@proxysoul/soulforge 1.7.2 → 1.7.5

package/dist/index.js

@@ -57838,7 +57838,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@proxysoul/soulforge",
-    version: "1.7.2",
+    version: "1.7.5",
     description: "Graph-powered code intelligence \u2014 multi-agent coding with codebase-aware AI",
     repository: {
       type: "git",
@@ -59984,7 +59984,7 @@ function supportsAnthropicOptions(modelId) {
 }
 function buildContextEdits(config2, contextWindow, thinkingEnabled) {
   const edits = [];
-  if (config2.clearThinking && thinkingEnabled) {
+  if (config2?.clearThinking !== false && thinkingEnabled) {
     edits.push({
       type: "clear_thinking_20251015",
       keep: {
@@ -59993,7 +59993,7 @@ function buildContextEdits(config2, contextWindow, thinkingEnabled) {
       }
     });
   }
-  if (config2.clearToolUses) {
+  if (config2?.clearToolUses !== false) {
     edits.push({
       type: "clear_tool_uses_20250919",
       trigger: {
@@ -60005,19 +60005,22 @@ function buildContextEdits(config2, contextWindow, thinkingEnabled) {
         value: 6
       },
       clearToolInputs: true,
-      clear_at_least: {
+      clearAtLeast: {
         type: "input_tokens",
         value: 5000
       }
     });
   }
-  if (config2.compact && contextWindow >= 200000) {
+  if (config2?.compact && contextWindow >= 200000) {
+    const trigger = Math.max(150000, Math.floor(contextWindow * 0.5));
     edits.push({
       type: "compact_20260112",
       trigger: {
         type: "input_tokens",
-        value: Math.floor(contextWindow * 0.75)
-      }
+        value: trigger
+      },
+      instructions: ["Write a concise summary of the conversation so far.", "Focus on: files modified, key decisions made, current task progress, and next steps.", "Preserve exact file paths, function names, and error messages.", "Do NOT list what you plan to do \u2014 only what has already been done and what remains.", "Do NOT dump internal state or repeat tool outputs.", "Keep the summary under 2000 tokens.", "Wrap in <summary></summary> tags."].join(`
+`)
     });
   }
   return edits.length > 0 ? edits : null;
@@ -60048,13 +60051,19 @@ function buildAnthropicOptions(modelId, caps, config2) {
   if (caps.effort && config2.performance?.effort && config2.performance.effort !== "off") {
     opts.effort = config2.performance.effort;
   }
+  if (caps.speed && config2.performance?.speed && config2.performance.speed !== "off") {
+    opts.speed = config2.performance.speed;
+  }
+  if (config2.performance?.toolStreaming === false) {
+    opts.toolStreaming = false;
+  }
   if (config2.performance?.disableParallelToolUse) {
     opts.disableParallelToolUse = true;
   }
   if (config2.performance?.sendReasoning === false) {
     opts.sendReasoning = false;
   }
-  if (caps.contextManagement && config2.contextManagement) {
+  if (caps.contextManagement) {
     const contextWindow = getModelContextWindow(modelId);
     const edits = buildContextEdits(config2.contextManagement, contextWindow, thinkingEnabled);
     if (edits) {
@@ -331649,12 +331658,21 @@ function truncate(text2, siteLinks) {
 ${siteLinks.map((l) => `- ${l}`).join(`
 `)}` : "";
   const budget = MAX_CONTENT_LENGTH - linksSection.length;
-  const body2 = text2.length > budget ? `${text2.slice(0, budget)}
-
-[...]` : text2;
+  if (text2.length <= budget)
+    return text2 + linksSection;
+  const tailBudget = Math.min(Math.floor(budget * 0.25), 20000);
+  const headBudget = budget - tailBudget;
+  const head = text2.slice(0, headBudget);
+  const tail = text2.slice(-tailBudget);
+  const omitted = text2.length - headBudget - tailBudget;
+  const body2 = `${head}
+
+[... ${String(Math.round(omitted / 1024))}KB omitted \u2014 ${String(Math.round(text2.length / 1024))}KB total. Showing first ${String(Math.round(headBudget / 1024))}KB + last ${String(Math.round(tailBudget / 1024))}KB. For specific sections, try a sub-page URL from the links below.]
+
+${tail}`;
   return body2 + linksSection;
 }
-var import_readability, MAX_CONTENT_LENGTH = 16000, pageCache, CACHE_TTL2, MAX_CACHE_SIZE = 100, lastSweep = 0, lastJinaWarning = null, fetchPageTool;
+var import_readability, MAX_CONTENT_LENGTH = 120000, pageCache, CACHE_TTL2, MAX_CACHE_SIZE = 100, lastSweep = 0, lastJinaWarning = null, fetchPageTool;
 var init_fetch_page = __esm(() => {
   init_esm10();
   init_secrets();
@@ -342323,6 +342341,82 @@ ${crossTabWarning}` : `Shell: ${desc}
     }),
     ...opts?.codeExecution ? {
       code_execution: createAnthropic().tools.codeExecution_20260120()
+    } : {},
+    ...opts?.computerUse ? {
+      computer: createAnthropic().tools.computer_20251124({
+        displayWidthPx: 1920,
+        displayHeightPx: 1080,
+        execute: async ({
+          action,
+          coordinate,
+          text: text2
+        }) => {
+          return `Computer use action: ${action}${coordinate ? ` at (${coordinate.join(",")})` : ""}${text2 ? ` text: ${text2}` : ""}`;
+        }
+      })
+    } : {},
+    ...opts?.anthropicTextEditor ? {
+      str_replace_based_edit_tool: createAnthropic().tools.textEditor_20250728({
+        async execute({
+          command,
+          path,
+          old_str,
+          new_str,
+          insert_text,
+          file_text,
+          view_range
+        }) {
+          const fs2 = await import("fs");
+          const absPath = path.startsWith("/") ? path : resolve30(effectiveCwd, path);
+          switch (command) {
+            case "view": {
+              if (!fs2.existsSync(absPath))
+                return `File not found: ${path}`;
+              const content = fs2.readFileSync(absPath, "utf-8");
+              const lines = content.split(`
+`);
+              if (view_range && view_range.length >= 2) {
+                const start2 = view_range[0] ?? 1;
+                const end = view_range[1] ?? lines.length;
+                return lines.slice(start2 - 1, end).map((l, i2) => `${start2 + i2}	${l}`).join(`
+`);
+              }
+              return lines.map((l, i2) => `${i2 + 1}	${l}`).join(`
+`);
+            }
+            case "create": {
+              fs2.mkdirSync(resolve30(absPath, ".."), {
+                recursive: true
+              });
+              fs2.writeFileSync(absPath, file_text ?? "", "utf-8");
+              return `Created ${path}`;
+            }
+            case "str_replace": {
+              if (!fs2.existsSync(absPath))
+                return `File not found: ${path}`;
+              const src = fs2.readFileSync(absPath, "utf-8");
+              if (!old_str || !src.includes(old_str))
+                return `old_str not found in ${path}`;
+              fs2.writeFileSync(absPath, src.replace(old_str, new_str ?? ""), "utf-8");
+              return `Applied replacement in ${path}`;
+            }
+            case "insert": {
+              if (!fs2.existsSync(absPath))
+                return `File not found: ${path}`;
+              const orig = fs2.readFileSync(absPath, "utf-8");
+              const origLines = orig.split(`
+`);
+              const insertLine = view_range?.[0] ?? origLines.length;
+              origLines.splice(insertLine, 0, insert_text ?? "");
+              fs2.writeFileSync(absPath, origLines.join(`
+`), "utf-8");
+              return `Inserted text at line ${insertLine} in ${path}`;
+            }
+            default:
+              return `Unknown command: ${command}`;
+          }
+        }
+      })
     } : {}
   };
 }
@@ -342874,9 +342968,6 @@ function setApiExportEnabled(v) {
 function isApiExportEnabled() {
   return apiExportEnabled;
 }
-function estimateTokens2(text2) {
-  return Math.ceil(text2.length / 4);
-}
 function detectRepeatedCalls(steps, window3 = REPEAT_CALL_WINDOW, threshold = REPEAT_CALL_THRESHOLD) {
   const counts = new Map;
   const start2 = Math.max(0, steps.length - window3);
@@ -342984,6 +343075,11 @@ function buildSummary(toolName, text2, ctx) {
     const entryMatch = text2.match(/(\d+) entries/);
     return `${tag} ${entryMatch ? entryMatch[1] : String(lineCount2)} entries`;
   }
+  if (toolName === "fetch_page" || toolName === "web_search") {
+    const truncated = text2.includes("page truncated");
+    const url2 = typeof args2?.url === "string" ? ` ${args2.url.slice(0, 80)}` : "";
+    return `${tag} ${String(lineCount2)} lines${url2}${truncated ? " (truncated \u2014 cached, try a sub-page URL)" : ""}`;
+  }
   if (toolName === "soul_analyze" || toolName === "soul_impact") {
     const action = typeof args2?.action === "string" ? `${args2.action}: ` : "";
     const firstLine = text2.split(`
@@ -343124,68 +343220,6 @@ function compactOldToolResults(messages, symbolLookup, pathMap) {
   }
   return result;
 }
-function pruneByTokenBudget(messages) {
-  const targets = [];
-  let totalTokens = 0;
-  for (let mi = messages.length - 1;mi >= 0; mi--) {
-    const msg = messages[mi];
-    if (!msg || msg.role !== "tool" || !Array.isArray(msg.content))
-      continue;
-    for (let pi = msg.content.length - 1;pi >= 0; pi--) {
-      const part = msg.content[pi];
-      if (!part || part.type !== "tool-result")
-        continue;
-      if (EDIT_TOOLS.has(part.toolName))
-        continue;
-      const text2 = extractText(part.output);
-      const tokens = estimateTokens2(text2);
-      if (tokens <= 50)
-        continue;
-      totalTokens += tokens;
-      targets.push({
-        msgIdx: mi,
-        partIdx: pi,
-        tokens
-      });
-    }
-  }
-  const excess = totalTokens - PRUNE_PROTECT_TOKENS;
-  if (excess < PRUNE_MINIMUM_TOKENS)
-    return messages;
-  let freed = 0;
-  const pruneSet = new Set;
-  for (let i2 = targets.length - 1;i2 >= 0 && freed < excess; i2--) {
-    const t = targets[i2];
-    if (!t)
-      continue;
-    pruneSet.add(`${String(t.msgIdx)}:${String(t.partIdx)}`);
-    freed += t.tokens;
-  }
-  if (pruneSet.size === 0)
-    return messages;
-  return messages.map((msg, mi) => {
-    if (msg.role !== "tool" || !Array.isArray(msg.content))
-      return msg;
-    let changed = false;
-    const newContent = msg.content.map((part, pi) => {
-      if (pruneSet.has(`${String(mi)}:${String(pi)}`)) {
-        changed = true;
-        return {
-          ...part,
-          output: {
-            type: "text",
-            value: PRUNED_PLACEHOLDER
-          }
-        };
-      }
-      return part;
-    });
-    return changed ? {
-      ...msg,
-      content: newContent
-    } : msg;
-  });
-}
 function buildPrepareStep({
   bus,
   agentId,
@@ -343204,6 +343238,7 @@ function buildPrepareStep({
   const isExplore = role === "explore" || role === "investigate";
   const stepNudgeAt = isExplore ? STEP_NUDGE_EXPLORE : STEP_NUDGE_CODE;
   const maxSteps = isExplore ? EXPLORE_MAX_STEPS : CODE_MAX_STEPS;
+  const previousInjects = [];
   const prepareStep = ({
     stepNumber,
     steps,
@@ -343250,10 +343285,9 @@ function buildPrepareStep({
     }
     if (!disablePruning && stepNumber >= 2) {
       const src = result.messages ?? messages;
-      const pruned = pruneByTokenBudget(src);
-      if (pruned !== src) {
-        const compacted = compactOldToolResults(pruned, symbolLookup);
-        result.messages = compacted !== pruned ? compacted : pruned;
+      const compacted = compactOldToolResults(src, symbolLookup);
+      if (compacted !== src) {
+        result.messages = compacted;
       }
     }
     const lastStep = steps.length > 0 ? steps[steps.length - 1] : undefined;
@@ -343339,22 +343373,17 @@ function buildPrepareStep({
       });
     }
     const contextSize = lastStep?.usage.inputTokens ?? 0;
+    const hints = [];
     if (bus && agentId) {
       const unseen = bus.drainUnseenFindings(agentId);
       if (unseen) {
-        const existing = result.system ?? "";
-        result.system = `${existing}
-
---- Peer findings (new) ---
-${unseen}`.trim();
+        hints.push(`--- Peer findings (new) ---
+${unseen}`);
       }
     }
     const taskBlock = renderTaskList(tabId);
-    if (taskBlock) {
-      result.system = `${result.system ?? ""}
-
-${taskBlock}`.trim();
-    }
+    if (taskBlock)
+      hints.push(taskBlock);
     if (stepNumber >= CONSECUTIVE_READ_LIMIT && !nudgeFired) {
       let consecutiveReads = 0;
       for (let i2 = steps.length - 1;i2 >= 0; i2--) {
@@ -343369,53 +343398,32 @@ ${taskBlock}`.trim();
           break;
       }
       if (consecutiveReads >= CONSECUTIVE_READ_LIMIT) {
-        const existing = result.system ?? "";
         const hint = isExplore ? `[status: ${String(consecutiveReads)} read-only steps \u2014 summarize findings or use a search tool for remaining questions]` : `[status: ${String(consecutiveReads)} read-only steps \u2014 apply edits with multi_edit]`;
-        result.system = `${existing}
-
-${hint}`.trim();
+        hints.push(hint);
       }
     }
     if (stepNumber >= REPEAT_CALL_THRESHOLD) {
       const repeated = detectRepeatedCalls(steps);
       if (repeated) {
-        const existing = result.system ?? "";
-        result.system = `${existing}
-
-\uD83D\uDD01 ${repeated.toolName} called ${String(repeated.count)}\xD7 with identical arguments \u2014 same result each time. Use the result you already have, or try a different tool/approach.`.trim();
+        hints.push(`\uD83D\uDD01 ${repeated.toolName} called ${String(repeated.count)}\xD7 with identical arguments \u2014 same result each time. Use the result you already have, or try a different tool/approach.`);
       }
     }
     if (stepNumber >= stepNudgeAt) {
       const remaining = maxSteps - stepNumber;
-      const existing = result.system ?? "";
       if (remaining <= 1) {
-        const hint = isExplore ? "Write your final text summary NOW. Name files, line numbers, exact values found." : "Apply edits with multi_edit NOW, then summarize what you changed.";
-        result.system = `${existing}
-
-\uD83D\uDED1 FINAL STEP. ${hint}`.trim();
+        const hint = isExplore ? "\uD83D\uDED1 FINAL STEP. Write your final text summary NOW. Name files, line numbers, exact values found." : "\uD83D\uDED1 FINAL STEP. Apply edits with multi_edit NOW, then summarize what you changed.";
+        hints.push(hint);
         result.toolChoice = "none";
         result.activeTools = [];
-        const msgs = result.messages ?? messages;
-        result.messages = [...msgs, {
-          role: "user",
-          content: [{
-            type: "text",
-            text: `FINAL step \u2014 write your text summary now: what you found or changed, which files, key details.`
-          }]
-        }];
       } else if (remaining <= 2) {
-        const hint = isExplore ? "Write your text summary NOW. Name files, line numbers, exact values." : "Apply edits with multi_edit NOW, then summarize what you changed.";
-        result.system = `${existing}
-
-\uD83D\uDED1 ${String(remaining)} steps left. ${hint}`.trim();
+        const hint = isExplore ? `\uD83D\uDED1 ${String(remaining)} steps left. Write your text summary NOW. Name files, line numbers, exact values.` : `\uD83D\uDED1 ${String(remaining)} steps left. Apply edits with multi_edit NOW, then summarize what you changed.`;
+        hints.push(hint);
         if (!isExplore) {
           result.activeTools = ["edit_file", "multi_edit", "done", "report_finding"];
         }
       } else {
-        const hint = isExplore ? "Write your text summary soon. Name files, line numbers, exact values found." : "Apply your edits NOW with multi_edit.";
-        result.system = `${existing}
-
-\u26A0 Step ${String(stepNumber)}/${String(maxSteps)} \u2014 ${String(remaining)} steps left. ${hint}`.trim();
+        const hint = isExplore ? `\u26A0 Step ${String(stepNumber)}/${String(maxSteps)} \u2014 ${String(remaining)} steps left. Write your text summary soon. Name files, line numbers, exact values found.` : `\u26A0 Step ${String(stepNumber)}/${String(maxSteps)} \u2014 ${String(remaining)} steps left. Apply your edits NOW with multi_edit.`;
+        hints.push(hint);
       }
     }
     if (contextSize > nudgeThreshold) {
@@ -343429,17 +343437,41 @@ ${hint}`.trim();
           agentId
         });
       }
-      const msgs = result.messages ?? messages;
-      result.messages = [...msgs, {
-        role: "user",
-        content: [{
-          type: "text",
-          text: "Stop calling tools. Write a concise text summary now: what you found or changed, which files, key details."
-        }]
-      }];
+      hints.push("Stop calling tools. Write a concise text summary now: what you found or changed, which files, key details.");
       result.toolChoice = "none";
       result.activeTools = [];
     }
+    if (hints.length > 0 || previousInjects.length > 0) {
+      const msgs = result.messages ?? [...sanitizedMessages ?? messages];
+      const cleanMsgCount = msgs.length;
+      let offset = 0;
+      for (const prev of previousInjects) {
+        const insertAt = prev.cleanInsertAt + offset;
+        if (insertAt <= msgs.length) {
+          msgs.splice(insertAt, 0, prev.message);
+          offset++;
+        }
+      }
+      if (hints.length > 0) {
+        const injectMessage = {
+          role: "user",
+          content: [{
+            type: "text",
+            text: hints.map((h) => `<system-reminder>
+${h}
+</system-reminder>`).join(`
+
+`)
+          }]
+        };
+        previousInjects.push({
+          cleanInsertAt: cleanMsgCount,
+          message: injectMessage
+        });
+        msgs.push(injectMessage);
+      }
+      result.messages = msgs;
+    }
     return Object.keys(result).length > 0 ? result : undefined;
   };
   const tokenStop = ({
@@ -343474,7 +343506,7 @@ function buildSymbolLookup(repoMap) {
     return repoMap.getFileSymbolsCached(rel);
   };
 }
-var apiExportEnabled = false, OUTPUT_NUDGE_PCT = 0.8, HARD_STOP_PCT = 0.9, DEFAULT_CONTEXT_WINDOW = 200000, MAX_SUBAGENT_CONTEXT = 200000, KEEP_RECENT_MESSAGES = 4, PRUNE_PROTECT_TOKENS = 40000, PRUNE_MINIMUM_TOKENS = 20000, PRUNED_PLACEHOLDER = "[Old tool result content cleared]", EXPLORE_MAX_STEPS = 28, CODE_MAX_STEPS = 18, STEP_NUDGE_EXPLORE = 18, STEP_NUDGE_CODE = 10, CONSECUTIVE_READ_LIMIT = 5, REPEAT_CALL_THRESHOLD = 3, REPEAT_CALL_WINDOW = 8, READ_TOOL_NAMES, SUMMARIZABLE_TOOLS, EDIT_TOOLS;
+var apiExportEnabled = false, OUTPUT_NUDGE_PCT = 0.8, HARD_STOP_PCT = 0.9, DEFAULT_CONTEXT_WINDOW = 200000, MAX_SUBAGENT_CONTEXT = 200000, KEEP_RECENT_MESSAGES = 4, EXPLORE_MAX_STEPS = 28, CODE_MAX_STEPS = 18, STEP_NUDGE_EXPLORE = 18, STEP_NUDGE_CODE = 10, CONSECUTIVE_READ_LIMIT = 5, REPEAT_CALL_THRESHOLD = 3, REPEAT_CALL_WINDOW = 8, READ_TOOL_NAMES, SUMMARIZABLE_TOOLS, EDIT_TOOLS;
 var init_step_utils = __esm(() => {
   init_dist10();
   init_task_list();
@@ -343513,19 +343545,27 @@ function createCodeAgent(model, options) {
   const agentId = options?.agentId;
   const hasBus = !!(bus && agentId);
   const busTools = hasBus ? buildBusTools(bus, agentId, "code") : {};
-  let tools = buildSubagentCodeTools({
-    webSearchModel: options?.webSearchModel,
-    onApproveWebSearch: options?.onApproveWebSearch,
-    onApproveFetchPage: options?.onApproveFetchPage,
-    repoMap: options?.repoMap
-  });
-  if (hasBus) {
-    tools = wrapWithBusCache(tools, bus, agentId, options?.repoMap);
+  let allTools;
+  if (options?.forgeTools) {
+    allTools = {
+      ...options.forgeTools,
+      ...busTools
+    };
+  } else {
+    let tools = buildSubagentCodeTools({
+      webSearchModel: options?.webSearchModel,
+      onApproveWebSearch: options?.onApproveWebSearch,
+      onApproveFetchPage: options?.onApproveFetchPage,
+      repoMap: options?.repoMap
+    });
+    if (hasBus) {
+      tools = wrapWithBusCache(tools, bus, agentId, options?.repoMap);
+    }
+    allTools = {
+      ...tools,
+      ...busTools
+    };
   }
-  const allTools = {
-    ...tools,
-    ...busTools
-  };
   const {
     prepareStep,
     stopConditions
@@ -343613,19 +343653,27 @@ function createExploreAgent(model, options) {
   const agentId = options?.agentId;
   const hasBus = !!(bus && agentId);
   const busTools = hasBus ? buildBusTools(bus, agentId, "explore") : {};
-  let tools = buildSubagentExploreTools({
-    webSearchModel: options?.webSearchModel,
-    onApproveWebSearch: options?.onApproveWebSearch,
-    onApproveFetchPage: options?.onApproveFetchPage,
-    repoMap: options?.repoMap
-  });
-  if (hasBus) {
-    tools = wrapWithBusCache(tools, bus, agentId, options?.repoMap);
+  let allTools;
+  if (options?.forgeTools) {
+    allTools = {
+      ...options.forgeTools,
+      ...busTools
+    };
+  } else {
+    let tools = buildSubagentExploreTools({
+      webSearchModel: options?.webSearchModel,
+      onApproveWebSearch: options?.onApproveWebSearch,
+      onApproveFetchPage: options?.onApproveFetchPage,
+      repoMap: options?.repoMap
+    });
+    if (hasBus) {
+      tools = wrapWithBusCache(tools, bus, agentId, options?.repoMap);
+    }
+    allTools = {
+      ...tools,
+      ...busTools
+    };
   }
-  const allTools = {
-    ...tools,
-    ...busTools
-  };
   const {
     prepareStep,
     stopConditions
@@ -344809,6 +344857,25 @@ var init_agent_verification = __esm(() => {
 // src/core/agents/subagent-tools.ts
 import { readFile as fsReadFile } from "fs/promises";
 import { isAbsolute as pathIsAbsolute, resolve as pathResolve } from "path";
+function guardForgeTools(forgeTools, role) {
+  const blocked = role === "code" ? CODE_BLOCKED : EXPLORE_BLOCKED;
+  const guarded = {};
+  const rejectMsg = (name21) => `${name21} is not available in ${role} mode. Use report_finding to suggest changes instead.`;
+  for (const [name21, t] of Object.entries(forgeTools)) {
+    if (blocked.has(name21)) {
+      guarded[name21] = {
+        ...t,
+        execute: async () => ({
+          success: false,
+          error: rejectMsg(name21)
+        })
+      };
+    } else {
+      guarded[name21] = t;
+    }
+  }
+  return guarded;
+}
 function formatToolArgs(toolCall) {
   const a = toolCall.input ?? {};
   if (toolCall.toolName === "read_file" && a.path)
@@ -344952,6 +345019,8 @@ function createAgent(task, models, bus, parentToolCallId) {
   }
   const contextWindow = getModelContextWindow(modelId);
   const forgeInstructions = useMiniForge ? models.forgeInstructions : undefined;
+  const agentRole = useExplore ? task.role === "investigate" ? "investigate" : "explore" : "code";
+  const forgeToolsGuarded = useMiniForge && models.forgeTools ? guardForgeTools(models.forgeTools, agentRole) : undefined;
   const opts = {
     bus,
     agentId: task.agentId,
@@ -344964,9 +345033,10 @@ function createAgent(task, models, bus, parentToolCallId) {
     repoMap: models.repoMap,
     contextWindow,
     disablePruning: models.disablePruning,
-    role: task.role === "investigate" ? "investigate" : "explore",
+    role: agentRole === "code" ? "explore" : agentRole,
     tabId: models.tabId,
-    forgeInstructions
+    forgeInstructions,
+    forgeTools: forgeToolsGuarded
   };
   const hasPreloadedFiles = !useExplore && task.task.includes("--- Preloaded file contents");
   const agent = useExplore ? createExploreAgent(model, opts) : createCodeAgent(model, {
@@ -345934,7 +346004,7 @@ ${value}
     })
   };
 }
-var SKILL_TOKEN_RE, SKILL_MATCH_THRESHOLD = 2, SKILL_NAME_WEIGHT = 3, SKILL_PREVIEW_CHARS = 200, SKILL_MAX_INJECT_CHARS = 2000, PRELOAD_FULL_FILE_MAX_LINES = 500, PRELOAD_TOTAL_MAX_CHARS = 80000;
+var EXPLORE_BLOCKED, CODE_BLOCKED, SKILL_TOKEN_RE, SKILL_MATCH_THRESHOLD = 2, SKILL_NAME_WEIGHT = 3, SKILL_PREVIEW_CHARS = 200, SKILL_MAX_INJECT_CHARS = 2000, PRELOAD_FULL_FILE_MAX_LINES = 500, PRELOAD_TOTAL_MAX_CHARS = 80000;
 var init_subagent_tools = __esm(() => {
   init_dist10();
   init_zod();
@@ -345950,6 +346020,8 @@ var init_subagent_tools = __esm(() => {
   init_code();
   init_explore();
   init_subagent_events();
+  EXPLORE_BLOCKED = new Set(["edit_file", "multi_edit", "write_file", "create_file", "rename_symbol", "move_symbol", "refactor", "dispatch", "shell"]);
+  CODE_BLOCKED = new Set(["dispatch"]);
   SKILL_TOKEN_RE = /[a-z0-9]+/gi;
 });
 
@@ -345981,6 +346053,7 @@ function lastStepHadPlanCall(messages) {
   return false;
 }
 function buildForgePrepareStep(isPlanMode, drainSteering, contextManager, tabId) {
+  const previousInjects = [];
   return ({
     stepNumber,
     messages
@@ -346069,17 +346142,33 @@ Finish any in-progress tool call, then switch entirely to this message in your n
 </steering>`);
       }
     }
-    if (tailParts.length > 0) {
+    if (tailParts.length > 0 || previousInjects.length > 0) {
       const msgs = result.messages ?? [...sanitized];
-      msgs.push({
-        role: "user",
-        content: [{
-          type: "text",
-          text: tailParts.join(`
+      const cleanMsgCount = msgs.length;
+      let offset = 0;
+      for (const prev of previousInjects) {
+        const insertAt = prev.cleanInsertAt + offset;
+        if (insertAt <= msgs.length) {
+          msgs.splice(insertAt, 0, prev.message);
+          offset++;
+        }
+      }
+      if (tailParts.length > 0) {
+        const injectMessage = {
+          role: "user",
+          content: [{
+            type: "text",
+            text: tailParts.join(`
 
 `)
-        }]
-      });
+          }]
+        };
+        previousInjects.push({
+          cleanInsertAt: cleanMsgCount,
+          message: injectMessage
+        });
+        msgs.push(injectMessage);
+      }
       result.messages = msgs;
     }
     if (process.env.SOULFORGE_DEBUG_API) {
@@ -346208,6 +346297,8 @@ function createForgeAgent({
   providerOptions,
   headers,
   codeExecution: codeExecution3,
+  computerUse,
+  anthropicTextEditor,
   cwd: cwd2,
   sessionId,
   sharedCacheRef,
@@ -346225,11 +346316,14 @@ function createForgeAgent({
   const modelId = typeof model === "object" && model !== null && "modelId" in model ? String(model.modelId) : "";
   if (modelId)
     contextManager.setActiveModel(modelId);
-  const canUseCodeExecution = codeExecution3 && isAnthropicNative(modelId);
+  const isAnthropic = isAnthropicNative(modelId);
+  const canUseCodeExecution = codeExecution3 && isAnthropic;
   const onDemandEnabled = !disabledTools?.has("request_tools") && !isRestricted && !planExecution;
   const activeDeferredTools = onDemandEnabled ? new Set : undefined;
   const directTools = buildTools(undefined, editorIntegration, onApproveWebSearch, {
     codeExecution: canUseCodeExecution,
+    computerUse: computerUse && isAnthropic,
+    anthropicTextEditor: anthropicTextEditor && isAnthropic,
     contextManager,
     agentSkills: !disabledTools?.has("skills"),
     webSearchModel,
@@ -346242,6 +346336,7 @@ function createForgeAgent({
     activeDeferredTools
   });
   const forgeInstructions = buildInstructions(contextManager, modelId);
+  const forgeTools = directTools;
   const subagentHeaders = detectModelFamily(modelId) === "openai" && sessionId ? {
     ...headers,
     "x-prompt-cache-key": sessionId
@@ -346262,7 +346357,8 @@ function createForgeAgent({
       skills,
       disablePruning,
       tabId: tabId ?? contextManager.getTabId() ?? undefined,
-      forgeInstructions
+      forgeInstructions,
+      forgeTools
     }).dispatch
   } : buildSubagentTools({
     defaultModel: model,
@@ -346282,7 +346378,8 @@ function createForgeAgent({
     skills,
     disablePruning,
     tabId: tabId ?? contextManager.getTabId() ?? undefined,
-    forgeInstructions
+    forgeInstructions,
+    forgeTools
   });
   const cachedReadFile = sharedCacheRef && agentFeatures?.dispatchCache !== false ? wrapReadFileWithDispatchCache(directTools.read_file, sharedCacheRef, cwd2) : directTools.read_file;
   const allTools = {
@@ -360473,11 +360570,14 @@ Be concise, direct, and to the point. Match response length to question complexi
 Output text to communicate with the user \u2014 all text outside tool use is displayed.
 Use Github-flavored markdown. Code blocks with language hints.
 Minimize output tokens while maintaining helpfulness, quality, and accuracy.
-Skip narration ("Let me now...", "I have enough context") \u2014 just call the tool or write the code.
-Skip summaries of what you just did \u2014 the user sees tool calls in real-time.
-Go straight to the answer. No transition sentences, no restating the question.
 Answer concisely \u2014 fewer than 4 lines unless the user asks for detail.
 
+# Silent tool use
+Stay silent while gathering information. When you need to read files, search, or explore \u2014 just call the tools with zero surrounding text. Emit text only when you have something meaningful to tell the user: an answer, a question, a decision, or a result.
+Good: [tool call] \u2192 [tool call] \u2192 [tool call] \u2192 "Here's what I found: ..."
+Bad: "Let me check..." \u2192 [tool call] \u2192 "Now let me look at..." \u2192 [tool call] \u2192 "I see the pattern..."
+The user sees tool calls in real-time \u2014 your narration between them adds noise, not value. Go straight to the answer once you have it.
+
 # Doing tasks
 When given a software engineering task:
 1. Read the Soul Map first \u2014 it has files, symbols, line numbers, and dependencies
@@ -360502,8 +360602,10 @@ var init_default = __esm(() => {
 
 # Tone and style
 Be concise and direct. Use Github-flavored markdown. Code blocks with language hints.
-Minimize output tokens while maintaining quality. No preamble, no postamble.
-Do not summarize actions you just took. Answer concisely.
+Minimize output tokens while maintaining quality. Answer concisely.
+
+# Silent tool use
+Stay silent while gathering information. When you need to read files, search, or explore \u2014 just call the tools with zero surrounding text. Emit text only when you have something meaningful to tell the user: an answer, a question, a decision, or a result.
 
 # Doing tasks
 1. Use search tools to understand the codebase. Use the Task tool for broad exploration.
@@ -360528,9 +360630,12 @@ var init_google2 = __esm(() => {
 
 # Tone and style
 Use Github-flavored markdown. Code blocks with language hints.
-Minimize output tokens. Do not summarize what you just did.
+Minimize output tokens.
 Answer concisely \u2014 fewer than 4 lines unless the user asks for detail.
 
+# Silent tool use
+Stay silent while gathering information. When you need to read files, search, or explore \u2014 just call the tools with zero surrounding text. Emit text only when you have something meaningful to tell the user: an answer, a question, a decision, or a result. The user sees tool calls in real-time \u2014 narration between them adds noise, not value.
+
 # Primary Workflow
 1. **Understand**: Use search tools and the Task tool for exploration. Use direct tools for targeted lookups.
 2. **Implement**: Make changes using edit tools. Read files once, plan all changes, apply in one call.
@@ -360551,10 +360656,12 @@ If you are not sure about file content or codebase structure, use your tools to
 
 # Tone and style
 Be concise and direct. Use Github-flavored markdown. Code blocks with language hints.
-Minimize output tokens while maintaining quality. Do not add preamble or postamble.
-Do not summarize actions you just took \u2014 the user sees tool calls in real-time.
+Minimize output tokens while maintaining quality.
 Answer concisely \u2014 fewer than 4 lines unless the user asks for detail.
 
+# Silent tool use
+Stay silent while gathering information. When you need to read files, search, or explore \u2014 just call the tools with zero surrounding text. Emit text only when you have something meaningful to tell the user: an answer, a question, a decision, or a result. The user sees tool calls in real-time \u2014 narration between them adds noise, not value.
+
 # Coding guidelines
 - Fix problems at the root cause, not surface-level patches
 - Avoid unneeded complexity. Ignore unrelated bugs \u2014 not your responsibility
@@ -430409,7 +430516,7 @@ var init_navigation = __esm(() => {
 // src/core/commands/proxy.ts
 async function cleanupProxySelections(ctx) {
   if (ctx.chat.activeModel.startsWith("proxy/")) {
-    ctx.chat.setActiveModel("none");
+    ctx.syncActiveModel("none");
     ctx.saveToScope({
       defaultModel: "none"
     }, ctx.detectScope("defaultModel"));
@@ -430666,6 +430773,13 @@ async function handleProxyLogin(_input, ctx) {
           label: ok ? "Authentication complete." : "Authentication failed.",
           color: ok ? getThemeTokens().success : getThemeTokens().brandSecondary
         });
+        if (ok && ctx.chat.activeModel === "none") {
+          loginLines.push({
+            type: "text",
+            label: "Press Ctrl+L or type /model to select a proxy model.",
+            color: getThemeTokens().textSecondary
+          });
+        }
         updatePopup([...loginLines]);
       }).catch((err2) => {
         const msg = err2 instanceof Error ? err2.message : String(err2);
@@ -436450,12 +436564,6 @@ var init_Footer = __esm(async () => {
     l: "Tab",
     ls: "Tab",
     tier: 3
-  }, {
-    k: "^X",
-    ic: icon("stop"),
-    l: "Stop",
-    ls: "Stop",
-    tier: 3
   }, {
     k: "^C",
     ic: icon("quit"),
@@ -437652,7 +437760,7 @@ function pruneOldToolResults(msgs) {
         continue;
       const text3 = typeof p2.output === "string" ? p2.output : typeof p2.output?.value === "string" ? p2.output.value : JSON.stringify(p2.output ?? "");
       const tokens = Math.round(text3.length / CHARS_PER_TOKEN2);
-      if (protectedTokens < PRUNE_PROTECT_TOKENS2) {
+      if (protectedTokens < PRUNE_PROTECT_TOKENS) {
         protectedTokens += tokens;
       } else {
         prunableTokens += tokens;
@@ -437660,7 +437768,7 @@ function pruneOldToolResults(msgs) {
       }
     }
   }
-  if (prunableTokens < PRUNE_MINIMUM_TOKENS2 || toPrune.size === 0)
+  if (prunableTokens < PRUNE_MINIMUM_TOKENS || toPrune.size === 0)
     return msgs;
   return msgs.map((msg, idx) => {
     if (!toPrune.has(idx))
@@ -438833,6 +438941,8 @@ ${description}`,
         providerOptions,
         headers,
         codeExecution: effectiveConfig2.codeExecution,
+        computerUse: effectiveConfig2.computerUse,
+        anthropicTextEditor: effectiveConfig2.anthropicTextEditor,
         cwd: cwd2,
         sessionId: sessionIdRef.current,
         sharedCacheRef: sharedCacheRef.current,
@@ -438874,6 +438984,8 @@ ${description}`,
                   providerOptions: degraded.providerOptions,
                   headers: degraded.headers,
                   codeExecution: effectiveConfig2.codeExecution,
+                  computerUse: effectiveConfig2.computerUse,
+                  anthropicTextEditor: effectiveConfig2.anthropicTextEditor,
                   cwd: cwd2,
                   sessionId: sessionIdRef.current,
                   sharedCacheRef: sharedCacheRef.current,
@@ -439781,7 +439893,7 @@ ${pContent}`;
     cycleMode: cycleModeFn
   };
 }
-var import_react32, ZERO_USAGE2, CHARS_PER_TOKEN2 = 4, PRUNE_PROTECT_TOKENS2 = 40000, PRUNE_MINIMUM_TOKENS2 = 20000;
+var import_react32, ZERO_USAGE2, CHARS_PER_TOKEN2 = 4, PRUNE_PROTECT_TOKENS = 40000, PRUNE_MINIMUM_TOKENS = 20000;
 var init_useChat = __esm(() => {
   init_dist10();
   init_agent_bus();
@@ -440189,7 +440301,8 @@ var init_InputBox = __esm(async () => {
       return results;
     }, [showAutocomplete, commandToken]);
     const hasMatches = matches3.length > 0;
-    const isCommandPrefix = hasMatches && matches3.some((m_0) => m_0.cmd.startsWith(commandToken.trimEnd()));
+    const trimmedToken = commandToken.trimEnd();
+    const isCommandPrefix = hasMatches && (matches3.some((m_0) => m_0.cmd.startsWith(trimmedToken)) || !trimmedToken.includes(" ", 1));
     const hasMatchesForNav = hasMatches && isCommandPrefix;
     const ghost = hasMatchesForNav && matches3[selectedIdx]?.cmd.startsWith(commandToken) ? matches3[selectedIdx].cmd.slice(value.length) : "";
     const maxVisible = Math.min(8, Math.max(4, Math.floor(termRows * 0.25)));
@@ -440239,7 +440352,8 @@ var init_InputBox = __esm(async () => {
       setVisualLines(1);
     }, []);
     const handleSubmit = import_react34.useCallback((input_0) => {
-      if (hasMatchesForNav && matches3[selectedIdx]) {
+      const useAutocomplete = hasMatchesForNav || showAutocomplete && hasMatches && matches3[selectedIdx];
+      if (useAutocomplete && matches3[selectedIdx]) {
         const completed_0 = matches3[selectedIdx].cmd;
         if (completed_0 === "/open" || completed_0 === "/git branch") {
           const withSpace = `${completed_0} `;
@@ -440271,7 +440385,7 @@ var init_InputBox = __esm(async () => {
       pushHistory(finalInput.trim());
       onSubmit(finalInput.trim());
       resetInput();
-    }, [matches3, selectedIdx, pushHistory, onSubmit, resetInput, isLoading, isCompacting, onQueue, hasMatchesForNav]);
+    }, [matches3, selectedIdx, pushHistory, onSubmit, resetInput, isLoading, isCompacting, onQueue, hasMatchesForNav, showAutocomplete, hasMatches]);
     const handleContentChange = import_react34.useCallback(() => {
       const text_0 = textareaRef.current?.plainText ?? "";
       if (isNavigatingHistory.current) {
@@ -442106,435 +442220,6 @@ var init_StructuredPlanView = __esm(async () => {
   };
 });
 
-// src/components/chat/ReasoningBlock.tsx
-function ThinkingSpinner() {
-  const $5 = import_compiler_runtime14.c(3);
-  const t2 = useTheme();
-  const frame = useSpinnerFrame();
-  const t0 = SPINNER_FRAMES[frame];
-  let t1;
-  if ($5[0] !== t2.brandDim || $5[1] !== t0) {
-    t1 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-      fg: t2.brandDim,
-      children: t0
-    }, undefined, false, undefined, this);
-    $5[0] = t2.brandDim;
-    $5[1] = t0;
-    $5[2] = t1;
-  } else {
-    t1 = $5[2];
-  }
-  return t1;
-}
-function ReasoningBlock(t0) {
-  const $5 = import_compiler_runtime14.c(90);
-  const {
-    content,
-    expanded,
-    isStreaming,
-    id
-  } = t0;
-  const t2 = useTheme();
-  let t1;
-  if ($5[0] !== content || $5[1] !== expanded || $5[2] !== id || $5[3] !== isStreaming || $5[4] !== t2.success || $5[5] !== t2.textFaint || $5[6] !== t2.textSubtle) {
-    t1 = Symbol.for("react.early_return_sentinel");
-    bb0: {
-      const lines = content.split(`
-`);
-      const lineCount2 = lines.length;
-      if (!expanded) {
-        if (isStreaming) {
-          const t24 = `${id}-col`;
-          let t33;
-          if ($5[8] === Symbol.for("react.memo_cache_sentinel")) {
-            t33 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(ThinkingSpinner, {}, undefined, false, undefined, this);
-            $5[8] = t33;
-          } else {
-            t33 = $5[8];
-          }
-          const t43 = t2.textFaint;
-          let t53;
-          if ($5[9] === Symbol.for("react.memo_cache_sentinel")) {
-            t53 = brainIcon();
-            $5[9] = t53;
-          } else {
-            t53 = $5[9];
-          }
-          let t63;
-          if ($5[10] !== t2.textFaint) {
-            t63 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-              fg: t43,
-              children: [
-                " ",
-                t53,
-                " reasoning"
-              ]
-            }, undefined, true, undefined, this);
-            $5[10] = t2.textFaint;
-            $5[11] = t63;
-          } else {
-            t63 = $5[11];
-          }
-          let t73;
-          if ($5[12] !== lineCount2 || $5[13] !== t2.textFaint) {
-            t73 = lineCount2 > 1 && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-              fg: t2.textFaint,
-              children: [
-                " (",
-                String(lineCount2),
-                " lines)"
-              ]
-            }, undefined, true, undefined, this);
-            $5[12] = lineCount2;
-            $5[13] = t2.textFaint;
-            $5[14] = t73;
-          } else {
-            t73 = $5[14];
-          }
-          let t83;
-          if ($5[15] !== t2.textSubtle) {
-            t83 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-              fg: t2.textSubtle,
-              children: " ^O"
-            }, undefined, false, undefined, this);
-            $5[15] = t2.textSubtle;
-            $5[16] = t83;
-          } else {
-            t83 = $5[16];
-          }
-          let t93;
-          if ($5[17] !== t24 || $5[18] !== t63 || $5[19] !== t73 || $5[20] !== t83) {
-            t93 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-              height: 1,
-              flexShrink: 0,
-              flexDirection: "row",
-              children: [
-                t33,
-                t63,
-                t73,
-                t83
-              ]
-            }, t24, true, undefined, this);
-            $5[17] = t24;
-            $5[18] = t63;
-            $5[19] = t73;
-            $5[20] = t83;
-            $5[21] = t93;
-          } else {
-            t93 = $5[21];
-          }
-          t1 = t93;
-          break bb0;
-        }
-        const firstLine = (lines[0] ?? "").trim().replace(/\*\*/g, "");
-        const preview = firstLine.length > 60 ? `${firstLine.slice(0, 57)}...` : firstLine;
-        const t23 = `${id}-col`;
-        const t32 = t2.textFaint;
-        let t42;
-        if ($5[22] !== t2.success) {
-          t42 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-            fg: t2.success,
-            children: "\u2713"
-          }, undefined, false, undefined, this);
-          $5[22] = t2.success;
-          $5[23] = t42;
-        } else {
-          t42 = $5[23];
-        }
-        let t52;
-        if ($5[24] === Symbol.for("react.memo_cache_sentinel")) {
-          t52 = brainIcon();
-          $5[24] = t52;
-        } else {
-          t52 = $5[24];
-        }
-        const t62 = preview || "Reasoned";
-        let t72;
-        if ($5[25] !== t2.textFaint || $5[26] !== t62) {
-          t72 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-            fg: t2.textFaint,
-            children: t62
-          }, undefined, false, undefined, this);
-          $5[25] = t2.textFaint;
-          $5[26] = t62;
-          $5[27] = t72;
-        } else {
-          t72 = $5[27];
-        }
-        let t82;
-        if ($5[28] !== lineCount2 || $5[29] !== t2.textFaint) {
-          t82 = lineCount2 > 1 && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-            fg: t2.textFaint,
-            children: [
-              " (",
-              String(lineCount2),
-              " lines)"
-            ]
-          }, undefined, true, undefined, this);
-          $5[28] = lineCount2;
-          $5[29] = t2.textFaint;
-          $5[30] = t82;
-        } else {
-          t82 = $5[30];
-        }
-        let t92;
-        if ($5[31] !== t2.textFaint) {
-          t92 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-            fg: t2.textFaint,
-            children: " ^O"
-          }, undefined, false, undefined, this);
-          $5[31] = t2.textFaint;
-          $5[32] = t92;
-        } else {
-          t92 = $5[32];
-        }
-        let t102;
-        if ($5[33] !== t2.textFaint || $5[34] !== t42 || $5[35] !== t72 || $5[36] !== t82 || $5[37] !== t92) {
-          t102 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-            fg: t32,
-            truncate: true,
-            children: [
-              t42,
-              " ",
-              t52,
-              " ",
-              t72,
-              t82,
-              t92
-            ]
-          }, undefined, true, undefined, this);
-          $5[33] = t2.textFaint;
-          $5[34] = t42;
-          $5[35] = t72;
-          $5[36] = t82;
-          $5[37] = t92;
-          $5[38] = t102;
-        } else {
-          t102 = $5[38];
-        }
-        let t112;
-        if ($5[39] !== t102 || $5[40] !== t23) {
-          t112 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-            height: 1,
-            flexShrink: 0,
-            children: t102
-          }, t23, false, undefined, this);
-          $5[39] = t102;
-          $5[40] = t23;
-          $5[41] = t112;
-        } else {
-          t112 = $5[41];
-        }
-        t1 = t112;
-        break bb0;
-      }
-    }
-    $5[0] = content;
-    $5[1] = expanded;
-    $5[2] = id;
-    $5[3] = isStreaming;
-    $5[4] = t2.success;
-    $5[5] = t2.textFaint;
-    $5[6] = t2.textSubtle;
-    $5[7] = t1;
-  } else {
-    t1 = $5[7];
-  }
-  if (t1 !== Symbol.for("react.early_return_sentinel")) {
-    return t1;
-  }
-  const bc = isStreaming ? t2.brandDim : t2.border;
-  const label = isStreaming ? "reasoning\u2026" : "reasoning";
-  let t10;
-  let t11;
-  let t22;
-  let t3;
-  let t4;
-  let t5;
-  let t6;
-  let t7;
-  let t8;
-  let t9;
-  if ($5[42] !== bc || $5[43] !== content || $5[44] !== id || $5[45] !== label || $5[46] !== t2.bgElevated || $5[47] !== t2.brandDim || $5[48] !== t2.textFaint || $5[49] !== t2.textSecondary) {
-    const trimmed = content.trim();
-    t5 = `${id}-exp`;
-    t6 = "column";
-    t7 = 0;
-    t8 = true;
-    t9 = "rounded";
-    t10 = bc;
-    const t122 = t2.bgElevated;
-    const t132 = t2.brandDim;
-    let t14;
-    if ($5[60] === Symbol.for("react.memo_cache_sentinel")) {
-      t14 = brainIcon();
-      $5[60] = t14;
-    } else {
-      t14 = $5[60];
-    }
-    let t15;
-    if ($5[61] !== t2.brandDim) {
-      t15 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-        fg: t132,
-        children: t14
-      }, undefined, false, undefined, this);
-      $5[61] = t2.brandDim;
-      $5[62] = t15;
-    } else {
-      t15 = $5[62];
-    }
-    let t16;
-    if ($5[63] !== label || $5[64] !== t2.brandDim) {
-      t16 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-        fg: t2.brandDim,
-        children: label
-      }, undefined, false, undefined, this);
-      $5[63] = label;
-      $5[64] = t2.brandDim;
-      $5[65] = t16;
-    } else {
-      t16 = $5[65];
-    }
-    let t17;
-    if ($5[66] !== t2.textFaint) {
-      t17 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-        fg: t2.textFaint,
-        children: " ^O"
-      }, undefined, false, undefined, this);
-      $5[66] = t2.textFaint;
-      $5[67] = t17;
-    } else {
-      t17 = $5[67];
-    }
-    let t18;
-    if ($5[68] !== t15 || $5[69] !== t16 || $5[70] !== t17) {
-      t18 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-        truncate: true,
-        children: [
-          t15,
-          " ",
-          t16,
-          t17
-        ]
-      }, undefined, true, undefined, this);
-      $5[68] = t15;
-      $5[69] = t16;
-      $5[70] = t17;
-      $5[71] = t18;
-    } else {
-      t18 = $5[71];
-    }
-    if ($5[72] !== t2.bgElevated || $5[73] !== t18) {
-      t11 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-        height: 1,
-        flexShrink: 0,
-        paddingX: 1,
-        backgroundColor: t122,
-        alignSelf: "flex-start",
-        marginTop: -1,
-        children: t18
-      }, undefined, false, undefined, this);
-      $5[72] = t2.bgElevated;
-      $5[73] = t18;
-      $5[74] = t11;
-    } else {
-      t11 = $5[74];
-    }
-    t22 = "column";
-    t3 = 1;
-    let t19;
-    if ($5[75] !== t2.textSecondary) {
-      t19 = (line2, i4) => /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-        fg: t2.textSecondary,
-        children: line2
-      }, i4, false, undefined, this);
-      $5[75] = t2.textSecondary;
-      $5[76] = t19;
-    } else {
-      t19 = $5[76];
-    }
-    t4 = trimmed.split(`
-`).map(t19);
-    $5[42] = bc;
-    $5[43] = content;
-    $5[44] = id;
-    $5[45] = label;
-    $5[46] = t2.bgElevated;
-    $5[47] = t2.brandDim;
-    $5[48] = t2.textFaint;
-    $5[49] = t2.textSecondary;
-    $5[50] = t10;
-    $5[51] = t11;
-    $5[52] = t22;
-    $5[53] = t3;
-    $5[54] = t4;
-    $5[55] = t5;
-    $5[56] = t6;
-    $5[57] = t7;
-    $5[58] = t8;
-    $5[59] = t9;
-  } else {
-    t10 = $5[50];
-    t11 = $5[51];
-    t22 = $5[52];
-    t3 = $5[53];
-    t4 = $5[54];
-    t5 = $5[55];
-    t6 = $5[56];
-    t7 = $5[57];
-    t8 = $5[58];
-    t9 = $5[59];
-  }
-  let t12;
-  if ($5[77] !== t22 || $5[78] !== t3 || $5[79] !== t4) {
-    t12 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-      flexDirection: t22,
-      paddingX: t3,
-      children: t4
-    }, undefined, false, undefined, this);
-    $5[77] = t22;
-    $5[78] = t3;
-    $5[79] = t4;
-    $5[80] = t12;
-  } else {
-    t12 = $5[80];
-  }
-  let t13;
-  if ($5[81] !== t10 || $5[82] !== t11 || $5[83] !== t12 || $5[84] !== t5 || $5[85] !== t6 || $5[86] !== t7 || $5[87] !== t8 || $5[88] !== t9) {
-    t13 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-      flexDirection: t6,
-      flexShrink: t7,
-      border: t8,
-      borderStyle: t9,
-      borderColor: t10,
-      children: [
-        t11,
-        t12
-      ]
-    }, t5, true, undefined, this);
-    $5[81] = t10;
-    $5[82] = t11;
-    $5[83] = t12;
-    $5[84] = t5;
-    $5[85] = t6;
-    $5[86] = t7;
-    $5[87] = t8;
-    $5[88] = t9;
-    $5[89] = t13;
-  } else {
-    t13 = $5[89];
-  }
-  return t13;
-}
-var import_compiler_runtime14, brainIcon = () => icon("brain");
-var init_ReasoningBlock = __esm(() => {
-  init_icons();
-  init_theme();
-  init_shared2();
-  init_jsx_dev_runtime();
-  import_compiler_runtime14 = __toESM(require_compiler_runtime(), 1);
-});
-
 // src/core/diff.ts
 function lcs(a2, b5) {
   const n = a2.length;
@@ -442756,17 +442441,17 @@ function toUnifiedDiff(filePath, diffLines) {
 `);
 }
 function _temp15() {}
-var import_compiler_runtime15, import_react36, LARGE_DIFF_THRESHOLD = 50, DiffView;
+var import_compiler_runtime14, import_react36, LARGE_DIFF_THRESHOLD = 50, DiffView;
 var init_DiffView = __esm(async () => {
   init_diff2();
   init_icons();
   init_theme();
   init_jsx_dev_runtime();
   await init_syntax();
-  import_compiler_runtime15 = __toESM(require_compiler_runtime(), 1);
+  import_compiler_runtime14 = __toESM(require_compiler_runtime(), 1);
   import_react36 = __toESM(require_react(), 1);
   DiffView = import_react36.memo(function DiffView2(t0) {
-    const $5 = import_compiler_runtime15.c(75);
+    const $5 = import_compiler_runtime14.c(75);
     const {
       filePath,
       oldString,
@@ -443150,6 +442835,435 @@ var init_DiffView = __esm(async () => {
   });
 });
 
+// src/components/chat/ReasoningBlock.tsx
+function ThinkingSpinner() {
+  const $5 = import_compiler_runtime15.c(3);
+  const t2 = useTheme();
+  const frame = useSpinnerFrame();
+  const t0 = SPINNER_FRAMES[frame];
+  let t1;
+  if ($5[0] !== t2.brandDim || $5[1] !== t0) {
+    t1 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+      fg: t2.brandDim,
+      children: t0
+    }, undefined, false, undefined, this);
+    $5[0] = t2.brandDim;
+    $5[1] = t0;
+    $5[2] = t1;
+  } else {
+    t1 = $5[2];
+  }
+  return t1;
+}
+function ReasoningBlock(t0) {
+  const $5 = import_compiler_runtime15.c(90);
+  const {
+    content,
+    expanded,
+    isStreaming,
+    id
+  } = t0;
+  const t2 = useTheme();
+  let t1;
+  if ($5[0] !== content || $5[1] !== expanded || $5[2] !== id || $5[3] !== isStreaming || $5[4] !== t2.success || $5[5] !== t2.textFaint || $5[6] !== t2.textSubtle) {
+    t1 = Symbol.for("react.early_return_sentinel");
+    bb0: {
+      const lines = content.split(`
+`);
+      const lineCount2 = lines.length;
+      if (!expanded) {
+        if (isStreaming) {
+          const t24 = `${id}-col`;
+          let t33;
+          if ($5[8] === Symbol.for("react.memo_cache_sentinel")) {
+            t33 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(ThinkingSpinner, {}, undefined, false, undefined, this);
+            $5[8] = t33;
+          } else {
+            t33 = $5[8];
+          }
+          const t43 = t2.textFaint;
+          let t53;
+          if ($5[9] === Symbol.for("react.memo_cache_sentinel")) {
+            t53 = brainIcon();
+            $5[9] = t53;
+          } else {
+            t53 = $5[9];
+          }
+          let t63;
+          if ($5[10] !== t2.textFaint) {
+            t63 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+              fg: t43,
+              children: [
+                " ",
+                t53,
+                " reasoning"
+              ]
+            }, undefined, true, undefined, this);
+            $5[10] = t2.textFaint;
+            $5[11] = t63;
+          } else {
+            t63 = $5[11];
+          }
+          let t73;
+          if ($5[12] !== lineCount2 || $5[13] !== t2.textFaint) {
+            t73 = lineCount2 > 1 && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+              fg: t2.textFaint,
+              children: [
+                " (",
+                String(lineCount2),
+                " lines)"
+              ]
+            }, undefined, true, undefined, this);
+            $5[12] = lineCount2;
+            $5[13] = t2.textFaint;
+            $5[14] = t73;
+          } else {
+            t73 = $5[14];
+          }
+          let t83;
+          if ($5[15] !== t2.textSubtle) {
+            t83 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+              fg: t2.textSubtle,
+              children: " ^O"
+            }, undefined, false, undefined, this);
+            $5[15] = t2.textSubtle;
+            $5[16] = t83;
+          } else {
+            t83 = $5[16];
+          }
+          let t93;
+          if ($5[17] !== t24 || $5[18] !== t63 || $5[19] !== t73 || $5[20] !== t83) {
+            t93 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+              height: 1,
+              flexShrink: 0,
+              flexDirection: "row",
+              children: [
+                t33,
+                t63,
+                t73,
+                t83
+              ]
+            }, t24, true, undefined, this);
+            $5[17] = t24;
+            $5[18] = t63;
+            $5[19] = t73;
+            $5[20] = t83;
+            $5[21] = t93;
+          } else {
+            t93 = $5[21];
+          }
+          t1 = t93;
+          break bb0;
+        }
+        const firstLine = (lines[0] ?? "").trim().replace(/\*\*/g, "");
+        const preview = firstLine.length > 60 ? `${firstLine.slice(0, 57)}...` : firstLine;
+        const t23 = `${id}-col`;
+        const t32 = t2.textFaint;
+        let t42;
+        if ($5[22] !== t2.success) {
+          t42 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+            fg: t2.success,
+            children: "\u2713"
+          }, undefined, false, undefined, this);
+          $5[22] = t2.success;
+          $5[23] = t42;
+        } else {
+          t42 = $5[23];
+        }
+        let t52;
+        if ($5[24] === Symbol.for("react.memo_cache_sentinel")) {
+          t52 = brainIcon();
+          $5[24] = t52;
+        } else {
+          t52 = $5[24];
+        }
+        const t62 = preview || "Reasoned";
+        let t72;
+        if ($5[25] !== t2.textFaint || $5[26] !== t62) {
+          t72 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+            fg: t2.textFaint,
+            children: t62
+          }, undefined, false, undefined, this);
+          $5[25] = t2.textFaint;
+          $5[26] = t62;
+          $5[27] = t72;
+        } else {
+          t72 = $5[27];
+        }
+        let t82;
+        if ($5[28] !== lineCount2 || $5[29] !== t2.textFaint) {
+          t82 = lineCount2 > 1 && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+            fg: t2.textFaint,
+            children: [
+              " (",
+              String(lineCount2),
+              " lines)"
+            ]
+          }, undefined, true, undefined, this);
+          $5[28] = lineCount2;
+          $5[29] = t2.textFaint;
+          $5[30] = t82;
+        } else {
+          t82 = $5[30];
+        }
+        let t92;
+        if ($5[31] !== t2.textFaint) {
+          t92 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+            fg: t2.textFaint,
+            children: " ^O"
+          }, undefined, false, undefined, this);
+          $5[31] = t2.textFaint;
+          $5[32] = t92;
+        } else {
+          t92 = $5[32];
+        }
+        let t102;
+        if ($5[33] !== t2.textFaint || $5[34] !== t42 || $5[35] !== t72 || $5[36] !== t82 || $5[37] !== t92) {
+          t102 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+            fg: t32,
+            truncate: true,
+            children: [
+              t42,
+              " ",
+              t52,
+              " ",
+              t72,
+              t82,
+              t92
+            ]
+          }, undefined, true, undefined, this);
+          $5[33] = t2.textFaint;
+          $5[34] = t42;
+          $5[35] = t72;
+          $5[36] = t82;
+          $5[37] = t92;
+          $5[38] = t102;
+        } else {
+          t102 = $5[38];
+        }
+        let t112;
+        if ($5[39] !== t102 || $5[40] !== t23) {
+          t112 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+            height: 1,
+            flexShrink: 0,
+            children: t102
+          }, t23, false, undefined, this);
+          $5[39] = t102;
+          $5[40] = t23;
+          $5[41] = t112;
+        } else {
+          t112 = $5[41];
+        }
+        t1 = t112;
+        break bb0;
+      }
+    }
+    $5[0] = content;
+    $5[1] = expanded;
+    $5[2] = id;
+    $5[3] = isStreaming;
+    $5[4] = t2.success;
+    $5[5] = t2.textFaint;
+    $5[6] = t2.textSubtle;
+    $5[7] = t1;
+  } else {
+    t1 = $5[7];
+  }
+  if (t1 !== Symbol.for("react.early_return_sentinel")) {
+    return t1;
+  }
+  const bc = isStreaming ? t2.brandDim : t2.border;
+  const label = isStreaming ? "reasoning\u2026" : "reasoning";
+  let t10;
+  let t11;
+  let t22;
+  let t3;
+  let t4;
+  let t5;
+  let t6;
+  let t7;
+  let t8;
+  let t9;
+  if ($5[42] !== bc || $5[43] !== content || $5[44] !== id || $5[45] !== label || $5[46] !== t2.bgElevated || $5[47] !== t2.brandDim || $5[48] !== t2.textFaint || $5[49] !== t2.textSecondary) {
+    const trimmed = content.trim();
+    t5 = `${id}-exp`;
+    t6 = "column";
+    t7 = 0;
+    t8 = true;
+    t9 = "rounded";
+    t10 = bc;
+    const t122 = t2.bgElevated;
+    const t132 = t2.brandDim;
+    let t14;
+    if ($5[60] === Symbol.for("react.memo_cache_sentinel")) {
+      t14 = brainIcon();
+      $5[60] = t14;
+    } else {
+      t14 = $5[60];
+    }
+    let t15;
+    if ($5[61] !== t2.brandDim) {
+      t15 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+        fg: t132,
+        children: t14
+      }, undefined, false, undefined, this);
+      $5[61] = t2.brandDim;
+      $5[62] = t15;
+    } else {
+      t15 = $5[62];
+    }
+    let t16;
+    if ($5[63] !== label || $5[64] !== t2.brandDim) {
+      t16 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+        fg: t2.brandDim,
+        children: label
+      }, undefined, false, undefined, this);
+      $5[63] = label;
+      $5[64] = t2.brandDim;
+      $5[65] = t16;
+    } else {
+      t16 = $5[65];
+    }
+    let t17;
+    if ($5[66] !== t2.textFaint) {
+      t17 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+        fg: t2.textFaint,
+        children: " ^O"
+      }, undefined, false, undefined, this);
+      $5[66] = t2.textFaint;
+      $5[67] = t17;
+    } else {
+      t17 = $5[67];
+    }
+    let t18;
+    if ($5[68] !== t15 || $5[69] !== t16 || $5[70] !== t17) {
+      t18 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+        truncate: true,
+        children: [
+          t15,
+          " ",
+          t16,
+          t17
+        ]
+      }, undefined, true, undefined, this);
+      $5[68] = t15;
+      $5[69] = t16;
+      $5[70] = t17;
+      $5[71] = t18;
+    } else {
+      t18 = $5[71];
+    }
+    if ($5[72] !== t2.bgElevated || $5[73] !== t18) {
+      t11 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+        height: 1,
+        flexShrink: 0,
+        paddingX: 1,
+        backgroundColor: t122,
+        alignSelf: "flex-start",
+        marginTop: -1,
+        children: t18
+      }, undefined, false, undefined, this);
+      $5[72] = t2.bgElevated;
+      $5[73] = t18;
+      $5[74] = t11;
+    } else {
+      t11 = $5[74];
+    }
+    t22 = "column";
+    t3 = 1;
+    let t19;
+    if ($5[75] !== t2.textSecondary) {
+      t19 = (line2, i4) => /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+        fg: t2.textSecondary,
+        children: line2
+      }, i4, false, undefined, this);
+      $5[75] = t2.textSecondary;
+      $5[76] = t19;
+    } else {
+      t19 = $5[76];
+    }
+    t4 = trimmed.split(`
+`).map(t19);
+    $5[42] = bc;
+    $5[43] = content;
+    $5[44] = id;
+    $5[45] = label;
+    $5[46] = t2.bgElevated;
+    $5[47] = t2.brandDim;
+    $5[48] = t2.textFaint;
+    $5[49] = t2.textSecondary;
+    $5[50] = t10;
+    $5[51] = t11;
+    $5[52] = t22;
+    $5[53] = t3;
+    $5[54] = t4;
+    $5[55] = t5;
+    $5[56] = t6;
+    $5[57] = t7;
+    $5[58] = t8;
+    $5[59] = t9;
+  } else {
+    t10 = $5[50];
+    t11 = $5[51];
+    t22 = $5[52];
+    t3 = $5[53];
+    t4 = $5[54];
+    t5 = $5[55];
+    t6 = $5[56];
+    t7 = $5[57];
+    t8 = $5[58];
+    t9 = $5[59];
+  }
+  let t12;
+  if ($5[77] !== t22 || $5[78] !== t3 || $5[79] !== t4) {
+    t12 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+      flexDirection: t22,
+      paddingX: t3,
+      children: t4
+    }, undefined, false, undefined, this);
+    $5[77] = t22;
+    $5[78] = t3;
+    $5[79] = t4;
+    $5[80] = t12;
+  } else {
+    t12 = $5[80];
+  }
+  let t13;
+  if ($5[81] !== t10 || $5[82] !== t11 || $5[83] !== t12 || $5[84] !== t5 || $5[85] !== t6 || $5[86] !== t7 || $5[87] !== t8 || $5[88] !== t9) {
+    t13 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+      flexDirection: t6,
+      flexShrink: t7,
+      border: t8,
+      borderStyle: t9,
+      borderColor: t10,
+      children: [
+        t11,
+        t12
+      ]
+    }, t5, true, undefined, this);
+    $5[81] = t10;
+    $5[82] = t11;
+    $5[83] = t12;
+    $5[84] = t5;
+    $5[85] = t6;
+    $5[86] = t7;
+    $5[87] = t8;
+    $5[88] = t9;
+    $5[89] = t13;
+  } else {
+    t13 = $5[89];
+  }
+  return t13;
+}
+var import_compiler_runtime15, brainIcon = () => icon("brain");
+var init_ReasoningBlock = __esm(() => {
+  init_icons();
+  init_theme();
+  init_shared2();
+  init_jsx_dev_runtime();
+  import_compiler_runtime15 = __toESM(require_compiler_runtime(), 1);
+});
+
 // src/components/chat/multi-agent-display.ts
 function shortModelId(modelId) {
   const parts2 = modelId.split("/");
@@ -443513,8 +443627,7 @@ function renderToolCall2(tc, seconds, diffStyle, t2, connector) {
     try {
       const plan = JSON.parse(tc.args);
       if (plan.title && Array.isArray(plan.steps) && Array.isArray(plan.files)) {
-        return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-          flexDirection: "column",
+        const planContent = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(import_jsx_dev_runtime2.Fragment, {
           children: [
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(StructuredPlanView, {
               plan,
@@ -443542,17 +443655,48 @@ function renderToolCall2(tc, seconds, diffStyle, t2, connector) {
               }, undefined, true, undefined, this)
             }, undefined, false, undefined, this)
           ]
-        }, tc.id, true, undefined, this);
+        }, undefined, true, undefined, this);
+        if (connector) {
+          const char = connector.isLast ? "\u2514 " : connector.isFirst ? "\u250C " : "\u251C ";
+          return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+            flexDirection: "column",
+            children: [
+              /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+                height: 1,
+                flexShrink: 0,
+                children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+                  children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                    fg: t2.textFaint,
+                    children: char
+                  }, undefined, false, undefined, this)
+                }, undefined, false, undefined, this)
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+                border: ["left"],
+                customBorderChars: connector.isLast ? TREE_SPACE : TREE_PIPE,
+                borderColor: t2.textFaint,
+                paddingLeft: 1,
+                children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+                  flexDirection: "column",
+                  children: planContent
+                }, undefined, false, undefined, this)
+              }, undefined, false, undefined, this)
+            ]
+          }, tc.id, true, undefined, this);
+        }
+        return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+          flexDirection: "column",
+          children: planContent
+        }, tc.id, false, undefined, this);
       }
     } catch {}
   }
   if (connector) {
-    const char = connector.isLast ? "\u2514 " : connector.isFirst ? "\u250C " : "\u251C ";
     return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(ToolRow, {
       tc,
       seconds,
       diffStyle,
-      connectorChar: char
+      treePosition: connector
     }, tc.id, false, undefined, this);
   }
   return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(ToolRow, {
@@ -443570,7 +443714,7 @@ function _temp25(s_0) {
 function _temp35(s_1) {
   return s_1.state !== "running";
 }
-var import_compiler_runtime16, import_react38, SUBAGENT_NAMES, RENDER_DEBOUNCE = 80, Spinner2, ChildStepRow, MultiAgentChildRow, ToolRow, QUIET_TOOLS, EDIT_TOOL_NAMES, ToolCallDisplay;
+var import_compiler_runtime16, import_react38, SUBAGENT_NAMES, RENDER_DEBOUNCE = 80, Spinner2, ChildStepRow, MultiAgentChildRow, TREE_PIPE, TREE_SPACE, ToolRow, QUIET_TOOLS, EDIT_TOOL_NAMES, ToolCallDisplay;
 var init_ToolCallDisplay = __esm(async () => {
   init_icons();
   init_theme();
@@ -443581,6 +443725,7 @@ var init_ToolCallDisplay = __esm(async () => {
   await __promiseAll([
     init_core4(),
     init_StructuredPlanView(),
+    init_DiffView(),
     init_dispatch_display(),
     init_StaticToolRow()
   ]);
@@ -444417,11 +444562,37 @@ var init_ToolCallDisplay = __esm(async () => {
     const n = next.childSteps[i4];
     return n && s2.toolName === n.toolName && s2.state === n.state && s2.args === n.args && s2.cacheState === n.cacheState;
   }) && prev.liveStats?.toolUses === next.liveStats?.toolUses && prev.liveStats?.tokenUsage?.total === next.liveStats?.tokenUsage?.total && prev.liveStats?.cacheHits === next.liveStats?.cacheHits);
+  TREE_PIPE = {
+    vertical: "\u2502",
+    horizontal: " ",
+    topLeft: " ",
+    topRight: " ",
+    bottomLeft: " ",
+    bottomRight: " ",
+    topT: " ",
+    bottomT: " ",
+    leftT: " ",
+    rightT: " ",
+    cross: " "
+  };
+  TREE_SPACE = {
+    vertical: " ",
+    horizontal: " ",
+    topLeft: " ",
+    topRight: " ",
+    bottomLeft: " ",
+    bottomRight: " ",
+    topT: " ",
+    bottomT: " ",
+    leftT: " ",
+    rightT: " ",
+    cross: " "
+  };
   ToolRow = import_react38.memo(function ToolRow2({
     tc,
     seconds,
     diffStyle = "default",
-    connectorChar
+    treePosition
   }) {
     const t2 = useTheme();
     const isSubagent = SUBAGENT_NAMES.has(tc.toolName);
@@ -444531,6 +444702,7 @@ var init_ToolCallDisplay = __esm(async () => {
         children: "\u2713"
       }, undefined, false, undefined, this);
     })();
+    const connectorChar = treePosition ? treePosition.isLast ? "\u2514 " : treePosition.isFirst ? "\u250C " : "\u251C " : undefined;
     const statusContent = connectorChar ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(import_jsx_dev_runtime2.Fragment, {
       children: [
         /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
@@ -444540,103 +444712,168 @@ var init_ToolCallDisplay = __esm(async () => {
         statusIcon
       ]
     }, undefined, true, undefined, this) : statusIcon;
+    const inTree = !!treePosition;
+    const hasExpanded = inTree && (!!staticProps.diff || staticProps.imageArt && staticProps.imageArt.length > 0 || isMultiAgent && multiProgress !== null && multiProgress.agents.size > 0 && !dispatchRejection || isSubagent && !isMultiAgent && allChildSteps.length > 0);
+    const multiAgentContent = isMultiAgent && multiProgress !== null && multiProgress.agents.size > 0 && !dispatchRejection ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+      flexDirection: "column",
+      marginLeft: 2,
+      children: [...multiProgress.agents.entries()].map(([agentId, info2], idx, arr) => {
+        const agentSteps = allChildSteps.filter((s2) => s2.agentId === agentId);
+        const isLastVisible = idx === arr.length - 1;
+        const allAccountedFor = arr.length >= (multiProgress.totalAgents ?? arr.length);
+        return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(MultiAgentChildRow, {
+          agentId,
+          info: info2,
+          isFirst: idx === 0,
+          isLast: isLastVisible && allAccountedFor,
+          childSteps: agentSteps,
+          liveStats: liveStats.get(agentId)
+        }, agentId, false, undefined, this);
+      })
+    }, undefined, false, undefined, this) : null;
+    const singleAgentContent = isSubagent && !isMultiAgent && allChildSteps.length > 0 ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+      flexDirection: "column",
+      children: (() => {
+        const MAX_SINGLE = 5;
+        const filtered = allChildSteps.filter((s_0) => !QUIET_TOOLS.has(s_0.toolName));
+        const running = filtered.filter((s_1) => s_1.state === "running");
+        const done_0 = filtered.filter((s_2) => s_2.state !== "running");
+        const doneSlots = Math.max(0, MAX_SINGLE - running.length);
+        const visibleDone = done_0.slice(-doneSlots);
+        const hiddenCount = done_0.length - visibleDone.length;
+        const visible = [...visibleDone, ...running];
+        const agentRunning = tc.state === "running";
+        const showThinking = agentRunning && running.length === 0 && done_0.length > 0;
+        return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(import_jsx_dev_runtime2.Fragment, {
+          children: [
+            hiddenCount > 0 && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+              height: 1,
+              flexShrink: 0,
+              marginLeft: 3,
+              children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+                truncate: true,
+                children: [
+                  /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                    fg: t2.textFaint,
+                    children: "\u251C "
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                    fg: t2.textDim,
+                    children: [
+                      "+",
+                      String(hiddenCount),
+                      " completed"
+                    ]
+                  }, undefined, true, undefined, this)
+                ]
+              }, undefined, true, undefined, this)
+            }, undefined, false, undefined, this),
+            visible.map((step, si) => {
+              const stableIdx = allChildSteps.indexOf(step);
+              const last = si === visible.length - 1 && !showThinking;
+              return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(ChildStepRow, {
+                step,
+                isLast: last
+              }, `${step.toolName}-${String(stableIdx)}`, false, undefined, this);
+            }),
+            showThinking && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+              height: 1,
+              flexShrink: 0,
+              marginLeft: 3,
+              children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+                truncate: true,
+                children: [
+                  /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                    fg: t2.textFaint,
+                    children: "\u2514 "
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(Spinner2, {
+                    color: t2.textMuted
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                    fg: t2.textMuted,
+                    children: " thinking..."
+                  }, undefined, false, undefined, this)
+                ]
+              }, undefined, true, undefined, this)
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this);
+      })()
+    }, undefined, false, undefined, this) : null;
+    const diffContent = staticProps.diff ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+      marginTop: 1,
+      flexDirection: "column",
+      children: [
+        /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(DiffView, {
+          filePath: staticProps.diff.path,
+          oldString: staticProps.diff.oldString,
+          newString: staticProps.diff.newString,
+          success: staticProps.diff.success,
+          errorMessage: staticProps.diff.errorMessage,
+          mode: diffStyle
+        }, undefined, false, undefined, this),
+        staticProps.diff.impact ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+          fg: t2.textMuted,
+          children: [
+            "  ",
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+              fg: t2.amber,
+              children: icon("impact")
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+              fg: t2.textSecondary,
+              children: [
+                " ",
+                staticProps.diff.impact
+              ]
+            }, undefined, true, undefined, this)
+          ]
+        }, undefined, true, undefined, this) : null
+      ]
+    }, undefined, true, undefined, this) : null;
+    const imageContent = staticProps.imageArt && staticProps.imageArt.length > 0 ? staticProps.imageArt.map((img) => /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+      flexDirection: "column",
+      marginTop: 1,
+      children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("ghostty-terminal", {
+        ansi: img.lines.join(`
+`),
+        cols: 130,
+        rows: img.lines.length,
+        trimEnd: true
+      }, undefined, false, undefined, this)
+    }, img.name, false, undefined, this)) : null;
     return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
       flexDirection: "column",
       children: [
         /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(StaticToolRow, {
           ...staticProps,
-          statusContent
-        }, undefined, false, undefined, this),
-        isMultiAgent && multiProgress !== null && multiProgress.agents.size > 0 && !dispatchRejection && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-          flexDirection: "column",
-          marginLeft: 2,
-          children: [...multiProgress.agents.entries()].map(([agentId, info2], idx, arr) => {
-            const agentSteps = allChildSteps.filter((s2) => s2.agentId === agentId);
-            const isLastVisible = idx === arr.length - 1;
-            const allAccountedFor = arr.length >= (multiProgress.totalAgents ?? arr.length);
-            return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(MultiAgentChildRow, {
-              agentId,
-              info: info2,
-              isFirst: idx === 0,
-              isLast: isLastVisible && allAccountedFor,
-              childSteps: agentSteps,
-              liveStats: liveStats.get(agentId)
-            }, agentId, false, undefined, this);
-          })
+          statusContent,
+          suppressExpanded: inTree
         }, undefined, false, undefined, this),
-        isSubagent && !isMultiAgent && allChildSteps.length > 0 && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-          flexDirection: "column",
-          children: (() => {
-            const MAX_SINGLE = 5;
-            const filtered = allChildSteps.filter((s_0) => !QUIET_TOOLS.has(s_0.toolName));
-            const running = filtered.filter((s_1) => s_1.state === "running");
-            const done_0 = filtered.filter((s_2) => s_2.state !== "running");
-            const doneSlots = Math.max(0, MAX_SINGLE - running.length);
-            const visibleDone = done_0.slice(-doneSlots);
-            const hiddenCount = done_0.length - visibleDone.length;
-            const visible = [...visibleDone, ...running];
-            const agentRunning = tc.state === "running";
-            const showThinking = agentRunning && running.length === 0 && done_0.length > 0;
-            return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(import_jsx_dev_runtime2.Fragment, {
-              children: [
-                hiddenCount > 0 && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-                  height: 1,
-                  flexShrink: 0,
-                  marginLeft: 3,
-                  children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-                    truncate: true,
-                    children: [
-                      /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-                        fg: t2.textFaint,
-                        children: "\u251C "
-                      }, undefined, false, undefined, this),
-                      /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-                        fg: t2.textDim,
-                        children: [
-                          "+",
-                          String(hiddenCount),
-                          " completed"
-                        ]
-                      }, undefined, true, undefined, this)
-                    ]
-                  }, undefined, true, undefined, this)
-                }, undefined, false, undefined, this),
-                visible.map((step, si) => {
-                  const stableIdx = allChildSteps.indexOf(step);
-                  const last = si === visible.length - 1 && !showThinking;
-                  return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(ChildStepRow, {
-                    step,
-                    isLast: last
-                  }, `${step.toolName}-${String(stableIdx)}`, false, undefined, this);
-                }),
-                showThinking && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-                  height: 1,
-                  flexShrink: 0,
-                  marginLeft: 3,
-                  children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-                    truncate: true,
-                    children: [
-                      /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-                        fg: t2.textFaint,
-                        children: "\u2514 "
-                      }, undefined, false, undefined, this),
-                      /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(Spinner2, {
-                        color: t2.textMuted
-                      }, undefined, false, undefined, this),
-                      /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-                        fg: t2.textMuted,
-                        children: " thinking..."
-                      }, undefined, false, undefined, this)
-                    ]
-                  }, undefined, true, undefined, this)
-                }, undefined, false, undefined, this)
-              ]
-            }, undefined, true, undefined, this);
-          })()
-        }, undefined, false, undefined, this)
+        hasExpanded ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+          border: ["left"],
+          customBorderChars: treePosition?.isLast ? TREE_SPACE : TREE_PIPE,
+          borderColor: t2.textFaint,
+          paddingLeft: 1,
+          children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+            flexDirection: "column",
+            children: [
+              diffContent,
+              imageContent,
+              multiAgentContent,
+              singleAgentContent
+            ]
+          }, undefined, true, undefined, this)
+        }, undefined, false, undefined, this) : /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(import_jsx_dev_runtime2.Fragment, {
+          children: [
+            multiAgentContent,
+            singleAgentContent
+          ]
+        }, undefined, true, undefined, this)
       ]
     }, undefined, true, undefined, this);
-  }, (prev, next) => prev.tc.id === next.tc.id && prev.tc.state === next.tc.state && prev.tc.args === next.tc.args && prev.tc.result === next.tc.result && prev.tc.error === next.tc.error && prev.tc.backend === next.tc.backend && prev.seconds === next.seconds && prev.diffStyle === next.diffStyle);
+  }, (prev, next) => prev.tc.id === next.tc.id && prev.tc.state === next.tc.state && prev.tc.args === next.tc.args && prev.tc.result === next.tc.result && prev.tc.error === next.tc.error && prev.tc.backend === next.tc.backend && prev.seconds === next.seconds && prev.diffStyle === next.diffStyle && prev.treePosition?.isFirst === next.treePosition?.isFirst && prev.treePosition?.isLast === next.treePosition?.isLast);
   QUIET_TOOLS = new Set(["update_plan_step", "ask_user", "task_list"]);
   EDIT_TOOL_NAMES = new Set(["edit_file", "multi_edit"]);
   ToolCallDisplay = import_react38.memo(function ToolCallDisplay2(t0) {
@@ -445225,7 +445462,7 @@ var init_tool_formatters = __esm(async () => {
 
 // src/components/chat/StaticToolRow.tsx
 function StaticToolRow(t0) {
-  const $5 = import_compiler_runtime17.c(56);
+  const $5 = import_compiler_runtime17.c(58);
   const {
     statusContent,
     isDone,
@@ -445243,34 +445480,36 @@ function StaticToolRow(t0) {
     suffixColor,
     diff,
     diffStyle: t1,
-    imageArt
+    imageArt,
+    suppressExpanded: t2
   } = t0;
   const diffStyle = t1 === undefined ? "default" : t1;
-  const t2 = useTheme();
-  let t22;
-  if ($5[0] !== t2.brand || $5[1] !== t2.error || $5[2] !== t2.success || $5[3] !== t2.textMuted || $5[4] !== t2.textSecondary) {
-    t22 = {
-      textDone: t2.textMuted,
-      toolNameActive: t2.brand,
-      argsActive: t2.textSecondary,
-      checkDone: t2.success,
-      error: t2.error
-    };
-    $5[0] = t2.brand;
-    $5[1] = t2.error;
-    $5[2] = t2.success;
-    $5[3] = t2.textMuted;
-    $5[4] = t2.textSecondary;
-    $5[5] = t22;
+  const suppressExpanded = t2 === undefined ? false : t2;
+  const t3 = useTheme();
+  let t32;
+  if ($5[0] !== t3.brand || $5[1] !== t3.error || $5[2] !== t3.success || $5[3] !== t3.textMuted || $5[4] !== t3.textSecondary) {
+    t32 = {
+      textDone: t3.textMuted,
+      toolNameActive: t3.brand,
+      argsActive: t3.textSecondary,
+      checkDone: t3.success,
+      error: t3.error
+    };
+    $5[0] = t3.brand;
+    $5[1] = t3.error;
+    $5[2] = t3.success;
+    $5[3] = t3.textMuted;
+    $5[4] = t3.textSecondary;
+    $5[5] = t32;
   } else {
-    t22 = $5[5];
+    t32 = $5[5];
   }
-  const rc = t22;
-  const t3 = isDone ? rc.textDone : iconColor;
-  let t4;
-  if ($5[6] !== icon2 || $5[7] !== t3) {
-    t4 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-      fg: t3,
+  const rc = t32;
+  const t4 = isDone ? rc.textDone : iconColor;
+  let t5;
+  if ($5[6] !== icon2 || $5[7] !== t4) {
+    t5 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+      fg: t4,
       children: [
         " ",
         icon2,
@@ -445278,15 +445517,15 @@ function StaticToolRow(t0) {
       ]
     }, undefined, true, undefined, this);
     $5[6] = icon2;
-    $5[7] = t3;
-    $5[8] = t4;
+    $5[7] = t4;
+    $5[8] = t5;
   } else {
-    t4 = $5[8];
+    t5 = $5[8];
   }
-  let t5;
-  if ($5[9] !== category || $5[10] !== categoryColor || $5[11] !== isDone || $5[12] !== t2.textDim) {
-    t5 = category ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-      fg: isDone ? t2.textDim : categoryColor,
+  let t6;
+  if ($5[9] !== category || $5[10] !== categoryColor || $5[11] !== isDone || $5[12] !== t3.textDim) {
+    t6 = category ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+      fg: isDone ? t3.textDim : categoryColor,
       children: [
         "[",
         category,
@@ -445296,15 +445535,15 @@ function StaticToolRow(t0) {
     $5[9] = category;
     $5[10] = categoryColor;
     $5[11] = isDone;
-    $5[12] = t2.textDim;
-    $5[13] = t5;
+    $5[12] = t3.textDim;
+    $5[13] = t6;
   } else {
-    t5 = $5[13];
+    t6 = $5[13];
   }
-  let t6;
-  if ($5[14] !== backendColor || $5[15] !== backendTag || $5[16] !== category || $5[17] !== isDone || $5[18] !== t2.textDim) {
-    t6 = backendTag ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-      fg: isDone ? t2.textDim : backendColor,
+  let t7;
+  if ($5[14] !== backendColor || $5[15] !== backendTag || $5[16] !== category || $5[17] !== isDone || $5[18] !== t3.textDim) {
+    t7 = backendTag ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+      fg: isDone ? t3.textDim : backendColor,
       children: [
         "[",
         getBackendLabel(backendTag),
@@ -445317,15 +445556,15 @@ function StaticToolRow(t0) {
     $5[15] = backendTag;
     $5[16] = category;
     $5[17] = isDone;
-    $5[18] = t2.textDim;
-    $5[19] = t6;
+    $5[18] = t3.textDim;
+    $5[19] = t7;
   } else {
-    t6 = $5[19];
+    t7 = $5[19];
   }
-  let t7;
-  if ($5[20] !== isDone || $5[21] !== outsideBadge || $5[22] !== t2.textDim) {
-    t7 = outsideBadge ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-      fg: isDone ? t2.textDim : outsideBadge.color,
+  let t8;
+  if ($5[20] !== isDone || $5[21] !== outsideBadge || $5[22] !== t3.textDim) {
+    t8 = outsideBadge ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+      fg: isDone ? t3.textDim : outsideBadge.color,
       children: [
         "[",
         outsideBadge.label,
@@ -445334,14 +445573,14 @@ function StaticToolRow(t0) {
     }, undefined, true, undefined, this) : null;
     $5[20] = isDone;
     $5[21] = outsideBadge;
-    $5[22] = t2.textDim;
-    $5[23] = t7;
+    $5[22] = t3.textDim;
+    $5[23] = t8;
   } else {
-    t7 = $5[23];
+    t8 = $5[23];
   }
-  let t8;
+  let t9;
   if ($5[24] !== argStr || $5[25] !== editResultText || $5[26] !== isDone || $5[27] !== label || $5[28] !== rc.argsActive || $5[29] !== rc.textDone || $5[30] !== rc.toolNameActive) {
-    t8 = editResultText ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+    t9 = editResultText ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
       fg: rc.textDone,
       children: editResultText
     }, undefined, false, undefined, this) : /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(import_jsx_dev_runtime2.Fragment, {
@@ -445367,55 +445606,55 @@ function StaticToolRow(t0) {
     $5[28] = rc.argsActive;
     $5[29] = rc.textDone;
     $5[30] = rc.toolNameActive;
-    $5[31] = t8;
+    $5[31] = t9;
   } else {
-    t8 = $5[31];
+    t9 = $5[31];
   }
-  let t9;
+  let t10;
   if ($5[32] !== rc.textDone || $5[33] !== suffix || $5[34] !== suffixColor) {
-    t9 = suffix ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+    t10 = suffix ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
       fg: suffixColor ?? rc.textDone,
       children: suffix
     }, undefined, false, undefined, this) : null;
     $5[32] = rc.textDone;
     $5[33] = suffix;
     $5[34] = suffixColor;
-    $5[35] = t9;
+    $5[35] = t10;
   } else {
-    t9 = $5[35];
+    t10 = $5[35];
   }
-  let t10;
-  if ($5[36] !== statusContent || $5[37] !== t4 || $5[38] !== t5 || $5[39] !== t6 || $5[40] !== t7 || $5[41] !== t8 || $5[42] !== t9) {
-    t10 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+  let t11;
+  if ($5[36] !== statusContent || $5[37] !== t10 || $5[38] !== t5 || $5[39] !== t6 || $5[40] !== t7 || $5[41] !== t8 || $5[42] !== t9) {
+    t11 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
       height: 1,
       flexShrink: 0,
       children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
         truncate: true,
         children: [
           statusContent,
-          t4,
           t5,
           t6,
           t7,
           t8,
-          t9
+          t9,
+          t10
         ]
       }, undefined, true, undefined, this)
     }, undefined, false, undefined, this);
     $5[36] = statusContent;
-    $5[37] = t4;
+    $5[37] = t10;
     $5[38] = t5;
     $5[39] = t6;
     $5[40] = t7;
     $5[41] = t8;
     $5[42] = t9;
-    $5[43] = t10;
+    $5[43] = t11;
   } else {
-    t10 = $5[43];
+    t11 = $5[43];
   }
-  let t11;
-  if ($5[44] !== diff || $5[45] !== diffStyle || $5[46] !== t2.amber || $5[47] !== t2.textMuted || $5[48] !== t2.textSecondary) {
-    t11 = diff ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+  let t12;
+  if ($5[44] !== diff || $5[45] !== diffStyle || $5[46] !== suppressExpanded || $5[47] !== t3.amber || $5[48] !== t3.textMuted || $5[49] !== t3.textSecondary) {
+    t12 = !suppressExpanded && diff ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
       marginTop: 1,
       flexDirection: "column",
       children: [
@@ -445428,15 +445667,15 @@ function StaticToolRow(t0) {
           mode: diffStyle
         }, undefined, false, undefined, this),
         diff.impact ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-          fg: t2.textMuted,
+          fg: t3.textMuted,
           children: [
             "  ",
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-              fg: t2.amber,
+              fg: t3.amber,
               children: icon("impact")
             }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-              fg: t2.textSecondary,
+              fg: t3.textSecondary,
               children: [
                 " ",
                 diff.impact
@@ -445448,39 +445687,41 @@ function StaticToolRow(t0) {
     }, undefined, true, undefined, this) : null;
     $5[44] = diff;
     $5[45] = diffStyle;
-    $5[46] = t2.amber;
-    $5[47] = t2.textMuted;
-    $5[48] = t2.textSecondary;
-    $5[49] = t11;
+    $5[46] = suppressExpanded;
+    $5[47] = t3.amber;
+    $5[48] = t3.textMuted;
+    $5[49] = t3.textSecondary;
+    $5[50] = t12;
   } else {
-    t11 = $5[49];
+    t12 = $5[50];
   }
-  let t12;
-  if ($5[50] !== imageArt) {
-    t12 = imageArt && imageArt.length > 0 ? imageArt.map(_temp17) : null;
-    $5[50] = imageArt;
-    $5[51] = t12;
+  let t13;
+  if ($5[51] !== imageArt || $5[52] !== suppressExpanded) {
+    t13 = !suppressExpanded && imageArt && imageArt.length > 0 ? imageArt.map(_temp17) : null;
+    $5[51] = imageArt;
+    $5[52] = suppressExpanded;
+    $5[53] = t13;
   } else {
-    t12 = $5[51];
+    t13 = $5[53];
   }
-  let t13;
-  if ($5[52] !== t10 || $5[53] !== t11 || $5[54] !== t12) {
-    t13 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+  let t14;
+  if ($5[54] !== t11 || $5[55] !== t12 || $5[56] !== t13) {
+    t14 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
       flexDirection: "column",
       children: [
-        t10,
         t11,
-        t12
+        t12,
+        t13
       ]
     }, undefined, true, undefined, this);
-    $5[52] = t10;
-    $5[53] = t11;
-    $5[54] = t12;
-    $5[55] = t13;
+    $5[54] = t11;
+    $5[55] = t12;
+    $5[56] = t13;
+    $5[57] = t14;
   } else {
-    t13 = $5[55];
+    t14 = $5[57];
   }
-  return t13;
+  return t14;
 }
 function _temp17(img) {
   return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
@@ -446081,199 +446322,372 @@ function isDenied(error48) {
   return !!error48 && /denied|rejected|cancelled/i.test(error48);
 }
 function ToolCallRow(t0) {
-  const $5 = import_compiler_runtime18.c(21);
+  const $5 = import_compiler_runtime18.c(44);
   const {
     tc,
     diffStyle,
-    autoCompactDiffs: t1
+    autoCompactDiffs: t1,
+    connectorChar,
+    treePosition
   } = t0;
   const autoCompactDiffs = t1 === undefined ? false : t1;
   const t2 = useTheme();
   const expanded = useCodeExpanded();
   const errorsExpanded = useReasoningExpanded();
+  let diffContent;
+  let errorContent;
+  let inTree;
   let props;
-  if ($5[0] !== autoCompactDiffs || $5[1] !== diffStyle || $5[2] !== expanded || $5[3] !== tc) {
+  let showErrorDetail;
+  let t22;
+  if ($5[0] !== autoCompactDiffs || $5[1] !== connectorChar || $5[2] !== diffStyle || $5[3] !== errorsExpanded || $5[4] !== expanded || $5[5] !== t2 || $5[6] !== tc || $5[7] !== treePosition) {
     props = buildFinalToolRowProps(tc);
+    const effectiveDiffStyle = props.diff ? expanded || !autoCompactDiffs ? diffStyle : "compact" : diffStyle;
     if (props.diff) {
-      props.diffStyle = expanded || !autoCompactDiffs ? diffStyle : "compact";
+      props.diffStyle = effectiveDiffStyle;
     }
-    $5[0] = autoCompactDiffs;
-    $5[1] = diffStyle;
-    $5[2] = expanded;
-    $5[3] = tc;
-    $5[4] = props;
-  } else {
-    props = $5[4];
-  }
-  const fullError = tc.result?.error ?? "";
-  const isError = !!tc.result && !tc.result.success && !isDenied(tc.result?.error);
-  if (isError && errorsExpanded && fullError.length > 0) {
-    let t23;
-    if ($5[5] !== fullError) {
-      t23 = fullError.length > 120 ? `${fullError.slice(0, 117)}\u2026` : fullError;
-      $5[5] = fullError;
-      $5[6] = t23;
-    } else {
-      t23 = $5[6];
+    if (connectorChar) {
+      const origStatus = props.statusContent;
+      let t33;
+      if ($5[14] !== connectorChar || $5[15] !== t2.textFaint) {
+        t33 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+          fg: t2.textFaint,
+          children: connectorChar
+        }, undefined, false, undefined, this);
+        $5[14] = connectorChar;
+        $5[15] = t2.textFaint;
+        $5[16] = t33;
+      } else {
+        t33 = $5[16];
+      }
+      props.statusContent = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(import_jsx_dev_runtime2.Fragment, {
+        children: [
+          t33,
+          origStatus
+        ]
+      }, undefined, true, undefined, this);
     }
-    const errorPreview = t23;
-    const hasMore = fullError.length > 120;
-    let t3;
-    if ($5[7] !== props) {
-      t3 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(StaticToolRow, {
-        ...props
-      }, undefined, false, undefined, this);
-      $5[7] = props;
-      $5[8] = t3;
+    inTree = !!treePosition;
+    const hasExpandedContent = inTree && (!!props.diff || props.imageArt && props.imageArt.length > 0);
+    const fullError = tc.result?.error ?? "";
+    let t32;
+    if ($5[17] !== tc.result) {
+      t32 = !!tc.result && !tc.result.success && !isDenied(tc.result?.error);
+      $5[17] = tc.result;
+      $5[18] = t32;
     } else {
-      t3 = $5[8];
+      t32 = $5[18];
     }
+    const isError = t32;
+    showErrorDetail = isError && errorsExpanded && fullError.length > 0;
     let t4;
-    if ($5[9] !== hasMore || $5[10] !== t2.textMuted) {
-      t4 = hasMore ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-        fg: t2.textMuted,
-        children: " /errors for full"
-      }, undefined, false, undefined, this) : null;
-      $5[9] = hasMore;
-      $5[10] = t2.textMuted;
-      $5[11] = t4;
+    if ($5[19] !== fullError || $5[20] !== showErrorDetail || $5[21] !== t2) {
+      t4 = showErrorDetail ? (() => {
+        const errorPreview = fullError.length > 120 ? `${fullError.slice(0, 117)}\u2026` : fullError;
+        const hasMore = fullError.length > 120;
+        return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+          paddingLeft: 3,
+          height: 1,
+          flexShrink: 0,
+          children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+            truncate: true,
+            fg: t2.error,
+            children: [
+              errorPreview,
+              hasMore ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                fg: t2.textMuted,
+                children: " /errors for full"
+              }, undefined, false, undefined, this) : null
+            ]
+          }, undefined, true, undefined, this)
+        }, undefined, false, undefined, this);
+      })() : null;
+      $5[19] = fullError;
+      $5[20] = showErrorDetail;
+      $5[21] = t2;
+      $5[22] = t4;
     } else {
-      t4 = $5[11];
+      t4 = $5[22];
     }
-    let t5;
-    if ($5[12] !== errorPreview || $5[13] !== t2.error || $5[14] !== t4) {
-      t5 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-        paddingLeft: 3,
-        height: 1,
-        flexShrink: 0,
-        children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-          truncate: true,
-          fg: t2.error,
+    errorContent = t4;
+    diffContent = hasExpandedContent && props.diff ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+      marginTop: 1,
+      flexDirection: "column",
+      children: [
+        /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(DiffView, {
+          filePath: props.diff.path,
+          oldString: props.diff.oldString,
+          newString: props.diff.newString,
+          success: props.diff.success,
+          errorMessage: props.diff.errorMessage,
+          mode: effectiveDiffStyle
+        }, undefined, false, undefined, this),
+        props.diff.impact ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+          fg: t2.textMuted,
           children: [
-            errorPreview,
-            t4
+            "  ",
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+              fg: t2.amber,
+              children: icon("impact")
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+              fg: t2.textSecondary,
+              children: [
+                " ",
+                props.diff.impact
+              ]
+            }, undefined, true, undefined, this)
           ]
-        }, undefined, true, undefined, this)
+        }, undefined, true, undefined, this) : null
+      ]
+    }, undefined, true, undefined, this) : null;
+    t22 = hasExpandedContent && props.imageArt && props.imageArt.length > 0 ? props.imageArt.map(_temp26) : null;
+    $5[0] = autoCompactDiffs;
+    $5[1] = connectorChar;
+    $5[2] = diffStyle;
+    $5[3] = errorsExpanded;
+    $5[4] = expanded;
+    $5[5] = t2;
+    $5[6] = tc;
+    $5[7] = treePosition;
+    $5[8] = diffContent;
+    $5[9] = errorContent;
+    $5[10] = inTree;
+    $5[11] = props;
+    $5[12] = showErrorDetail;
+    $5[13] = t22;
+  } else {
+    diffContent = $5[8];
+    errorContent = $5[9];
+    inTree = $5[10];
+    props = $5[11];
+    showErrorDetail = $5[12];
+    t22 = $5[13];
+  }
+  const imageContent = t22;
+  const needsContinuation = diffContent || imageContent || inTree && errorContent;
+  if (needsContinuation) {
+    let t32;
+    if ($5[23] !== props) {
+      t32 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(StaticToolRow, {
+        ...props,
+        suppressExpanded: true
       }, undefined, false, undefined, this);
-      $5[12] = errorPreview;
-      $5[13] = t2.error;
-      $5[14] = t4;
-      $5[15] = t5;
+      $5[23] = props;
+      $5[24] = t32;
+    } else {
+      t32 = $5[24];
+    }
+    let t4;
+    if ($5[25] === Symbol.for("react.memo_cache_sentinel")) {
+      t4 = ["left"];
+      $5[25] = t4;
     } else {
-      t5 = $5[15];
+      t4 = $5[25];
     }
+    const t5 = treePosition?.isLast ? TREE_SPACE : TREE_PIPE;
     let t6;
-    if ($5[16] !== t3 || $5[17] !== t5) {
+    if ($5[26] !== diffContent || $5[27] !== errorContent || $5[28] !== imageContent) {
       t6 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+        flexDirection: "column",
+        children: [
+          diffContent,
+          imageContent,
+          errorContent
+        ]
+      }, undefined, true, undefined, this);
+      $5[26] = diffContent;
+      $5[27] = errorContent;
+      $5[28] = imageContent;
+      $5[29] = t6;
+    } else {
+      t6 = $5[29];
+    }
+    let t7;
+    if ($5[30] !== t2.textFaint || $5[31] !== t5 || $5[32] !== t6) {
+      t7 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+        border: t4,
+        customBorderChars: t5,
+        borderColor: t2.textFaint,
+        paddingLeft: 1,
+        children: t6
+      }, undefined, false, undefined, this);
+      $5[30] = t2.textFaint;
+      $5[31] = t5;
+      $5[32] = t6;
+      $5[33] = t7;
+    } else {
+      t7 = $5[33];
+    }
+    let t8;
+    if ($5[34] !== t32 || $5[35] !== t7) {
+      t8 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
         flexDirection: "column",
         flexShrink: 0,
         children: [
-          t3,
-          t5
+          t32,
+          t7
         ]
       }, undefined, true, undefined, this);
-      $5[16] = t3;
-      $5[17] = t5;
-      $5[18] = t6;
+      $5[34] = t32;
+      $5[35] = t7;
+      $5[36] = t8;
     } else {
-      t6 = $5[18];
+      t8 = $5[36];
     }
-    return t6;
+    return t8;
   }
-  let t22;
-  if ($5[19] !== props) {
-    t22 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(StaticToolRow, {
+  if (showErrorDetail) {
+    let t32;
+    if ($5[37] !== props) {
+      t32 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(StaticToolRow, {
+        ...props
+      }, undefined, false, undefined, this);
+      $5[37] = props;
+      $5[38] = t32;
+    } else {
+      t32 = $5[38];
+    }
+    let t4;
+    if ($5[39] !== errorContent || $5[40] !== t32) {
+      t4 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+        flexDirection: "column",
+        flexShrink: 0,
+        children: [
+          t32,
+          errorContent
+        ]
+      }, undefined, true, undefined, this);
+      $5[39] = errorContent;
+      $5[40] = t32;
+      $5[41] = t4;
+    } else {
+      t4 = $5[41];
+    }
+    return t4;
+  }
+  let t3;
+  if ($5[42] !== props) {
+    t3 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(StaticToolRow, {
       ...props
     }, undefined, false, undefined, this);
-    $5[19] = props;
-    $5[20] = t22;
+    $5[42] = props;
+    $5[43] = t3;
   } else {
-    t22 = $5[20];
+    t3 = $5[43];
   }
-  return t22;
+  return t3;
+}
+function _temp26(img) {
+  return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+    flexDirection: "column",
+    marginTop: 1,
+    children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("ghostty-terminal", {
+      ansi: img.lines.join(`
+`),
+      cols: 130,
+      rows: img.lines.length,
+      trimEnd: true
+    }, undefined, false, undefined, this)
+  }, img.name, false, undefined, this);
 }
 function CollapsedToolGroup(t0) {
-  const $5 = import_compiler_runtime18.c(13);
+  const $5 = import_compiler_runtime18.c(17);
   const {
-    calls
+    calls,
+    connectorChar
   } = t0;
   const t2 = useTheme();
   const count = calls.length;
-  const allOk = calls.every(_temp26);
-  const t1 = allOk ? t2.success : t2.error;
-  const t22 = allOk ? "\u2713" : "\u2717";
-  let t3;
-  if ($5[0] !== t1 || $5[1] !== t22) {
-    t3 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-      fg: t1,
+  const allOk = calls.every(_temp36);
+  let t1;
+  if ($5[0] !== connectorChar || $5[1] !== t2.textFaint) {
+    t1 = connectorChar ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+      fg: t2.textFaint,
+      children: connectorChar
+    }, undefined, false, undefined, this) : null;
+    $5[0] = connectorChar;
+    $5[1] = t2.textFaint;
+    $5[2] = t1;
+  } else {
+    t1 = $5[2];
+  }
+  const t22 = allOk ? t2.success : t2.error;
+  const t3 = allOk ? "\u2713" : "\u2717";
+  let t4;
+  if ($5[3] !== t22 || $5[4] !== t3) {
+    t4 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+      fg: t22,
       children: [
-        t22,
+        t3,
         " "
       ]
     }, undefined, true, undefined, this);
-    $5[0] = t1;
-    $5[1] = t22;
-    $5[2] = t3;
+    $5[3] = t22;
+    $5[4] = t3;
+    $5[5] = t4;
   } else {
-    t3 = $5[2];
+    t4 = $5[5];
   }
-  const t4 = t2.textSecondary;
-  const t5 = String(count);
-  const t6 = count > 1 ? "s" : "";
-  let t7;
-  if ($5[3] !== calls) {
-    t7 = calls.map(_temp36).join(", ");
-    $5[3] = calls;
-    $5[4] = t7;
+  const t5 = t2.textSecondary;
+  const t6 = String(count);
+  const t7 = count > 1 ? "s" : "";
+  let t8;
+  if ($5[6] !== calls) {
+    t8 = calls.map(_temp44).join(", ");
+    $5[6] = calls;
+    $5[7] = t8;
   } else {
-    t7 = $5[4];
+    t8 = $5[7];
   }
-  let t8;
-  if ($5[5] !== t2.textSecondary || $5[6] !== t5 || $5[7] !== t6 || $5[8] !== t7) {
-    t8 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-      fg: t4,
+  let t9;
+  if ($5[8] !== t2.textSecondary || $5[9] !== t6 || $5[10] !== t7 || $5[11] !== t8) {
+    t9 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+      fg: t5,
       children: [
-        t5,
-        " tool call",
         t6,
-        " (",
+        " tool call",
         t7,
+        " (",
+        t8,
         ")"
       ]
     }, undefined, true, undefined, this);
-    $5[5] = t2.textSecondary;
-    $5[6] = t5;
-    $5[7] = t6;
-    $5[8] = t7;
-    $5[9] = t8;
+    $5[8] = t2.textSecondary;
+    $5[9] = t6;
+    $5[10] = t7;
+    $5[11] = t8;
+    $5[12] = t9;
   } else {
-    t8 = $5[9];
+    t9 = $5[12];
   }
-  let t9;
-  if ($5[10] !== t3 || $5[11] !== t8) {
-    t9 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+  let t10;
+  if ($5[13] !== t1 || $5[14] !== t4 || $5[15] !== t9) {
+    t10 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
       height: 1,
       flexShrink: 0,
       children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
         truncate: true,
         children: [
-          t3,
-          t8
+          t1,
+          t4,
+          t9
         ]
       }, undefined, true, undefined, this)
     }, undefined, false, undefined, this);
-    $5[10] = t3;
-    $5[11] = t8;
-    $5[12] = t9;
+    $5[13] = t1;
+    $5[14] = t4;
+    $5[15] = t9;
+    $5[16] = t10;
   } else {
-    t9 = $5[12];
+    t10 = $5[16];
   }
-  return t9;
+  return t10;
 }
-function _temp36(tc_0) {
+function _temp44(tc_0) {
   return TOOL_LABELS[tc_0.name] ?? tc_0.name;
 }
-function _temp26(tc) {
+function _temp36(tc) {
   return tc.result?.success;
 }
 function parsePlanFromArgs(tc) {
@@ -446301,9 +446715,11 @@ function parsePlanResult(tc) {
   }
 }
 function WritePlanCall(t0) {
-  const $5 = import_compiler_runtime18.c(22);
+  const $5 = import_compiler_runtime18.c(37);
   const {
-    tc
+    tc,
+    connectorChar,
+    treePosition
   } = t0;
   const t2 = useTheme();
   let t1;
@@ -446349,37 +446765,41 @@ function WritePlanCall(t0) {
   import_react39.useEffect(t3, t4);
   if (!plan) {
     let t52;
-    if ($5[7] !== tc) {
+    if ($5[7] !== connectorChar || $5[8] !== tc || $5[9] !== treePosition) {
       t52 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(ToolCallRow, {
-        tc
+        tc,
+        connectorChar,
+        treePosition
       }, undefined, false, undefined, this);
-      $5[7] = tc;
-      $5[8] = t52;
+      $5[7] = connectorChar;
+      $5[8] = tc;
+      $5[9] = treePosition;
+      $5[10] = t52;
     } else {
-      t52 = $5[8];
+      t52 = $5[10];
     }
     return t52;
   }
   const hasResult = !!resultStr;
   const collapsed = hasResult && !expanded;
   let t5;
-  if ($5[9] !== collapsed || $5[10] !== plan || $5[11] !== planFile || $5[12] !== resultStr) {
+  if ($5[11] !== collapsed || $5[12] !== plan || $5[13] !== planFile || $5[14] !== resultStr) {
     t5 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(StructuredPlanView, {
       plan,
       result: resultStr,
       planFile,
       collapsed
     }, undefined, false, undefined, this);
-    $5[9] = collapsed;
-    $5[10] = plan;
-    $5[11] = planFile;
-    $5[12] = resultStr;
-    $5[13] = t5;
+    $5[11] = collapsed;
+    $5[12] = plan;
+    $5[13] = planFile;
+    $5[14] = resultStr;
+    $5[15] = t5;
   } else {
-    t5 = $5[13];
+    t5 = $5[15];
   }
   let t6;
-  if ($5[14] !== collapsed || $5[15] !== markdown || $5[16] !== resultStr || $5[17] !== t2) {
+  if ($5[16] !== collapsed || $5[17] !== markdown || $5[18] !== resultStr || $5[19] !== t2) {
     t6 = !collapsed && markdown && !resultStr?.includes("cancelled") && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
       flexDirection: "column",
       flexShrink: 0,
@@ -446392,29 +446812,101 @@ function WritePlanCall(t0) {
         text: markdown
       }, undefined, false, undefined, this)
     }, undefined, false, undefined, this);
-    $5[14] = collapsed;
-    $5[15] = markdown;
-    $5[16] = resultStr;
-    $5[17] = t2;
-    $5[18] = t6;
+    $5[16] = collapsed;
+    $5[17] = markdown;
+    $5[18] = resultStr;
+    $5[19] = t2;
+    $5[20] = t6;
   } else {
-    t6 = $5[18];
+    t6 = $5[20];
   }
   let t7;
-  if ($5[19] !== t5 || $5[20] !== t6) {
+  if ($5[21] !== t5 || $5[22] !== t6) {
     t7 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(import_jsx_dev_runtime2.Fragment, {
       children: [
         t5,
         t6
       ]
     }, undefined, true, undefined, this);
-    $5[19] = t5;
-    $5[20] = t6;
-    $5[21] = t7;
+    $5[21] = t5;
+    $5[22] = t6;
+    $5[23] = t7;
   } else {
-    t7 = $5[21];
+    t7 = $5[23];
   }
-  return t7;
+  const planContent = t7;
+  if (connectorChar && treePosition) {
+    let t8;
+    if ($5[24] !== connectorChar || $5[25] !== t2.textFaint) {
+      t8 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+        height: 1,
+        flexShrink: 0,
+        children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+          children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+            fg: t2.textFaint,
+            children: connectorChar
+          }, undefined, false, undefined, this)
+        }, undefined, false, undefined, this)
+      }, undefined, false, undefined, this);
+      $5[24] = connectorChar;
+      $5[25] = t2.textFaint;
+      $5[26] = t8;
+    } else {
+      t8 = $5[26];
+    }
+    let t9;
+    if ($5[27] === Symbol.for("react.memo_cache_sentinel")) {
+      t9 = ["left"];
+      $5[27] = t9;
+    } else {
+      t9 = $5[27];
+    }
+    const t10 = treePosition.isLast ? TREE_SPACE : TREE_PIPE;
+    let t11;
+    if ($5[28] !== planContent) {
+      t11 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+        flexDirection: "column",
+        children: planContent
+      }, undefined, false, undefined, this);
+      $5[28] = planContent;
+      $5[29] = t11;
+    } else {
+      t11 = $5[29];
+    }
+    let t12;
+    if ($5[30] !== t2.textFaint || $5[31] !== t10 || $5[32] !== t11) {
+      t12 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+        border: t9,
+        customBorderChars: t10,
+        borderColor: t2.textFaint,
+        paddingLeft: 1,
+        children: t11
+      }, undefined, false, undefined, this);
+      $5[30] = t2.textFaint;
+      $5[31] = t10;
+      $5[32] = t11;
+      $5[33] = t12;
+    } else {
+      t12 = $5[33];
+    }
+    let t13;
+    if ($5[34] !== t12 || $5[35] !== t8) {
+      t13 = /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+        flexDirection: "column",
+        children: [
+          t8,
+          t12
+        ]
+      }, undefined, true, undefined, this);
+      $5[34] = t12;
+      $5[35] = t8;
+      $5[36] = t13;
+    } else {
+      t13 = $5[36];
+    }
+    return t13;
+  }
+  return planContent;
 }
 function truncateUserContent(content, expanded, t2) {
   const lines = content.split(`
@@ -446457,21 +446949,35 @@ function parsePlanTitle(content) {
   return match2?.[1] ?? "Plan";
 }
 function renderSegments(segments, toolCallMap, diffStyle = "default", autoCompactDiffs = false, showReasoning = true, reasoningExpanded = false, t2 = getThemeTokens()) {
+  const merged = [];
+  for (const seg of segments) {
+    if (seg.type === "text" && seg.content.trim() === "")
+      continue;
+    const prev = merged[merged.length - 1];
+    if (seg.type === "tools" && prev?.type === "tools") {
+      prev.toolCallIds.push(...seg.toolCallIds);
+    } else {
+      merged.push(seg.type === "tools" ? {
+        ...seg,
+        toolCallIds: [...seg.toolCallIds]
+      } : seg);
+    }
+  }
   let firstToolsIdx = -1;
-  for (let k5 = 0;k5 < segments.length; k5++) {
-    if (segments[k5]?.type === "tools") {
+  for (let k5 = 0;k5 < merged.length; k5++) {
+    if (merged[k5]?.type === "tools") {
       firstToolsIdx = k5;
       break;
     }
   }
   let lastVisibleType = null;
-  return segments.map((seg, i4) => {
+  return merged.map((seg, i4) => {
     if (seg.type === "reasoning" && !showReasoning)
       return null;
     const needsGap = lastVisibleType !== null && lastVisibleType !== seg.type;
     lastVisibleType = seg.type;
     if (seg.type === "text") {
-      const isLastSegment = i4 === segments.length - 1;
+      const isLastSegment = i4 === merged.length - 1;
       const hasToolsBefore = firstToolsIdx >= 0 && firstToolsIdx < i4;
       const isFinalAnswer = isLastSegment && hasToolsBefore && seg.content.trim().length > 20;
       return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
@@ -446605,14 +447111,22 @@ function renderSegments(segments, toolCallMap, diffStyle = "default", autoCompac
     if (calls.length === 0)
       return null;
     const groups = groupToolCalls(calls);
+    const totalItems = groups.length;
+    const useTree = totalItems >= 2;
     const toolsKey = `tools-${seg.toolCallIds[0] ?? String(i4)}`;
     return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
       flexDirection: "column",
       marginTop: needsGap ? 1 : 0,
       children: groups.map((g3, gi) => {
+        const treePos = useTree ? {
+          isFirst: gi === 0,
+          isLast: gi === totalItems - 1
+        } : undefined;
+        const connChar = treePos ? treePos.isLast ? "\u2514 " : treePos.isFirst ? "\u250C " : "\u251C " : undefined;
         if (g3.type === "meta") {
           return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(CollapsedToolGroup, {
-            calls: g3.calls
+            calls: g3.calls,
+            connectorChar: connChar
           }, `meta-${String(gi)}`, false, undefined, this);
         }
         if (g3.type === "batch") {
@@ -446650,6 +447164,10 @@ function renderSegments(segments, toolCallMap, diffStyle = "default", autoCompac
             children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
               truncate: true,
               children: [
+                connChar ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                  fg: t2.textFaint,
+                  children: connChar
+                }, undefined, false, undefined, this) : null,
                 /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: statusColor,
                   children: [
@@ -446688,18 +447206,22 @@ function renderSegments(segments, toolCallMap, diffStyle = "default", autoCompac
         return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
           flexDirection: "column",
           children: g3.tc.name === "write_plan" || g3.tc.name === "plan" ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(WritePlanCall, {
-            tc: g3.tc
+            tc: g3.tc,
+            connectorChar: connChar,
+            treePosition: treePos
           }, undefined, false, undefined, this) : /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(ToolCallRow, {
             tc: g3.tc,
             diffStyle,
-            autoCompactDiffs
+            autoCompactDiffs,
+            connectorChar: connChar,
+            treePosition: treePos
           }, undefined, false, undefined, this)
         }, g3.tc.id, false, undefined, this);
       })
     }, toolsKey, false, undefined, this);
   });
 }
-function _temp44(tc_0) {
+function _temp53(tc_0) {
   return tc_0.name !== "task_list" && tc_0.name !== "update_plan_step";
 }
 var import_compiler_runtime18, import_react39, ReasoningExpandedContext, ReasoningExpandedProvider, REVEAL_INTERVAL = 30, MAX_REVEAL_STEPS = 15, CURSOR_CHAR = "\u2588", RAIL_BORDER, TRUNCATE_THRESHOLD = 10, TRUNCATE_HEAD = 4, TRUNCATE_TAIL = 4, UserMessageAccent, UserMessageBubble, AssistantMessage, StaticMessage, MessageList;
@@ -446714,8 +447236,10 @@ var init_MessageList = __esm(async () => {
   await __promiseAll([
     init_core4(),
     init_StructuredPlanView(),
+    init_DiffView(),
     init_Markdown(),
-    init_StaticToolRow()
+    init_StaticToolRow(),
+    init_ToolCallDisplay()
   ]);
   import_compiler_runtime18 = __toESM(require_compiler_runtime(), 1);
   import_react39 = __toESM(require_react(), 1);
@@ -447230,7 +447754,7 @@ var init_MessageList = __esm(async () => {
           }, undefined, false, undefined, this),
           hasTools && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
             flexDirection: "column",
-            children: msg.toolCalls?.filter(_temp44).map((tc_1) => /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+            children: msg.toolCalls?.filter(_temp53).map((tc_1) => /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
               flexDirection: "column",
               children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(ToolCallRow, {
                 tc: tc_1,
@@ -450396,7 +450920,7 @@ function StatusLine(t0) {
   let t3;
   let t4;
   if ($5[0] !== providers || $5[1] !== tk.textMuted || $5[2] !== tk.warning) {
-    const names = providers.slice(0, 4).map(_temp53);
+    const names = providers.slice(0, 4).map(_temp54);
     const overflow = providers.length > 4 ? providers.length - 4 : 0;
     t1 = "row";
     t2 = 0;
@@ -450467,7 +450991,7 @@ function StatusLine(t0) {
   }
   return t6;
 }
-function _temp53(p2) {
+function _temp54(p2) {
   return p2.name.toLowerCase();
 }
 function IndexingStatus() {
@@ -450764,14 +451288,30 @@ function LoadingStatus({
     flexDirection: "column",
     flexShrink: 0,
     children: [
-      showBusy && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-        height: 1,
-        paddingX: 1,
-        children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-          ref: scanRef,
-          content: buildScanContent(scanPosRef.current, scanWidth)
-        }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this),
+      showBusy && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(import_jsx_dev_runtime2.Fragment, {
+        children: [
+          /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+            height: 1,
+            paddingX: 1,
+            children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+              fg: getThemeTokens().error,
+              attributes: TextAttributes.BOLD,
+              children: [
+                icon("stop"),
+                " ^X to stop"
+              ]
+            }, undefined, true, undefined, this)
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+            height: 1,
+            paddingX: 1,
+            children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+              ref: scanRef,
+              content: buildScanContent(scanPosRef.current, scanWidth)
+            }, undefined, false, undefined, this)
+          }, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this),
       /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
         height: 1,
         flexDirection: "row",
@@ -451700,7 +452240,7 @@ function _temp313(s2) {
 function _temp48(m_1) {
   return m_1.role !== "system" || m_1.showInChat;
 }
-function _temp54() {}
+function _temp55() {}
 var import_compiler_runtime30, import_react55, MAX_RENDERED = 60, SCROLLBOX_STYLE, SCROLLBAR_HIDDEN, TabInstance;
 var init_TabInstance = __esm(async () => {
   init_shallow2();
@@ -452331,7 +452871,7 @@ var init_TabInstance = __esm(async () => {
     if ($5[119] !== chat.sessionId || $5[120] !== cwd2) {
       t43 = () => {
         const p_0 = join44(cwd2, ".soulforge", "plans", planFileName(chat.sessionId));
-        unlink3(p_0).catch(_temp54);
+        unlink3(p_0).catch(_temp55);
       };
       $5[119] = chat.sessionId;
       $5[120] = cwd2;
@@ -453706,7 +454246,7 @@ function CompactionLog(t0) {
     onClose
   } = t0;
   useTheme();
-  const storeEntries = useCompactionLogStore(_temp55);
+  const storeEntries = useCompactionLogStore(_temp56);
   let t1;
   if ($5[0] !== storeEntries) {
     t1 = [...storeEntries].sort(_temp216).map(_temp315);
@@ -453741,7 +454281,7 @@ function _temp315(e) {
 function _temp216(a2, b5) {
   return b5.timestamp - a2.timestamp;
 }
-function _temp55(s2) {
+function _temp56(s2) {
   return s2.entries;
 }
 var import_compiler_runtime33, COMPACTION_CONFIG;
@@ -453945,7 +454485,7 @@ function ErrorLog(t0) {
     onClose
   } = t0;
   useTheme();
-  const bgErrors = useErrorStore(_temp57);
+  const bgErrors = useErrorStore(_temp58);
   let t1;
   if ($5[0] !== bgErrors || $5[1] !== messages) {
     const chatEntries = extractLogEntries(messages);
@@ -453999,7 +454539,7 @@ function _temp217(e) {
     detail: e.message
   };
 }
-function _temp57(s2) {
+function _temp58(s2) {
   return s2.errors;
 }
 var import_compiler_runtime34;
@@ -454195,7 +454735,7 @@ function HelpPopup(t0) {
       return;
     }
     if (evt.name === "up") {
-      setScrollOffset(_temp58);
+      setScrollOffset(_temp59);
       return;
     }
     if (evt.name === "down") {
@@ -454526,7 +455066,7 @@ function HelpPopup(t0) {
   }
   return t29;
 }
-function _temp58(prev) {
+function _temp59(prev) {
   return Math.max(0, prev - 1);
 }
 var import_compiler_runtime35, import_react61, MAX_POPUP_WIDTH = 88, CHROME_ROWS2 = 6;
@@ -454617,7 +455157,7 @@ function ApiKeySettings(t0) {
   const innerW = popupWidth - 2;
   const maxVisible = Math.max(4, Math.floor((termRows - 2) * 0.8) - CHROME_ROWS3);
   const t2 = useTheme();
-  const keys2 = useApiKeyStore(_temp59);
+  const keys2 = useApiKeyStore(_temp60);
   const priority = useApiKeyStore(_temp218);
   const refresh = useApiKeyStore(_temp317);
   const [cursor, setCursor] = import_react63.useState(0);
@@ -455522,7 +456062,7 @@ function _temp317(s_1) {
 function _temp218(s_0) {
   return s_0.priority;
 }
-function _temp59(s2) {
+function _temp60(s2) {
   return s2.keys;
 }
 var import_compiler_runtime36, import_react63, MAX_POPUP_WIDTH2 = 68, CHROME_ROWS3 = 12, PROVIDER_KEYS, useApiKeyStore, KEY_ITEMS;
@@ -455673,7 +456213,7 @@ function LspStatusPopup(t0) {
   }
   const popupHeight = Math.max(12, t3);
   const maxListVisible = Math.max(4, popupHeight - CHROME_ROWS4);
-  const bgErrors = useErrorStore(_temp60);
+  const bgErrors = useErrorStore(_temp61);
   let t4;
   if ($5[5] !== bgErrors) {
     t4 = bgErrors.filter(_temp219);
@@ -455813,7 +456353,7 @@ function LspStatusPopup(t0) {
           return;
         }
         if (evt.name === "up") {
-          setDetailScroll(_temp56);
+          setDetailScroll(_temp57);
           return;
         }
         if (evt.name === "down") {
@@ -456472,7 +457012,7 @@ function LspStatusPopup(t0) {
   }
   return t30;
 }
-function _temp56(p2) {
+function _temp57(p2) {
   return Math.max(0, p2 - 1);
 }
 function _temp412() {}
@@ -456485,7 +457025,7 @@ function _temp318(s_0) {
 function _temp219(e) {
   return e.source.startsWith("LSP:");
 }
-function _temp60(s2) {
+function _temp61(s2) {
   return s2.errors;
 }
 var import_compiler_runtime37, import_react65, CHROME_ROWS4 = 7, POLL_MS = 2000;
@@ -456522,7 +457062,7 @@ function SetupGuide(t0) {
   const innerW = popupWidth - 2;
   const maxVisible = Math.max(4, Math.floor(containerRows * 0.8) - CHROME_ROWS5);
   const t2 = useTheme();
-  const [statuses, setStatuses] = import_react67.useState(_temp61);
+  const [statuses, setStatuses] = import_react67.useState(_temp64);
   const [cursor, setCursor] = import_react67.useState(0);
   const [scrollOffset, setScrollOffset] = import_react67.useState(0);
   const [installing, setInstalling] = import_react67.useState(null);
@@ -457295,7 +457835,7 @@ function _temp319(c) {
 function _temp220() {
   return detectInstalledFonts();
 }
-function _temp61() {
+function _temp64() {
   return checkPrerequisites();
 }
 var import_compiler_runtime38, import_react67, MAX_POPUP_WIDTH3 = 74, CHROME_ROWS5 = 10;
@@ -457330,7 +457870,7 @@ function WebSearchSettings(t0) {
   const innerW = popupWidth - 2;
   const maxVisible = Math.max(4, Math.floor((termRows - 2) * 0.8) - CHROME_ROWS6);
   const t2 = useTheme();
-  const keys2 = useWebSearchStore(_temp64);
+  const keys2 = useWebSearchStore(_temp66);
   const refresh = useWebSearchStore(_temp221);
   const [cursor, setCursor] = import_react69.useState(0);
   const [mode, setMode] = import_react69.useState("menu");
@@ -458331,7 +458871,7 @@ function _temp320(v_0) {
 function _temp221(s_0) {
   return s_0.refresh;
 }
-function _temp64(s2) {
+function _temp66(s2) {
   return s2.keys;
 }
 var import_compiler_runtime39, import_react69, MAX_POPUP_WIDTH4 = 72, CHROME_ROWS6 = 10, useWebSearchStore, KEY_ITEMS2;
@@ -458380,7 +458920,7 @@ function SimpleModalLayer(t0) {
     messages,
     onSystemMessage
   } = t0;
-  const modalHelpPopup = useUIStore(_temp66);
+  const modalHelpPopup = useUIStore(_temp67);
   const modalWebSearchSettings = useUIStore(_temp222);
   const modalApiKeySettings = useUIStore(_temp321);
   const modalSetup = useUIStore(_temp414);
@@ -458561,7 +459101,7 @@ function _temp321(s_1) {
 function _temp222(s_0) {
   return s_0.modals.webSearchSettings;
 }
-function _temp66(s2) {
+function _temp67(s2) {
   return s2.modals.helpPopup;
 }
 var import_compiler_runtime40, closerCache, getCloser = (name21) => closerCache[name21] ??= () => useUIStore.getState().closeModal(name21);
@@ -458716,7 +459256,7 @@ function CommandPalette(t0) {
   } = usePopupScroll(maxVisible);
   let t22;
   if ($5[8] === Symbol.for("react.memo_cache_sentinel")) {
-    t22 = getCommandDefs().filter(_temp67);
+    t22 = getCommandDefs().filter(_temp68);
     $5[8] = t22;
   } else {
     t22 = $5[8];
@@ -459279,7 +459819,7 @@ function _temp322(q_0) {
 function _temp223(q4) {
   return q4.slice(0, -1);
 }
-function _temp67(d3) {
+function _temp68(d3) {
   return !d3.hidden;
 }
 function renderHighlightedCmd(cmd, indices, baseFg, hlFg, bg2, bold2) {
@@ -460228,7 +460768,7 @@ function DiagnosePopup(t0) {
       return;
     }
     if (evt.name === "up") {
-      setScrollOffset(_temp68);
+      setScrollOffset(_temp69);
       return;
     }
     if (evt.name === "down") {
@@ -460566,7 +461106,7 @@ function DiagnosePopup(t0) {
   }
   return t30;
 }
-function _temp68(prev) {
+function _temp69(prev) {
   return Math.max(0, prev - 1);
 }
 var import_compiler_runtime42, import_react75, CHROME_ROWS9 = 6, SPINNER;
@@ -461765,7 +462305,7 @@ function SetupStep(t0) {
   } = t0;
   let t1;
   if ($5[0] === Symbol.for("react.memo_cache_sentinel")) {
-    t1 = PROVIDERS.some(_temp69);
+    t1 = PROVIDERS.some(_temp70);
     $5[0] = t1;
   } else {
     t1 = $5[0];
@@ -462574,7 +463114,7 @@ function _temp323(v_0) {
 function _temp224(n) {
   return n + 1;
 }
-function _temp69(p2) {
+function _temp70(p2) {
   return hasKey(p2.id);
 }
 var import_compiler_runtime48, import_react82, PROVIDERS;
@@ -462837,7 +463377,7 @@ function ThemeStep(t0) {
     t1 = $5[0];
   }
   const themes = t1;
-  const currentName = useThemeStore(_temp70);
+  const currentName = useThemeStore(_temp71);
   const isTransparent = useThemeStore(_temp225);
   let t22;
   if ($5[1] === Symbol.for("react.memo_cache_sentinel")) {
@@ -463376,7 +463916,7 @@ function _temp324(name21, tp, mOp, dOp, bdr) {
 function _temp225(s_0) {
   return s_0.tokens.bgApp === "transparent";
 }
-function _temp70(s2) {
+function _temp71(s2) {
   return s2.name;
 }
 function OptionRow(t0) {
@@ -464045,7 +464585,7 @@ var init_WorkflowStep = __esm(async () => {
 });
 
 // src/components/modals/wizard/index.tsx
-function _temp71(i4) {
+function _temp74(i4) {
   return i4 + 1;
 }
 function _temp226(i_0) {
@@ -464117,7 +464657,7 @@ var init_wizard = __esm(async () => {
     if ($5[3] !== onClose || $5[4] !== stepIdx) {
       t3 = () => {
         if (stepIdx < STEPS.length - 1) {
-          setStepIdx(_temp71);
+          setStepIdx(_temp74);
         } else {
           onClose();
         }
@@ -464461,7 +465001,7 @@ function GitCommitModal(t0) {
         const lines = diff.split(`
 `).length;
         setDiffSummary(lines > 1 ? `${String(lines)} lines changed` : "no staged changes");
-      }).catch(_temp74);
+      }).catch(_temp76);
     };
     t5 = [visible, cwd2];
     $5[3] = cwd2;
@@ -464941,7 +465481,7 @@ Co-Authored-By: SoulForge <noreply@soulforge.com>` : message.trim();
 function _temp227(prev) {
   return !prev;
 }
-function _temp74() {}
+function _temp76() {}
 var import_compiler_runtime54, import_react91, MAX_POPUP_WIDTH7 = 64;
 var init_GitCommitModal = __esm(async () => {
   init_status();
@@ -465043,7 +465583,7 @@ function GitMenu(t0) {
           if (entries2.length === 0) {
             onSystemMessage("No commits found.");
           } else {
-            const logText = entries2.map(_temp76).join(`
+            const logText = entries2.map(_temp77).join(`
 `);
             onSystemMessage(logText);
           }
@@ -465410,7 +465950,7 @@ function GitMenu(t0) {
   }
   return t23;
 }
-function _temp76(e) {
+function _temp77(e) {
   return `${e.hash} ${e.subject} (${e.date})`;
 }
 var import_compiler_runtime55, import_react93, MAX_POPUP_WIDTH8 = 54, CHROME_ROWS11 = 7, MENU_ITEMS;
@@ -465506,7 +466046,7 @@ function InfoPopup(t0) {
         return;
       }
       if (evt.name === "up" || evt.name === "k") {
-        setScrollOffset(_temp77);
+        setScrollOffset(_temp78);
         return;
       }
       if (evt.name === "down" || evt.name === "j") {
@@ -465890,7 +466430,7 @@ function InfoPopup(t0) {
 function _temp228(text3, max) {
   return text3.length > max ? `${text3.slice(0, max - 1)}\u2026` : text3;
 }
-function _temp77(prev) {
+function _temp78(prev) {
   return Math.max(0, prev - 1);
 }
 var import_compiler_runtime56, import_react95, CHROME_ROWS12 = 6;
@@ -465924,7 +466464,7 @@ function useAllProviderModels(active) {
     t0 = $5[0];
   }
   const [providerData, setProviderData] = import_react96.useState(t0);
-  const [availability, setAvailability] = import_react96.useState(_temp78);
+  const [availability, setAvailability] = import_react96.useState(_temp79);
   let t1;
   let t2;
   if ($5[1] !== active) {
@@ -466023,7 +466563,7 @@ function _temp325(p_0) {
   return p_0.loading;
 }
 function _temp229() {}
-function _temp78() {
+function _temp79() {
   const cached2 = getCachedProviderStatuses();
   const map2 = new Map;
   if (cached2) {
@@ -466809,7 +467349,7 @@ function SessionPicker(t0) {
       return;
     }
     if (evt.name === "backspace" || evt.name === "delete") {
-      setQuery(_temp79);
+      setQuery(_temp80);
       resetScroll();
       return;
     }
@@ -467412,7 +467952,7 @@ function _temp326(s_0, x4) {
 function _temp230(prev_3) {
   return `${prev_3} `;
 }
-function _temp79(prev_1) {
+function _temp80(prev_1) {
   return prev_1.slice(0, -1);
 }
 var import_compiler_runtime58, import_react100, POPUP_CHROME = 8, COL_MSGS = 7, COL_SIZE = 7, COL_TIME = 11, COL_FIXED;
@@ -468542,7 +469082,7 @@ function UpdateModal(t0) {
       if (!visible || tick >= 12) {
         return;
       }
-      const timer = setInterval(() => setTick(_temp80), 60);
+      const timer = setInterval(() => setTick(_temp81), 60);
       return () => clearInterval(timer);
     };
     t5 = [visible, tick];
@@ -471089,7 +471629,7 @@ function _temp327(i_0) {
 function _temp231(i4) {
   return i4 + 1;
 }
-function _temp80(prev) {
+function _temp81(prev) {
   return prev + 1;
 }
 var import_compiler_runtime60, import_react104, UPGRADE_QUIPS, LATEST_QUIPS, SPINNER2, GHOST_FADE2, WISP, MAX_LOG = 50, BOLD5, ITALIC4, DIM4;
@@ -472987,6 +473527,8 @@ function readValuesFromLayer(layer) {
     v4.speed = layer.performance.speed;
   if (layer.performance?.sendReasoning !== undefined)
     v4.sendReasoning = layer.performance.sendReasoning;
+  if (layer.performance?.toolStreaming !== undefined)
+    v4.toolStreaming = layer.performance.toolStreaming;
   if (layer.performance?.disableParallelToolUse !== undefined)
     v4.disableParallelToolUse = layer.performance.disableParallelToolUse;
   if (layer.performance?.openaiReasoningEffort !== undefined)
@@ -472995,6 +473537,10 @@ function readValuesFromLayer(layer) {
     v4.serviceTier = layer.performance.serviceTier;
   if (layer.codeExecution !== undefined)
     v4.codeExecution = layer.codeExecution;
+  if (layer.computerUse !== undefined)
+    v4.computerUse = layer.computerUse;
+  if (layer.anthropicTextEditor !== undefined)
+    v4.anthropicTextEditor = layer.anthropicTextEditor;
   if (layer.webSearch !== undefined)
     v4.webSearch = layer.webSearch;
   if (layer.contextManagement?.compact !== undefined)
@@ -473053,6 +473599,12 @@ function buildPatch(key3, value) {
           sendReasoning: value
         }
       };
+    case "toolStreaming":
+      return {
+        performance: {
+          toolStreaming: value
+        }
+      };
     case "disableParallelToolUse":
       return {
         performance: {
@@ -473075,6 +473627,14 @@ function buildPatch(key3, value) {
       return {
         codeExecution: value
       };
+    case "computerUse":
+      return {
+        computerUse: value
+      };
+    case "anthropicTextEditor":
+      return {
+        anthropicTextEditor: value
+      };
     case "webSearch":
       return {
         webSearch: value
@@ -473135,7 +473695,7 @@ function ProviderSettings(t0) {
   const containerRows = termRows - 2;
   const popupWidth = Math.min(MAX_POPUP_WIDTH11, Math.floor(termCols * 0.85));
   const innerW = popupWidth - 2;
-  const maxVisible = Math.max(4, Math.floor(containerRows * 0.8) - CHROME_ROWS16);
+  const maxVisible = Math.max(4, Math.floor(containerRows * 0.85) - CHROME_ROWS16);
   const t2 = useTheme();
   const [tab, setTab] = import_react110.useState("claude");
   const {
@@ -473738,7 +474298,7 @@ function ProviderSettings(t0) {
   }
   return t33;
 }
-var import_compiler_runtime62, import_react110, MAX_POPUP_WIDTH11 = 78, CHROME_ROWS16 = 7, TABS3, TAB_LABELS2, TAB_ICONS, CLAUDE_ITEMS, OPENAI_ITEMS, GENERAL_ITEMS, TAB_ITEMS, DEFAULTS;
+var import_compiler_runtime62, import_react110, MAX_POPUP_WIDTH11 = 88, CHROME_ROWS16 = 7, TABS3, TAB_LABELS2, TAB_ICONS, CLAUDE_ITEMS, OPENAI_ITEMS, GENERAL_ITEMS, TAB_ITEMS, DEFAULTS;
 var init_ProviderSettings = __esm(async () => {
   init_icons();
   init_theme();
@@ -473783,9 +474343,29 @@ var init_ProviderSettings = __esm(async () => {
   }, {
     key: "speed",
     label: "Speed",
-    desc: "Opus only \u2014 2.5x faster output (requires SDK update)",
+    desc: "Opus 4.6 \u2014 2.5x faster output (standard | fast)",
     type: "cycle",
     options: ["off", "standard", "fast"]
+  }, {
+    key: "codeExecution",
+    label: "Code Execution",
+    desc: "Sandboxed code evaluation (Python/Bash)",
+    type: "toggle"
+  }, {
+    key: "computerUse",
+    label: "Computer Use",
+    desc: "Keyboard/mouse/screenshot control",
+    type: "toggle"
+  }, {
+    key: "anthropicTextEditor",
+    label: "Anthropic Text Editor",
+    desc: "Anthropic's str_replace editor tool",
+    type: "toggle"
+  }, {
+    key: "toolStreaming",
+    label: "Tool Streaming",
+    desc: "Stream tool call args incrementally (disable to debug)",
+    type: "toggle"
   }, {
     key: "sendReasoning",
     label: "Send Reasoning",
@@ -473794,24 +474374,18 @@ var init_ProviderSettings = __esm(async () => {
   }, {
     key: "compact",
     label: "Server Compaction",
-    desc: "API-level context compaction (200K+ models)",
+    desc: "Anthropic server-side context compaction (200K+ models)",
     type: "toggle"
   }, {
     key: "clearToolUses",
     label: "Clear Tool Uses",
-    desc: "Auto-clear old tool results, keep last 10",
+    desc: "Server-side \u2014 auto-clear old tool results, keep last 6",
     type: "toggle"
   }, {
     key: "clearThinking",
     label: "Clear Thinking",
-    desc: "Auto-clear old thinking blocks, keep last 5",
+    desc: "Server-side \u2014 auto-clear old thinking blocks, keep last 2",
     type: "toggle"
-  }, {
-    key: "pruning",
-    label: "Tool Result Pruning",
-    desc: "Compact old tool results \u2014 main | subagents | both | none",
-    type: "cycle",
-    options: ["none", "main", "subagents", "both"]
   }];
   OPENAI_ITEMS = [{
     key: "openaiReasoningEffort",
@@ -473831,16 +474405,17 @@ var init_ProviderSettings = __esm(async () => {
     label: "Sequential Tools",
     desc: "One tool at a time instead of parallel (all providers)",
     type: "toggle"
-  }, {
-    key: "codeExecution",
-    label: "Code Execution",
-    desc: "Sandboxed code evaluation",
-    type: "toggle"
   }, {
     key: "webSearch",
     label: "Web Search",
     desc: "Allow web search tool",
     type: "toggle"
+  }, {
+    key: "pruning",
+    label: "Tool Result Pruning",
+    desc: "Client-side \u2014 compact old tool results: main | subagents | both | none",
+    type: "cycle",
+    options: ["none", "main", "subagents", "both"]
   }];
   TAB_ITEMS = {
     claude: CLAUDE_ITEMS,
@@ -473853,10 +474428,13 @@ var init_ProviderSettings = __esm(async () => {
     effort: "off",
     speed: "off",
     sendReasoning: false,
+    toolStreaming: true,
     disableParallelToolUse: false,
     openaiReasoningEffort: "off",
     serviceTier: "off",
     codeExecution: false,
+    computerUse: false,
+    anthropicTextEditor: false,
     webSearch: true,
     compact: false,
     clearToolUses: false,
@@ -476457,7 +477035,7 @@ function ShutdownSplash(t0) {
   let t3;
   if ($5[2] === Symbol.for("react.memo_cache_sentinel")) {
     t2 = () => {
-      const timer = setInterval(() => setTick(_temp81), 80);
+      const timer = setInterval(() => setTick(_temp83), 80);
       return () => clearInterval(timer);
     };
     t3 = [];
@@ -476654,7 +477232,7 @@ function ShutdownSplash(t0) {
   }
   return t14;
 }
-function _temp81(t2) {
+function _temp83(t2) {
   return t2 + 1;
 }
 function nativeCopy(text3) {
@@ -477219,7 +477797,11 @@ function App({
       saveToScope,
       detectScope,
       agentFeatures: effectiveConfig.agentFeatures,
-      instructionFiles: effectiveConfig.instructionFiles
+      instructionFiles: effectiveConfig.instructionFiles,
+      syncActiveModel: (modelId) => {
+        chat_0.setActiveModel(modelId);
+        setActiveModelForHeader(modelId);
+      }
     });
   }, [tabMgr, toggleEditor, nvimOpen, handleExit, cwd2, git, contextManager, handleSuspend, openEditorWithFile, effectiveConfig.nvimConfig, effectiveConfig.vimHints, effectiveConfig.verbose, effectiveConfig.diffStyle, effectiveConfig.autoCompactDiffs, effectiveConfig.compaction?.strategy, saveToScope, detectScope, effectiveConfig.agentFeatures, effectiveConfig.instructionFiles]);
   const closeLlmSelector = import_react120.useCallback(() => {
@@ -477537,13 +478119,13 @@ function App({
       /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(LlmSelector, {
         visible: modalLlmSelector,
         activeModel: activeModelForHeader,
-        onSelect: (modelId) => {
+        onSelect: (modelId_0) => {
           const slot = useUIStore.getState().routerSlotPicking;
           if (slot) {
             const current = effectiveConfig.taskRouter ?? DEFAULT_TASK_ROUTER;
             const updated = {
               ...current,
-              [slot]: modelId
+              [slot]: modelId_0
             };
             saveToScope({
               taskRouter: updated
@@ -477552,11 +478134,11 @@ function App({
             useUIStore.getState().closeModal("llmSelector");
             useUIStore.getState().openModal("routerSettings");
           } else {
-            activeChatRef.current?.setActiveModel(modelId);
-            notifyProviderSwitch(modelId);
-            setActiveModelForHeader(modelId);
+            activeChatRef.current?.setActiveModel(modelId_0);
+            notifyProviderSwitch(modelId_0);
+            setActiveModelForHeader(modelId_0);
             saveToScope({
-              defaultModel: modelId
+              defaultModel: modelId_0
             }, modelScope);
             const wasFromWizard_0 = wizardOpenedLlm.current;
             wizardOpenedLlm.current = false;