bravecode-cli 0.1.23 → 0.1.24

package/dist/cli-main.mjs

@@ -2893,9 +2893,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
       _excessArguments(receivedArgs) {
         if (this._allowExcessArguments) return;
         const expected = this.registeredArguments.length;
-        const s = expected === 1 ? "" : "s";
+        const s2 = expected === 1 ? "" : "s";
         const forSubcommand = this.parent ? ` for '${this.name()}'` : "";
-        const message = `error: too many arguments${forSubcommand}. Expected ${expected} argument${s} but got ${receivedArgs.length}.`;
+        const message = `error: too many arguments${forSubcommand}. Expected ${expected} argument${s2} but got ${receivedArgs.length}.`;
         this.error(message, { code: "commander.excessArguments" });
       }
       /**
@@ -38185,7 +38185,7 @@ var APP_VERSION, APP_NAME;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    APP_VERSION = "0.1.23";
+    APP_VERSION = "0.1.24";
     APP_NAME = "BraveCode";
   }
 });
@@ -38914,8 +38914,8 @@ var init_brace_expressions = __esm({
       "[:word:]": ["\\p{L}\\p{Nl}\\p{Nd}\\p{Pc}", true],
       "[:xdigit:]": ["A-Fa-f0-9", false]
     };
-    braceEscape = (s) => s.replace(/[[\]\\-]/g, "\\$&");
-    regexpEscape = (s) => s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+    braceEscape = (s2) => s2.replace(/[[\]\\-]/g, "\\$&");
+    regexpEscape = (s2) => s2.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
     rangesToString = (ranges) => ranges.join("");
     parseClass = (glob, position) => {
       const pos = position;
@@ -39012,11 +39012,11 @@ var init_brace_expressions = __esm({
 var unescape;
 var init_unescape = __esm({
   "node_modules/minimatch/dist/esm/unescape.js"() {
-    unescape = (s, { windowsPathsNoEscape = false, magicalBraces = true } = {}) => {
+    unescape = (s2, { windowsPathsNoEscape = false, magicalBraces = true } = {}) => {
       if (magicalBraces) {
-        return windowsPathsNoEscape ? s.replace(/\[([^/\\])\]/g, "$1") : s.replace(/((?!\\).|^)\[([^/\\])\]/g, "$1$2").replace(/\\([^/])/g, "$1");
+        return windowsPathsNoEscape ? s2.replace(/\[([^/\\])\]/g, "$1") : s2.replace(/((?!\\).|^)\[([^/\\])\]/g, "$1$2").replace(/\\([^/])/g, "$1");
       }
-      return windowsPathsNoEscape ? s.replace(/\[([^/\\{}])\]/g, "$1") : s.replace(/((?!\\).|^)\[([^/\\{}])\]/g, "$1$2").replace(/\\([^/{}])/g, "$1");
+      return windowsPathsNoEscape ? s2.replace(/\[([^/\\{}])\]/g, "$1") : s2.replace(/((?!\\).|^)\[([^/\\{}])\]/g, "$1$2").replace(/\\([^/{}])/g, "$1");
     };
   }
 });
@@ -39081,7 +39081,7 @@ var init_ast = __esm({
     addPatternStart = /* @__PURE__ */ new Set(["[", "."]);
     justDots = /* @__PURE__ */ new Set(["..", "."]);
     reSpecials = new Set("().*{}+?[]^$\\!");
-    regExpEscape = (s) => s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+    regExpEscape = (s2) => s2.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
     qmark = "[^/]";
     star = qmark + "*?";
     starNoEmpty = qmark + "+?";
@@ -39504,7 +39504,7 @@ var init_ast = __esm({
           this.#fillNegs();
         }
         if (!isExtglobAST(this)) {
-          const noEmpty = this.isStart() && this.isEnd() && !this.#parts.some((s) => typeof s !== "string");
+          const noEmpty = this.isStart() && this.isEnd() && !this.#parts.some((s2) => typeof s2 !== "string");
           const src = this.#parts.map((p) => {
             const [re, _, hasMagic, uflag] = typeof p === "string" ? _a25.#parseGlob(p, this.#hasMagic, noEmpty) : p.toRegExpSource(allowDot);
             this.#hasMagic = this.#hasMagic || hasMagic;
@@ -39544,12 +39544,12 @@ var init_ast = __esm({
         const start = this.type === "!" ? "(?:(?!(?:" : "(?:";
         let body = this.#partsToRegExp(dot);
         if (this.isStart() && this.isEnd() && !body && this.type !== "!") {
-          const s = this.toString();
+          const s2 = this.toString();
           const me = this;
-          me.#parts = [s];
+          me.#parts = [s2];
           me.type = null;
           me.#hasMagic = void 0;
-          return [s, unescape(this.toString()), false, false];
+          return [s2, unescape(this.toString()), false, false];
         }
         let bodyDotAllowed = !repeated || allowDot || dot || !startNoDot ? "" : this.#partsToRegExp(true);
         if (bodyDotAllowed === body) {
@@ -39675,11 +39675,11 @@ var init_ast = __esm({
 var escape;
 var init_escape = __esm({
   "node_modules/minimatch/dist/esm/escape.js"() {
-    escape = (s, { windowsPathsNoEscape = false, magicalBraces = false } = {}) => {
+    escape = (s2, { windowsPathsNoEscape = false, magicalBraces = false } = {}) => {
       if (magicalBraces) {
-        return windowsPathsNoEscape ? s.replace(/[?*()[\]{}]/g, "[$&]") : s.replace(/[?*()[\]\\{}]/g, "\\$&");
+        return windowsPathsNoEscape ? s2.replace(/[?*()[\]{}]/g, "[$&]") : s2.replace(/[?*()[\]\\{}]/g, "\\$&");
       }
-      return windowsPathsNoEscape ? s.replace(/[?*()[\]]/g, "[$&]") : s.replace(/[?*()[\]\\]/g, "\\$&");
+      return windowsPathsNoEscape ? s2.replace(/[?*()[\]]/g, "[$&]") : s2.replace(/[?*()[\]\\]/g, "\\$&");
     };
   }
 });
@@ -39794,8 +39794,8 @@ var init_esm4 = __esm({
             return orig.AST.fromGlob(pattern, ext(def, options));
           }
         },
-        unescape: (s, options = {}) => orig.unescape(s, ext(def, options)),
-        escape: (s, options = {}) => orig.escape(s, ext(def, options)),
+        unescape: (s2, options = {}) => orig.unescape(s2, ext(def, options)),
+        escape: (s2, options = {}) => orig.escape(s2, ext(def, options)),
         filter: (pattern, options = {}) => orig.filter(pattern, ext(def, options)),
         defaults: (options) => orig.defaults(ext(def, options)),
         makeRe: (pattern, options = {}) => orig.makeRe(pattern, ext(def, options)),
@@ -39826,7 +39826,7 @@ var init_esm4 = __esm({
     };
     minimatch.match = match;
     globMagic = /[?*]|[+@!]\(.*?\)|\[|\]/;
-    regExpEscape2 = (s) => s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+    regExpEscape2 = (s2) => s2.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
     Minimatch = class {
       options;
       set;
@@ -39904,26 +39904,26 @@ var init_esm4 = __esm({
           this.debug = (...args) => console.error(...args);
         }
         this.debug(this.pattern, this.globSet);
-        const rawGlobParts = this.globSet.map((s) => this.slashSplit(s));
+        const rawGlobParts = this.globSet.map((s2) => this.slashSplit(s2));
         this.globParts = this.preprocess(rawGlobParts);
         this.debug(this.pattern, this.globParts);
-        let set2 = this.globParts.map((s, _, __) => {
+        let set2 = this.globParts.map((s2, _, __) => {
           if (this.isWindows && this.windowsNoMagicRoot) {
-            const isUNC = s[0] === "" && s[1] === "" && (s[2] === "?" || !globMagic.test(s[2])) && !globMagic.test(s[3]);
-            const isDrive = /^[a-z]:/i.test(s[0]);
+            const isUNC = s2[0] === "" && s2[1] === "" && (s2[2] === "?" || !globMagic.test(s2[2])) && !globMagic.test(s2[3]);
+            const isDrive = /^[a-z]:/i.test(s2[0]);
             if (isUNC) {
               return [
-                ...s.slice(0, 4),
-                ...s.slice(4).map((ss) => this.parse(ss))
+                ...s2.slice(0, 4),
+                ...s2.slice(4).map((ss) => this.parse(ss))
               ];
             } else if (isDrive) {
-              return [s[0], ...s.slice(1).map((ss) => this.parse(ss))];
+              return [s2[0], ...s2.slice(1).map((ss) => this.parse(ss))];
             }
           }
-          return s.map((ss) => this.parse(ss));
+          return s2.map((ss) => this.parse(ss));
         });
         this.debug(this.pattern, set2);
-        this.set = set2.filter((s) => s.indexOf(false) === -1);
+        this.set = set2.filter((s2) => s2.indexOf(false) === -1);
         if (this.isWindows) {
           for (let i = 0; i < this.set.length; i++) {
             const p = this.set[i];
@@ -40785,13 +40785,13 @@ var init_snapshot = __esm({
         return [...this.snapshots];
       }
       getSnapshot(id) {
-        return this.snapshots.find((s) => s.id === id);
+        return this.snapshots.find((s2) => s2.id === id);
       }
       async getDiff() {
         if (!this.isGitRepo()) {
           return "Not a git repository";
         }
-        const lastReal = [...this.snapshots].reverse().find((s) => isRealCommitHash(s.commitHash));
+        const lastReal = [...this.snapshots].reverse().find((s2) => isRealCommitHash(s2.commitHash));
         if (!lastReal) {
           return "No snapshot to diff";
         }
@@ -41889,6 +41889,16 @@ var init_use_agent_runner = __esm({
 import React4 from "react";
 import { useRenderer, useKeyboard, useTerminalDimensions, createRoot } from "@opentui/react";
 import { Fragment, jsx, jsxs } from "@opentui/react/jsx-runtime";
+function s(v) {
+  if (v === null || v === void 0) return "";
+  if (typeof v === "string") return v;
+  if (typeof v === "number" || typeof v === "bigint" || typeof v === "boolean") return String(v);
+  try {
+    return String(v);
+  } catch {
+    return "";
+  }
+}
 function HeaderBar() {
   const { colors: colors2 } = useTheme();
   const cwd = process.cwd().replace(process.env.HOME ?? "", "~");
@@ -41910,9 +41920,9 @@ function HeaderBar() {
           /* @__PURE__ */ jsx("text", { fg: colors2.headerFg, children: /* @__PURE__ */ jsxs("b", { children: [
             APP_NAME,
             " \u2014 ",
-            APP_NAME.toLowerCase()
+            s(APP_NAME.toLowerCase())
           ] }) }),
-          /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: cwd })
+          /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: s(cwd) })
         ] }),
         /* @__PURE__ */ jsx("text", { fg: colors2.headerFg, children: "\u25A4  \u2630  \u2296  \u22A1  \u2715" })
       ]
@@ -41940,10 +41950,10 @@ function StatusBar() {
           /* @__PURE__ */ jsx("text", { fg: colors2.info, children: "/status" })
         ] }),
         /* @__PURE__ */ jsxs("text", { fg: colors2.textMuted, children: [
-          /* @__PURE__ */ jsx("text", { fg: colors2.primary, children: /* @__PURE__ */ jsx("b", { children: APP_NAME }) }),
+          /* @__PURE__ */ jsx("text", { fg: colors2.primary, children: /* @__PURE__ */ jsx("b", { children: s(APP_NAME) }) }),
           /* @__PURE__ */ jsxs("text", { fg: colors2.textMuted, children: [
             " ",
-            APP_VERSION
+            s(APP_VERSION)
           ] })
         ] })
       ]
@@ -41956,13 +41966,13 @@ function AgentModelLine({ inline = false }) {
   return /* @__PURE__ */ jsxs("box", { style: { flexDirection: "row", gap: 1, ...inline ? {} : { paddingLeft: 1, paddingRight: 1, marginTop: 0, marginBottom: 0 } }, children: [
     /* @__PURE__ */ jsx("text", { fg: colors2.primary, children: /* @__PURE__ */ jsxs("b", { children: [
       "\u25FC ",
-      currentAgent.name.replace(" Agent", "")
+      s(currentAgent.name.replace(" Agent", ""))
     ] }) }),
     /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: "\xB7" }),
-    /* @__PURE__ */ jsx("text", { fg: colors2.textSecondary, children: currentModel }),
+    /* @__PURE__ */ jsx("text", { fg: colors2.textSecondary, children: s(currentModel) }),
     /* @__PURE__ */ jsx("text", { fg: colors2.success, children: "Free" }),
     /* @__PURE__ */ jsx("text", { fg: colors2.accent, children: "OpenCode Zen" }),
-    isRunning && /* @__PURE__ */ jsx("text", { fg: colors2.warning, children: "\xB7 generating\u2026" })
+    isRunning ? /* @__PURE__ */ jsx("text", { fg: colors2.warning, children: "\xB7 generating\u2026" }) : null
   ] });
 }
 function ShortcutHints({ interrupted = false }) {
@@ -41982,7 +41992,7 @@ function PixelLogo() {
     \u2588\u2588  \u2588\u2588   \u2588\u2588       \u2588\u2588\u2588\u2588\u2588\u2588  \u2588\u2588  \u2588\u2588  \u2588\u2588   \u2588\u2588  \u2588\u2588\u2588\u2588\u2588\u2588  \u2588\u2588\u2588\u2588\u2588\u2588  \u2588\u2588\u2588\u2588\u2588\u2588  \u2588\u2588\u2588\u2588\u2588\u2588
   `;
   const logo = letter.split("\n").filter(Boolean);
-  return /* @__PURE__ */ jsx("box", { alignItems: "center", flexDirection: "column", gap: 0, children: logo.map((line, i) => /* @__PURE__ */ jsx("text", { fg: colors2.primary, children: line }, i)) });
+  return /* @__PURE__ */ jsx("box", { alignItems: "center", flexDirection: "column", gap: 0, children: logo.map((line, i) => /* @__PURE__ */ jsx("text", { fg: colors2.primary, children: s(line) }, s(i))) });
 }
 function Sidebar({ compact = false }) {
   const { colors: colors2 } = useTheme();
@@ -42006,18 +42016,18 @@ function Sidebar({ compact = false }) {
           /* @__PURE__ */ jsx("text", { fg: colors2.text, children: /* @__PURE__ */ jsx("b", { children: "Info" }) }),
           /* @__PURE__ */ jsxs("box", { style: { marginTop: 1 }, children: [
             /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: "agent " }),
-            /* @__PURE__ */ jsx("text", { fg: colors2.primary, children: currentAgent.name.replace(" Agent", "") })
+            /* @__PURE__ */ jsx("text", { fg: colors2.primary, children: s(currentAgent.name.replace(" Agent", "")) })
           ] }),
           /* @__PURE__ */ jsxs("text", { fg: colors2.textMuted, children: [
             "model ",
-            currentModel
+            s(currentModel)
           ] }),
           /* @__PURE__ */ jsxs("box", { style: { marginTop: 1 }, children: [
             /* @__PURE__ */ jsx("text", { fg: colors2.success, children: "\u25CF" }),
             /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: " mcp connected" })
           ] }),
           /* @__PURE__ */ jsx("box", { style: { flexGrow: 1 } }),
-          /* @__PURE__ */ jsx("box", { style: { marginTop: 1 }, children: /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: APP_VERSION }) }),
+          /* @__PURE__ */ jsx("box", { style: { marginTop: 1 }, children: /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: s(APP_VERSION) }) }),
           /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: "ctrl+b sidebar" })
         ]
       }
@@ -42038,9 +42048,9 @@ function Sidebar({ compact = false }) {
       children: [
         /* @__PURE__ */ jsx("text", { fg: colors2.text, children: /* @__PURE__ */ jsxs("b", { children: [
           "New session - ",
-          sessionTime.slice(0, 17)
+          s(sessionTime.slice(0, 17))
         ] }) }),
-        /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: sessionTime.slice(17) }),
+        /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: s(sessionTime.slice(17)) }),
         /* @__PURE__ */ jsx("box", { style: { marginTop: 1 }, children: /* @__PURE__ */ jsx("text", { fg: colors2.text, children: /* @__PURE__ */ jsx("b", { children: "Context" }) }) }),
         /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: "0 tokens" }),
         /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: "0% used" }),
@@ -42054,14 +42064,14 @@ function Sidebar({ compact = false }) {
         /* @__PURE__ */ jsx("box", { style: { marginTop: 1 }, children: /* @__PURE__ */ jsx("text", { fg: colors2.text, children: /* @__PURE__ */ jsx("b", { children: "LSP" }) }) }),
         /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: "LSPs are disabled" }),
         /* @__PURE__ */ jsx("box", { style: { flexGrow: 1 } }),
-        /* @__PURE__ */ jsx("box", { style: { marginTop: 1 }, children: /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: cwd }) }),
+        /* @__PURE__ */ jsx("box", { style: { marginTop: 1 }, children: /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: s(cwd) }) }),
         /* @__PURE__ */ jsxs("box", { children: [
           /* @__PURE__ */ jsx("text", { fg: colors2.primary, children: /* @__PURE__ */ jsxs("b", { children: [
             "\u25CF ",
-            APP_NAME,
+            s(APP_NAME),
             " "
           ] }) }),
-          /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: APP_VERSION })
+          /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: s(APP_VERSION) })
         ] })
       ]
     }
@@ -42081,10 +42091,10 @@ function MessageBubble({ msg }) {
     }, children: [
       /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: /* @__PURE__ */ jsxs("b", { children: [
         "[Tool result for ",
-        msg.toolName ?? "tool",
+        s(msg.toolName ?? "tool"),
         "]"
       ] }) }),
-      /* @__PURE__ */ jsx("scrollbox", { style: { maxHeight: 10, backgroundColor: colors2.bgAlt }, children: /* @__PURE__ */ jsx("text", { fg: colors2.textSecondary, children: msg.content.length > 4e3 ? msg.content.slice(0, 4e3) + "\n... (truncated)" : msg.content }) })
+      /* @__PURE__ */ jsx("scrollbox", { style: { maxHeight: 10, backgroundColor: colors2.bgAlt }, children: /* @__PURE__ */ jsx("text", { fg: colors2.textSecondary, children: s(msg.content.length > 4e3 ? msg.content.slice(0, 4e3) + "\n... (truncated)" : msg.content) }) })
     ] });
   }
   return /* @__PURE__ */ jsxs("box", { style: {
@@ -42099,21 +42109,21 @@ function MessageBubble({ msg }) {
   }, children: [
     /* @__PURE__ */ jsxs("box", { style: { flexDirection: "row", gap: 1, marginBottom: 0 }, children: [
       /* @__PURE__ */ jsx("text", { fg: isUser ? colors2.primary : colors2.textSecondary, children: /* @__PURE__ */ jsx("b", { children: isUser ? "You" : "Assistant" }) }),
-      /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: msg.timestamp.toLocaleTimeString() })
+      /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: s(msg.timestamp.toLocaleTimeString()) })
     ] }),
-    /* @__PURE__ */ jsx("scrollbox", { style: { maxHeight: 40 }, children: /* @__PURE__ */ jsx("text", { fg: colors2.text, wrapMode: "word", children: msg.content || (isUser ? "" : " ") }) }),
-    msg.toolCalls && msg.toolCalls.length > 0 && /* @__PURE__ */ jsx("box", { style: { marginTop: 0, flexDirection: "column" }, children: msg.toolCalls.map((tc) => /* @__PURE__ */ jsx("box", { style: { flexDirection: "row", gap: 1 }, children: /* @__PURE__ */ jsx("text", { fg: tc.status === "error" ? colors2.error : colors2.info, children: /* @__PURE__ */ jsxs("b", { children: [
+    /* @__PURE__ */ jsx("scrollbox", { style: { maxHeight: 40 }, children: /* @__PURE__ */ jsx("text", { fg: colors2.text, wrapMode: "word", children: s(msg.content || (isUser ? "" : " ")) }) }),
+    msg.toolCalls && msg.toolCalls.length > 0 ? /* @__PURE__ */ jsx("box", { style: { marginTop: 0, flexDirection: "column" }, children: msg.toolCalls.map((tc) => /* @__PURE__ */ jsx("box", { style: { flexDirection: "row", gap: 1 }, children: /* @__PURE__ */ jsx("text", { fg: tc.status === "error" ? colors2.error : colors2.info, children: /* @__PURE__ */ jsxs("b", { children: [
       "[",
-      tc.name,
+      s(tc.name),
       tc.status === "done" ? " \u2713" : tc.status === "error" ? " \u2717" : "\u2026",
       "]"
-    ] }) }) }, tc.id)) })
+    ] }) }) }, s(tc.id))) }) : null
   ] });
 }
 function MessageContainer() {
   const { messages } = useSession();
   const { colors: colors2 } = useTheme();
-  return /* @__PURE__ */ jsx("scrollbox", { style: { flexGrow: 1, backgroundColor: colors2.bg, paddingLeft: 1, paddingRight: 1 }, children: /* @__PURE__ */ jsx("box", { style: { flexDirection: "column", gap: 1, paddingTop: 1 }, children: messages.map((msg) => /* @__PURE__ */ jsx(MessageBubble, { msg }, msg.id)) }) });
+  return /* @__PURE__ */ jsx("scrollbox", { style: { flexGrow: 1, backgroundColor: colors2.bg, paddingLeft: 1, paddingRight: 1 }, children: /* @__PURE__ */ jsx("box", { style: { flexDirection: "column", gap: 1, paddingTop: 1 }, children: messages.map((msg) => /* @__PURE__ */ jsx(MessageBubble, { msg }, s(msg.id))) }) });
 }
 function InputEditor({
   onSubmit,
@@ -42149,10 +42159,10 @@ function InputEditor({
         "input",
         {
           ref: inputRef,
-          value,
-          onChange: (val) => setValue(String(val)),
+          value: s(value),
+          onChange: (val) => setValue(s(val)),
           onSubmit: () => doSubmit(),
-          placeholder,
+          placeholder: s(placeholder),
           placeholderColor: colors2.textMuted,
           textColor: colors2.text,
           backgroundColor: colors2.inputBg
@@ -42178,10 +42188,10 @@ function InputEditor({
       "input",
       {
         ref: inputRef,
-        value,
-        onChange: (val) => setValue(String(val)),
+        value: s(value),
+        onChange: (val) => setValue(s(val)),
         onSubmit: () => doSubmit(),
-        placeholder,
+        placeholder: s(placeholder),
         placeholderColor: colors2.textMuted,
         textColor: colors2.text,
         backgroundColor: colors2.inputBg
@@ -42298,9 +42308,9 @@ function ModelAgentDialog() {
           const item = it;
           const id = item.id;
           const name25 = item.name;
-          const subtitle = isAgent ? item.model ?? "" : `${item.provider ?? ""} \xB7 ${Math.round((item.contextWindow ?? 0) / 1e3)}k ctx`;
+          const ctxK = Math.round((item.contextWindow ?? 0) / 1e3);
+          const subtitle = isAgent ? s(item.model ?? "") : `${s(item.provider ?? "")} \xB7 ${s(ctxK)}k ctx`;
           const isCurrent = isAgent ? currentAgent.id === id : currentModel === id;
-          const selected = i === selectedIdx.current;
           return /* @__PURE__ */ jsxs(
             "box",
             {
@@ -42309,20 +42319,20 @@ function ModelAgentDialog() {
                 paddingRight: 1,
                 paddingTop: 0,
                 paddingBottom: 0,
-                backgroundColor: selected ? colors2.primaryDim : "transparent",
+                backgroundColor: i === selectedIdx.current ? colors2.primaryDim : "transparent",
                 flexDirection: "row",
                 justifyContent: "space-between",
                 width: "100%"
               },
               children: [
                 /* @__PURE__ */ jsxs("box", { style: { flexDirection: "column" }, children: [
-                  /* @__PURE__ */ jsx("text", { fg: colors2.text, children: /* @__PURE__ */ jsx("b", { children: name25 }) }),
-                  /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: subtitle })
+                  /* @__PURE__ */ jsx("text", { fg: colors2.text, children: /* @__PURE__ */ jsx("b", { children: s(name25) }) }),
+                  /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: s(subtitle) })
                 ] }),
-                isCurrent && /* @__PURE__ */ jsx("text", { fg: colors2.success, children: /* @__PURE__ */ jsx("b", { children: "\u25C9" }) })
+                isCurrent ? /* @__PURE__ */ jsx("text", { fg: colors2.success, children: /* @__PURE__ */ jsx("b", { children: "\u25C9" }) }) : null
               ]
             },
-            id
+            s(id)
           );
         }) }) }),
         /* @__PURE__ */ jsx("text", { fg: colors2.textMuted, children: "\u2191\u2193 navigate \xB7 tab switch \xB7 Enter select \xB7 Esc close" })
@@ -42357,15 +42367,15 @@ function ToastContainer() {
           {
             fg: t.kind === "error" ? colors2.error : t.kind === "warning" ? colors2.warning : t.kind === "success" ? colors2.success : colors2.info,
             children: /* @__PURE__ */ jsxs("b", { children: [
-              t.kind.toUpperCase(),
+              s(t.kind.toUpperCase()),
               ":"
             ] })
           }
         ),
-        /* @__PURE__ */ jsx("text", { fg: colors2.text, style: { paddingLeft: 1 }, children: t.message })
+        /* @__PURE__ */ jsx("text", { fg: colors2.text, style: { paddingLeft: 1 }, children: s(t.message) })
       ]
     },
-    t.id
+    s(t.id)
   )) });
 }
 function App() {
@@ -42500,11 +42510,11 @@ function App() {
           /* @__PURE__ */ jsx(ShortcutHints, { interrupted: isRunning })
         ] })
       ] }),
-      sidebarVisible ? /* @__PURE__ */ jsx(Sidebar, { compact: false }) : infoCompact && /* @__PURE__ */ jsx(Sidebar, { compact: true })
+      sidebarVisible ? /* @__PURE__ */ jsx(Sidebar, { compact: false }) : infoCompact ? /* @__PURE__ */ jsx(Sidebar, { compact: true }) : null
     ] }),
     /* @__PURE__ */ jsx(StatusBar, {}),
-    isOpen && dialog.type === "model" && /* @__PURE__ */ jsx(ModelAgentDialog, {}),
-    isOpen && dialog.type === "help" && /* @__PURE__ */ jsx(HelpDialog, {}),
+    isOpen && dialog.type === "model" ? /* @__PURE__ */ jsx(ModelAgentDialog, {}) : null,
+    isOpen && dialog.type === "help" ? /* @__PURE__ */ jsx(HelpDialog, {}) : null,
     /* @__PURE__ */ jsx(ToastContainer, {})
   ] });
 }
@@ -43040,7 +43050,7 @@ Fetching ${url2} (${method})...
       if (action === "remove" && args && args.length > 0) {
         const config2 = getConfig();
         const servers = config2.getNested("mcp.servers") || [];
-        const filtered = servers.filter((s) => s.id !== args[0]);
+        const filtered = servers.filter((s2) => s2.id !== args[0]);
         config2.setNested("mcp.servers", filtered);
         console.log(`Removed MCP server: ${args[0]}`);
         return;