Fixes

Author: Sg312

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-content.test.ts

@@ -0,0 +1,22 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it } from 'vitest'
+import { sanitizeChatDisplayContent } from './chat-sanitize'
+
+describe('sanitizeChatDisplayContent', () => {
+  it('unwraps workspace resource tags from inline code spans', () => {
+    const content =
+      '`I updated <workspace_resource>{"type":"workflow","id":"wf-1","title":"Workflow"}</workspace_resource>.`'
+
+    expect(sanitizeChatDisplayContent(content)).toBe(
+      'I updated <workspace_resource>{"type":"workflow","id":"wf-1","title":"Workflow"}</workspace_resource>.'
+    )
+  })
+
+  it('removes hidden internal references wrapped in inline code', () => {
+    const content = 'Read `internal/tool-results/read-1.md` and found the issue.'
+
+    expect(sanitizeChatDisplayContent(content)).toBe('Read  and found the issue.')
+  })
+})

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

@@ -18,6 +18,7 @@ import {
   SpecialTags,
 } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags'
 import type { MothershipResource } from '@/app/workspace/[workspaceId]/home/types'
+import { sanitizeChatDisplayContent } from './chat-sanitize'
 
 const LANG_ALIASES: Record<string, string> = {
   js: 'javascript',
@@ -270,6 +271,8 @@ function ChatContentInner({
   const onWorkspaceResourceSelectRef = useRef(onWorkspaceResourceSelect)
   onWorkspaceResourceSelectRef.current = onWorkspaceResourceSelect
 
+  const displayContent = useMemo(() => sanitizeChatDisplayContent(content), [content])
+
   useEffect(() => {
     const handler = (e: Event) => {
       const { type, id, title } = (e as CustomEvent).detail
@@ -279,7 +282,10 @@ function ChatContentInner({
     return () => window.removeEventListener('wsres-click', handler)
   }, [])
 
-  const parsed = useMemo(() => parseSpecialTags(content, isStreaming), [content, isStreaming])
+  const parsed = useMemo(
+    () => parseSpecialTags(displayContent, isStreaming),
+    [displayContent, isStreaming]
+  )
   const hasSpecialContent = parsed.hasPendingTag || parsed.segments.some((s) => s.type !== 'text')
 
   if (hasSpecialContent) {
@@ -354,7 +360,7 @@ function ChatContentInner({
   return (
     <div className={cn(PROSE_CLASSES, '[&>:first-child]:mt-0 [&>:last-child]:mb-0')}>
       <Streamdown mode={isStreaming ? undefined : 'static'} components={MARKDOWN_COMPONENTS}>
-        {content}
+        {displayContent}
       </Streamdown>
     </div>
   )

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-sanitize.ts

@@ -0,0 +1,12 @@
+const HIDDEN_INLINE_REFERENCE_PATTERN =
+  /`[^`\n]*(?:internal\/tool-results\/|internal\/blocktips\/|components\/integrations\/[^`\n]*README)[^`\n]*`/g
+const WORKSPACE_RESOURCE_CODE_SPAN_PATTERN =
+  /`([^`\n]*<workspace_resource>[\s\S]*?<\/workspace_resource>[^`\n]*)`/g
+
+export function sanitizeChatDisplayContent(content: string): string {
+  return content
+    .replace(WORKSPACE_RESOURCE_CODE_SPAN_PATTERN, '$1')
+    .replace(HIDDEN_INLINE_REFERENCE_PATTERN, '')
+    .replace(/`(\s*<workspace_resource>)/g, '$1')
+    .replace(/(<\/workspace_resource>\s*)`/g, '$1')
+}

apps/sim/lib/copilot/generated/tool-catalog-v1.ts

@@ -3067,25 +3067,31 @@ export const TouchPlan: ToolCatalogEntry = {
         description:
           'Plan file name or relative path under .plans, e.g. "implementation.md" or "phase-1/implementation.md". If no extension is supplied, ".md" is appended.',
       },
+      scope: {
+        type: 'string',
+        description:
+          'Plan scope. Use "workspace" for root .plans/** main-agent plans. Use "workflow" for workflows/{workflow}/.plans/** subplans. If omitted with workflowPath, workflow scope is assumed; otherwise workspace scope is assumed.',
+        enum: ['workspace', 'workflow'],
+      },
       title: {
         type: 'string',
         description: 'Optional short user-visible label for the plan creation.',
       },
       workflowPath: {
         type: 'string',
         description:
-          'Canonical workflow VFS path, e.g. "workflows/My%20Workflow" or "workflows/Folder/My%20Workflow". Copy from glob/read output; do not use workflow IDs.',
+          'Required for scope "workflow". Canonical workflow VFS path, e.g. "workflows/My%20Workflow" or "workflows/Folder/My%20Workflow". Copy from glob/read output; do not use workflow IDs.',
       },
     },
-    required: ['workflowPath', 'name'],
+    required: ['name'],
   },
   resultSchema: {
     type: 'object',
     properties: {
       data: {
         type: 'object',
         description:
-          'Contains id, name, vfsPath, backingVfsPath, and workflowId. Use vfsPath for follow-up workspace_file calls.',
+          'Contains id, name, scope, vfsPath, backingVfsPath, and workflowId for workflow plans. Use vfsPath for follow-up workspace_file calls.',
       },
       message: { type: 'string', description: 'Human-readable outcome.' },
       success: { type: 'boolean', description: 'Whether the plan file was created.' },

apps/sim/lib/copilot/generated/tool-schemas-v1.ts

@@ -2816,25 +2816,31 @@ export const TOOL_RUNTIME_SCHEMAS: Record<string, ToolRuntimeSchemaEntry> = {
           description:
             'Plan file name or relative path under .plans, e.g. "implementation.md" or "phase-1/implementation.md". If no extension is supplied, ".md" is appended.',
         },
+        scope: {
+          type: 'string',
+          description:
+            'Plan scope. Use "workspace" for root .plans/** main-agent plans. Use "workflow" for workflows/{workflow}/.plans/** subplans. If omitted with workflowPath, workflow scope is assumed; otherwise workspace scope is assumed.',
+          enum: ['workspace', 'workflow'],
+        },
         title: {
           type: 'string',
           description: 'Optional short user-visible label for the plan creation.',
         },
         workflowPath: {
           type: 'string',
           description:
-            'Canonical workflow VFS path, e.g. "workflows/My%20Workflow" or "workflows/Folder/My%20Workflow". Copy from glob/read output; do not use workflow IDs.',
+            'Required for scope "workflow". Canonical workflow VFS path, e.g. "workflows/My%20Workflow" or "workflows/Folder/My%20Workflow". Copy from glob/read output; do not use workflow IDs.',
         },
       },
-      required: ['workflowPath', 'name'],
+      required: ['name'],
     },
     resultSchema: {
       type: 'object',
       properties: {
         data: {
           type: 'object',
           description:
-            'Contains id, name, vfsPath, backingVfsPath, and workflowId. Use vfsPath for follow-up workspace_file calls.',
+            'Contains id, name, scope, vfsPath, backingVfsPath, and workflowId for workflow plans. Use vfsPath for follow-up workspace_file calls.',
         },
         message: {
           type: 'string',

apps/sim/lib/copilot/request/context/request-context.ts

@@ -12,6 +12,8 @@ export function createStreamingContext(overrides?: Partial<StreamingContext>): S
     runId: undefined,
     messageId: generateId(),
     accumulatedContent: '',
+    finalAssistantContent: '',
+    sawMainToolCall: false,
     contentBlocks: [],
     toolCalls: new Map(),
     pendingToolPromises: new Map(),

apps/sim/lib/copilot/request/context/result.test.ts

@@ -16,6 +16,8 @@ function makeContext(): StreamingContext {
     runId: undefined,
     messageId: 'msg-1',
     accumulatedContent: '',
+    finalAssistantContent: '',
+    sawMainToolCall: false,
     contentBlocks: [],
     toolCalls: new Map(),
     pendingToolPromises: new Map(),

apps/sim/lib/copilot/request/go/stream.test.ts

@@ -18,6 +18,7 @@ vi.mock('@/lib/copilot/request/session', async () => {
   return {
     ...actual,
     hasAbortMarker: vi.fn().mockResolvedValue(false),
+    upsertFilePreviewSession: vi.fn(async (session) => session),
   }
 })
 
@@ -27,6 +28,16 @@ vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => ({
   resolveWorkspaceFileReference: resolveWorkspaceFileReferenceMock,
 }))
 
+vi.mock('@/lib/copilot/tools/server/files/file-preview', async () => {
+  const actual = await vi.importActual<
+    typeof import('@/lib/copilot/tools/server/files/file-preview')
+  >('@/lib/copilot/tools/server/files/file-preview')
+  return {
+    ...actual,
+    loadWorkspaceFileTextForPreview: vi.fn().mockResolvedValue(''),
+  }
+})
+
 import {
   buildPreviewContentUpdate,
   decodeJsonStringPrefix,
@@ -77,6 +88,8 @@ function createStreamingContext(): StreamingContext {
   return {
     messageId: 'msg-1',
     accumulatedContent: '',
+    finalAssistantContent: '',
+    sawMainToolCall: false,
     contentBlocks: [],
     toolCalls: new Map(),
     pendingToolPromises: new Map(),
@@ -263,7 +276,10 @@ describe('copilot go stream helpers', () => {
 
     const previewEvents = onEvent.mock.calls
       .map(([event]) => event)
-      .filter((event) => event.type === MothershipStreamV1EventType.tool && 'previewPhase' in event.payload)
+      .filter(
+        (event) =>
+          event.type === MothershipStreamV1EventType.tool && 'previewPhase' in event.payload
+      )
 
     expect(previewEvents.map((event) => event.payload.previewPhase)).toEqual([
       'file_preview_start',
@@ -379,7 +395,8 @@ describe('copilot go stream helpers', () => {
     const previewEvents = onEvent.mock.calls
       .map(([event]) => event)
       .filter(
-        (event) => event.type === MothershipStreamV1EventType.tool && 'previewPhase' in event.payload
+        (event) =>
+          event.type === MothershipStreamV1EventType.tool && 'previewPhase' in event.payload
       )
 
     expect(previewEvents.map((event) => event.payload.previewPhase)).toEqual([

apps/sim/lib/copilot/request/handlers/handlers.test.ts

@@ -84,6 +84,8 @@ describe('sse-handlers tool lifecycle', () => {
       chatId: undefined,
       messageId: 'msg-1',
       accumulatedContent: '',
+      finalAssistantContent: '',
+      sawMainToolCall: false,
       trace: new TraceCollector(),
       contentBlocks: [],
       toolCalls: new Map(),
@@ -105,6 +107,54 @@ describe('sse-handlers tool lifecycle', () => {
     }
   })
 
+  it('keeps only the latest post-tool assistant text for headless final content', async () => {
+    await sseHandlers.text(
+      {
+        type: MothershipStreamV1EventType.text,
+        payload: {
+          channel: MothershipStreamV1TextChannel.assistant,
+          text: 'I will check that.',
+        },
+      } satisfies StreamEvent,
+      context,
+      execContext,
+      { interactive: false }
+    )
+
+    await sseHandlers.tool(
+      {
+        type: MothershipStreamV1EventType.tool,
+        payload: {
+          toolCallId: 'tool-1',
+          toolName: ReadTool.id,
+          arguments: { path: 'foo.txt' },
+          executor: MothershipStreamV1ToolExecutor.sim,
+          mode: MothershipStreamV1ToolMode.async,
+          phase: MothershipStreamV1ToolPhase.call,
+        },
+      } satisfies StreamEvent,
+      context,
+      execContext,
+      { interactive: false, autoExecuteTools: false }
+    )
+
+    await sseHandlers.text(
+      {
+        type: MothershipStreamV1EventType.text,
+        payload: {
+          channel: MothershipStreamV1TextChannel.assistant,
+          text: 'Final answer only.',
+        },
+      } satisfies StreamEvent,
+      context,
+      execContext,
+      { interactive: false }
+    )
+
+    expect(context.accumulatedContent).toBe('I will check that.Final answer only.')
+    expect(context.finalAssistantContent).toBe('Final answer only.')
+  })
+
   it('executes tool_call and emits tool_result', async () => {
     executeTool.mockResolvedValueOnce({ success: true, output: { ok: true } })
     const onEvent = vi.fn()

apps/sim/lib/copilot/request/handlers/text.ts

@@ -68,6 +68,7 @@ export function handleTextEvent(scope: ToolScope): StreamHandler {
       flushThinkingBlock(context)
     }
     context.accumulatedContent += chunk
+    context.finalAssistantContent += chunk
     addContentBlock(context, { type: 'text', content: chunk })
   }
 }