micro-models-agent 0.24.1 → 0.24.2

package/dist/main.js

@@ -2306,6 +2306,7 @@ var init_en = __esm(() => {
     "tool.memory_error": "Memory error: {error}",
     "tool.screenshot_unavailable": "[Screenshot captured — image not available for text-only model]",
     "tool.timeout": "Tool {name} timed out after {seconds} seconds",
+    "tool.aborted": "Tool {name} was interrupted by user",
     "tool.interactive_disabled": "Interactive tool is disabled in exit-on-complete mode. Proceed without asking the user.",
     "proc.started": `Started background process {id} (PID {pid}).
 Command: {command}`,
@@ -2850,6 +2851,7 @@ var init_ru = __esm(() => {
     "tool.memory_error": "Ошибка памяти: {error}",
     "tool.screenshot_unavailable": "[Скриншот сделан — изображение недоступно для текстовой модели]",
     "tool.timeout": "Инструмент {name} превысил таймаут ({seconds} сек)",
+    "tool.aborted": "Инструмент {name} прерван пользователем",
     "tool.interactive_disabled": "Интерактивный инструмент отключён в режиме exit-on-complete. Продолжай без вопроса пользователю.",
     "proc.started": `Фоновый процесс запущен: {id} (PID {pid}).
 Команда: {command}`,
@@ -4291,6 +4293,11 @@ function getMessageText(content) {
 }
 
 // src/llm/token-counter.ts
+var exports_token_counter = {};
+__export(exports_token_counter, {
+  TokenCounter: () => TokenCounter
+});
+
 class TokenCounter {
   encoder;
   constructor(model = "gpt-4o") {
@@ -4957,7 +4964,7 @@ class ToolExecutor {
     this.ctx = ctx;
     this.pluginManager = pluginManager;
   }
-  async execute(call) {
+  async execute(call, signal) {
     const tool = this.registry.get(call.name);
     if (!tool) {
       return {
@@ -4999,10 +5006,25 @@ class ToolExecutor {
             })));
           }, TOOL_EXECUTION_TIMEOUT_MS);
         });
-        result = await Promise.race([
+        const racePromises = [
           tool.handler(this.ctx, call.arguments),
           timeoutPromise
-        ]);
+        ];
+        if (signal) {
+          const abortPromise = new Promise((_, reject) => {
+            const onAbort = () => {
+              killByCallId(call.id);
+              reject(new Error(t("tool.aborted", { name: call.name })));
+            };
+            if (signal.aborted) {
+              onAbort();
+            } else {
+              signal.addEventListener("abort", onAbort, { once: true });
+            }
+          });
+          racePromises.push(abortPromise);
+        }
+        result = await Promise.race(racePromises);
       }
       result.toolCallId = call.id;
     } catch (e) {
@@ -5033,6 +5055,9 @@ class ToolExecutor {
   setScope(scope) {
     this.ctx.scope = scope;
   }
+  updateProvider(provider) {
+    this.ctx.llmProvider = provider;
+  }
 }
 var TOOL_EXECUTION_TIMEOUT_MS = 60000;
 var init_executor = __esm(() => {
@@ -9040,6 +9065,7 @@ class Agent {
   deps;
   systemPromptAdded = false;
   shutdownRequested = false;
+  abortController = null;
   constructor(deps) {
     this.deps = deps;
   }
@@ -9155,6 +9181,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       baseDir
     } = this.deps;
     const slog = new SessionLogger(sessionManager);
+    this.abortController = new AbortController;
     let iteration = 0;
     let lastText = "";
     let hallucinationRetries = 0;
@@ -9168,6 +9195,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
     const MAX_AUDIT_RETRIES = 3;
     while (iteration < config.maxToolIterations && !this.shutdownRequested) {
       iteration++;
+      contextManager.noteIteration();
       pluginManager.runOnBeforeThink({
         iteration,
         logger,
@@ -9200,6 +9228,8 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       this.emitPhase(iteration, "thinking", onPhase);
       try {
         for await (const chunk of llmProvider.chat(history, allTools)) {
+          if (this.shutdownRequested)
+            break;
           if (chunk.type === "text" && chunk.content) {
             if (emittedReasoning && !textContent) {
               onMeta?.(`
@@ -9303,7 +9333,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
           onTool?.({ type: "start", tool: call.name, args: call.arguments });
           slog.logToolCall(call, iteration);
           const tokensBeforeTool = contextManager.getEstimatedTokens();
-          const result = await toolExecutor.execute(call);
+          const result = await toolExecutor.execute(call, this.abortController?.signal);
           const duration = Date.now() - startTime;
           if (!result.success)
             anyToolFailed = true;
@@ -9322,15 +9352,6 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
 ` + result.diff + `
 `);
           }
-          const tokensAfterTool = contextManager.getEstimatedTokens();
-          onTool?.({
-            type: "end",
-            tool: call.name,
-            args: call.arguments,
-            duration,
-            error: !result.success,
-            ctxDelta: tokensAfterTool - tokensBeforeTool
-          });
           const currentTokens2 = contextManager.getEstimatedTokens();
           const budget3 = contextManager.getBudget();
           const truncatedOutput = this.truncateToolOutput(result.output, budget3, currentTokens2);
@@ -9342,6 +9363,15 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
             success: result.success,
             arguments: call.arguments
           });
+          const tokensAfterTool = contextManager.getEstimatedTokens();
+          onTool?.({
+            type: "end",
+            tool: call.name,
+            args: call.arguments,
+            duration,
+            error: !result.success,
+            ctxDelta: tokensAfterTool - tokensBeforeTool
+          });
           summaries.push(`[Tool: ${call.name} (${JSON.stringify(call.arguments)}) → ${truncatedOutput.slice(0, 200)}]`);
           if (config.session.autoSave) {
             slog.logToolResult(call, result, duration, iteration);
@@ -9512,6 +9542,23 @@ ${taskReminder}</system-summary>`
     this.deps.contextManager.clear();
     this.systemPromptAdded = false;
   }
+  async reconfigure(config) {
+    const { OpenAICompatProvider: OpenAICompatProvider2 } = await Promise.resolve().then(() => (init_openai_compat(), exports_openai_compat));
+    const { TokenCounter: TokenCounter2 } = await Promise.resolve().then(() => (init_token_counter(), exports_token_counter));
+    const newProvider = new OpenAICompatProvider2({
+      model: config.model,
+      baseUrl: config.provider.baseUrl,
+      apiKey: config.provider.apiKey,
+      contextWindow: config.contextWindow,
+      retry: config.retry,
+      rateLimits: config.security?.rateLimits
+    });
+    this.deps.llmProvider = newProvider;
+    this.deps.toolExecutor.updateProvider(newProvider);
+    const newTokenCounter = new TokenCounter2(config.model);
+    this.deps.contextManager.resize(config.contextWindow, config.contextBudget, newTokenCounter);
+    this.deps.config = config;
+  }
   setContext(messages) {
     const { contextManager } = this.deps;
     contextManager.clear();
@@ -9530,6 +9577,7 @@ ${taskReminder}</system-summary>`
   }
   shutdown() {
     this.shutdownRequested = true;
+    this.abortController?.abort();
     const { pluginManager, logger, sessionManager, contextManager } = this.deps;
     contextManager.onCompact = null;
     const killed = processRegistry.killAll();
@@ -9635,10 +9683,18 @@ class ContextManager {
   getIterationsSinceCompaction() {
     return this.iterationsSinceCompaction;
   }
+  noteIteration() {
+    this.iterationsSinceCompaction++;
+  }
   getQuality() {
-    const freshness = 1 - this.iterationsSinceCompaction / COMPACTION_INTERVAL;
-    const depth = 1 / (1 + this.compactionCount);
-    return Math.round(freshness * depth * 100);
+    const usedTokens = this.getEstimatedTokens();
+    const tokenLoad = Math.max(0, 1 - usedTokens / this.budget.history);
+    const compactionLoss = Math.max(0, 1 - this.compactionCount * 0.15);
+    const msgCount = this.messages.length || 1;
+    const errorDensity = Math.max(0, 1 - Math.min(1, this.errorFacts.length / msgCount));
+    const freshness = Math.max(0, 1 - this.iterationsSinceCompaction / COMPACTION_INTERVAL);
+    const score = tokenLoad * 0.4 + compactionLoss * 0.25 + errorDensity * 0.2 + freshness * 0.15;
+    return Math.round(Math.min(100, Math.max(0, score * 100)));
   }
   addMessage(msg) {
     if (msg.role === "user" && this.pendingImageParts.length > 0) {
@@ -9653,7 +9709,6 @@ class ContextManager {
       this.pendingImageParts = [];
     }
     this.messages.push(msg);
-    this.iterationsSinceCompaction++;
     const tokens = this.getEstimatedTokens();
     if (tokens > this.peakTokens)
       this.peakTokens = tokens;
@@ -9820,6 +9875,13 @@ ${lines.join(`
   getEstimatedTokens() {
     return this.messages.reduce((sum, m) => sum + this.estimateMessageTokens(m), 0);
   }
+  resize(contextWindow, contextBudget, tokenCounter) {
+    this.contextWindow = contextWindow;
+    this.budget = this.calculateBudget(contextWindow, contextBudget);
+    if (tokenCounter !== undefined) {
+      this.tokenCounter = tokenCounter ?? null;
+    }
+  }
 }
 var COMPACTION_INTERVAL = 15, KEEP_LAST_N = 6;
 var init_manager = () => {};
@@ -10354,7 +10416,10 @@ var init_web_search = __esm(() => {
       type: "object",
       properties: {
         query: { type: "string", description: "Search query" },
-        numResults: { type: "number", description: "Number of results (default 5)" }
+        numResults: {
+          type: "number",
+          description: "Number of results (default 5)"
+        }
       },
       required: ["query"]
     },
@@ -10372,27 +10437,41 @@ var init_web_search = __esm(() => {
         };
       }
       try {
-        const response = await fetch(url, { signal: AbortSignal.timeout(securityConfig?.requestTimeout || 1e4) });
+        const response = await fetch(url, {
+          signal: AbortSignal.timeout(securityConfig?.requestTimeout || 1e4)
+        });
         const html = await response.text();
         const results = [];
-        const snippetRegex = /<a[^>]+class="result__a"[^>]*>([\s\S]*?)<\/a>[\s\S]*?<a[^>]+class="result__snippet"[^>]*>([\s\S]*?)<\/a>/gi;
+        const snippetRegex = /<a[^>]+class="result__a"[^>]*href="([^"]*)"[^>]*>([\s\S]*?)<\/a>[\s\S]*?<a[^>]+class="result__snippet"[^>]*>([\s\S]*?)<\/a>/gi;
         let match;
         let count = 0;
         while ((match = snippetRegex.exec(html)) !== null && count < numResults) {
-          const title = match[1].replace(/<[^>]+>/g, "").trim();
-          const snippet = match[2].replace(/<[^>]+>/g, "").trim();
-          results.push(`${title}: ${snippet}`);
+          const href = match[1].trim();
+          const title = match[2].replace(/<[^>]+>/g, "").trim();
+          const snippet = match[3].replace(/<[^>]+>/g, "").trim();
+          results.push(`${count + 1}. ${title}
+   URL: ${href}
+   ${snippet}`);
           count++;
         }
         logNetworkRequest(ctx.sessionId, sanitizeUrl(url), true, `Results: ${results.length}`);
         if (results.length === 0) {
           return { success: true, output: t("tool.no_results", { query }) };
         }
-        return { success: true, output: t("tool.search_results", { query, results: results.join(`
-`) }) };
+        return {
+          success: true,
+          output: t("tool.search_results", {
+            query,
+            results: results.join(`
+`)
+          })
+        };
       } catch (err) {
         logNetworkRequest(ctx.sessionId, sanitizeUrl(url), false, `Error: ${err.message}`);
-        return { success: false, output: t("error.search_failed", { message: err.message }) };
+        return {
+          success: false,
+          output: t("error.search_failed", { message: err.message })
+        };
       }
     }
   };
@@ -24150,6 +24229,7 @@ function registerMmaCommands(ctx) {
         ctx.config.maxToolIterations = answers.maxToolIterations;
         ctx.config.locale = answers.locale;
         saveConfig(ctx.config, configPath);
+        await ctx.agent.reconfigure(ctx.config);
         console.log(pc.green(t("cli.config_saved")));
       });
     }
@@ -24180,7 +24260,7 @@ Excluded blocks: ${info.excluded.length}`));
     name: "provider",
     description: t("repl.provider_list"),
     usage: t("repl.provider_usage"),
-    action: (args) => {
+    action: async (args) => {
       const subcmd = args[0];
       if (!subcmd || subcmd === "list") {
         console.log(`${t("repl.provider_current")}  ${ctx.config.provider.type}`);
@@ -24196,6 +24276,7 @@ Excluded blocks: ${info.excluded.length}`));
         ctx.config.provider.type = name;
         const configPath = join35(homedir16(), ".mma", "config.json");
         saveConfig(ctx.config, configPath);
+        await ctx.agent.reconfigure(ctx.config);
         console.log(pc.green(t("repl.provider_set", { name })));
         return;
       }
@@ -24251,6 +24332,7 @@ Excluded blocks: ${info.excluded.length}`));
         ctx.config.model = name;
         const configPath = join35(homedir16(), ".mma", "config.json");
         saveConfig(ctx.config, configPath);
+        await ctx.agent.reconfigure(ctx.config);
         console.log(pc.green(t("repl.model_set", { name })));
         return;
       }
@@ -24261,7 +24343,7 @@ Excluded blocks: ${info.excluded.length}`));
     name: "context",
     description: t("cli.manage_context"),
     usage: "/context <size>",
-    action: (args) => {
+    action: async (args) => {
       if (args.length === 0) {
         console.log(`/context ${t("repl.context")}  ${ctx.config.contextWindow}`);
         console.log(`Usage: /context <size>  (min 1024)`);
@@ -24275,6 +24357,7 @@ Excluded blocks: ${info.excluded.length}`));
       ctx.config.contextWindow = size;
       const configPath = join35(homedir16(), ".mma", "config.json");
       saveConfig(ctx.config, configPath);
+      await ctx.agent.reconfigure(ctx.config);
       console.log(pc.green(t("cli.context_set", { size })));
     }
   });

package/package.json

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