fix(mothership): address PR review — move FileAttachmentForApi to types, defer onEditValueConsumed to effect, await sendMessage in sendNow

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx

@@ -64,7 +64,10 @@ import { cn } from '@/lib/core/utils/cn'
 import { CHAT_ACCEPT_ATTRIBUTE } from '@/lib/uploads/utils/validation'
 import { useAvailableResources } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown'
 import { getResourceConfig } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry'
-import type { MothershipResource } from '@/app/workspace/[workspaceId]/home/types'
+import type {
+  FileAttachmentForApi,
+  MothershipResource,
+} from '@/app/workspace/[workspaceId]/home/types'
 import {
   useContextManagement,
   useFileAttachments,
@@ -145,13 +148,7 @@ function mapResourceToContext(resource: MothershipResource): ChatContext {
   }
 }
 
-export interface FileAttachmentForApi {
-  id: string
-  key: string
-  filename: string
-  media_type: string
-  size: number
-}
+export type { FileAttachmentForApi } from '@/app/workspace/[workspaceId]/home/types'
 
 interface UserInputProps {
   defaultValue?: string
@@ -200,11 +197,16 @@ export function UserInput({
   if (editValue && editValue !== prevEditValue) {
     setPrevEditValue(editValue)
     setValue(editValue)
-    onEditValueConsumed?.()
   } else if (!editValue && prevEditValue) {
     setPrevEditValue(editValue)
   }
 
+  useEffect(() => {
+    if (editValue) {
+      onEditValueConsumed?.()
+    }
+  }, [editValue, onEditValueConsumed])
+
   const animatedPlaceholder = useAnimatedPlaceholder(isInitialView)
   const placeholder = isInitialView ? animatedPlaceholder : 'Send message to Sim'
 

apps/sim/app/workspace/[workspaceId]/home/home.tsx

@@ -25,9 +25,8 @@ import {
   UserMessageContent,
 } from './components'
 import { PendingTagIndicator } from './components/message-content/components/special-tags'
-import type { FileAttachmentForApi } from './components/user-input/user-input'
 import { useAutoScroll, useChat } from './hooks'
-import type { MothershipResource, MothershipResourceType } from './types'
+import type { FileAttachmentForApi, MothershipResource, MothershipResourceType } from './types'
 
 const logger = createLogger('Home')
 

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts

@@ -28,12 +28,12 @@ import { useFolderStore } from '@/stores/folders/store'
 import type { ChatContext } from '@/stores/panel'
 import { useTerminalConsoleStore } from '@/stores/terminal'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import type { FileAttachmentForApi } from '../components/user-input/user-input'
 import type {
   ChatMessage,
   ChatMessageAttachment,
   ContentBlock,
   ContentBlockType,
+  FileAttachmentForApi,
   MothershipResource,
   MothershipResourceType,
   QueuedMessage,
@@ -1016,7 +1016,7 @@ export function useChat(
       if (!msg) return
       await stopGeneration()
       setMessageQueue((prev) => prev.filter((m) => m.id !== id))
-      sendMessage(msg.content, msg.fileAttachments, msg.contexts)
+      await sendMessage(msg.content, msg.fileAttachments, msg.contexts)
     },
     [stopGeneration, sendMessage, setMessageQueue]
   )

apps/sim/app/workspace/[workspaceId]/home/types.ts

@@ -1,12 +1,19 @@
 import type { MothershipResourceType } from '@/lib/copilot/resource-types'
 import type { ChatContext } from '@/stores/panel'
-import type { FileAttachmentForApi } from './components/user-input/user-input'
 
 export type {
   MothershipResource,
   MothershipResourceType,
 } from '@/lib/copilot/resource-types'
 
+export interface FileAttachmentForApi {
+  id: string
+  key: string
+  filename: string
+  media_type: string
+  size: number
+}
+
 export interface QueuedMessage {
   id: string
   content: string