@modeloslab/modelcode 0.1.2 → 0.1.3

package/dist/cli.mjs

@@ -1356,10 +1356,15 @@ async function interactiveLogin(rl, cfg) {
 ` + `  ${C.cyan}3${C.reset}) skip for now
 `);
   const choice = (await rl.question(`${C.green}choose 1-3\u203A${C.reset} `)).trim();
-  if (choice === "1" || choice.startsWith("mdlk_")) {
-    const key = choice.startsWith("mdlk_") ? choice : (await rl.question("API key (mdlk_\u2026): ")).trim();
-    if (!key.startsWith("mdlk_")) {
-      stdout.write(`${C.amber}that doesn't look like an mdlk_ key${C.reset}
+  const extractKey = (s) => s.match(/mdlk_[A-Za-z0-9]+/)?.[0] ?? "";
+  if (choice === "1" || /mdlk_/.test(choice)) {
+    let key = extractKey(choice);
+    if (!key)
+      key = extractKey(await rl.question("paste your API key (mdlk_\u2026): "));
+    if (!key)
+      key = extractKey(await rl.question("API key (mdlk_\u2026): "));
+    if (!key) {
+      stdout.write(`${C.amber}that doesn't look like an mdlk_ key \u2014 it should start with "mdlk_"${C.reset}
 `);
       return false;
     }
@@ -1581,7 +1586,7 @@ async function main() {
       await interactiveLogin(rl, cfg);
       rl.close();
     }
-    const { runTui } = await import("./tui-2wxjcqb2.mjs");
+    const { runTui } = await import("./tui-gh76vcf8.mjs");
     return runTui(cfg, resume);
   }
   if (cmd === "tui")

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

@@ -21480,6 +21480,92 @@ ${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/themes.ts
 var THEMES = {
   amber: { accent: "yellow", user: "green", tool: "cyan", dim: "gray", ok: "green", warn: "yellow" },
@@ -21492,11 +21578,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 +21590,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 +21653,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) {
@@ -21711,22 +21860,21 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
               }, 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
-              }, 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)
-            ]
-          }, 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, {
@@ -21795,7 +21943,7 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
             ]
           }, undefined, true, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-            children: input
+            children: input || (busy ? "" : "")
           }, undefined, false, undefined, this),
           !busy ? /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
             color: t.accent,
@@ -21831,16 +21979,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)
         ]
@@ -22584,13 +22738,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) {
@@ -23606,7 +23762,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 +23774,25 @@ 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 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 +23813,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,33 +23871,38 @@ 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());
+    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 = "";
       setBusy(false);
       setContextPct(agent.contextStatus().pct);
       setMode(agent.mode);
       refreshWallet();
     }
-  }, [agent, add2, refreshWallet, cfg, cwd2]);
+  }, [agent, add2, refreshWallet, cfg, cwd2, flushAssistant]);
   const onInterrupt = import_react35.useCallback(() => {
     agent.abort();
   }, [agent]);
@@ -23770,6 +23951,9 @@ function Root({ cfg, resume, mcpCount }) {
     walletMdl,
     mode,
     busy,
+    toolStream,
+    turnStart,
+    turnTokens,
     confirmReq,
     history,
     onConfirm,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modeloslab/modelcode",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "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": {