bingocode 1.1.200 → 1.1.201

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bingocode",
-  "version": "1.1.200",
+  "version": "1.1.201",
   "type": "module",
   "bin": {
     "claude": "bin/claude-win.cjs",

package/src/server/config/providers.yaml

@@ -1,229 +1,229 @@
-version: 2
-
-# Provider Preset Configuration
-# fields array declares fields to be filled when adding
-# key: 'name' | 'apiKey' | 'baseUrl' mapped directly to top-level fields, others saved in extra.<key>
-# secret: true uses mask display in frontend
-#
-# modelsUrl: model list path relative to baseUrl, empty string means dynamic pulling not supported
-# modelsAuthStyle: bearer → Authorization: Bearer <apiKey>
-#                  x-api-key → x-api-key: <apiKey> + anthropic-version header
-# modelsDataPath: record field name for models array in JSON response (almost always 'data')
-
-presets:
-  - id: official
-    name: Claude Official
-    baseUrl: ''
-    apiFormat: anthropic
-    needsApiKey: false
-    websiteUrl: https://www.anthropic.com/claude-code
-    modelsUrl: /v1/models
-    modelsAuthStyle: x-api-key
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. Claude Official'
-
-  - id: openai
-    name: OpenAI
-    baseUrl: https://api.openai.com/v1
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://platform.openai.com
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My OpenAI'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'sk-...'
-      - key: baseUrl
-        label: Base URL (Optional)
-        required: false
-        secret: false
-        default: https://api.openai.com/v1
-        placeholder: 'https://api.openai.com/v1'
-
-  - id: gemini
-    name: Google Gemini
-    baseUrl: https://generativelanguage.googleapis.com/v1beta/openai
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://aistudio.google.com
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My Gemini'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'Gemini API Key'
-
-  - id: mistral
-    name: Mistral AI
-    baseUrl: https://api.mistral.ai/v1
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://console.mistral.ai
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My Mistral'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'Mistral API Key'
-
-  - id: deepseek
-    name: DeepSeek
-    baseUrl: https://api.deepseek.com/anthropic
-    apiFormat: anthropic
-    needsApiKey: true
-    websiteUrl: https://platform.deepseek.com
-    # Models list follows OpenAI endpoint (no /v1/models under /anthropic)
-    modelsUrl: https://api.deepseek.com/v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My DeepSeek'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'sk-...'
-
-  - id: nvidia
-    name: NVIDIA API
-    baseUrl: https://integrate.api.nvidia.com/v1
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://build.nvidia.com/explore/discover
-    modelsUrl: /models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My NVIDIA'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'nvapi-...'
-
-  - id: zhipuglm
-    name: Zhipu GLM
-    baseUrl: https://open.bigmodel.cn/api/paas/v4
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://open.bigmodel.cn
-    modelsUrl: /v4/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My GLM'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'Zhipu API Key (glm-5.1)'
-
-  - id: kimi
-    name: Kimi
-    baseUrl: https://api.moonshot.ai/v1
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://platform.moonshot.cn
-    modelsUrl: /models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My Kimi'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'Moonshot API Key (kimi-k2.6)'
-
-  - id: minimax
-    name: MiniMax
-    baseUrl: https://api.minimax.io/v1
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://platform.minimaxi.com
-    modelsUrl: /models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My MiniMax'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'MiniMax API Key (MiniMax-M2.7)'
-
-  - id: custom
-    name: Custom
-    baseUrl: ''
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: ''
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My Custom Provider'
-      - key: baseUrl
-        label: Base URL
-        required: true
-        secret: false
-        placeholder: 'https://your-api-endpoint.com/v1'
-      - key: apiKey
-        label: API Key
-        required: false
-        secret: true
-        placeholder: '(Optional) API Key'
+version: 2
+
+# Provider Preset Configuration
+# fields array declares fields to be filled when adding
+# key: 'name' | 'apiKey' | 'baseUrl' mapped directly to top-level fields, others saved in extra.<key>
+# secret: true uses mask display in frontend
+#
+# modelsUrl: model list path relative to baseUrl, empty string means dynamic pulling not supported
+# modelsAuthStyle: bearer → Authorization: Bearer <apiKey>
+#                  x-api-key → x-api-key: <apiKey> + anthropic-version header
+# modelsDataPath: record field name for models array in JSON response (almost always 'data')
+
+presets:
+  - id: official
+    name: Claude Official
+    baseUrl: ''
+    apiFormat: anthropic
+    needsApiKey: false
+    websiteUrl: https://www.anthropic.com/claude-code
+    modelsUrl: /v1/models
+    modelsAuthStyle: x-api-key
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. Claude Official'
+
+  - id: openai
+    name: OpenAI
+    baseUrl: https://api.openai.com/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://platform.openai.com
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My OpenAI'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'sk-...'
+      - key: baseUrl
+        label: Base URL (Optional)
+        required: false
+        secret: false
+        default: https://api.openai.com/v1
+        placeholder: 'https://api.openai.com/v1'
+
+  - id: gemini
+    name: Google Gemini
+    baseUrl: https://generativelanguage.googleapis.com/v1beta/openai
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://aistudio.google.com
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My Gemini'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'Gemini API Key'
+
+  - id: mistral
+    name: Mistral AI
+    baseUrl: https://api.mistral.ai/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://console.mistral.ai
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My Mistral'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'Mistral API Key'
+
+  - id: deepseek
+    name: DeepSeek
+    baseUrl: https://api.deepseek.com/anthropic
+    apiFormat: anthropic
+    needsApiKey: true
+    websiteUrl: https://platform.deepseek.com
+    # Models list follows OpenAI endpoint (no /v1/models under /anthropic)
+    modelsUrl: https://api.deepseek.com/v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My DeepSeek'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'sk-...'
+
+  - id: nvidia
+    name: NVIDIA API
+    baseUrl: https://integrate.api.nvidia.com/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://build.nvidia.com/explore/discover
+    modelsUrl: /models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My NVIDIA'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'nvapi-...'
+
+  - id: zhipuglm
+    name: Zhipu GLM
+    baseUrl: https://open.bigmodel.cn/api/paas/v4
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://open.bigmodel.cn
+    modelsUrl: /v4/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My GLM'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'Zhipu API Key (glm-5.1)'
+
+  - id: kimi
+    name: Kimi
+    baseUrl: https://api.moonshot.ai/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://platform.moonshot.cn
+    modelsUrl: /models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My Kimi'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'Moonshot API Key (kimi-k2.6)'
+
+  - id: minimax
+    name: MiniMax
+    baseUrl: https://api.minimax.io/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://platform.minimaxi.com
+    modelsUrl: /models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My MiniMax'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'MiniMax API Key (MiniMax-M2.7)'
+
+  - id: custom
+    name: Custom
+    baseUrl: ''
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: ''
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My Custom Provider'
+      - key: baseUrl
+        label: Base URL
+        required: true
+        secret: false
+        placeholder: 'https://your-api-endpoint.com/v1'
+      - key: apiKey
+        label: API Key
+        required: false
+        secret: true
+        placeholder: '(Optional) API Key'

package/src/server/services/providerService.ts

@@ -9,6 +9,7 @@
 import * as fs from 'fs/promises'
 import * as path from 'path'
 import * as os from 'os'
+import { parse as parseJsonc } from 'jsonc-parser/lib/esm/main.js'
 import { getDirectFetchOptions } from '../../utils/proxy.ts'
 import { ApiError } from '../middleware/errorHandler.js'
 import { anthropicToOpenaiChat } from '../proxy/transform/anthropicToOpenaiChat.js'
@@ -268,6 +269,18 @@ export class ProviderService {
   // --- Settings sync ---
 
   private async syncToSettings(provider: SavedProvider): Promise<void> {
+    // Prefer slot-based model IDs when slots are configured, so that the
+    // slot table (set via "Configure Model Slots" in the TUI) is the single
+    // source of truth.  Falling back to provider.models only when no slots
+    // exist keeps things working for users who haven't configured slots yet.
+    const slots = await this.readSlots()
+    const hasSlots = Object.keys(slots).length > 0
+    if (hasSlots) {
+      await this.syncSettingsForSlots(slots)
+      return
+    }
+
+    // Legacy fallback: no slots configured — use provider.models directly
     const settings = await this.readSettings()
     const existingEnv = (settings.env as Record<string, string>) || {}
 
@@ -620,7 +633,9 @@ export class ProviderService {
       let originalContent: string | null = null
       try {
         originalContent = await fs.readFile(settingsPath, "utf-8")
-        settings = JSON.parse(originalContent)
+        // VS Code settings.json uses JSONC (JSON with comments) —
+        // parseJsonc handles comments/trailing commas, unlike JSON.parse
+        settings = parseJsonc(originalContent) as Record<string, unknown>
       } catch {
         // File does not exist yet — start fresh
       }
@@ -650,7 +665,9 @@ export class ProviderService {
 
       try {
         await fs.mkdir(path.dirname(settingsPath), { recursive: true })
-        await fs.writeFile(settingsPath, JSON.stringify(settings, null, 4) + '\n')
+        const tmpPath = `${settingsPath}.tmp.${Date.now()}`
+        await fs.writeFile(tmpPath, JSON.stringify(settings, null, 4) + '\n')
+        await fs.rename(tmpPath, settingsPath)
         writtenPaths.push(settingsPath)
       } catch (err) {
         failedPaths.push(settingsPath)
@@ -661,7 +678,9 @@ export class ProviderService {
         // Fix #11: Attempt restore from backup on write failure
         if (originalContent !== null) {
           try {
-            await fs.writeFile(settingsPath, originalContent, "utf-8")
+            const tmpPath2 = `${settingsPath}.tmp.${Date.now()}`
+            await fs.writeFile(tmpPath2, originalContent, "utf-8")
+            await fs.rename(tmpPath2, settingsPath)
             console.error(`[ProviderService] Restored ${settingsPath} from in-memory copy after write failure`)
           } catch {
             // In-memory restore failed, try .bak file
@@ -694,7 +713,9 @@ export class ProviderService {
         const original = originalContents.get(p)
         try {
           if (original !== null) {
-            await fs.writeFile(p, original, "utf-8")
+            const tmpPath = `${p}.tmp.${Date.now()}`
+            await fs.writeFile(tmpPath, original, "utf-8")
+            await fs.rename(tmpPath, p)
           } else {
             await fs.unlink(p).catch(() => {})
           }
@@ -754,14 +775,16 @@ export class ProviderService {
     for (const settingsPath of linkedPaths) {
       try {
         const raw = await fs.readFile(settingsPath, "utf-8")
-        const settings = JSON.parse(raw)
+        const settings = parseJsonc(raw) as Record<string, unknown>
         settings.claudeCode = preLinkClaudeCode[settingsPath] ?? {
           preferredLocation: "panel",
           environmentVariables: [
             { name: "ANTHROPIC_BASE_URL", value: "https://api.anthropic.com" },
           ],
         }
-        await fs.writeFile(settingsPath, JSON.stringify(settings, null, 4) + '\n')
+        const tmpPath = `${settingsPath}.tmp.${Date.now()}`
+        await fs.writeFile(tmpPath, JSON.stringify(settings, null, 4) + '\n')
+        await fs.rename(tmpPath, settingsPath)
       } catch {
         // File may have been moved or deleted since linking — harmless
       }

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