Fix researcher-web

Author: jahooma

cli/src/utils/__tests__/message-block-helpers.test.ts

@@ -331,6 +331,41 @@ describe('extractSpawnAgentResultContent', () => {
     })
     expect(result).toEqual({ content: '', hasError: false })
   })
+
+  test('handles allMessages output mode', () => {
+    const result = extractSpawnAgentResultContent({
+      type: 'allMessages',
+      value: [
+        {
+          role: 'assistant',
+          content: [{ type: 'text', text: 'First response' }],
+        },
+        {
+          role: 'user',
+          content: [{ type: 'text', text: 'Follow up' }],
+        },
+        {
+          role: 'assistant',
+          content: [{ type: 'text', text: 'Second response' }],
+        },
+      ],
+    })
+    expect(result).toEqual({
+      content: 'First response\nSecond response',
+      hasError: false,
+    })
+  })
+
+  test('handles structuredOutput with message field', () => {
+    const result = extractSpawnAgentResultContent({
+      type: 'structuredOutput',
+      value: { message: 'Structured output message' },
+    })
+    expect(result).toEqual({
+      content: 'Structured output message',
+      hasError: false,
+    })
+  })
 })
 
 describe('appendInterruptionNotice', () => {

cli/src/utils/message-block-helpers.ts

@@ -170,9 +170,9 @@ export const extractSpawnAgentResultContent = (
     return { content: String((obj.value as any).errorMessage), hasError: true }
   }
 
-  // Handle lastMessage output mode: { type: "lastMessage", value: [Message array] }
+  // Handle lastMessage and allMessages output modes: { type: "lastMessage"|"allMessages", value: [Message array] }
   // This is common for agents like researcher-web
-  if (obj.type === 'lastMessage' && Array.isArray(obj.value)) {
+  if ((obj.type === 'lastMessage' || obj.type === 'allMessages') && Array.isArray(obj.value)) {
     const messages = obj.value as Array<{ role?: string; content?: unknown }>
     const textContent = messages
       .filter((msg) => msg?.role === 'assistant')
@@ -182,6 +182,30 @@ export const extractSpawnAgentResultContent = (
     return { content: textContent, hasError: false }
   }
 
+  // Handle structuredOutput mode: { type: "structuredOutput", value: any }
+  if (obj.type === 'structuredOutput') {
+    const value = obj.value
+    // Check for message field in structured output
+    if (value && typeof value === 'object') {
+      const valueObj = value as Record<string, unknown>
+      if (typeof valueObj.message === 'string') {
+        return { content: valueObj.message, hasError: false }
+      }
+      // Check for data.message pattern
+      if (valueObj.data && typeof valueObj.data === 'object') {
+        const dataObj = valueObj.data as Record<string, unknown>
+        if (typeof dataObj.message === 'string') {
+          return { content: dataObj.message, hasError: false }
+        }
+      }
+    }
+    // Fall through to format as JSON
+    return {
+      content: formatToolOutput([{ type: 'json', value: obj.value }]),
+      hasError: false,
+    }
+  }
+
   // Handle nested string value: { value: "..." }
   if (typeof obj.value === 'string') {
     return { content: obj.value, hasError: false }

cli/src/utils/sdk-event-handlers.ts

@@ -354,12 +354,24 @@ const updateSpawnAgentBlocks = (
 
       if (result?.value) {
         const { content, hasError } = extractSpawnAgentResultContent(result.value)
-        // Preserve streamed content (agents like commander stream their output)
+        
+        // Check if there's meaningful text content already streamed
+        const existingTextContent = block.blocks
+          .filter((b): b is { type: 'text'; content: string } => b.type === 'text')
+          .map(b => b.content)
+          .join('')
+          .trim()
+        
+        // Use extracted content from result if it's more substantial than existing streamed content.
+        // This ensures agents with lastMessage output mode (like researcher-web) show their final
+        // result inside the box, even if they had tool blocks or partial content during execution.
+        const shouldUseExtractedContent = content && (!existingTextContent || content.length > existingTextContent.length)
+        
         const hasStreamedContent = block.blocks.length > 0
         if (hasError || content || hasStreamedContent) {
           return {
             ...block,
-            blocks: hasStreamedContent ? block.blocks : [{ type: 'text', content } as ContentBlock],
+            blocks: shouldUseExtractedContent ? [{ type: 'text', content } as ContentBlock] : block.blocks,
             status: hasError ? ('failed' as const) : ('complete' as const),
           }
         }