jinzd-ai-cli 0.4.60 → 0.4.62

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

@@ -10,7 +10,7 @@ import {
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT,
   runTestsTool
-} from "./chunk-2DWWB4KD.js";
+} from "./chunk-LLI6COMK.js";
 
 // src/tools/builtin/bash.ts
 import { execSync } from "child_process";
@@ -4062,6 +4062,28 @@ var notebookEditTool = {
   }
 };
 
+// src/core/token-estimator.ts
+var CJK_REGEX = /[\u2E80-\u9FFF\uA000-\uA4FF\uAC00-\uD7FF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF]/g;
+function estimateTokens(text) {
+  if (!text) return 0;
+  const cjkMatches = text.match(CJK_REGEX);
+  const cjkCount = cjkMatches ? cjkMatches.length : 0;
+  const nonCjkCount = text.length - cjkCount;
+  const tokens = cjkCount * 1.5 + nonCjkCount * 0.25;
+  return Math.ceil(tokens) + 4;
+}
+function estimateToolDefinitionTokens(def) {
+  let charCount = def.name.length + def.description.length;
+  for (const [key, param] of Object.entries(def.parameters)) {
+    charCount += key.length + param.type.length + param.description.length;
+    if (param.enum) {
+      charCount += param.enum.join(" ").length;
+    }
+  }
+  const structuralOverhead = 40 + Object.keys(def.parameters).length * 30;
+  return Math.ceil((charCount + structuralOverhead) * 0.25) + 10;
+}
+
 // src/tools/registry.ts
 import { pathToFileURL } from "url";
 import { existsSync as existsSync12, mkdirSync as mkdirSync4, readdirSync as readdirSync6 } from "fs";
@@ -4110,6 +4132,74 @@ var ToolRegistry = class {
   getDefinitions() {
     return [...this.tools.values()].map((t) => t.definition);
   }
+  /**
+   * Return tool definitions within a token budget, trimming MCP tools if needed.
+   *
+   * Strategy: always include all builtin + plugin tools. If total tokens exceed
+   * the budget, keep only MCP tools that were used in this session (by name),
+   * trimming the rest. Returns { definitions, trimmedCount, systemNote }.
+   *
+   * @param tokenBudget  Max tokens for tool definitions (typically 20% of context window)
+   * @param usedToolNames  Names of MCP tools already called this session (always kept)
+   */
+  getDefinitionsWithBudget(tokenBudget, usedToolNames) {
+    const allDefs = this.getDefinitions();
+    let totalTokens = 0;
+    for (const def of allDefs) {
+      totalTokens += estimateToolDefinitionTokens(def);
+    }
+    if (totalTokens <= tokenBudget) {
+      return { definitions: allDefs, trimmedCount: 0, systemNote: null };
+    }
+    const builtinDefs = [];
+    const mcpDefs = [];
+    for (const def of allDefs) {
+      if (this.mcpToolNames.has(def.name)) {
+        mcpDefs.push(def);
+      } else {
+        builtinDefs.push(def);
+      }
+    }
+    let budget = tokenBudget;
+    for (const def of builtinDefs) {
+      budget -= estimateToolDefinitionTokens(def);
+    }
+    const kept = [...builtinDefs];
+    const used = usedToolNames ?? /* @__PURE__ */ new Set();
+    const remaining = [];
+    for (const def of mcpDefs) {
+      if (used.has(def.name)) {
+        const cost = estimateToolDefinitionTokens(def);
+        budget -= cost;
+        kept.push(def);
+      } else {
+        remaining.push(def);
+      }
+    }
+    let trimmed = 0;
+    for (const def of remaining) {
+      const cost = estimateToolDefinitionTokens(def);
+      if (budget >= cost) {
+        budget -= cost;
+        kept.push(def);
+      } else {
+        trimmed++;
+      }
+    }
+    let systemNote = null;
+    if (trimmed > 0) {
+      const trimmedServers = /* @__PURE__ */ new Set();
+      const keptNames = new Set(kept.map((d) => d.name));
+      for (const def of mcpDefs) {
+        if (!keptNames.has(def.name)) {
+          const parts = def.name.split("__");
+          if (parts.length >= 2) trimmedServers.add(parts[1]);
+        }
+      }
+      systemNote = `[MCP Tool Budget] ${trimmed} MCP tool(s) from server(s) [${[...trimmedServers].join(", ")}] were excluded to fit the context window. If you need a specific MCP tool that isn't listed, tell the user to ask for it explicitly.`;
+    }
+    return { definitions: kept, trimmedCount: trimmed, systemNote };
+  }
   listAll() {
     return [...this.tools.values()];
   }
@@ -4229,5 +4319,6 @@ export {
   askUserContext,
   googleSearchContext,
   spawnAgentContext,
+  estimateTokens,
   ToolRegistry
 };

package/dist/{chunk-3YVHYAXK.js → chunk-6OTF2ILP.js}

@@ -8,7 +8,7 @@ import {
   RateLimitError,
   schemaToJsonSchema,
   truncateForPersist
-} from "./chunk-C32FFHMY.js";
+} from "./chunk-672OV76Z.js";
 import {
   APP_NAME,
   CONFIG_DIR_NAME,
@@ -21,7 +21,7 @@ import {
   MCP_TOOL_PREFIX,
   PLUGINS_DIR_NAME,
   VERSION
-} from "./chunk-2DWWB4KD.js";
+} from "./chunk-LLI6COMK.js";
 
 // src/config/config-manager.ts
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";
@@ -2462,14 +2462,25 @@ var Session = class _Session {
   /**
    * 上下文压缩：用摘要消息替换旧消息，保留最近 keepLast 条。
    *
+   * Tool-history-aware: if the cut point lands inside a tool round
+   * (assistant+toolCalls followed by tool results), expand to keep the
+   * entire round intact. This prevents orphaned tool results.
+   *
    * 压缩后消息结构：
-   *   [summaryMsg（user）, ackMsg（assistant）, ...最近 keepLast 条原始消息]
+   *   [summaryMsg（user）, ackMsg（assistant）, ...最近 N 条原始消息]
    *
    * @returns 被删除的消息条数
    */
   compact(summaryMsg, ackMsg, keepLast) {
-    const preserved = this.messages.slice(-keepLast);
-    const removedCount = this.messages.length - preserved.length;
+    let cutIndex = this.messages.length - keepLast;
+    if (cutIndex <= 0) {
+      return 0;
+    }
+    while (cutIndex > 0 && this.messages[cutIndex]?.role === "tool") {
+      cutIndex--;
+    }
+    const preserved = this.messages.slice(cutIndex);
+    const removedCount = cutIndex;
     this.messages = [summaryMsg, ackMsg, ...preserved];
     this.updated = /* @__PURE__ */ new Date();
     return removedCount;
@@ -3687,6 +3698,7 @@ function formatCost(amount) {
 }
 
 // src/session/tool-history.ts
+var SESSION_SIZE_LIMIT = 2 * 1024 * 1024;
 function persistToolRound(session, toolCalls, toolResults, opts) {
   session.addMessage({
     role: "assistant",
@@ -3757,6 +3769,52 @@ function rebuildExtraMessages(provider, toolHistory) {
   }
   return result;
 }
+function trimOldToolOutput(messages, keepRecentRounds = 10) {
+  const roundStarts = [];
+  for (let i = 0; i < messages.length; i++) {
+    if (messages[i].role === "assistant" && messages[i].toolCalls?.length) {
+      roundStarts.push(i);
+    }
+  }
+  if (roundStarts.length <= keepRecentRounds) return 0;
+  const cutoffRoundIdx = roundStarts.length - keepRecentRounds;
+  let trimmed = 0;
+  for (let r = 0; r < cutoffRoundIdx; r++) {
+    const start = roundStarts[r];
+    const end = r + 1 < roundStarts.length ? roundStarts[r + 1] : messages.length;
+    const assistantMsg = messages[start];
+    if (typeof assistantMsg.content === "string" && assistantMsg.content.length > 200) {
+      assistantMsg.content = assistantMsg.content.slice(0, 100) + "\u2026 [trimmed for size]";
+      trimmed++;
+    }
+    for (let j = start + 1; j < end; j++) {
+      const msg = messages[j];
+      if (msg.role === "tool") {
+        const status = msg.isError ? "\u2717 error" : "\u2713 ok";
+        const name = msg.toolName ?? "unknown";
+        const currentContent = typeof msg.content === "string" ? msg.content : "";
+        if (currentContent.length > 200) {
+          msg.content = `[${name}: ${status}] (output trimmed for size \u2014 ${currentContent.length} chars)`;
+          trimmed++;
+        }
+      }
+    }
+  }
+  return trimmed;
+}
+function autoTrimSessionIfNeeded(session, sizeLimit = SESSION_SIZE_LIMIT) {
+  const json = JSON.stringify(session.toJSON());
+  if (json.length <= sizeLimit) return false;
+  let keepRecent = 10;
+  while (keepRecent >= 2) {
+    const trimmed = trimOldToolOutput(session.messages, keepRecent);
+    if (trimmed === 0) break;
+    const newSize = JSON.stringify(session.toJSON()).length;
+    if (newSize <= sizeLimit) return true;
+    keepRecent = Math.max(2, Math.floor(keepRecent / 2));
+  }
+  return true;
+}
 
 // src/repl/dev-state.ts
 import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync3, unlinkSync as unlinkSync2, mkdirSync as mkdirSync4 } from "fs";
@@ -3871,6 +3929,7 @@ export {
   persistToolRound,
   extractToolHistory,
   rebuildExtraMessages,
+  autoTrimSessionIfNeeded,
   SNAPSHOT_PROMPT,
   sessionHasMeaningfulContent,
   saveDevState,

package/dist/{chunk-2DWWB4KD.js → chunk-LLI6COMK.js}

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

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

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

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

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

package/dist/index.js

@@ -8,6 +8,7 @@ import {
   SessionManager,
   SkillManager,
   TOOL_CALL_REMINDER,
+  autoTrimSessionIfNeeded,
   buildPhantomCorrectionMessage,
   buildWriteRoundReminder,
   clearDevState,
@@ -30,11 +31,12 @@ import {
   saveDevState,
   sessionHasMeaningfulContent,
   setupProxy
-} from "./chunk-3YVHYAXK.js";
+} from "./chunk-6OTF2ILP.js";
 import {
   ToolExecutor,
   ToolRegistry,
   askUserContext,
+  estimateTokens,
   googleSearchContext,
   initTheme,
   lastResponseStore,
@@ -44,7 +46,7 @@ import {
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-C32FFHMY.js";
+} from "./chunk-672OV76Z.js";
 import {
   fileCheckpoints
 } from "./chunk-4BKXL7SM.js";
@@ -69,7 +71,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-2DWWB4KD.js";
+} from "./chunk-LLI6COMK.js";
 
 // src/index.ts
 import { program } from "commander";
@@ -2164,7 +2166,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-QGJHXL5Z.js");
+          const { executeTests } = await import("./run-tests-ORVJAUJG.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -3910,6 +3912,11 @@ ${skillContent}`);
       "4. Current status and tasks not yet completed",
       "5. Key details to remember (file paths, config values, error messages, variable names, etc.)",
       "",
+      "If the conversation contains tool call rounds (assistant calling tools like read_file, write_file, bash, etc.), ",
+      'summarize each round as a single line: "- [tool_name] target \u2192 result/status". ',
+      'Do NOT include raw tool output. Group consecutive similar operations (e.g., "read 5 files in src/") ',
+      "instead of listing each one individually.",
+      "",
       "Requirements: Be well-organized so that subsequent conversation can seamlessly continue from this summary."
     ];
     if (instruction) summaryPromptLines.push("", `Additional requirement: ${instruction}`);
@@ -4317,6 +4324,9 @@ Session '${this.resumeSessionId}' not found.
         await this.handleChatSimple(provider, session.messages);
       }
       if (this.config.get("session").autoSave) {
+        if (autoTrimSessionIfNeeded(session)) {
+          process.stderr.write(theme.dim("  [session] Trimmed old tool output to reduce file size\n"));
+        }
         await this.sessions.save();
       }
       const elapsed = Date.now() - t0;
@@ -4399,7 +4409,7 @@ Session '${this.resumeSessionId}' not found.
    * 混合 CJK / ASCII 文本平均约 2.5 字符 = 1 token（与 renderer.ts 中的估算公式一致）。
    */
   estimateTokens(text) {
-    return Math.ceil(text.length / 2.5);
+    return estimateTokens(text);
   }
   /**
    * 估算当前对话的总 token 消耗（system prompt + 所有 session messages）。
@@ -4418,6 +4428,11 @@ Session '${this.resumeSessionId}' not found.
             if (part.type === "text" && part.text) total += this.estimateTokens(part.text);
           }
         }
+        if (msg.toolCalls) {
+          for (const tc of msg.toolCalls) {
+            total += this.estimateTokens(JSON.stringify(tc.arguments));
+          }
+        }
       }
     }
     return total;
@@ -4856,6 +4871,8 @@ Session '${this.resumeSessionId}' not found.
   async handleChatWithTools(provider, messages) {
     const session = this.sessions.current;
     let toolDefs;
+    let mcpBudgetNote = null;
+    const usedMcpToolNames = /* @__PURE__ */ new Set();
     if (this.planMode) {
       toolDefs = this.toolRegistry.getDefinitions().filter((t) => PLAN_MODE_READONLY_TOOLS.has(t.name));
     } else {
@@ -4863,7 +4880,19 @@ Session '${this.resumeSessionId}' not found.
       if (skillFilter) {
         toolDefs = this.toolRegistry.getDefinitions().filter((t) => skillFilter.has(t.name));
       } else {
-        toolDefs = this.toolRegistry.getDefinitions();
+        const contextWindow = this.getContextWindowSize();
+        if (contextWindow > 0) {
+          const toolBudget = Math.floor(contextWindow * 0.2);
+          const { definitions, trimmedCount, systemNote } = this.toolRegistry.getDefinitionsWithBudget(toolBudget, usedMcpToolNames);
+          toolDefs = definitions;
+          mcpBudgetNote = systemNote;
+          if (trimmedCount > 0) {
+            process.stderr.write(theme.dim(`  [MCP budget] ${trimmedCount} MCP tool(s) trimmed to fit ${toolBudget.toLocaleString()} token budget
+`));
+          }
+        } else {
+          toolDefs = this.toolRegistry.getDefinitions();
+        }
       }
     }
     if (this.allowedTools) {
@@ -4898,7 +4927,9 @@ You have a maximum of ${maxToolRounds} tool call rounds for this task. Plan effi
 - Do NOT read the same file more than once \u2014 use the content from previous reads.
 - Prioritize the most critical tasks first in case rounds run out.
 - When remaining rounds are low, focus on completing the current task and summarizing.${pauseHint}`;
-    const systemPrompt = baseSystemPrompt + roundBudgetHint;
+    const systemPrompt = baseSystemPrompt + roundBudgetHint + (mcpBudgetNote ? `
+
+${mcpBudgetNote}` : "");
     const modelParams = this.getModelParams();
     const useStreaming = this.config.get("ui").streaming;
     const spinner = this.renderer.showSpinner("Thinking...");
@@ -5264,6 +5295,9 @@ You have a maximum of ${maxToolRounds} tool call rounds for this task. Plan effi
         const reasoningContent = "reasoningContent" in result ? result.reasoningContent : void 0;
         const newMsgs = provider.buildToolResultMessages(result.toolCalls, toolResults, reasoningContent);
         extraMessages.push(...newMsgs);
+        for (const tc of result.toolCalls) {
+          if (tc.name.startsWith("mcp__")) usedMcpToolNames.add(tc.name);
+        }
         const streamedContent = "content" in result ? result.content : void 0;
         persistToolRound(session, result.toolCalls, toolResults, {
           assistantContent: streamedContent,
@@ -5704,7 +5738,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-L2XJYXMB.js");
+  const { startWebServer } = await import("./server-HBAOUOIC.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) => {
@@ -5937,7 +5971,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-JTMNY7JR.js");
+  const { startHub } = await import("./hub-2XLQSZY2.js");
   await startHub(
     {
       topic: topic ?? "",

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

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

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

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

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

@@ -7,6 +7,7 @@ import {
   SessionManager,
   SkillManager,
   TOOL_CALL_REMINDER,
+  autoTrimSessionIfNeeded,
   computeCost,
   detectsHallucinatedFileOp,
   extractToolHistory,
@@ -20,7 +21,7 @@ import {
   persistToolRound,
   rebuildExtraMessages,
   setupProxy
-} from "./chunk-3YVHYAXK.js";
+} from "./chunk-6OTF2ILP.js";
 import {
   AuthManager
 } from "./chunk-BYNY5JPB.js";
@@ -29,6 +30,7 @@ import {
   ToolRegistry,
   askUserContext,
   checkPermission,
+  estimateTokens,
   getDangerLevel,
   googleSearchContext,
   isFileWriteTool,
@@ -39,7 +41,7 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-C32FFHMY.js";
+} from "./chunk-672OV76Z.js";
 import "./chunk-4BKXL7SM.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -59,7 +61,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-2DWWB4KD.js";
+} from "./chunk-LLI6COMK.js";
 
 // src/web/server.ts
 import express from "express";
@@ -657,7 +659,7 @@ var SessionHandler = class _SessionHandler {
   }
   /** 粗略估算文本 token 数（2.5 chars/token）*/
   estTokens(text) {
-    return Math.ceil(text.length / 2.5);
+    return estimateTokens(text);
   }
   /**
    * 估算当前 agentic 请求总 token 数（session messages + extraMessages + system prompt）。
@@ -678,6 +680,11 @@ var SessionHandler = class _SessionHandler {
             }
           }
         }
+        if (msg.toolCalls) {
+          for (const tc of msg.toolCalls) {
+            total += this.estTokens(JSON.stringify(tc.arguments));
+          }
+        }
       }
     }
     if (extraMessages.length > 0) {
@@ -691,6 +698,7 @@ var SessionHandler = class _SessionHandler {
   /** Save session only if it exists and has messages (never persist empty "Untitled" sessions). */
   saveIfNeeded() {
     if (this.sessions.current && this.sessions.current.messages.length > 0) {
+      autoTrimSessionIfNeeded(this.sessions.current);
       const id = this.sessions.current.id;
       this.sessions.save();
       this.unsavedSessions.delete(id);
@@ -748,9 +756,9 @@ var SessionHandler = class _SessionHandler {
         return;
       }
       const hasToolSupport = typeof provider.chatWithTools === "function";
-      const toolDefs = hasToolSupport ? this.getFilteredToolDefs() : [];
+      const { toolDefs, mcpBudgetNote } = hasToolSupport ? this.getFilteredToolDefs() : { toolDefs: [], mcpBudgetNote: null };
       if (hasToolSupport && toolDefs.length > 0) {
-        await this.handleChatWithTools(provider, session.messages, toolDefs);
+        await this.handleChatWithTools(provider, session.messages, toolDefs, mcpBudgetNote);
       } else {
         await this.handleChatSimple(provider, session.messages);
       }
@@ -815,7 +823,7 @@ var SessionHandler = class _SessionHandler {
       this.abortController = null;
     }
   }
-  async handleChatWithTools(provider, messages, toolDefs) {
+  async handleChatWithTools(provider, messages, toolDefs, mcpBudgetNote) {
     const session = this.sessions.current;
     const { baseMessages: cleanMessages, toolHistory } = extractToolHistory(messages);
     const apiMessages = [...cleanMessages];
@@ -833,7 +841,9 @@ You have a maximum of ${maxToolRounds} tool call rounds for this task. Plan effi
 - Prefer batch operations (e.g. global find-and-replace) over repetitive single edits.
 - Prioritize the most critical tasks first in case rounds run out.
 - When remaining rounds are low, focus on completing the current task and summarizing.${pauseHint}`;
-    const systemPrompt = baseSystemPrompt + roundBudgetHint;
+    const systemPrompt = baseSystemPrompt + roundBudgetHint + (mcpBudgetNote ? `
+
+${mcpBudgetNote}` : "");
     const modelParams = this.getModelParams();
     const roundUsage = { inputTokens: 0, outputTokens: 0, cacheCreationTokens: 0, cacheReadTokens: 0 };
     const supportsStreamingTools = typeof provider.chatWithToolsStream === "function";
@@ -1923,7 +1933,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-QGJHXL5Z.js");
+          const { executeTests } = await import("./run-tests-ORVJAUJG.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -2440,11 +2450,18 @@ Add .md files to create commands.` });
   sendSessionMessages() {
     const session = this.sessions.current;
     if (!session) return;
-    const messages = session.messages.map((m) => ({
-      role: m.role,
-      content: getContentText(m.content),
-      timestamp: m.timestamp?.toISOString()
-    }));
+    const messages = session.messages.map((m) => {
+      const out = {
+        role: m.role,
+        content: getContentText(m.content),
+        timestamp: m.timestamp?.toISOString()
+      };
+      if (m.toolCalls) out.toolCalls = m.toolCalls;
+      if (m.toolCallId) out.toolCallId = m.toolCallId;
+      if (m.toolName) out.toolName = m.toolName;
+      if (m.isError !== void 0) out.isError = m.isError;
+      return out;
+    });
     this.send({
       type: "session_messages",
       sessionId: session.id,
@@ -2504,16 +2521,26 @@ Add .md files to create commands.` });
     };
   }
   getFilteredToolDefs() {
-    let defs = this.toolRegistry.getDefinitions();
     if (this.planMode) {
-      defs = defs.filter((t) => PLAN_MODE_READONLY_TOOLS.has(t.name));
-    } else {
-      const skillFilter = this.skillManager?.getActiveToolFilter();
-      if (skillFilter) {
-        defs = defs.filter((t) => skillFilter.has(t.name));
-      }
+      return {
+        toolDefs: this.toolRegistry.getDefinitions().filter((t) => PLAN_MODE_READONLY_TOOLS.has(t.name)),
+        mcpBudgetNote: null
+      };
+    }
+    const skillFilter = this.skillManager?.getActiveToolFilter();
+    if (skillFilter) {
+      return {
+        toolDefs: this.toolRegistry.getDefinitions().filter((t) => skillFilter.has(t.name)),
+        mcpBudgetNote: null
+      };
+    }
+    const contextWindow = this.getContextWindowSize();
+    if (contextWindow > 0) {
+      const toolBudget = Math.floor(contextWindow * 0.2);
+      const { definitions, systemNote } = this.toolRegistry.getDefinitionsWithBudget(toolBudget);
+      return { toolDefs: definitions, mcpBudgetNote: systemNote };
     }
-    return defs;
+    return { toolDefs: this.toolRegistry.getDefinitions(), mcpBudgetNote: null };
   }
   /**
    * Find first matching context file in a directory.

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

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

package/dist/web/client/app.js

@@ -717,6 +717,49 @@ function escapeHtml(str) {
   return div.innerHTML;
 }
 
+/**
+ * Create a static tool-call card for session history view.
+ * Groups an assistant tool-call message with its subsequent tool results.
+ * Unlike live tool cards, these have no timer — just the final state.
+ *
+ * @param {Object} assistantMsg - The assistant message with toolCalls array
+ * @param {Object[]} resultMsgs - Subsequent tool-result messages
+ */
+function createHistoryToolCards(assistantMsg, resultMsgs) {
+  const toolCalls = assistantMsg.toolCalls || [];
+  for (let i = 0; i < toolCalls.length; i++) {
+    const tc = toolCalls[i];
+    const rm = resultMsgs[i]; // may be undefined if results are missing
+    const isError = rm ? rm.isError : false;
+    const resultContent = rm ? rm.content : '';
+
+    const el = document.createElement('details');
+    el.className = 'tool-card tool-border-safe my-1';
+
+    const statusIcon = rm ? (isError ? '✗' : '✓') : '?';
+    const statusClass = rm ? (isError ? 'text-error' : 'text-success') : 'opacity-50';
+    const badgeClass = isError ? 'badge-error' : 'badge-info';
+    const levelIcon = isError ? '⚠' : '⚙';
+
+    const argsHtml = tc.arguments ? formatToolArgs(tc.arguments) : '';
+    const truncResult = resultContent.length > 500
+      ? resultContent.slice(0, 500) + '...'
+      : resultContent;
+
+    el.innerHTML = `
+      <summary class="flex items-center gap-2 w-full cursor-pointer select-none py-1">
+        <span class="badge ${badgeClass} badge-sm gap-1">${levelIcon} ${escapeHtml(tc.name)}</span>
+        <span class="tool-result-badge text-xs ml-auto ${statusClass}">${statusIcon}</span>
+      </summary>
+      <div class="tool-details-body pt-1">
+        ${argsHtml ? `<div class="tool-args w-full">${argsHtml}</div>` : ''}
+        ${rm ? `<div class="tool-result-content mt-2 pt-2 border-t border-base-content/10 w-full ${isError ? 'text-error' : 'text-success'}">${statusIcon} ${escapeHtml(truncResult)}</div>` : ''}
+      </div>
+    `;
+    messagesEl.appendChild(el);
+  }
+}
+
 function scrollToBottom() {
   requestAnimationFrame(() => {
     chatArea.scrollTop = chatArea.scrollHeight;
@@ -1074,6 +1117,56 @@ function updateBatchBar() {
  * write it into the tab's `messagesHtml` cache; the live DOM is left
  * untouched so the active tab's content never flashes wrong data.
  */
+
+/**
+ * Render a messages array into the live DOM (messagesEl).
+ * Handles user, assistant (text), assistant (toolCalls), and tool result messages.
+ * Groups consecutive assistant+toolCalls with subsequent tool results into cards.
+ */
+function renderMessagesArray(messages) {
+  let i = 0;
+  while (i < messages.length) {
+    const m = messages[i];
+    if (m.role === 'user') {
+      addUserMessage(m.content);
+      i++;
+    } else if (m.role === 'assistant' && m.toolCalls && m.toolCalls.length > 0) {
+      // Assistant message with tool calls — collect subsequent tool results
+      const resultMsgs = [];
+      let j = i + 1;
+      while (j < messages.length && messages[j].role === 'tool') {
+        resultMsgs.push(messages[j]);
+        j++;
+      }
+      // If the assistant also had text content, render it first
+      if (m.content && m.content.trim()) {
+        const el = createAssistantMessage();
+        renderMarkdown(el, m.content);
+      }
+      createHistoryToolCards(m, resultMsgs);
+      i = j;
+    } else if (m.role === 'tool') {
+      // Orphan tool result (no preceding assistant+toolCalls) — render as info card
+      const statusIcon = m.isError ? '✗' : '✓';
+      const statusClass = m.isError ? 'text-error' : 'text-success';
+      const el = document.createElement('div');
+      el.className = `tool-card tool-border-safe my-1 p-2 ${statusClass}`;
+      const toolLabel = m.toolName ? escapeHtml(m.toolName) : 'tool';
+      const truncContent = m.content && m.content.length > 300
+        ? m.content.slice(0, 300) + '...' : (m.content || '');
+      el.innerHTML = `<span class="badge badge-info badge-sm">${toolLabel}</span> ${statusIcon} ${escapeHtml(truncContent)}`;
+      messagesEl.appendChild(el);
+      i++;
+    } else if (m.role === 'assistant') {
+      const el = createAssistantMessage();
+      renderMarkdown(el, m.content);
+      i++;
+    } else {
+      // system or unknown — skip
+      i++;
+    }
+  }
+}
 function renderSessionMessages(msg) {
   // Back-compat: if called with a bare array (legacy), treat as active-tab apply
   const messages = Array.isArray(msg) ? msg : msg.messages;
@@ -1096,14 +1189,7 @@ function renderSessionMessages(msg) {
     // Active tab: paint directly into the live DOM (preserves any in-flight
     // streaming helpers that rely on messagesEl)
     messagesEl.innerHTML = '';
-    for (const m of messages) {
-      if (m.role === 'user') {
-        addUserMessage(m.content);
-      } else if (m.role === 'assistant') {
-        const el = createAssistantMessage();
-        renderMarkdown(el, m.content);
-      }
-    }
+    renderMessagesArray(messages);
     scrollToBottom();
     // Snapshot into cache so subsequent tab-snapshots see the latest content
     sessionTabs[targetIdx].messagesHtml = messagesEl.innerHTML;
@@ -1136,14 +1222,7 @@ function buildMessagesHtmlOffDom(messages) {
     currentAssistantContent = '';
     currentThinkingEl = null;
     currentThinkingContent = '';
-    for (const m of messages) {
-      if (m.role === 'user') {
-        addUserMessage(m.content);
-      } else if (m.role === 'assistant') {
-        const el = createAssistantMessage();
-        renderMarkdown(el, m.content);
-      }
-    }
+    renderMessagesArray(messages);
     return messagesEl.innerHTML;
   } finally {
     messagesEl.innerHTML = savedHtml;

package/package.json

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