@modeloslab/modelcode 0.1.4 → 0.1.5

package/dist/cli.mjs

@@ -64,7 +64,7 @@ import {
   validateMnemonic,
   walletFromMnemonic,
   which
-} from "./main-wr686fnv.mjs";
+} from "./main-t9m4v4fc.mjs";
 import"./main-p2xnn95s.mjs";
 import {
   __require
@@ -1609,7 +1609,7 @@ async function main() {
       s.resume();
       await new Promise((r) => setImmediate(r));
     }
-    const { runTui } = await import("./tui-sekv1hga.mjs");
+    const { runTui } = await import("./tui-rxaw95g7.mjs");
     return runTui(cfg, resume);
   }
   if (cmd === "tui")

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

@@ -8073,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);
@@ -8093,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);
     });
   });
 }

package/dist/{tui-sekv1hga.mjs → tui-rxaw95g7.mjs}

@@ -68,7 +68,7 @@ import {
   undo,
   userPromptSubmit,
   which
-} from "./main-wr686fnv.mjs";
+} from "./main-t9m4v4fc.mjs";
 import"./main-p2xnn95s.mjs";
 import {
   __commonJS,
@@ -21829,10 +21829,34 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
       }, 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")
@@ -23819,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` },
@@ -23837,7 +23881,9 @@ 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);
@@ -23872,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;
@@ -23932,6 +23980,7 @@ function Root({ cfg, resume, mcpCount }) {
       return;
     }
     streamBuf.current = "";
+    toolStreamRef.current = "";
     setStreaming("");
     setToolStream("");
     tokensRef.current = 0;
@@ -23939,6 +23988,13 @@ function Root({ cfg, resume, mcpCount }) {
     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();
@@ -23955,9 +24011,14 @@ 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);

package/package.json

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