jinzd-ai-cli 0.4.99 → 0.4.100

package/dist/{batch-7DMVTZSV.js → batch-6S5U2JDF.js}

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import {
   ConfigManager
-} from "./chunk-UWLEBELB.js";
+} from "./chunk-4Y3CQKOA.js";
 import "./chunk-2ZD3YTVM.js";
-import "./chunk-Y7BS6NOY.js";
+import "./chunk-VUNOH5LH.js";
 
 // src/cli/batch.ts
 import Anthropic from "@anthropic-ai/sdk";

package/dist/{chunk-UWLEBELB.js → chunk-4Y3CQKOA.js}

@@ -8,7 +8,7 @@ import {
   CONFIG_FILE_NAME,
   HISTORY_DIR_NAME,
   PLUGINS_DIR_NAME
-} from "./chunk-Y7BS6NOY.js";
+} from "./chunk-VUNOH5LH.js";
 
 // src/config/config-manager.ts
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";

package/dist/{chunk-PVOAXVZM.js → chunk-7KSCEXT5.js}

@@ -23,7 +23,7 @@ import {
 } from "./chunk-6VRJGH25.js";
 import {
   runTestsTool
-} from "./chunk-P3PTLB4T.js";
+} from "./chunk-NXJF4NTB.js";
 import {
   CONFIG_DIR_NAME,
   DEFAULT_MAX_TOOL_OUTPUT_CHARS_CAP,
@@ -31,7 +31,7 @@ import {
   SUBAGENT_ALLOWED_TOOLS,
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT
-} from "./chunk-Y7BS6NOY.js";
+} from "./chunk-VUNOH5LH.js";
 
 // src/tools/types.ts
 function isFileWriteTool(name) {

package/dist/{chunk-7NWJTFYS.js → chunk-DUTKX4KD.js}

@@ -2,7 +2,7 @@
 import {
   schemaToJsonSchema,
   truncateForPersist
-} from "./chunk-PVOAXVZM.js";
+} from "./chunk-7KSCEXT5.js";
 import {
   AuthError,
   ProviderError,
@@ -21,7 +21,7 @@ import {
   MCP_PROTOCOL_VERSION,
   MCP_TOOL_PREFIX,
   VERSION
-} from "./chunk-Y7BS6NOY.js";
+} from "./chunk-VUNOH5LH.js";
 
 // src/providers/claude.ts
 import Anthropic from "@anthropic-ai/sdk";
@@ -209,10 +209,7 @@ var ClaudeProvider = class extends BaseProvider {
   }
   async chat(request) {
     try {
-      const messages = request.messages.filter((m) => m.role !== "system" && m.role !== "tool" && !m.toolCalls).map((m) => ({
-        role: m.role,
-        content: this.contentToClaudeParts(m.content)
-      }));
+      const messages = this.toClaudeMessagesWithToolHistory(request.messages);
       const { thinking, temperature } = this.buildThinkingParams(request);
       const response = await this.client.messages.create({
         model: request.model,
@@ -234,10 +231,7 @@ var ClaudeProvider = class extends BaseProvider {
   }
   async *chatStream(request) {
     try {
-      const messages = request.messages.filter((m) => m.role !== "system" && m.role !== "tool" && !m.toolCalls).map((m) => ({
-        role: m.role,
-        content: this.contentToClaudeParts(m.content)
-      }));
+      const messages = this.toClaudeMessagesWithToolHistory(request.messages);
       const { thinking, temperature } = this.buildThinkingParams(request);
       const stream = this.client.messages.stream({
         model: request.model,
@@ -291,7 +285,7 @@ var ClaudeProvider = class extends BaseProvider {
           }
         }))
       );
-      const baseMessages = request.messages.filter((m) => m.role !== "system" && m.role !== "tool" && !m.toolCalls).map((m) => ({ role: m.role, content: this.contentToClaudeParts(m.content) }));
+      const baseMessages = this.toClaudeMessagesWithToolHistory(request.messages);
       const extraMessages = request._extraMessages ?? [];
       const allMessages = [...baseMessages, ...extraMessages];
       const { thinking, temperature } = this.buildThinkingParams(request);
@@ -344,7 +338,7 @@ var ClaudeProvider = class extends BaseProvider {
         }
       }))
     );
-    const baseMessages = request.messages.filter((m) => m.role !== "system").map((m) => ({ role: m.role, content: this.contentToClaudeParts(m.content) }));
+    const baseMessages = this.toClaudeMessagesWithToolHistory(request.messages);
     const extraMessages = request._extraMessages ?? [];
     const allMessages = [...baseMessages, ...extraMessages];
     const { thinking, temperature } = this.buildThinkingParams(request);
@@ -456,6 +450,73 @@ var ClaudeProvider = class extends BaseProvider {
       yield { type: "done", usage: { inputTokens: 0, outputTokens: 0 }, rawContent: rawContentBlocks };
     }
   }
+  /**
+   * 将 Message[] 转换为 Anthropic.MessageParam[]，按原始顺序保留历史工具往返。
+   *
+   * v0.4.100+：之前的实现把 role='tool' 和 assistant.toolCalls 全部剥离后塞进
+   * _extraMessages 的尾部，导致跨轮历史的工具调用被插入到当前用户消息之后，
+   * 模型会复读上一轮的"完成汇总"。现在按原始顺序内联编码。
+   *
+   * 注意：历史持久化的 toolCalls 没有原始 thinking blocks（仅当前轮的内存里有），
+   * 故只输出 tool_use 块作为 fallback；当前轮通过 buildToolResultMessages() 仍能
+   * 携带 thinking 信息。
+   */
+  toClaudeMessagesWithToolHistory(messages) {
+    const out = [];
+    let i = 0;
+    while (i < messages.length) {
+      const m = messages[i];
+      if (m.role === "system") {
+        i++;
+        continue;
+      }
+      if (m.role === "assistant" && m.toolCalls && m.toolCalls.length > 0) {
+        const toolCalls = m.toolCalls;
+        const assistantBlocks = [];
+        if (typeof m.content === "string" && m.content.trim()) {
+          assistantBlocks.push({ type: "text", text: m.content });
+        }
+        for (const tc of toolCalls) {
+          assistantBlocks.push({
+            type: "tool_use",
+            id: tc.id,
+            name: tc.name,
+            input: tc.arguments
+          });
+        }
+        out.push({ role: "assistant", content: assistantBlocks });
+        const toolResults = [];
+        let j = i + 1;
+        while (j < messages.length && messages[j].role === "tool") {
+          const tm = messages[j];
+          if (tm.toolCallId) {
+            toolResults.push({
+              type: "tool_result",
+              tool_use_id: tm.toolCallId,
+              content: typeof tm.content === "string" ? tm.content : "",
+              is_error: tm.isError ?? false
+            });
+          }
+          j++;
+        }
+        if (toolResults.length > 0) {
+          out.push({ role: "user", content: toolResults });
+        }
+        i = j;
+        continue;
+      }
+      if (m.role === "tool") {
+        i++;
+        continue;
+      }
+      out.push({
+        role: m.role,
+        content: this.contentToClaudeParts(m.content)
+      });
+      i++;
+    }
+    return out;
+  }
   buildToolResultMessages(assistantToolCalls, results) {
     const rawContent = assistantToolCalls._rawContent;
     let assistantContent;
@@ -602,11 +663,62 @@ var GeminiProvider = class extends BaseProvider {
     }
     return parts.length > 0 ? parts : [{ text: "" }];
   }
+  /**
+   * 将 Message[] 转 Gemini Content[]，按原始顺序保留历史工具往返。
+   *
+   * v0.4.100+：之前过滤掉 role='tool' 和 assistant.toolCalls 后再由 _extraMessages
+   * 拼到末尾，导致跨轮历史的工具调用被插到当前用户消息之后，模型会复读上一轮汇总。
+   */
   toGeminiHistory(messages) {
-    return messages.filter((m) => m.role !== "system" && m.role !== "tool" && !m.toolCalls).map((m) => ({
-      role: m.role === "assistant" ? "model" : "user",
-      parts: this.contentToGeminiParts(m.content)
-    }));
+    const out = [];
+    let i = 0;
+    while (i < messages.length) {
+      const m = messages[i];
+      if (m.role === "system") {
+        i++;
+        continue;
+      }
+      if (m.role === "assistant" && m.toolCalls && m.toolCalls.length > 0) {
+        const modelParts = [];
+        if (typeof m.content === "string" && m.content.trim()) {
+          modelParts.push({ text: m.content });
+        }
+        for (const tc of m.toolCalls) {
+          modelParts.push({ functionCall: { name: tc.name, args: tc.arguments } });
+        }
+        out.push({ role: "model", parts: modelParts });
+        const fnParts = [];
+        let j = i + 1;
+        while (j < messages.length && messages[j].role === "tool") {
+          const tm = messages[j];
+          fnParts.push({
+            functionResponse: {
+              name: tm.toolName ?? "unknown",
+              response: {
+                result: typeof tm.content === "string" ? tm.content : "",
+                isError: tm.isError ?? false
+              }
+            }
+          });
+          j++;
+        }
+        if (fnParts.length > 0) {
+          out.push({ role: "function", parts: fnParts });
+        }
+        i = j;
+        continue;
+      }
+      if (m.role === "tool") {
+        i++;
+        continue;
+      }
+      out.push({
+        role: m.role === "assistant" ? "model" : "user",
+        parts: this.contentToGeminiParts(m.content)
+      });
+      i++;
+    }
+    return out;
   }
   async chat(request) {
     try {
@@ -830,16 +942,49 @@ var OpenAICompatibleProvider = class extends BaseProvider {
     }
     this.client = new OpenAI(clientOptions);
   }
-  /** 将 systemPrompt + messages 合并为 OpenAI messages 数组（system 消息放首位）。 */
+  /**
+   * 将 systemPrompt + messages 合并为 OpenAI messages 数组（system 消息放首位）。
+   *
+   * v0.4.100+：按原始顺序保留工具消息（assistant.toolCalls 和 role='tool'），
+   * 不再剥离到 _extraMessages 末尾——之前的剥离会让历史工具往返被插到当前用户消息之后，
+   * 导致模型把"过去的工具调用结果"当作"对当前问题的回应"，DeepSeek V4 Flash 上尤其明显
+   * （会复读上一轮的"完成汇总"）。
+   *
+   * DeepSeek V4 thinking 模式：所有 assistant 消息（含带 toolCalls 的）必须有
+   * reasoning_content 字段，缺失则 API 400。
+   */
   buildMessages(request) {
-    const filtered = request.messages.filter((m) => m.role !== "tool" && !m.toolCalls);
-    const msgs = filtered.map((m) => {
+    const msgs = [];
+    for (const m of request.messages) {
+      if (m.role === "tool") {
+        if (!m.toolCallId) continue;
+        msgs.push({
+          role: "tool",
+          tool_call_id: m.toolCallId,
+          content: typeof m.content === "string" ? m.content : ""
+        });
+        continue;
+      }
+      if (m.role === "assistant" && m.toolCalls && m.toolCalls.length > 0) {
+        const assistantMsg = {
+          role: "assistant",
+          content: typeof m.content === "string" && m.content ? m.content : null,
+          tool_calls: m.toolCalls.map((tc) => ({
+            id: tc.id,
+            type: "function",
+            function: { name: tc.name, arguments: JSON.stringify(tc.arguments) }
+          })),
+          reasoning_content: m.reasoningContent ?? ""
+        };
+        msgs.push(assistantMsg);
+        continue;
+      }
       const base = { role: m.role, content: m.content };
       if (m.role === "assistant") {
         base.reasoning_content = m.reasoningContent ?? "";
       }
-      return base;
-    });
+      msgs.push(base);
+    }
     const systemContent = [request.systemPrompt, request.systemPromptVolatile].filter(Boolean).join("\n\n---\n\n");
     if (systemContent) {
       return [{ role: "system", content: systemContent }, ...msgs];
@@ -3819,67 +3964,6 @@ function persistToolRound(session, toolCalls, toolResults, opts) {
     });
   }
 }
-function isToolMessage(m) {
-  return m.role === "tool" || !!(m.toolCalls && m.toolCalls.length > 0);
-}
-function extractToolHistory(messages) {
-  const baseMessages = [];
-  const toolHistory = [];
-  for (const m of messages) {
-    if (isToolMessage(m)) {
-      toolHistory.push(m);
-    } else {
-      baseMessages.push(m);
-    }
-  }
-  return { baseMessages, toolHistory };
-}
-function rebuildExtraMessages(provider, toolHistory) {
-  if (toolHistory.length === 0) return [];
-  const result = [];
-  let i = 0;
-  while (i < toolHistory.length) {
-    const msg = toolHistory[i];
-    if (msg.role === "assistant" && msg.toolCalls && msg.toolCalls.length > 0) {
-      const toolCalls = msg.toolCalls;
-      const toolResults = [];
-      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,
-          content: typeof tm.content === "string" ? tm.content : getContentText(tm.content),
-          isError: tm.isError ?? false
-        });
-        j++;
-      }
-      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({
-        role: msg.role,
-        content: typeof msg.content === "string" ? msg.content : getContentText(msg.content)
-      });
-      i++;
-    }
-  }
-  return result;
-}
 function trimOldToolOutput(messages, keepRecentRounds = 10) {
   const roundStarts = [];
   for (let i = 0; i < messages.length; i++) {
@@ -4053,8 +4137,6 @@ export {
   formatCost,
   parseSimpleYaml,
   persistToolRound,
-  extractToolHistory,
-  rebuildExtraMessages,
   autoTrimSessionIfNeeded,
   SNAPSHOT_PROMPT,
   sessionHasMeaningfulContent,

package/dist/{chunk-P3PTLB4T.js → chunk-NXJF4NTB.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   TEST_TIMEOUT
-} from "./chunk-Y7BS6NOY.js";
+} from "./chunk-VUNOH5LH.js";
 
 // src/tools/builtin/run-tests.ts
 import { execSync } from "child_process";

package/dist/{chunk-Y7BS6NOY.js → chunk-VUNOH5LH.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/core/constants.ts
-var VERSION = "0.4.99";
+var VERSION = "0.4.100";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";

package/dist/{chunk-DRUEPDBJ.js → chunk-WWODV2IK.js}

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

package/dist/electron-server.js

@@ -36,7 +36,7 @@ import {
   VERSION,
   buildUserIdentityPrompt,
   runTestsTool
-} from "./chunk-DRUEPDBJ.js";
+} from "./chunk-WWODV2IK.js";
 import {
   hasSemanticIndex,
   semanticSearch
@@ -720,10 +720,7 @@ var ClaudeProvider = class extends BaseProvider {
   }
   async chat(request) {
     try {
-      const messages = request.messages.filter((m) => m.role !== "system" && m.role !== "tool" && !m.toolCalls).map((m) => ({
-        role: m.role,
-        content: this.contentToClaudeParts(m.content)
-      }));
+      const messages = this.toClaudeMessagesWithToolHistory(request.messages);
       const { thinking, temperature } = this.buildThinkingParams(request);
       const response = await this.client.messages.create({
         model: request.model,
@@ -745,10 +742,7 @@ var ClaudeProvider = class extends BaseProvider {
   }
   async *chatStream(request) {
     try {
-      const messages = request.messages.filter((m) => m.role !== "system" && m.role !== "tool" && !m.toolCalls).map((m) => ({
-        role: m.role,
-        content: this.contentToClaudeParts(m.content)
-      }));
+      const messages = this.toClaudeMessagesWithToolHistory(request.messages);
       const { thinking, temperature } = this.buildThinkingParams(request);
       const stream = this.client.messages.stream({
         model: request.model,
@@ -802,7 +796,7 @@ var ClaudeProvider = class extends BaseProvider {
           }
         }))
       );
-      const baseMessages = request.messages.filter((m) => m.role !== "system" && m.role !== "tool" && !m.toolCalls).map((m) => ({ role: m.role, content: this.contentToClaudeParts(m.content) }));
+      const baseMessages = this.toClaudeMessagesWithToolHistory(request.messages);
       const extraMessages = request._extraMessages ?? [];
       const allMessages = [...baseMessages, ...extraMessages];
       const { thinking, temperature } = this.buildThinkingParams(request);
@@ -855,7 +849,7 @@ var ClaudeProvider = class extends BaseProvider {
         }
       }))
     );
-    const baseMessages = request.messages.filter((m) => m.role !== "system").map((m) => ({ role: m.role, content: this.contentToClaudeParts(m.content) }));
+    const baseMessages = this.toClaudeMessagesWithToolHistory(request.messages);
     const extraMessages = request._extraMessages ?? [];
     const allMessages = [...baseMessages, ...extraMessages];
     const { thinking, temperature } = this.buildThinkingParams(request);
@@ -967,6 +961,73 @@ var ClaudeProvider = class extends BaseProvider {
       yield { type: "done", usage: { inputTokens: 0, outputTokens: 0 }, rawContent: rawContentBlocks };
     }
   }
+  /**
+   * 将 Message[] 转换为 Anthropic.MessageParam[]，按原始顺序保留历史工具往返。
+   *
+   * v0.4.100+：之前的实现把 role='tool' 和 assistant.toolCalls 全部剥离后塞进
+   * _extraMessages 的尾部，导致跨轮历史的工具调用被插入到当前用户消息之后，
+   * 模型会复读上一轮的"完成汇总"。现在按原始顺序内联编码。
+   *
+   * 注意：历史持久化的 toolCalls 没有原始 thinking blocks（仅当前轮的内存里有），
+   * 故只输出 tool_use 块作为 fallback；当前轮通过 buildToolResultMessages() 仍能
+   * 携带 thinking 信息。
+   */
+  toClaudeMessagesWithToolHistory(messages) {
+    const out = [];
+    let i = 0;
+    while (i < messages.length) {
+      const m = messages[i];
+      if (m.role === "system") {
+        i++;
+        continue;
+      }
+      if (m.role === "assistant" && m.toolCalls && m.toolCalls.length > 0) {
+        const toolCalls = m.toolCalls;
+        const assistantBlocks = [];
+        if (typeof m.content === "string" && m.content.trim()) {
+          assistantBlocks.push({ type: "text", text: m.content });
+        }
+        for (const tc of toolCalls) {
+          assistantBlocks.push({
+            type: "tool_use",
+            id: tc.id,
+            name: tc.name,
+            input: tc.arguments
+          });
+        }
+        out.push({ role: "assistant", content: assistantBlocks });
+        const toolResults = [];
+        let j = i + 1;
+        while (j < messages.length && messages[j].role === "tool") {
+          const tm = messages[j];
+          if (tm.toolCallId) {
+            toolResults.push({
+              type: "tool_result",
+              tool_use_id: tm.toolCallId,
+              content: typeof tm.content === "string" ? tm.content : "",
+              is_error: tm.isError ?? false
+            });
+          }
+          j++;
+        }
+        if (toolResults.length > 0) {
+          out.push({ role: "user", content: toolResults });
+        }
+        i = j;
+        continue;
+      }
+      if (m.role === "tool") {
+        i++;
+        continue;
+      }
+      out.push({
+        role: m.role,
+        content: this.contentToClaudeParts(m.content)
+      });
+      i++;
+    }
+    return out;
+  }
   buildToolResultMessages(assistantToolCalls, results) {
     const rawContent = assistantToolCalls._rawContent;
     let assistantContent;
@@ -1113,11 +1174,62 @@ var GeminiProvider = class extends BaseProvider {
     }
     return parts.length > 0 ? parts : [{ text: "" }];
   }
+  /**
+   * 将 Message[] 转 Gemini Content[]，按原始顺序保留历史工具往返。
+   *
+   * v0.4.100+：之前过滤掉 role='tool' 和 assistant.toolCalls 后再由 _extraMessages
+   * 拼到末尾，导致跨轮历史的工具调用被插到当前用户消息之后，模型会复读上一轮汇总。
+   */
   toGeminiHistory(messages) {
-    return messages.filter((m) => m.role !== "system" && m.role !== "tool" && !m.toolCalls).map((m) => ({
-      role: m.role === "assistant" ? "model" : "user",
-      parts: this.contentToGeminiParts(m.content)
-    }));
+    const out = [];
+    let i = 0;
+    while (i < messages.length) {
+      const m = messages[i];
+      if (m.role === "system") {
+        i++;
+        continue;
+      }
+      if (m.role === "assistant" && m.toolCalls && m.toolCalls.length > 0) {
+        const modelParts = [];
+        if (typeof m.content === "string" && m.content.trim()) {
+          modelParts.push({ text: m.content });
+        }
+        for (const tc of m.toolCalls) {
+          modelParts.push({ functionCall: { name: tc.name, args: tc.arguments } });
+        }
+        out.push({ role: "model", parts: modelParts });
+        const fnParts = [];
+        let j = i + 1;
+        while (j < messages.length && messages[j].role === "tool") {
+          const tm = messages[j];
+          fnParts.push({
+            functionResponse: {
+              name: tm.toolName ?? "unknown",
+              response: {
+                result: typeof tm.content === "string" ? tm.content : "",
+                isError: tm.isError ?? false
+              }
+            }
+          });
+          j++;
+        }
+        if (fnParts.length > 0) {
+          out.push({ role: "function", parts: fnParts });
+        }
+        i = j;
+        continue;
+      }
+      if (m.role === "tool") {
+        i++;
+        continue;
+      }
+      out.push({
+        role: m.role === "assistant" ? "model" : "user",
+        parts: this.contentToGeminiParts(m.content)
+      });
+      i++;
+    }
+    return out;
   }
   async chat(request) {
     try {
@@ -1341,16 +1453,49 @@ var OpenAICompatibleProvider = class extends BaseProvider {
     }
     this.client = new OpenAI(clientOptions);
   }
-  /** 将 systemPrompt + messages 合并为 OpenAI messages 数组（system 消息放首位）。 */
+  /**
+   * 将 systemPrompt + messages 合并为 OpenAI messages 数组（system 消息放首位）。
+   *
+   * v0.4.100+：按原始顺序保留工具消息（assistant.toolCalls 和 role='tool'），
+   * 不再剥离到 _extraMessages 末尾——之前的剥离会让历史工具往返被插到当前用户消息之后，
+   * 导致模型把"过去的工具调用结果"当作"对当前问题的回应"，DeepSeek V4 Flash 上尤其明显
+   * （会复读上一轮的"完成汇总"）。
+   *
+   * DeepSeek V4 thinking 模式：所有 assistant 消息（含带 toolCalls 的）必须有
+   * reasoning_content 字段，缺失则 API 400。
+   */
   buildMessages(request) {
-    const filtered = request.messages.filter((m) => m.role !== "tool" && !m.toolCalls);
-    const msgs = filtered.map((m) => {
+    const msgs = [];
+    for (const m of request.messages) {
+      if (m.role === "tool") {
+        if (!m.toolCallId) continue;
+        msgs.push({
+          role: "tool",
+          tool_call_id: m.toolCallId,
+          content: typeof m.content === "string" ? m.content : ""
+        });
+        continue;
+      }
+      if (m.role === "assistant" && m.toolCalls && m.toolCalls.length > 0) {
+        const assistantMsg = {
+          role: "assistant",
+          content: typeof m.content === "string" && m.content ? m.content : null,
+          tool_calls: m.toolCalls.map((tc) => ({
+            id: tc.id,
+            type: "function",
+            function: { name: tc.name, arguments: JSON.stringify(tc.arguments) }
+          })),
+          reasoning_content: m.reasoningContent ?? ""
+        };
+        msgs.push(assistantMsg);
+        continue;
+      }
       const base = { role: m.role, content: m.content };
       if (m.role === "assistant") {
         base.reasoning_content = m.reasoningContent ?? "";
       }
-      return base;
-    });
+      msgs.push(base);
+    }
     const systemContent = [request.systemPrompt, request.systemPromptVolatile].filter(Boolean).join("\n\n---\n\n");
     if (systemContent) {
       return [{ role: "system", content: systemContent }, ...msgs];
@@ -9406,67 +9551,6 @@ function persistToolRound(session, toolCalls, toolResults, opts) {
     });
   }
 }
-function isToolMessage(m) {
-  return m.role === "tool" || !!(m.toolCalls && m.toolCalls.length > 0);
-}
-function extractToolHistory(messages) {
-  const baseMessages = [];
-  const toolHistory = [];
-  for (const m of messages) {
-    if (isToolMessage(m)) {
-      toolHistory.push(m);
-    } else {
-      baseMessages.push(m);
-    }
-  }
-  return { baseMessages, toolHistory };
-}
-function rebuildExtraMessages(provider, toolHistory) {
-  if (toolHistory.length === 0) return [];
-  const result = [];
-  let i = 0;
-  while (i < toolHistory.length) {
-    const msg = toolHistory[i];
-    if (msg.role === "assistant" && msg.toolCalls && msg.toolCalls.length > 0) {
-      const toolCalls = msg.toolCalls;
-      const toolResults = [];
-      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,
-          content: typeof tm.content === "string" ? tm.content : getContentText(tm.content),
-          isError: tm.isError ?? false
-        });
-        j++;
-      }
-      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({
-        role: msg.role,
-        content: typeof msg.content === "string" ? msg.content : getContentText(msg.content)
-      });
-      i++;
-    }
-  }
-  return result;
-}
 function trimOldToolOutput(messages, keepRecentRounds = 10) {
   const roundStarts = [];
   for (let i = 0; i < messages.length; i++) {
@@ -10004,9 +10088,8 @@ var SessionHandler = class _SessionHandler {
   }
   async handleChatWithTools(provider, messages, toolDefs, mcpBudgetNote) {
     const session = this.sessions.current;
-    const { baseMessages: cleanMessages, toolHistory } = extractToolHistory(messages);
-    const apiMessages = [...cleanMessages];
-    const extraMessages = toolHistory.length > 0 ? rebuildExtraMessages(provider, toolHistory) : [];
+    const apiMessages = [...messages];
+    const extraMessages = [];
     const maxToolRounds = this.config.get("maxToolRounds") ?? DEFAULT_MAX_TOOL_ROUNDS;
     const autoPauseIntervalRaw = this.config.get("autoPauseInterval");
     const autoPauseInterval = typeof autoPauseIntervalRaw === "number" ? autoPauseIntervalRaw : 50;
@@ -11402,7 +11485,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-LRPE4YY3.js");
+          const { executeTests } = await import("./run-tests-ASV6RF2W.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {

package/dist/{hub-RUAWQFK2.js → hub-IV5FAEWL.js}

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

package/dist/index.js

@@ -13,7 +13,6 @@ import {
   clearDevState,
   computeCost,
   detectsHallucinatedFileOp,
-  extractToolHistory,
   extractWrittenFilePaths,
   findPhantomClaims,
   formatCost,
@@ -26,14 +25,13 @@ import {
   loadDevState,
   parseSimpleYaml,
   persistToolRound,
-  rebuildExtraMessages,
   saveDevState,
   sessionHasMeaningfulContent,
   setupProxy
-} from "./chunk-7NWJTFYS.js";
+} from "./chunk-DUTKX4KD.js";
 import {
   ConfigManager
-} from "./chunk-UWLEBELB.js";
+} from "./chunk-4Y3CQKOA.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -52,7 +50,7 @@ import {
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-PVOAXVZM.js";
+} from "./chunk-7KSCEXT5.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   fileCheckpoints
@@ -70,7 +68,7 @@ import "./chunk-KJLJPUY2.js";
 import "./chunk-6VRJGH25.js";
 import "./chunk-2DXY7UGF.js";
 import "./chunk-KHYD3WXE.js";
-import "./chunk-P3PTLB4T.js";
+import "./chunk-NXJF4NTB.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   AUTHOR,
@@ -92,7 +90,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-Y7BS6NOY.js";
+} from "./chunk-VUNOH5LH.js";
 
 // src/index.ts
 import { program } from "commander";
@@ -2612,7 +2610,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-B3XHGUVD.js");
+          const { executeTests } = await import("./run-tests-J4UIFHR3.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -5877,9 +5875,8 @@ Session '${this.resumeSessionId}' not found.
     if (this.blockedTools) {
       toolDefs = toolDefs.filter((t) => !this.blockedTools.has(t.name));
     }
-    const { baseMessages: cleanMessages, toolHistory } = extractToolHistory(messages);
-    const apiMessages = [...cleanMessages];
-    const extraMessages = toolHistory.length > 0 ? rebuildExtraMessages(provider, toolHistory) : [];
+    const apiMessages = [...messages];
+    const extraMessages = [];
     const maxToolRounds = this.maxToolRoundsOverride ?? this.config.get("maxToolRounds") ?? DEFAULT_MAX_TOOL_ROUNDS;
     const autoPauseIntervalRaw = this.config.get("autoPauseInterval");
     const autoPauseInterval = typeof autoPauseIntervalRaw === "number" ? autoPauseIntervalRaw : DEFAULT_AUTO_PAUSE_INTERVAL;
@@ -6752,7 +6749,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-EGOEPMSQ.js");
+  const { startWebServer } = await import("./server-QHNF2N2Q.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) => {
@@ -6875,7 +6872,7 @@ program.command("sessions").description("List recent conversation sessions").act
 });
 program.command("batch <action> [arg] [arg2]").description("Anthropic Message Batches: submit | list | status <id> | results <id> [out] | cancel <id>").option("--dry-run", "Parse and validate input without submitting (submit only)").action(async (action, arg, arg2, options) => {
   try {
-    const batch = await import("./batch-7DMVTZSV.js");
+    const batch = await import("./batch-6S5U2JDF.js");
     switch (action) {
       case "submit":
         if (!arg) {
@@ -6918,7 +6915,7 @@ program.command("batch <action> [arg] [arg2]").description("Anthropic Message Ba
   }
 });
 program.command("mcp-serve").description("Start an MCP server over STDIO, exposing aicli's built-in tools to Claude Desktop / Cursor / other MCP clients").option("--allow-destructive", "Allow bash / run_interactive / task_create (always destructive in MCP mode)").option("--allow-outside-cwd", "Allow tool path arguments to escape the sandbox root \u2014 disabled by default").option("--tools <list>", "Comma-separated whitelist of tools to expose (default: all eligible tools)").option("--cwd <path>", "Working directory AND sandbox root (default: current directory)").action(async (options) => {
-  const { startMcpServer } = await import("./server-WCI7SGTN.js");
+  const { startMcpServer } = await import("./server-EMJPXELL.js");
   await startMcpServer({
     allowDestructive: !!options.allowDestructive,
     allowOutsideCwd: !!options.allowOutsideCwd,
@@ -7045,7 +7042,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-RUAWQFK2.js");
+  const { startHub } = await import("./hub-IV5FAEWL.js");
   await startHub(
     {
       topic: topic ?? "",

package/dist/{run-tests-LRPE4YY3.js → run-tests-ASV6RF2W.js}

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

package/dist/{run-tests-B3XHGUVD.js → run-tests-J4UIFHR3.js}

@@ -2,8 +2,8 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-P3PTLB4T.js";
-import "./chunk-Y7BS6NOY.js";
+} from "./chunk-NXJF4NTB.js";
+import "./chunk-VUNOH5LH.js";
 export {
   executeTests,
   runTestsTool

package/dist/{server-WCI7SGTN.js → server-EMJPXELL.js}

@@ -3,7 +3,7 @@ import {
   ToolRegistry,
   getDangerLevel,
   schemaToJsonSchema
-} from "./chunk-PVOAXVZM.js";
+} from "./chunk-7KSCEXT5.js";
 import "./chunk-2ZD3YTVM.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-ANYYM4CF.js";
@@ -12,10 +12,10 @@ import "./chunk-KJLJPUY2.js";
 import "./chunk-6VRJGH25.js";
 import "./chunk-2DXY7UGF.js";
 import "./chunk-KHYD3WXE.js";
-import "./chunk-P3PTLB4T.js";
+import "./chunk-NXJF4NTB.js";
 import {
   VERSION
-} from "./chunk-Y7BS6NOY.js";
+} from "./chunk-VUNOH5LH.js";
 
 // src/mcp/server.ts
 import { createInterface } from "readline";

package/dist/{server-EGOEPMSQ.js → server-QHNF2N2Q.js}

@@ -12,7 +12,6 @@ import {
   autoTrimSessionIfNeeded,
   computeCost,
   detectsHallucinatedFileOp,
-  extractToolHistory,
   formatCost,
   formatGitContextForPrompt,
   getContentText,
@@ -21,12 +20,11 @@ import {
   hadPreviousWriteToolCalls,
   loadDevState,
   persistToolRound,
-  rebuildExtraMessages,
   setupProxy
-} from "./chunk-7NWJTFYS.js";
+} from "./chunk-DUTKX4KD.js";
 import {
   ConfigManager
-} from "./chunk-UWLEBELB.js";
+} from "./chunk-4Y3CQKOA.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -44,7 +42,7 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-PVOAXVZM.js";
+} from "./chunk-7KSCEXT5.js";
 import "./chunk-2ZD3YTVM.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-ANYYM4CF.js";
@@ -53,7 +51,7 @@ import "./chunk-KJLJPUY2.js";
 import "./chunk-6VRJGH25.js";
 import "./chunk-2DXY7UGF.js";
 import "./chunk-KHYD3WXE.js";
-import "./chunk-P3PTLB4T.js";
+import "./chunk-NXJF4NTB.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   AUTHOR,
@@ -72,7 +70,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-Y7BS6NOY.js";
+} from "./chunk-VUNOH5LH.js";
 
 // src/web/server.ts
 import express from "express";
@@ -853,9 +851,8 @@ var SessionHandler = class _SessionHandler {
   }
   async handleChatWithTools(provider, messages, toolDefs, mcpBudgetNote) {
     const session = this.sessions.current;
-    const { baseMessages: cleanMessages, toolHistory } = extractToolHistory(messages);
-    const apiMessages = [...cleanMessages];
-    const extraMessages = toolHistory.length > 0 ? rebuildExtraMessages(provider, toolHistory) : [];
+    const apiMessages = [...messages];
+    const extraMessages = [];
     const maxToolRounds = this.config.get("maxToolRounds") ?? DEFAULT_MAX_TOOL_ROUNDS;
     const autoPauseIntervalRaw = this.config.get("autoPauseInterval");
     const autoPauseInterval = typeof autoPauseIntervalRaw === "number" ? autoPauseIntervalRaw : 50;
@@ -2251,7 +2248,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-B3XHGUVD.js");
+          const { executeTests } = await import("./run-tests-J4UIFHR3.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {

package/dist/{task-orchestrator-EZK6NLQW.js → task-orchestrator-VOWDS3AR.js}

@@ -4,7 +4,7 @@ import {
   getDangerLevel,
   googleSearchContext,
   truncateOutput
-} from "./chunk-PVOAXVZM.js";
+} from "./chunk-7KSCEXT5.js";
 import "./chunk-2ZD3YTVM.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-ANYYM4CF.js";
@@ -13,10 +13,10 @@ import "./chunk-KJLJPUY2.js";
 import "./chunk-6VRJGH25.js";
 import "./chunk-2DXY7UGF.js";
 import "./chunk-KHYD3WXE.js";
-import "./chunk-P3PTLB4T.js";
+import "./chunk-NXJF4NTB.js";
 import {
   SUBAGENT_ALLOWED_TOOLS
-} from "./chunk-Y7BS6NOY.js";
+} from "./chunk-VUNOH5LH.js";
 
 // src/hub/task-orchestrator.ts
 import { createInterface } from "readline";

package/package.json

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