@modeloslab/modelcode 0.1.2 → 0.1.4

package/dist/{tui-2wxjcqb2.mjs → tui-sekv1hga.mjs}

@@ -60,6 +60,7 @@ import {
   searchFacts,
   searchSessions,
   shellInvocation,
+  shellName,
   snapshot,
   spawnProc,
   startScheduler,
@@ -67,7 +68,7 @@ import {
   undo,
   userPromptSubmit,
   which
-} from "./main-k6vk3448.mjs";
+} from "./main-wr686fnv.mjs";
 import"./main-p2xnn95s.mjs";
 import {
   __commonJS,
@@ -21382,7 +21383,8 @@ var COMMAND_GROUPS = [
     { cmd: "/summary", desc: "recap the session (also /recap); auto-runs after heavy tasks — /summary disable to turn off" },
     { cmd: "/compact <summary>", desc: "collapse history to a summary (free context)" },
     { cmd: "/fork", desc: "save a snapshot of the current conversation" },
-    { cmd: "/btw <note>", desc: "inject a steering note mid-task" },
+    { cmd: "/btw <question>", desc: "quick side question — answered without changing the current task" },
+    { cmd: "/steer <note>", desc: "steer the ongoing task (applied going forward)" },
     { cmd: "@<path>", desc: "mention a file — its contents are attached to your message" },
     { cmd: "/exit", desc: "quit" }
   ] },
@@ -21480,6 +21482,140 @@ ${c.dim}Tips show on startup (one at a time). Toggle off with MODELCODE_TIPS=0.$
 `);
 }
 
+// src/ui/spinnerVerbs.ts
+var SPINNER_VERBS = [
+  "Accomplishing",
+  "Architecting",
+  "Baking",
+  "Brewing",
+  "Calculating",
+  "Cerebrating",
+  "Channeling",
+  "Churning",
+  "Cogitating",
+  "Composing",
+  "Computing",
+  "Concocting",
+  "Considering",
+  "Contemplating",
+  "Cooking",
+  "Crafting",
+  "Creating",
+  "Crunching",
+  "Crystallizing",
+  "Deciphering",
+  "Deliberating",
+  "Determining",
+  "Digging",
+  "Distilling",
+  "Doing",
+  "Effecting",
+  "Elaborating",
+  "Engineering",
+  "Envisioning",
+  "Excavating",
+  "Exploring",
+  "Fabricating",
+  "Fashioning",
+  "Finagling",
+  "Forging",
+  "Formulating",
+  "Generating",
+  "Germinating",
+  "Hatching",
+  "Herding",
+  "Honing",
+  "Hustling",
+  "Ideating",
+  "Imagining",
+  "Incubating",
+  "Inferring",
+  "Manifesting",
+  "Marinating",
+  "Mulling",
+  "Musing",
+  "Noodling",
+  "Orchestrating",
+  "Percolating",
+  "Philosophizing",
+  "Plotting",
+  "Pondering",
+  "Processing",
+  "Puttering",
+  "Puzzling",
+  "Reticulating",
+  "Ruminating",
+  "Scheming",
+  "Sculpting",
+  "Shimmying",
+  "Simmering",
+  "Smooshing",
+  "Spinning",
+  "Stewing",
+  "Summoning",
+  "Synthesizing",
+  "Thinking",
+  "Tinkering",
+  "Transmuting",
+  "Unfurling",
+  "Vibing",
+  "Weaving",
+  "Whirring",
+  "Working",
+  "Wrangling"
+];
+function randomVerb() {
+  return SPINNER_VERBS[Math.floor(Math.random() * SPINNER_VERBS.length)];
+}
+
+// src/ui/markdown.ts
+var B = "\x1B[1m";
+var _B = "\x1B[22m";
+var I = "\x1B[3m";
+var _I = "\x1B[23m";
+var U = "\x1B[4m";
+var _U = "\x1B[24m";
+var DIM = "\x1B[2m";
+var _DIM = "\x1B[22m";
+var CY = "\x1B[36m";
+var _CY = "\x1B[39m";
+function inline(s) {
+  return s.replace(/`([^`]+)`/g, `${CY}$1${_CY}`).replace(/\*\*([^*]+)\*\*/g, `${B}$1${_B}`).replace(/__([^_]+)__/g, `${B}$1${_B}`).replace(/(^|[^*])\*([^*\n]+)\*/g, `$1${I}$2${_I}`).replace(/(^|[^_])_([^_\n]+)_/g, `$1${I}$2${_I}`);
+}
+function formatMarkdown(src) {
+  const out = [];
+  let inFence = false;
+  for (const raw of src.split(`
+`)) {
+    const line = raw.replace(/\s+$/, "");
+    if (/^\s*```/.test(line)) {
+      inFence = !inFence;
+      continue;
+    }
+    if (inFence) {
+      out.push(`${DIM}  ${line}${_DIM}`);
+      continue;
+    }
+    const h = line.match(/^(#{1,6})\s+(.*)$/);
+    if (h) {
+      out.push(h[1].length === 1 ? `${B}${U}${h[2]}${_U}${_B}` : `${B}${inline(h[2])}${_B}`);
+      continue;
+    }
+    if (/^\s*([-*_])\1{2,}\s*$/.test(line)) {
+      out.push(`${DIM}────────${_DIM}`);
+      continue;
+    }
+    const b = line.match(/^(\s*)[-*+]\s+(.*)$/);
+    if (b) {
+      out.push(`${b[1]}${CY}•${_CY} ${inline(b[2])}`);
+      continue;
+    }
+    out.push(inline(line));
+  }
+  return out.join(`
+`);
+}
+
 // src/ui/themes.ts
 var THEMES = {
   amber: { accent: "yellow", user: "green", tool: "cyan", dim: "gray", ok: "green", warn: "yellow" },
@@ -21492,11 +21628,11 @@ function getTheme(name) {
 
 // src/ui/App.tsx
 var jsx_dev_runtime = __toESM(require_jsx_dev_runtime(), 1);
-var SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+var SPINNER = ["✶", "✸", "✹", "✺", "✹", "✷"];
 function Spinner({ color }) {
   const [i, setI] = import_react34.useState(0);
   import_react34.useEffect(() => {
-    const t = setInterval(() => setI((n) => (n + 1) % SPINNER.length), 80);
+    const t = setInterval(() => setI((n) => (n + 1) % SPINNER.length), 120);
     return () => clearInterval(t);
   }, []);
   return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
@@ -21504,6 +21640,46 @@ function Spinner({ color }) {
     children: SPINNER[i]
   }, undefined, false, undefined, this);
 }
+function WorkingRow({ start, tokens, color, dim }) {
+  const [, tick] = import_react34.useState(0);
+  const [verb, setVerb] = import_react34.useState(() => randomVerb());
+  import_react34.useEffect(() => {
+    const t = setInterval(() => tick((n) => n + 1), 1000);
+    const v = setInterval(() => setVerb(randomVerb()), 4000);
+    return () => {
+      clearInterval(t);
+      clearInterval(v);
+    };
+  }, []);
+  const secs = Math.max(0, Math.floor((Date.now() - start) / 1000));
+  const tok = tokens > 0 ? ` · ↓ ${tokens.toLocaleString()} tok` : "";
+  return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+    children: [
+      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Spinner, {
+        color
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+        color,
+        bold: true,
+        children: [
+          " ",
+          verb,
+          "…"
+        ]
+      }, undefined, true, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+        color: dim,
+        children: [
+          " (",
+          secs,
+          "s",
+          tok,
+          " · esc to interrupt)"
+        ]
+      }, undefined, true, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+}
 function Chip({ label, color }) {
   return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
     backgroundColor: color,
@@ -21527,15 +21703,38 @@ function C_KEY(color, k) {
     ]
   }, undefined, true, undefined, this);
 }
-function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct, walletMdl, mode, busy, confirmReq, history, onConfirm, onSubmit, onInterrupt, onExit }) {
+function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct, walletMdl, mode, busy, toolStream, turnStart, turnTokens, confirmReq, history, onConfirm, onSubmit, onInterrupt, onExit }) {
   const t = getTheme(theme);
   const [input, setInput] = import_react34.useState("");
   const [histIdx, setHistIdx] = import_react34.useState(-1);
+  const [exitHint, setExitHint] = import_react34.useState(false);
+  const exitTimer = import_react34.useRef(null);
   const { exit } = use_app_default();
+  const armExit = () => {
+    setExitHint(true);
+    if (exitTimer.current)
+      clearTimeout(exitTimer.current);
+    exitTimer.current = setTimeout(() => setExitHint(false), 800);
+  };
+  const doExit = () => {
+    if (exitTimer.current)
+      clearTimeout(exitTimer.current);
+    onExit();
+    exit();
+  };
   use_input_default((ch, key) => {
+    if (key.ctrl && ch === "d") {
+      doExit();
+      return;
+    }
     if (key.ctrl && ch === "c") {
-      onExit();
-      exit();
+      if (exitHint) {
+        doExit();
+        return;
+      }
+      if (busy)
+        onInterrupt();
+      armExit();
       return;
     }
     if (confirmReq) {
@@ -21554,8 +21753,6 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
       onInterrupt();
       return;
     }
-    if (busy)
-      return;
     if (key.upArrow) {
       if (history.length) {
         const i = histIdx < 0 ? history.length - 1 : Math.max(0, histIdx - 1);
@@ -21603,6 +21800,7 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
   const renderLine = (l, i) => {
     if (l.kind === "user")
       return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+        flexDirection: "column",
         marginTop: 1,
         children: [
           /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Chip, {
@@ -21610,27 +21808,23 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
             color: t.user
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-            children: [
-              " ",
-              l.text
-            ]
-          }, undefined, true, undefined, this)
+            children: l.text
+          }, undefined, false, undefined, this)
         ]
       }, i, true, undefined, this);
     if (l.kind === "assistant")
       return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+        flexDirection: "column",
         marginTop: 1,
         children: [
-          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Chip, {
-            label: "◆",
-            color: t.accent
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            color: t.accent,
+            bold: true,
+            children: "◆ modelcode"
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-            children: [
-              " ",
-              l.text
-            ]
-          }, undefined, true, undefined, this)
+            children: formatMarkdown(l.text)
+          }, undefined, false, undefined, this)
         ]
       }, i, true, undefined, this);
     if (l.kind === "tool")
@@ -21643,6 +21837,7 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
       }, i, true, undefined, this);
     if (l.kind === "error")
       return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+        flexDirection: "column",
         marginTop: 1,
         children: [
           /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Chip, {
@@ -21651,11 +21846,8 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
             color: t.warn,
-            children: [
-              " ",
-              l.text
-            ]
-          }, undefined, true, undefined, this)
+            children: l.text
+          }, undefined, false, undefined, this)
         ]
       }, i, true, undefined, this);
     return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
@@ -21697,36 +21889,34 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
         flexDirection: "column",
         children: [
           streaming ? /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+            flexDirection: "column",
             marginTop: 1,
             children: [
-              /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Chip, {
-                label: "◆",
-                color: t.accent
-              }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-                children: [
-                  " ",
-                  streaming
-                ]
-              }, undefined, true, undefined, this)
-            ]
-          }, undefined, true, undefined, this) : null,
-          busy && !streaming ? /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
-            marginTop: 1,
-            children: [
-              /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Spinner, {
-                color: t.accent
+                color: t.accent,
+                bold: true,
+                children: "◆ modelcode"
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-                color: t.dim,
-                children: [
-                  " thinking…  ",
-                  C_KEY(t.dim, "esc"),
-                  " to interrupt"
-                ]
-              }, undefined, true, undefined, this)
+                children: formatMarkdown(streaming)
+              }, undefined, false, undefined, this)
             ]
-          }, undefined, true, undefined, this) : null
+          }, undefined, true, undefined, this) : null,
+          toolStream ? /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            color: t.dim,
+            children: toolStream.split(`
+`).slice(-6).join(`
+`)
+          }, undefined, false, undefined, this) : null,
+          busy ? /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+            marginTop: streaming || toolStream ? 0 : 1,
+            children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(WorkingRow, {
+              start: turnStart,
+              tokens: turnTokens,
+              color: t.accent,
+              dim: t.dim
+            }, undefined, false, undefined, this)
+          }, undefined, false, undefined, this) : null
         ]
       }, undefined, true, undefined, this),
       suggestions.length ? /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
@@ -21783,26 +21973,27 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
         ]
       }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
         borderStyle: "round",
-        borderColor: busy ? t.dim : t.user,
+        borderColor: t.user,
         paddingX: 1,
         marginTop: 1,
         children: [
           /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-            color: busy ? t.dim : t.user,
-            children: [
-              busy ? "…" : "›",
-              " "
-            ]
-          }, undefined, true, undefined, this),
+            color: t.user,
+            children: "› "
+          }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
             children: input
           }, undefined, false, undefined, this),
-          !busy ? /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
             color: t.accent,
             children: "▋"
-          }, undefined, false, undefined, this) : null
+          }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
+      busy && input ? /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+        color: t.dim,
+        children: "  ↵ to queue this for after the current turn"
+      }, undefined, false, undefined, this) : null,
       /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
         justifyContent: "space-between",
         paddingX: 1,
@@ -21831,16 +22022,22 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
               ctxBar,
               " ",
               contextPct,
-              "%"
+              "%",
+              turnTokens > 0 ? ` · ↓${turnTokens.toLocaleString()} tok` : ""
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+          exitHint ? /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            color: t.warn,
+            children: "press Ctrl-C again to exit"
+          }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
             color: t.dim,
             children: [
-              sessionMdl.toFixed(6),
+              sessionMdl.toFixed(4),
               " MDL",
               usd,
-              " · /help · ^C"
+              " · ",
+              busy ? "esc=stop · " : "",
+              "^C ^C=exit"
             ]
           }, undefined, true, undefined, this)
         ]
@@ -21897,6 +22094,16 @@ class Agent {
   note(text) {
     this.history.push({ role: "system", content: `User steering note (apply going forward): ${text}` });
   }
+  async sideQuestion(question, onDelta) {
+    const forked = [
+      ...this.history,
+      { role: "system", content: "The user has a quick side question. Answer it concisely using the conversation so far. This does NOT change the current task." },
+      { role: "user", content: question }
+    ];
+    const res = await chat(this.cfg, forked, [], onDelta ?? (() => {}), this.modelFor(question));
+    this.h.onCost(res.feeGrains);
+    return res.content || "(no answer)";
+  }
   get messages() {
     return [...this.history];
   }
@@ -22082,7 +22289,7 @@ ${tail2}`;
       } else {
         if (MUTATING_TOOLS.has(tool.name) && typeof args.path === "string")
           snapshot(this.ctx.cwd, args.path);
-        const runCtx = { ...this.ctx, onStream: (c2) => this.h.onToolStream?.(c2) };
+        const runCtx = { ...this.ctx, onStream: (c2) => this.h.onToolStream?.(c2), onCost: (g) => this.h.onCost(g) };
         try {
           result2 = await tool.run(args, runCtx);
         } catch (e) {
@@ -22584,13 +22791,15 @@ async function handleSlash(line, ctx) {
     }
     case "/model": {
       if (!arg)
-        return { output: `build model: ${cfg.model}${cfg.autoRoute ? " (auto-route on)" : ""}` };
+        return { output: `build model: ${cfg.model}${cfg.autoRoute ? " (auto-route ON — /route to turn off)" : ""}` };
       const id = resolveModelName(arg);
       if (!id)
         return { output: `unknown model '${arg}' — /models to list` };
+      const wasRouting = cfg.autoRoute;
       cfg.model = id;
-      saveConfig({ model: id });
-      return { output: `✓ build model → ${id}` };
+      cfg.autoRoute = false;
+      saveConfig({ model: id, autoRoute: false });
+      return { output: `✓ build model → ${id}${wasRouting ? " (auto-route turned OFF — your model is used for every turn)" : ""}`, modeChanged: true };
     }
     case "/submodel": {
       if (!arg) {
@@ -22732,7 +22941,9 @@ ${typeof m.content === "string" ? m.content : JSON.stringify(m.content)}`).join(
 `) : "no saved sessions" };
     }
     case "/btw":
-      return arg ? { note: arg, output: "noted — will apply going forward" } : { output: "usage: /btw <steering note>" };
+      return arg ? { sideQuestion: arg } : { output: "usage: /btw <quick question> — answered without changing the current task" };
+    case "/steer":
+      return arg ? { note: arg, output: "noted — will apply going forward" } : { output: "usage: /steer <note> — steer the ongoing task" };
     case "/web":
     case "/fetch":
     case "/browse":
@@ -22791,7 +23002,7 @@ function inside(cwd2, p) {
 }
 var bash = {
   name: "bash",
-  description: "Run a shell command in the working directory; returns combined stdout+stderr. Use for builds, tests, git, file ops.",
+  description: `Run a shell command in the working directory (shell: ${shellName()}); returns combined stdout+stderr. Use for builds, tests, git, file ops.${shellName() === "powershell" || shellName() === "pwsh" ? " NOTE: this is Windows PowerShell — use PowerShell syntax (Get-ChildItem/ls, Get-Content/cat, 2>$null, Select-Object -First N)." : shellName() === "cmd" ? " NOTE: this is Windows cmd.exe — use cmd syntax." : ""}`,
   permission: "ask",
   parameters: {
     type: "object",
@@ -22981,7 +23192,9 @@ function registerAgentTool(cfg, onProgress) {
       if (!agent)
         return `error: unknown subagent '${args.subagent_type}'. available: ${names.join(", ")}`;
       const { text, feeGrains } = await runSubagent(cfg, agent, String(args.prompt ?? ""), ctx, onProgress);
-      return `[${agent.name} · ${(feeGrains / 1e8).toFixed(6)} MDL · free/uncapped]
+      ctx.onCost?.(feeGrains);
+      onProgress?.(`  ↳ ${agent.name} done · ${(feeGrains / 1e8).toFixed(4)} MDL`);
+      return `[${agent.name} · ${(feeGrains / 1e8).toFixed(6)} MDL]
 ${text}`;
     }
   };
@@ -23002,7 +23215,8 @@ ${text}`;
     async run(args, ctx) {
       const members = Array.isArray(args.members) ? args.members.map(String) : [];
       const { transcript, feeGrains } = await runTeam(cfg, members, String(args.prompt ?? ""), ctx, Number(args.rounds) || 2, onProgress);
-      return `[team · ${(feeGrains / 1e8).toFixed(6)} MDL · free/uncapped]
+      ctx.onCost?.(feeGrains);
+      return `[team · ${(feeGrains / 1e8).toFixed(6)} MDL]
 ${transcript}`;
     }
   };
@@ -23606,7 +23820,10 @@ function imageMentions(line, cwd2) {
 // src/ui/tui.tsx
 var jsx_dev_runtime2 = __toESM(require_jsx_dev_runtime(), 1);
 function Root({ cfg, resume, mcpCount }) {
-  const [lines, setLines] = import_react35.useState([{ kind: "system", text: "ready — ask me anything, or /help" }]);
+  const [lines, setLines] = import_react35.useState([
+    { kind: "system", text: `ready · model ${cfg.model} — ask me anything, or /help` },
+    ...cfg.autoRoute ? [{ kind: "system", text: `⚠ auto-route is ON — turns may use a different model than ${cfg.model}. Run /route to turn it off (or /model ${cfg.model} to lock it in).` }] : []
+  ]);
   const [streaming, setStreaming] = import_react35.useState("");
   const [busy, setBusy] = import_react35.useState(false);
   const [sessionMdl, setSessionMdl] = import_react35.useState(0);
@@ -23615,14 +23832,27 @@ function Root({ cfg, resume, mcpCount }) {
   const [mode, setMode] = import_react35.useState("default");
   const [confirmReq, setConfirmReq] = import_react35.useState(null);
   const [history, setHistory] = import_react35.useState([]);
+  const [toolStream, setToolStream] = import_react35.useState("");
+  const [turnStart, setTurnStart] = import_react35.useState(0);
+  const [turnTokens, setTurnTokens] = import_react35.useState(0);
   const mdlUsd = import_react35.useRef(null);
   const streamBuf = import_react35.useRef("");
+  const tokensRef = import_react35.useRef(0);
+  const busyRef = import_react35.useRef(false);
+  const queueRef = import_react35.useRef([]);
   const confirmResolve = import_react35.useRef(null);
   const sessionIdRef = import_react35.useRef(newSessionId());
   const sessionMdlRef = import_react35.useRef(0);
   const mcpCountRef = import_react35.useRef(mcpCount);
   const cwd2 = process.cwd();
   const add2 = import_react35.useCallback((l) => setLines((prev) => [...prev, l]), []);
+  const flushAssistant = import_react35.useCallback(() => {
+    const txt = streamBuf.current.trim();
+    streamBuf.current = "";
+    setStreaming("");
+    if (txt)
+      setLines((prev) => [...prev, { kind: "assistant", text: txt }]);
+  }, []);
   const confirm = import_react35.useCallback((name, args) => {
     if (isAllowed(name, cwd2))
       return Promise.resolve(true);
@@ -23643,13 +23873,19 @@ function Root({ cfg, resume, mcpCount }) {
     onAssistantDelta: (txt) => {
       streamBuf.current += txt;
       setStreaming(streamBuf.current);
+      tokensRef.current += Math.max(1, Math.round(txt.length / 4));
+      setTurnTokens(tokensRef.current);
     },
-    onToolStart: (name, args) => add2({ kind: "tool", text: `${name} ${JSON.stringify(args).slice(0, 80)}` }),
-    onToolResult: (_n, r) => add2({ kind: "system", text: r.slice(0, 300) }),
-    onToolStream: (chunk2) => {
-      streamBuf.current += chunk2;
-      setStreaming(streamBuf.current);
+    onToolStart: (name, args) => {
+      flushAssistant();
+      setToolStream("");
+      add2({ kind: "tool", text: `${name} ${JSON.stringify(args).slice(0, 80)}` });
+    },
+    onToolResult: (_n, r) => {
+      setToolStream("");
+      add2({ kind: "system", text: r.slice(0, 300) });
     },
+    onToolStream: (chunk2) => setToolStream((s) => (s + chunk2).slice(-2000)),
     onCost: (g) => setSessionMdl((s) => {
       const v = s + g / 1e8;
       sessionMdlRef.current = v;
@@ -23695,39 +23931,47 @@ function Root({ cfg, resume, mcpCount }) {
       add2({ kind: "system", text: "not logged in — run `modelcode login` (or option 1/2 at startup) to set an API key. /help works without one." });
       return;
     }
-    setBusy(true);
     streamBuf.current = "";
     setStreaming("");
+    setToolStream("");
+    tokensRef.current = 0;
+    setTurnTokens(0);
+    setTurnStart(Date.now());
+    busyRef.current = true;
+    setBusy(true);
     try {
       await agent.send(expandFileMentions(prompt, cwd2), imageMentions(prompt, cwd2));
-      if (streamBuf.current)
-        add2({ kind: "assistant", text: streamBuf.current });
+      flushAssistant();
       saveSession(sessionIdRef.current, cwd2, agent.messages);
       const heavyMin = Number(process.env.MODELCODE_AUTOSUMMARY_MIN || "8");
       if (cfg.autoSummary && agent.lastTurnToolCount >= heavyMin) {
-        streamBuf.current = "";
+        tokensRef.current = 0;
+        setTurnTokens(0);
+        setTurnStart(Date.now());
         await agent.send("Recap concisely (bullets): what we worked on, key changes/decisions (files touched), current state, and any open/next steps.");
-        if (streamBuf.current)
-          add2({ kind: "system", text: `— recap —
-` + streamBuf.current });
+        flushAssistant();
       }
     } catch (e) {
+      flushAssistant();
       add2({ kind: "error", text: e.message });
     } finally {
       setStreaming("");
+      setToolStream("");
       streamBuf.current = "";
+      busyRef.current = false;
       setBusy(false);
       setContextPct(agent.contextStatus().pct);
       setMode(agent.mode);
       refreshWallet();
+      const next = queueRef.current.shift();
+      if (next !== undefined)
+        runInput(next);
     }
-  }, [agent, add2, refreshWallet, cfg, cwd2]);
+  }, [agent, add2, refreshWallet, cfg, cwd2, flushAssistant]);
   const onInterrupt = import_react35.useCallback(() => {
     agent.abort();
   }, [agent]);
-  const onSubmit = import_react35.useCallback(async (input) => {
-    add2({ kind: "user", text: input });
-    setHistory((h) => (h[h.length - 1] === input ? h : [...h, input]).slice(-100));
+  const runInput = import_react35.useCallback(async (input) => {
     if (input.startsWith("/")) {
       const r = await handleSlash(input, { agent, cfg, cwd: cwd2, sessionMdl: sessionMdlRef.current, mcpCount: mcpCountRef.current });
       if (r) {
@@ -23752,6 +23996,28 @@ function Root({ cfg, resume, mcpCount }) {
           setMode(agent.mode);
         if (r.output)
           add2({ kind: "system", text: r.output });
+        if (r.sideQuestion) {
+          busyRef.current = true;
+          setBusy(true);
+          setTurnStart(Date.now());
+          streamBuf.current = "";
+          setStreaming("");
+          try {
+            const ans = await agent.sideQuestion(r.sideQuestion, (t) => {
+              streamBuf.current += t;
+              setStreaming(streamBuf.current);
+            });
+            add2({ kind: "system", text: `btw › ${ans}` });
+          } catch (e) {
+            add2({ kind: "error", text: e.message });
+          } finally {
+            streamBuf.current = "";
+            setStreaming("");
+            busyRef.current = false;
+            setBusy(false);
+            refreshWallet();
+          }
+        }
         if (r.agentPrompt)
           await runTurn(r.agentPrompt);
         return;
@@ -23759,6 +24025,17 @@ function Root({ cfg, resume, mcpCount }) {
     }
     await runTurn(input);
   }, [agent, add2, cfg, cwd2, onExit, runTurn]);
+  const onSubmit = import_react35.useCallback((input) => {
+    setHistory((h) => (h[h.length - 1] === input ? h : [...h, input]).slice(-100));
+    if (busyRef.current) {
+      queueRef.current.push(input);
+      add2({ kind: "user", text: input });
+      add2({ kind: "system", text: "↳ queued (runs after the current turn)" });
+      return;
+    }
+    add2({ kind: "user", text: input });
+    runInput(input);
+  }, [add2, runInput]);
   return /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(App2, {
     theme: cfg.theme,
     model: cfg.model,
@@ -23770,6 +24047,9 @@ function Root({ cfg, resume, mcpCount }) {
     walletMdl,
     mode,
     busy,
+    toolStream,
+    turnStart,
+    turnTokens,
     confirmReq,
     history,
     onConfirm,
@@ -23778,12 +24058,25 @@ function Root({ cfg, resume, mcpCount }) {
     onExit
   }, undefined, false, undefined, this);
 }
-async function runTui(cfg, resume = "none") {
-  if (!process.stdin.isTTY || !process.stdout.isTTY) {
-    process.stderr.write(`modelcode: the interactive TUI needs a terminal (TTY). For non-interactive use, run: modelcode -p "<prompt>"
-`);
-    process.exit(1);
+function getRenderStdin() {
+  if (process.stdin.isTTY)
+    return;
+  if (process.env.CI)
+    return;
+  if (process.platform === "win32")
+    return;
+  try {
+    const { openSync } = __require("fs");
+    const { ReadStream } = __require("tty");
+    const s = new ReadStream(openSync("/dev/tty", "r"));
+    s.isTTY = true;
+    return s;
+  } catch {
+    return;
   }
+}
+async function runTui(cfg, resume = "none") {
+  const renderStdin = getRenderStdin();
   registerCoreTools();
   registerMemoryTools();
   registerAgentTool(cfg, (line) => emitProgress(line));
@@ -23791,7 +24084,12 @@ async function runTui(cfg, resume = "none") {
   registerMoreTools();
   registerBrowserTool();
   registerTaskTools();
-  const mcpCount = await registerMcpTools(process.cwd()).catch(() => 0);
+  let mcpCount = 0;
+  registerMcpTools(process.cwd()).then((n) => {
+    mcpCount = n;
+    if (n)
+      emitProgress(`✓ ${n} MCP tool(s) connected`);
+  }).catch(() => {});
   startScheduler(async (prompt, jobCwd) => {
     emitProgress(`⏰ running scheduled job…`);
     const a = new Agent(cfg, { cwd: jobCwd }, { onAssistantDelta: () => {}, onToolStart: () => {}, onToolResult: () => {}, onCost: () => {}, confirm: async () => true });
@@ -23800,11 +24098,26 @@ async function runTui(cfg, resume = "none") {
   });
   pullTeamMemory().catch(() => {});
   indexCodebaseIncremental(process.cwd()).catch(() => {});
+  const restore = () => {
+    try {
+      if (process.stdin.isTTY)
+        process.stdin.setRawMode(false);
+    } catch {}
+  };
+  process.on("exit", restore);
+  process.on("SIGINT", () => {
+    restore();
+    process.exit(0);
+  });
+  process.on("SIGTERM", () => {
+    restore();
+    process.exit(0);
+  });
   render_default(/* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Root, {
     cfg,
     resume,
     mcpCount
-  }, undefined, false, undefined, this));
+  }, undefined, false, undefined, this), { exitOnCtrlC: false, ...renderStdin ? { stdin: renderStdin } : {} });
 }
 export {
   runTui