jinzd-ai-cli 0.4.64 → 0.4.66

package/dist/{chunk-JSAPO5GI.js → chunk-HOBLE365.js}

@@ -8,7 +8,7 @@ import {
   RateLimitError,
   schemaToJsonSchema,
   truncateForPersist
-} from "./chunk-YF3Z47AT.js";
+} from "./chunk-X5RX2VGQ.js";
 import {
   APP_NAME,
   CONFIG_DIR_NAME,
@@ -21,7 +21,7 @@ import {
   MCP_TOOL_PREFIX,
   PLUGINS_DIR_NAME,
   VERSION
-} from "./chunk-S6P5MYUF.js";
+} from "./chunk-NIJZBQ6I.js";
 
 // src/config/config-manager.ts
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";
@@ -3752,16 +3752,29 @@ function rebuildExtraMessages(provider, toolHistory) {
       let j = i + 1;
       while (j < toolHistory.length && toolHistory[j].role === "tool") {
         const tm = toolHistory[j];
+        if (!tm.toolCallId) {
+          console.warn(
+            `[rebuildExtraMessages] Skipping malformed tool message (missing toolCallId) at index ${j}; tool name="${toolCalls.find((_tc) => true)?.name ?? "unknown"}"`
+          );
+          j++;
+          continue;
+        }
         toolResults.push({
-          callId: tm.toolCallId ?? "",
+          callId: tm.toolCallId,
           content: typeof tm.content === "string" ? tm.content : getContentText(tm.content),
           isError: tm.isError ?? false
         });
         j++;
       }
-      result.push(
-        ...provider.buildToolResultMessages(toolCalls, toolResults, msg.reasoningContent)
-      );
+      if (toolResults.length > 0) {
+        result.push(
+          ...provider.buildToolResultMessages(toolCalls, toolResults, msg.reasoningContent)
+        );
+      } else {
+        console.warn(
+          `[rebuildExtraMessages] Dropping assistant turn with ${toolCalls.length} toolCalls but no valid tool results`
+        );
+      }
       i = j;
     } else {
       result.push({
@@ -3806,18 +3819,34 @@ function trimOldToolOutput(messages, keepRecentRounds = 10) {
   }
   return trimmed;
 }
+function cloneMessages(messages) {
+  return messages.map((m) => ({ ...m }));
+}
 function autoTrimSessionIfNeeded(session, sizeLimit = SESSION_SIZE_LIMIT) {
-  const json = JSON.stringify(session.toJSON());
-  if (json.length <= sizeLimit) return false;
+  const originalSize = JSON.stringify(session.toJSON()).length;
+  if (originalSize <= sizeLimit) return false;
+  const snapshotLen = session.messages.length;
+  let working = cloneMessages(session.messages.slice(0, snapshotLen));
+  let committedSize = originalSize;
+  let anyTrim = false;
   let keepRecent = 10;
   while (keepRecent >= 2) {
-    const trimmed = trimOldToolOutput(session.messages, keepRecent);
-    if (trimmed === 0) break;
+    const trimmedCount = trimOldToolOutput(working, keepRecent);
+    if (trimmedCount === 0) break;
+    anyTrim = true;
+    const originalMessages = session.messages;
+    session.messages = [...working, ...originalMessages.slice(snapshotLen)];
     const newSize = JSON.stringify(session.toJSON()).length;
-    if (newSize <= sizeLimit) return true;
+    session.messages = originalMessages;
+    committedSize = newSize;
+    if (newSize <= sizeLimit) break;
     keepRecent = Math.max(2, Math.floor(keepRecent / 2));
+    if (keepRecent < 2) break;
   }
-  return true;
+  if (!anyTrim) return false;
+  const appended = session.messages.slice(snapshotLen);
+  session.messages.splice(0, session.messages.length, ...working, ...appended);
+  return committedSize < originalSize;
 }
 
 // src/repl/dev-state.ts

package/dist/{chunk-S6P5MYUF.js → chunk-NIJZBQ6I.js}

@@ -8,7 +8,7 @@ import { platform } from "os";
 import chalk from "chalk";
 
 // src/core/constants.ts
-var VERSION = "0.4.64";
+var VERSION = "0.4.66";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";

package/dist/{chunk-NJEMUAJD.js → chunk-UIFW7G4A.js}

@@ -6,7 +6,7 @@ import { platform } from "os";
 import chalk from "chalk";
 
 // src/core/constants.ts
-var VERSION = "0.4.64";
+var VERSION = "0.4.66";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";

package/dist/{chunk-YF3Z47AT.js → chunk-X5RX2VGQ.js}

@@ -10,7 +10,7 @@ import {
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT,
   runTestsTool
-} from "./chunk-S6P5MYUF.js";
+} from "./chunk-NIJZBQ6I.js";
 
 // src/tools/builtin/bash.ts
 import { execSync } from "child_process";
@@ -1386,12 +1386,19 @@ var ToolExecutor = class {
     }
     const results = new Array(calls.length);
     const t0 = Date.now();
-    const parallelPhase = safeParallel.length > 0 ? Promise.all(safeParallel.map(async ({ idx, call }) => {
-      results[idx] = await this.execute(call);
-    })) : Promise.resolve();
+    const wrapExec = async (idx, call) => {
+      try {
+        results[idx] = await this.execute(call);
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        console.error(`[executor] Unexpected error in tool "${call.name}":`, err);
+        results[idx] = { callId: call.id, content: `Tool execution failed: ${msg}`, isError: true };
+      }
+    };
+    const parallelPhase = safeParallel.length > 0 ? Promise.all(safeParallel.map(({ idx, call }) => wrapExec(idx, call))) : Promise.resolve();
     const bashPhase = (async () => {
       for (const { idx, call } of safeBash) {
-        results[idx] = await this.execute(call);
+        await wrapExec(idx, call);
       }
     })();
     await Promise.all([parallelPhase, bashPhase]);

package/dist/{hub-KEBKTLLR.js → hub-JA7HH44N.js}

@@ -385,7 +385,7 @@ ${content}`);
   }
 }
 async function runTaskMode(config, providers, configManager, topic) {
-  const { TaskOrchestrator } = await import("./task-orchestrator-ZTMZIHNF.js");
+  const { TaskOrchestrator } = await import("./task-orchestrator-KOCFBDPK.js");
   const orchestrator = new TaskOrchestrator(config, providers, configManager);
   let interrupted = false;
   const onSigint = () => {

package/dist/index.js

@@ -31,7 +31,7 @@ import {
   saveDevState,
   sessionHasMeaningfulContent,
   setupProxy
-} from "./chunk-JSAPO5GI.js";
+} from "./chunk-HOBLE365.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -46,7 +46,7 @@ import {
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-YF3Z47AT.js";
+} from "./chunk-X5RX2VGQ.js";
 import {
   fileCheckpoints
 } from "./chunk-4BKXL7SM.js";
@@ -71,7 +71,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-S6P5MYUF.js";
+} from "./chunk-NIJZBQ6I.js";
 
 // src/index.ts
 import { program } from "commander";
@@ -2193,7 +2193,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-WNHU6QH3.js");
+          const { executeTests } = await import("./run-tests-47TTKJTB.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -3280,14 +3280,31 @@ var CostTracker = class {
       this.records = [];
     }
   }
-  /** Save to disk (atomic write). */
+  /**
+   * Save to disk (atomic write).
+   *
+   * H2: Snapshot records before writing and only clear the dirty flag after
+   * the write succeeds. If writeFileSync/renameSync throws, dirty remains
+   * true so the next save() retries — prevents silent data loss on transient
+   * disk errors. writeFileSync is sync in Node.js so there's no interleaving
+   * risk within a single save() call; the snapshot mainly protects against
+   * future refactors to async I/O.
+   */
   save() {
     if (!this.dirty) return;
-    const data = { version: 1, records: this.records };
-    const tmp = this.filePath + ".tmp";
-    writeFileSync2(tmp, JSON.stringify(data, null, 2), "utf-8");
-    renameSync(tmp, this.filePath);
-    this.dirty = false;
+    const snapshot = {
+      version: 1,
+      records: [...this.records]
+      // shallow copy — records are plain data
+    };
+    try {
+      const tmp = this.filePath + ".tmp";
+      writeFileSync2(tmp, JSON.stringify(snapshot, null, 2), "utf-8");
+      renameSync(tmp, this.filePath);
+      this.dirty = false;
+    } catch (err) {
+      console.error("[cost-tracker] Failed to persist cost history:", err);
+    }
   }
   /**
    * Record cost from a completed session/interaction.
@@ -5905,7 +5922,7 @@ program.command("web").description("Start Web UI server with browser-based chat
     console.error("Error: Invalid port number. Must be between 1 and 65535.");
     process.exit(1);
   }
-  const { startWebServer } = await import("./server-R7OJYTSP.js");
+  const { startWebServer } = await import("./server-A3SB52SS.js");
   await startWebServer({ port, host: options.host });
 });
 program.command("user [action] [username]").description("Manage Web UI users (list | create <name> | delete <name> | reset-password <name> | migrate <name>)").action(async (action, username) => {
@@ -6138,7 +6155,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-KEBKTLLR.js");
+  const { startHub } = await import("./hub-JA7HH44N.js");
   await startHub(
     {
       topic: topic ?? "",

package/dist/{run-tests-WNHU6QH3.js → run-tests-47TTKJTB.js}

@@ -2,7 +2,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-S6P5MYUF.js";
+} from "./chunk-NIJZBQ6I.js";
 export {
   executeTests,
   runTestsTool

package/dist/{run-tests-ZABNMYY2.js → run-tests-E55HLJDD.js}

@@ -1,7 +1,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-NJEMUAJD.js";
+} from "./chunk-UIFW7G4A.js";
 export {
   executeTests,
   runTestsTool

package/dist/{server-R7OJYTSP.js → server-A3SB52SS.js}

@@ -21,7 +21,7 @@ import {
   persistToolRound,
   rebuildExtraMessages,
   setupProxy
-} from "./chunk-JSAPO5GI.js";
+} from "./chunk-HOBLE365.js";
 import {
   AuthManager
 } from "./chunk-BYNY5JPB.js";
@@ -41,7 +41,7 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-YF3Z47AT.js";
+} from "./chunk-X5RX2VGQ.js";
 import "./chunk-4BKXL7SM.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -61,7 +61,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-S6P5MYUF.js";
+} from "./chunk-NIJZBQ6I.js";
 
 // src/web/server.ts
 import express from "express";
@@ -345,12 +345,19 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
       }
     }
     const results = new Array(calls.length);
-    const parallelPhase = safeParallel.length > 0 ? Promise.all(safeParallel.map(async ({ idx, call }) => {
-      results[idx] = await this.execute(call);
-    })) : Promise.resolve();
+    const wrapExec = async (idx, call) => {
+      try {
+        results[idx] = await this.execute(call);
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        console.error(`[tool-executor-web] Unexpected error in tool "${call.name}":`, err);
+        results[idx] = { callId: call.id, content: `Tool execution failed: ${msg}`, isError: true };
+      }
+    };
+    const parallelPhase = safeParallel.length > 0 ? Promise.all(safeParallel.map(({ idx, call }) => wrapExec(idx, call))) : Promise.resolve();
     const bashPhase = (async () => {
       for (const { idx, call } of safeBash) {
-        results[idx] = await this.execute(call);
+        await wrapExec(idx, call);
       }
     })();
     await Promise.all([parallelPhase, bashPhase]);
@@ -527,6 +534,8 @@ var SessionHandler = class _SessionHandler {
   activeSystemPrompt;
   /** Directories added via /add-dir */
   addedDirs = /* @__PURE__ */ new Set();
+  /** Track MCP tool names used across this session (for MCP budget prioritization) */
+  usedMcpToolNames = /* @__PURE__ */ new Set();
   /**
    * 未保存会话的内存缓存（per-handler）。
    * 当客户端通过 `session new` 创建新会话时，会话仅存在于 SessionManager._current 中，
@@ -1038,6 +1047,9 @@ Details: ${errMsg.split("\n")[0]}
             round: round + 1,
             tools: result.toolCalls.map((tc) => tc.name)
           });
+          for (const tc of result.toolCalls) {
+            if (tc.name.startsWith("mcp__")) this.usedMcpToolNames.add(tc.name);
+          }
           googleSearchContext.configManager = this.config;
           spawnAgentContext.provider = provider;
           spawnAgentContext.model = this.currentModel;
@@ -1959,7 +1971,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
       case "test": {
         this.send({ type: "info", message: "\u{1F9EA} Running tests..." });
         try {
-          const { executeTests } = await import("./run-tests-WNHU6QH3.js");
+          const { executeTests } = await import("./run-tests-47TTKJTB.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -2563,7 +2575,7 @@ Add .md files to create commands.` });
     const contextWindow = this.getContextWindowSize();
     if (contextWindow > 0) {
       const toolBudget = Math.floor(contextWindow * 0.2);
-      const { definitions, systemNote } = this.toolRegistry.getDefinitionsWithBudget(toolBudget);
+      const { definitions, systemNote } = this.toolRegistry.getDefinitionsWithBudget(toolBudget, this.usedMcpToolNames);
       return { toolDefs: definitions, mcpBudgetNote: systemNote };
     }
     return { toolDefs: this.toolRegistry.getDefinitions(), mcpBudgetNote: null };

package/dist/{task-orchestrator-ZTMZIHNF.js → task-orchestrator-KOCFBDPK.js}

@@ -4,11 +4,11 @@ import {
   getDangerLevel,
   googleSearchContext,
   truncateOutput
-} from "./chunk-YF3Z47AT.js";
+} from "./chunk-X5RX2VGQ.js";
 import "./chunk-4BKXL7SM.js";
 import {
   SUBAGENT_ALLOWED_TOOLS
-} from "./chunk-S6P5MYUF.js";
+} from "./chunk-NIJZBQ6I.js";
 
 // src/hub/task-orchestrator.ts
 import { createInterface } from "readline";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jinzd-ai-cli",
-  "version": "0.4.64",
+  "version": "0.4.66",
   "description": "Cross-platform REPL-style AI CLI with multi-provider support",
   "type": "module",
   "main": "./dist/index.js",