feat: 完成第二版类型清理

src/services/AgentSummary/agentSummary.ts

@@ -130,7 +130,8 @@ export function startAgentSummarization(
           )
           continue
         }
-        const textBlock = msg.message.content.find(b => b.type === 'text')
+        const contentArr = Array.isArray(msg.message.content) ? msg.message.content : []
+        const textBlock = contentArr.find(b => b.type === 'text')
         if (textBlock?.type === 'text' && textBlock.text.trim()) {
           const summaryText = textBlock.text.trim()
           logForDebugging(

src/services/PromptSuggestion/promptSuggestion.ts

@@ -339,7 +339,8 @@ export async function generateSuggestion(
 
   for (const msg of result.messages) {
     if (msg.type !== 'assistant') continue
-    const textBlock = msg.message.content.find(b => b.type === 'text')
+    const contentArr = Array.isArray(msg.message.content) ? msg.message.content : []
+    const textBlock = contentArr.find(b => b.type === 'text')
     if (textBlock?.type === 'text') {
       const suggestion = textBlock.text.trim()
       if (suggestion) {

src/services/autoDream/autoDream.ts

@@ -10,6 +10,7 @@
 // State is closure-scoped inside initAutoDream() rather than module-level
 // (tests call initAutoDream() in beforeEach for a fresh closure).
 
+import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
 import type { REPLHookContext } from '../../utils/hooks/postSamplingHooks.js'
 import {
   createCacheSafeParams,
@@ -241,7 +242,7 @@ ${sessionIds.map(id => `- ${id}`).join('\n')}`
         isDreamTask(dreamState) &&
         dreamState.filesTouched.length > 0
       ) {
-        appendSystemMessage({
+        ;(appendSystemMessage as (msg: Message) => void)({
           ...createMemorySavedMessage(dreamState.filesTouched),
           verb: 'Improved',
         })
@@ -287,7 +288,8 @@ function makeDreamProgressWatcher(
     let text = ''
     let toolUseCount = 0
     const touchedPaths: string[] = []
-    for (const block of msg.message.content) {
+    const contentBlocks = msg.message.content as ContentBlockParam[]
+    for (const block of contentBlocks) {
       if (block.type === 'text') {
         text += block.text
       } else if (block.type === 'tool_use') {

src/services/compact/cachedMicrocompact.ts

@@ -1,12 +1,37 @@
 // Auto-generated stub — replace with real implementation
 export {};
-export const isCachedMicrocompactEnabled: any = (() => {}) as any;
-export const isModelSupportedForCacheEditing: any = (() => {}) as any;
-export const getCachedMCConfig: any = (() => {}) as any;
-export const createCachedMCState: any = (() => {}) as any;
-export const markToolsSentToAPI: any = (() => {}) as any;
-export const resetCachedMCState: any = (() => {}) as any;
-export const registerToolResult: any = (() => {}) as any;
-export const registerToolMessage: any = (() => {}) as any;
-export const getToolResultsToDelete: any = (() => {}) as any;
-export const createCacheEditsBlock: any = (() => {}) as any;
+
+export type CachedMCState = {
+  registeredTools: Set<string>
+  toolOrder: string[]
+  deletedRefs: Set<string>
+  pinnedEdits: PinnedCacheEdits[]
+  toolsSentToAPI: boolean
+}
+
+export type CacheEditsBlock = {
+  type: 'cache_edits'
+  edits: Array<{ type: string; tool_use_id: string }>
+}
+
+export type PinnedCacheEdits = {
+  userMessageIndex: number
+  block: CacheEditsBlock
+}
+
+export const isCachedMicrocompactEnabled: () => boolean = () => false;
+export const isModelSupportedForCacheEditing: (model: string) => boolean = () => false;
+export const getCachedMCConfig: () => { triggerThreshold: number; keepRecent: number } = () => ({ triggerThreshold: 0, keepRecent: 0 });
+export const createCachedMCState: () => CachedMCState = () => ({
+  registeredTools: new Set(),
+  toolOrder: [],
+  deletedRefs: new Set(),
+  pinnedEdits: [],
+  toolsSentToAPI: false,
+});
+export const markToolsSentToAPI: (state: CachedMCState) => void = () => {};
+export const resetCachedMCState: (state: CachedMCState) => void = () => {};
+export const registerToolResult: (state: CachedMCState, toolId: string) => void = () => {};
+export const registerToolMessage: (state: CachedMCState, groupIds: string[]) => void = () => {};
+export const getToolResultsToDelete: (state: CachedMCState) => string[] = () => [];
+export const createCacheEditsBlock: (state: CachedMCState, toolIds: string[]) => CacheEditsBlock | null = () => null;

src/services/compact/microCompact.ts

@@ -436,7 +436,7 @@ export function evaluateTimeBasedTrigger(
     return null
   }
   const gapMinutes =
-    (Date.now() - new Date(lastAssistant.timestamp).getTime()) / 60_000
+    (Date.now() - new Date(lastAssistant.timestamp as string | number).getTime()) / 60_000
   if (!Number.isFinite(gapMinutes) || gapMinutes < config.gapThresholdMinutes) {
     return null
   }

src/services/compact/sessionMemoryCompact.ts

@@ -135,7 +135,7 @@ async function initSessionMemoryCompactConfig(): Promise<void> {
 export function hasTextBlocks(message: Message): boolean {
   if (message.type === 'assistant') {
     const content = message.message.content
-    return content.some(block => block.type === 'text')
+    return Array.isArray(content) && content.some(block => block.type === 'text')
   }
   if (message.type === 'user') {
     const content = message.message.content

src/services/mcp/MCPConnectionManager.tsx

@@ -70,4 +70,3 @@ export function MCPConnectionManager(t0) {
   }
   return t2;
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJSZWFjdCIsImNyZWF0ZUNvbnRleHQiLCJSZWFjdE5vZGUiLCJ1c2VDb250ZXh0IiwidXNlTWVtbyIsIkNvbW1hbmQiLCJUb29sIiwiTUNQU2VydmVyQ29ubmVjdGlvbiIsIlNjb3BlZE1jcFNlcnZlckNvbmZpZyIsIlNlcnZlclJlc291cmNlIiwidXNlTWFuYWdlTUNQQ29ubmVjdGlvbnMiLCJNQ1BDb25uZWN0aW9uQ29udGV4dFZhbHVlIiwicmVjb25uZWN0TWNwU2VydmVyIiwic2VydmVyTmFtZSIsIlByb21pc2UiLCJjbGllbnQiLCJ0b29scyIsImNvbW1hbmRzIiwicmVzb3VyY2VzIiwidG9nZ2xlTWNwU2VydmVyIiwiTUNQQ29ubmVjdGlvbkNvbnRleHQiLCJ1c2VNY3BSZWNvbm5lY3QiLCJjb250ZXh0IiwiRXJyb3IiLCJ1c2VNY3BUb2dnbGVFbmFibGVkIiwiTUNQQ29ubmVjdGlvbk1hbmFnZXJQcm9wcyIsImNoaWxkcmVuIiwiZHluYW1pY01jcENvbmZpZyIsIlJlY29yZCIsImlzU3RyaWN0TWNwQ29uZmlnIiwiTUNQQ29ubmVjdGlvbk1hbmFnZXIiLCJ0MCIsIiQiLCJfYyIsInQxIiwidmFsdWUiLCJ0MiJdLCJzb3VyY2VzIjpbIk1DUENvbm5lY3Rpb25NYW5hZ2VyLnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgUmVhY3QsIHtcbiAgY3JlYXRlQ29udGV4dCxcbiAgdHlwZSBSZWFjdE5vZGUsXG4gIHVzZUNvbnRleHQsXG4gIHVzZU1lbW8sXG59IGZyb20gJ3JlYWN0J1xuaW1wb3J0IHR5cGUgeyBDb21tYW5kIH0gZnJvbSAnLi4vLi4vY29tbWFuZHMuanMnXG5pbXBvcnQgdHlwZSB7IFRvb2wgfSBmcm9tICcuLi8uLi9Ub29sLmpzJ1xuaW1wb3J0IHR5cGUge1xuICBNQ1BTZXJ2ZXJDb25uZWN0aW9uLFxuICBTY29wZWRNY3BTZXJ2ZXJDb25maWcsXG4gIFNlcnZlclJlc291cmNlLFxufSBmcm9tICcuL3R5cGVzLmpzJ1xuaW1wb3J0IHsgdXNlTWFuYWdlTUNQQ29ubmVjdGlvbnMgfSBmcm9tICcuL3VzZU1hbmFnZU1DUENvbm5lY3Rpb25zLmpzJ1xuXG5pbnRlcmZhY2UgTUNQQ29ubmVjdGlvbkNvbnRleHRWYWx1ZSB7XG4gIHJlY29ubmVjdE1jcFNlcnZlcjogKHNlcnZlck5hbWU6IHN0cmluZykgPT4gUHJvbWlzZTx7XG4gICAgY2xpZW50OiBNQ1BTZXJ2ZXJDb25uZWN0aW9uXG4gICAgdG9vbHM6IFRvb2xbXVxuICAgIGNvbW1hbmRzOiBDb21tYW5kW11cbiAgICByZXNvdXJjZXM/OiBTZXJ2ZXJSZXNvdXJjZVtdXG4gIH0+XG4gIHRvZ2dsZU1jcFNlcnZlcjogKHNlcnZlck5hbWU6IHN0cmluZykgPT4gUHJvbWlzZTx2b2lkPlxufVxuXG5jb25zdCBNQ1BDb25uZWN0aW9uQ29udGV4dCA9IGNyZWF0ZUNvbnRleHQ8TUNQQ29ubmVjdGlvbkNvbnRleHRWYWx1ZSB8IG51bGw+KFxuICBudWxsLFxuKVxuXG5leHBvcnQgZnVuY3Rpb24gdXNlTWNwUmVjb25uZWN0KCkge1xuICBjb25zdCBjb250ZXh0ID0gdXNlQ29udGV4dChNQ1BDb25uZWN0aW9uQ29udGV4dClcbiAgaWYgKCFjb250ZXh0KSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKCd1c2VNY3BSZWNvbm5lY3QgbXVzdCBiZSB1c2VkIHdpdGhpbiBNQ1BDb25uZWN0aW9uTWFuYWdlcicpXG4gIH1cbiAgcmV0dXJuIGNvbnRleHQucmVjb25uZWN0TWNwU2VydmVyXG59XG5cbmV4cG9ydCBmdW5jdGlvbiB1c2VNY3BUb2dnbGVFbmFibGVkKCkge1xuICBjb25zdCBjb250ZXh0ID0gdXNlQ29udGV4dChNQ1BDb25uZWN0aW9uQ29udGV4dClcbiAgaWYgKCFjb250ZXh0KSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKFxuICAgICAgJ3VzZU1jcFRvZ2dsZUVuYWJsZWQgbXVzdCBiZSB1c2VkIHdpdGhpbiBNQ1BDb25uZWN0aW9uTWFuYWdlcicsXG4gICAgKVxuICB9XG4gIHJldHVybiBjb250ZXh0LnRvZ2dsZU1jcFNlcnZlclxufVxuXG5pbnRlcmZhY2UgTUNQQ29ubmVjdGlvbk1hbmFnZXJQcm9wcyB7XG4gIGNoaWxkcmVuOiBSZWFjdE5vZGVcbiAgZHluYW1pY01jcENvbmZpZzogUmVjb3JkPHN0cmluZywgU2NvcGVkTWNwU2VydmVyQ29uZmlnPiB8IHVuZGVmaW5lZFxuICBpc1N0cmljdE1jcENvbmZpZzogYm9vbGVhblxufVxuXG4vLyBUT0RPIChvbGxpZSk6IFdlIG1heSBiZSBhYmxlIHRvIGdldCByaWQgb2YgdGhpcyBjb250ZXh0IGJ5IHB1dHRpbmcgdGhlc2UgZnVuY3Rpb24gb24gYXBwIHN0YXRlXG5leHBvcnQgZnVuY3Rpb24gTUNQQ29ubmVjdGlvbk1hbmFnZXIoe1xuICBjaGlsZHJlbixcbiAgZHluYW1pY01jcENvbmZpZyxcbiAgaXNTdHJpY3RNY3BDb25maWcsXG59OiBNQ1BDb25uZWN0aW9uTWFuYWdlclByb3BzKTogUmVhY3QuUmVhY3ROb2RlIHtcbiAgY29uc3QgeyByZWNvbm5lY3RNY3BTZXJ2ZXIsIHRvZ2dsZU1jcFNlcnZlciB9ID0gdXNlTWFuYWdlTUNQQ29ubmVjdGlvbnMoXG4gICAgZHluYW1pY01jcENvbmZpZyxcbiAgICBpc1N0cmljdE1jcENvbmZpZyxcbiAgKVxuICBjb25zdCB2YWx1ZSA9IHVzZU1lbW8oXG4gICAgKCkgPT4gKHsgcmVjb25uZWN0TWNwU2VydmVyLCB0b2dnbGVNY3BTZXJ2ZXIgfSksXG4gICAgW3JlY29ubmVjdE1jcFNlcnZlciwgdG9nZ2xlTWNwU2VydmVyXSxcbiAgKVxuXG4gIHJldHVybiAoXG4gICAgPE1DUENvbm5lY3Rpb25Db250ZXh0LlByb3ZpZGVyIHZhbHVlPXt2YWx1ZX0+XG4gICAgICB7Y2hpbGRyZW59XG4gICAgPC9NQ1BDb25uZWN0aW9uQ29udGV4dC5Qcm92aWRlcj5cbiAgKVxufVxuIl0sIm1hcHBpbmdzIjoiO0FBQUEsT0FBT0EsS0FBSyxJQUNWQyxhQUFhLEVBQ2IsS0FBS0MsU0FBUyxFQUNkQyxVQUFVLEVBQ1ZDLE9BQU8sUUFDRixPQUFPO0FBQ2QsY0FBY0MsT0FBTyxRQUFRLG1CQUFtQjtBQUNoRCxjQUFjQyxJQUFJLFFBQVEsZUFBZTtBQUN6QyxjQUNFQyxtQkFBbUIsRUFDbkJDLHFCQUFxQixFQUNyQkMsY0FBYyxRQUNULFlBQVk7QUFDbkIsU0FBU0MsdUJBQXVCLFFBQVEsOEJBQThCO0FBRXRFLFVBQVVDLHlCQUF5QixDQUFDO0VBQ2xDQyxrQkFBa0IsRUFBRSxDQUFDQyxVQUFVLEVBQUUsTUFBTSxFQUFFLEdBQUdDLE9BQU8sQ0FBQztJQUNsREMsTUFBTSxFQUFFUixtQkFBbUI7SUFDM0JTLEtBQUssRUFBRVYsSUFBSSxFQUFFO0lBQ2JXLFFBQVEsRUFBRVosT0FBTyxFQUFFO0lBQ25CYSxTQUFTLENBQUMsRUFBRVQsY0FBYyxFQUFFO0VBQzlCLENBQUMsQ0FBQztFQUNGVSxlQUFlLEVBQUUsQ0FBQ04sVUFBVSxFQUFFLE1BQU0sRUFBRSxHQUFHQyxPQUFPLENBQUMsSUFBSSxDQUFDO0FBQ3hEO0FBRUEsTUFBTU0sb0JBQW9CLEdBQUduQixhQUFhLENBQUNVLHlCQUF5QixHQUFHLElBQUksQ0FBQyxDQUMxRSxJQUNGLENBQUM7QUFFRCxPQUFPLFNBQUFVLGdCQUFBO0VBQ0wsTUFBQUMsT0FBQSxHQUFnQm5CLFVBQVUsQ0FBQ2lCLG9CQUFvQixDQUFDO0VBQ2hELElBQUksQ0FBQ0UsT0FBTztJQUNWLE1BQU0sSUFBSUMsS0FBSyxDQUFDLDBEQUEwRCxDQUFDO0VBQUE7RUFDNUUsT0FDTUQsT0FBTyxDQUFBVixrQkFBbUI7QUFBQTtBQUduQyxPQUFPLFNBQUFZLG9CQUFBO0VBQ0wsTUFBQUYsT0FBQSxHQUFnQm5CLFVBQVUsQ0FBQ2lCLG9CQUFvQixDQUFDO0VBQ2hELElBQUksQ0FBQ0UsT0FBTztJQUNWLE1BQU0sSUFBSUMsS0FBSyxDQUNiLDhEQUNGLENBQUM7RUFBQTtFQUNGLE9BQ01ELE9BQU8sQ0FBQUgsZUFBZ0I7QUFBQTtBQUdoQyxVQUFVTSx5QkFBeUIsQ0FBQztFQUNsQ0MsUUFBUSxFQUFFeEIsU0FBUztFQUNuQnlCLGdCQUFnQixFQUFFQyxNQUFNLENBQUMsTUFBTSxFQUFFcEIscUJBQXFCLENBQUMsR0FBRyxTQUFTO0VBQ25FcUIsaUJBQWlCLEVBQUUsT0FBTztBQUM
Line truncated

src/services/mcp/client.ts

@@ -139,6 +139,7 @@ import type {
   ConnectedMCPServer,
   MCPServerConnection,
   McpSdkServerConfig,
+  McpStdioServerConfig,
   ScopedMcpServerConfig,
   ServerResource,
 } from './types.js'
@@ -903,7 +904,7 @@ export const connectToServer = memoize(
         )
         logMCPDebug(name, `claude.ai proxy transport created successfully`)
       } else if (
-        (serverRef.type === 'stdio' || !serverRef.type) &&
+        ((serverRef as ScopedMcpServerConfig).type === 'stdio' || !(serverRef as ScopedMcpServerConfig).type) &&
         isClaudeInChromeMCPServer(name)
       ) {
         // Run the Chrome MCP server in-process to avoid spawning a ~325 MB subprocess
@@ -916,7 +917,7 @@ export const connectToServer = memoize(
         const { createLinkedTransportPair } = await import(
           './InProcessTransport.js'
         )
-        const context = createChromeContext(serverRef.env)
+        const context = createChromeContext((serverRef as McpStdioServerConfig).env)
         inProcessServer = createClaudeForChromeMcpServer(context)
         const [clientTransport, serverTransport] = createLinkedTransportPair()
         await inProcessServer.connect(serverTransport)
@@ -924,7 +925,7 @@ export const connectToServer = memoize(
         logMCPDebug(name, `In-process Chrome MCP server started`)
       } else if (
         feature('CHICAGO_MCP') &&
-        (serverRef.type === 'stdio' || !serverRef.type) &&
+        ((serverRef as ScopedMcpServerConfig).type === 'stdio' || !(serverRef as ScopedMcpServerConfig).type) &&
         isComputerUseMCPServer!(name)
       ) {
         // Run the Computer Use MCP server in-process — same rationale as
@@ -941,23 +942,24 @@ export const connectToServer = memoize(
         await inProcessServer.connect(serverTransport)
         transport = clientTransport
         logMCPDebug(name, `In-process Computer Use MCP server started`)
-      } else if (serverRef.type === 'stdio' || !serverRef.type) {
+      } else if ((serverRef as ScopedMcpServerConfig).type === 'stdio' || !(serverRef as ScopedMcpServerConfig).type) {
+        const stdioRef = serverRef as McpStdioServerConfig
         const finalCommand =
-          process.env.CLAUDE_CODE_SHELL_PREFIX || serverRef.command
+          process.env.CLAUDE_CODE_SHELL_PREFIX || stdioRef.command
         const finalArgs = process.env.CLAUDE_CODE_SHELL_PREFIX
-          ? [[serverRef.command, ...serverRef.args].join(' ')]
-          : serverRef.args
+          ? [[stdioRef.command, ...stdioRef.args].join(' ')]
+          : stdioRef.args
         transport = new StdioClientTransport({
           command: finalCommand,
           args: finalArgs,
           env: {
             ...subprocessEnv(),
-            ...serverRef.env,
+            ...stdioRef.env,
           } as Record<string, string>,
           stderr: 'pipe', // prevents error output from the MCP server from printing to the UI
         })
       } else {
-        throw new Error(`Unsupported server type: ${serverRef.type}`)
+        throw new Error(`Unsupported server type: ${(serverRef as ScopedMcpServerConfig).type}`)
       }
 
       // Set up stderr logging for stdio transport before connecting in case there are any stderr
@@ -3245,10 +3247,11 @@ async function callMCPTool({
 }
 
 function extractToolUseId(message: AssistantMessage): string | undefined {
-  if (message.message.content[0]?.type !== 'tool_use') {
+  const firstBlock = (message.message.content as ContentBlockParam[] | undefined)?.[0]
+  if (!firstBlock || typeof firstBlock === 'string' || firstBlock.type !== 'tool_use') {
     return undefined
   }
-  return message.message.content[0].id
+  return firstBlock.id
 }
 
 /**

src/services/mcpServerApproval.tsx

@@ -38,4 +38,3 @@ export async function handleMcpjsonServerApprovals(root: Root): Promise<void> {
     }
   });
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJSZWFjdCIsIk1DUFNlcnZlckFwcHJvdmFsRGlhbG9nIiwiTUNQU2VydmVyTXVsdGlzZWxlY3REaWFsb2ciLCJSb290IiwiS2V5YmluZGluZ1NldHVwIiwiQXBwU3RhdGVQcm92aWRlciIsImdldE1jcENvbmZpZ3NCeVNjb3BlIiwiZ2V0UHJvamVjdE1jcFNlcnZlclN0YXR1cyIsImhhbmRsZU1jcGpzb25TZXJ2ZXJBcHByb3ZhbHMiLCJyb290IiwiUHJvbWlzZSIsInNlcnZlcnMiLCJwcm9qZWN0U2VydmVycyIsInBlbmRpbmdTZXJ2ZXJzIiwiT2JqZWN0Iiwia2V5cyIsImZpbHRlciIsInNlcnZlck5hbWUiLCJsZW5ndGgiLCJyZXNvbHZlIiwiZG9uZSIsInVuZGVmaW5lZCIsInJlbmRlciJdLCJzb3VyY2VzIjpbIm1jcFNlcnZlckFwcHJvdmFsLnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnXG5pbXBvcnQgeyBNQ1BTZXJ2ZXJBcHByb3ZhbERpYWxvZyB9IGZyb20gJy4uL2NvbXBvbmVudHMvTUNQU2VydmVyQXBwcm92YWxEaWFsb2cuanMnXG5pbXBvcnQgeyBNQ1BTZXJ2ZXJNdWx0aXNlbGVjdERpYWxvZyB9IGZyb20gJy4uL2NvbXBvbmVudHMvTUNQU2VydmVyTXVsdGlzZWxlY3REaWFsb2cuanMnXG5pbXBvcnQgdHlwZSB7IFJvb3QgfSBmcm9tICcuLi9pbmsuanMnXG5pbXBvcnQgeyBLZXliaW5kaW5nU2V0dXAgfSBmcm9tICcuLi9rZXliaW5kaW5ncy9LZXliaW5kaW5nUHJvdmlkZXJTZXR1cC5qcydcbmltcG9ydCB7IEFwcFN0YXRlUHJvdmlkZXIgfSBmcm9tICcuLi9zdGF0ZS9BcHBTdGF0ZS5qcydcbmltcG9ydCB7IGdldE1jcENvbmZpZ3NCeVNjb3BlIH0gZnJvbSAnLi9tY3AvY29uZmlnLmpzJ1xuaW1wb3J0IHsgZ2V0UHJvamVjdE1jcFNlcnZlclN0YXR1cyB9IGZyb20gJy4vbWNwL3V0aWxzLmpzJ1xuXG4vKipcbiAqIFNob3cgTUNQIHNlcnZlciBhcHByb3ZhbCBkaWFsb2dzIGZvciBwZW5kaW5nIHByb2plY3Qgc2VydmVycy5cbiAqIFVzZXMgdGhlIHByb3ZpZGVkIEluayByb290IHRvIHJlbmRlciAocmV1c2luZyB0aGUgZXhpc3RpbmcgaW5zdGFuY2VcbiAqIGZyb20gbWFpbi50c3ggaW5zdGVhZCBvZiBjcmVhdGluZyBhIHNlcGFyYXRlIG9uZSkuXG4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBoYW5kbGVNY3Bqc29uU2VydmVyQXBwcm92YWxzKHJvb3Q6IFJvb3QpOiBQcm9taXNlPHZvaWQ+IHtcbiAgY29uc3QgeyBzZXJ2ZXJzOiBwcm9qZWN0U2VydmVycyB9ID0gZ2V0TWNwQ29uZmlnc0J5U2NvcGUoJ3Byb2plY3QnKVxuICBjb25zdCBwZW5kaW5nU2VydmVycyA9IE9iamVjdC5rZXlzKHByb2plY3RTZXJ2ZXJzKS5maWx0ZXIoXG4gICAgc2VydmVyTmFtZSA9PiBnZXRQcm9qZWN0TWNwU2VydmVyU3RhdHVzKHNlcnZlck5hbWUpID09PSAncGVuZGluZycsXG4gIClcblxuICBpZiAocGVuZGluZ1NlcnZlcnMubGVuZ3RoID09PSAwKSB7XG4gICAgcmV0dXJuXG4gIH1cblxuICBhd2FpdCBuZXcgUHJvbWlzZTx2b2lkPihyZXNvbHZlID0+IHtcbiAgICBjb25zdCBkb25lID0gKCk6IHZvaWQgPT4gdm9pZCByZXNvbHZlKClcbiAgICBpZiAocGVuZGluZ1NlcnZlcnMubGVuZ3RoID09PSAxICYmIHBlbmRpbmdTZXJ2ZXJzWzBdICE9PSB1bmRlZmluZWQpIHtcbiAgICAgIGNvbnN0IHNlcnZlck5hbWUgPSBwZW5kaW5nU2VydmVyc1swXVxuICAgICAgcm9vdC5yZW5kZXIoXG4gICAgICAgIDxBcHBTdGF0ZVByb3ZpZGVyPlxuICAgICAgICAgIDxLZXliaW5kaW5nU2V0dXA+XG4gICAgICAgICAgICA8TUNQU2VydmVyQXBwcm92YWxEaWFsb2cgc2VydmVyTmFtZT17c2VydmVyTmFtZX0gb25Eb25lPXtkb25lfSAvPlxuICAgICAgICAgIDwvS2V5YmluZGluZ1NldHVwPlxuICAgICAgICA8L0FwcFN0YXRlUHJvdmlkZXI+LFxuICAgICAgKVxuICAgIH0gZWxzZSB7XG4gICAgICByb290LnJlbmRlcihcbiAgICAgICAgPEFwcFN0YXRlUHJvdmlkZXI+XG4gICAgICAgICAgPEtleWJpbmRpbmdTZXR1cD5cbiAgICAgICAgICAgIDxNQ1BTZXJ2ZXJNdWx0aXNlbGVjdERpYWxvZ1xuICAgICAgICAgICAgICBzZXJ2ZXJOYW1lcz17cGVuZGluZ1NlcnZlcnN9XG4gICAgICAgICAgICAgIG9uRG9uZT17ZG9uZX1cbiAgICAgICAgICAgIC8+XG4gICAgICAgICAgPC9LZXliaW5kaW5nU2V0dXA+XG4gICAgICAgIDwvQXBwU3RhdGVQcm92aWRlcj4sXG4gICAgICApXG4gICAgfVxuICB9KVxufVxuIl0sIm1hcHBpbmdzIjoiQUFBQSxPQUFPQSxLQUFLLE1BQU0sT0FBTztBQUN6QixTQUFTQyx1QkFBdUIsUUFBUSwwQ0FBMEM7QUFDbEYsU0FBU0MsMEJBQTBCLFFBQVEsNkNBQTZDO0FBQ3hGLGNBQWNDLElBQUksUUFBUSxXQUFXO0FBQ3JDLFNBQVNDLGVBQWUsUUFBUSwyQ0FBMkM7QUFDM0UsU0FBU0MsZ0JBQWdCLFFBQVEsc0JBQXNCO0FBQ3ZELFNBQVNDLG9CQUFvQixRQUFRLGlCQUFpQjtBQUN0RCxTQUFTQyx5QkFBeUIsUUFBUSxnQkFBZ0I7O0FBRTFEO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSxPQUFPLGVBQWVDLDRCQUE0QkEsQ0FBQ0MsSUFBSSxFQUFFTixJQUFJLENBQUMsRUFBRU8sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0VBQzVFLE1BQU07SUFBRUMsT0FBTyxFQUFFQztFQUFlLENBQUMsR0FBR04sb0JBQW9CLENBQUMsU0FBUyxDQUFDO0VBQ25FLE1BQU1PLGNBQWMsR0FBR0MsTUFBTSxDQUFDQyxJQUFJLENBQUNILGNBQWMsQ0FBQyxDQUFDSSxNQUFNLENBQ3ZEQyxVQUFVLElBQUlWLHlCQUF5QixDQUFDVSxVQUFVLENBQUMsS0FBSyxTQUMxRCxDQUFDO0VBRUQsSUFBSUosY0FBYyxDQUFDSyxNQUFNLEtBQUssQ0FBQyxFQUFFO0lBQy9CO0VBQ0Y7RUFFQSxNQUFNLElBQUlSLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQ1MsT0FBTyxJQUFJO0lBQ2pDLE1BQU1DLElBQUksR0FBR0EsQ0FBQSxDQUFFLEVBQUUsSUFBSSxJQUFJLEtBQUtELE9BQU8sQ0FBQyxDQUFDO0lBQ3ZDLElBQUlOLGNBQWMsQ0FBQ0ssTUFBTSxLQUFLLENBQUMsSUFBSUwsY0FBYyxDQUFDLENBQUMsQ0FBQyxLQUFLUSxTQUFTLEVBQUU7TUFDbEUsTUFBTUosVUFBVSxHQUFHSixjQUFjLENBQUMsQ0FBQyxDQUFDO01BQ3BDSixJQUFJLENBQUNhLE1BQU0sQ0FDVCxDQUFDLGdCQUFnQjtBQUN6QixVQUFVLENBQUMsZUFBZTtBQUMxQixZQUFZLENBQUMsdUJBQXVCLENBQUMsVUFBVSxDQUFDLENBQUNMLFVBQVUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDRyxJQUFJLENBQUM7QUFDMUUsVUFBVSxFQUFFLGVBQWU7QUFDM0IsUUFBUSxFQUFFLGdCQUFnQixDQUNwQixDQUFDO0lBQ0gsQ0FBQyxNQUFNO01BQ0xYLElBQUksQ0FBQ2EsTUFBTSxDQUNULENBQUMsZ0JBQWdCO0FBQ3pCLFVBQVUsQ0FBQyxlQUFlO0FBQzFCLFlBQVksQ0FBQywwQkFBMEIsQ0FDekIsV0FBVyxDQUFDLENBQUNULGNBQWMsQ0FBQyxDQUM1QixNQUFNLENBQUMsQ0FBQ08sSUFBSSxDQUFDO0FBRTNCLFVBQVUsRUFBRSxlQUFlO0FBQzNCLFFBQVEsRUFBRSxnQkFBZ0IsQ0FDcEIsQ0FBQztJQUNIO0VBQ0YsQ0FBQyxDQUFDO0FBQ0oiLCJpZ25vcmVMaXN0IjpbXX0=

src/services/plugins/pluginOperations.ts

@@ -379,38 +379,39 @@ export async function installPluginOp(
   })
 
   if (!result.ok) {
-    switch (result.reason) {
+    const failResult = result as Extract<typeof result, { ok: false }>
+    switch (failResult.reason) {
       case 'local-source-no-location':
         return {
           success: false,
-          message: `Cannot install local plugin "${result.pluginName}" without marketplace install location`,
+          message: `Cannot install local plugin "${failResult.pluginName}" without marketplace install location`,
         }
       case 'settings-write-failed':
         return {
           success: false,
-          message: `Failed to update settings: ${result.message}`,
+          message: `Failed to update settings: ${failResult.message}`,
         }
       case 'resolution-failed':
         return {
           success: false,
-          message: formatResolutionError(result.resolution),
+          message: formatResolutionError(failResult.resolution),
         }
       case 'blocked-by-policy':
         return {
           success: false,
-          message: `Plugin "${result.pluginName}" is blocked by your organization's policy and cannot be installed`,
+          message: `Plugin "${failResult.pluginName}" is blocked by your organization's policy and cannot be installed`,
         }
       case 'dependency-blocked-by-policy':
         return {
           success: false,
-          message: `Plugin "${result.pluginName}" depends on "${result.blockedDependency}", which is blocked by your organization's policy`,
+          message: `Plugin "${failResult.pluginName}" depends on "${failResult.blockedDependency}", which is blocked by your organization's policy`,
         }
     }
   }
 
   return {
     success: true,
-    message: `Successfully installed plugin: ${pluginId} (scope: ${scope})${result.depNote}`,
+    message: `Successfully installed plugin: ${pluginId} (scope: ${scope})${(result as Extract<typeof result, { ok: true }>).depNote}`,
     pluginId,
     pluginName: entry.name,
     scope,

src/services/remoteManagedSettings/securityCheck.tsx

@@ -71,4 +71,3 @@ export function handleSecurityCheckResult(result: SecurityCheckResult): boolean
   }
   return true;
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJSZWFjdCIsImdldElzSW50ZXJhY3RpdmUiLCJNYW5hZ2VkU2V0dGluZ3NTZWN1cml0eURpYWxvZyIsImV4dHJhY3REYW5nZXJvdXNTZXR0aW5ncyIsImhhc0Rhbmdlcm91c1NldHRpbmdzIiwiaGFzRGFuZ2Vyb3VzU2V0dGluZ3NDaGFuZ2VkIiwicmVuZGVyIiwiS2V5YmluZGluZ1NldHVwIiwiQXBwU3RhdGVQcm92aWRlciIsImdyYWNlZnVsU2h1dGRvd25TeW5jIiwiZ2V0QmFzZVJlbmRlck9wdGlvbnMiLCJTZXR0aW5nc0pzb24iLCJsb2dFdmVudCIsIlNlY3VyaXR5Q2hlY2tSZXN1bHQiLCJjaGVja01hbmFnZWRTZXR0aW5nc1NlY3VyaXR5IiwiY2FjaGVkU2V0dGluZ3MiLCJuZXdTZXR0aW5ncyIsIlByb21pc2UiLCJyZXNvbHZlIiwidW5tb3VudCIsImhhbmRsZVNlY3VyaXR5Q2hlY2tSZXN1bHQiLCJyZXN1bHQiXSwic291cmNlcyI6WyJzZWN1cml0eUNoZWNrLnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnXG5pbXBvcnQgeyBnZXRJc0ludGVyYWN0aXZlIH0gZnJvbSAnLi4vLi4vYm9vdHN0cmFwL3N0YXRlLmpzJ1xuaW1wb3J0IHsgTWFuYWdlZFNldHRpbmdzU2VjdXJpdHlEaWFsb2cgfSBmcm9tICcuLi8uLi9jb21wb25lbnRzL01hbmFnZWRTZXR0aW5nc1NlY3VyaXR5RGlhbG9nL01hbmFnZWRTZXR0aW5nc1NlY3VyaXR5RGlhbG9nLmpzJ1xuaW1wb3J0IHtcbiAgZXh0cmFjdERhbmdlcm91c1NldHRpbmdzLFxuICBoYXNEYW5nZXJvdXNTZXR0aW5ncyxcbiAgaGFzRGFuZ2Vyb3VzU2V0dGluZ3NDaGFuZ2VkLFxufSBmcm9tICcuLi8uLi9jb21wb25lbnRzL01hbmFnZWRTZXR0aW5nc1NlY3VyaXR5RGlhbG9nL3V0aWxzLmpzJ1xuaW1wb3J0IHsgcmVuZGVyIH0gZnJvbSAnLi4vLi4vaW5rLmpzJ1xuaW1wb3J0IHsgS2V5YmluZGluZ1NldHVwIH0gZnJvbSAnLi4vLi4va2V5YmluZGluZ3MvS2V5YmluZGluZ1Byb3ZpZGVyU2V0dXAuanMnXG5pbXBvcnQgeyBBcHBTdGF0ZVByb3ZpZGVyIH0gZnJvbSAnLi4vLi4vc3RhdGUvQXBwU3RhdGUuanMnXG5pbXBvcnQgeyBncmFjZWZ1bFNodXRkb3duU3luYyB9IGZyb20gJy4uLy4uL3V0aWxzL2dyYWNlZnVsU2h1dGRvd24uanMnXG5pbXBvcnQgeyBnZXRCYXNlUmVuZGVyT3B0aW9ucyB9IGZyb20gJy4uLy4uL3V0aWxzL3JlbmRlck9wdGlvbnMuanMnXG5pbXBvcnQgdHlwZSB7IFNldHRpbmdzSnNvbiB9IGZyb20gJy4uLy4uL3V0aWxzL3NldHRpbmdzL3R5cGVzLmpzJ1xuaW1wb3J0IHsgbG9nRXZlbnQgfSBmcm9tICcuLi9hbmFseXRpY3MvaW5kZXguanMnXG5cbmV4cG9ydCB0eXBlIFNlY3VyaXR5Q2hlY2tSZXN1bHQgPSAnYXBwcm92ZWQnIHwgJ3JlamVjdGVkJyB8ICdub19jaGVja19uZWVkZWQnXG5cbi8qKlxuICogQ2hlY2sgaWYgbmV3IHJlbW90ZSBtYW5hZ2VkIHNldHRpbmdzIGNvbnRhaW4gZGFuZ2Vyb3VzIHNldHRpbmdzIHRoYXQgcmVxdWlyZSB1c2VyIGFwcHJvdmFsLlxuICogU2hvd3MgYSBibG9ja2luZyBkaWFsb2cgaWYgZGFuZ2Vyb3VzIHNldHRpbmdzIGhhdmUgY2hhbmdlZCBvciBiZWVuIGFkZGVkLlxuICpcbiAqIEBwYXJhbSBjYWNoZWRTZXR0aW5ncyBUaGUgY3VycmVudCBjYWNoZWQgc2V0dGluZ3MgKG1heSBiZSBudWxsIGZvciBmaXJzdCBydW4pXG4gKiBAcGFyYW0gbmV3U2V0dGluZ3MgVGhlIG5ldyBzZXR0aW5ncyBmZXRjaGVkIGZyb20gdGhlIEFQSVxuICogQHJldHVybnMgJ2FwcHJvdmVkJyBpZiB1c2VyIGFjY2VwdHMsICdyZWplY3RlZCcgaWYgdXNlciBkZWNsaW5lcywgJ25vX2NoZWNrX25lZWRlZCcgaWYgbm8gZGFuZ2Vyb3VzIGNoYW5nZXNcbiAqL1xuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGNoZWNrTWFuYWdlZFNldHRpbmdzU2VjdXJpdHkoXG4gIGNhY2hlZFNldHRpbmdzOiBTZXR0aW5nc0pzb24gfCBudWxsLFxuICBuZXdTZXR0aW5nczogU2V0dGluZ3NKc29uIHwgbnVsbCxcbik6IFByb21pc2U8U2VjdXJpdHlDaGVja1Jlc3VsdD4ge1xuICAvLyBJZiBuZXcgc2V0dGluZ3MgZG9uJ3QgaGF2ZSBkYW5nZXJvdXMgc2V0dGluZ3MsIG5vIGNoZWNrIG5lZWRlZFxuICBpZiAoXG4gICAgIW5ld1NldHRpbmdzIHx8XG4gICAgIWhhc0Rhbmdlcm91c1NldHRpbmdzKGV4dHJhY3REYW5nZXJvdXNTZXR0aW5ncyhuZXdTZXR0aW5ncykpXG4gICkge1xuICAgIHJldHVybiAnbm9fY2hlY2tfbmVlZGVkJ1xuICB9XG5cbiAgLy8gSWYgZGFuZ2Vyb3VzIHNldHRpbmdzIGhhdmVuJ3QgY2hhbmdlZCwgbm8gY2hlY2sgbmVlZGVkXG4gIGlmICghaGFzRGFuZ2Vyb3VzU2V0dGluZ3NDaGFuZ2VkKGNhY2hlZFNldHRpbmdzLCBuZXdTZXR0aW5ncykpIHtcbiAgICByZXR1cm4gJ25vX2NoZWNrX25lZWRlZCdcbiAgfVxuXG4gIC8vIFNraXAgZGlhbG9nIGluIG5vbi1pbnRlcmFjdGl2ZSBtb2RlIChjb25zaXN0ZW50IHdpdGggdHJ1c3QgZGlhbG9nIGJlaGF2aW9yKVxuICBpZiAoIWdldElzSW50ZXJhY3RpdmUoKSkge1xuICAgIHJldHVybiAnbm9fY2hlY2tfbmVlZGVkJ1xuICB9XG5cbiAgLy8gTG9nIHRoYXQgZGlhbG9nIGlzIGJlaW5nIHNob3duXG4gIGxvZ0V2ZW50KCd0ZW5ndV9tYW5hZ2VkX3NldHRpbmdzX3NlY3VyaXR5X2RpYWxvZ19zaG93bicsIHt9KVxuXG4gIC8vIFNob3cgYmxvY2tpbmcgZGlhbG9nXG4gIHJldHVybiBuZXcgUHJvbWlzZTxTZWN1cml0eUNoZWNrUmVzdWx0PihyZXNvbHZlID0+IHtcbiAgICB2b2lkIChhc3luYyAoKSA9PiB7XG4gICAgICBjb25zdCB7IHVubW91bnQgfSA9IGF3YWl0IHJlbmRlcihcbiAgICAgICAgPEFwcFN0YXRlUHJvdmlkZXI+XG4gICAgICAgICAgPEtleWJpbmRpbmdTZXR1cD5cbiAgICAgICAgICAgIDxNYW5hZ2VkU2V0dGluZ3NTZWN1cml0eURpYWxvZ1xuICAgICAgICAgICAgICBzZXR0aW5ncz17bmV3U2V0dGluZ3N9XG4gICAgICAgICAgICAgIG9uQWNjZXB0PXsoKSA9PiB7XG4gICAgICAgICAgICAgICAgbG9nRXZlbnQoJ3Rlbmd1X21hbmFnZWRfc2V0dGluZ3Nfc2VjdXJpdHlfZGlhbG9nX2FjY2VwdGVkJywge30pXG4gICAgICAgICAgICAgICAgdW5tb3VudCgpXG4gICAgICAgICAgICAgICAgdm9pZCByZXNvbHZlKCdhcHByb3ZlZCcpXG4gICAgICAgICAgICAgIH19XG4gICAgICAgICAgICAgIG9uUmVqZWN0PXsoKSA9PiB7XG4gICAgICAgICAgICAgICAgbG9nRXZlbnQoJ3Rlbmd1X21hbmFnZWRfc2V0dGluZ3Nfc2VjdXJpdHlfZGlhbG9nX3JlamVjdGVkJywge30pXG4gICAgICAgICAgICAgICAgdW5tb3VudCgpXG4gICAgICAgICAgICAgICAgdm9pZCByZXNvbHZlKCdyZWplY3RlZCcpXG4gICAgICAgICAgICAgIH19XG4gICAgICAgICAgICAvPlxuICAgICAgICAgIDwvS2V5YmluZGluZ1NldHVwPlxuICAgICAgICA8L0FwcFN0YXRlUHJvdmlkZXI+LFxuICAgICAgICBnZXRCYXNlUmVuZGVyT3B0aW9ucyhmYWxzZSksXG4gICAgICApXG4gICAgfSkoKVxuICB9KVxufVxuXG4vKipcbiAqIEhhbmRsZSB0aGUgc2VjdXJpdHkgY2hlY2sgcmVzdWx0IGJ5IGV4aXRpbmcgaWYgcmVqZWN0ZWRcbiAqIFJldHVybnMgdHJ1ZSBpZiB3ZSBzaG91bGQgY29udGludWUsIGZhbHNlIGlmIHdlIHNob3VsZCBzdG9wXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBoYW5kbGVTZWN1cml0eUNoZWNrUmVzdWx0KFxuICByZXN1bHQ6IFNlY3VyaXR5Q2hlY2tSZXN1bHQsXG4pOiBib29sZWFuIHtcbiAgaWYgKHJlc3VsdCA9PT0gJ3JlamVjdGVkJyk
Line truncated

src/services/skillSearch/remoteSkillLoader.ts

@@ -1,2 +1,17 @@
 // Auto-generated stub — replace with real implementation
-export {};
+export function loadRemoteSkill(_slug: string, _url: string): Promise<{
+  cacheHit: boolean;
+  latencyMs: number;
+  skillPath: string;
+  content: string;
+  fileCount?: number;
+  totalBytes?: number;
+  fetchMethod?: string;
+}> {
+  return Promise.resolve({
+    cacheHit: false,
+    latencyMs: 0,
+    skillPath: '',
+    content: '',
+  });
+}

src/services/skillSearch/remoteSkillState.ts

@@ -1,2 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export {};
+export function stripCanonicalPrefix(_name: string): string | null { return null; }
+export function getDiscoveredRemoteSkill(_slug: string): { url: string } | undefined { return undefined; }

src/services/skillSearch/telemetry.ts

@@ -1,2 +1,11 @@
 // Auto-generated stub — replace with real implementation
-export {};
+export function logRemoteSkillLoaded(_data: {
+  slug: string;
+  cacheHit: boolean;
+  latencyMs: number;
+  urlScheme: string;
+  error?: string;
+  fileCount?: number;
+  totalBytes?: number;
+  fetchMethod?: string;
+}): void {}

src/services/toolUseSummary/toolUseSummaryGenerator.ts

@@ -80,7 +80,7 @@ export async function generateToolUseSummary({
       },
     })
 
-    const summary = response.message.content
+    const summary = (Array.isArray(response.message.content) ? response.message.content : [])
       .filter(block => block.type === 'text')
       .map(block => (block.type === 'text' ? block.text : ''))
       .join('')

src/services/tools/toolExecution.ts

@@ -253,7 +253,7 @@ function getNextImagePasteId(messages: Message[]): number {
   let maxId = 0
   for (const message of messages) {
     if (message.type === 'user' && message.imagePasteIds) {
-      for (const id of message.imagePasteIds) {
+      for (const id of message.imagePasteIds as number[]) {
         if (id > maxId) maxId = id
       }
     }
@@ -354,8 +354,8 @@ export async function* runToolUse(
       tool = fallbackTool
     }
   }
-  const messageId = assistantMessage.message.id
-  const requestId = assistantMessage.requestId
+  const messageId = assistantMessage.message.id as string
+  const requestId = assistantMessage.requestId as string | undefined
   const mcpServerType = getMcpServerType(
     toolName,
     toolUseContext.options.mcpClients,
@@ -548,7 +548,7 @@ function streamedCheckPermissionsAndCallTool(
       })
       stream.enqueue({
         message: createProgressMessage({
-          toolUseID: progress.toolUseID,
+          toolUseID: progress.toolUseID as string,
           parentToolUseID: toolUseID,
           data: progress.data,
         }),
@@ -822,8 +822,8 @@ async function checkPermissionsAndCallTool(
             att.durationMs !== undefined
           ) {
             preToolHookInfos.push({
-              command: att.command,
-              durationMs: att.durationMs,
+              command: att.command as string,
+              durationMs: att.durationMs as number,
             })
           }
         }
@@ -1506,8 +1506,8 @@ async function checkPermissionsAndCallTool(
             att.durationMs !== undefined
           ) {
             postToolHookInfos.push({
-              command: att.command,
-              durationMs: att.durationMs,
+              command: att.command as string,
+              durationMs: att.durationMs as number,
             })
           }
         }
@@ -1522,8 +1522,8 @@ async function checkPermissionsAndCallTool(
             att.durationMs !== undefined
           ) {
             postToolHookInfos.push({
-              command: att.command,
-              durationMs: att.durationMs,
+              command: att.command as string,
+              durationMs: att.durationMs as number,
             })
           }
         }

src/services/tools/toolOrchestration.ts

@@ -130,7 +130,7 @@ async function* runToolsSerially(
     for await (const update of runToolUse(
       toolUse,
       assistantMessages.find(_ =>
-        _.message.content.some(
+        Array.isArray(_.message.content) && _.message.content.some(
           _ => _.type === 'tool_use' && _.id === toolUse.id,
         ),
       )!,
@@ -163,7 +163,7 @@ async function* runToolsConcurrently(
       yield* runToolUse(
         toolUse,
         assistantMessages.find(_ =>
-          _.message.content.some(
+          Array.isArray(_.message.content) && _.message.content.some(
             _ => _.type === 'tool_use' && _.id === toolUse.id,
           ),
         )!,