micro-models-agent 0.36.1 → 0.36.2

package/dist/main.js

@@ -7909,6 +7909,12 @@ var init_process_kill = __esm(() => {
 });
 
 // src/core/prompt-builder.ts
+function blockLabel(content) {
+  const firstLine = content.split(`
+`)[0].trim();
+  return firstLine.length > 70 ? firstLine.slice(0, 67) + "..." : firstLine;
+}
+
 class PromptBuilder {
   blocks = [];
   budget;
@@ -7937,24 +7943,41 @@ class PromptBuilder {
     let usedTokens = 0;
     const included = [];
     const excluded = [];
+    const blocks = [];
     for (const block of essential) {
       included.push(block.content);
       usedTokens += block.estimatedTokens;
+      blocks.push({
+        label: blockLabel(block.content),
+        priority: block.priority,
+        essential: true,
+        tokens: block.estimatedTokens,
+        included: true
+      });
     }
     for (const block of nonEssential) {
       const tokens = block.estimatedTokens;
-      if (usedTokens + tokens <= this.budget) {
+      const fits = usedTokens + tokens <= this.budget;
+      if (fits) {
         included.push(block.content);
         usedTokens += tokens;
       } else {
         excluded.push(block.content);
       }
+      blocks.push({
+        label: blockLabel(block.content),
+        priority: block.priority,
+        essential: false,
+        tokens,
+        included: fits
+      });
     }
     return {
       prompt: included.join(`
 
 `),
-      excluded
+      excluded,
+      blocks
     };
   }
 }
@@ -8078,14 +8101,54 @@ class SessionLogger {
       iteration
     });
   }
-  logCompaction(content, iteration, contextTokens, contextLimit) {
+  logCompaction(info) {
     this.session?.appendLog({
       ts: new Date().toISOString(),
       type: "compaction",
-      content,
+      content: `${info.reason}, iteration ${info.iteration}`,
+      iteration: info.iteration,
+      reason: info.reason,
+      tokensBefore: info.tokensBefore,
+      tokensAfter: info.tokensAfter,
+      qualityBefore: info.qualityBefore,
+      qualityAfter: info.qualityAfter,
+      messagesBefore: info.messagesBefore,
+      messagesAfter: info.messagesAfter,
+      removedTurns: info.removedTurns,
+      keptTurns: info.keptTurns,
+      summary: info.summary
+    });
+  }
+  logContext(info) {
+    this.session?.appendLog({
+      ts: new Date().toISOString(),
+      type: "context",
+      content: info.kind === "start" ? "context snapshot at session start" : `context at iteration ${info.iteration}`,
+      iteration: info.iteration,
+      window: info.window,
+      systemBudget: info.systemBudget,
+      reserveBudget: info.reserveBudget,
+      historyBudget: info.historyBudget,
+      systemTokens: info.systemTokens,
+      toolTokens: info.toolTokens,
+      contextTokens: info.tokens,
+      quality: info.quality,
+      messageCount: info.messageCount,
+      compactionCount: info.compactionCount,
+      iterationsSinceCompaction: info.iterationsSinceCompaction,
+      blocks: info.blocks
+    });
+  }
+  logLlmUsage(iteration, usage) {
+    this.session?.appendLog({
+      ts: new Date().toISOString(),
+      type: "llm_usage",
       iteration,
-      ...contextTokens !== undefined ? { contextTokens } : {},
-      ...contextLimit !== undefined ? { contextLimit } : {}
+      promptTokens: usage.promptTokens,
+      completionTokens: usage.completionTokens,
+      totalTokens: usage.totalTokens,
+      source: usage.source,
+      durationMs: usage.durationMs
     });
   }
   logError(message) {
@@ -10384,7 +10447,36 @@ class Agent {
     if (pluginBlocks.length > 0) {
       builder.addBlocks(pluginBlocks);
     }
-    return builder.build();
+    const result = builder.build();
+    return {
+      prompt: result.prompt,
+      excluded: result.excluded,
+      blocks: result.blocks
+    };
+  }
+  logContextStat(kind, iteration, slog, blocks) {
+    const cm = this.deps.contextManager;
+    if (typeof cm.getSnapshot !== "function")
+      return;
+    const snap = cm.getSnapshot();
+    const history = cm.getActiveHistory();
+    const systemMsg = history.find((m) => m.role === "system");
+    slog.logContext({
+      kind,
+      iteration,
+      window: snap.window,
+      systemBudget: snap.budget.systemPrompt,
+      reserveBudget: snap.budget.responseReserve,
+      historyBudget: snap.budget.history,
+      systemTokens: kind === "start" && systemMsg && typeof systemMsg.content === "string" ? this.deps.llmProvider.countTokens(systemMsg.content) : undefined,
+      toolTokens: snap.toolTokens,
+      tokens: snap.tokens,
+      quality: snap.quality,
+      messageCount: snap.messageCount,
+      compactionCount: snap.compactionCount,
+      iterationsSinceCompaction: snap.iterationsSinceCompaction,
+      blocks
+    });
   }
   getSystemPromptInfo() {
     const { prompt, excluded } = this.buildSystemPrompt();
@@ -10544,27 +10636,47 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
         }
       });
       if (contextManager.needsCompaction()) {
-        contextManager.compact();
-        logger.debug("Context compacted");
-        slog.logCompaction(`regular compaction, iteration ${iteration}`, iteration);
+        const result = contextManager.compact();
+        if (result) {
+          logger.debug("Context compacted");
+          slog.logCompaction({ reason: "interval", iteration, ...result });
+        }
       }
       const currentTokens = contextManager.getEstimatedTokens();
       const budget2 = contextManager.getBudget();
       const quality = contextManager.getQuality();
       if (quality < QUALITY_TRIGGER_THRESHOLD && contextManager.getCompactionCount() > 0 && iteration - lastForcedCompactionIteration >= FORCED_COMPACTION_COOLDOWN) {
         lastForcedCompactionIteration = iteration;
-        contextManager.compact();
+        const result = contextManager.compact();
         logger.warn(`Low context quality (${quality}%) — forced compaction`);
-        slog.logCompaction(`quality-triggered compaction (${quality}% < ${QUALITY_TRIGGER_THRESHOLD}%), iteration ${iteration}`, iteration, currentTokens, budget2.history);
+        if (result) {
+          slog.logCompaction({
+            reason: `quality-triggered (${quality}% < ${QUALITY_TRIGGER_THRESHOLD}%)`,
+            iteration,
+            ...result
+          });
+        }
       }
       if (currentTokens > budget2.history) {
-        contextManager.compact();
+        const result = contextManager.compact();
         logger.warn(`Context overflow (${currentTokens} > ${budget2.history}), forced compaction`);
-        slog.logCompaction(`forced compaction (${currentTokens} > ${budget2.history}), iteration ${iteration}`, iteration, currentTokens, budget2.history);
+        if (result) {
+          slog.logCompaction({
+            reason: `overflow (${currentTokens} > ${budget2.history})`,
+            iteration,
+            ...result
+          });
+        }
       }
       this.refreshSystemPrompt();
       const history = contextManager.getActiveHistory();
       slog.logToolDefs(allToolsForBudget.length, allToolsForBudget.map((t2) => t2.name), iteration);
+      if (iteration === 1) {
+        const { blocks } = this.buildSystemPrompt();
+        this.logContextStat("start", iteration, slog, blocks);
+      } else {
+        this.logContextStat("iteration", iteration, slog);
+      }
       let textContent = "";
       let reasoningContent = "";
       const toolCalls = [];
@@ -10573,6 +10685,8 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       const textChunks = [];
       this.emitPhase(iteration, "thinking", onPhase);
       const llmStart = Date.now();
+      const promptBefore = apiPromptTokens;
+      const completionBefore = apiCompletionTokens;
       logger.logLLMRequest(config.model, history.length, input, "agent");
       try {
         for await (const chunk of llmProvider.chat(history, allToolsForBudget, this.abortController?.signal)) {
@@ -10636,6 +10750,20 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       }
       apiCompletionChars += (textContent || reasoningContent).length;
       logger.logLLMResponse(config.model, (textContent || reasoningContent).length, Date.now() - llmStart, undefined, "agent");
+      {
+        const usagePrompt = apiPromptTokens - promptBefore;
+        const usageCompletion = apiCompletionTokens - completionBefore;
+        const source = usagePrompt > 0 || usageCompletion > 0 ? "api" : "estimate";
+        const prompt = source === "api" ? usagePrompt : contextManager.getEstimatedTokens();
+        const completion = source === "api" ? usageCompletion : Math.ceil((textContent || reasoningContent).length / 4);
+        slog.logLlmUsage(iteration, {
+          promptTokens: prompt,
+          completionTokens: completion,
+          totalTokens: prompt + completion,
+          source,
+          durationMs: Date.now() - llmStart
+        });
+      }
       if (this.shutdownRequested) {
         break;
       }
@@ -10753,8 +10881,15 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
             slog.logToolResult(call, result, duration, iteration);
           }
           if (contextManager.needsCompaction()) {
-            contextManager.compact();
-            logger.debug("Context compacted after tool result");
+            const result2 = contextManager.compact();
+            if (result2) {
+              logger.debug("Context compacted after tool result");
+              slog.logCompaction({
+                reason: "after_tool",
+                iteration,
+                ...result2
+              });
+            }
           }
           if (!result.success) {
             const key = call.name;
@@ -11362,9 +11497,12 @@ class ContextManager {
     return totalTokens > this.budget.history * this.compactionThreshold;
   }
   compact() {
+    const tokensBefore = this.getEstimatedTokens();
+    const qualityBefore = this.getQuality();
+    const messagesBefore = this.messages.length;
     this.iterationsSinceCompaction = 0;
     if (this.messages.length <= KEEP_LAST_N * 2)
-      return;
+      return null;
     this.compactionCount++;
     const cutoff = this.messages.length - KEEP_LAST_N * 2;
     const oldTurns = this.messages.slice(0, cutoff);
@@ -11418,6 +11556,29 @@ ${lines.join(`
     if (this.onCompact) {
       this.onCompact(summary);
     }
+    return {
+      removedTurns: oldTurns.length,
+      keptTurns: freshRecent.length,
+      tokensBefore,
+      tokensAfter: this.getEstimatedTokens(),
+      qualityBefore,
+      qualityAfter: this.getQuality(),
+      messagesBefore,
+      messagesAfter: this.messages.length,
+      summary: this.compactedBlock ?? ""
+    };
+  }
+  getSnapshot() {
+    return {
+      window: this.contextWindow,
+      budget: { ...this.budget },
+      tokens: this.getEstimatedTokens(),
+      toolTokens: this.toolTokens,
+      messageCount: this.messages.length,
+      quality: this.getQuality(),
+      compactionCount: this.compactionCount,
+      iterationsSinceCompaction: this.iterationsSinceCompaction
+    };
   }
   updateSystemPrompt(content) {
     const idx = this.messages.findIndex((m) => m.role === "system");
@@ -31602,6 +31763,17 @@ import { fileURLToPath as fileURLToPath6 } from "url";
 // src/modules/updater/checker.ts
 init_command();
 import { platform as platform9 } from "os";
+function semverGt(a, b) {
+  const pa = a.replace(/^v/, "").split(/[.-]/).map((p) => Number.parseInt(p, 10) || 0);
+  const pb = b.replace(/^v/, "").split(/[.-]/).map((p) => Number.parseInt(p, 10) || 0);
+  for (let i = 0;i < 3; i++) {
+    const na = pa[i] ?? 0;
+    const nb = pb[i] ?? 0;
+    if (na !== nb)
+      return na > nb;
+  }
+  return false;
+}
 var defaultRunner2 = async (command, args, options) => {
   const { execFile } = await import("child_process");
   return new Promise((resolve24) => {
@@ -31638,7 +31810,7 @@ class Updater {
       if (!latest) {
         return { updateAvailable: false, current: this.currentVersion, error: "No latest tag" };
       }
-      const updateAvailable = latest !== this.currentVersion;
+      const updateAvailable = semverGt(latest, this.currentVersion);
       return { updateAvailable, current: this.currentVersion, latest };
     } catch (e) {
       return { updateAvailable: false, current: this.currentVersion, error: e.message };
@@ -31680,6 +31852,7 @@ class UpdaterModule {
   logger;
   started = false;
   timer = null;
+  idlePromise = null;
   installEnabled = true;
   constructor(config, currentVersion, packageName, logger, installRunner) {
     this.config = config;
@@ -31703,7 +31876,7 @@ class UpdaterModule {
     if (this.started || !this.config.enabled)
       return;
     this.started = true;
-    this.runLoop();
+    this.idlePromise = this.runLoop();
   }
   stop() {
     this.started = false;
@@ -31712,6 +31885,12 @@ class UpdaterModule {
       this.timer = null;
     }
   }
+  async waitForIdle(timeoutMs = 130000) {
+    const idle = this.idlePromise;
+    if (!idle)
+      return;
+    await Promise.race([idle, new Promise((r) => setTimeout(r, timeoutMs))]);
+  }
   async runLoop() {
     while (this.started) {
       await this.checkOnce();
@@ -31775,9 +31954,19 @@ function readVersion5() {
 }
 function startAutoUpdate(config) {
   try {
-    const module = new UpdaterModule(config.updater, readVersion5(), "micro-models-agent");
+    const module = new UpdaterModule(config.updater, readVersion5(), "micro-models-agent", {
+      info: (m) => process.stderr.write(pc2.dim(m) + `
+`),
+      warn: (m) => process.stderr.write(pc2.yellow(m) + `
+`),
+      error: (m) => process.stderr.write(pc2.red(m) + `
+`)
+    });
     module.start();
-  } catch {}
+    return module;
+  } catch {
+    return;
+  }
 }
 async function main() {
   const program2 = createProgram();
@@ -31795,7 +31984,7 @@ async function main() {
   if (program2.args.length > 0) {
     const prompt = program2.args.join(" ");
     const { agent, config } = await bootstrap(undefined, projectDir, noAgentsMd, exitOnComplete);
-    startAutoUpdate(config);
+    const updater = exitOnComplete ? undefined : startAutoUpdate(config);
     if (jsonMode) {
       const result2 = await agent.run(prompt);
       agent.shutdown();
@@ -31812,6 +32001,7 @@ async function main() {
       }, null, 2));
       process.stdout.write(`
 `);
+      await updater?.waitForIdle();
       process.exit(result2.success ? 0 : 1);
     }
     const renderer = new Renderer({
@@ -31834,6 +32024,7 @@ async function main() {
     renderer.flush();
     const exitCode = printRunResult(result, () => renderer.flush());
     agent.shutdown();
+    await updater?.waitForIdle();
     process.exit(exitCode);
   } else {
     const configPath = join45(homedir18(), ".mma", "config.json");

package/package.json

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