Merge origin/main into image-support

- Combine image support features with main branch bash execution
- Add PendingBashMessage, PendingToolResult types to chat-store
- Add bash history handlers to chat keyboard
- Preserve all image support functionality (clipboard, thumbnails, etc.)
- Fix duplicate content parameter in SDK run.ts

Author: brandonkachen

.agents/__tests__/context-pruner.test.ts

@@ -3,6 +3,18 @@ import { describe, test, expect, beforeEach } from 'bun:test'
 import contextPruner from '../context-pruner'
 
 import type { Message, ToolMessage } from '../types/util-types'
+const createMessage = (
+  role: 'user' | 'assistant',
+  content: string,
+): Message => ({
+  role,
+  content: [
+    {
+      type: 'text',
+      text: content,
+    },
+  ],
+})
 
 describe('context-pruner handleSteps', () => {
   let mockAgentState: any
@@ -13,14 +25,6 @@ describe('context-pruner handleSteps', () => {
     }
   })
 
-  const createMessage = (
-    role: 'user' | 'assistant',
-    content: string,
-  ): Message => ({
-    role,
-    content,
-  })
-
   const createTerminalToolMessage = (
     command: string,
     output: string,
@@ -153,8 +157,7 @@ describe('context-pruner handleSteps', () => {
         m.role === 'tool' &&
         m.toolName === 'run_terminal_command' &&
         (m.content?.[0]?.value?.command === 'command-7' ||
-          m.content?.[0]?.value?.message ===
-            '[LARGE_TOOL_RESULT_OMITTED]'),
+          m.content?.[0]?.value?.message === '[LARGE_TOOL_RESULT_OMITTED]'),
     )
     expect(recentTerminalMessage).toBeDefined()
   })
@@ -191,9 +194,7 @@ describe('context-pruner handleSteps', () => {
     const smallResultMessage = resultMessages.find(
       (m: any) => m.role === 'tool' && m.toolName === 'code_search',
     )
-    expect(smallResultMessage?.content?.[0]?.value?.data).toBe(
-      'Small result',
-    )
+    expect(smallResultMessage?.content?.[0]?.value?.data).toBe('Small result')
   })
 
   test('performs message-level pruning when other passes are insufficient', () => {
@@ -299,14 +300,6 @@ describe('context-pruner edge cases', () => {
     }
   })
 
-  const createMessage = (
-    role: 'user' | 'assistant',
-    content: string,
-  ): Message => ({
-    role,
-    content,
-  })
-
   const createTerminalToolMessage = (
     command: string,
     output: string,
@@ -366,8 +359,7 @@ describe('context-pruner edge cases', () => {
 
     // Valid terminal command should be processed correctly
     const validCommand = resultMessages.find(
-      (m: any) =>
-        m.role === 'tool' && m.toolName === 'run_terminal_command',
+      (m: any) => m.role === 'tool' && m.toolName === 'run_terminal_command',
     )
     expect(validCommand).toBeDefined()
   })
@@ -481,8 +473,7 @@ describe('context-pruner edge cases', () => {
     const hasLargeToolResultReplacement = resultMessages.some(
       (m: any) =>
         m.role === 'tool' &&
-        m.content?.[0]?.value?.message ===
-          '[LARGE_TOOL_RESULT_OMITTED]',
+        m.content?.[0]?.value?.message === '[LARGE_TOOL_RESULT_OMITTED]',
     )
     expect(hasLargeToolResultReplacement).toBe(true)
   })

.agents/context-pruner.ts

@@ -145,7 +145,12 @@ const definition: AgentDefinition = {
     const shortenedMessageTokenFactor = 0.5
     const replacementMessage: Message = {
       role: 'user',
-      content: '<system>Previous message(s) omitted due to length</system>',
+      content: [
+        {
+          type: 'text',
+          text: '<system>Previous message(s) omitted due to length</system>',
+        },
+      ],
     }
 
     const keepLastTags: Record<string, number> = {}

.agents/researcher/task-researcher.ts

@@ -97,10 +97,8 @@ Important: the report should only include the analysis, key facts, and relevant
       const userMessages = messageHistory.filter(
         (message) =>
           message.role === 'user' &&
-          (typeof message.content === 'string'
-            ? message.content.includes('<user_message>')
-            : message.content[0].type === 'text' &&
-              message.content[0].text.includes('<user_message>')),
+          message.content[0].type === 'text' &&
+          message.content[0].text.includes('<user_message>'),
       )
       const lastUserMessage = userMessages[userMessages.length - 2]
       let userPrompt = prompt

.agents/types/util-types.ts

@@ -86,35 +86,39 @@ export type ToolResultOutput =
     }
 
 // ===== Message Types =====
-type AuxiliaryData = {
+export type AuxiliaryMessageData = {
   providerOptions?: ProviderMetadata
+  tags?: string[]
+
+  /** @deprecated Use tags instead. */
   timeToLive?: 'agentStep' | 'userPrompt'
+  /** @deprecated Use tags instead. */
   keepDuringTruncation?: boolean
+  /** @deprecated Use tags instead. */
   keepLastTags?: string[]
 }
 
 export type SystemMessage = {
   role: 'system'
-  content: string
-} & AuxiliaryData
+  content: TextPart[]
+} & AuxiliaryMessageData
 
 export type UserMessage = {
   role: 'user'
-  content: string | (TextPart | ImagePart | FilePart)[]
-} & AuxiliaryData
+  content: (TextPart | ImagePart | FilePart)[]
+} & AuxiliaryMessageData
 
 export type AssistantMessage = {
   role: 'assistant'
-  content: string | (TextPart | ReasoningPart | ToolCallPart)[]
-} & AuxiliaryData
+  content: (TextPart | ReasoningPart | ToolCallPart)[]
+} & AuxiliaryMessageData
 
 export type ToolMessage = {
   role: 'tool'
   toolCallId: string
   toolName: string
   content: ToolResultOutput[]
-  providerOptions?: ProviderMetadata
-} & AuxiliaryData
+} & AuxiliaryMessageData
 
 export type Message =
   | SystemMessage

cli/src/chat.tsx

@@ -943,11 +943,16 @@ export const Chat = ({
       setFocusedAgentId(null)
       setInputFocused(true)
       inputRef.current?.focus()
-    },
-    onClearQueue: clearQueue,
-    onExitAppWarning: () => handleCtrlC(),
-    onExitApp: () => handleCtrlC(),
-    onPasteImage: () => {
+    },      onClearQueue: clearQueue,
+      onExitAppWarning: () => handleCtrlC(),
+      onExitApp: () => handleCtrlC(),
+      onBashHistoryUp: () => {
+        // Bash history not implemented in this context
+      },
+      onBashHistoryDown: () => {
+        // Bash history not implemented in this context
+      },
+      onPasteImage: () => {
       // Check if clipboard has an image
       if (!hasClipboardImage()) {
         // No image in clipboard, let normal paste happen