@modeloslab/modelcode 0.1.2 → 0.1.4

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-wr686fnv.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) {
@@ -1356,10 +1370,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;
     }
@@ -1580,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-2wxjcqb2.mjs");
+    const { runTui } = await import("./tui-sekv1hga.mjs");
     return runTui(cfg, resume);
   }
   if (cmd === "tui")

package/dist/{main-k6vk3448.mjs → main-wr686fnv.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++) {
@@ -21025,6 +21050,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 +21058,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 +21085,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 +21430,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 +21484,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 +24315,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 };