@modeloslab/modelcode 0.1.3 → 0.1.5

package/dist/cli.mjs

@@ -56,6 +56,7 @@ import {
   searchFacts,
   searchSessions,
   shellInvocation,
+  shellName,
   snapshot,
   spawnProc,
   toolSchemas,
@@ -63,7 +64,7 @@ import {
   validateMnemonic,
   walletFromMnemonic,
   which
-} from "./main-k6vk3448.mjs";
+} from "./main-t9m4v4fc.mjs";
 import"./main-p2xnn95s.mjs";
 import {
   __require
@@ -141,7 +142,7 @@ function inside(cwd, 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",
@@ -331,7 +332,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}`;
     }
   };
@@ -352,7 +355,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}`;
     }
   };
@@ -407,6 +411,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];
   }
@@ -592,7 +606,7 @@ ${tail}`;
       } else {
         if (MUTATING_TOOLS.has(tool.name) && typeof args.path === "string")
           snapshot(this.ctx.cwd, args.path);
-        const runCtx = { ...this.ctx, onStream: (c) => this.h.onToolStream?.(c) };
+        const runCtx = { ...this.ctx, onStream: (c) => this.h.onToolStream?.(c), onCost: (g) => this.h.onCost(g) };
         try {
           result = await tool.run(args, runCtx);
         } catch (e) {
@@ -1585,8 +1599,17 @@ async function main() {
       const rl = createInterface({ input: stdin, output: stdout });
       await interactiveLogin(rl, cfg);
       rl.close();
+      const s = stdin;
+      s.removeAllListeners("data");
+      s.removeAllListeners("keypress");
+      try {
+        if (s.isTTY)
+          s.setRawMode(false);
+      } catch {}
+      s.resume();
+      await new Promise((r) => setImmediate(r));
     }
-    const { runTui } = await import("./tui-gh76vcf8.mjs");
+    const { runTui } = await import("./tui-rxaw95g7.mjs");
     return runTui(cfg, resume);
   }
   if (cmd === "tui")

package/dist/{main-k6vk3448.mjs → main-t9m4v4fc.mjs}

@@ -7966,7 +7966,19 @@ var isWin = process.platform === "win32";
 function shellInvocation(cmd) {
   if (!isWin)
     return ["bash", "-lc", cmd];
-  return hasBash() ? ["bash", "-c", cmd] : ["cmd", "/c", cmd];
+  if (hasBash())
+    return ["bash", "-c", cmd];
+  const ps = powershellBin();
+  if (ps)
+    return [ps, "-NoProfile", "-NonInteractive", "-Command", cmd];
+  return ["cmd", "/c", cmd];
+}
+function shellName() {
+  if (!isWin)
+    return "bash";
+  if (hasBash())
+    return "bash";
+  return powershellBin() ?? "cmd";
 }
 var _bash = null;
 function hasBash() {
@@ -7979,6 +7991,19 @@ function hasBash() {
   }
   return _bash;
 }
+var _ps;
+function powershellBin() {
+  if (_ps !== undefined)
+    return _ps;
+  for (const bin of ["pwsh", "powershell"]) {
+    try {
+      if (spawnSync(bin, ["-NoProfile", "-Command", "exit 0"], { stdio: "ignore" }).status === 0) {
+        return _ps = bin;
+      }
+    } catch {}
+  }
+  return _ps = null;
+}
 function packageRoot(startDir) {
   let dir = startDir;
   for (let i = 0;i < 12; i++) {
@@ -8048,15 +8073,40 @@ function extsFromGlob(glob) {
 function runProc(cmd, opts = {}) {
   return new Promise((resolve) => {
     const [bin, ...args] = cmd;
-    const so = { cwd: opts.cwd, env: { ...process.env, ...opts.env }, stdio: ["ignore", "pipe", "pipe"] };
+    const so = { cwd: opts.cwd, env: { ...process.env, ...opts.env }, stdio: ["ignore", "pipe", "pipe"], detached: !isWin };
     const p = spawn(bin, args, so);
-    let stdout = "", stderr = "";
+    let stdout = "", stderr = "", done = false;
     const dOut = new StringDecoder("utf8"), dErr = new StringDecoder("utf8");
+    const finish = (code) => {
+      if (done)
+        return;
+      done = true;
+      if (killer)
+        clearTimeout(killer);
+      resolve({ code, stdout: stdout + dOut.end(), stderr: stderr + dErr.end() });
+    };
+    const killTree = (signal) => {
+      try {
+        if (isWin)
+          spawnSync("taskkill", ["/pid", String(p.pid), "/T", "/F"], { stdio: "ignore" });
+        else if (p.pid)
+          process.kill(-p.pid, signal);
+        else
+          p.kill(signal);
+      } catch {
+        try {
+          p.kill(signal);
+        } catch {}
+      }
+    };
     let killer = null;
     if (opts.timeoutMs)
       killer = setTimeout(() => {
-        p.kill("SIGTERM");
-        setTimeout(() => p.kill("SIGKILL"), 2000);
+        killTree("SIGTERM");
+        setTimeout(() => {
+          killTree("SIGKILL");
+          finish(124);
+        }, 2000);
       }, opts.timeoutMs);
     p.stdout?.on("data", (d) => {
       const s = dOut.write(d);
@@ -8068,15 +8118,10 @@ function runProc(cmd, opts = {}) {
       stderr += s;
       opts.onChunk?.(s, true);
     });
-    p.on("close", (code) => {
-      if (killer)
-        clearTimeout(killer);
-      resolve({ code: code ?? 0, stdout: stdout + dOut.end(), stderr: stderr + dErr.end() });
-    });
+    p.on("close", (code) => finish(code ?? 0));
     p.on("error", (e) => {
-      if (killer)
-        clearTimeout(killer);
-      resolve({ code: 1, stdout, stderr: stderr + String(e) });
+      stderr += String(e);
+      finish(1);
     });
   });
 }
@@ -21025,6 +21070,7 @@ async function chat2(cfg, messages, tools, onDelta, modelOverride, timeoutMs = 1
     messages,
     max_tokens: cfg.maxTokens,
     stream: true,
+    stream_options: { include_usage: true },
     ...tools.length ? { tools, tool_choice: "auto" } : {}
   };
   const attempt = async (live) => {
@@ -21032,7 +21078,13 @@ async function chat2(cfg, messages, tools, onDelta, modelOverride, timeoutMs = 1
     let content = "";
     let finishReason = null;
     let feeGrains = 0;
+    let promptTokens = 0, completionTokens = 0;
     const calls = {};
+    const readFee = (o) => {
+      const x = o;
+      const v = x?.x_modelos?.fee_grains ?? x?.fee_grains ?? x?.cost_grains;
+      return v != null ? Number(v) || 0 : 0;
+    };
     for await (const chunk of stream) {
       const choice = chunk.choices?.[0];
       const delta = choice?.delta;
@@ -21053,22 +21105,33 @@ async function chat2(cfg, messages, tools, onDelta, modelOverride, timeoutMs = 1
       }
       if (choice?.finish_reason)
         finishReason = choice.finish_reason;
-      const x = chunk.x_modelos;
-      if (x?.fee_grains)
-        feeGrains = Number(x.fee_grains) || feeGrains;
+      feeGrains = readFee(chunk) || readFee(chunk.usage) || feeGrains;
+      const usage = chunk.usage;
+      if (usage) {
+        promptTokens = usage.prompt_tokens ?? promptTokens;
+        completionTokens = usage.completion_tokens ?? completionTokens;
+      }
     }
-    return { content, toolCalls: Object.values(calls), finishReason, feeGrains };
+    return { content, toolCalls: Object.values(calls), finishReason, feeGrains, promptTokens, completionTokens };
   };
-  try {
-    return await attempt(true);
-  } catch (e) {
-    await new Promise((r) => setTimeout(r, 1500));
+  let lastErr;
+  for (let i = 0;i < 3; i++) {
     try {
       return await attempt(true);
-    } catch {
-      throw e;
+    } catch (e) {
+      lastErr = e;
+      const status = e.status;
+      if (status && status >= 400 && status < 500)
+        break;
+      if (i < 2)
+        await new Promise((r) => setTimeout(r, 1000 * (i + 1)));
     }
   }
+  const err = lastErr;
+  const reachable = err?.status !== undefined;
+  if (!reachable)
+    throw new Error(`inference API not reachable (${cfg.baseUrl}) — check your connection. ${err?.message ?? err?.code ?? ""}`.trim());
+  throw new Error(`inference API error${err.status ? ` (HTTP ${err.status})` : ""}: ${err.message ?? "request rejected"}`);
 }
 
 // src/router/router.ts
@@ -21387,21 +21450,39 @@ async function runSubagent(cfg2, agent, task, ctx, onProgress, extraTools = [])
   const granted = base ? [...base, ...extraTools] : extraTools.length ? [...allTools(), ...extraTools] : null;
   const tools = granted ? granted.map((t) => ({ type: "function", function: { name: t.name, description: t.description, parameters: t.parameters } })) : toolSchemas();
   const lookup = (name) => granted ? granted.find((t) => t.name === name) : getTool(name);
-  const turnCtx = buildTurnContext(task, ctx.cwd, {});
+  const env = `Working directory: ${ctx.cwd}
+Platform: ${process.platform}
+Today: ${new Date().toISOString().slice(0, 10)}`;
+  const projSlice = loadProjectContext(ctx.cwd).slice(0, 4000);
+  const turnCtx = (buildTurnContext(task, ctx.cwd, {}) || "").slice(0, 4000);
+  const sys = [agent.systemPrompt, env, projSlice, turnCtx].filter(Boolean).join(`
+
+`);
   const history = [
-    { role: "system", content: agent.systemPrompt + loadProjectContext(ctx.cwd) },
-    ...turnCtx ? [{ role: "system", content: turnCtx }] : [],
+    { role: "system", content: sys },
     { role: "user", content: task }
   ];
   let feeGrains = 0;
   const routed = cfg2.autoRoute ? route(task)?.model : undefined;
   const subModel = cfg2.subagentModel || routed || agent.model || cfg2.model;
+  onProgress?.(`  ↳ ${agent.name} on ${subModel}`);
+  const RESULT_CAP = Number(process.env.MODELCODE_MAX_TOOL_RESULT || "40000");
+  const capResult = (s) => s.length <= RESULT_CAP ? s : `${s.slice(0, Math.floor(RESULT_CAP * 0.7))}
+
+…[truncated ${s.length - RESULT_CAP} chars]…
+
+${s.slice(-Math.floor(RESULT_CAP * 0.2))}`;
   const finish = (text) => {
     fireEvent("subagentStop", ctx.cwd, { AGENT: agent.name, RESULT: text.slice(0, 4000) }).catch(() => {});
     return { text, feeGrains };
   };
   for (let step = 0;step < MAX_STEPS; step++) {
-    const res = await chat2(cfg2, history, tools, () => {}, subModel, 60000);
+    let res;
+    try {
+      res = await chat2(cfg2, history, tools, () => {}, subModel, 120000);
+    } catch (e) {
+      return finish(`error: ${agent.name} (${subModel}) — ${e.message}`);
+    }
     feeGrains += res.feeGrains;
     history.push({ role: "assistant", content: res.content || null, ...res.toolCalls.length ? { tool_calls: res.toolCalls } : {} });
     if (!res.toolCalls.length)
@@ -21423,7 +21504,7 @@ async function runSubagent(cfg2, agent, task, ctx, onProgress, extraTools = [])
           result = `error: ${e.message}`;
         }
       }
-      history.push({ role: "tool", tool_call_id: call.id, name: call.function.name, content: result });
+      history.push({ role: "tool", tool_call_id: call.id, name: call.function.name, content: capResult(result) });
     }
   }
   return finish("(subagent hit the step limit without finishing)");
@@ -24254,4 +24335,4 @@ async function decryptWallet(enc, password, network = MAINNET) {
   }
   return w;
 }
-export { exports_external, register, getTool, toolSchemas, renderDiff, shellInvocation, globMatch, runProc, which, spawnProc, globalDir, loadConfig, saveConfig, rememberFact, allFacts, searchFacts, deleteFact, recordTurn, searchSessions, parseFrontmatter, loadSubagents, chat2 as chat, route, loadProjectContext, addEntity, addRelation, query, indexFile, indexCodebaseIncremental, indexCodebase, loadSkills, buildTurnContext, preToolUse, postToolUse, userPromptSubmit, fireEvent, runSubagent, runTeam, isImagePath, imageToDataUrl, estimateTokens, contextStatus, compactionThreshold, findCompactionCut, newTurn, snapshot, undo, depth, MUTATING_TOOLS, isProtectedBuiltin, recordUse, recordPatch, recordCreate, getUsage, allUsage, activityCount, analyzeImpact, impactSummary, lspFor, closeAllLsp, COLUMNS, addCard, moveCard, removeCard, renderBoard, addJob, listJobs, removeJob, startScheduler, MAINNET, generateMnemonic2 as generateMnemonic, validateMnemonic2 as validateMnemonic, walletFromMnemonic, importWalletHex, encryptWallet, decryptWallet, createTransfer };
+export { exports_external, register, getTool, toolSchemas, renderDiff, shellInvocation, shellName, globMatch, runProc, which, spawnProc, globalDir, loadConfig, saveConfig, rememberFact, allFacts, searchFacts, deleteFact, recordTurn, searchSessions, parseFrontmatter, loadSubagents, chat2 as chat, route, loadProjectContext, addEntity, addRelation, query, indexFile, indexCodebaseIncremental, indexCodebase, loadSkills, buildTurnContext, preToolUse, postToolUse, userPromptSubmit, fireEvent, runSubagent, runTeam, isImagePath, imageToDataUrl, estimateTokens, contextStatus, compactionThreshold, findCompactionCut, newTurn, snapshot, undo, depth, MUTATING_TOOLS, isProtectedBuiltin, recordUse, recordPatch, recordCreate, getUsage, allUsage, activityCount, analyzeImpact, impactSummary, lspFor, closeAllLsp, COLUMNS, addCard, moveCard, removeCard, renderBoard, addJob, listJobs, removeJob, startScheduler, MAINNET, generateMnemonic2 as generateMnemonic, validateMnemonic2 as validateMnemonic, walletFromMnemonic, importWalletHex, encryptWallet, decryptWallet, createTransfer };

package/dist/{tui-gh76vcf8.mjs → tui-rxaw95g7.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-t9m4v4fc.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" }
   ] },
@@ -21566,6 +21568,54 @@ 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" },
@@ -21703,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);
@@ -21752,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, {
@@ -21759,39 +21808,60 @@ 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")
       return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-        color: t.tool,
         children: [
-          "  ⚙ ",
-          l.text
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            color: t.tool,
+            children: "⏺ "
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            children: l.text
+          }, undefined, false, undefined, this)
+        ]
+      }, i, true, undefined, this);
+    if (l.kind === "result")
+      return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+        flexDirection: "row",
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            color: t.dim,
+            children: "  ⎿  "
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+            flexShrink: 1,
+            flexGrow: 1,
+            children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+              color: t.dim,
+              children: l.text.split(`
+`).join(`
+     `)
+            }, undefined, false, undefined, this)
+          }, undefined, false, undefined, this)
         ]
       }, 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, {
@@ -21800,11 +21870,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, {
@@ -21846,18 +21913,17 @@ 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
+              /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+                color: t.accent,
+                bold: true,
+                children: "◆ modelcode"
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-                children: [
-                  " ",
-                  streaming
-                ]
-              }, undefined, true, undefined, this)
+                children: formatMarkdown(streaming)
+              }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this) : null,
           toolStream ? /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
@@ -21931,26 +21997,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 || (busy ? "" : "")
+            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,
@@ -22051,6 +22118,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];
   }
@@ -22236,7 +22313,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) {
@@ -22888,7 +22965,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":
@@ -22947,7 +23026,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",
@@ -23137,7 +23216,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}`;
     }
   };
@@ -23158,7 +23239,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}`;
     }
   };
@@ -23761,6 +23843,26 @@ function imageMentions(line, cwd2) {
 
 // src/ui/tui.tsx
 var jsx_dev_runtime2 = __toESM(require_jsx_dev_runtime(), 1);
+function toolUseLabel(name, args) {
+  const cap = (s, n = 160) => s.length > n ? s.slice(0, n).trim() + "…" : s;
+  if (name === "bash")
+    return cap(String(args.command ?? "").split(`
+`)[0] ?? "");
+  if (name === "edit" || name === "write" || name === "read")
+    return `${name} ${cap(String(args.path ?? ""), 80)}`;
+  const keys2 = Object.entries(args).map(([k, v]) => `${k}=${cap(String(v), 40)}`).join(" ");
+  return cap(`${name} ${keys2}`);
+}
+function capLines(s, max2) {
+  const lines = s.replace(/\s+$/, "").split(`
+`);
+  if (lines.length <= max2)
+    return lines.join(`
+`);
+  return lines.slice(0, max2).join(`
+`) + `
+… +${lines.length - max2} lines`;
+}
 function Root({ cfg, resume, mcpCount }) {
   const [lines, setLines] = import_react35.useState([
     { kind: "system", text: `ready · model ${cfg.model} — ask me anything, or /help` },
@@ -23779,7 +23881,11 @@ function Root({ cfg, resume, mcpCount }) {
   const [turnTokens, setTurnTokens] = import_react35.useState(0);
   const mdlUsd = import_react35.useRef(null);
   const streamBuf = import_react35.useRef("");
+  const toolStreamRef = import_react35.useRef("");
   const tokensRef = import_react35.useRef(0);
+  const pumpRef = import_react35.useRef(null);
+  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);
@@ -23812,20 +23918,22 @@ function Root({ cfg, resume, mcpCount }) {
   const agent = import_react35.useRef(new Agent(cfg, { cwd: cwd2 }, {
     onAssistantDelta: (txt) => {
       streamBuf.current += txt;
-      setStreaming(streamBuf.current);
       tokensRef.current += Math.max(1, Math.round(txt.length / 4));
-      setTurnTokens(tokensRef.current);
     },
     onToolStart: (name, args) => {
       flushAssistant();
+      toolStreamRef.current = "";
       setToolStream("");
-      add2({ kind: "tool", text: `${name} ${JSON.stringify(args).slice(0, 80)}` });
+      add2({ kind: "tool", text: toolUseLabel(name, args) });
     },
     onToolResult: (_n, r) => {
+      toolStreamRef.current = "";
       setToolStream("");
-      add2({ kind: "system", text: r.slice(0, 300) });
+      add2({ kind: "result", text: capLines(r, 8) });
+    },
+    onToolStream: (chunk2) => {
+      toolStreamRef.current = (toolStreamRef.current + chunk2).slice(-2000);
     },
-    onToolStream: (chunk2) => setToolStream((s) => (s + chunk2).slice(-2000)),
     onCost: (g) => setSessionMdl((s) => {
       const v = s + g / 1e8;
       sessionMdlRef.current = v;
@@ -23872,12 +23980,21 @@ function Root({ cfg, resume, mcpCount }) {
       return;
     }
     streamBuf.current = "";
+    toolStreamRef.current = "";
     setStreaming("");
     setToolStream("");
     tokensRef.current = 0;
     setTurnTokens(0);
     setTurnStart(Date.now());
+    busyRef.current = true;
     setBusy(true);
+    if (pumpRef.current)
+      clearInterval(pumpRef.current);
+    pumpRef.current = setInterval(() => {
+      setStreaming(streamBuf.current);
+      setToolStream(toolStreamRef.current);
+      setTurnTokens(tokensRef.current);
+    }, 80);
     try {
       await agent.send(expandFileMentions(prompt, cwd2), imageMentions(prompt, cwd2));
       flushAssistant();
@@ -23894,21 +24011,28 @@ function Root({ cfg, resume, mcpCount }) {
       flushAssistant();
       add2({ kind: "error", text: e.message });
     } finally {
+      if (pumpRef.current) {
+        clearInterval(pumpRef.current);
+        pumpRef.current = null;
+      }
       setStreaming("");
       setToolStream("");
       streamBuf.current = "";
+      toolStreamRef.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, 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) {
@@ -23933,6 +24057,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;
@@ -23940,6 +24086,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,
@@ -23962,12 +24119,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));
@@ -23975,7 +24145,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 });
@@ -23984,11 +24159,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modeloslab/modelcode",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "modelOS-native AI coding agent CLI — remembers like Hermes, codes like Claude Code, runs on modelOS (pay-per-use in MDL, no rate limits). Knowledge-graph memory, subagents, MCP, vision, spend caps.",
   "type": "module",
   "bin": {