osagent 0.1.16 → 0.1.18

package/dist/cli.js

@@ -142539,7 +142539,7 @@ var init_anthropic = __esm({
         const lowerModel = model.toLowerCase();
         return lowerModel.includes("claude");
       }
-      buildRequest(request4, userPromptId) {
+      buildRequest(request4, _userPromptId) {
         const result = { ...request4 };
         if (result.temperature !== void 0 && result.top_p !== void 0) {
           delete result.top_p;
@@ -142577,7 +142577,7 @@ var init_openrouter = __esm({
           "X-Title": "OSAgent"
         };
       }
-      buildRequest(request4, userPromptId) {
+      buildRequest(request4, _userPromptId) {
         const result = { ...request4 };
         if (result.temperature !== void 0 && result.top_p !== void 0 && AnthropicOpenAICompatibleProvider.isClaudeModel(result.model)) {
           delete result.top_p;
@@ -142611,14 +142611,14 @@ var init_ollama = __esm({
        */
       static isOllamaProvider(config) {
         const baseUrl = config.baseUrl?.toLowerCase() || "";
-        return baseUrl.includes("ollama.com") || baseUrl.includes("localhost:11434") || baseUrl.includes("127.0.0.1:11434");
+        return baseUrl.includes("osa.dev") || baseUrl.includes("ollama.com") || baseUrl.includes("localhost:11434") || baseUrl.includes("127.0.0.1:11434");
       }
       /**
-       * Check if this is Ollama Cloud (vs Local)
+       * Check if this is OS Agent Cloud (vs Local)
        */
       isCloud() {
         const baseUrl = this.contentGeneratorConfig.baseUrl?.toLowerCase() || "";
-        return baseUrl.includes("ollama.com");
+        return baseUrl.includes("osa.dev") || baseUrl.includes("ollama.com");
       }
       buildHeaders() {
         const version2 = this.cliConfig.getCliVersion() || "unknown";
@@ -146088,7 +146088,7 @@ function createContentGeneratorConfig(config, authType, generationConfig) {
     return {
       ...newContentGeneratorConfig,
       model: newContentGeneratorConfig?.model || DEFAULT_OLLAMA_CODER_MODEL,
-      baseUrl: newContentGeneratorConfig?.baseUrl || "https://ollama.com",
+      baseUrl: newContentGeneratorConfig?.baseUrl || "https://osa.dev",
       // API key from OLLAMA_API_KEY env var or settings
       apiKey: newContentGeneratorConfig?.apiKey || process.env["OLLAMA_API_KEY"]
     };
@@ -146108,7 +146108,7 @@ function createContentGeneratorConfig(config, authType, generationConfig) {
   };
 }
 async function createContentGenerator(config, gcConfig, sessionId2, isInitialAuth) {
-  const version2 = "0.1.16";
+  const version2 = "0.1.18";
   const userAgent2 = `OSAgent/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -287093,8 +287093,7 @@ init_esbuild_shims();
 
 // packages/cli/src/patches/punycode-shim.ts
 init_esbuild_shims();
-import Module from "node:module";
-import { createRequire as createRequire2 } from "node:module";
+import Module, { createRequire as createRequire2 } from "node:module";
 var require2 = createRequire2(import.meta.url);
 var userlandPunycode = require2.resolve("punycode/");
 var moduleAny = Module;
@@ -303773,8 +303772,8 @@ function saveSettings(settingsFile) {
 __name(saveSettings, "saveSettings");
 
 // packages/cli/src/config/auth.ts
-function validateAuthMethod(authMethod) {
-  const settings = loadSettings();
+function validateAuthMethod(authMethod, mergedSettings) {
+  const settings = mergedSettings ? { merged: mergedSettings } : loadSettings();
   loadEnvironment(settings.merged);
   if (authMethod === AuthType2.USE_OPENAI) {
     const hasApiKey = process.env["OPENAI_API_KEY"] || settings.merged.security?.auth?.apiKey;
@@ -303786,6 +303785,16 @@ function validateAuthMethod(authMethod) {
   if (authMethod === AuthType2.OSA_OAUTH) {
     return null;
   }
+  if (authMethod === AuthType2.OLLAMA_CLOUD) {
+    const hasApiKey = process.env["OLLAMA_API_KEY"] || settings.merged.security?.auth?.apiKey;
+    if (!hasApiKey) {
+      return "OLLAMA_API_KEY environment variable not found. Get your API key at https://osa.dev";
+    }
+    return null;
+  }
+  if (authMethod === AuthType2.OLLAMA_LOCAL) {
+    return null;
+  }
   return "Invalid auth method selected.";
 }
 __name(validateAuthMethod, "validateAuthMethod");
@@ -309690,7 +309699,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.1.16";
+  return "0.1.18";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -313695,7 +313704,7 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO2 = "009b589";
+var GIT_COMMIT_INFO2 = "c6060b4";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -313900,16 +313909,14 @@ Execute each agent with the same task and synthesize their combined results.`;
         return t2("List all available built-in and custom agents.");
       },
       kind: "built-in" /* BUILT_IN */,
-      action: /* @__PURE__ */ __name(() => {
-        return {
-          type: "submit_prompt",
-          content: [
-            {
-              text: `List all available subagents with their names and descriptions. Include both built-in agents (general-purpose, research-explorer, code-reviewer, test-writer, documentation, osa-orchestrator) and any custom agents defined in .osagent/agents/`
-            }
-          ]
-        };
-      }, "action")
+      action: /* @__PURE__ */ __name(() => ({
+        type: "submit_prompt",
+        content: [
+          {
+            text: `List all available subagents with their names and descriptions. Include both built-in agents (general-purpose, research-explorer, code-reviewer, test-writer, documentation, osa-orchestrator) and any custom agents defined in .osagent/agents/`
+          }
+        ]
+      }), "action")
     }
   ]
 };
@@ -314524,6 +314531,108 @@ var compressCommand = {
   }, "action")
 };
 
+// packages/cli/src/ui/commands/consultCommand.ts
+init_esbuild_shims();
+var consultCommand = {
+  name: "consult",
+  get description() {
+    return t2("Manage consultation mode - gather context through questions");
+  },
+  kind: "built-in" /* BUILT_IN */,
+  subCommands: [
+    {
+      name: "on",
+      get description() {
+        return t2("Enable active consultation mode");
+      },
+      kind: "built-in" /* BUILT_IN */,
+      action: /* @__PURE__ */ __name(async () => ({
+        type: "message",
+        messageType: "info",
+        content: t2("Consultation mode: ACTIVE\nThe agent will ask clarifying questions as you work.\nPress [a] to answer, [s] to skip questions.")
+      }), "action")
+    },
+    {
+      name: "off",
+      get description() {
+        return t2("Disable consultation mode");
+      },
+      kind: "built-in" /* BUILT_IN */,
+      action: /* @__PURE__ */ __name(async () => ({
+        type: "message",
+        messageType: "info",
+        content: t2("Consultation mode: OFF\nNo questions will be asked.")
+      }), "action")
+    },
+    {
+      name: "blocking",
+      get description() {
+        return t2("Enable blocking mode - high priority questions pause the agent");
+      },
+      kind: "built-in" /* BUILT_IN */,
+      action: /* @__PURE__ */ __name(async () => ({
+        type: "message",
+        messageType: "info",
+        content: t2("Consultation mode: BLOCKING\nHigh priority questions will pause the agent until answered.\nThis ensures critical decisions get your input.")
+      }), "action")
+    },
+    {
+      name: "context",
+      get description() {
+        return t2("Show collected context from consultation");
+      },
+      kind: "built-in" /* BUILT_IN */,
+      action: /* @__PURE__ */ __name(async () => ({
+        type: "message",
+        messageType: "info",
+        content: t2("Use this to view all context gathered through consultation.\n(Context will appear here when questions are answered)")
+      }), "action")
+    },
+    {
+      name: "clear",
+      get description() {
+        return t2("Clear all collected consultation context");
+      },
+      kind: "built-in" /* BUILT_IN */,
+      action: /* @__PURE__ */ __name(async () => ({
+        type: "message",
+        messageType: "info",
+        content: t2("Consultation context cleared.")
+      }), "action")
+    }
+  ],
+  action: /* @__PURE__ */ __name(async (_context, args) => {
+    const argTrimmed = args.trim().toLowerCase();
+    if (!argTrimmed) {
+      return {
+        type: "message",
+        messageType: "info",
+        content: t2(`Consultation Mode
+
+The consultation system gathers context from you as you work:
+- Questions appear below the loading indicator
+- Press [a] to answer, [s] to skip
+- Context is used to improve agent responses
+
+Commands:
+  /consult on       - Active mode (questions shown, agent continues)
+  /consult blocking - Blocking mode (high-priority questions pause agent)
+  /consult off      - Disable consultation
+  /consult context  - View collected context
+  /consult clear    - Clear all context
+
+Current: Active mode`)
+      };
+    }
+    return {
+      type: "message",
+      messageType: "error",
+      content: t2(`Unknown option: ${argTrimmed}
+Use /consult for help.`)
+    };
+  }, "action")
+};
+
 // packages/cli/src/ui/commands/continueCommand.ts
 init_esbuild_shims();
 import * as fs72 from "node:fs/promises";
@@ -315293,7 +315402,7 @@ var doctorCommand = {
             content: t2(`\u2713 Updated to osagent@${newVersion}
 Restart osagent to use the new version.`)
           };
-        } catch (error) {
+        } catch (_error) {
           return {
             type: "message",
             messageType: "error",
@@ -319081,6 +319190,7 @@ var BuiltinCommandLoader = class {
       chatCommand,
       clearCommand,
       compressCommand,
+      consultCommand,
       continueCommand,
       openaiProfileCommand,
       copyCommand,
@@ -344764,9 +344874,7 @@ var TodoProvider = /* @__PURE__ */ __name(({
   const clearTodos = (0, import_react63.useCallback)(() => {
     setTodosState([]);
   }, []);
-  const getActiveTodo = (0, import_react63.useCallback)(() => {
-    return todos.find((todo) => todo.status === "in_progress");
-  }, [todos]);
+  const getActiveTodo = (0, import_react63.useCallback)(() => todos.find((todo) => todo.status === "in_progress"), [todos]);
   const value = (0, import_react63.useMemo)(
     () => ({
       todos,
@@ -349171,7 +349279,7 @@ function AuthDialog() {
           "Note: Your existing API key in settings.json will not be cleared when using Ollama Cloud. You can switch to a different authentication method later if needed."
         ) }) }),
         /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(Text3, { children: t2("OSAgent - AI Coding Assistant") }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(Text3, { color: Colors.AccentBlue, children: "https://ollama.com" }) })
+        /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(Text3, { color: Colors.AccentBlue, children: "https://osa.dev" }) })
       ]
     }
   );
@@ -350284,7 +350392,7 @@ var DialogManager = /* @__PURE__ */ __name(({
           onSubmit: (apiKey, baseUrl, model) => {
             uiActions.handleAuthSelect(AuthType2.OLLAMA_CLOUD, "User" /* User */, {
               apiKey,
-              baseUrl: baseUrl || "https://ollama.com",
+              baseUrl: baseUrl || "https://osa.dev",
               model: model || "qwen3-coder:480b-cloud"
             });
           },
@@ -350293,10 +350401,10 @@ var DialogManager = /* @__PURE__ */ __name(({
             uiActions.setAuthState("updating" /* Updating */);
           },
           defaultApiKey: fromSettings?.apiKey || process34.env["OLLAMA_API_KEY"] || "",
-          defaultBaseUrl: fromSettings?.baseUrl || "https://ollama.com",
+          defaultBaseUrl: fromSettings?.baseUrl || "https://osa.dev",
           defaultModel: modelSettings?.name || "qwen3-coder:480b-cloud",
           providerName: "Ollama Cloud",
-          apiKeyUrl: "https://ollama.com/settings/keys"
+          apiKeyUrl: "https://osa.dev/settings/keys"
         }
       );
     }
@@ -350444,9 +350552,74 @@ var LoadingIndicator = /* @__PURE__ */ __name(({
   ] });
 }, "LoadingIndicator");
 
-// packages/cli/src/ui/components/ContextSummaryDisplay.tsx
+// packages/cli/src/ui/components/ConsultationDisplay.tsx
 init_esbuild_shims();
 var import_jsx_runtime88 = __toESM(require_jsx_runtime(), 1);
+var ConsultationDisplay = /* @__PURE__ */ __name(({
+  isStreamingActive = false,
+  currentQuestion = null,
+  queueCount = 0,
+  isBlocking = false,
+  consultationMode = "active"
+}) => {
+  if (!currentQuestion) {
+    return null;
+  }
+  const priorityColors = {
+    high: theme.status.error,
+    medium: theme.status.warning,
+    low: theme.text.secondary
+  };
+  const categoryIcons = {
+    architecture: "[arch]",
+    requirements: "[req]",
+    clarification: "[?]",
+    preference: "[pref]"
+  };
+  return /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, paddingX: 1, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(Box_default, { marginBottom: 0, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Text3, { color: theme.text.accent, bold: true, children: isBlocking ? "! " : "? " }),
+      /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(Text3, { color: theme.text.secondary, children: [
+        t2("Consultation"),
+        queueCount > 0 && ` (+${queueCount} more)`
+      ] }),
+      isBlocking && /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(Text3, { color: theme.status.warning, children: [
+        " ",
+        t2("[Waiting for answer]")
+      ] })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(
+      Box_default,
+      {
+        flexDirection: "column",
+        borderStyle: "single",
+        borderColor: isBlocking ? theme.status.warning : theme.border.default,
+        paddingX: 1,
+        marginTop: 0,
+        children: [
+          /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(Box_default, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Text3, { color: priorityColors[currentQuestion.priority], children: categoryIcons[currentQuestion.category] }),
+            /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Text3, { color: theme.text.secondary, children: " " }),
+            /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Text3, { color: theme.text.primary, wrap: "wrap", children: currentQuestion.question })
+          ] }),
+          currentQuestion.context && /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Box_default, { marginTop: 0, children: /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Text3, { color: theme.text.secondary, dimColor: true, wrap: "wrap", children: currentQuestion.context }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(Text3, { color: theme.text.secondary, children: [
+            t2("Reply with your answer in the input below"),
+            isStreamingActive && t2(" (agent continues in background)")
+          ] }) })
+        ]
+      }
+    ),
+    /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Box_default, { marginTop: 0, children: /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(Text3, { color: theme.text.secondary, dimColor: true, children: [
+      t2("Mode: {{mode}}", { mode: consultationMode }),
+      consultationMode === "blocking" && currentQuestion.priority === "high" ? t2(" - High priority questions block agent") : ""
+    ] }) })
+  ] });
+}, "ConsultationDisplay");
+
+// packages/cli/src/ui/components/ContextSummaryDisplay.tsx
+init_esbuild_shims();
+var import_jsx_runtime89 = __toESM(require_jsx_runtime(), 1);
 var ContextSummaryDisplay = /* @__PURE__ */ __name(({
   OSAMdFileCount,
   contextFileNames,
@@ -350461,7 +350634,7 @@ var ContextSummaryDisplay = /* @__PURE__ */ __name(({
   const blockedMcpServerCount = blockedMcpServers?.length || 0;
   const openFileCount = ideContext?.workspaceState?.openFiles?.length ?? 0;
   if (OSAMdFileCount === 0 && mcpServerCount === 0 && blockedMcpServerCount === 0 && openFileCount === 0) {
-    return /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Text3, { children: " " });
+    return /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(Text3, { children: " " });
   }
   const openFilesText = (() => {
     if (openFileCount === 0) {
@@ -350519,16 +350692,16 @@ var ContextSummaryDisplay = /* @__PURE__ */ __name(({
   })();
   const summaryParts = [openFilesText, OSAMdText, mcpText].filter(Boolean);
   if (isNarrow) {
-    return /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(Box_default, { flexDirection: "column", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Text3, { color: theme.text.secondary, children: t2("Using:") }),
-      summaryParts.map((part, index) => /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(Text3, { color: theme.text.secondary, children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)(Box_default, { flexDirection: "column", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(Text3, { color: theme.text.secondary, children: t2("Using:") }),
+      summaryParts.map((part, index) => /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)(Text3, { color: theme.text.secondary, children: [
         "  ",
         "- ",
         part
       ] }, index))
     ] });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(Text3, { color: theme.text.secondary, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)(Text3, { color: theme.text.secondary, children: [
     t2("Using:"),
     " ",
     summaryParts.join(" | ")
@@ -350537,7 +350710,7 @@ var ContextSummaryDisplay = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/AutoAcceptIndicator.tsx
 init_esbuild_shims();
-var import_jsx_runtime89 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime90 = __toESM(require_jsx_runtime(), 1);
 var AutoAcceptIndicator = /* @__PURE__ */ __name(({
   approvalMode
 }) => {
@@ -350564,29 +350737,29 @@ var AutoAcceptIndicator = /* @__PURE__ */ __name(({
     default:
       break;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)(Text3, { color: textColor, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime90.jsxs)(Text3, { color: textColor, children: [
     textContent2,
-    subText && /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(Text3, { color: theme.text.secondary, children: subText })
+    subText && /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(Text3, { color: theme.text.secondary, children: subText })
   ] }) });
 }, "AutoAcceptIndicator");
 
 // packages/cli/src/ui/components/ShellModeIndicator.tsx
 init_esbuild_shims();
-var import_jsx_runtime90 = __toESM(require_jsx_runtime(), 1);
-var ShellModeIndicator = /* @__PURE__ */ __name(() => /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime90.jsxs)(Text3, { color: theme.ui.symbol, children: [
+var import_jsx_runtime91 = __toESM(require_jsx_runtime(), 1);
+var ShellModeIndicator = /* @__PURE__ */ __name(() => /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(Text3, { color: theme.ui.symbol, children: [
   "shell mode enabled",
-  /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(Text3, { color: theme.text.secondary, children: " (esc to disable)" })
+  /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Text3, { color: theme.text.secondary, children: " (esc to disable)" })
 ] }) }), "ShellModeIndicator");
 
 // packages/cli/src/ui/components/DetailedMessagesDisplay.tsx
 init_esbuild_shims();
-var import_jsx_runtime91 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime92 = __toESM(require_jsx_runtime(), 1);
 var DetailedMessagesDisplay = /* @__PURE__ */ __name(({ messages, maxHeight, width }) => {
   if (messages.length === 0) {
     return null;
   }
   const borderAndPadding = 4;
-  return /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -350596,12 +350769,12 @@ var DetailedMessagesDisplay = /* @__PURE__ */ __name(({ messages, maxHeight, wid
       paddingX: 1,
       width,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(Text3, { bold: true, color: theme.text.primary, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(Text3, { bold: true, color: theme.text.primary, children: [
           "Debug Console",
           " ",
-          /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Text3, { color: theme.text.secondary, children: "(ctrl+o to close)" })
+          /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Text3, { color: theme.text.secondary, children: "(ctrl+o to close)" })
         ] }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(MaxSizedBox, { maxHeight, maxWidth: width - borderAndPadding, children: messages.map((msg, index) => {
+        /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(MaxSizedBox, { maxHeight, maxWidth: width - borderAndPadding, children: messages.map((msg, index) => {
           let textColor = theme.text.primary;
           let icon = "\u2139";
           switch (msg.type) {
@@ -350621,14 +350794,14 @@ var DetailedMessagesDisplay = /* @__PURE__ */ __name(({ messages, maxHeight, wid
             default:
               break;
           }
-          return /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(Box_default, { flexDirection: "row", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(Text3, { color: textColor, children: [
+          return /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(Box_default, { flexDirection: "row", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(Text3, { color: textColor, children: [
               icon,
               " "
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(Text3, { color: textColor, wrap: "wrap", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(Text3, { color: textColor, wrap: "wrap", children: [
               msg.content,
-              msg.count && msg.count > 1 && /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(Text3, { color: theme.text.secondary, children: [
+              msg.count && msg.count > 1 && /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(Text3, { color: theme.text.secondary, children: [
                 " (x",
                 msg.count,
                 ")"
@@ -350651,7 +350824,7 @@ init_esbuild_shims();
 // packages/cli/src/ui/components/PrepareLabel.tsx
 init_esbuild_shims();
 var import_react87 = __toESM(require_react(), 1);
-var import_jsx_runtime92 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime93 = __toESM(require_jsx_runtime(), 1);
 var MAX_WIDTH = 150;
 var _PrepareLabel = /* @__PURE__ */ __name(({
   label,
@@ -350663,7 +350836,7 @@ var _PrepareLabel = /* @__PURE__ */ __name(({
   const hasMatch = matchedIndex !== void 0 && matchedIndex >= 0 && matchedIndex < label.length && userInput.length > 0;
   if (!hasMatch) {
     const display = isExpanded ? label : label.length > MAX_WIDTH ? label.slice(0, MAX_WIDTH) + "..." : label;
-    return /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Text3, { wrap: "wrap", color: textColor, children: display });
+    return /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text3, { wrap: "wrap", color: textColor, children: display });
   }
   const matchLength = userInput.length;
   let before = "";
@@ -350702,9 +350875,9 @@ var _PrepareLabel = /* @__PURE__ */ __name(({
       after = after.length >= 3 ? after.slice(0, -3) + "..." : "...";
     }
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(Text3, { color: textColor, wrap: "wrap", children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(Text3, { color: textColor, wrap: "wrap", children: [
     before,
-    match2 ? match2.split(/(\s+)/).map((part, index) => /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(
+    match2 ? match2.split(/(\s+)/).map((part, index) => /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(
       Text3,
       {
         color: theme.background.primary,
@@ -350719,7 +350892,7 @@ var _PrepareLabel = /* @__PURE__ */ __name(({
 var PrepareLabel = import_react87.default.memo(_PrepareLabel);
 
 // packages/cli/src/ui/components/SuggestionsDisplay.tsx
-var import_jsx_runtime93 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime94 = __toESM(require_jsx_runtime(), 1);
 var MAX_SUGGESTIONS_TO_SHOW = 8;
 function SuggestionsDisplay({
   suggestions,
@@ -350732,7 +350905,7 @@ function SuggestionsDisplay({
   expandedIndex
 }) {
   if (isLoading) {
-    return /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Box_default, { paddingX: 1, width, children: /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text3, { color: "gray", children: "Loading suggestions..." }) });
+    return /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Box_default, { paddingX: 1, width, children: /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { color: "gray", children: "Loading suggestions..." }) });
   }
   if (suggestions.length === 0) {
     return null;
@@ -350748,15 +350921,15 @@ function SuggestionsDisplay({
     ...suggestions.map((s2) => getFullLabel(s2).length)
   );
   const commandColumnWidth = mode === "slash" ? Math.min(maxLabelLength, Math.floor(width * 0.5)) : 0;
-  return /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(Box_default, { flexDirection: "column", paddingX: 1, width, children: [
-    scrollOffset > 0 && /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text3, { color: theme.text.primary, children: "\u25B2" }),
+  return /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(Box_default, { flexDirection: "column", paddingX: 1, width, children: [
+    scrollOffset > 0 && /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { color: theme.text.primary, children: "\u25B2" }),
     visibleSuggestions.map((suggestion, index) => {
       const originalIndex = startIndex + index;
       const isActive = originalIndex === activeIndex;
       const isExpanded = originalIndex === expandedIndex;
       const textColor = isActive ? theme.text.accent : theme.text.secondary;
       const isLong = suggestion.value.length >= MAX_WIDTH;
-      const labelElement = /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(
+      const labelElement = /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(
         PrepareLabel,
         {
           label: suggestion.value,
@@ -350766,23 +350939,23 @@ function SuggestionsDisplay({
           isExpanded
         }
       );
-      return /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(Box_default, { flexDirection: "row", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(Box_default, { flexDirection: "row", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(
           Box_default,
           {
             ...mode === "slash" ? { width: commandColumnWidth, flexShrink: 0 } : { flexShrink: 1 },
-            children: /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(Box_default, { children: [
+            children: /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(Box_default, { children: [
               labelElement,
-              suggestion.commandKind === "mcp-prompt" /* MCP_PROMPT */ && /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text3, { color: textColor, children: " [MCP]" })
+              suggestion.commandKind === "mcp-prompt" /* MCP_PROMPT */ && /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { color: textColor, children: " [MCP]" })
             ] })
           }
         ),
-        suggestion.description && /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Box_default, { flexGrow: 1, paddingLeft: 3, children: /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text3, { color: textColor, wrap: "truncate", children: suggestion.description }) }),
-        isActive && isLong && /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text3, { color: Colors.Gray, children: isExpanded ? " \u2190 " : " \u2192 " }) })
+        suggestion.description && /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Box_default, { flexGrow: 1, paddingLeft: 3, children: /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { color: textColor, wrap: "truncate", children: suggestion.description }) }),
+        isActive && isLong && /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { color: Colors.Gray, children: isExpanded ? " \u2190 " : " \u2192 " }) })
       ] }, `${suggestion.value}-${originalIndex}`);
     }),
-    endIndex < suggestions.length && /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text3, { color: "gray", children: "\u25BC" }),
-    suggestions.length > MAX_SUGGESTIONS_TO_SHOW && /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(Text3, { color: "gray", children: [
+    endIndex < suggestions.length && /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { color: "gray", children: "\u25BC" }),
+    suggestions.length > MAX_SUGGESTIONS_TO_SHOW && /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(Text3, { color: "gray", children: [
       "(",
       activeIndex + 1,
       "/",
@@ -352037,7 +352210,7 @@ var ShellFocusContext = (0, import_react95.createContext)(true);
 var useShellFocusState = /* @__PURE__ */ __name(() => (0, import_react95.useContext)(ShellFocusContext), "useShellFocusState");
 
 // packages/cli/src/ui/components/InputPrompt.tsx
-var import_jsx_runtime94 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime95 = __toESM(require_jsx_runtime(), 1);
 var calculatePromptWidths = /* @__PURE__ */ __name((terminalWidth) => {
   const widthFraction = 0.9;
   const FRAME_PADDING_AND_BORDER = 4;
@@ -352546,21 +352719,21 @@ var InputPrompt = /* @__PURE__ */ __name(({
     statusColor = theme.status.warning;
     statusText = t2("Accepting edits");
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(import_jsx_runtime94.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)(import_jsx_runtime95.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)(
       Box_default,
       {
         borderStyle: "round",
         borderColor: isShellFocused && !isEmbeddedShellFocused ? statusColor ?? theme.border.focused : theme.border.default,
         paddingX: 1,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(
+          /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)(
             Text3,
             {
               color: statusColor ?? theme.text.accent,
               "aria-label": statusText || void 0,
               children: [
-                shellModeActive ? reverseSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(
+                shellModeActive ? reverseSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)(
                   Text3,
                   {
                     color: theme.text.link,
@@ -352570,15 +352743,15 @@ var InputPrompt = /* @__PURE__ */ __name(({
                       " "
                     ]
                   }
-                ) : "!" : commandSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { color: theme.text.accent, children: "(r:) " }) : showYoloStyling ? "*" : ">",
+                ) : "!" : commandSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text3, { color: theme.text.accent, children: "(r:) " }) : showYoloStyling ? "*" : ">",
                 " "
               ]
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Box_default, { flexGrow: 1, flexDirection: "column", children: buffer.text.length === 0 && placeholder ? showCursor ? /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(Text3, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Box_default, { flexGrow: 1, flexDirection: "column", children: buffer.text.length === 0 && placeholder ? showCursor ? /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)(Text3, { children: [
             source_default2.inverse(placeholder.slice(0, 1)),
-            /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { color: theme.text.secondary, children: placeholder.slice(1) })
-          ] }) : /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { color: theme.text.secondary, children: placeholder }) : linesToRender.map((lineText, visualIdxInRenderedSet) => {
+            /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text3, { color: theme.text.secondary, children: placeholder.slice(1) })
+          ] }) : /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text3, { color: theme.text.secondary, children: placeholder }) : linesToRender.map((lineText, visualIdxInRenderedSet) => {
             const absoluteVisualIdx = scrollVisualRow + visualIdxInRenderedSet;
             const mapEntry = buffer.visualToLogicalMap[absoluteVisualIdx];
             const cursorVisualRow = cursorVisualRowAbsolute - scrollVisualRow;
@@ -352625,20 +352798,20 @@ var InputPrompt = /* @__PURE__ */ __name(({
               }
               const color = seg.type === "command" || seg.type === "file" ? theme.text.accent : theme.text.primary;
               renderedLine.push(
-                /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { color, children: display }, `token-${segIdx}`)
+                /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text3, { color, children: display }, `token-${segIdx}`)
               );
             });
             if (isOnCursorLine && cursorVisualColAbsolute === cpLen(lineText)) {
               renderedLine.push(
-                /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { children: showCursor ? source_default2.inverse(" ") : " " }, `cursor-end-${cursorVisualColAbsolute}`)
+                /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text3, { children: showCursor ? source_default2.inverse(" ") : " " }, `cursor-end-${cursorVisualColAbsolute}`)
               );
             }
-            return /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Box_default, { height: 1, children: /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { children: renderedLine }) }, `line-${visualIdxInRenderedSet}`);
+            return /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Box_default, { height: 1, children: /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text3, { children: renderedLine }) }, `line-${visualIdxInRenderedSet}`);
           }) })
         ]
       }
     ),
-    shouldShowSuggestions && /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Box_default, { paddingRight: 2, children: /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(
+    shouldShowSuggestions && /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Box_default, { paddingRight: 2, children: /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(
       SuggestionsDisplay,
       {
         suggestions: activeCompletion.suggestions,
@@ -352659,7 +352832,7 @@ init_esbuild_shims();
 
 // packages/cli/src/ui/components/ConsoleSummaryDisplay.tsx
 init_esbuild_shims();
-var import_jsx_runtime95 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime96 = __toESM(require_jsx_runtime(), 1);
 var ConsoleSummaryDisplay = /* @__PURE__ */ __name(({
   errorCount
 }) => {
@@ -352667,14 +352840,14 @@ var ConsoleSummaryDisplay = /* @__PURE__ */ __name(({
     return null;
   }
   const errorIcon = "\u2716";
-  return /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Box_default, { children: errorCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)(Text3, { color: theme.status.error, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(Box_default, { children: errorCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(Text3, { color: theme.status.error, children: [
     errorIcon,
     " ",
     errorCount,
     " error",
     errorCount > 1 ? "s" : "",
     " ",
-    /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text3, { color: theme.text.secondary, children: "(ctrl+o for details)" })
+    /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(Text3, { color: theme.text.secondary, children: "(ctrl+o for details)" })
   ] }) });
 }, "ConsoleSummaryDisplay");
 
@@ -352685,7 +352858,7 @@ import process36 from "node:process";
 init_esbuild_shims();
 var import_react97 = __toESM(require_react(), 1);
 import process35 from "node:process";
-var import_jsx_runtime96 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime97 = __toESM(require_jsx_runtime(), 1);
 var MemoryUsageDisplay = /* @__PURE__ */ __name(() => {
   const [memoryUsage, setMemoryUsage] = (0, import_react97.useState)("");
   const [memoryUsageColor, setMemoryUsageColor] = (0, import_react97.useState)(
@@ -352703,15 +352876,15 @@ var MemoryUsageDisplay = /* @__PURE__ */ __name(() => {
     updateMemory();
     return () => clearInterval(intervalId);
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(Box_default, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(Text3, { color: theme.text.secondary, children: " | " }),
-    /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(Text3, { color: memoryUsageColor, children: memoryUsage })
+  return /* @__PURE__ */ (0, import_jsx_runtime97.jsxs)(Box_default, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime97.jsx)(Text3, { color: theme.text.secondary, children: " | " }),
+    /* @__PURE__ */ (0, import_jsx_runtime97.jsx)(Text3, { color: memoryUsageColor, children: memoryUsage })
   ] });
 }, "MemoryUsageDisplay");
 
 // packages/cli/src/ui/components/ContextUsageDisplay.tsx
 init_esbuild_shims();
-var import_jsx_runtime97 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime98 = __toESM(require_jsx_runtime(), 1);
 var formatTokens = /* @__PURE__ */ __name((count) => {
   if (count >= 1e6) {
     return `${(count / 1e6).toFixed(1)}M`;
@@ -352741,19 +352914,19 @@ var ContextUsageDisplay = /* @__PURE__ */ __name(({
   const percentageUsed = (percentage * 100).toFixed(0);
   const usageColor = getUsageColor(percentage);
   if (terminalWidth < 80) {
-    return /* @__PURE__ */ (0, import_jsx_runtime97.jsxs)(Text3, { color: usageColor, children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text3, { color: usageColor, children: [
       "(",
       percentageUsed,
       "%)"
     ] });
   }
   if (terminalWidth < 120) {
-    return /* @__PURE__ */ (0, import_jsx_runtime97.jsxs)(Text3, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime97.jsxs)(Text3, { color: usageColor, children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text3, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text3, { color: usageColor, children: [
         percentageUsed,
         "%"
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime97.jsxs)(Text3, { color: theme.text.secondary, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text3, { color: theme.text.secondary, children: [
         " ",
         "(",
         formatTokens(promptTokenCount),
@@ -352765,13 +352938,13 @@ var ContextUsageDisplay = /* @__PURE__ */ __name(({
   }
   const barWidth = 10;
   const progressBar = generateProgressBar(percentage, barWidth);
-  return /* @__PURE__ */ (0, import_jsx_runtime97.jsxs)(Text3, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime97.jsxs)(Text3, { color: usageColor, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text3, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text3, { color: usageColor, children: [
       "[",
       progressBar,
       "]"
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime97.jsxs)(Text3, { color: theme.text.secondary, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text3, { color: theme.text.secondary, children: [
       " ",
       formatTokens(promptTokenCount),
       "/",
@@ -352783,7 +352956,7 @@ var ContextUsageDisplay = /* @__PURE__ */ __name(({
 // packages/cli/src/ui/components/DebugProfiler.tsx
 init_esbuild_shims();
 var import_react98 = __toESM(require_react(), 1);
-var import_jsx_runtime98 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime99 = __toESM(require_jsx_runtime(), 1);
 var DebugProfiler = /* @__PURE__ */ __name(() => {
   const numRenders = (0, import_react98.useRef)(0);
   const [showNumRenders, setShowNumRenders] = (0, import_react98.useState)(false);
@@ -352801,7 +352974,7 @@ var DebugProfiler = /* @__PURE__ */ __name(() => {
   if (!showNumRenders) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text3, { color: theme.status.warning, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text3, { color: theme.status.warning, children: [
     "Renders: ",
     numRenders.current,
     " "
@@ -352809,7 +352982,7 @@ var DebugProfiler = /* @__PURE__ */ __name(() => {
 }, "DebugProfiler");
 
 // packages/cli/src/ui/components/Footer.tsx
-var import_jsx_runtime99 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime100 = __toESM(require_jsx_runtime(), 1);
 var Footer = /* @__PURE__ */ __name(() => {
   const uiState = useUIState();
   const config = useConfig();
@@ -352851,7 +353024,7 @@ var Footer = /* @__PURE__ */ __name(() => {
   const displayPath = shortenPath(tildeifyPath(targetDir), pathLength);
   const justifyContent = hideCWD && hideModelInfo ? "center" : "space-between";
   const displayVimMode = vimEnabled ? vimMode : void 0;
-  return /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(
     Box_default,
     {
       justifyContent,
@@ -352859,64 +353032,64 @@ var Footer = /* @__PURE__ */ __name(() => {
       flexDirection: "row",
       alignItems: "center",
       children: [
-        (debugMode || displayVimMode || !hideCWD) && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Box_default, { children: [
-          debugMode && /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(DebugProfiler, {}),
-          displayVimMode && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text3, { color: theme.text.secondary, children: [
+        (debugMode || displayVimMode || !hideCWD) && /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Box_default, { children: [
+          debugMode && /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(DebugProfiler, {}),
+          displayVimMode && /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Text3, { color: theme.text.secondary, children: [
             "[",
             displayVimMode,
             "] "
           ] }),
-          !hideCWD && (nightly ? /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(dist_default4, { colors: theme.ui.gradient, children: /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text3, { children: [
+          !hideCWD && (nightly ? /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(dist_default4, { colors: theme.ui.gradient, children: /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Text3, { children: [
             displayPath,
-            branchName && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text3, { children: [
+            branchName && /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Text3, { children: [
               " (",
               branchName,
               "*)"
             ] })
-          ] }) }) : /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text3, { color: theme.text.link, children: [
+          ] }) }) : /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Text3, { color: theme.text.link, children: [
             displayPath,
-            branchName && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text3, { color: theme.text.secondary, children: [
+            branchName && /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Text3, { color: theme.text.secondary, children: [
               " (",
               branchName,
               "*)"
             ] })
           ] })),
-          debugMode && /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text3, { color: theme.status.error, children: " " + (debugMessage || "--debug") })
+          debugMode && /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text3, { color: theme.status.error, children: " " + (debugMessage || "--debug") })
         ] }),
-        !hideSandboxStatus && /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(
+        !hideSandboxStatus && /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(
           Box_default,
           {
             flexGrow: 1,
             alignItems: "center",
             justifyContent: "center",
             display: "flex",
-            children: isTrustedFolder === false ? /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text3, { color: theme.status.warning, children: "untrusted" }) : process36.env["SANDBOX"] && process36.env["SANDBOX"] !== "sandbox-exec" ? /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text3, { color: "green", children: process36.env["SANDBOX"].replace(/^OSA-(?:cli-)?/, "") }) : process36.env["SANDBOX"] === "sandbox-exec" ? /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text3, { color: theme.status.warning, children: [
+            children: isTrustedFolder === false ? /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text3, { color: theme.status.warning, children: "untrusted" }) : process36.env["SANDBOX"] && process36.env["SANDBOX"] !== "sandbox-exec" ? /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text3, { color: "green", children: process36.env["SANDBOX"].replace(/^OSA-(?:cli-)?/, "") }) : process36.env["SANDBOX"] === "sandbox-exec" ? /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Text3, { color: theme.status.warning, children: [
               "macOS Seatbelt",
               " ",
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text3, { color: theme.text.secondary, children: [
+              /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Text3, { color: theme.text.secondary, children: [
                 "(",
                 process36.env["SEATBELT_PROFILE"],
                 ")"
               ] })
-            ] }) : /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text3, { color: theme.status.error, children: [
+            ] }) : /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Text3, { color: theme.status.error, children: [
               "no sandbox",
-              terminalWidth >= 100 && /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text3, { color: theme.text.secondary, children: " (see /docs)" })
+              terminalWidth >= 100 && /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text3, { color: theme.text.secondary, children: " (see /docs)" })
             ] })
           }
         ),
-        !hideModelInfo && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Box_default, { alignItems: "center", justifyContent: "flex-end", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Box_default, { alignItems: "center", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Box_default, { flexDirection: "row", alignItems: "center", children: [
-              systemPromptPreset && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text3, { color: theme.text.secondary, children: [
+        !hideModelInfo && /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Box_default, { alignItems: "center", justifyContent: "flex-end", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Box_default, { alignItems: "center", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Box_default, { flexDirection: "row", alignItems: "center", children: [
+              systemPromptPreset && /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Text3, { color: theme.text.secondary, children: [
                 "sp (",
                 systemPromptPreset,
                 ")",
-                /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text3, { color: theme.ui.symbol, children: " \xB7 " })
+                /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text3, { color: theme.ui.symbol, children: " \xB7 " })
               ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text3, { color: theme.text.accent, children: [
+              /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Text3, { color: theme.text.accent, children: [
                 model,
                 " ",
-                /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(
+                /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(
                   ContextUsageDisplay,
                   {
                     promptTokenCount,
@@ -352926,20 +353099,20 @@ var Footer = /* @__PURE__ */ __name(() => {
                 )
               ] })
             ] }),
-            showMemoryUsage && /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(MemoryUsageDisplay, {})
+            showMemoryUsage && /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(MemoryUsageDisplay, {})
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Box_default, { alignItems: "center", paddingLeft: 2, children: [
-            corgiMode && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text3, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text3, { color: theme.ui.symbol, children: "| " }),
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text3, { color: theme.status.error, children: "\u25BC" }),
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text3, { color: theme.text.primary, children: "(\xB4" }),
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text3, { color: theme.status.error, children: "\u1D25" }),
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text3, { color: theme.text.primary, children: "`)" }),
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text3, { color: theme.status.error, children: "\u25BC " })
+          /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Box_default, { alignItems: "center", paddingLeft: 2, children: [
+            corgiMode && /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Text3, { children: [
+              /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text3, { color: theme.ui.symbol, children: "| " }),
+              /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text3, { color: theme.status.error, children: "\u25BC" }),
+              /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text3, { color: theme.text.primary, children: "(\xB4" }),
+              /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text3, { color: theme.status.error, children: "\u1D25" }),
+              /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text3, { color: theme.text.primary, children: "`)" }),
+              /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text3, { color: theme.status.error, children: "\u25BC " })
             ] }),
-            !showErrorDetails && errorCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Box_default, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text3, { color: theme.ui.symbol, children: "| " }),
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(ConsoleSummaryDisplay, { errorCount })
+            !showErrorDetails && errorCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Box_default, { children: [
+              /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text3, { color: theme.ui.symbol, children: "| " }),
+              /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(ConsoleSummaryDisplay, { errorCount })
             ] })
           ] })
         ] })
@@ -352950,7 +353123,7 @@ var Footer = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/components/QueuedMessageDisplay.tsx
 init_esbuild_shims();
-var import_jsx_runtime100 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime101 = __toESM(require_jsx_runtime(), 1);
 var MAX_DISPLAYED_QUEUED_MESSAGES = 3;
 var QueuedMessageDisplay = /* @__PURE__ */ __name(({
   messageQueue
@@ -352958,12 +353131,12 @@ var QueuedMessageDisplay = /* @__PURE__ */ __name(({
   if (messageQueue.length === 0) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime101.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
     messageQueue.slice(0, MAX_DISPLAYED_QUEUED_MESSAGES).map((message2, index) => {
       const preview = message2.replace(/\s+/g, " ");
-      return /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Box_default, { paddingLeft: 2, width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text3, { dimColor: true, wrap: "truncate", children: preview }) }, index);
+      return /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(Box_default, { paddingLeft: 2, width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(Text3, { dimColor: true, wrap: "truncate", children: preview }) }, index);
     }),
-    messageQueue.length > MAX_DISPLAYED_QUEUED_MESSAGES && /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Text3, { dimColor: true, children: [
+    messageQueue.length > MAX_DISPLAYED_QUEUED_MESSAGES && /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime101.jsxs)(Text3, { dimColor: true, children: [
       "... (+",
       messageQueue.length - MAX_DISPLAYED_QUEUED_MESSAGES,
       " more)"
@@ -352974,7 +353147,7 @@ var QueuedMessageDisplay = /* @__PURE__ */ __name(({
 // packages/cli/src/ui/components/ConfigInitDisplay.tsx
 init_esbuild_shims();
 var import_react99 = __toESM(require_react(), 1);
-var import_jsx_runtime101 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime102 = __toESM(require_jsx_runtime(), 1);
 var ConfigInitDisplay = /* @__PURE__ */ __name(() => {
   const config = useConfig();
   const [message2, setMessage] = (0, import_react99.useState)(t2("Initializing..."));
@@ -353002,15 +353175,15 @@ var ConfigInitDisplay = /* @__PURE__ */ __name(() => {
       appEvents.off("mcp-client-update", onChange);
     };
   }, [config]);
-  return /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime101.jsxs)(Text3, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(OSASpinner, {}),
+  return /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(Text3, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(OSASpinner, {}),
     " ",
-    /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(Text3, { color: theme.text.primary, children: message2 })
+    /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Text3, { color: theme.text.primary, children: message2 })
   ] }) });
 }, "ConfigInitDisplay");
 
 // packages/cli/src/ui/components/Composer.tsx
-var import_jsx_runtime102 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime103 = __toESM(require_jsx_runtime(), 1);
 var Composer = /* @__PURE__ */ __name(() => {
   const config = useConfig();
   const settings = useSettings();
@@ -353026,8 +353199,8 @@ var Composer = /* @__PURE__ */ __name(() => {
     () => calculatePromptWidths(uiState.terminalWidth),
     [uiState.terminalWidth]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(Box_default, { flexDirection: "column", children: [
-    !uiState.embeddedShellFocused && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime103.jsxs)(Box_default, { flexDirection: "column", children: [
+    !uiState.embeddedShellFocused && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(
       LoadingIndicator,
       {
         thought: uiState.streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */ || config.getAccessibility()?.disableLoadingPhrases ? void 0 : uiState.thought,
@@ -353035,9 +353208,15 @@ var Composer = /* @__PURE__ */ __name(() => {
         elapsedTime: uiState.elapsedTime
       }
     ),
-    !uiState.isConfigInitialized && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(ConfigInitDisplay, {}),
-    /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(QueuedMessageDisplay, { messageQueue: uiState.messageQueue }),
-    /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(
+    !uiState.embeddedShellFocused && uiState.streamingState !== "idle" /* Idle */ && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(
+      ConsultationDisplay,
+      {
+        isStreamingActive: uiState.streamingState === "responding" /* Responding */
+      }
+    ),
+    !uiState.isConfigInitialized && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(ConfigInitDisplay, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(QueuedMessageDisplay, { messageQueue: uiState.messageQueue }),
+    /* @__PURE__ */ (0, import_jsx_runtime103.jsxs)(
       Box_default,
       {
         marginTop: 1,
@@ -353046,9 +353225,9 @@ var Composer = /* @__PURE__ */ __name(() => {
         flexDirection: isNarrow ? "column" : "row",
         alignItems: isNarrow ? "flex-start" : "center",
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(Box_default, { marginRight: 1, children: [
-            process.env["OSA_SYSTEM_MD"] && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Text3, { color: theme.status.error, children: "|\u2310\u25A0_\u25A0| " }),
-            uiState.ctrlCPressedOnce ? /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Text3, { color: theme.status.warning, children: t2("Press Ctrl+C again to exit.") }) : uiState.ctrlDPressedOnce ? /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Text3, { color: theme.status.warning, children: t2("Press Ctrl+D again to exit.") }) : uiState.showEscapePrompt ? /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Text3, { color: theme.text.secondary, children: t2("Press Esc again to clear.") }) : !settings.merged.ui?.hideContextSummary && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime103.jsxs)(Box_default, { marginRight: 1, children: [
+            process.env["OSA_SYSTEM_MD"] && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Text3, { color: theme.status.error, children: "|\u2310\u25A0_\u25A0| " }),
+            uiState.ctrlCPressedOnce ? /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Text3, { color: theme.status.warning, children: t2("Press Ctrl+C again to exit.") }) : uiState.ctrlDPressedOnce ? /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Text3, { color: theme.status.warning, children: t2("Press Ctrl+D again to exit.") }) : uiState.showEscapePrompt ? /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Text3, { color: theme.text.secondary, children: t2("Press Esc again to clear.") }) : !settings.merged.ui?.hideContextSummary && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(
               ContextSummaryDisplay,
               {
                 ideContext: uiState.ideContextState,
@@ -353060,15 +353239,15 @@ var Composer = /* @__PURE__ */ __name(() => {
               }
             )
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(Box_default, { paddingTop: isNarrow ? 1 : 0, children: [
-            showAutoAcceptIndicator !== ApprovalMode.DEFAULT && !uiState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(AutoAcceptIndicator, { approvalMode: showAutoAcceptIndicator }),
-            uiState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(ShellModeIndicator, {})
+          /* @__PURE__ */ (0, import_jsx_runtime103.jsxs)(Box_default, { paddingTop: isNarrow ? 1 : 0, children: [
+            showAutoAcceptIndicator !== ApprovalMode.DEFAULT && !uiState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(AutoAcceptIndicator, { approvalMode: showAutoAcceptIndicator }),
+            uiState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(ShellModeIndicator, {})
           ] })
         ]
       }
     ),
-    uiState.showErrorDetails && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(OverflowProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(Box_default, { flexDirection: "column", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(
+    uiState.showErrorDetails && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(OverflowProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime103.jsxs)(Box_default, { flexDirection: "column", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(
         DetailedMessagesDisplay,
         {
           messages: uiState.filteredConsoleMessages,
@@ -353076,9 +353255,9 @@ var Composer = /* @__PURE__ */ __name(() => {
           width: containerWidth
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(ShowMoreLines, { constrainHeight: uiState.constrainHeight })
+      /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(ShowMoreLines, { constrainHeight: uiState.constrainHeight })
     ] }) }),
-    uiState.isInputActive && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(
+    uiState.isInputActive && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(
       InputPrompt,
       {
         buffer: uiState.buffer,
@@ -353100,37 +353279,37 @@ var Composer = /* @__PURE__ */ __name(() => {
         placeholder: vimEnabled ? "  " + t2("Press 'i' for INSERT mode and 'Esc' for NORMAL mode.") : "  " + t2("Type your message or @path/to/file")
       }
     ),
-    !settings.merged.ui?.hideFooter && !isScreenReaderEnabled && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Footer, {})
+    !settings.merged.ui?.hideFooter && !isScreenReaderEnabled && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Footer, {})
   ] });
 }, "Composer");
 
 // packages/cli/src/ui/components/ExitWarning.tsx
 init_esbuild_shims();
-var import_jsx_runtime103 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime104 = __toESM(require_jsx_runtime(), 1);
 var ExitWarning = /* @__PURE__ */ __name(() => {
   const uiState = useUIState();
-  return /* @__PURE__ */ (0, import_jsx_runtime103.jsxs)(import_jsx_runtime103.Fragment, { children: [
-    uiState.dialogsVisible && uiState.ctrlCPressedOnce && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Text3, { color: theme.status.warning, children: "Press Ctrl+C again to exit." }) }),
-    uiState.dialogsVisible && uiState.ctrlDPressedOnce && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Text3, { color: theme.status.warning, children: "Press Ctrl+D again to exit." }) })
+  return /* @__PURE__ */ (0, import_jsx_runtime104.jsxs)(import_jsx_runtime104.Fragment, { children: [
+    uiState.dialogsVisible && uiState.ctrlCPressedOnce && /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(Text3, { color: theme.status.warning, children: "Press Ctrl+C again to exit." }) }),
+    uiState.dialogsVisible && uiState.ctrlDPressedOnce && /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(Text3, { color: theme.status.warning, children: "Press Ctrl+D again to exit." }) })
   ] });
 }, "ExitWarning");
 
 // packages/cli/src/ui/layouts/ScreenReaderAppLayout.tsx
-var import_jsx_runtime104 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime105 = __toESM(require_jsx_runtime(), 1);
 var ScreenReaderAppLayout = /* @__PURE__ */ __name(() => {
   const uiState = useUIState();
-  return /* @__PURE__ */ (0, import_jsx_runtime104.jsxs)(Box_default, { flexDirection: "column", width: "90%", height: "100%", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(Notifications, {}),
-    /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(Footer, {}),
-    /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(Box_default, { flexGrow: 1, overflow: "hidden", children: /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(MainContent, {}) }),
-    uiState.dialogsVisible ? /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Box_default, { flexDirection: "column", width: "90%", height: "100%", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Notifications, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Footer, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Box_default, { flexGrow: 1, overflow: "hidden", children: /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(MainContent, {}) }),
+    uiState.dialogsVisible ? /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
       DialogManager,
       {
         terminalWidth: uiState.terminalWidth,
         addItem: uiState.historyManager.addItem
       }
-    ) : /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(Composer, {}),
-    /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(ExitWarning, {})
+    ) : /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Composer, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(ExitWarning, {})
   ] });
 }, "ScreenReaderAppLayout");
 
@@ -353139,7 +353318,7 @@ init_esbuild_shims();
 
 // packages/cli/src/ui/components/TaskMasterPanel.tsx
 init_esbuild_shims();
-var import_jsx_runtime105 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime106 = __toESM(require_jsx_runtime(), 1);
 var STATUS_ICONS2 = {
   pending: "\u25CB",
   in_progress: "\u25D0",
@@ -353157,13 +353336,13 @@ var TaskMasterPanel = /* @__PURE__ */ __name(({
   const totalCount = todos.length;
   const progressPercent = Math.round(completedCount / totalCount * 100);
   if (compact && activeTodo) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Box_default, { marginBottom: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Text3, { color: theme.text.secondary, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(build_default, { type: "dots" }),
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsxs)(Box_default, { marginBottom: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime106.jsxs)(Text3, { color: theme.text.secondary, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(build_default, { type: "dots" }),
         " "
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Text3, { color: theme.status.success, children: activeTodo.activeForm || activeTodo.content }),
-      /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Text3, { color: theme.text.secondary, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Text3, { color: theme.status.success, children: activeTodo.activeForm || activeTodo.content }),
+      /* @__PURE__ */ (0, import_jsx_runtime106.jsxs)(Text3, { color: theme.text.secondary, children: [
         " ",
         "(",
         completedCount,
@@ -353173,7 +353352,7 @@ var TaskMasterPanel = /* @__PURE__ */ __name(({
       ] })
     ] });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime106.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -353182,9 +353361,9 @@ var TaskMasterPanel = /* @__PURE__ */ __name(({
       paddingX: 1,
       marginBottom: 1,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Box_default, { justifyContent: "space-between", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Text3, { color: theme.text.accent, bold: true, children: "Tasks" }),
-          /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Text3, { color: theme.text.secondary, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime106.jsxs)(Box_default, { justifyContent: "space-between", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Text3, { color: theme.text.accent, bold: true, children: "Tasks" }),
+          /* @__PURE__ */ (0, import_jsx_runtime106.jsxs)(Text3, { color: theme.text.secondary, children: [
             completedCount,
             "/",
             totalCount,
@@ -353193,17 +353372,17 @@ var TaskMasterPanel = /* @__PURE__ */ __name(({
             "%)"
           ] })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Box_default, { marginY: 0, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Text3, { color: theme.status.success, children: "\u2588".repeat(Math.round(progressPercent / 100 * 20)) }),
-          /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Text3, { color: theme.text.secondary, children: "\u2591".repeat(20 - Math.round(progressPercent / 100 * 20)) })
+        /* @__PURE__ */ (0, import_jsx_runtime106.jsxs)(Box_default, { marginY: 0, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Text3, { color: theme.status.success, children: "\u2588".repeat(Math.round(progressPercent / 100 * 20)) }),
+          /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Text3, { color: theme.text.secondary, children: "\u2591".repeat(20 - Math.round(progressPercent / 100 * 20)) })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Box_default, { flexDirection: "column", children: todos.map((todo) => {
+        /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Box_default, { flexDirection: "column", children: todos.map((todo) => {
           const isCompleted = todo.status === "completed";
           const isInProgress = todo.status === "in_progress";
           const itemColor = isCompleted ? theme.text.secondary : isInProgress ? theme.status.success : theme.text.primary;
-          return /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Box_default, { flexDirection: "row", minHeight: 1, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Box_default, { width: 3, children: isInProgress ? /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Text3, { color: itemColor, children: /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(build_default, { type: "dots" }) }) : /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Text3, { color: itemColor, children: STATUS_ICONS2[todo.status] }) }),
-            /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+          return /* @__PURE__ */ (0, import_jsx_runtime106.jsxs)(Box_default, { flexDirection: "row", minHeight: 1, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Box_default, { width: 3, children: isInProgress ? /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Text3, { color: itemColor, children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(build_default, { type: "dots" }) }) : /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Text3, { color: itemColor, children: STATUS_ICONS2[todo.status] }) }),
+            /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
               Text3,
               {
                 color: itemColor,
@@ -353220,30 +353399,30 @@ var TaskMasterPanel = /* @__PURE__ */ __name(({
 }, "TaskMasterPanel");
 
 // packages/cli/src/ui/layouts/DefaultAppLayout.tsx
-var import_jsx_runtime106 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime107 = __toESM(require_jsx_runtime(), 1);
 var DefaultAppLayout = /* @__PURE__ */ __name(({
   width = "90%"
 }) => {
   const uiState = useUIState();
-  return /* @__PURE__ */ (0, import_jsx_runtime106.jsxs)(Box_default, { flexDirection: "column", width, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(MainContent, {}),
-    /* @__PURE__ */ (0, import_jsx_runtime106.jsxs)(Box_default, { flexDirection: "column", ref: uiState.mainControlsRef, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Notifications, {}),
-      /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(TaskMasterPanel, { compact: true }),
-      uiState.dialogsVisible ? /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime107.jsxs)(Box_default, { flexDirection: "column", width, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(MainContent, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime107.jsxs)(Box_default, { flexDirection: "column", ref: uiState.mainControlsRef, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Notifications, {}),
+      /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(TaskMasterPanel, { compact: true }),
+      uiState.dialogsVisible ? /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(
         DialogManager,
         {
           terminalWidth: uiState.terminalWidth,
           addItem: uiState.historyManager.addItem
         }
-      ) : /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Composer, {}),
-      /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(ExitWarning, {})
+      ) : /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Composer, {}),
+      /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(ExitWarning, {})
     ] })
   ] });
 }, "DefaultAppLayout");
 
 // packages/cli/src/ui/App.tsx
-var import_jsx_runtime107 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime108 = __toESM(require_jsx_runtime(), 1);
 var getContainerWidth = /* @__PURE__ */ __name((terminalWidth) => {
   if (terminalWidth <= 80) {
     return "98%";
@@ -353261,9 +353440,9 @@ var App2 = /* @__PURE__ */ __name(() => {
   const { columns } = useTerminalSize();
   const containerWidth = getContainerWidth(columns);
   if (uiState.quittingMessages) {
-    return /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(QuittingDisplay, {});
+    return /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(QuittingDisplay, {});
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(StreamingContext.Provider, { value: uiState.streamingState, children: isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(ScreenReaderAppLayout, {}) : /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(DefaultAppLayout, { width: containerWidth }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(StreamingContext.Provider, { value: uiState.streamingState, children: isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(ScreenReaderAppLayout, {}) : /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(DefaultAppLayout, { width: containerWidth }) });
 }, "App");
 
 // packages/cli/src/ui/AppContainer.tsx
@@ -353571,13 +353750,22 @@ var useAuthCommand = /* @__PURE__ */ __name((settings, config, addItem) => {
         if (credentials) {
           config.updateCredentials({
             apiKey: credentials.apiKey,
-            baseUrl: credentials.baseUrl || "https://ollama.com",
+            baseUrl: credentials.baseUrl || "https://osa.dev",
             model: credentials.model || "qwen3-coder:480b-cloud"
           });
           await performAuth(authType, scope, credentials);
         }
         return;
       }
+      if (authType === AuthType2.OLLAMA_LOCAL) {
+        config.updateCredentials({
+          apiKey: "ollama",
+          baseUrl: "http://localhost:11434/v1",
+          model: credentials?.model || "qwen2.5-coder:32b"
+        });
+        await performAuth(authType, scope, credentials);
+        return;
+      }
       await performAuth(authType, scope);
     },
     [config, performAuth]
@@ -353599,15 +353787,19 @@ var useAuthCommand = /* @__PURE__ */ __name((settings, config, addItem) => {
   }, [isAuthenticating, pendingAuthType, cancelOSAAuth, config]);
   (0, import_react104.useEffect)(() => {
     const defaultAuthType = process.env["OSA_DEFAULT_AUTH_TYPE"];
-    if (defaultAuthType && ![AuthType2.OSA_OAUTH, AuthType2.USE_OPENAI].includes(
-      defaultAuthType
-    )) {
+    const validAuthTypes = [
+      AuthType2.OSA_OAUTH,
+      AuthType2.USE_OPENAI,
+      AuthType2.OLLAMA_CLOUD,
+      AuthType2.OLLAMA_LOCAL
+    ];
+    if (defaultAuthType && !validAuthTypes.includes(defaultAuthType)) {
       onAuthError(
         t2(
           'Invalid OSA_DEFAULT_AUTH_TYPE value: "{{value}}". Valid values are: {{validValues}}',
           {
             value: defaultAuthType,
-            validValues: [AuthType2.OSA_OAUTH, AuthType2.USE_OPENAI].join(", ")
+            validValues: validAuthTypes.join(", ")
           }
         )
       );
@@ -360921,7 +361113,7 @@ var useAttentionNotifications = /* @__PURE__ */ __name(({
 }, "useAttentionNotifications");
 
 // packages/cli/src/ui/AppContainer.tsx
-var import_jsx_runtime108 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime109 = __toESM(require_jsx_runtime(), 1);
 var CTRL_EXIT_PROMPT_DURATION_MS = 1e3;
 function isToolExecuting(pendingHistoryItems) {
   return pendingHistoryItems.some((item) => {
@@ -361139,13 +361331,15 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       );
     } else if (settings.merged.security?.auth?.selectedType && !settings.merged.security?.auth?.useExternal) {
       const error = validateAuthMethod(
-        settings.merged.security.auth.selectedType
+        settings.merged.security.auth.selectedType,
+        settings.merged
       );
       if (error) {
         onAuthError(error);
       }
     }
   }, [
+    settings.merged,
     settings.merged.security?.auth?.selectedType,
     settings.merged.security?.auth?.enforcedType,
     settings.merged.security?.auth?.useExternal,
@@ -361996,14 +362190,14 @@ ${queuedText}` : queuedText;
       closeAgentsManagerDialog
     ]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(UIStateContext.Provider, { value: uiState, children: /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(UIActionsContext.Provider, { value: uiActions, children: /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(ConfigContext.Provider, { value: config, children: /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(UIStateContext.Provider, { value: uiState, children: /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(UIActionsContext.Provider, { value: uiActions, children: /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(ConfigContext.Provider, { value: config, children: /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(
     AppContext2.Provider,
     {
       value: {
         version: props.version,
         startupWarnings: props.startupWarnings || []
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(ShellFocusContext.Provider, { value: isFocused, children: /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(App2, {}) })
+      children: /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(ShellFocusContext.Provider, { value: isFocused, children: /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(App2, {}) })
     }
   ) }) }) });
 }, "AppContainer");
@@ -364668,7 +364862,7 @@ function toPermissionOptions(confirmation) {
 __name(toPermissionOptions, "toPermissionOptions");
 
 // packages/cli/src/gemini.tsx
-var import_jsx_runtime109 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime110 = __toESM(require_jsx_runtime(), 1);
 function validateDnsResolutionOrder(order) {
   const defaultValue = "ipv4first";
   if (order === void 0) {
@@ -364733,14 +364927,14 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
   const AppWrapper = /* @__PURE__ */ __name(() => {
     const kittyProtocolStatus = useKittyKeyboardProtocol();
     const nodeMajorVersion = parseInt(process.versions.node.split(".")[0], 10);
-    return /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(SettingsContext.Provider, { value: settings, children: /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(SettingsContext.Provider, { value: settings, children: /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(
       KeypressProvider,
       {
         kittyProtocolEnabled: kittyProtocolStatus.enabled,
         config,
         debugKeystrokeLogging: settings.merged.general?.debugKeystrokeLogging,
         pasteWorkaround: process.platform === "win32" || nodeMajorVersion < 20,
-        children: /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(SessionStatsProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(TodoProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(VimModeProvider, { settings, children: /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(
+        children: /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(SessionStatsProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(TodoProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(VimModeProvider, { settings, children: /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(
           AppContainer,
           {
             config,
@@ -364754,7 +364948,7 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
     ) });
   }, "AppWrapper");
   const instance = render_default(
-    process.env["DEBUG"] ? /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(import_react138.default.StrictMode, { children: /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(AppWrapper, {}) }) : /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(AppWrapper, {}),
+    process.env["DEBUG"] ? /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(import_react138.default.StrictMode, { children: /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(AppWrapper, {}) }) : /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(AppWrapper, {}),
     {
       exitOnCtrlC: false,
       isScreenReaderEnabled: config.getScreenReader()