jinzd-ai-cli 0.4.63 → 0.4.65

package/README.md

@@ -7,7 +7,7 @@
 [![npm version](https://img.shields.io/npm/v/jinzd-ai-cli)](https://www.npmjs.com/package/jinzd-ai-cli)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 [![Node.js](https://img.shields.io/badge/node-%3E%3D20-brightgreen)](https://nodejs.org)
-[![Tests](https://img.shields.io/badge/tests-343%20passing-brightgreen)]()
+[![Tests](https://img.shields.io/badge/tests-396%20passing-brightgreen)]()
 [![GitHub Release](https://img.shields.io/github/v/release/jinzhengdong/ai-cli)](https://github.com/jinzhengdong/ai-cli/releases)
 [![CI](https://github.com/jinzhengdong/ai-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/jinzhengdong/ai-cli/actions/workflows/ci.yml)
 
@@ -378,11 +378,11 @@ The Web UI (`aicli web`) provides a full-featured browser interface:
 ## Testing
 
 ```bash
-npm test              # Run all 343 tests
+npm test              # Run all 396 tests
 npm run test:watch    # Watch mode
 ```
 
-21 test suites covering: authentication, sessions, tool types & danger levels, permissions, output truncation, diff rendering, edit-file similarity, error hierarchy, config management, env loading, provider registry, web-fetch, grep-files, hub renderer, hub discussion, hub presets, dev-state.
+26 test suites covering: authentication, sessions, tool types & danger levels, permissions, output truncation, diff rendering, edit-file similarity, error hierarchy, config management, env loading, provider registry, web-fetch, grep-files, hub renderer, hub discussion, hub presets, dev-state, token estimator, tool registry budget, parallel tool execution, cost tracker, session tool history.
 
 ## Documentation
 

package/README.zh-CN.md

@@ -7,7 +7,7 @@
 [![npm version](https://img.shields.io/npm/v/jinzd-ai-cli)](https://www.npmjs.com/package/jinzd-ai-cli)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 [![Node.js](https://img.shields.io/badge/node-%3E%3D20-brightgreen)](https://nodejs.org)
-[![Tests](https://img.shields.io/badge/tests-343%20passing-brightgreen)]()
+[![Tests](https://img.shields.io/badge/tests-396%20passing-brightgreen)]()
 [![GitHub Release](https://img.shields.io/github/v/release/jinzhengdong/ai-cli)](https://github.com/jinzhengdong/ai-cli/releases)
 [![CI](https://github.com/jinzhengdong/ai-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/jinzhengdong/ai-cli/actions/workflows/ci.yml)
 
@@ -391,11 +391,11 @@ Web UI（`aicli web`）提供功能完备的浏览器界面：
 ## 测试
 
 ```bash
-npm test              # 运行全部 343 个测试
+npm test              # 运行全部 396 个测试
 npm run test:watch    # 监听模式
 ```
 
-21 个测试套件覆盖：认证、会话、工具类型与危险级别、权限、输出截断、diff 渲染、edit-file 相似度、错误层级、配置管理、环境变量、Provider 注册、web-fetch、grep-files、Hub 渲染、Hub 讨论、Hub 预设、开发状态。
+26 个测试套件覆盖：认证、会话、工具类型与危险级别、权限、输出截断、diff 渲染、edit-file 相似度、错误层级、配置管理、环境变量、Provider 注册、web-fetch、grep-files、Hub 渲染、Hub 讨论、Hub 预设、开发状态、Token 估算、工具注册表预算、并行工具执行、费用追踪、会话工具历史。
 
 ## 文档
 

package/dist/{chunk-EYRPTNVI.js → chunk-2B2EVU6Z.js}

@@ -8,7 +8,7 @@ import {
   RateLimitError,
   schemaToJsonSchema,
   truncateForPersist
-} from "./chunk-E45EGVSY.js";
+} from "./chunk-SKN6HBBT.js";
 import {
   APP_NAME,
   CONFIG_DIR_NAME,
@@ -21,7 +21,7 @@ import {
   MCP_TOOL_PREFIX,
   PLUGINS_DIR_NAME,
   VERSION
-} from "./chunk-MLEM56CR.js";
+} from "./chunk-AQNAV4H4.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({

package/dist/{chunk-MLEM56CR.js → chunk-AQNAV4H4.js}

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

package/dist/{chunk-E45EGVSY.js → chunk-SKN6HBBT.js}

@@ -10,7 +10,7 @@ import {
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT,
   runTestsTool
-} from "./chunk-MLEM56CR.js";
+} from "./chunk-AQNAV4H4.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/{chunk-GUD733DE.js → chunk-UNLZJRCY.js}

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

package/dist/{hub-R6ID4F6J.js → hub-TKYPJZEX.js}

@@ -385,7 +385,7 @@ ${content}`);
   }
 }
 async function runTaskMode(config, providers, configManager, topic) {
-  const { TaskOrchestrator } = await import("./task-orchestrator-LNJWNTSJ.js");
+  const { TaskOrchestrator } = await import("./task-orchestrator-4DCUYIRI.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-EYRPTNVI.js";
+} from "./chunk-2B2EVU6Z.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -46,7 +46,7 @@ import {
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-E45EGVSY.js";
+} from "./chunk-SKN6HBBT.js";
 import {
   fileCheckpoints
 } from "./chunk-4BKXL7SM.js";
@@ -71,7 +71,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-MLEM56CR.js";
+} from "./chunk-AQNAV4H4.js";
 
 // src/index.ts
 import { program } from "commander";
@@ -249,7 +249,7 @@ var Renderer = class {
     console.log(theme.dim("    /yolo  /exit"));
     console.log(HR);
     console.log(theme.dim("  Key Features:"));
-    console.log(feat("Agentic loop (up to 25 tool-call rounds, final answer streamed)"));
+    console.log(feat("Agentic loop (up to 200 tool-call rounds, configurable via config/CLI, final answer streamed)"));
     console.log(feat("Multimodal input: @filepath to inline images (base64) or text into messages"));
     console.log(feat("Git context awareness: auto-inject branch name and file change status on startup"));
     console.log(feat("Project context files: auto-load AICLI.md / CLAUDE.md (3 levels: global/project/subdir)"));
@@ -306,6 +306,11 @@ var Renderer = class {
     console.log(feat("Context injection: aicli hub -c doc.md \u2014 inject external documents for all agents"));
     console.log(feat("Task Mode: aicli hub --task \u2014 agents plan, write code, and execute with tools (plan\u2192approve\u2192execute\u2192review)"));
     console.log(feat("Ollama local models: built-in provider, no API key, auto-discovers installed models via /v1/models"));
+    console.log(feat("MCP tool budget: auto-trim MCP tool definitions when exceeding 20% context window, prioritize used tools"));
+    console.log(feat("Smart compact: tool-history-aware compression preserves full tool call rounds (no mid-round splits)"));
+    console.log(feat("Session size control: auto-trim old tool output when session exceeds 2MB, keep recent rounds intact"));
+    console.log(feat("Crash recovery: detect incomplete agentic loops on /resume, warn and offer continuation"));
+    console.log(feat("Cost dashboard: /cost history shows cross-session daily/weekly/monthly spend with budget progress bar"));
     console.log();
   }
   printPrompt(provider, _model) {
@@ -938,7 +943,7 @@ function createDefaultCommands() {
           "  /config [set|get|show]   - Config wizard, or get/set values, show all",
           "  /copy                    - Copy last AI response to clipboard",
           "  /paste [description]     - Read image from clipboard and send to AI",
-          "  /cost [reset]            - Show session token usage (or reset counters)",
+          "  /cost [reset | history]   - Show session token usage, reset, or cross-session cost dashboard",
           "  /init [--force]          - Generate AICLI.md by scanning project structure",
           "  /skill [name|off|list]   - Manage agent skills (reusable prompt packs)",
           "  /checkpoint [save|restore|delete] <name> - Session checkpoints",
@@ -2188,7 +2193,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-KRGPFYPF.js");
+          const { executeTests } = await import("./run-tests-C4CEOYZP.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -5900,7 +5905,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-BGMUORHT.js");
+  const { startWebServer } = await import("./server-CDRR3DC7.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) => {
@@ -6133,7 +6138,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-R6ID4F6J.js");
+  const { startHub } = await import("./hub-TKYPJZEX.js");
   await startHub(
     {
       topic: topic ?? "",

package/dist/{run-tests-KRGPFYPF.js → run-tests-C4CEOYZP.js}

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

package/dist/{run-tests-A53KBZPJ.js → run-tests-KATYWRVQ.js}

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

package/dist/{server-BGMUORHT.js → server-CDRR3DC7.js}

@@ -21,7 +21,7 @@ import {
   persistToolRound,
   rebuildExtraMessages,
   setupProxy
-} from "./chunk-EYRPTNVI.js";
+} from "./chunk-2B2EVU6Z.js";
 import {
   AuthManager
 } from "./chunk-BYNY5JPB.js";
@@ -41,7 +41,7 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-E45EGVSY.js";
+} from "./chunk-SKN6HBBT.js";
 import "./chunk-4BKXL7SM.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -61,7 +61,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-MLEM56CR.js";
+} from "./chunk-AQNAV4H4.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-KRGPFYPF.js");
+          const { executeTests } = await import("./run-tests-C4CEOYZP.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-LNJWNTSJ.js → task-orchestrator-4DCUYIRI.js}

@@ -4,11 +4,11 @@ import {
   getDangerLevel,
   googleSearchContext,
   truncateOutput
-} from "./chunk-E45EGVSY.js";
+} from "./chunk-SKN6HBBT.js";
 import "./chunk-4BKXL7SM.js";
 import {
   SUBAGENT_ALLOWED_TOOLS
-} from "./chunk-MLEM56CR.js";
+} from "./chunk-AQNAV4H4.js";
 
 // src/hub/task-orchestrator.ts
 import { createInterface } from "readline";

package/package.json

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