miii-agent 0.1.20 → 0.1.21

package/dist/cli.js

@@ -89,8 +89,8 @@ var init_config = __esm({
   "src/config.ts"() {
     "use strict";
     EFFORT_OPTIONS = {
-      low: { temperature: 0.2, num_predict: 1024 },
-      medium: { temperature: 0.7, num_predict: 2048 },
+      low: { temperature: 0.2, num_predict: 8192 },
+      medium: { temperature: 0.7, num_predict: 16384 },
       high: { temperature: 1, num_predict: -1 }
     };
     CONFIG_DIR = join(homedir(), ".miii");
@@ -163,30 +163,6 @@ async function modelContext(entry, model) {
     throw err;
   }
 }
-async function paramCountB(entry, model) {
-  try {
-    const info = await makeClient(entry).show({ model });
-    const details = info.details;
-    if (details?.parameter_size) {
-      const m = details.parameter_size.match(/([\d.]+)\s*([BM])/i);
-      if (m) {
-        const n = parseFloat(m[1]);
-        if (!isNaN(n)) return m[2].toUpperCase() === "M" ? n / 1e3 : n;
-      }
-    }
-    const modelInfo = info.model_info;
-    if (modelInfo) {
-      const key = Object.keys(modelInfo).find((k) => k.endsWith("parameter_count"));
-      if (key) {
-        const val = Number(modelInfo[key]);
-        if (!isNaN(val) && val > 0) return val / 1e9;
-      }
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
 async function* chat(entry, model, messages, tools, opts) {
   if (opts?.signal?.aborted) return;
   const signal = opts?.signal;
@@ -249,6 +225,7 @@ async function* chat(entry, model, messages, tools, opts) {
         content: stripHarmony(chunk.message.content),
         thinking: stripHarmony(chunk.message.thinking),
         done: chunk.done,
+        done_reason: chunk.done_reason,
         tool_calls: chunk.message.tool_calls,
         prompt_eval_count: chunk.prompt_eval_count,
         eval_count: chunk.eval_count
@@ -384,6 +361,7 @@ async function* chat2(entry, model, messages, tools, opts) {
   if (oaTools) body.tools = oaTools;
   if (opts?.num_predict && opts.num_predict > 0) body.max_tokens = opts.num_predict;
   const toolCallAccum = /* @__PURE__ */ new Map();
+  let lastFinishReason;
   const TIMEOUT_MS = 18e4;
   const timeoutSignal = AbortSignal.timeout(TIMEOUT_MS);
   const combinedSignal = opts?.signal && typeof AbortSignal.any === "function" ? AbortSignal.any([opts.signal, timeoutSignal]) : opts?.signal ?? timeoutSignal;
@@ -423,6 +401,7 @@ async function* chat2(entry, model, messages, tools, opts) {
           if (!choices || choices.length === 0) continue;
           const delta = choices[0].delta ?? {};
           const finishReason = choices[0].finish_reason;
+          if (finishReason) lastFinishReason = finishReason;
           if (delta.content) {
             yield { content: delta.content, done: false };
           }
@@ -487,6 +466,9 @@ async function* chat2(entry, model, messages, tools, opts) {
   yield {
     content: "",
     done: true,
+    // OpenAI signals a hit token cap as finish_reason 'length'; normalize to the
+    // Ollama spelling so the agent loop can detect truncation uniformly.
+    done_reason: lastFinishReason === "length" ? "length" : lastFinishReason ?? void 0,
     tool_calls: toolCalls.length > 0 ? toolCalls : void 0
   };
 }
@@ -502,9 +484,6 @@ var init_openai = __esm({
 function active() {
   return resolveProvider();
 }
-function providerName() {
-  return active().name;
-}
 function isAvailable3() {
   const { entry } = active();
   return entry.type === "ollama" ? isAvailable(entry) : isAvailable2(entry);
@@ -521,16 +500,6 @@ async function modelContext3(model) {
   const { entry } = active();
   return entry.type === "ollama" ? modelContext(entry, model) : modelContext2(entry, model);
 }
-async function modelParamCountB(model) {
-  const { entry } = active();
-  if (entry.type !== "ollama") return null;
-  const key = `${entry.baseUrl}:${model}`;
-  const cached = paramCountCache.get(key);
-  if (cached !== void 0) return cached;
-  const params = await paramCountB(entry, model);
-  paramCountCache.set(key, params);
-  return params;
-}
 async function* chat3(model, messages, tools, opts) {
   const { entry } = active();
   if (entry.type === "ollama") {
@@ -539,14 +508,12 @@ async function* chat3(model, messages, tools, opts) {
     yield* chat2(entry, model, messages, tools, opts);
   }
 }
-var paramCountCache;
 var init_client = __esm({
   "src/llm/client.ts"() {
     "use strict";
     init_config();
     init_ollama();
     init_openai();
-    paramCountCache = /* @__PURE__ */ new Map();
   }
 });
 
@@ -749,7 +716,10 @@ var init_edit_file = __esm({
       handler: ({ path, old_str, new_str, replace_all }) => {
         try {
           if (old_str === new_str) {
-            return { content: `old_str and new_str are identical \u2014 nothing to change in ${path}.`, is_error: true };
+            return {
+              content: `old_str and new_str are identical \u2014 nothing to change in ${path}. If the file is already correct, do NOT edit again: finish with the respond action and tell the user it is done.`,
+              is_error: true
+            };
           }
           const abs = confinePath(path);
           const src = readFileSync3(abs, "utf-8");
@@ -1218,6 +1188,31 @@ function toZod(schema) {
   }
   return z.object(shape).passthrough();
 }
+function exampleValue(spec) {
+  if (spec.enum && spec.enum.length) return spec.enum[0];
+  switch (spec.type) {
+    case "number":
+    case "integer":
+      return 0;
+    case "boolean":
+      return false;
+    case "array":
+      return [];
+    case "object":
+      return {};
+    default:
+      return "...";
+  }
+}
+function exampleInput(schema) {
+  const required = schema.required ?? [];
+  const obj = {};
+  for (const key of required) {
+    const spec = schema.properties[key];
+    if (spec) obj[key] = exampleValue(spec);
+  }
+  return JSON.stringify(obj);
+}
 function validateInput(schema, input) {
   const result = toZod(schema).safeParse(input ?? {});
   if (result.success) return null;
@@ -1614,8 +1609,22 @@ function parseGrammarAction(content, knownToolNames) {
     }
   }
   const name = typeof obj.name === "string" ? obj.name : void 0;
-  const args2 = obj.arguments ?? {};
   if (!name) return null;
+  let args2;
+  const wrapped = obj.arguments ?? obj.parameters ?? obj.input ?? obj.args;
+  if (typeof wrapped === "string") {
+    try {
+      const parsed = JSON.parse(wrapped);
+      args2 = parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+    } catch {
+      args2 = {};
+    }
+  } else if (wrapped && typeof wrapped === "object" && !Array.isArray(wrapped)) {
+    args2 = wrapped;
+  } else {
+    const { name: _n, ...rest } = obj;
+    args2 = rest;
+  }
   if (name === "respond") {
     const message = typeof args2.message === "string" ? args2.message : "";
     return { kind: "respond", message };
@@ -1707,6 +1716,30 @@ function readGuard(name, input, seen) {
   const verb = name === "edit_file" ? "edit" : "overwrite";
   return `Refusing to ${verb} ${p}: you have not read it this turn. Call read_file on ${p} first, then retry the ${name}.`;
 }
+function unwrapEnvelope(name, input) {
+  if (!("arguments" in input)) return input;
+  if ("name" in input && input.name !== name) return input;
+  let args2 = input.arguments;
+  if (typeof args2 === "string") {
+    try {
+      args2 = JSON.parse(args2);
+    } catch {
+      return input;
+    }
+  }
+  if (args2 && typeof args2 === "object" && !Array.isArray(args2)) return args2;
+  return input;
+}
+function splitWriteHint(name, cause) {
+  const lead = cause === "truncated" ? `Your response was cut off at the output token limit, so this ${name} call is incomplete and was NOT run.` : `Your ${name} call arrived with missing or garbled arguments \u2014 usually the response was cut off or mangled while writing a large value. It was NOT run.`;
+  return `${lead} Do not resend the whole file in one call. Instead create the file with write_file containing only the first portion, then append the rest with successive edit_file calls. Keep each call small.`;
+}
+function looksTruncatedWrite(name, input) {
+  if (!BIG_WRITE_TOOLS.has(name)) return false;
+  if (typeof input.path !== "string" || !input.path) return true;
+  if (name === "write_file" && typeof input.content !== "string") return true;
+  return false;
+}
 function markSeen(name, input, seen) {
   if (name !== "read_file" && name !== "edit_file" && name !== "write_file") return;
   const p = input.path;
@@ -1719,11 +1752,7 @@ function markSeen(name, input, seen) {
 async function* runAgent(opts) {
   const { model, cwd, permissions, hooks, signal, num_ctx } = opts;
   const startTime = Date.now();
-  let useGrammar = false;
-  if (providerName() === "ollama") {
-    const params = await modelParamCountB(model);
-    useGrammar = params == null || params <= GRAMMAR_MAX_PARAMS_B;
-  }
+  const useGrammar = false;
   const system = buildSystemPrompt(TOOLS, cwd, loadProjectContext(cwd), useGrammar);
   const grammar = useGrammar ? buildToolGrammar(TOOLS) : void 0;
   const ollamaTools = toOllamaTools(TOOLS);
@@ -1743,9 +1772,11 @@ async function* runAgent(opts) {
     let tool_calls;
     let respondEmitted = 0;
     let streamedRespond = false;
+    let emittedText = false;
     let lastTail = "";
     let tailRepeats = 0;
     let streamLooped = false;
+    let truncated = false;
     const ac = new AbortController();
     const composedSignal = signal ? AbortSignal.any ? AbortSignal.any([signal, ac.signal]) : ac.signal : ac.signal;
     if (signal) signal.addEventListener("abort", () => ac.abort(), { once: true });
@@ -1755,12 +1786,14 @@ async function* runAgent(opts) {
         if (chunk.content) {
           text += chunk.content;
           if (!useGrammar) {
+            emittedText = true;
             yield { type: "text-delta", text: chunk.content };
           } else {
             const r = streamRespondMessage(text);
             if (r) {
               streamedRespond = true;
               if (r.message.length > respondEmitted) {
+                emittedText = true;
                 yield { type: "text-delta", text: r.message.slice(respondEmitted) };
                 respondEmitted = r.message.length;
               }
@@ -1781,7 +1814,7 @@ async function* runAgent(opts) {
             }
           }
         }
-        if (chunk.thinking) {
+        if (chunk.thinking && !emittedText) {
           yield { type: "thinking-delta", text: chunk.thinking };
         }
         if (chunk.tool_calls && chunk.tool_calls.length > 0) {
@@ -1790,6 +1823,7 @@ async function* runAgent(opts) {
         if (chunk.done) {
           promptTokens += chunk.prompt_eval_count ?? 0;
           evalTokens += chunk.eval_count ?? 0;
+          if (chunk.done_reason === "length") truncated = true;
         }
       }
     } catch (err) {
@@ -1828,6 +1862,19 @@ async function* runAgent(opts) {
     }
     const tool_uses = blocks.filter((b) => b.type === "tool_use");
     history.push({ role: "assistant", content: blocks });
+    if (truncated && tool_uses.length > 0) {
+      const results2 = tool_uses.map((use) => ({
+        type: "tool_result",
+        tool_use_id: use.id,
+        content: splitWriteHint(use.name, "truncated"),
+        is_error: true
+      }));
+      for (const u of tool_uses) yield { type: "tool-use", block: u };
+      for (const r of results2) yield { type: "tool-result", block: r };
+      history.push({ role: "user", content: results2 });
+      yield { type: "turn-end", stop_reason: "tool_use" };
+      continue;
+    }
     if (tool_uses.length === 0) {
       yield { type: "turn-end", stop_reason: "end_turn" };
       break;
@@ -1862,12 +1909,14 @@ async function* runAgent(opts) {
         yield { type: "tool-result", block: r2 };
         continue;
       }
+      use.input = unwrapEnvelope(use.name, use.input);
       const invalid = validateInput(tool.input_schema, use.input);
       if (invalid) {
+        const content = looksTruncatedWrite(use.name, use.input) ? splitWriteHint(use.name, "garbled") : `${invalid} for ${use.name}. Pass the arguments directly as the tool input \u2014 do NOT wrap them in {"name":...,"arguments":...}. Correct shape: ${exampleInput(tool.input_schema)}. Retry with all required fields.`;
         const r2 = {
           type: "tool_result",
           tool_use_id: use.id,
-          content: `${invalid} for ${use.name}.`,
+          content,
           is_error: true
         };
         results.push(r2);
@@ -1934,7 +1983,7 @@ async function* runAgent(opts) {
   yield { type: "done", prompt_tokens: promptTokens, eval_tokens: evalTokens };
   return history;
 }
-var MAX_TURNS, REPEAT_TAIL, REPEAT_KILL, GRAMMAR_MAX_PARAMS_B;
+var MAX_TURNS, REPEAT_TAIL, REPEAT_KILL, BIG_WRITE_TOOLS;
 var init_loop = __esm({
   "src/agent/loop.ts"() {
     "use strict";
@@ -1951,7 +2000,7 @@ var init_loop = __esm({
     MAX_TURNS = 25;
     REPEAT_TAIL = 120;
     REPEAT_KILL = 4;
-    GRAMMAR_MAX_PARAMS_B = 14;
+    BIG_WRITE_TOOLS = /* @__PURE__ */ new Set(["write_file", "edit_file"]);
   }
 });
 
@@ -2670,7 +2719,7 @@ import { Box as Box12, Text as Text12, Static } from "ink";
 // src/ui/markdown.ts
 import { Marked } from "marked";
 import { markedTerminal } from "marked-terminal";
-import { highlight } from "cli-highlight";
+import { highlight, supportsLanguage } from "cli-highlight";
 
 // node_modules/chalk/source/vendor/ansi-styles/index.js
 var ANSI_BACKGROUND_OFFSET = 10;
@@ -3194,7 +3243,7 @@ var theme = {
   // faint rule
 };
 function highlightCode(code, lang) {
-  if (!lang) return code;
+  if (!lang || !supportsLanguage(lang)) return code;
   try {
     return highlight(code, { language: lang, ignoreIllegals: true });
   } catch {
@@ -3292,7 +3341,7 @@ import { Box as Box10, Text as Text10 } from "ink";
 
 // src/ui/ToolBlock.tsx
 import { Box as Box9, Text as Text9 } from "ink";
-import { highlight as highlight2 } from "cli-highlight";
+import { highlight as highlight2, supportsLanguage as supportsLanguage2 } from "cli-highlight";
 
 // src/ui/toolExpand.ts
 import { useState as useState3, useEffect as useEffect3 } from "react";
@@ -3427,7 +3476,7 @@ function langFromPath(path) {
   return ext ? EXT_LANG[ext] : void 0;
 }
 function highlightLine(text, lang) {
-  if (!lang) return text;
+  if (!lang || !supportsLanguage2(lang)) return text;
   try {
     return highlight2(text, { language: lang, ignoreIllegals: true });
   } catch {
@@ -4628,7 +4677,6 @@ function App() {
           header: /* @__PURE__ */ jsx13(WelcomeBlock, { model: cfg.model, activeCtx, effort, cwd })
         }
       ),
-      updateAvailable && /* @__PURE__ */ jsx13(Box13, { marginLeft: 2, marginBottom: 1, children: /* @__PURE__ */ jsx13(Text13, { color: "yellow", children: `\u2191 update available: v${updateAvailable} \u2014 run: miii --update` }) }),
       input.startsWith("/") && /* @__PURE__ */ jsx13(CommandPalette, { filter: input, cursor: paletteCursor }),
       contextWarning !== null && /* @__PURE__ */ jsx13(Box13, { marginLeft: 2, marginBottom: 1, children: /* @__PURE__ */ jsx13(Text13, { color: "yellow", children: `\u26A0 context ${contextWarning}% full \u2014 run /clear and start fresh` }) }),
       !input.startsWith("/") && (() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miii-agent",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "Cursor / Claude Code, but local. An offline AI pair-programmer in your terminal, powered by Ollama. Private by default, free forever.",
   "type": "module",
   "bin": {