fix(home): clear the composer when a result is handed to the Assistant, follow the search query in a chat, restore a queued message's mode, and seed the base list

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/knowledge-search-results.tsx

@@ -231,7 +231,7 @@ export function KnowledgeSearchResults({
   if (!basesPending && knowledgeBaseIds.length === 0) {
     return (
       <p className='px-2 py-2 text-[var(--text-muted)] text-caption'>
-        Nothing to search yet. Connect a source above to index what you can open.
+        Nothing to search yet. Clear the query and connect a source to index what you can open.
       </p>
     )
   }

apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx

@@ -3,6 +3,7 @@
 import {
   memo,
   type ReactNode,
+  type RefObject,
   useCallback,
   useDeferredValue,
   useEffect,
@@ -63,6 +64,12 @@ interface MothershipChatProps {
   isSending: boolean
   /** The composer's Search-mode results, shown above the input. */
   searchResults?: ReactNode
+  /** The live search query; the composer shows it so the box and the results never disagree. */
+  searchQuery?: string
+  /** The composer, for a caller that hands a question to the agent from outside the box. */
+  userInputRef?: RefObject<UserInputHandle | null>
+  /** Puts the composer in the mode a queued message was written in, when one is loaded for editing. */
+  onRestoreQueuedMode?: (requestMode: QueuedMessage['requestMode']) => void
   isReconnecting?: boolean
   isLoading?: boolean
   onSubmit: (
@@ -319,6 +326,9 @@ export function MothershipChat({
   messages: messagesProp,
   isSending,
   searchResults,
+  searchQuery,
+  userInputRef: userInputRefProp,
+  onRestoreQueuedMode,
   isReconnecting = false,
   isLoading = false,
   onSubmit,
@@ -663,7 +673,8 @@ export function MothershipChat({
     item.index !== lastIndex && item.start < (instance.scrollElement?.scrollTop ?? 0)
 
   const scrolledChatRef = useRef<string | undefined | typeof UNSCROLLED>(UNSCROLLED)
-  const userInputRef = useRef<UserInputHandle>(null)
+  const ownUserInputRef = useRef<UserInputHandle>(null)
+  const userInputRef = userInputRefProp ?? ownUserInputRef
   const messageQueueRef = useRef(messageQueue)
   useEffect(() => {
     messageQueueRef.current = messageQueue
@@ -686,9 +697,11 @@ export function MothershipChat({
   const handleEditQueued = useCallback(
     (id: string) => {
       const msg = onEditQueuedMessage(id)
-      if (msg) userInputRef.current?.loadQueuedMessage(msg)
+      if (!msg) return
+      onRestoreQueuedMode?.(msg.requestMode)
+      userInputRef.current?.loadQueuedMessage(msg)
     },
-    [onEditQueuedMessage]
+    [onEditQueuedMessage, onRestoreQueuedMode, userInputRef]
   )
 
   const handleEditQueuedTail = useCallback(() => {
@@ -831,6 +844,7 @@ export function MothershipChat({
             <UserInput
               key={draftScopeKey}
               ref={userInputRef}
+              defaultValue={searchQuery}
               onSubmit={onSubmit}
               canSearch={canSearch}
               clearOnSubmit={clearOnSubmit}

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

@@ -96,6 +96,8 @@ export interface UserInputHandle {
    * names chip with brand icons. Focuses the input and places the caret at the
    * end. Does NOT submit. Safe to call with the same text twice in a row. */
   populatePrompt: (text: string) => void
+  /** Empties the composer and its draft, as a send does; for a question handed to the agent from outside the box. */
+  clear: () => void
 }
 
 /**
@@ -434,6 +436,7 @@ const UserInputImpl = forwardRef<UserInputHandle, UserInputProps>(function UserI
         currentEditor.setContexts(msg.contexts ?? [])
         currentEditor.focusAtEnd()
       },
+      clear: clearComposer,
       populatePrompt: (text: string) => {
         // `text` is a curated prompt, so opt its bare integration names into
         // `@`-mention form before chipification (the auto-mention pipeline only
@@ -551,6 +554,24 @@ const UserInputImpl = forwardRef<UserInputHandle, UserInputProps>(function UserI
     textareaRef.current?.focus()
   }
 
+  /** Empties the text, chips, attachments, transcript, and the saved draft in one step. */
+  const clearComposer = useCallback(() => {
+    editorRef.current.clear()
+    sttPrefixRef.current = ''
+    if (draftSaveTimerRef.current !== null) {
+      window.clearTimeout(draftSaveTimerRef.current)
+      draftSaveTimerRef.current = null
+    }
+    pendingDraftRef.current = null
+    if (draftScopeKeyRef.current) {
+      useMothershipDraftsStore.getState().clearDraft(draftScopeKeyRef.current)
+    }
+    /** The chips are gone with the text, and clearing is not a removal to report. */
+    prevSelectedContextsRef.current = []
+    resetTranscript()
+    filesRef.current.clearAttachedFiles()
+  }, [resetTranscript])
+
   const handleSubmit = useCallback(() => {
     const currentFiles = filesRef.current
     const currentEditor = editorRef.current
@@ -575,27 +596,13 @@ const UserInputImpl = forwardRef<UserInputHandle, UserInputProps>(function UserI
       fileAttachmentsForApi.length > 0 ? fileAttachmentsForApi : undefined,
       activeContexts.length > 0 ? activeContexts : undefined
     )
-    if (clearOnSubmitRef.current) {
-      currentEditor.clear()
-      sttPrefixRef.current = ''
-      if (draftSaveTimerRef.current !== null) {
-        window.clearTimeout(draftSaveTimerRef.current)
-        draftSaveTimerRef.current = null
-      }
-      pendingDraftRef.current = null
-      if (draftScopeKeyRef.current) {
-        useMothershipDraftsStore.getState().clearDraft(draftScopeKeyRef.current)
-      }
-      /**
-       * The chips are gone with the text, and clearing is not a removal to
-       * report. A composer that keeps its text (Search mode) keeps its chips
-       * too, so the diff base stays in step with what is still selected.
-       */
-      prevSelectedContextsRef.current = []
-    }
-    resetTranscript()
-    currentFiles.clearAttachedFiles()
-  }, [onSubmit, resetTranscript])
+    /**
+     * A composer that keeps its text (Search mode) keeps its attachments and
+     * chips too: the search took the query alone, and the person may hand the
+     * rest to the agent next.
+     */
+    if (clearOnSubmitRef.current) clearComposer()
+  }, [onSubmit, clearComposer])
 
   /**
    * Enter policy for the editor: mirror canSubmit's uploading guard (Enter

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

@@ -89,6 +89,7 @@ import type {
   FileAttachmentForApi,
   MothershipResource,
   MothershipResourceType,
+  QueuedMessage,
   WorkspaceResourceRef,
 } from './types'
 
@@ -193,7 +194,7 @@ export function Home({ chatId, userName, userId }: HomeProps) {
    * box and the results never show two different queries.
    */
   useEffect(() => {
-    if (searchQuery && composerMode === 'build') void setComposerMode('search')
+    if (searchQuery.trim() && composerMode === 'build') void setComposerMode('search')
   }, [searchQuery, composerMode, setComposerMode])
   /** The bases an Ask turn is grounded in; read through a ref so a list refresh never rebuilds the submit handler. */
   const { data: knowledgeBases = EMPTY_KNOWLEDGE_BASES } = useKnowledgeBasesQuery(workspaceId)
@@ -202,6 +203,7 @@ export function Home({ chatId, userName, userId }: HomeProps) {
   const hasCheckedLandingStorageRef = useRef(false)
   const initialViewInputRef = useRef<HTMLDivElement>(null)
   const initialViewUserInputRef = useRef<UserInputHandle>(null)
+  const chatViewUserInputRef = useRef<UserInputHandle>(null)
 
   const [isInputEntering, setIsInputEntering] = useState(false)
 
@@ -499,6 +501,8 @@ export function Home({ chatId, userName, userId }: HomeProps) {
       const mode = modeOverride ?? composerMode
       const answering = mode === 'assistant'
       if (mode === 'search') {
+        /** A search sends nothing, so an edit in progress is released rather than left waiting. */
+        if (editingQueuedId) cancelQueueEdit()
         if (trimmed) setSearchQuery(trimmed)
         return
       }
@@ -525,23 +529,43 @@ export function Home({ chatId, userName, userId }: HomeProps) {
       workspaceId,
       chatId,
       composerMode,
+      editingQueuedId,
+      cancelQueueEdit,
       prepareResourceViewForAgentTurn,
       sendMessage,
       setSearchQuery,
     ]
   )
 
-  /** An emptied search box returns to the sources; nothing else reads the cleared query. */
-  const clearSearch = useCallback(() => setSearchQuery(''), [setSearchQuery])
+  /**
+   * A queued message re-enters the composer in the mode it was written in: an
+   * Assistant question edits as an Assistant question, and never as a Search,
+   * which submits nothing and would leave the edit stranded.
+   */
+  const restoreQueuedMode = useCallback(
+    (requestMode: QueuedMessage['requestMode']) => {
+      void setComposerMode(requestMode === 'ask' ? 'assistant' : 'build')
+    },
+    [setComposerMode]
+  )
+
+  /** An emptied search box returns to the sources; a send in any other mode has no search to clear. */
+  const clearSearch = useCallback(() => {
+    if (searchQueryValue !== null) setSearchQuery('')
+  }, [searchQueryValue, setSearchQuery])
 
   /**
    * Summarize or Answer on a result: switch to Assistant and hand the question
    * to it. The submit reads the mode from this render, so it is sent as an
-   * Assistant turn directly rather than waiting for the URL to update.
+   * Assistant turn directly rather than waiting for the URL to update, and the
+   * box is emptied as a send empties it, so the query does not linger as a
+   * draft under the answer.
    */
   const handleSummarize = (prompt: string) => {
     void setComposerMode('assistant')
     setSearchQuery('')
+    initialViewUserInputRef.current?.clear()
+    chatViewUserInputRef.current?.clear()
     handleSubmit(prompt, undefined, undefined, 'assistant')
   }
   const showSearchResults = composerMode === 'search' && searchQuery.trim().length > 0
@@ -800,6 +824,9 @@ export function Home({ chatId, userName, userId }: HomeProps) {
             messages={messages}
             isSending={isSending}
             searchResults={searchResults}
+            searchQuery={searchQuery}
+            userInputRef={chatViewUserInputRef}
+            onRestoreQueuedMode={restoreQueuedMode}
             isReconnecting={isReconnecting}
             isLoading={showChatSkeleton}
             onSubmit={handleSubmit}

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

@@ -1,13 +1,21 @@
 import type { QueryClient } from '@tanstack/react-query'
+import { listKnowledgeBasesContract } from '@/lib/api/contracts/knowledge'
+import { internalSessionAuth } from '@/lib/api/server/routes'
+import { internalKnowledgePresenters } from '@/lib/knowledge/api/internal-route'
+import { listInternalKnowledgeBases } from '@/lib/knowledge/application/knowledge-bases'
 import { getWorkspaceHostContextForViewer } from '@/lib/workspaces/host-context'
 import { seedWorkspaceFiles } from '@/app/workspace/[workspaceId]/lib/seed-workspace-files'
+import { KNOWLEDGE_BASE_LIST_STALE_TIME, knowledgeKeys } from '@/hooks/queries/utils/knowledge-keys'
 
 /**
  * Prefetches what the Home surface needs on top of the workspace layout's own prefetch.
  *
  * Home reads the workspace file list on mount (resource tabs, mentions, the resource picker), so
  * the list is seeded by the routes that render Home rather than by the layout: seeding it in the
- * layout would pay for it on every workspace route, including the ones that never read it.
+ * layout would pay for it on every workspace route, including the ones that never read it. The
+ * knowledge-base list is seeded the same way, under the client hook's key and stale time: an
+ * Assistant turn attaches the searched bases at submit, and a first question typed before the
+ * list arrived would otherwise go out with nothing to search.
  *
  * The seed carries no authorization of its own, so the viewer is proved first. This reuses the
  * layout's `cache`d host-context lookup rather than re-deriving the permission, so it costs no
@@ -23,5 +31,21 @@ export async function prefetchHomeSurface(
   const hostContext = await getWorkspaceHostContextForViewer(workspaceId, userId)
   if (!hostContext) return
 
-  await seedWorkspaceFiles(queryClient, workspaceId)
+  await Promise.all([
+    seedWorkspaceFiles(queryClient, workspaceId),
+    queryClient.prefetchQuery({
+      queryKey: knowledgeKeys.list(workspaceId, 'active'),
+      queryFn: async () => {
+        const principal = await internalSessionAuth.authenticate()
+        const result = await listInternalKnowledgeBases.execute({
+          principal,
+          input: { workspaceId, scope: 'active' },
+        })
+        return listKnowledgeBasesContract.response.schema.parse(
+          internalKnowledgePresenters.list(result)
+        ).data
+      },
+      staleTime: KNOWLEDGE_BASE_LIST_STALE_TIME,
+    }),
+  ])
 }

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

@@ -25,8 +25,8 @@ export interface FileAttachmentForApi {
 
 /**
  * A request mode a send asks the agent for beyond the default. `ask` is an
- * answer drawn from the attached knowledge bases with the knowledge tool
- * alone: the server attaches no integration tools to the turn.
+ * Assistant turn: an answer drawn from the attached knowledge bases first,
+ * with a connected integration reached only when those cannot answer.
  */
 export type ChatRequestMode = 'ask'