Fix

Sg312 · Sg312 · commit d22f3678fea2 · 2026-04-08T17:41:57.000-07:00
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-viewer.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-viewer.tsx
@@ -243,6 +243,8 @@ function TextEditor({
   const [savedContent, setSavedContent] = useState('')
   const savedContentRef = useRef('')
   const wasStreamingRef = useRef(false)
+  const pendingStreamReconcileRef = useRef(false)
+  const lastStreamedContentRef = useRef<string | null>(null)
 
   useEffect(() => {
     if (streamingContent !== undefined) {
@@ -254,41 +256,31 @@ function TextEditor({
               fetchedContent.endsWith(`\n${streamingContent}`)
             ? fetchedContent
             : `${fetchedContent}\n${streamingContent}`
-      // #region agent log
-      fetch('http://127.0.0.1:7774/ingest/b056eec6-a1ee-457f-8556-85f94314ca06', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json', 'X-Debug-Session-Id': '6f10b0' },
-        body: JSON.stringify({
-          sessionId: '6f10b0',
-          location: 'file-viewer.tsx:TextEditor-merge',
-          message: 'streaming merge',
-          data: {
-            streamingMode,
-            fetchedContentLen: fetchedContent?.length,
-            streamingContentLen: streamingContent.length,
-            nextContentLen: nextContent.length,
-            fetchedUndefined: fetchedContent === undefined,
-            usedReplace: streamingMode === 'replace' || fetchedContent === undefined,
-            nextPreview: nextContent.slice(0, 200),
-          },
-          timestamp: Date.now(),
-          hypothesisId: 'H2-H3',
-        }),
-      }).catch(() => {})
-      // #endregion
+      pendingStreamReconcileRef.current = true
+      lastStreamedContentRef.current = nextContent
       setContent(nextContent)
       contentRef.current = nextContent
       initializedRef.current = true
       return
     }
 
-    if (wasStreamingRef.current) {
-      if (fetchedContent !== undefined && fetchedContent !== savedContentRef.current) {
+    if (wasStreamingRef.current && pendingStreamReconcileRef.current) {
+      const lastStreamed = lastStreamedContentRef.current
+      const hasFetchedAdvanced =
+        fetchedContent !== undefined && fetchedContent !== savedContentRef.current
+      const fetchedMatchesLastStream =
+        fetchedContent !== undefined && lastStreamed !== null && fetchedContent === lastStreamed
+
+      if (hasFetchedAdvanced || fetchedMatchesLastStream) {
+        pendingStreamReconcileRef.current = false
         wasStreamingRef.current = false
-        setContent(fetchedContent)
+        lastStreamedContentRef.current = null
+        if (lastStreamed !== null && contentRef.current === lastStreamed) {
+          setContent(fetchedContent)
+          contentRef.current = fetchedContent
+        }
         setSavedContent(fetchedContent)
         savedContentRef.current = fetchedContent
-        contentRef.current = fetchedContent
         return
       }
     }
@@ -316,7 +308,7 @@ function TextEditor({
       savedContentRef.current = fetchedContent
       contentRef.current = fetchedContent
     }
-  }, [streamingContent, fetchedContent, dataUpdatedAt, autoFocus])
+  }, [streamingContent, fetchedContent, streamingMode, dataUpdatedAt, autoFocus])
 
   const handleContentChange = useCallback((value: string) => {
     setContent(value)
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx
@@ -120,102 +120,18 @@ export const ResourceContent = memo(function ResourceContent({
     isSourceMime
   )
 
-  // #region agent log
-  if (streamingFile) {
-    fetch('http://127.0.0.1:7774/ingest/b056eec6-a1ee-457f-8556-85f94314ca06', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json', 'X-Debug-Session-Id': '6f10b0' },
-      body: JSON.stringify({
-        sessionId: '6f10b0',
-        location: 'resource-content.tsx:streaming-context',
-        message: 'streaming state',
-        data: {
-          resourceId: resource.id,
-          resourceType: resource.type,
-          streamOp: streamOperation,
-          isPatch: isPatchStream,
-          isWrite: isWriteStream,
-          isUpdate: isUpdateStream,
-          hasActiveFileRecord: !!activeFileRecord,
-          hasFetchedContent: !!fetchedFileContent,
-          fetchedContentLen: fetchedFileContent?.length,
-          streamingFileContentLen: streamingFile.content.length,
-          streamingFileName: streamingFile.fileName,
-          streamingFileMode: isWriteStream ? 'append' : 'replace',
-        },
-        timestamp: Date.now(),
-      }),
-    }).catch(() => {})
-  }
-  // #endregion
   const streamingExtractedContent = useMemo(() => {
     if (!streamingFile) return undefined
     if (!streamOperation) return undefined
 
     if (isPatchStream) {
-      if (!fetchedFileContent) {
-        // #region agent log
-        fetch('http://127.0.0.1:7774/ingest/b056eec6-a1ee-457f-8556-85f94314ca06', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json', 'X-Debug-Session-Id': '6f10b0' },
-          body: JSON.stringify({
-            sessionId: '6f10b0',
-            location: 'resource-content.tsx:patch-no-fetched',
-            message: 'patch but no fetchedFileContent',
-            data: { resourceId: resource.id, activeFileRecordId: activeFileRecord?.id },
-            timestamp: Date.now(),
-            hypothesisId: 'H1',
-          }),
-        }).catch(() => {})
-        // #endregion
-        return undefined
-      }
-      const patchResult = extractPatchPreview(streamingFile, fetchedFileContent)
-      // #region agent log
-      fetch('http://127.0.0.1:7774/ingest/b056eec6-a1ee-457f-8556-85f94314ca06', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json', 'X-Debug-Session-Id': '6f10b0' },
-        body: JSON.stringify({
-          sessionId: '6f10b0',
-          location: 'resource-content.tsx:patch-result',
-          message: 'extractPatchPreview result',
-          data: {
-            hasPatchResult: !!patchResult,
-            patchResultLen: patchResult?.length,
-            fetchedLen: fetchedFileContent.length,
-            contentPreview: streamingFile.content.slice(0, 200),
-            edit: streamingFile.edit,
-          },
-          timestamp: Date.now(),
-          hypothesisId: 'H4',
-        }),
-      }).catch(() => {})
-      // #endregion
-      return patchResult
+      if (!fetchedFileContent) return undefined
+      return extractPatchPreview(streamingFile, fetchedFileContent)
     }
 
     const extracted = streamingFile.content
     if (extracted.length === 0) return undefined
 
-    // #region agent log
-    fetch('http://127.0.0.1:7774/ingest/b056eec6-a1ee-457f-8556-85f94314ca06', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json', 'X-Debug-Session-Id': '6f10b0' },
-      body: JSON.stringify({
-        sessionId: '6f10b0',
-        location: 'resource-content.tsx:write-update-content',
-        message: 'extracted content for write/update',
-        data: {
-          streamOp: streamOperation,
-          extractedLen: extracted.length,
-          extractedPreview: extracted.slice(0, 150),
-        },
-        timestamp: Date.now(),
-        hypothesisId: 'H2',
-      }),
-    }).catch(() => {})
-    // #endregion
-
     if (isUpdateStream) return extracted
     if (isWriteStream) return extracted
 
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
@@ -958,12 +958,16 @@ export function useChat(
 
                 if (previewPhase === 'file_preview_content') {
                   const content = typeof payload.content === 'string' ? payload.content : ''
+                  const isAppendOp = prevSession.operation === 'append'
+                  const prevContent = streamingFileRef.current?.content ?? ''
+                  const nextContent = isAppendOp ? prevContent + content : content
                   const nextSession: StreamingFilePreview = {
                     ...prevSession,
-                    content,
+                    content: nextContent,
                   }
                   sessions.set(id, nextSession)
                   activeFilePreviewToolCallIdRef.current = id
+                  streamingFileRef.current = nextSession
                   setStreamingFile(nextSession)
                   break
                 }
@@ -1104,8 +1108,10 @@ export function useChat(
                   filePreviewSessionsRef.current.delete(id)
                   if (activeFilePreviewToolCallIdRef.current === id) {
                     activeFilePreviewToolCallIdRef.current = null
-                    setStreamingFile(null)
-                    streamingFileRef.current = null
+                    if (!activeSubagent || activeSubagent !== FileTool.id) {
+                      setStreamingFile(null)
+                      streamingFileRef.current = null
+                    }
                   }
                   const fileResource = extractedResources.find((r) => r.type === 'file')
                   if (fileResource) {
@@ -1118,7 +1124,7 @@ export function useChat(
                     })
                     setActiveResourceId(fileResource.id)
                     invalidateResourceQueries(queryClient, workspaceId, 'file', fileResource.id)
-                  } else {
+                  } else if (!activeSubagent || activeSubagent !== FileTool.id) {
                     setResources((rs) => rs.filter((r) => r.id !== 'streaming-file'))
                   }
                 }
@@ -1335,7 +1341,7 @@ export function useChat(
                 if (isPendingPause) {
                   break
                 }
-                if (streamingFileRef.current) {
+                if (streamingFileRef.current && !activeFilePreviewToolCallIdRef.current) {
                   setStreamingFile(null)
                   streamingFileRef.current = null
                   const lastFileResource = resourcesRef.current.find(
diff --git a/apps/sim/lib/copilot/request/handlers/handlers.test.ts b/apps/sim/lib/copilot/request/handlers/handlers.test.ts
@@ -24,6 +24,7 @@ vi.mock('@/lib/copilot/tool-executor', () => ({
   isSimExecuted,
   executeTool,
   ensureHandlersRegistered,
+  getToolEntry: vi.fn().mockReturnValue(undefined),
 }))
 
 vi.mock('@/lib/copilot/async-runs/repository', async () => {
diff --git a/apps/sim/lib/copilot/tools/server/files/workspace-file.ts b/apps/sim/lib/copilot/tools/server/files/workspace-file.ts
@@ -152,7 +152,22 @@ export const workspaceFileServerTool: BaseServerTool<WorkspaceFileArgs, Workspac
       throw new Error('Authentication required')
     }
 
-    const normalized = params
+    const raw = params as Record<string, unknown>
+    const nested = raw.args as Record<string, unknown> | undefined
+    const normalized: WorkspaceFileArgs =
+      params.operation && params.target
+        ? params
+        : nested && typeof nested === 'object'
+          ? {
+              operation: (nested.operation ?? raw.operation) as WorkspaceFileOperation,
+              target: (nested.target ?? raw.target) as WorkspaceFileTarget | undefined,
+              title: (nested.title ?? raw.title) as string | undefined,
+              content: (nested.content ?? raw.content) as string | undefined,
+              contentType: (nested.contentType ?? raw.contentType) as string | undefined,
+              newName: (nested.newName ?? raw.newName) as string | undefined,
+              edit: (nested.edit ?? raw.edit) as WorkspaceFileEdit | undefined,
+            }
+          : params
     const { operation } = normalized
     const workspaceId = context.workspaceId
 
diff --git a/apps/sim/lib/copilot/tools/server/router.ts b/apps/sim/lib/copilot/tools/server/router.ts
@@ -159,11 +159,25 @@ export async function routeExecution(
 
   assertServerToolNotAborted(context)
 
-  // Validate input if tool declares a schema; otherwise fall back to the
-  // generated JSON schema contract emitted from Go.
+  // Go injects chatId/workspaceId and may wrap the model's args inside a
+  // nested "args" object. Unwrap that before validation so the generated
+  // JSON Schema sees the flat tool contract shape.
+  let normalizedPayload = payload ?? {}
+  if (
+    normalizedPayload &&
+    typeof normalizedPayload === 'object' &&
+    !Array.isArray(normalizedPayload)
+  ) {
+    const raw = normalizedPayload as Record<string, unknown>
+    if (raw.args && typeof raw.args === 'object' && !raw.operation) {
+      const nested = raw.args as Record<string, unknown>
+      normalizedPayload = { ...nested, ...raw, args: undefined }
+    }
+  }
+
   const args = tool.inputSchema
-    ? tool.inputSchema.parse(payload ?? {})
-    : validateGeneratedToolPayload(toolName, 'parameters', payload ?? {})
+    ? tool.inputSchema.parse(normalizedPayload)
+    : validateGeneratedToolPayload(toolName, 'parameters', normalizedPayload)
 
   assertServerToolNotAborted(context)
 
diff --git a/bun.lock b/bun.lock
