jinzd-ai-cli 0.4.62 → 0.4.64

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-6OTF2ILP.js → chunk-JSAPO5GI.js}

@@ -8,7 +8,7 @@ import {
   RateLimitError,
   schemaToJsonSchema,
   truncateForPersist
-} from "./chunk-672OV76Z.js";
+} from "./chunk-YF3Z47AT.js";
 import {
   APP_NAME,
   CONFIG_DIR_NAME,
@@ -21,7 +21,7 @@ import {
   MCP_TOOL_PREFIX,
   PLUGINS_DIR_NAME,
   VERSION
-} from "./chunk-LLI6COMK.js";
+} from "./chunk-S6P5MYUF.js";
 
 // src/config/config-manager.ts
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";
@@ -182,6 +182,10 @@ var ConfigSchema = z.object({
   // 实际上限还会受模型 contextWindow 动态约束（取 contextWindow/4 作为下限）。
   // 设置为 0 或未配置时使用默认值；不建议设为小于 12_000 或大于模型 contextWindow/2。
   maxToolOutputChars: z.number().int().min(0).default(5e5),
+  // 月度成本预算（USD）。
+  // 设置后，每次 AI 回复后会跟踪成本，接近或超过预算时在 /status 和 /cost 中显示警告。
+  // 默认 0 = 不限制。例：50 表示每月最多花 $50。
+  monthlyBudget: z.number().min(0).default(0),
   // 插件加载开关（安全控制）
   // 默认 false：不自动加载 ~/.aicli/plugins/ 中的插件文件。
   // 插件以完整 Node.js 权限在主进程中执行（可读写文件、访问网络、执行命令），

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

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

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

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

package/dist/{chunk-672OV76Z.js → chunk-YF3Z47AT.js}

@@ -10,7 +10,7 @@ import {
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT,
   runTestsTool
-} from "./chunk-LLI6COMK.js";
+} from "./chunk-S6P5MYUF.js";
 
 // src/tools/builtin/bash.ts
 import { execSync } from "child_process";
@@ -1365,14 +1365,19 @@ var ToolExecutor = class {
     }
   }
   async executeAll(calls) {
-    const safeCalls = [];
+    const safeParallel = [];
+    const safeBash = [];
     const fileWriteCalls = [];
     const otherCalls = [];
     for (let i = 0; i < calls.length; i++) {
       const call = calls[i];
       const level = getDangerLevel(call.name, call.arguments);
       if (level === "safe") {
-        safeCalls.push({ idx: i, call });
+        if (call.name === "bash") {
+          safeBash.push({ idx: i, call });
+        } else {
+          safeParallel.push({ idx: i, call });
+        }
       } else if (isFileWriteTool(call.name) && level === "write") {
         fileWriteCalls.push({ idx: i, call });
       } else {
@@ -1380,11 +1385,20 @@ var ToolExecutor = class {
       }
     }
     const results = new Array(calls.length);
-    await Promise.all(
-      safeCalls.map(async ({ idx, call }) => {
+    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 bashPhase = (async () => {
+      for (const { idx, call } of safeBash) {
         results[idx] = await this.execute(call);
-      })
-    );
+      }
+    })();
+    await Promise.all([parallelPhase, bashPhase]);
+    if (safeParallel.length >= 2) {
+      const elapsed = Date.now() - t0;
+      console.log(theme.dim(`  \u26A1 ${safeParallel.length} tools executed in parallel (${elapsed}ms)`));
+    }
     if (fileWriteCalls.length === 1) {
       const { idx, call } = fileWriteCalls[0];
       results[idx] = await this.execute(call);
@@ -1418,31 +1432,41 @@ var ToolExecutor = class {
     if (this.sessionAutoApprove) {
       console.log(theme.warning("  \u26A1 All auto-approved (session /yolo mode)"));
     }
-    const results = [];
+    const results = new Array(calls.length);
+    const approvedIndices = [];
     for (let i = 0; i < calls.length; i++) {
-      const call = calls[i];
       const approved = decision === "all" || decision !== "none" && decision.has(i + 1);
       if (approved) {
+        approvedIndices.push(i);
+      } else {
+        console.log(theme.dim(`  [${i + 1}] `) + theme.dim("rejected"));
+        results[i] = { callId: calls[i].id, content: `[User rejected] The user rejected this ${calls[i].name} operation. Do not retry without asking.`, isError: true };
+      }
+    }
+    const t0 = Date.now();
+    await Promise.all(
+      approvedIndices.map(async (i) => {
+        const call = calls[i];
         const tool = this.registry.get(call.name);
         if (!tool) {
-          results.push({ callId: call.id, content: `Unknown tool: ${call.name}`, isError: true });
-          continue;
+          results[i] = { callId: call.id, content: `Unknown tool: ${call.name}`, isError: true };
+          return;
         }
         try {
           const rawContent = await tool.execute(call.arguments);
           const content = truncateOutput(rawContent, call.name);
           const wasTruncated = content !== rawContent;
           this.printToolResult(call.name, rawContent, false, wasTruncated);
-          results.push({ callId: call.id, content, isError: false });
+          results[i] = { callId: call.id, content, isError: false };
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
           this.printToolResult(call.name, message, true, false);
-          results.push({ callId: call.id, content: message, isError: true });
+          results[i] = { callId: call.id, content: message, isError: true };
         }
-      } else {
-        console.log(theme.dim(`  [${i + 1}] `) + theme.dim("rejected"));
-        results.push({ callId: call.id, content: `[User rejected] The user rejected this ${call.name} operation. Do not retry without asking.`, isError: true });
-      }
+      })
+    );
+    if (approvedIndices.length >= 2) {
+      console.log(theme.dim(`  \u26A1 ${approvedIndices.length} file writes executed in parallel (${Date.now() - t0}ms)`));
     }
     return results;
   }

package/dist/{hub-2XLQSZY2.js → hub-KEBKTLLR.js}

@@ -385,7 +385,7 @@ ${content}`);
   }
 }
 async function runTaskMode(config, providers, configManager, topic) {
-  const { TaskOrchestrator } = await import("./task-orchestrator-2ATTBG2S.js");
+  const { TaskOrchestrator } = await import("./task-orchestrator-ZTMZIHNF.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-6OTF2ILP.js";
+} from "./chunk-JSAPO5GI.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -46,7 +46,7 @@ import {
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-672OV76Z.js";
+} from "./chunk-YF3Z47AT.js";
 import {
   fileCheckpoints
 } from "./chunk-4BKXL7SM.js";
@@ -71,15 +71,15 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-LLI6COMK.js";
+} from "./chunk-S6P5MYUF.js";
 
 // src/index.ts
 import { program } from "commander";
 
 // src/repl/repl.ts
 import * as readline from "readline";
-import { existsSync as existsSync4, readFileSync as readFileSync3, readdirSync as readdirSync3, statSync as statSync3 } from "fs";
-import { join as join4, resolve as resolve2, extname as extname2, dirname as dirname3, basename as basename2 } from "path";
+import { existsSync as existsSync5, readFileSync as readFileSync4, readdirSync as readdirSync3, statSync as statSync3 } from "fs";
+import { join as join5, resolve as resolve2, extname as extname2, dirname as dirname3, basename as basename2 } from "path";
 import chalk4 from "chalk";
 
 // src/repl/renderer.ts
@@ -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",
@@ -1843,7 +1848,7 @@ ${hint}` : "")
     {
       name: "cost",
       description: "Show session token usage, prompt-cache hits, and USD cost",
-      usage: "/cost [reset]",
+      usage: "/cost [reset | history]",
       execute(args, ctx) {
         const sub = args[0]?.toLowerCase();
         if (sub === "reset") {
@@ -1851,6 +1856,28 @@ ${hint}` : "")
           ctx.renderer.printSuccess("Session token counters reset.");
           return;
         }
+        if (sub === "history" || sub === "h") {
+          const tracker = ctx.getCostTracker();
+          const budget = ctx.config.get("monthlyBudget");
+          console.log();
+          console.log(theme.heading("  \u{1F4B0} Cross-Session Cost Dashboard"));
+          console.log(theme.dim("  " + "\u2500".repeat(48)));
+          const summary = tracker.formatSummary(budget);
+          for (const line of summary.split("\n")) {
+            console.log(theme.dim("  ") + chalk2.white(line));
+          }
+          console.log(theme.dim("  " + "\u2500".repeat(48)));
+          const warning = tracker.checkBudget(budget);
+          if (warning) {
+            console.log(theme.warning(`  ${warning}`));
+          } else if (budget && budget > 0) {
+            console.log(theme.success("  \u2713 Within monthly budget"));
+          } else {
+            console.log(theme.dim('  Tip: set "monthlyBudget" in config (e.g., 50 for $50/month)'));
+          }
+          console.log();
+          return;
+        }
         const session = ctx.sessions.current;
         const usage = session?.tokenUsage ?? {
           inputTokens: 0,
@@ -2166,7 +2193,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-ORVJAUJG.js");
+          const { executeTests } = await import("./run-tests-WNHU6QH3.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -3230,6 +3257,125 @@ var CustomCommandManager = class {
   }
 };
 
+// src/core/cost-tracker.ts
+import { existsSync as existsSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync2, renameSync } from "fs";
+import { join as join4 } from "path";
+var CostTracker = class {
+  filePath;
+  records = [];
+  dirty = false;
+  constructor(configDir) {
+    this.filePath = join4(configDir, "cost-history.json");
+    this.load();
+  }
+  load() {
+    try {
+      if (existsSync4(this.filePath)) {
+        const data = JSON.parse(readFileSync3(this.filePath, "utf-8"));
+        if (data.version === 1 && Array.isArray(data.records)) {
+          this.records = data.records;
+        }
+      }
+    } catch {
+      this.records = [];
+    }
+  }
+  /** Save to disk (atomic write). */
+  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;
+  }
+  /**
+   * Record cost from a completed session/interaction.
+   */
+  addCost(provider, model, usage) {
+    const cost = computeCost(provider, model, usage);
+    if (cost === null || cost === 0) return;
+    const today = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+    let record = this.records.find((r) => r.date === today);
+    if (!record) {
+      record = { date: today, cost: 0, sessions: 0, inputTokens: 0, outputTokens: 0 };
+      this.records.push(record);
+    }
+    record.cost += cost;
+    record.sessions += 1;
+    record.inputTokens += usage.inputTokens;
+    record.outputTokens += usage.outputTokens;
+    this.dirty = true;
+    if (this.records.length > 90) {
+      this.records = this.records.slice(-90);
+    }
+  }
+  /** Get total cost for a given month ("2026-04"). */
+  getMonthlyCost(yearMonth) {
+    const prefix = yearMonth ?? (/* @__PURE__ */ new Date()).toISOString().slice(0, 7);
+    return this.records.filter((r) => r.date.startsWith(prefix)).reduce((sum, r) => sum + r.cost, 0);
+  }
+  /** Get today's cost. */
+  getTodayCost() {
+    const today = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+    return this.records.find((r) => r.date === today)?.cost ?? 0;
+  }
+  /** Get total cost for last N days. */
+  getRecentCost(days) {
+    const cutoff = /* @__PURE__ */ new Date();
+    cutoff.setDate(cutoff.getDate() - days);
+    const cutoffStr = cutoff.toISOString().slice(0, 10);
+    return this.records.filter((r) => r.date >= cutoffStr).reduce((sum, r) => sum + r.cost, 0);
+  }
+  /** Get all records for display. */
+  getRecords() {
+    return [...this.records];
+  }
+  /**
+   * Check if monthly cost exceeds budget, return warning message or null.
+   */
+  checkBudget(monthlyBudget) {
+    if (!monthlyBudget || monthlyBudget <= 0) return null;
+    const monthlyCost = this.getMonthlyCost();
+    const ratio = monthlyCost / monthlyBudget;
+    if (ratio >= 1) {
+      return `\u{1F6A8} Monthly budget exceeded: ${formatCost(monthlyCost)} / ${formatCost(monthlyBudget)} (${Math.round(ratio * 100)}%)`;
+    }
+    if (ratio >= 0.8) {
+      return `\u26A0 Monthly budget warning: ${formatCost(monthlyCost)} / ${formatCost(monthlyBudget)} (${Math.round(ratio * 100)}%)`;
+    }
+    return null;
+  }
+  /**
+   * Format a cost summary for display.
+   */
+  formatSummary(monthlyBudget) {
+    const today = this.getTodayCost();
+    const monthly = this.getMonthlyCost();
+    const yearMonth = (/* @__PURE__ */ new Date()).toISOString().slice(0, 7);
+    const lines = [
+      `Today:      ${formatCost(today)}`,
+      `This month: ${formatCost(monthly)} (${yearMonth})`
+    ];
+    if (monthlyBudget && monthlyBudget > 0) {
+      const ratio = monthly / monthlyBudget;
+      const bar = "\u2588".repeat(Math.min(20, Math.round(ratio * 20))) + "\u2591".repeat(Math.max(0, 20 - Math.round(ratio * 20)));
+      lines.push(`Budget:     ${formatCost(monthlyBudget)} [${bar}] ${Math.round(ratio * 100)}%`);
+    }
+    const last7 = [];
+    for (let i = 6; i >= 0; i--) {
+      const d = /* @__PURE__ */ new Date();
+      d.setDate(d.getDate() - i);
+      const dateStr = d.toISOString().slice(0, 10);
+      const record = this.records.find((r) => r.date === dateStr);
+      const dayLabel = dateStr.slice(5);
+      last7.push(`${dayLabel}: ${record ? formatCost(record.cost) : "$0.00"}`);
+    }
+    lines.push(`Last 7 days: ${last7.join("  ")}`);
+    return lines.join("\n");
+  }
+};
+
 // src/repl/notify.ts
 import { spawn } from "child_process";
 import { platform as platform2 } from "os";
@@ -3303,7 +3449,7 @@ function parseAtReferences(input2, cwd) {
     const absPath = resolve2(cwd, rawPath);
     const ext = extname2(rawPath).toLowerCase();
     const mime = IMAGE_MIME[ext];
-    if (!existsSync4(absPath)) {
+    if (!existsSync5(absPath)) {
       refs.push({ path: rawPath, type: "notfound" });
       continue;
     }
@@ -3313,7 +3459,7 @@ function parseAtReferences(input2, cwd) {
         refs.push({ path: rawPath, type: "toolarge" });
         continue;
       }
-      const data = readFileSync3(absPath).toString("base64");
+      const data = readFileSync4(absPath).toString("base64");
       imageParts.push({
         type: "image_url",
         image_url: { url: `data:${mime};base64,${data}` }
@@ -3321,7 +3467,7 @@ function parseAtReferences(input2, cwd) {
       refs.push({ path: rawPath, type: "image" });
       textBody = textBody.replace(match[0], "").trim();
     } else {
-      const content = readFileSync3(absPath, "utf-8");
+      const content = readFileSync4(absPath, "utf-8");
       const inlined = `
 
 [File: ${rawPath}]
@@ -3390,6 +3536,7 @@ var Repl = class {
     if (options?.blockedTools) this.blockedTools = options.blockedTools;
     if (options?.resumeSessionId) this.resumeSessionId = options.resumeSessionId;
     if (options?.maxToolRoundsOverride !== void 0) this.maxToolRoundsOverride = options.maxToolRoundsOverride;
+    this.costTracker = new CostTracker(this.config.getConfigDir());
   }
   rl;
   currentProvider;
@@ -3405,12 +3552,13 @@ var Repl = class {
   contextLayers = [];
   /** 本次会话累计 token 用量 */
   sessionTokenUsage = { inputTokens: 0, outputTokens: 0, cacheCreationTokens: 0, cacheReadTokens: 0 };
-  /** Fold a single-request TokenUsage (with optional cache fields) into sessionTokenUsage. */
+  /** Fold a single-request TokenUsage (with optional cache fields) into sessionTokenUsage + cost tracker. */
   addSessionUsage(u) {
     this.sessionTokenUsage.inputTokens += u.inputTokens;
     this.sessionTokenUsage.outputTokens += u.outputTokens;
     this.sessionTokenUsage.cacheCreationTokens += u.cacheCreationTokens ?? 0;
     this.sessionTokenUsage.cacheReadTokens += u.cacheReadTokens ?? 0;
+    this.costTracker.addCost(this.currentProvider, this.currentModel, u);
   }
   /** 启动时检测到的 Git 分支（无 git 仓库时为 null） */
   gitBranch = null;
@@ -3452,6 +3600,8 @@ var Repl = class {
   selecting = false;
   /** CLI --max-tool-rounds 覆盖值；未指定时从 config.maxToolRounds 读取 */
   maxToolRoundsOverride;
+  /** 跨 session 成本追踪器 */
+  costTracker;
   // ── /add-dir 目录上下文支持 ────────────────────────────────────────────────
   /**
    * 扫描目录内容，返回格式化字符串（含目录树 + 关键文件内容）。
@@ -3531,7 +3681,7 @@ var Repl = class {
       const filtered = entries.filter((e) => !SKIP_DIRS_SET.has(e));
       for (let i = 0; i < filtered.length && entryCount < MAX_TREE_ENTRIES; i++) {
         const name = filtered[i];
-        const fullPath = join4(dir, name);
+        const fullPath = join5(dir, name);
         const isLast = i === filtered.length - 1;
         const connector = isLast ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
         let isDir;
@@ -3565,7 +3715,7 @@ ${treeLines.join("\n")}`
       for (const name of entries) {
         if (totalChars >= MAX_TOTAL_CHARS) break;
         if (SKIP_DIRS_SET.has(name)) continue;
-        const fullPath = join4(dir, name);
+        const fullPath = join5(dir, name);
         let st;
         try {
           st = statSync3(fullPath);
@@ -3580,7 +3730,7 @@ ${treeLines.join("\n")}`
           if (!TEXT_EXTS.has(ext) && !isSpecial) continue;
           if (st.size > MAX_FILE_CHARS * 3) continue;
           try {
-            let content = readFileSync3(fullPath, "utf-8");
+            let content = readFileSync4(fullPath, "utf-8");
             if (content.length > MAX_FILE_CHARS) {
               content = content.slice(0, MAX_FILE_CHARS) + `
 ... (truncated, ${content.length} chars total)`;
@@ -3610,7 +3760,7 @@ ${content}
    */
   addExtraContextDir(dirPath) {
     const absPath = resolve2(dirPath);
-    if (!existsSync4(absPath)) {
+    if (!existsSync5(absPath)) {
       return { success: false, charCount: 0, added: false, error: `Directory not found: ${dirPath}` };
     }
     let isDir;
@@ -3644,9 +3794,9 @@ ${content}
    */
   findContextFile(dir, candidates = CONTEXT_FILE_CANDIDATES) {
     for (const candidate of candidates) {
-      const fullPath = join4(dir, candidate);
-      if (existsSync4(fullPath)) {
-        const content = readFileSync3(fullPath, "utf-8").trim();
+      const fullPath = join5(dir, candidate);
+      if (existsSync5(fullPath)) {
+        const content = readFileSync4(fullPath, "utf-8").trim();
         if (content) return { filePath: fullPath, content };
       }
     }
@@ -3674,10 +3824,10 @@ ${content}
     const cwd = process.cwd();
     const gitRoot = getGitRoot(cwd);
     const projectRoot = gitRoot ?? cwd;
-    const mcpPath = join4(projectRoot, MCP_PROJECT_CONFIG_NAME);
-    if (!existsSync4(mcpPath)) return null;
+    const mcpPath = join5(projectRoot, MCP_PROJECT_CONFIG_NAME);
+    if (!existsSync5(mcpPath)) return null;
     try {
-      const raw = JSON.parse(readFileSync3(mcpPath, "utf-8"));
+      const raw = JSON.parse(readFileSync4(mcpPath, "utf-8"));
       const servers = raw?.mcpServers;
       if (!servers || typeof servers !== "object") {
         process.stderr.write(
@@ -3723,8 +3873,8 @@ ${content}
         );
         return { layers: [], mergedContent: "" };
       }
-      if (existsSync4(fullPath)) {
-        const content = readFileSync3(fullPath, "utf-8").trim();
+      if (existsSync5(fullPath)) {
+        const content = readFileSync4(fullPath, "utf-8").trim();
         if (content) {
           const layer = {
             level: "project",
@@ -3781,9 +3931,9 @@ ${content}
    * 超过 MEMORY_MAX_CHARS 时只取末尾最新部分。
    */
   loadMemoryContent() {
-    const memoryPath = join4(this.config.getConfigDir(), MEMORY_FILE_NAME);
-    if (!existsSync4(memoryPath)) return null;
-    let content = readFileSync3(memoryPath, "utf-8").trim();
+    const memoryPath = join5(this.config.getConfigDir(), MEMORY_FILE_NAME);
+    if (!existsSync5(memoryPath)) return null;
+    let content = readFileSync4(memoryPath, "utf-8").trim();
     if (!content) return null;
     if (content.length > MEMORY_MAX_CHARS) {
       content = content.slice(-MEMORY_MAX_CHARS);
@@ -4094,6 +4244,16 @@ Session '${this.resumeSessionId}' not found.
       process.stdout.write(
         theme.dim(`  \u{1F4C2} Resumed session: ${session.id.slice(0, 8)} `) + theme.dim(`(${session.messages.length} messages`) + (session.title ? theme.dim(`, "${session.title}"`) : "") + theme.dim(")\n")
       );
+      const msgs = session.messages;
+      if (msgs.length > 0) {
+        const lastMsg = msgs[msgs.length - 1];
+        const isIncomplete = lastMsg.role === "tool" || lastMsg.role === "assistant" && lastMsg.toolCalls && lastMsg.toolCalls.length > 0;
+        if (isIncomplete) {
+          process.stdout.write(
+            theme.warning("  \u26A0 Session appears to have been interrupted mid-task (last message is tool output).\n") + theme.dim("  The AI will see the tool history and can continue where it left off.\n") + theme.dim('  Tip: type "continue where you left off" or describe what to do next.\n')
+          );
+        }
+      }
     }
     if (layers.length > 0) {
       if (layers.length === 1) {
@@ -4134,14 +4294,14 @@ Session '${this.resumeSessionId}' not found.
       process.stdout.write(theme.dim(`  \u{1F50C} Plugins loaded: ${pluginCount} tool(s) from plugins/
 `));
     }
-    const skillsDir = join4(this.config.getConfigDir(), SKILLS_DIR_NAME);
+    const skillsDir = join5(this.config.getConfigDir(), SKILLS_DIR_NAME);
     this.skillManager = new SkillManager(skillsDir);
     const skillCount = this.skillManager.loadSkills();
     if (skillCount > 0) {
       process.stdout.write(theme.dim(`  \u{1F3AF} Skills: ${skillCount} available (use /skill to manage)
 `));
     }
-    const commandsDir = join4(this.config.getConfigDir(), CUSTOM_COMMANDS_DIR_NAME);
+    const commandsDir = join5(this.config.getConfigDir(), CUSTOM_COMMANDS_DIR_NAME);
     this.customCommandManager = new CustomCommandManager(commandsDir);
     const customCmdCount = this.customCommandManager.loadCommands();
     if (customCmdCount > 0) {
@@ -4329,6 +4489,12 @@ Session '${this.resumeSessionId}' not found.
         }
         await this.sessions.save();
       }
+      this.costTracker.save();
+      const budgetWarning = this.costTracker.checkBudget(this.config.get("monthlyBudget"));
+      if (budgetWarning) {
+        process.stdout.write(theme.warning(`  ${budgetWarning}
+`));
+      }
       const elapsed = Date.now() - t0;
       const threshold = this.config.get("ui").notificationThreshold;
       if (threshold > 0 && elapsed >= threshold) {
@@ -4592,14 +4758,14 @@ Session '${this.resumeSessionId}' not found.
       const dir = normalized.includes("/") ? dirname3(normalized) : ".";
       const prefix = normalized.includes("/") ? basename2(normalized) : normalized;
       const absDir = resolve2(process.cwd(), dir);
-      if (!existsSync4(absDir)) return [];
+      if (!existsSync5(absDir)) return [];
       const entries = readdirSync3(absDir);
       const results = [];
       for (const entry of entries) {
         if (entry.startsWith(".")) continue;
         if (!entry.toLowerCase().startsWith(prefix.toLowerCase())) continue;
         try {
-          const fullPath = join4(absDir, entry);
+          const fullPath = join5(absDir, entry);
           const stat = statSync3(fullPath);
           const rel = dir === "." ? entry : `${dir}/${entry}`;
           results.push(stat.isDirectory() ? `${rel}/` : rel);
@@ -5634,6 +5800,7 @@ Tip: You can continue the conversation by asking the AI to proceed.`
       listContextDirs: () => [...this.extraContextDirs],
       forkSession: (messageCount, title) => this.sessions.forkSession(messageCount, title),
       getToolExecutor: () => this.toolExecutor,
+      getCostTracker: () => this.costTracker,
       exit: () => this.handleExit()
     };
     await cmd.execute(args, ctx);
@@ -5738,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-HBAOUOIC.js");
+  const { startWebServer } = await import("./server-R7OJYTSP.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) => {
@@ -5971,7 +6138,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-2XLQSZY2.js");
+  const { startHub } = await import("./hub-KEBKTLLR.js");
   await startHub(
     {
       topic: topic ?? "",

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

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

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

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

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

@@ -21,7 +21,7 @@ import {
   persistToolRound,
   rebuildExtraMessages,
   setupProxy
-} from "./chunk-6OTF2ILP.js";
+} from "./chunk-JSAPO5GI.js";
 import {
   AuthManager
 } from "./chunk-BYNY5JPB.js";
@@ -41,7 +41,7 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-672OV76Z.js";
+} from "./chunk-YF3Z47AT.js";
 import "./chunk-4BKXL7SM.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -61,7 +61,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-LLI6COMK.js";
+} from "./chunk-S6P5MYUF.js";
 
 // src/web/server.ts
 import express from "express";
@@ -325,14 +325,19 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
     }
   }
   async executeAll(calls) {
-    const safeCalls = [];
+    const safeParallel = [];
+    const safeBash = [];
     const fileWriteCalls = [];
     const otherCalls = [];
     for (let i = 0; i < calls.length; i++) {
       const call = calls[i];
       const level = getDangerLevel(call.name, call.arguments);
       if (level === "safe") {
-        safeCalls.push({ idx: i, call });
+        if (call.name === "bash") {
+          safeBash.push({ idx: i, call });
+        } else {
+          safeParallel.push({ idx: i, call });
+        }
       } else if (isFileWriteTool(call.name) && level === "write") {
         fileWriteCalls.push({ idx: i, call });
       } else {
@@ -340,11 +345,15 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
       }
     }
     const results = new Array(calls.length);
-    await Promise.all(
-      safeCalls.map(async ({ idx, call }) => {
+    const parallelPhase = safeParallel.length > 0 ? Promise.all(safeParallel.map(async ({ idx, call }) => {
+      results[idx] = await this.execute(call);
+    })) : Promise.resolve();
+    const bashPhase = (async () => {
+      for (const { idx, call } of safeBash) {
         results[idx] = await this.execute(call);
-      })
-    );
+      }
+    })();
+    await Promise.all([parallelPhase, bashPhase]);
     if (fileWriteCalls.length === 1) {
       const { idx, call } = fileWriteCalls[0];
       results[idx] = await this.execute(call);
@@ -362,33 +371,39 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
   async executeBatchFileWrites(items) {
     const calls = items.map((i) => i.call);
     const decision = this.sessionAutoApprove ? "all" : await this.batchConfirm(calls);
-    const results = [];
+    const results = new Array(calls.length);
+    const approvedIndices = [];
     for (let i = 0; i < calls.length; i++) {
-      const call = calls[i];
       if (decision === "all" || decision instanceof Set && decision.has(i + 1)) {
+        approvedIndices.push(i);
+      } else {
+        results[i] = {
+          callId: calls[i].id,
+          content: `[User rejected] File write rejected by user. Do not retry without asking.`,
+          isError: true
+        };
+      }
+    }
+    await Promise.all(
+      approvedIndices.map(async (i) => {
+        const call = calls[i];
         const tool = this.registry.get(call.name);
         if (!tool) {
-          results.push({ callId: call.id, content: `Unknown tool: ${call.name}`, isError: true });
-          continue;
+          results[i] = { callId: call.id, content: `Unknown tool: ${call.name}`, isError: true };
+          return;
         }
         try {
           const rawContent = await tool.execute(call.arguments);
           const content = truncateOutput(rawContent, call.name);
           this.sendToolCallResult(call, rawContent, false);
-          results.push({ callId: call.id, content, isError: false });
+          results[i] = { callId: call.id, content, isError: false };
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
           this.sendToolCallResult(call, message, true);
-          results.push({ callId: call.id, content: message, isError: true });
+          results[i] = { callId: call.id, content: message, isError: true };
         }
-      } else {
-        results.push({
-          callId: call.id,
-          content: `[User rejected] File write rejected by user. Do not retry without asking.`,
-          isError: true
-        });
-      }
-    }
+      })
+    );
     return results;
   }
 };
@@ -1327,6 +1342,17 @@ Tokens: in=${this.sessionTokenUsage.inputTokens} out=${this.sessionTokenUsage.ou
             this.sessions.loadSession(found.id);
             this.resetWebSessionUsage();
             this.send({ type: "info", message: `Loaded session: ${found.id.slice(0, 8)} "${found.title ?? ""}" (${found.messageCount} messages)` });
+            const loadedSession = this.sessions.current;
+            if (loadedSession && loadedSession.messages.length > 0) {
+              const lastMsg = loadedSession.messages[loadedSession.messages.length - 1];
+              const isIncomplete = lastMsg.role === "tool" || lastMsg.role === "assistant" && lastMsg.toolCalls && lastMsg.toolCalls.length > 0;
+              if (isIncomplete) {
+                this.send({
+                  type: "info",
+                  message: '\u26A0 This session appears to have been interrupted mid-task. The AI will see the tool history and can continue where it left off. Type "continue where you left off" to resume.'
+                });
+              }
+            }
             this.sendSessionMessages();
             this.sendStatus();
             this.sendSessionList();
@@ -1933,7 +1959,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-ORVJAUJG.js");
+          const { executeTests } = await import("./run-tests-WNHU6QH3.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {

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

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

package/package.json

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