micro-models-agent 0.27.0 → 0.28.0

package/dist/main.js

@@ -2229,7 +2229,9 @@ var init_defaults = __esm(() => {
       navigationTimeout: 15000
     },
     ui: {
-      spinner: true
+      spinner: true,
+      toolStyle: "inline",
+      toolComments: true
     },
     mcpServers: {
       context7: {
@@ -4514,12 +4516,12 @@ class OpenAICompatProvider {
     };
     this.rateLimiter = createRateLimiter(config.rateLimits);
   }
-  async* chat(messages, tools) {
+  async* chat(messages, tools, signal) {
     if (!this.rateLimiter.canMakeRequest()) {
       throw new Error(`Rate limit exceeded: ${this.rateLimiter.getConfig().maxRequestsPerMinute} requests per minute`);
     }
     this.rateLimiter.recordRequest();
-    const streamResult = this.doStream(messages, tools);
+    const streamResult = this.doStream(messages, tools, signal);
     let hasToolCall = false;
     let hasText = false;
     let reasoningAcc = "";
@@ -4534,13 +4536,13 @@ class OpenAICompatProvider {
       yield chunk;
     }
     if (!hasToolCall && !hasText) {
-      const fallback = await this.doNonStreaming(messages, tools);
+      const fallback = await this.doNonStreaming(messages, tools, signal);
       for (const chunk of fallback) {
         yield chunk;
       }
     }
   }
-  async* doStream(messages, tools) {
+  async* doStream(messages, tools, signal) {
     const body = {
       model: this.model,
       messages,
@@ -4567,11 +4569,12 @@ class OpenAICompatProvider {
     const controller = new AbortController;
     const totalTimeoutMs = 120000;
     const timeoutId = setTimeout(() => controller.abort(), totalTimeoutMs);
+    const abortSignal = signal ? AbortSignal.any([controller.signal, signal]) : controller.signal;
     const response = await this.fetchWithRetry(`${this.config.baseUrl}/chat/completions`, {
       method: "POST",
       headers,
       body: JSON.stringify(body),
-      signal: controller.signal
+      signal: abortSignal
     });
     if (!response.ok) {
       clearTimeout(timeoutId);
@@ -4670,7 +4673,7 @@ class OpenAICompatProvider {
       reader.releaseLock();
     }
   }
-  async doNonStreaming(messages, tools) {
+  async doNonStreaming(messages, tools, signal) {
     const body = {
       model: this.model,
       messages,
@@ -4698,7 +4701,8 @@ class OpenAICompatProvider {
       const response = await this.fetchWithRetry(`${this.config.baseUrl}/chat/completions`, {
         method: "POST",
         headers,
-        body: JSON.stringify(body)
+        body: JSON.stringify(body),
+        signal
       });
       if (!response.ok) {
         const errorText = await response.text();
@@ -4792,7 +4796,7 @@ class OpenAICompatProvider {
       if (attempt < maxRetries) {
         const delay = Math.min(baseDelay * Math.pow(2, attempt), maxDelay);
         const jitter = Math.random() * baseDelay * 0.1;
-        await this.sleep(delay + jitter);
+        await this.sleep(delay + jitter, init.signal ?? undefined);
       }
     }
     throw lastError ?? new Error(t("error.llm_retries"));
@@ -4800,8 +4804,23 @@ class OpenAICompatProvider {
   isRetryable(status) {
     return status === 429 || status >= 500;
   }
-  sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
+  sleep(ms, signal) {
+    return new Promise((resolve, reject) => {
+      if (signal?.aborted) {
+        reject(new DOMException("Aborted", "AbortError"));
+        return;
+      }
+      let timer;
+      const onAbort = () => {
+        clearTimeout(timer);
+        reject(new DOMException("Aborted", "AbortError"));
+      };
+      timer = setTimeout(() => {
+        signal?.removeEventListener("abort", onAbort);
+        resolve();
+      }, ms);
+      signal?.addEventListener("abort", onAbort, { once: true });
+    });
   }
 }
 var init_openai_compat = __esm(() => {
@@ -5959,9 +5978,9 @@ function formatLine(line, maxNumWidth) {
   const num = line.type === "remove" ? line.oldNum : line.newNum;
   const numStr = num !== null ? String(num).padStart(maxNumWidth) : " ".repeat(maxNumWidth);
   if (line.type === "remove") {
-    return pc.red(`${pc.bgRed(`${numStr} - ${line.content}`)}`);
+    return `${numStr} ${pc.red("-")} ${line.content}`;
   } else if (line.type === "add") {
-    return pc.green(`${pc.bgGreen(`${numStr} + ${line.content}`)}`);
+    return `${numStr} ${pc.green("+")} ${line.content}`;
   } else if (line.content === "...") {
     return pc.dim(`  ${" ".repeat(maxNumWidth)}...`);
   } else {
@@ -6000,7 +6019,7 @@ function generateNewFileDiff(content) {
   const diffLines = [];
   for (let i = 0;i < lines.length; i++) {
     const numStr = String(i + 1).padStart(maxNumWidth);
-    diffLines.push(pc.green(`${pc.bgGreen(`${numStr} + ${lines[i]}`)}`));
+    diffLines.push(`${numStr} ${pc.green("+")} ${lines[i]}`);
   }
   if (diffLines.length > MAX_DIFF_LINES) {
     const truncated = diffLines.slice(0, MAX_DIFF_LINES);
@@ -6018,7 +6037,7 @@ function generateDeleteDiff(content) {
   const diffLines = [];
   for (let i = 0;i < lines.length; i++) {
     const numStr = String(i + 1).padStart(maxNumWidth);
-    diffLines.push(pc.red(`${pc.bgRed(`${numStr} - ${lines[i]}`)}`));
+    diffLines.push(`${numStr} ${pc.red("-")} ${lines[i]}`);
   }
   if (diffLines.length > MAX_DIFF_LINES) {
     const truncated = diffLines.slice(0, MAX_DIFF_LINES);
@@ -9547,6 +9566,18 @@ var init_store = __esm(() => {
 
 // src/core/agent.ts
 import { join as join10 } from "path";
+function isToolCallJson(text) {
+  const trimmed = text.trim();
+  if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+    try {
+      JSON.parse(trimmed);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  return false;
+}
 
 class Agent {
   deps;
@@ -9734,7 +9765,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       const textChunks = [];
       this.emitPhase(iteration, "thinking", onPhase);
       try {
-        for await (const chunk of llmProvider.chat(history, allTools)) {
+        for await (const chunk of llmProvider.chat(history, allTools, this.abortController?.signal)) {
           if (this.shutdownRequested)
             break;
           if (chunk.type === "text" && chunk.content) {
@@ -9776,6 +9807,10 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
           }
         }
       } catch (err) {
+        if (this.shutdownRequested || err?.name === "AbortError") {
+          logger.info("LLM call aborted (interrupt)");
+          break;
+        }
         logger.error(`LLM call failed: ${err.message}`);
         slog.logError(err.message);
         pluginManager.runOnError({ iteration, logger }, err);
@@ -9788,7 +9823,12 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       } finally {
         this.emitPhase(iteration, "done", onPhase);
       }
-      if (!sawToolCall && textChunks.length > 0) {
+      if (this.shutdownRequested) {
+        break;
+      }
+      const toolComments = this.deps.config.ui?.toolComments ?? true;
+      const showText = textChunks.length > 0 && (!sawToolCall || toolComments && !isToolCallJson(textContent));
+      if (showText) {
         for (const chunk of textChunks) {
           const textOut = pluginManager.runOnText({ iteration, logger }, chunk);
           onChunk?.(textOut);
@@ -16821,6 +16861,10 @@ function box(lines, opts = {}) {
   out.push(pc.dim(`└${"─".repeat(width - 2)}┘`));
   return out;
 }
+function divider(width) {
+  const w = Math.min(width ?? getTerminalWidth(), 60);
+  return pc.dim("─".repeat(w));
+}
 var init_box = __esm(() => {
   init_string_width();
   init_colors();
@@ -26563,6 +26607,28 @@ init_spinner();
 init_box();
 init_table();
 init_i18n();
+var GUTTER = "  ";
+function toolMarker(tool) {
+  switch (tool) {
+    case "write_file":
+    case "edit_file":
+    case "create_dir":
+    case "move_file":
+    case "delete_file":
+      return "←";
+    case "read_file":
+    case "list_dir":
+    case "file_info":
+      return "→";
+    case "glob":
+    case "grep":
+      return "✱";
+    case "bash":
+      return "$";
+    default:
+      return "⚙";
+  }
+}
 function isRichTerminal() {
   return Boolean(process.stdout.isTTY) && !process.env.CI;
 }
@@ -26592,12 +26658,14 @@ class Renderer {
   out;
   err;
   width;
+  toolStyle;
   card = null;
   constructor(opts = {}) {
     this.rich = opts.rich ?? isRichTerminal();
     this.out = opts.out ?? process.stdout;
     this.err = opts.err ?? process.stderr;
     this.width = opts.width ?? getTerminalWidth();
+    this.toolStyle = opts.toolStyle ?? "inline";
     this.spinner = new Spinner({
       enabled: this.rich && (opts.spinner ?? true),
       stream: this.err,
@@ -26614,11 +26682,24 @@ class Renderer {
   meta(chunk) {
     this.spinner.stop();
     if (this.card) {
-      this.card.body.push(chunk);
+      if (this.toolStyle === "inline") {
+        this.writeInlineBody(chunk);
+      } else {
+        this.card.body.push(chunk);
+      }
     } else {
       this.out.write(chunk);
     }
   }
+  writeInlineBody(chunk) {
+    for (const line of chunk.split(`
+`)) {
+      if (line.trim() === "")
+        continue;
+      this.out.write(`${GUTTER}${line}
+`);
+    }
+  }
   reasoning(chunk) {
     this.spinner.stop();
     this.out.write(pc.dim(chunk));
@@ -26640,6 +26721,13 @@ ${pc.dim("⚙")} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}
       return;
     }
     this.card = { tool, args, body: [], start: Date.now() };
+    if (this.toolStyle === "inline") {
+      const marker = toolMarker(tool);
+      this.out.write(`
+${pc.dim(marker)} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}
+`);
+      return;
+    }
     this.spinner.start(`${pc.dim("⚙")} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}`);
   }
   toolEnd(_tool, duration, error, ctxDelta) {
@@ -26655,6 +26743,20 @@ ${pc.dim("⚙")} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}
     if (!this.card)
       return;
     const { tool, args, body } = this.card;
+    const marker = error ? pc.red("✗") : pc.green("✓");
+    let footer = `${marker} ${pc.dim(`${duration}ms`)}`;
+    if (ctxDelta !== undefined && ctxDelta !== 0) {
+      const deltaStr = ctxDelta > 0 ? pc.green(`+${ctxDelta}`) : pc.yellow(`${ctxDelta} ↓`);
+      footer += `  ${pc.dim("ctx")} ${deltaStr}`;
+    }
+    if (this.toolStyle === "inline") {
+      this.out.write(`${GUTTER}${footer}
+`);
+      this.out.write(`${divider(this.width)}
+`);
+      this.card = null;
+      return;
+    }
     const lines = [];
     const summary = summarizeArgs2(args);
     if (summary)
@@ -26666,12 +26768,6 @@ ${pc.dim("⚙")} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}
           lines.push(line);
       }
     }
-    const marker = error ? pc.red("✗") : pc.green("✓");
-    let footer = `${marker} ${pc.dim(`${duration}ms`)}`;
-    if (ctxDelta !== undefined && ctxDelta !== 0) {
-      const deltaStr = ctxDelta > 0 ? pc.green(`+${ctxDelta}`) : pc.yellow(`${ctxDelta} ↓`);
-      footer += `  ${pc.dim("ctx")} ${deltaStr}`;
-    }
     lines.push(footer);
     const title = `${marker} ${friendlyTool(tool)}`;
     for (const line of box(lines, { title, width: this.width })) {
@@ -26894,18 +26990,20 @@ class Repl {
       readline2.emitKeypressEvents(process.stdin);
       process.stdin.on("keypress", async (str, key) => {
         if (key.name === "escape") {
+          const escBytes = key.sequence ? (key.sequence.match(/\x1b/g) || []).length : 1;
           const now = Date.now();
-          if (now - this.lastEscTime < this.doubleEscDelay) {
+          const withinWindow = now - this.lastEscTime < this.doubleEscDelay;
+          this.lastEscTime = now;
+          if (escBytes >= 2 || withinWindow) {
+            this.lastEscTime = 0;
             if (this.agentRunning) {
               process.stdout.write(pc.yellow(`
 ${t("repl.interrupt")}
 `));
               this.agent.shutdown();
             }
-            this.lastEscTime = 0;
-            return;
           }
-          this.lastEscTime = now;
+          return;
         }
         if (key.ctrl && key.name === "v" && !this.agentRunning) {
           try {
@@ -26918,6 +27016,10 @@ ${t("repl.interrupt")}
               console.log(pc.green(`
 ${t("image.attached", { source: "clipboard", size: `${sizeKb} KB` })}`));
               this.rl.prompt();
+            } else {
+              console.log(pc.yellow(`
+${t("image.clipboard_empty")}`));
+              this.rl.prompt();
             }
           } catch {}
         }
@@ -26962,7 +27064,8 @@ ${t("image.attached", { source: "clipboard", size: `${sizeKb} KB` })}`));
       process.stdout.write(`
 ` + pc.green(t("repl.agent")));
       const renderer = new Renderer({
-        spinner: this.config.ui?.spinner ?? true
+        spinner: this.config.ui?.spinner ?? true,
+        toolStyle: this.config.ui?.toolStyle ?? "inline"
       });
       const result = await this.agent.run(input, (c) => renderer.text(c), (m) => renderer.meta(m), (ev) => {
         if (ev.type === "start") {
@@ -27179,7 +27282,10 @@ async function main() {
 `);
       process.exit(result2.success ? 0 : 1);
     }
-    const renderer = new Renderer({ spinner: config.ui?.spinner ?? true });
+    const renderer = new Renderer({
+      spinner: config.ui?.spinner ?? true,
+      toolStyle: config.ui?.toolStyle ?? "inline"
+    });
     const result = await agent.run(prompt, (chunk) => renderer.text(chunk), (meta) => renderer.meta(meta), (ev) => {
       if (ev.type === "start") {
         renderer.toolStart(ev.tool, ev.args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "micro-models-agent",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "Micro Models Agent (MMA) — LLM agent harness for small models (Qwen3.5-9B, 32K-64K context)",
   "type": "module",
   "bin": {