@cydm/pie 1.0.28 → 1.0.30

package/dist/cli.js

@@ -5,6 +5,7 @@ import {
   cleanupBashOutputArtifacts,
   createCliHostCapabilities,
   createCliWebResearchHealthStore,
+  formatSize,
   getAgentDir,
   getBuiltinDir,
   getConfigDir,
@@ -16,8 +17,9 @@ import {
   getSessionsDir,
   getSettingsPath,
   getThemesDir,
-  migrateConfigFromAgentDir
-} from "./chunks/chunk-BDDSZSHX.js";
+  migrateConfigFromAgentDir,
+  truncateHeadTail
+} from "./chunks/chunk-PLJQYVFC.js";
 import {
   AGENTS_CONTEXT_FILE_NAME,
   AgentSessionController,
@@ -67,7 +69,7 @@ import {
   setExtensionEnabledInSettings,
   shouldPreserveExecutionStateForUserText,
   supersedeExecutionState
-} from "./chunks/chunk-L63BJMTT.js";
+} from "./chunks/chunk-BOFCKEV5.js";
 import "./chunks/chunk-4B42ZU4B.js";
 import {
   Deref,
@@ -45727,45 +45729,6 @@ var ModelRegistry = class {
 // src/core/settings-manager.ts
 import * as fs3 from "fs";
 import * as path3 from "path";
-
-// src/tool-set.ts
-var DEFAULT_TOOL_SET = "lean";
-var LEAN_CODING_TOOL_NAMES = [
-  "read_file",
-  "edit_file",
-  "write_file",
-  "bash"
-];
-var CLI_DEFAULT_TOOL_NAMES = /* @__PURE__ */ new Set([
-  "read_file",
-  "write_file",
-  "edit_file",
-  "list_dir",
-  "grep_text",
-  "find_files",
-  "bash",
-  "web_research",
-  "web_search",
-  "web_fetch",
-  "code_intel"
-]);
-var LEAN_CODING_TOOL_NAME_SET = new Set(LEAN_CODING_TOOL_NAMES);
-function normalizeDefaultToolSet(value) {
-  return value === "full" ? "full" : DEFAULT_TOOL_SET;
-}
-function selectDefaultTools(tools, defaultSet) {
-  if (defaultSet === "full") {
-    return [...tools];
-  }
-  return tools.filter(
-    (tool) => !CLI_DEFAULT_TOOL_NAMES.has(tool.name) || LEAN_CODING_TOOL_NAME_SET.has(tool.name)
-  );
-}
-function formatDefaultToolSet(defaultSet) {
-  return defaultSet === "full" ? "Full" : "Lean";
-}
-
-// src/core/settings-manager.ts
 var SettingsManager = class {
   settingsPath;
   legacyConfigPath;
@@ -45854,16 +45817,6 @@ var SettingsManager = class {
     }
     return "auto";
   }
-  getDefaultToolSet() {
-    return normalizeDefaultToolSet(this.settings.tools?.defaultSet);
-  }
-  setDefaultToolSet(defaultSet) {
-    this.settings.tools = {
-      ...this.settings.tools,
-      defaultSet
-    };
-    this.writeSettings();
-  }
   // ==========================================================================
   // Extension enablement (user ~/.pie/settings.json + project ./.pie/settings.json)
   // ==========================================================================
@@ -46312,7 +46265,7 @@ Default mode:
   - File tools read and write inside the current workspace.
   - ~/.pie is allowlisted for Pie configuration and session support.
   - Shell commands run from the workspace and return structured output, timeout, and truncation details.
-  - web_search is read-only and uses provider-native search; it does not grant bash/curl web scraping permission.
+  - web_research is read-only, uses provider-native web/search/fetch capabilities, and does not grant bash/curl web scraping permission.
   - Protected paths from extensions can block reads/writes even when tools are present.
 
 Plan mode:
@@ -47018,6 +46971,7 @@ var CommandTree = class {
       if (isLast) {
         node.description = info.description;
         node.handler = info.handler;
+        node.hidden = info.hidden === true;
         if (!node.children || node.children.length === 0) {
           node.isCategory = false;
         }
@@ -47042,7 +46996,7 @@ var CommandTree = class {
    */
   getChildren(path30) {
     const node = this.find(path30);
-    return node?.children || [];
+    return (node?.children || []).filter((child) => !child.hidden);
   }
   /**
    * Check if a path exists (as category or command)
@@ -47063,6 +47017,7 @@ var CommandTree = class {
   search(prefix) {
     const results = [];
     const traverse = (node, currentPath) => {
+      if (node.hidden) return;
       const newPath = node.name ? [...currentPath, node.name] : currentPath;
       const pathStr = newPath.join("/");
       if (node.name && pathStr.startsWith(prefix)) {
@@ -47087,6 +47042,7 @@ var CommandTree = class {
   searchByName(namePrefix) {
     const results = [];
     const traverse = (node, currentPath) => {
+      if (node.hidden) return;
       const newPath = node.name ? [...currentPath, node.name] : currentPath;
       const pathStr = newPath.join("/");
       if (node.name && node.name.toLowerCase().startsWith(namePrefix.toLowerCase())) {
@@ -47110,6 +47066,7 @@ var CommandTree = class {
   getAllPaths() {
     const paths = [];
     const traverse = (node, currentPath) => {
+      if (node.hidden) return;
       const newPath = node.name ? [...currentPath, node.name] : currentPath;
       if (node.name) {
         paths.push(newPath.join("/"));
@@ -47180,12 +47137,14 @@ function createExtensionContext(extension, cwd, uiContext, abortFn, isIdleFn, ha
         name: finalName,
         description: command.description,
         handler: command.handler,
-        path: cmdPath
+        path: cmdPath,
+        hidden: command.hidden === true
       };
       extension.commands.set(finalName, registeredCmd);
       commandTree.register(cmdPath, {
         description: command.description,
-        handler: command.handler
+        handler: command.handler,
+        hidden: command.hidden === true
       });
     },
     registerShortcut(key, shortcut) {
@@ -50187,6 +50146,18 @@ var SelectList = class {
     this.filteredItems = this.items.filter((item) => item.value.toLowerCase().startsWith(filter.toLowerCase()));
     this.selectedIndex = 0;
   }
+  getVisibleRange() {
+    const startIndex = Math.max(
+      0,
+      Math.min(this.selectedIndex - Math.floor(this.maxVisible / 2), this.filteredItems.length - this.maxVisible)
+    );
+    const endIndex = Math.min(startIndex + this.maxVisible, this.filteredItems.length);
+    return { startIndex, endIndex };
+  }
+  getVisibleItems() {
+    const { startIndex, endIndex } = this.getVisibleRange();
+    return this.filteredItems.slice(startIndex, endIndex);
+  }
   setSelectedIndex(index) {
     this.selectedIndex = Math.max(0, Math.min(index, this.filteredItems.length - 1));
   }
@@ -50198,11 +50169,7 @@ var SelectList = class {
       lines.push(this.theme.noMatch("  No matching commands"));
       return lines;
     }
-    const startIndex = Math.max(
-      0,
-      Math.min(this.selectedIndex - Math.floor(this.maxVisible / 2), this.filteredItems.length - this.maxVisible)
-    );
-    const endIndex = Math.min(startIndex + this.maxVisible, this.filteredItems.length);
+    const { startIndex, endIndex } = this.getVisibleRange();
     for (let i = startIndex; i < endIndex; i++) {
       const item = this.filteredItems[i];
       if (!item) continue;
@@ -50215,19 +50182,20 @@ var SelectList = class {
         if (descriptionSingleLine && width > 40) {
           const maxValueWidth = Math.min(30, width - prefixWidth - 4);
           const truncatedValue = truncateToWidth(displayValue, maxValueWidth, "");
-          const spacing = " ".repeat(Math.max(1, 32 - truncatedValue.length));
-          const descriptionStart = prefixWidth + truncatedValue.length + spacing.length;
+          const valueWidth = visibleWidth(truncatedValue);
+          const spacing = " ".repeat(Math.max(1, 32 - valueWidth));
+          const descriptionStart = prefixWidth + valueWidth + spacing.length;
           const remainingWidth = width - descriptionStart - 2;
           if (remainingWidth > 10) {
             const truncatedDesc = truncateToWidth(descriptionSingleLine, remainingWidth, "");
-            line = this.theme.selectedText(`\u2192 ${truncatedValue}${spacing}${truncatedDesc}`);
+            line = truncateToWidth(this.theme.selectedText(`\u2192 ${truncatedValue}${spacing}${truncatedDesc}`), width, "");
           } else {
             const maxWidth = width - prefixWidth - 2;
-            line = this.theme.selectedText(`\u2192 ${truncateToWidth(displayValue, maxWidth, "")}`);
+            line = truncateToWidth(this.theme.selectedText(`\u2192 ${truncateToWidth(displayValue, maxWidth, "")}`), width, "");
           }
         } else {
           const maxWidth = width - prefixWidth - 2;
-          line = this.theme.selectedText(`\u2192 ${truncateToWidth(displayValue, maxWidth, "")}`);
+          line = truncateToWidth(this.theme.selectedText(`\u2192 ${truncateToWidth(displayValue, maxWidth, "")}`), width, "");
         }
       } else {
         const displayValue = item.label || item.value;
@@ -50235,23 +50203,24 @@ var SelectList = class {
         if (descriptionSingleLine && width > 40) {
           const maxValueWidth = Math.min(30, width - prefix.length - 4);
           const truncatedValue = truncateToWidth(displayValue, maxValueWidth, "");
-          const spacing = " ".repeat(Math.max(1, 32 - truncatedValue.length));
-          const descriptionStart = prefix.length + truncatedValue.length + spacing.length;
+          const valueWidth = visibleWidth(truncatedValue);
+          const spacing = " ".repeat(Math.max(1, 32 - valueWidth));
+          const descriptionStart = prefix.length + valueWidth + spacing.length;
           const remainingWidth = width - descriptionStart - 2;
           if (remainingWidth > 10) {
             const truncatedDesc = truncateToWidth(descriptionSingleLine, remainingWidth, "");
             const descText = this.theme.description(spacing + truncatedDesc);
-            line = prefix + truncatedValue + descText;
+            line = truncateToWidth(prefix + truncatedValue + descText, width, "");
           } else {
             const maxWidth = width - prefix.length - 2;
-            line = prefix + truncateToWidth(displayValue, maxWidth, "");
+            line = truncateToWidth(prefix + truncateToWidth(displayValue, maxWidth, ""), width, "");
           }
         } else {
           const maxWidth = width - prefix.length - 2;
-          line = prefix + truncateToWidth(displayValue, maxWidth, "");
+          line = truncateToWidth(prefix + truncateToWidth(displayValue, maxWidth, ""), width, "");
         }
       }
-      lines.push(line);
+      lines.push(truncateToWidth(line, width, ""));
     }
     if (startIndex > 0 || endIndex < this.filteredItems.length) {
       const scrollText = `  (${this.selectedIndex + 1}/${this.filteredItems.length})`;
@@ -56683,7 +56652,7 @@ var FileManagerError = class extends Error {
   code;
   details;
   locale;
-  constructor(code, details, locale = "zh") {
+  constructor(code, details, locale = "en") {
     const messages = FileErrorMessages[code];
     super(messages[locale]);
     this.name = "FileManagerError";
@@ -60273,34 +60242,6 @@ var SettingsSelectorComponent = class extends Container {
           }
         )
       },
-      {
-        id: "tools",
-        label: "Tools",
-        description: "Default model-visible tool set",
-        currentValue: config.defaultToolSet,
-        submenu: (currentValue, done) => new SelectSubmenu(
-          "Default Tools",
-          "Choose which built-in tools are visible in new coding sessions",
-          [
-            {
-              value: "lean",
-              label: "Lean",
-              description: "read_file, edit_file, write_file, bash"
-            },
-            {
-              value: "full",
-              label: "Full",
-              description: "All built-in tools, including search, web, and code intel"
-            }
-          ],
-          currentValue,
-          (value) => {
-            callbacks.onDefaultToolSetChange(value);
-            done(value);
-          },
-          () => done()
-        )
-      },
       {
         id: "extensions",
         label: "Extensions",
@@ -61276,7 +61217,8 @@ var SessionSelectorComponent = class extends Container {
   items;
   refreshAttempted = /* @__PURE__ */ new Set();
   refreshInFlight = false;
-  pendingRefreshId;
+  refreshQueue = [];
+  refreshQueued = /* @__PURE__ */ new Set();
   refreshTimer;
   destroyed = false;
   constructor(sessions, callbacks, options = {}) {
@@ -61310,16 +61252,15 @@ var SessionSelectorComponent = class extends Container {
       this.clearRefreshTimer();
       this.callbacks.onCancel();
     };
-    this.selectList.onSelectionChange = (item) => {
-      this.scheduleRefresh(item.value);
+    this.selectList.onSelectionChange = () => {
+      this.scheduleVisibleRefreshes();
     };
     this.addChild(this.selectList);
     this.addChild(new Spacer(1));
     this.addChild(
       new Text(theme.fg("dim", "  \u2191\u2193 to navigate \xB7 \u2190\u2192 to page \xB7 Enter to select \xB7 Esc to cancel"), 0, 0)
     );
-    const selected = this.selectList.getSelectedItem();
-    if (selected) this.scheduleRefresh(selected.value);
+    this.scheduleVisibleRefreshes();
   }
   handleInput(data) {
     this.selectList.handleInput(data);
@@ -61341,9 +61282,14 @@ var SessionSelectorComponent = class extends Container {
       this.refreshTimer = void 0;
     }
   }
-  scheduleRefresh(sessionId) {
-    if (!this.options.refreshMetadata || this.destroyed || this.refreshAttempted.has(sessionId)) return;
-    this.pendingRefreshId = sessionId;
+  scheduleVisibleRefreshes() {
+    if (!this.options.refreshMetadata || this.destroyed) return;
+    for (const item of this.selectList.getVisibleItems()) {
+      if (this.refreshAttempted.has(item.value) || this.refreshQueued.has(item.value)) continue;
+      this.refreshQueue.push(item.value);
+      this.refreshQueued.add(item.value);
+    }
+    if (this.refreshQueue.length === 0) return;
     this.clearRefreshTimer();
     this.refreshTimer = setTimeout(() => {
       this.refreshTimer = void 0;
@@ -61353,9 +61299,9 @@ var SessionSelectorComponent = class extends Container {
   async runPendingRefresh() {
     if (this.destroyed || !this.options.refreshMetadata) return;
     if (this.refreshInFlight) return;
-    const sessionId = this.pendingRefreshId;
-    this.pendingRefreshId = void 0;
+    const sessionId = this.refreshQueue.shift();
     if (!sessionId || this.refreshAttempted.has(sessionId)) return;
+    this.refreshQueued.delete(sessionId);
     this.refreshAttempted.add(sessionId);
     this.refreshInFlight = true;
     try {
@@ -61366,7 +61312,7 @@ var SessionSelectorComponent = class extends Container {
     } catch {
     } finally {
       this.refreshInFlight = false;
-      if (this.pendingRefreshId && !this.destroyed) {
+      if (this.refreshQueue.length > 0 && !this.destroyed) {
         void this.runPendingRefresh();
       }
     }
@@ -62460,7 +62406,7 @@ function renderExecutionWidgetLines(steps, activeTheme = theme) {
 }
 
 // src/components/tool-execution.ts
-function formatSize(bytes) {
+function formatSize2(bytes) {
   if (bytes < 1024) return `${bytes}B`;
   if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}KB`;
   return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;
@@ -62590,7 +62536,7 @@ ${renderManageTodoListResult(this.result, { expanded: this.expanded }, theme)}`;
           if (truncation.firstLineExceedsLimit) {
             text += "\n" + theme.fg(
               "warning",
-              `[First line exceeds ${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit]`
+              `[First line exceeds ${formatSize2(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit]`
             );
           } else if (truncation.truncatedBy === "lines") {
             text += "\n" + theme.fg(
@@ -62600,7 +62546,7 @@ ${renderManageTodoListResult(this.result, { expanded: this.expanded }, theme)}`;
           } else {
             text += "\n" + theme.fg(
               "warning",
-              `[Truncated: ${truncation.outputLines} lines shown (${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)]`
+              `[Truncated: ${truncation.outputLines} lines shown (${formatSize2(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)]`
             );
           }
         }
@@ -62748,7 +62694,7 @@ ${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
             warnings.push(`${entryLimit} entries limit`);
           }
           if (truncation?.truncated) {
-            warnings.push(`${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
+            warnings.push(`${formatSize2(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
           }
           text += `
 ${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
@@ -62786,7 +62732,7 @@ ${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
             warnings.push(`${resultLimit} results limit`);
           }
           if (truncation?.truncated) {
-            warnings.push(`${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
+            warnings.push(`${formatSize2(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
           }
           text += `
 ${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
@@ -62829,7 +62775,7 @@ ${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
             warnings.push(`${matchLimit} matches limit`);
           }
           if (truncation?.truncated) {
-            warnings.push(`${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
+            warnings.push(`${formatSize2(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
           }
           if (linesTruncated) {
             warnings.push("some lines truncated");
@@ -62869,7 +62815,7 @@ ${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
               warnings.push(`Truncated: showing ${truncation.outputLines} of ${truncation.totalLines} lines`);
             } else {
               warnings.push(
-                `Truncated: ${truncation.outputLines} lines shown (${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)`
+                `Truncated: ${truncation.outputLines} lines shown (${formatSize2(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)`
               );
             }
           }
@@ -63688,8 +63634,7 @@ function showSettingsSelector(host) {
         availableThemes: getAvailableThemes(),
         currentModel: currentModelId,
         availableModels,
-        yoloMode: host.yoloMode,
-        defaultToolSet: host.options.settingsManager.getDefaultToolSet()
+        yoloMode: host.yoloMode
       },
       {
         onThinkingLevelChange: (level) => {
@@ -63718,10 +63663,6 @@ function showSettingsSelector(host) {
             host.showError(`Failed to switch model: ${err}`);
           }
         },
-        onDefaultToolSetChange: (defaultToolSet) => {
-          host.options.settingsManager.setDefaultToolSet(defaultToolSet);
-          host.showStatus(`Default tools: ${formatDefaultToolSet(defaultToolSet)} (restart Pie to apply)`);
-        },
         onYoloToggle: async () => {
           await host.handleYoloCommand();
           done();
@@ -64223,10 +64164,6 @@ function registerBuiltinCommands(host) {
     description: "Change theme",
     handler: () => host.showSettingsSelector()
   });
-  commandTree.register(["settings", "tools"], {
-    description: "Choose the default model-visible tool set",
-    handler: () => host.showSettingsSelector()
-  });
   commandTree.register(["settings", "thinking"], {
     description: "Set thinking level (off/minimal/low/medium/high/xhigh)",
     handler: (_2, args) => host.handleThinkingCommand(args)
@@ -64811,7 +64748,7 @@ function setupInteractiveEditorSubmitHandler(host) {
       const expanded = host.expandSkillCommand(skillText);
       if (expanded !== skillText) {
         if (host.submitLock) {
-          host.queueMessage(expanded, "steer");
+          host.queueMessage(expanded, "followUp", { deliverWhileStreaming: false });
           return;
         }
         host.setSubmitLock(true);
@@ -64842,7 +64779,7 @@ function setupInteractiveEditorSubmitHandler(host) {
     if (text.startsWith("/tools/subagent")) {
       const args = text.slice("/tools/subagent".length).trim();
       if (host.submitLock) {
-        host.queueMessage(text, "steer");
+        host.queueMessage(text, "followUp", { deliverWhileStreaming: false });
         return;
       }
       host.editor.setText("");
@@ -64861,7 +64798,7 @@ function setupInteractiveEditorSubmitHandler(host) {
             host.showStatus("Wait for the current response to finish before compacting");
             return;
           }
-          host.queueMessage(text, "steer");
+          host.queueMessage(text, "followUp", { deliverWhileStreaming: false });
           return;
         }
         host.editor.setText("");
@@ -64891,6 +64828,11 @@ function setupInteractiveEditorSubmitHandler(host) {
         }
         return;
       }
+      if (exactMatch?.isCategory && !exactMatch.handler) {
+        host.showHierarchicalMenu(firstPartSegments);
+        host.editor.setText("");
+        return;
+      }
       const pathStr = text.slice(1);
       const segments = pathStr.split("/").filter(Boolean);
       let node = null;
@@ -64912,7 +64854,7 @@ function setupInteractiveEditorSubmitHandler(host) {
             host.showStatus("Wait for the current response to finish before compacting");
             return;
           }
-          host.queueMessage(text, "steer");
+          host.queueMessage(text, "followUp", { deliverWhileStreaming: false });
           return;
         }
         host.editor.setText("");
@@ -64953,7 +64895,7 @@ function setupInteractiveEditorSubmitHandler(host) {
           for (const [name, command] of ext.commands) {
             if (command.path?.join("/") === fullPath) {
               if (host.submitLock) {
-                host.queueMessage(text, "steer");
+                host.queueMessage(text, "followUp", { deliverWhileStreaming: false });
                 return;
               }
               host.editor.setText("");
@@ -64999,15 +64941,16 @@ function setupInteractiveEditorSubmitHandler(host) {
       }
     }
     if (host.mentionHandler?.hasPendingMentionWork()) {
-      host.queueMessage(text, "steer", {
+      host.queueMessage(text, "followUp", {
         clearEditor: false,
-        statusMessage: "\u6587\u4EF6\u5904\u7406\u4E2D\uFF0C\u6D88\u606F\u5DF2\u6392\u961F\uFF0C\u6DFB\u52A0\u5B8C\u6210\u540E\u81EA\u52A8\u53D1\u9001"
+        statusMessage: "Files are still processing. Message queued and will send when attachments are ready.",
+        deliverWhileStreaming: false
       });
       host.agentSessionController?.requestQueueDispatch();
       return;
     }
     if (host.submitLock) {
-      host.queueMessage(text, "steer");
+      host.queueMessage(text, "followUp", { deliverWhileStreaming: false });
       return;
     }
     host.setSubmitLock(true);
@@ -65037,9 +64980,10 @@ function setupInteractiveEditorSubmitHandler(host) {
             host.setSubmitLock(false);
             host.isProcessing = false;
             host.footer.setState({ status: "ready" });
-            host.queueMessage(text, "steer", {
+            host.queueMessage(text, "followUp", {
               clearEditor: false,
-              statusMessage: `\u6587\u4EF6\u5904\u7406\u4E2D: ${processingFiles.join(", ")}\uFF0C\u5DF2\u6392\u961F\uFF0C\u5904\u7406\u5B8C\u6210\u540E\u81EA\u52A8\u53D1\u9001`
+              statusMessage: `Files still processing: ${processingFiles.join(", ")}. Message queued and will send when attachments are ready.`,
+              deliverWhileStreaming: false
             });
             host.agentSessionController?.requestQueueDispatch();
             return;
@@ -65279,7 +65223,7 @@ var FilePickerComponent = class extends Container {
     if (this.query) {
       this.addChild(new Text(theme.fg("dim", `@ ${this.query}`), 1, 0));
     } else {
-      this.addChild(new Text(theme.fg("dim", "@ \u9009\u62E9\u6587\u4EF6..."), 1, 0));
+      this.addChild(new Text(theme.fg("dim", "@ Select a file..."), 1, 0));
     }
     this.addChild(new Text(theme.fg("border", "\u2500".repeat(40)), 1, 0));
     const maxOptions = 8;
@@ -65304,16 +65248,16 @@ var FilePickerComponent = class extends Container {
           new Text(
             theme.fg(
               "dim",
-              `  ${this.selectedIndex + 1}/${this.options.length} \xB7 \u663E\u793A ${this.scrollOffset + 1}-${visibleEnd}`
+              `  ${this.selectedIndex + 1}/${this.options.length} \xB7 showing ${this.scrollOffset + 1}-${visibleEnd}`
             ),
             1,
             0
           )
         );
       }
-      this.addChild(new Text(theme.fg("dim", "\u2191\u2193 \u9009\u62E9 \xB7 \u2190 \u8FD4\u56DE / \u2192 \u8FDB\u5165 \xB7 Enter \u786E\u8BA4 \xB7 Esc \u53D6\u6D88"), 1, 0));
+      this.addChild(new Text(theme.fg("dim", "\u2191\u2193 Select \xB7 \u2190 Back / \u2192 Open \xB7 Enter Confirm \xB7 Esc Cancel"), 1, 0));
     } else {
-      this.addChild(new Text(theme.fg("dim", "  \u65E0\u5339\u914D\u6587\u4EF6"), 1, 0));
+      this.addChild(new Text(theme.fg("dim", "  No matching files"), 1, 0));
     }
   }
 };
@@ -65346,11 +65290,11 @@ var FileCommands = class {
         purpose: parsed.purpose,
         onProgress: (progress, stage) => {
           const stageNames = {
-            analyzing: "\u5206\u6790\u4E2D",
-            preprocessing: "\u9884\u5904\u7406",
-            uploading: "\u4E0A\u4F20\u4E2D",
-            processing: "\u5904\u7406\u4E2D",
-            complete: "\u5B8C\u6210"
+            analyzing: "Analyzing",
+            preprocessing: "Preprocessing",
+            uploading: "Uploading",
+            processing: "Processing",
+            complete: "Complete"
           };
           this.context.showStatus(`${stageNames[stage] || stage}... ${progress}%`);
         }
@@ -65417,11 +65361,11 @@ var FileCommands = class {
         optimize: parsed.options,
         onProgress: (progress, stage) => {
           const stageNames = {
-            analyzing: "\u5206\u6790\u89C6\u9891",
-            preprocessing: "\u9884\u5904\u7406",
-            uploading: "\u4E0A\u4F20\u4E2D",
-            processing: "\u5E73\u53F0\u5904\u7406\u4E2D",
-            complete: "\u5B8C\u6210"
+            analyzing: "Analyzing video",
+            preprocessing: "Preprocessing",
+            uploading: "Uploading",
+            processing: "Processing",
+            complete: "Complete"
           };
           this.context.showStatus(`${stageNames[stage] || stage}... ${progress}%`);
         }
@@ -65976,7 +65920,7 @@ var MentionHandler = class {
       this.fileManager.ensureSessionTracking(option.fileId);
       const mention = this.formatMention(option.name, option.fileId);
       this.onInsertMention(mention, queryToken);
-      this.onStatus?.(`\u5DF2\u6DFB\u52A0\u6587\u4EF6 ${option.name}\uFF08\u5DF2\u4E0A\u4F20\u5230 ${this.fileManager.getPlatformDisplayName()}\uFF09`);
+      this.onStatus?.(`Added ${option.name} (already uploaded to ${this.fileManager.getPlatformDisplayName()})`);
     } else if (option.type === "upload" && option.path) {
       this.pendingUploadCount += 1;
       const pendingMention = this.formatPendingMention(option.name);
@@ -65986,15 +65930,15 @@ var MentionHandler = class {
         if (option.cacheStatus === "uploaded") {
           this.pushPendingStatus(
             pendingStatusKey,
-            `\u51C6\u5907\u6DFB\u52A0 ${option.name}\uFF08\u5C06\u590D\u7528 ${this.fileManager.getPlatformDisplayName()} \u5DF2\u4E0A\u4F20\u6587\u4EF6\uFF09...`
+            `Preparing ${option.name} (reusing upload from ${this.fileManager.getPlatformDisplayName()})...`
           );
         } else if (option.cacheStatus === "cached") {
           this.pushPendingStatus(
             pendingStatusKey,
-            `\u51C6\u5907\u6DFB\u52A0 ${option.name}\uFF08\u5C06\u590D\u7528\u672C\u5730\u7F13\u5B58\uFF09...`
+            `Preparing ${option.name} (reusing local cache)...`
           );
         } else {
-          this.pushPendingStatus(pendingStatusKey, `\u51C6\u5907\u6DFB\u52A0 ${option.name}...`);
+          this.pushPendingStatus(pendingStatusKey, `Preparing ${option.name}...`);
         }
         const mimeType = FileCache.getMimeType(option.path);
         const shouldStageLocally = !mimeType.startsWith("image/") && !mimeType.startsWith("video/");
@@ -66018,33 +65962,33 @@ var MentionHandler = class {
           const mention = this.formatMention(result.name, result.fileId);
           this.onInsertMention(mention, pendingMention);
           this.clearPendingStatus(pendingStatusKey);
-          this.onStatus?.(shouldStageLocally ? `\u5DF2\u6DFB\u52A0\u672C\u5730\u6587\u4EF6 ${result.name}` : `\u5DF2\u6DFB\u52A0\u6587\u4EF6 ${result.name}`);
+          this.onStatus?.(shouldStageLocally ? `Added local file ${result.name}` : `Added ${result.name}`);
         } else {
           this.onInsertMention("", pendingMention);
           this.clearPendingStatus(pendingStatusKey);
-          this.onError?.("\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5");
+          this.onError?.("File upload failed. Please try again.");
         }
       } catch (err) {
         this.onInsertMention("", pendingMention);
         this.clearPendingStatus(pendingStatusKey);
         const errorMessage3 = err instanceof Error ? err.message : String(err);
         if (errorMessage3.includes("PLATFORM_NOT_SUPPORTED")) {
-          this.onError?.("\u5F53\u524D AI \u6A21\u578B\u4E0D\u652F\u6301\u6587\u4EF6\u4E0A\u4F20");
+          this.onError?.("The current AI model does not support file uploads.");
         } else if (errorMessage3.includes("ENOENT")) {
-          this.onError?.("\u6587\u4EF6\u4E0D\u5B58\u5728\u6216\u65E0\u6CD5\u8BBF\u95EE");
+          this.onError?.("File does not exist or cannot be accessed.");
         } else if (errorMessage3.includes("EACCES") || errorMessage3.includes("PERMISSION")) {
-          this.onError?.("\u6CA1\u6709\u6743\u9650\u8BBF\u95EE\u8BE5\u6587\u4EF6");
+          this.onError?.("Permission denied while accessing the file.");
         } else if (errorMessage3.includes("network") || errorMessage3.includes("ETIMEDOUT") || errorMessage3.includes("ECONNREFUSED")) {
-          this.onError?.("\u7F51\u7EDC\u9519\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u8FDE\u63A5\u540E\u91CD\u8BD5");
+          this.onError?.("Network error. Check the connection and try again.");
         } else {
-          this.onError?.(`\u4E0A\u4F20\u5931\u8D25: ${errorMessage3}`);
+          this.onError?.(`Upload failed: ${errorMessage3}`);
         }
       } finally {
         this.clearPendingStatus(pendingStatusKey);
         this.pendingUploadCount = Math.max(0, this.pendingUploadCount - 1);
       }
     } else {
-      this.onError?.("\u65E0\u6548\u7684\u6587\u4EF6\u9009\u9879");
+      this.onError?.("Invalid file option.");
     }
     this.browsingDirectory = void 0;
     this.onHidePicker();
@@ -66186,10 +66130,10 @@ var MentionHandler = class {
     const seenNames = /* @__PURE__ */ new Set();
     options.push({
       type: "browse",
-      name: "\u6D4F\u89C8\u6587\u4EF6\u7CFB\u7EDF...",
+      name: "Browse filesystem...",
       path: process.cwd(),
       icon: "\u{1F4C2}",
-      meta: "\u8DF3\u51FA\u5F53\u524D\u76EE\u5F55\u9009\u62E9\u6587\u4EF6"
+      meta: "Choose a file outside the current directory"
     });
     try {
       const sessionFiles = this.fileManager.getSessionFiles();
@@ -66197,7 +66141,7 @@ var MentionHandler = class {
         if (!query || file.name.toLowerCase().includes(query.toLowerCase())) {
           if (seenNames.has(file.name.toLowerCase())) continue;
           seenNames.add(file.name.toLowerCase());
-          const statusText = file.status === "ready" ? "\u5DF2\u4E0A\u4F20" : file.status === "uploading" ? "\u4E0A\u4F20\u4E2D" : file.status === "expired" ? "\u5DF2\u8FC7\u671F" : file.status;
+          const statusText = file.status === "ready" ? "uploaded" : file.status === "uploading" ? "uploading" : file.status === "expired" ? "expired" : file.status;
           options.push({
             type: "cached",
             name: file.name,
@@ -66221,7 +66165,7 @@ var MentionHandler = class {
           path: file.path,
           icon: getFileTypeIcon(file.type),
           cacheStatus: file.cacheStatus,
-          meta: `${this.formatCacheMeta(file.cacheStatus)}\u5F53\u524D\u76EE\u5F55 \u2022 ${formatBytes(file.size)}`
+          meta: `${this.formatCacheMeta(file.cacheStatus)}current directory \u2022 ${formatBytes(file.size)}`
         });
       }
     } catch (err) {
@@ -66244,7 +66188,7 @@ var MentionHandler = class {
             hash: file.hash,
             fileId,
             icon: getFileTypeIcon(file.type),
-            meta: `\u7F13\u5B58 \u2022 ${formatBytes(file.size)}`
+            meta: `cache \u2022 ${formatBytes(file.size)}`
           });
           if (options.length >= 10) break;
         }
@@ -66265,7 +66209,7 @@ var MentionHandler = class {
               name,
               path: resolvedPath,
               icon: "\u2B06\uFE0F",
-              meta: `${formatBytes(stats.size)} \u2022 \u70B9\u51FB\u4E0A\u4F20`
+              meta: `${formatBytes(stats.size)} \u2022 click to upload`
             });
           }
         }
@@ -66290,7 +66234,7 @@ var MentionHandler = class {
         name: "..",
         path: path26.dirname(currentDir),
         icon: "\u21A9",
-        meta: "\u8FD4\u56DE\u4E0A\u7EA7\u76EE\u5F55"
+        meta: "Parent directory"
       });
     }
     for (const directory of entries.directories) {
@@ -66299,7 +66243,7 @@ var MentionHandler = class {
         name: directory.name,
         path: directory.path,
         icon: "\u{1F4C1}",
-        meta: "\u76EE\u5F55"
+        meta: "Directory"
       });
     }
     for (const file of entries.files) {
@@ -66314,7 +66258,7 @@ var MentionHandler = class {
     }
     return {
       options,
-      queryLabel: `\u6D4F\u89C8 ${displayDir}${filter ? ` \xB7 ${filter}` : ""}`
+      queryLabel: `Browse ${displayDir}${filter ? ` \xB7 ${filter}` : ""}`
     };
   }
   getBrowserDirectory(query = this.currentQuery) {
@@ -66331,24 +66275,24 @@ var MentionHandler = class {
     const normalizedPlatform = normalizeFileManagerPlatform(platform2);
     const fileInfo = this.findFileByFileId(fileId);
     if (!fileInfo) {
-      return { reason: "\u6587\u4EF6\u4E0D\u53EF\u7528" };
+      return { reason: "File unavailable" };
     }
     if (fileInfo.platform === "local") {
-      return { fileInfo, reason: "\u4EC5\u672C\u5730\u53EF\u590D\u7528" };
+      return { fileInfo, reason: "Reusable locally only" };
     }
     if (fileInfo.platform !== normalizedPlatform) {
-      return { fileInfo, reason: "\u5F53\u524D\u5E73\u53F0\u4E0D\u53EF\u590D\u7528" };
+      return { fileInfo, reason: "Not reusable on the current platform" };
     }
     const fileStatus = await this.fileManager.getFileStatus(fileId);
     if (!fileStatus) {
-      return { fileInfo, reason: "\u6587\u4EF6\u4E0D\u53EF\u7528" };
+      return { fileInfo, reason: "File unavailable" };
     }
     if (fileStatus.status === "active" || fileStatus.status === "ready") {
       return { fileInfo, fileId, status: "ready", reason: "ok" };
     }
     if (fileStatus.status === "processing" || fileStatus.status === "uploading") {
       if (fileInfo.mimeType.startsWith("video/")) {
-        return { fileInfo, fileId, status: "uploading", reason: "\u89C6\u9891\u5904\u7406\u4E2D" };
+        return { fileInfo, fileId, status: "uploading", reason: "Video is still processing" };
       }
       return { fileInfo, fileId, status: "ready", reason: "ok" };
     }
@@ -66357,12 +66301,12 @@ var MentionHandler = class {
       if (refreshed.success && refreshed.fileId) {
         return { fileInfo, fileId: refreshed.fileId, status: "ready", reason: "ok" };
       }
-      return { fileInfo, reason: "\u6587\u4EF6\u5DF2\u8FC7\u671F" };
+      return { fileInfo, reason: "File expired" };
     }
     if (fileStatus.unsupportedPlatform) {
-      return { fileInfo, reason: "\u5F53\u524D\u5E73\u53F0\u4E0D\u53EF\u590D\u7528" };
+      return { fileInfo, reason: "Not reusable on the current platform" };
     }
-    return { fileInfo, reason: "\u6587\u4EF6\u4E0D\u53EF\u7528" };
+    return { fileInfo, reason: "File unavailable" };
   }
   formatMention(name, fileId) {
     return `@[${name}](file:${fileId}) `;
@@ -66372,20 +66316,20 @@ var MentionHandler = class {
   }
   formatUploadProgress(name, progress, stage) {
     const stageNames = {
-      analyzing: "\u5206\u6790\u4E2D",
-      preprocessing: "\u9884\u5904\u7406\u4E2D",
-      uploading: "\u4E0A\u4F20\u4E2D",
-      processing: "\u5E73\u53F0\u5904\u7406\u4E2D",
-      complete: "\u5B8C\u6210"
+      analyzing: "Analyzing",
+      preprocessing: "Preprocessing",
+      uploading: "Uploading",
+      processing: "Processing",
+      complete: "Complete"
     };
     return `${stageNames[stage]} ${name}... ${Math.max(0, Math.min(100, Math.round(progress)))}%`;
   }
   formatCacheMeta(cacheStatus) {
     if (cacheStatus === "uploaded") {
-      return `\u66FE\u4E0A\u4F20\u5230${this.fileManager.getPlatformDisplayName()} \u2022 `;
+      return `uploaded to ${this.fileManager.getPlatformDisplayName()} \u2022 `;
     }
     if (cacheStatus === "cached") {
-      return "\u4EC5\u672C\u5730\u53EF\u590D\u7528 \u2022 ";
+      return "local cache only \u2022 ";
     }
     return "";
   }
@@ -66849,7 +66793,8 @@ function queueMessage(host, text, mode, options = {}) {
       streamingBehavior: mode,
       displayText: text,
       dedupeKey: options.dedupeKey,
-      clearEditor
+      clearEditor,
+      deliverWhileStreaming: options.deliverWhileStreaming ?? mode === "steer"
     }
   ).catch((error) => {
     host.showError(`Queue error: ${error instanceof Error ? error.message : String(error)}`);
@@ -67073,52 +67018,15 @@ var TodoWidgetComponent = class extends Container {
 
 // src/agent-guidelines.ts
 function buildCodingAgentGuidelinesSection(tools = []) {
-  const toolNames = new Set(tools.map((tool) => tool.name));
-  const hasRead = toolNames.has("read_file");
-  const hasWrite = toolNames.has("write_file");
-  const hasEdit = toolNames.has("edit_file");
-  const hasGrep = toolNames.has("grep_text");
-  const hasFind = toolNames.has("find_files");
-  const hasBash = toolNames.has("bash");
-  const hasWebResearch = toolNames.has("web_research");
-  const hasWebSearch = toolNames.has("web_search");
-  const hasWebFetch = toolNames.has("web_fetch");
-  const hasCodeIntel = toolNames.has("code_intel");
-  const hasTodo = toolNames.has("manage_todo_list");
+  void tools;
   const guidelines = [
-    "Complete coding tasks by making the needed file changes; do not stop at analysis."
+    "Handle coding tasks by analyzing, planning, or making changes as the available tools and user request allow; do not stop at analysis when execution is expected.",
+    "Work in the current workspace, preserve user changes, and keep edits focused.",
+    "Inspect the relevant code before changing it. Use file tools for workspace writes; do not use shell redirection or heredocs to bypass write_file/edit_file guards.",
+    "Run the most relevant existing test, build, or check after file changes when practical.",
+    "If a command fails or times out, change the approach instead of repeating the same command.",
+    "Finish with a concise summary of changes, validation, and any remaining risk."
   ];
-  if (hasRead && hasEdit) {
-    guidelines.push("Read the current file before edit_file; use precise replacements and batch related edits when possible.");
-  }
-  if (hasGrep || hasFind) {
-    guidelines.push("Use targeted search to locate files, then read only the ranges needed for the edit.");
-  }
-  if (hasRead && !hasEdit) {
-    guidelines.push("Read only the relevant ranges; avoid repeating unchanged reads.");
-  }
-  if (hasWrite) {
-    guidelines.push("Use write_file for new files or true complete rewrites; prefer edit_file for targeted changes.");
-  }
-  if (hasBash) {
-    if (hasWrite || hasEdit) {
-      guidelines.push("Use file tools for file writes; do not use shell redirection or heredocs to bypass write_file/edit_file guards.");
-    }
-    guidelines.push("Use bash for tests, builds, and inspection commands; if a command fails or times out, change the approach instead of repeating it.");
-  }
-  if (hasWebResearch || hasWebSearch || hasWebFetch) {
-    guidelines.push("Use web tools only when current or external public information is required.");
-  }
-  if (hasCodeIntel) {
-    guidelines.push("Use code_intel when type, diagnostic, definition, or reference information would materially reduce code-reading churn.");
-  }
-  if (hasTodo) {
-    guidelines.push("Use manage_todo_list only for genuinely multi-step work, and mark items done only after the work is complete.");
-  }
-  guidelines.push(
-    "Run the relevant existing test or build after changes; if it passes, stop and report the result.",
-    "Keep task-relative paths relative to the current working directory."
-  );
   return `## Guidelines
 
 ${guidelines.map((guideline, index) => `${index + 1}. ${guideline}`).join("\n")}`;
@@ -67531,7 +67439,7 @@ function recoverFromInvalidFileReferenceError(host, errorMessage3) {
       const fileId = url.slice("ms://".length);
       if (!invalidFileIds.has(fileId)) return [block];
       messageChanged = true;
-      return [{ type: "text", text: " [\u6587\u4EF6\u5F15\u7528\u5DF2\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u53D1\u9001\u6587\u4EF6] " }];
+      return [{ type: "text", text: " [File reference expired. Please attach the file again.] " }];
     });
     if (!messageChanged) return message;
     changed = true;
@@ -67539,7 +67447,7 @@ function recoverFromInvalidFileReferenceError(host, errorMessage3) {
   });
   if (!changed) return;
   host.replaceAgentMessagesAndMarkSynced(sanitizedMessages, { updateSession: true });
-  host.showStatus("\u68C0\u6D4B\u5230\u5931\u6548\u6587\u4EF6\u5F15\u7528\uFF0C\u5DF2\u4ECE\u5F53\u524D\u4F1A\u8BDD\u4E0A\u4E0B\u6587\u79FB\u9664\uFF0C\u8BF7\u91CD\u65B0\u53D1\u9001\u6587\u4EF6");
+  host.showStatus("Removed expired file references from this session context. Please attach the file again.");
 }
 
 // src/components/hierarchical-selector.ts
@@ -68321,6 +68229,80 @@ function buildDirectShellCommand(command) {
   }
   return { file: "bash", args: ["-lc", command], prompt: "$" };
 }
+var DIRECT_OUTPUT_MAX_LINES = 400;
+var DIRECT_OUTPUT_MAX_BYTES = 16 * 1024;
+var DIRECT_CAPTURE_PREFIX_BYTES = 512 * 1024;
+var DIRECT_CAPTURE_TAIL_BYTES = 512 * 1024;
+function takeUtf8Prefix(text, maxBytes) {
+  const bytes = Buffer.from(text, "utf8");
+  if (bytes.length <= maxBytes) return text;
+  return bytes.subarray(0, maxBytes).toString("utf8").replace(/\uFFFD+$/g, "");
+}
+function takeUtf8Suffix(text, maxBytes) {
+  const bytes = Buffer.from(text, "utf8");
+  if (bytes.length <= maxBytes) return text;
+  return bytes.subarray(Math.max(0, bytes.length - maxBytes)).toString("utf8").replace(/^\uFFFD+/g, "");
+}
+var DirectBashOutputCollector = class {
+  prefix = "";
+  tail = "";
+  totalBytes = 0;
+  overflowed = false;
+  append(text) {
+    if (!text) return;
+    const bytes = Buffer.byteLength(text, "utf8");
+    this.totalBytes += bytes;
+    if (!this.overflowed) {
+      const next = this.prefix + text;
+      if (Buffer.byteLength(next, "utf8") <= DIRECT_CAPTURE_PREFIX_BYTES + DIRECT_CAPTURE_TAIL_BYTES) {
+        this.prefix = next;
+        return;
+      }
+      this.overflowed = true;
+      this.prefix = takeUtf8Prefix(next, DIRECT_CAPTURE_PREFIX_BYTES);
+      this.tail = takeUtf8Suffix(next, DIRECT_CAPTURE_TAIL_BYTES);
+      return;
+    }
+    this.tail = takeUtf8Suffix(this.tail + text, DIRECT_CAPTURE_TAIL_BYTES);
+  }
+  format() {
+    if (this.totalBytes === 0) {
+      return {
+        text: "[command completed with no output]",
+        empty: true,
+        truncated: false,
+        totalBytes: 0,
+        totalLines: 0
+      };
+    }
+    const materialized = this.overflowed ? `${this.prefix}
+... [direct bash capture omitted ${formatSize(Math.max(0, this.totalBytes - Buffer.byteLength(this.prefix, "utf8") - Buffer.byteLength(this.tail, "utf8")))} from the middle] ...
+${this.tail}` : this.prefix;
+    const truncated = truncateHeadTail(materialized, {
+      maxLines: DIRECT_OUTPUT_MAX_LINES,
+      maxBytes: DIRECT_OUTPUT_MAX_BYTES
+    });
+    const suffix = truncated.truncated ? `
+
+[direct bash output truncated: showing ${truncated.outputLines}/${truncated.totalLines} lines, ${formatSize(truncated.outputBytes)}/${formatSize(this.totalBytes)}]` : "";
+    return {
+      text: `${truncated.content}${suffix}`,
+      empty: false,
+      truncated: truncated.truncated || this.overflowed,
+      totalBytes: this.totalBytes,
+      totalLines: truncated.totalLines
+    };
+  }
+};
+function renderOutputText(outputContainer, text, color = "dim") {
+  const lines = text.split("\n");
+  for (let i = 0; i < lines.length; i += 1) {
+    const line = lines[i];
+    if (line || i < lines.length - 1) {
+      outputContainer.addChild(new Text(theme.fg(color, line), 1, 0));
+    }
+  }
+}
 async function handleDirectBash(host, command) {
   host.chatContainer.addChild(new Spacer(1));
   const shellCommand = buildDirectShellCommand(command);
@@ -68335,31 +68317,20 @@ async function handleDirectBash(host, command) {
     cwd: process.cwd(),
     env: process.env
   });
+  const output = new DirectBashOutputCollector();
   child.stdout.on("data", (data) => {
-    const text = data.toString();
-    const lines = text.split("\n");
-    for (const line of lines) {
-      if (line || lines.indexOf(line) < lines.length - 1) {
-        outputContainer.addChild(new Text(theme.fg("dim", line), 1, 0));
-      }
-    }
-    host.ui.requestRender();
+    output.append(data.toString());
   });
   child.stderr.on("data", (data) => {
-    const text = data.toString();
-    const lines = text.split("\n");
-    for (const line of lines) {
-      if (line || lines.indexOf(line) < lines.length - 1) {
-        outputContainer.addChild(new Text(theme.fg("error", line), 1, 0));
-      }
-    }
-    host.ui.requestRender();
+    output.append(data.toString());
   });
   return new Promise((resolve5) => {
     let settled = false;
     const finish = (code) => {
       if (settled) return;
       settled = true;
+      const formatted = output.format();
+      renderOutputText(outputContainer, formatted.text, code === 0 ? "dim" : "error");
       if (code !== 0) {
         outputContainer.addChild(new Spacer(1));
         outputContainer.addChild(new Text(theme.fg("error", `[exit ${code ?? "spawn error"}]`), 1, 0));
@@ -68369,7 +68340,7 @@ async function handleDirectBash(host, command) {
       resolve5();
     };
     child.on("error", (error) => {
-      outputContainer.addChild(new Text(theme.fg("error", error.message), 1, 0));
+      output.append(error.message);
       finish(null);
     });
     child.on("close", (code) => {
@@ -69134,10 +69105,8 @@ var InteractiveMode = class {
     const rebuilt = this.rebuildSkillAwareTools(completeToolSet);
     const currentTools = this.extensionRunner ? wrapToolsWithExtensions(rebuilt.currentTools, this.extensionRunner) : rebuilt.currentTools;
     const originalTools = this.extensionRunner ? wrapToolsWithExtensions(rebuilt.originalTools, this.extensionRunner) : rebuilt.originalTools;
-    const defaultToolSet = this.options.settingsManager.getDefaultToolSet();
-    const defaultTools = selectDefaultTools(currentTools, defaultToolSet);
     const activeTools = selectToolsForRuntimeMode(
-      defaultTools,
+      currentTools,
       this.planModeEnabled ? "plan" : "normal"
     );
     this.agent.setTools(activeTools);
@@ -69219,6 +69188,7 @@ var InteractiveMode = class {
       },
       apiKey: this.options.apiKey,
       sessionId: activeSession?.id,
+      streamFn: this.options.streamFn,
       transformContext: createRuntimeModeTransformContext({
         getState: () => this.getRuntimeModeState(),
         consumeTransition: () => this.consumeRuntimeModeTransition(),
@@ -69703,12 +69673,11 @@ async function composeCliRuntime(params) {
   const allTools = createPolicyEnforcedTools(rawTools, {
     getContext: () => ({ mode: "normal", confirmationPolicy: "allow" })
   });
-  const defaultToolSet = settingsManager.getDefaultToolSet();
-  const tools = selectDefaultTools(allTools, defaultToolSet);
+  const tools = [...allTools];
   recordCliCompositionStep(compositionTrace, {
     id: "policy_filtering",
     inputSummary: `tools=${rawTools.length}`,
-    outputSummary: `${summarizeToolNames(tools)} (defaultSet=${defaultToolSet}; available=${allTools.length})`,
+    outputSummary: summarizeToolNames(tools),
     toolCount: tools.length,
     policyDecisions: rawTools.length === allTools.length ? ["allow:default"] : [`filtered:${rawTools.length - allTools.length}`]
   });
@@ -71201,11 +71170,8 @@ async function runWithJsonEventsConsoleIsolation(fn) {
   }
 }
 async function createCliTestStreamFnFromEnv() {
-  if (!process.env.PIE_TEST_MOCK_STREAM_SEQUENCE) {
-    return void 0;
-  }
-  const { createTestStreamFnFromSequenceEnv } = await import("./chunks/test-stream-ZNGAUUVH.js");
-  return createTestStreamFnFromSequenceEnv();
+  if (!process.env.PIE_TEST_MOCK_STREAM_SEQUENCE) return void 0;
+  return (await import("./chunks/test-stream-A7JSM2UM.js")).createTestStreamFnFromSequenceEnv();
 }
 async function startChat(initialPrompt, testCommand) {
   const rawOutput = process.argv.includes("--raw-output");
@@ -71276,7 +71242,9 @@ async function startChat(initialPrompt, testCommand) {
   process.env.PIE_TUI_ACTIVE = "1";
   const runtimeLogger = initializeCliRuntimeLogger(runtime.sessionId, { mode: "interactive_tui" });
   const restoreConsoleInterception = installInteractiveConsoleInterception(runtimeLogger);
-  const interactive = new InteractiveMode(runtime.createInteractiveOptions());
+  const interactiveOptions = runtime.createInteractiveOptions();
+  interactiveOptions.streamFn = await createCliTestStreamFnFromEnv();
+  const interactive = new InteractiveMode(interactiveOptions);
   try {
     await interactive.init();
     if (runtime.initialModel.unconfigured && runtime.initialModel.warning) {