@ww_nero/mini-cli 1.0.102 → 1.0.103

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ww_nero/mini-cli",
-  "version": "1.0.102",
+  "version": "1.0.103",
   "description": "极简的 AI 命令行助手",
   "bin": {
     "mini": "bin/mini.js"

package/src/chat.js

@@ -760,6 +760,145 @@ const startChatSession = async ({
     loadingPromptVisible = false;
   };
 
+  const displayToolExecutionResult = (functionName, toolResult, rawToolContent) => {
+    if (functionName === 'write') {
+      const writeOutput = formatWriteOutput(toolResult);
+      if (writeOutput.isError) {
+        console.log(chalk.red(formatTreeResult(writeOutput.message)));
+      } else {
+        console.log(chalk.gray(formatTreeResult(`已写入，共${writeOutput.lineCount}行`)));
+      }
+      return;
+    }
+
+    if (functionName === 'edit') {
+      const editOutput = formatEditOutput(toolResult);
+      if (editOutput.isError) {
+        console.log(chalk.red(indentToolResult(editOutput.message)));
+      } else if (editOutput.diff) {
+        console.log(editOutput.diff);
+      }
+      return;
+    }
+
+    if (functionName === 'read') {
+      const isError = rawToolContent.startsWith('[Error]');
+      if (isError) {
+        console.log(chalk.red(formatTreeResult(rawToolContent.replace('[Error] ', ''))));
+      } else {
+        const normalized = rawToolContent.replace(/\r\n/g, '\n').replace(/\r/g, '\n').trim();
+        const lineCount = countLines(normalized);
+        console.log(chalk.gray(formatTreeResult(`已读取，共${lineCount}行`)));
+      }
+      return;
+    }
+
+    const isError = rawToolContent.startsWith('[Error]');
+    const displayResult = formatToolResultForDisplay(rawToolContent, 100);
+    if (displayResult) {
+      console.log((isError ? chalk.red : chalk.gray)(formatTreeResult(displayResult.replace('[Error] ', ''))));
+    }
+  };
+
+  const executeToolCallAndAppendResult = async (toolCall, { ensureNotAborted } = {}) => {
+    if (typeof ensureNotAborted === 'function') {
+      ensureNotAborted();
+    }
+
+    const functionName = toolCall?.function?.name || 'unknown_tool';
+    const rawArgs = toolCall?.function?.arguments || '';
+    const parsedArgs = safeJsonParse(rawArgs);
+    const handler = toolHandlers[functionName];
+    const displayArgs = parsedArgs && typeof parsedArgs === 'object'
+      ? parsedArgs
+      : { raw: typeof rawArgs === 'string' ? rawArgs : '' };
+
+    renderToolCall({ functionName, args: displayArgs }, mcpToolNames);
+
+    let toolResult;
+    if (!parsedArgs || typeof parsedArgs !== 'object') {
+      toolResult = '工具调用失败：参数解析错误';
+    } else if (!handler) {
+      toolResult = `工具 ${functionName} 未实现`;
+    } else {
+      showLoadingPrompt();
+      try {
+        toolResult = await handler(parsedArgs);
+      } catch (toolError) {
+        toolResult = `[Error] 工具执行异常: ${toolError.message}`;
+      } finally {
+        clearLoadingPrompt();
+      }
+    }
+
+    const rawToolContent = stringifyToolResult(toolResult);
+    const toolContent = enforceToolOutputLimit(rawToolContent, toolOutputTokenLimit);
+
+    displayToolExecutionResult(functionName, toolResult, rawToolContent);
+    process.stdout.write('\n');
+
+    messages.push({
+      role: 'tool',
+      tool_call_id: toolCall.id,
+      content: toolContent
+    });
+  };
+
+  const getPendingToolCallsAtTail = () => {
+    let assistantIndex = -1;
+    for (let index = messages.length - 1; index >= 0; index -= 1) {
+      const message = messages[index];
+      if (!message || typeof message !== 'object') {
+        continue;
+      }
+      if (message.role === 'tool') {
+        continue;
+      }
+      assistantIndex = index;
+      break;
+    }
+
+    if (assistantIndex < 0) {
+      return [];
+    }
+
+    const assistantMessage = messages[assistantIndex];
+    const toolCalls = Array.isArray(assistantMessage?.tool_calls) ? assistantMessage.tool_calls.filter(Boolean) : [];
+    if (assistantMessage?.role !== 'assistant' || toolCalls.length === 0) {
+      return [];
+    }
+
+    const completedToolCallIds = new Set();
+    for (let index = assistantIndex + 1; index < messages.length; index += 1) {
+      const message = messages[index];
+      if (!message || typeof message !== 'object') {
+        continue;
+      }
+      if (message.role !== 'tool' || !message.tool_call_id) {
+        return [];
+      }
+      completedToolCallIds.add(message.tool_call_id);
+    }
+
+    return toolCalls.filter((toolCall) => !completedToolCallIds.has(toolCall.id));
+  };
+
+  const resolvePendingToolCallsIfNeeded = async () => {
+    const pendingToolCalls = getPendingToolCallsAtTail();
+    if (pendingToolCalls.length === 0) {
+      return;
+    }
+
+    console.log(chalk.yellow(`检测到上次中断后遗留的 ${pendingToolCalls.length} 个工具调用，正在继续执行...`));
+    process.stdout.write('\n');
+
+    for (const toolCall of pendingToolCalls) {
+      await executeToolCallAndAppendResult(toolCall);
+    }
+
+    persistHistorySafely();
+  };
+
   let inFlightController = null;
   let closing = false;
   let cancelNoticeShown = false;
@@ -880,6 +1019,8 @@ const startChatSession = async ({
       return !slashCommandResult.shouldExit;
     }
 
+    await resolvePendingToolCallsIfNeeded();
+
     const targetEndpoint = modelManager.getActiveEndpoint();
 
     const userMessage = { role: 'user', content: text };
@@ -1009,76 +1150,9 @@ const startChatSession = async ({
           messages.push(assistantMessage);
 
           for (const toolCall of toolCalls) {
-            ensureNotAborted();
-            const functionName = toolCall?.function?.name || 'unknown_tool';
-            const rawArgs = toolCall?.function?.arguments || '';
-            const parsedArgs = safeJsonParse(rawArgs);
-            const handler = toolHandlers[functionName];
-            const displayArgs = parsedArgs && typeof parsedArgs === 'object'
-              ? parsedArgs
-              : { raw: typeof rawArgs === 'string' ? rawArgs : '' };
-
             ensureNewline();
-            renderToolCall({ functionName, args: displayArgs }, mcpToolNames);
-
-            let toolResult;
-
-            if (!parsedArgs || typeof parsedArgs !== 'object') {
-              toolResult = '工具调用失败：参数解析错误';
-            } else if (!handler) {
-              toolResult = `工具 ${functionName} 未实现`;
-            } else {
-              showLoadingPrompt();
-              try {
-                toolResult = await handler(parsedArgs);
-              } catch (toolError) {
-                toolResult = `[Error] 工具执行异常: ${toolError.message}`;
-              } finally {
-                clearLoadingPrompt();
-              }
-            }
-
-            const rawToolContent = stringifyToolResult(toolResult);
-            const toolContent = enforceToolOutputLimit(rawToolContent, toolOutputTokenLimit);
-
-            // Display tool output
-            if (functionName === 'write') {
-              const writeOutput = formatWriteOutput(toolResult);
-              if (writeOutput.isError) {
-                console.log(chalk.red(formatTreeResult(writeOutput.message)));
-              } else {
-                console.log(chalk.gray(formatTreeResult(`已写入，共${writeOutput.lineCount}行`)));
-              }
-            } else if (functionName === 'edit') {
-              const editOutput = formatEditOutput(toolResult);
-              if (editOutput.isError) {
-                console.log(chalk.red(indentToolResult(editOutput.message)));
-              } else if (editOutput.diff) {
-                console.log(editOutput.diff);
-              }
-            } else if (functionName === 'read') {
-              const isError = rawToolContent.startsWith('[Error]');
-              if (isError) {
-                console.log(chalk.red(formatTreeResult(rawToolContent.replace('[Error] ', ''))));
-              } else {
-                const normalized = rawToolContent.replace(/\r\n/g, '\n').replace(/\r/g, '\n').trim();
-                const lineCount = countLines(normalized);
-                console.log(chalk.gray(formatTreeResult(`已读取，共${lineCount}行`)));
-              }
-            } else {
-              const isError = rawToolContent.startsWith('[Error]');
-              const displayResult = formatToolResultForDisplay(rawToolContent, 100);
-              if (displayResult) {
-                console.log((isError ? chalk.red : chalk.gray)(formatTreeResult(displayResult.replace('[Error] ', ''))));
-              }
-            }
-
-            process.stdout.write('\n');
-
-            messages.push({
-              role: 'tool',
-              tool_call_id: toolCall.id,
-              content: toolContent
+            await executeToolCallAndAppendResult(toolCall, {
+              ensureNotAborted
             });
           }
           persistHistorySafely();