bingocode 1.1.200 → 1.1.202-beta.1

package/src/tools/AgentTool/UI.tsx

@@ -5,7 +5,7 @@ import { ConfigurableShortcutHint } from 'src/components/ConfigurableShortcutHin
 import { CtrlOToExpand, SubAgentProvider } from 'src/components/CtrlOToExpand.js';
 import { Byline } from 'src/components/design-system/Byline.js';
 import { KeyboardShortcutHint } from 'src/components/design-system/KeyboardShortcutHint.js';
-import type { z } from 'zod/v4';
+import { z } from 'zod/v4';
 import { AgentProgressLine } from '../../components/AgentProgressLine.js';
 import { FallbackToolUseErrorMessage } from '../../components/FallbackToolUseErrorMessage.js';
 import { FallbackToolUseRejectedMessage } from '../../components/FallbackToolUseRejectedMessage.js';
@@ -15,14 +15,14 @@ import { MessageResponse } from '../../components/MessageResponse.js';
 import { ToolUseLoader } from '../../components/ToolUseLoader.js';
 import { Box, Text } from '../../ink.js';
 import { getDumpPromptsPath } from '../../services/api/dumpPrompts.js';
-import { findToolByName, type Tools } from '../../Tool.js';
+import { buildTool, findToolByName, toolMatchesName, type Tool, type Tools } from '../../Tool.js';
 import type { Message, ProgressMessage } from '../../types/message.js';
 import type { AgentToolProgress } from '../../types/tools.js';
 import { count } from '../../utils/array.js';
 import { getSearchOrReadFromContent, getSearchReadSummaryText } from '../../utils/collapseReadSearch.js';
 import { getDisplayPath } from '../../utils/file.js';
 import { formatDuration, formatNumber } from '../../utils/format.js';
-import { buildSubagentLookups, createAssistantMessage, EMPTY_LOOKUPS } from '../../utils/messages.js';
+import { buildSubagentLookups, createAssistantMessage, EMPTY_LOOKUPS, type MessageLookups } from '../../utils/messages.js';
 import type { ModelAlias } from '../../utils/model/aliases.js';
 import { getMainLoopModel, parseUserSpecifiedModel, renderModelName } from '../../utils/model/model.js';
 import type { Theme, ThemeName } from '../../utils/theme.js';
@@ -32,6 +32,58 @@ import { getAgentColor } from './agentColorManager.js';
 import { GENERAL_PURPOSE_AGENT } from './built-in/generalPurposeAgent.js';
 const MAX_PROGRESS_MESSAGES_TO_SHOW = 3;
 
+/**
+ * Create a minimal fallback Tool object for a sub-agent tool name not present
+ * in the coordinator's tool set. Used in brain mode where the coordinator only
+ * has [Agent, AskUserQuestion] but sub-agents use Read/Grep/Bash/Edit/etc.
+ * Without fallbacks, findToolByName returns null and renders blank lines.
+ */
+function createFallbackTool(name: string): Tool {
+  return buildTool({
+    name,
+    inputSchema: z.object({}).passthrough(),
+    description: async () => `Sub-agent tool: ${name}`,
+    call: async () => ({ data: {} as unknown }) as any,
+    maxResultSizeChars: 100_000,
+    prompt: async () => '',
+    mapToolResultToToolResultBlockParam: (_content: unknown, toolUseID: string) => ({
+      tool_use_id: toolUseID,
+      content: [{ type: 'text' as const, text: '' }],
+      type: 'tool_result' as const,
+    }),
+    renderToolUseMessage: (input: Record<string, unknown>) => {
+      const keys = Object.keys(input);
+      if (keys.length === 0) return '';
+      return keys.map(k => {
+        const v = input[k];
+        let s = typeof v === 'string' ? v : JSON.stringify(v);
+        if (s.length > 80) s = s.slice(0, 80) + '\u2026';
+        return `${k}: ${s}`;
+      }).join(', ');
+    },
+    renderToolResultMessage: () => null,
+  })
+}
+
+/**
+ * Given the result of buildSubagentLookups, create fallback Tool entries
+ * for any tool name not already in `tools`. Returns the original `tools`
+ * array if no new names are found. Avoids re-scanning progress data.
+ */
+function augmentToolsFromLookups(
+  tools: Tools,
+  lookups: MessageLookups,
+): Tools {
+  const toolNames = new Set<string>()
+  for (const block of lookups.toolUseByToolUseID.values()) {
+    toolNames.add(block.name)
+  }
+  if (toolNames.size === 0) return tools
+  const missing = [...toolNames].filter(n => !tools.some(t => toolMatchesName(t, n)))
+  if (missing.length === 0) return tools
+  return [...tools, ...missing.map(createFallbackTool)]
+}
+
 /**
  * Guard: checks if progress data has a `message` field (agent_progress or
  * skill_progress).  Other progress types (e.g. bash_progress forwarded from
@@ -262,12 +314,12 @@ function VerboseAgentTranscript(t0) {
     lookups: agentLookups,
     inProgressToolUseIDs
   } = t1;
-  let t2;
+  const augmentedTools = augmentToolsFromLookups(tools, agentLookups);  let t2;
   if ($[2] !== agentLookups || $[3] !== inProgressToolUseIDs || $[4] !== progressMessages || $[5] !== tools || $[6] !== verbose) {
     const filteredMessages = progressMessages.filter(_temp4);
     let t3;
     if ($[8] !== agentLookups || $[9] !== inProgressToolUseIDs || $[10] !== tools || $[11] !== verbose) {
-      t3 = progressMessage => <MessageResponse key={progressMessage.uuid} height={1}><MessageComponent message={progressMessage.data.message} lookups={agentLookups} addMargin={false} tools={tools} commands={[]} verbose={verbose} inProgressToolUseIDs={inProgressToolUseIDs} progressMessagesForMessage={[]} shouldAnimate={false} shouldShowDot={false} isTranscriptMode={false} isStatic={true} /></MessageResponse>;
+      t3 = progressMessage => <MessageResponse key={progressMessage.uuid} height={1}><MessageComponent message={progressMessage.data.message} lookups={agentLookups} addMargin={false} tools={augmentedTools} commands={[]} verbose={verbose} inProgressToolUseIDs={inProgressToolUseIDs} progressMessagesForMessage={[]} shouldAnimate={false} shouldShowDot={false} isTranscriptMode={false} isStatic={true} /></MessageResponse>;
       $[8] = agentLookups;
       $[9] = inProgressToolUseIDs;
       $[10] = tools;
@@ -384,6 +436,12 @@ export function renderToolResultMessage(data: Output, progressMessagesForMessage
       speed: null
     }
   });
+  const agentProgressData = progressMessagesForMessage
+    .filter((pm): pm is ProgressMessage<AgentToolProgress> => hasProgressMessage(pm.data))
+    .map(pm => pm.data)
+  const { lookups: resultLookups } = buildSubagentLookups(agentProgressData)
+  const augmentedTools = augmentToolsFromLookups(tools, resultLookups)
+
   return <Box flexDirection="column">
       {"external" === 'ant' && <MessageResponse>
           <Text color="warning">
@@ -394,13 +452,13 @@ export function renderToolResultMessage(data: Output, progressMessagesForMessage
           <AgentPromptDisplay prompt={prompt} theme={theme} />
         </MessageResponse>}
       {isTranscriptMode ? <SubAgentProvider>
-          <VerboseAgentTranscript progressMessages={progressMessagesForMessage} tools={tools} verbose={verbose} />
+          <VerboseAgentTranscript progressMessages={progressMessagesForMessage} tools={augmentedTools} verbose={verbose} />
         </SubAgentProvider> : null}
       {isTranscriptMode && content && content.length > 0 && <MessageResponse>
           <AgentResponseDisplay content={content} theme={theme} />
         </MessageResponse>}
       <MessageResponse height={1}>
-        <MessageComponent message={finalAssistantMessage} lookups={EMPTY_LOOKUPS} addMargin={false} tools={tools} commands={[]} verbose={verbose} inProgressToolUseIDs={new Set()} progressMessagesForMessage={[]} shouldAnimate={false} shouldShowDot={false} isTranscriptMode={false} isStatic={true} />
+        <MessageComponent message={finalAssistantMessage} lookups={EMPTY_LOOKUPS} addMargin={false} tools={augmentedTools} commands={[]} verbose={verbose} inProgressToolUseIDs={new Set()} progressMessagesForMessage={[]} shouldAnimate={false} shouldShowDot={false} isTranscriptMode={false} isStatic={true} />
       </MessageResponse>
       {!isTranscriptMode && <Text dimColor>
           {'  '}
@@ -540,6 +598,13 @@ export function renderToolUseProgressMessage(progressMessages: ProgressMessage<P
     lookups: subagentLookups,
     inProgressToolUseIDs: collapsedInProgressIDs
   } = buildSubagentLookups(progressMessages.filter((pm): pm is ProgressMessage<AgentToolProgress> => hasProgressMessage(pm.data)).map(pm => pm.data));
+
+  // Augment tools with fallback entries for sub-agent tools not in the
+  // coordinator's tool set. In brain mode the coordinator only has
+  // [Agent, AskUserQuestion], but sub-agents call Read/Grep/Bash/Edit/etc.
+  // Without fallbacks, findToolByName returns null and renders blank lines.
+  const augmentedTools = augmentToolsFromLookups(tools, subagentLookups);
+
   return <MessageResponse>
       <Box flexDirection="column">
         <SubAgentProvider>
@@ -558,7 +623,7 @@ export function renderToolUseProgressMessage(progressMessages: ProgressMessage<P
           // content (tool not found, renderToolUseMessage returns null)
           // doesn't leave a blank line. Tool call headers are single-line
           // anyway so truncation isn't needed.
-          return <MessageComponent key={processed.message.uuid} message={processed.message.data.message} lookups={subagentLookups} addMargin={false} tools={tools} commands={[]} verbose={verbose} inProgressToolUseIDs={collapsedInProgressIDs} progressMessagesForMessage={[]} shouldAnimate={false} shouldShowDot={false} style="condensed" isTranscriptMode={false} isStatic={true} />;
+          return <MessageComponent key={processed.message.uuid} message={processed.message.data.message} lookups={subagentLookups} addMargin={false} tools={augmentedTools} commands={[]} verbose={verbose} inProgressToolUseIDs={collapsedInProgressIDs} progressMessagesForMessage={[]} shouldAnimate={false} shouldShowDot={false} style="condensed" isTranscriptMode={false} isStatic={true} />;
         })}
         </SubAgentProvider>
         {hiddenToolUseCount > 0 && <Text dimColor>

package/src/utils/context.ts

@@ -6,7 +6,7 @@ import { getCanonicalName } from './model/model.js'
 import { getModelCapability } from './model/modelCapabilities.js'
 
 // Model context window size (200k tokens for all models right now)
-export const MODEL_CONTEXT_WINDOW_DEFAULT = 200_000
+export const MODEL_CONTEXT_WINDOW_DEFAULT = 1_000_000
 
 // Maximum output tokens for compact operations
 export const COMPACT_MAX_OUTPUT_TOKENS = 20_000