@modeloslab/modelcode 0.1.5 → 0.1.8

package/dist/cli.mjs

@@ -48,11 +48,12 @@ import {
   removeCard,
   removeJob,
   renderBoard,
-  renderDiff,
+  renderDiffPlain,
   route,
   runProc,
   runSubagent,
   runTeam,
+  saveConfig,
   searchFacts,
   searchSessions,
   shellInvocation,
@@ -64,7 +65,7 @@ import {
   validateMnemonic,
   walletFromMnemonic,
   which
-} from "./main-t9m4v4fc.mjs";
+} from "./main-pj08pbgh.mjs";
 import"./main-p2xnn95s.mjs";
 import {
   __require
@@ -93,6 +94,7 @@ var ConfigSchema = exports_external.object({
   autoSummary: exports_external.boolean().default(true),
   theme: exports_external.enum(["amber", "mono", "ocean"]).default("amber"),
   teamMemoryUrl: exports_external.string().optional(),
+  autoFixLaunchErrors: exports_external.boolean().default(false),
   spendCapMdl: exports_external.number().default(0),
   providers: exports_external.record(exports_external.object({ baseUrl: exports_external.string(), apiKey: exports_external.string().optional(), model: exports_external.string().optional() })).default({})
 });
@@ -119,7 +121,7 @@ function loadConfig(cwd = process.cwd()) {
     raw.apiKey = envKey;
   return ConfigSchema.parse(raw);
 }
-function saveConfig(patch) {
+function saveConfig2(patch) {
   const p = join(globalDir2(), "config.json");
   let cur = {};
   try {
@@ -155,7 +157,7 @@ var bash = {
   async run(args, ctx) {
     const cmd = String(args.command ?? "");
     const timeout = Number(args.timeout_ms) || 120000;
-    const r = await runProc(shellInvocation(cmd), { cwd: ctx.cwd, timeoutMs: timeout, onChunk: (s) => ctx.onStream?.(s) });
+    const r = await runProc(shellInvocation(cmd), { cwd: ctx.cwd, timeoutMs: timeout, signal: ctx.signal, onChunk: (s) => ctx.onStream?.(s) });
     return `exit ${r.code}
 ${(r.stdout + (r.stderr ? `
 [stderr]
@@ -226,7 +228,7 @@ var edit = {
     const updated = args.replace_all ? src.split(oldS).join(newS) : src.replace(oldS, newS);
     writeFileSync2(p, updated);
     return `edited ${args.path} (${count} replacement${count === 1 ? "" : "s"})
-${renderDiff(oldS, newS, String(args.path))}`;
+${renderDiffPlain(oldS, newS)}`;
   }
 };
 var glob = {
@@ -379,6 +381,15 @@ Tool discipline (important): call each tool ONCE for a given action — never re
 A tool result is authoritative: once a write/edit succeeds, trust it and move on. Do NOT claim a task is
 done in the same message where you call the tool to do it — call the tool first, then confirm only after
 you see its result. Keep confirmations to one short sentence.`;
+var LAUNCH_RE = /\b(npm|pnpm|yarn|bun)\s+(run\s+)?(dev|start|serve)\b|\b(vite|next|nuxt|astro|remix|webpack[\- ]dev[\- ]server|nodemon|tsx\s+watch|ts-node-dev)\b|\b(uvicorn|gunicorn|flask\s+run|manage\.py\s+runserver|rails\s+s(erver)?|go\s+run|cargo\s+run|dotnet\s+run|php\s+artisan\s+serve|air|nest\s+start)\b/i;
+function isLaunchCommand(cmd) {
+  return LAUNCH_RE.test(cmd);
+}
+function looksLikeLaunchError(result) {
+  if (!/^exit\s+([1-9]\d*|124)\b/m.test(result))
+    return false;
+  return /\b(error|exception|cannot find module|module not found|eaddrinuse|syntaxerror|typeerror|referenceerror|failed to compile|command not found|traceback|panic:|address already in use|unexpected token|ENOENT|MODULE_NOT_FOUND)\b/i.test(result);
+}
 
 class Agent {
   cfg;
@@ -501,6 +512,7 @@ ${summary}` : "Earlier conversation was auto-compacted to free context (summary
     recordTurn(this.ctx.cwd, "user", userText);
     newTurn();
     this._doneCalls.clear();
+    this._launchHandled.clear();
     const ac = this.abortController = new AbortController;
     const signal = ac.signal;
     let turnGrains = 0;
@@ -550,6 +562,26 @@ ${tail}`;
           }
           this.history.push({ role: "tool", tool_call_id: call.id, name: call.function.name, content });
           toolCount++;
+          if (call.function.name === "bash" && !this._launchHandled.has(call.id)) {
+            let bashCmd = "";
+            try {
+              bashCmd = String(JSON.parse(call.function.arguments || "{}").command ?? "");
+            } catch {}
+            if (isLaunchCommand(bashCmd) && looksLikeLaunchError(content)) {
+              this._launchHandled.add(call.id);
+              let decision = this.cfg.autoFixLaunchErrors ? "always" : "no";
+              if (!this.cfg.autoFixLaunchErrors && this.h.onLaunchError) {
+                decision = await this.h.onLaunchError(bashCmd);
+              }
+              if (decision === "always") {
+                this.cfg.autoFixLaunchErrors = true;
+                saveConfig({ autoFixLaunchErrors: true });
+              }
+              if (decision === "yes" || decision === "always") {
+                this.history.push({ role: "system", content: `The launch command \`${bashCmd}\` failed to start. Diagnose the root cause from the error output above, fix it (install missing deps, fix config/code, free the port, etc.), then re-run the launch to verify it starts cleanly.` });
+              }
+            }
+          }
         }
       }
     } catch (e) {
@@ -577,6 +609,7 @@ ${tail}`;
     }
   }
   _suggested = false;
+  _launchHandled = new Set;
   _doneCalls = new Map;
   async execToolCall(call) {
     const tool = getTool(call.function.name);
@@ -602,11 +635,11 @@ ${tail}`;
       if (!gate.allowed) {
         result = `blocked by hook: ${gate.reason}`;
       } else if (needsConfirm && !await this.h.confirm(tool.name, args)) {
-        result = "denied by user";
+        result = "declined by user";
       } 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), onCost: (g) => this.h.onCost(g) };
+        const runCtx = { ...this.ctx, onStream: (c) => this.h.onToolStream?.(c), onCost: (g) => this.h.onCost(g), signal: this.abortController?.signal };
         try {
           result = await tool.run(args, runCtx);
         } catch (e) {
@@ -625,7 +658,7 @@ ${tail}`;
       }
     }
     this.h.onToolResult(tool.name, result);
-    if (!result.startsWith("error") && !result.startsWith("denied") && !result.startsWith("blocked"))
+    if (!result.startsWith("error") && !result.startsWith("declined") && !result.startsWith("blocked"))
       this._doneCalls.set(sig, result);
     return { content: result, edited };
   }
@@ -1310,9 +1343,6 @@ function registerTaskTools() {
   register(schedule);
 }
 
-// src/tips/tips.ts
-var FREQUENCY = Math.max(1, Number(process.env.MODELCODE_TIP_FREQUENCY || "1"));
-
 // src/wallet/store.ts
 import { join as join5 } from "path";
 import { existsSync as existsSync8, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "fs";
@@ -1382,7 +1412,7 @@ async function interactiveLogin(rl, cfg) {
 `);
       return false;
     }
-    saveConfig({ apiKey: key });
+    saveConfig2({ apiKey: key });
     cfg.apiKey = key;
     stdout.write(`${C.green}\u2713 logged in${C.reset} (key saved to ~/.modelcode/config.json)
 `);
@@ -1410,7 +1440,7 @@ async function interactiveLogin(rl, cfg) {
     }
     try {
       const { apiKey, depositAddr } = await registerApiKey(address);
-      saveConfig({ apiKey });
+      saveConfig2({ apiKey });
       cfg.apiKey = apiKey;
       stdout.write(`${C.green}\u2713 API key created + saved${C.reset}
 ` + `${C.dim}To buy credits: send MDL to your wallet, then run ${C.reset}modelcode credits fund <mdl>${C.dim} ` + `(it funds the API bank ${depositAddr ? depositAddr.slice(0, 16) + "\u2026" : ""} and claims credits).${C.reset}
@@ -1440,7 +1470,7 @@ async function maybeAutoKey(address) {
     return;
   try {
     const { apiKey, depositAddr } = await registerApiKey(address);
-    saveConfig({ apiKey });
+    saveConfig2({ apiKey });
     stdout.write(`${C.green}API key created & saved${C.reset} (${apiKey.slice(0, 12)}\u2026)
 ` + `deposit address: ${depositAddr}
 fund it in one command: ${C.cyan}modelcode credits fund <mdl>${C.reset}
@@ -1609,7 +1639,7 @@ async function main() {
       s.resume();
       await new Promise((r) => setImmediate(r));
     }
-    const { runTui } = await import("./tui-rxaw95g7.mjs");
+    const { runTui } = await import("./tui-pgwd6eyk.mjs");
     return runTui(cfg, resume);
   }
   if (cmd === "tui")

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

@@ -7921,6 +7921,7 @@ var ConfigSchema = exports_external.object({
   autoSummary: exports_external.boolean().default(true),
   theme: exports_external.enum(["amber", "mono", "ocean"]).default("amber"),
   teamMemoryUrl: exports_external.string().optional(),
+  autoFixLaunchErrors: exports_external.boolean().default(false),
   spendCapMdl: exports_external.number().default(0),
   providers: exports_external.record(exports_external.object({ baseUrl: exports_external.string(), apiKey: exports_external.string().optional(), model: exports_external.string().optional() })).default({})
 });
@@ -8108,6 +8109,19 @@ function runProc(cmd, opts = {}) {
           finish(124);
         }, 2000);
       }, opts.timeoutMs);
+    if (opts.signal) {
+      if (opts.signal.aborted) {
+        killTree("SIGKILL");
+        finish(130);
+      } else
+        opts.signal.addEventListener("abort", () => {
+          killTree("SIGTERM");
+          setTimeout(() => {
+            killTree("SIGKILL");
+            finish(130);
+          }, 500);
+        }, { once: true });
+    }
     p.stdout?.on("data", (d) => {
       const s = dOut.write(d);
       stdout += s;
@@ -15067,37 +15081,43 @@ function toolSchemas() {
 
 // src/ui/diff.ts
 var A = { red: "\x1B[31m", green: "\x1B[32m", gray: "\x1B[90m", cyan: "\x1B[36m", yellow: "\x1B[33m", mag: "\x1B[35m", reset: "\x1B[0m" };
-function renderDiff(before, after, path = "") {
+function renderDiffPlain(before, after) {
   const a = before.split(`
 `), b = after.split(`
 `);
-  const n = Math.min(a.length, 2000), m = Math.min(b.length, 2000);
+  const n = Math.min(a.length, 4000), m = Math.min(b.length, 4000);
   const dp = Array.from({ length: n + 1 }, () => new Array(m + 1).fill(0));
   for (let i2 = n - 1;i2 >= 0; i2--)
     for (let j2 = m - 1;j2 >= 0; j2--)
       dp[i2][j2] = a[i2] === b[j2] ? dp[i2 + 1][j2 + 1] + 1 : Math.max(dp[i2 + 1][j2], dp[i2][j2 + 1]);
-  const out = path ? [`${A.cyan}--- ${path}${A.reset}`] : [];
+  const out = [];
   let i = 0, j = 0;
   while (i < n && j < m) {
     if (a[i] === b[j]) {
-      out.push(`${A.gray} ${a[i]}${A.reset}`);
+      out.push(`  ${a[i]}`);
       i++;
       j++;
     } else if (dp[i + 1][j] >= dp[i][j + 1]) {
-      out.push(`${A.red}-${a[i]}${A.reset}`);
+      out.push(`- ${a[i]}`);
       i++;
     } else {
-      out.push(`${A.green}+${b[j]}${A.reset}`);
+      out.push(`+ ${b[j]}`);
       j++;
     }
   }
   while (i < n)
-    out.push(`${A.red}-${a[i++]}${A.reset}`);
+    out.push(`- ${a[i++]}`);
   while (j < m)
-    out.push(`${A.green}+${b[j++]}${A.reset}`);
+    out.push(`+ ${b[j++]}`);
   return out.join(`
 `);
 }
+var KEYWORDS = /\b(const|let|var|function|class|interface|type|import|export|return|if|else|for|while|async|await|def|fn|struct|enum|public|private|func|package|use|impl|match|new)\b/g;
+var STRINGS = /("[^"]*"|'[^']*'|`[^`]*`)/g;
+var COMMENTS = /(\/\/[^\n]*|#[^\n]*)/g;
+function highlight(code) {
+  return code.replace(COMMENTS, (m) => `${A.gray}${m}${A.reset}`).replace(STRINGS, (m) => `${A.yellow}${m}${A.reset}`).replace(KEYWORDS, (m) => `${A.mag}${m}${A.reset}`).replace(/\b(\d+(?:\.\d+)?)\b/g, (m) => `${A.cyan}${m}${A.reset}`);
+}
 
 // src/memory/store.ts
 import { join as join7 } from "path";
@@ -24335,4 +24355,4 @@ async function decryptWallet(enc, password, network = MAINNET) {
   }
   return w;
 }
-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 };
+export { exports_external, register, getTool, toolSchemas, renderDiffPlain, highlight, 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-rxaw95g7.mjs → tui-pgwd6eyk.mjs}

@@ -23,6 +23,7 @@ import {
   getUsage,
   globMatch,
   globalDir,
+  highlight,
   imageToDataUrl,
   impactSummary,
   indexCodebase,
@@ -51,7 +52,7 @@ import {
   removeCard,
   removeJob,
   renderBoard,
-  renderDiff,
+  renderDiffPlain,
   route,
   runProc,
   runSubagent,
@@ -68,7 +69,7 @@ import {
   undo,
   userPromptSubmit,
   which
-} from "./main-t9m4v4fc.mjs";
+} from "./main-pj08pbgh.mjs";
 import"./main-p2xnn95s.mjs";
 import {
   __commonJS,
@@ -21593,7 +21594,7 @@ function formatMarkdown(src) {
       continue;
     }
     if (inFence) {
-      out.push(`${DIM}  ${line}${_DIM}`);
+      out.push(`  ${highlight(line)}`);
       continue;
     }
     const h = line.match(/^(#{1,6})\s+(.*)$/);
@@ -21692,6 +21693,11 @@ function Chip({ label, color }) {
     ]
   }, undefined, true, undefined, this);
 }
+function truncPath(p, max2 = 60) {
+  if (p.length <= max2)
+    return p;
+  return "…" + p.slice(p.length - max2 + 1);
+}
 function C_KEY(color, k) {
   return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
     color,
@@ -21703,7 +21709,7 @@ function C_KEY(color, k) {
     ]
   }, undefined, true, undefined, this);
 }
-function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct, walletMdl, mode, busy, toolStream, turnStart, turnTokens, confirmReq, history, onConfirm, onSubmit, onInterrupt, onExit }) {
+function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct, walletMdl, mode, busy, toolStream, turnStart, turnTokens, confirmReq, launchReq, history, onConfirm, onLaunchDecision, onSubmit, onInterrupt, onExit }) {
   const t = getTheme(theme);
   const [input, setInput] = import_react34.useState("");
   const [histIdx, setHistIdx] = import_react34.useState(-1);
@@ -21737,6 +21743,16 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
       armExit();
       return;
     }
+    if (launchReq) {
+      const k = ch.toLowerCase();
+      if (k === "y")
+        onLaunchDecision("yes");
+      else if (k === "a")
+        onLaunchDecision("always");
+      else if (k === "n" || key.return || key.escape)
+        onLaunchDecision("no");
+      return;
+    }
     if (confirmReq) {
       const k = ch.toLowerCase();
       if (k === "y")
@@ -21859,6 +21875,55 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
           }, undefined, false, undefined, this)
         ]
       }, i, true, undefined, this);
+    if (l.kind === "diff") {
+      const rows = l.text.split(`
+`);
+      const header = rows[0] && !/^[+\- ] /.test(rows[0]) ? rows.shift() : null;
+      let ln = 0;
+      return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+        flexDirection: "column",
+        children: [
+          header ? /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+                color: t.tool,
+                children: "⏺ "
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+                children: header
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this) : null,
+          rows.slice(0, 60).map((row, k) => {
+            const add2 = row.startsWith("+ "), del = row.startsWith("- ");
+            if (!del)
+              ln++;
+            const num = String(ln).padStart(4);
+            const body = row.slice(2);
+            return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+              children: [
+                /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+                  color: t.dim,
+                  children: `   ${add2 ? "    " : num} `
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+                  backgroundColor: add2 ? "#10301a" : del ? "#3a1418" : undefined,
+                  color: add2 ? t.ok : del ? t.warn : t.dim,
+                  children: [
+                    add2 ? "+ " : del ? "- " : "  ",
+                    body
+                  ]
+                }, undefined, true, undefined, this)
+              ]
+            }, k, true, undefined, this);
+          }),
+          rows.length > 60 ? /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            color: t.dim,
+            children: `      … +${rows.length - 60} more diff lines`
+          }, undefined, false, undefined, this) : null
+        ]
+      }, i, true, undefined, this);
+    }
     if (l.kind === "error")
       return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
         flexDirection: "column",
@@ -21888,21 +21953,36 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
       /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
         borderStyle: "round",
         borderColor: t.accent,
-        paddingX: 1,
-        justifyContent: "space-between",
+        paddingX: 2,
+        paddingY: 1,
+        flexDirection: "column",
+        alignItems: "center",
         children: [
           /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
             bold: true,
             color: t.accent,
-            children: "◆ modelcode"
+            children: "✻ modelcode"
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
             color: t.dim,
+            children: "the AI coding agent on modelOS"
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
             children: [
-              model,
-              " · pay-per-use · no limits"
+              /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+                color: t.user,
+                children: model
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+                color: t.dim,
+                children: " · pay-per-use in MDL · no rate limits"
+              }, undefined, false, undefined, this)
             ]
-          }, undefined, true, undefined, this)
+          }, undefined, true, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            color: t.dim,
+            children: truncPath(process.cwd())
+          }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Static, {
@@ -21962,6 +22042,34 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
           ]
         }, c2.cmd, true, undefined, this))
       }, undefined, false, undefined, this) : null,
+      launchReq ? /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+        flexDirection: "column",
+        borderStyle: "round",
+        borderColor: t.warn,
+        paddingX: 1,
+        marginTop: 1,
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            color: t.warn,
+            bold: true,
+            children: "launch failed — fix it?"
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            color: t.dim,
+            children: launchReq.cmd
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            children: [
+              C_KEY(t.user, "y"),
+              " accept   ",
+              C_KEY(t.user, "n"),
+              " decline   ",
+              C_KEY(t.accent, "a"),
+              " at all times (every project)"
+            ]
+          }, undefined, true, undefined, this)
+        ]
+      }, undefined, true, undefined, this) : null,
       confirmReq ? /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
         flexDirection: "column",
         borderStyle: "round",
@@ -21985,13 +22093,13 @@ function App2({ theme, model, mdlUsd, lines, streaming, sessionMdl, contextPct,
           /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
             children: [
               C_KEY(t.user, "y"),
-              " yes   ",
+              " accept   ",
               C_KEY(t.user, "a"),
               " always (project)   ",
               C_KEY(t.user, "g"),
-              " global   ",
+              " always (global)   ",
               C_KEY(t.warn, "n"),
-              " no"
+              " decline"
             ]
           }, undefined, true, undefined, this)
         ]
@@ -22086,6 +22194,15 @@ Tool discipline (important): call each tool ONCE for a given action — never re
 A tool result is authoritative: once a write/edit succeeds, trust it and move on. Do NOT claim a task is
 done in the same message where you call the tool to do it — call the tool first, then confirm only after
 you see its result. Keep confirmations to one short sentence.`;
+var LAUNCH_RE = /\b(npm|pnpm|yarn|bun)\s+(run\s+)?(dev|start|serve)\b|\b(vite|next|nuxt|astro|remix|webpack[\- ]dev[\- ]server|nodemon|tsx\s+watch|ts-node-dev)\b|\b(uvicorn|gunicorn|flask\s+run|manage\.py\s+runserver|rails\s+s(erver)?|go\s+run|cargo\s+run|dotnet\s+run|php\s+artisan\s+serve|air|nest\s+start)\b/i;
+function isLaunchCommand(cmd) {
+  return LAUNCH_RE.test(cmd);
+}
+function looksLikeLaunchError(result2) {
+  if (!/^exit\s+([1-9]\d*|124)\b/m.test(result2))
+    return false;
+  return /\b(error|exception|cannot find module|module not found|eaddrinuse|syntaxerror|typeerror|referenceerror|failed to compile|command not found|traceback|panic:|address already in use|unexpected token|ENOENT|MODULE_NOT_FOUND)\b/i.test(result2);
+}
 
 class Agent {
   cfg;
@@ -22208,6 +22325,7 @@ ${summary}` : "Earlier conversation was auto-compacted to free context (summary
     recordTurn(this.ctx.cwd, "user", userText);
     newTurn();
     this._doneCalls.clear();
+    this._launchHandled.clear();
     const ac = this.abortController = new AbortController;
     const signal = ac.signal;
     let turnGrains = 0;
@@ -22257,6 +22375,26 @@ ${tail2}`;
           }
           this.history.push({ role: "tool", tool_call_id: call.id, name: call.function.name, content });
           toolCount++;
+          if (call.function.name === "bash" && !this._launchHandled.has(call.id)) {
+            let bashCmd = "";
+            try {
+              bashCmd = String(JSON.parse(call.function.arguments || "{}").command ?? "");
+            } catch {}
+            if (isLaunchCommand(bashCmd) && looksLikeLaunchError(content)) {
+              this._launchHandled.add(call.id);
+              let decision = this.cfg.autoFixLaunchErrors ? "always" : "no";
+              if (!this.cfg.autoFixLaunchErrors && this.h.onLaunchError) {
+                decision = await this.h.onLaunchError(bashCmd);
+              }
+              if (decision === "always") {
+                this.cfg.autoFixLaunchErrors = true;
+                saveConfig({ autoFixLaunchErrors: true });
+              }
+              if (decision === "yes" || decision === "always") {
+                this.history.push({ role: "system", content: `The launch command \`${bashCmd}\` failed to start. Diagnose the root cause from the error output above, fix it (install missing deps, fix config/code, free the port, etc.), then re-run the launch to verify it starts cleanly.` });
+              }
+            }
+          }
         }
       }
     } catch (e) {
@@ -22284,6 +22422,7 @@ ${tail2}`;
     }
   }
   _suggested = false;
+  _launchHandled = new Set;
   _doneCalls = new Map;
   async execToolCall(call) {
     const tool = getTool(call.function.name);
@@ -22309,11 +22448,11 @@ ${tail2}`;
       if (!gate.allowed) {
         result2 = `blocked by hook: ${gate.reason}`;
       } else if (needsConfirm && !await this.h.confirm(tool.name, args)) {
-        result2 = "denied by user";
+        result2 = "declined by user";
       } 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), onCost: (g) => this.h.onCost(g) };
+        const runCtx = { ...this.ctx, onStream: (c2) => this.h.onToolStream?.(c2), onCost: (g) => this.h.onCost(g), signal: this.abortController?.signal };
         try {
           result2 = await tool.run(args, runCtx);
         } catch (e) {
@@ -22332,7 +22471,7 @@ ${tail2}`;
       }
     }
     this.h.onToolResult(tool.name, result2);
-    if (!result2.startsWith("error") && !result2.startsWith("denied") && !result2.startsWith("blocked"))
+    if (!result2.startsWith("error") && !result2.startsWith("declined") && !result2.startsWith("blocked"))
       this._doneCalls.set(sig, result2);
     return { content: result2, edited };
   }
@@ -23039,7 +23178,7 @@ var bash = {
   async run(args, ctx) {
     const cmd = String(args.command ?? "");
     const timeout = Number(args.timeout_ms) || 120000;
-    const r = await runProc(shellInvocation(cmd), { cwd: ctx.cwd, timeoutMs: timeout, onChunk: (s) => ctx.onStream?.(s) });
+    const r = await runProc(shellInvocation(cmd), { cwd: ctx.cwd, timeoutMs: timeout, signal: ctx.signal, onChunk: (s) => ctx.onStream?.(s) });
     return `exit ${r.code}
 ${(r.stdout + (r.stderr ? `
 [stderr]
@@ -23110,7 +23249,7 @@ var edit = {
     const updated = args.replace_all ? src.split(oldS).join(newS) : src.replace(oldS, newS);
     writeFileSync6(p, updated);
     return `edited ${args.path} (${count} replacement${count === 1 ? "" : "s"})
-${renderDiff(oldS, newS, String(args.path))}`;
+${renderDiffPlain(oldS, newS)}`;
   }
 };
 var glob = {
@@ -23875,6 +24014,7 @@ function Root({ cfg, resume, mcpCount }) {
   const [walletMdl, setWalletMdl] = import_react35.useState(null);
   const [mode, setMode] = import_react35.useState("default");
   const [confirmReq, setConfirmReq] = import_react35.useState(null);
+  const [launchReq, setLaunchReq] = import_react35.useState(null);
   const [history, setHistory] = import_react35.useState([]);
   const [toolStream, setToolStream] = import_react35.useState("");
   const [turnStart, setTurnStart] = import_react35.useState(0);
@@ -23887,6 +24027,7 @@ function Root({ cfg, resume, mcpCount }) {
   const busyRef = import_react35.useRef(false);
   const queueRef = import_react35.useRef([]);
   const confirmResolve = import_react35.useRef(null);
+  const launchResolve = import_react35.useRef(null);
   const sessionIdRef = import_react35.useRef(newSessionId());
   const sessionMdlRef = import_react35.useRef(0);
   const mcpCountRef = import_react35.useRef(mcpCount);
@@ -23915,6 +24056,17 @@ function Root({ cfg, resume, mcpCount }) {
     confirmResolve.current?.(decision !== "no");
     confirmResolve.current = null;
   }, [confirmReq, cwd2]);
+  const onLaunchError = import_react35.useCallback((cmd) => {
+    setLaunchReq({ cmd });
+    return new Promise((resolve3) => {
+      launchResolve.current = resolve3;
+    });
+  }, []);
+  const onLaunchDecision = import_react35.useCallback((d) => {
+    setLaunchReq(null);
+    launchResolve.current?.(d);
+    launchResolve.current = null;
+  }, []);
   const agent = import_react35.useRef(new Agent(cfg, { cwd: cwd2 }, {
     onAssistantDelta: (txt) => {
       streamBuf.current += txt;
@@ -23926,10 +24078,13 @@ function Root({ cfg, resume, mcpCount }) {
       setToolStream("");
       add2({ kind: "tool", text: toolUseLabel(name, args) });
     },
-    onToolResult: (_n, r) => {
+    onToolResult: (name, r) => {
       toolStreamRef.current = "";
       setToolStream("");
-      add2({ kind: "result", text: capLines(r, 8) });
+      if ((name === "edit" || name === "write") && /^[+\-] /m.test(r))
+        add2({ kind: "diff", text: r });
+      else
+        add2({ kind: "result", text: capLines(r, 8) });
     },
     onToolStream: (chunk2) => {
       toolStreamRef.current = (toolStreamRef.current + chunk2).slice(-2000);
@@ -23940,6 +24095,7 @@ function Root({ cfg, resume, mcpCount }) {
       return v;
     }),
     confirm,
+    onLaunchError,
     onSuggestSkill: (n) => add2({ kind: "system", text: `\uD83D\uDCA1 that took ${n} steps — /skill-create to save it` }),
     onCompact: (cs) => add2({ kind: "system", text: `\uD83D\uDDDC  context auto-compacted (now ~${cs.pct}% full)` })
   })).current;
@@ -24112,8 +24268,10 @@ function Root({ cfg, resume, mcpCount }) {
     turnStart,
     turnTokens,
     confirmReq,
+    launchReq,
     history,
     onConfirm,
+    onLaunchDecision,
     onSubmit,
     onInterrupt,
     onExit

package/package.json

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