jinzd-ai-cli 0.4.91 → 0.4.92

package/dist/{batch-KZQHKPE5.js → batch-SK2YCZEY.js}

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import {
   ConfigManager
-} from "./chunk-US6MQO6W.js";
+} from "./chunk-ING3NMVR.js";
 import "./chunk-2ZD3YTVM.js";
-import "./chunk-AKCXRW2Q.js";
+import "./chunk-5IL2BHSD.js";
 
 // src/cli/batch.ts
 import Anthropic from "@anthropic-ai/sdk";

package/dist/{chunk-AKCXRW2Q.js → chunk-5IL2BHSD.js}

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

package/dist/{chunk-XQHCCV3A.js → chunk-A4TUAW4J.js}

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

package/dist/{chunk-Z2V6EYPQ.js → chunk-CNI26J5Z.js}

@@ -23,7 +23,7 @@ import {
 } from "./chunk-6VRJGH25.js";
 import {
   runTestsTool
-} from "./chunk-IGNYJUZU.js";
+} from "./chunk-KLSISB52.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-AKCXRW2Q.js";
+} from "./chunk-5IL2BHSD.js";
 
 // src/tools/types.ts
 function isFileWriteTool(name) {
@@ -83,7 +83,7 @@ function schemaToJsonSchema(schema) {
 }
 
 // src/tools/builtin/bash.ts
-import { execSync } from "child_process";
+import { spawn } from "child_process";
 import { existsSync as existsSync2, readdirSync, statSync } from "fs";
 import { platform } from "os";
 import { resolve } from "path";
@@ -203,6 +203,26 @@ var UndoStack = class {
 };
 var undoStack = new UndoStack();
 
+// src/core/interrupt.ts
+var controller = new AbortController();
+var interrupted = false;
+function currentAbortSignal() {
+  return controller.signal;
+}
+function isInterrupted() {
+  return interrupted;
+}
+function requestInterrupt() {
+  interrupted = true;
+  if (!controller.signal.aborted) {
+    controller.abort(new DOMException("User interrupted (Ctrl+C)", "AbortError"));
+  }
+}
+function resetInterrupt() {
+  controller = new AbortController();
+  interrupted = false;
+}
+
 // src/tools/builtin/bash.ts
 var IS_WINDOWS = platform() === "win32";
 var SHELL = IS_WINDOWS ? "powershell.exe" : process.env["SHELL"] ?? "/bin/bash";
@@ -285,21 +305,40 @@ Important rules:
       parsedTargetsBefore.set(t, existsSync2(t));
     }
     try {
-      const output = execSync(actualCommand, {
-        timeout,
-        encoding: IS_WINDOWS ? "buffer" : "utf-8",
-        stdio: ["pipe", "pipe", "pipe"],
-        cwd: effectiveCwd,
-        shell: SHELL,
-        env: {
-          ...process.env,
-          PYTHONUTF8: "1",
-          PYTHONIOENCODING: "utf-8"
+      const { stdout, stderr, status, signal, timedOut, aborted } = await runShell(
+        actualCommand,
+        {
+          timeout,
+          cwd: effectiveCwd,
+          env: {
+            ...process.env,
+            PYTHONUTF8: "1",
+            PYTHONIOENCODING: "utf-8"
+          }
         }
-      });
+      );
+      if (aborted) {
+        pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, effectiveCwd);
+        throw new ToolError(
+          "bash",
+          `Command interrupted by user (Ctrl+C).
+
+[The user pressed Ctrl+C while this command was running. Stop the current task, summarize what was done so far, and wait for the user's next instruction. Do NOT retry this command or continue with further tool calls unless explicitly asked.]`
+        );
+      }
+      if (status !== 0 || timedOut) {
+        throw {
+          status,
+          signal,
+          code: timedOut ? "ETIMEDOUT" : void 0,
+          stdout,
+          stderr,
+          message: timedOut ? "ETIMEDOUT" : `exit ${status}`
+        };
+      }
       updateCwdFromCommand(command, effectiveCwd);
       pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, effectiveCwd);
-      const result = IS_WINDOWS && Buffer.isBuffer(output) ? output.toString("utf-8") : output;
+      const result = IS_WINDOWS && Buffer.isBuffer(stdout) ? stdout.toString("utf-8") : stdout;
       return result || "(command completed with no output)";
     } catch (err) {
       pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, effectiveCwd);
@@ -419,6 +458,84 @@ function pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, cwd) {
     }
   }
 }
+function runShell(command, opts) {
+  return new Promise((resolvePromise) => {
+    const shellArgs = IS_WINDOWS ? ["-NoProfile", "-NonInteractive", "-Command", command] : ["-c", command];
+    const child = spawn(SHELL, shellArgs, {
+      cwd: opts.cwd,
+      env: opts.env,
+      windowsHide: true,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    const stdoutChunks = [];
+    const stderrChunks = [];
+    let timedOut = false;
+    let aborted = false;
+    let settled = false;
+    child.stdout?.on("data", (chunk) => stdoutChunks.push(chunk));
+    child.stderr?.on("data", (chunk) => stderrChunks.push(chunk));
+    const timeoutTimer = setTimeout(() => {
+      timedOut = true;
+      killChild(child);
+    }, opts.timeout);
+    const signal = currentAbortSignal();
+    const onAbort = () => {
+      aborted = true;
+      killChild(child);
+    };
+    if (signal.aborted) {
+      onAbort();
+    } else {
+      signal.addEventListener("abort", onAbort, { once: true });
+    }
+    const cleanup = () => {
+      clearTimeout(timeoutTimer);
+      signal.removeEventListener("abort", onAbort);
+    };
+    child.on("error", (err) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      stderrChunks.push(Buffer.from(String(err.message ?? err)));
+      resolvePromise({
+        stdout: Buffer.concat(stdoutChunks),
+        stderr: Buffer.concat(stderrChunks),
+        status: null,
+        signal: null,
+        timedOut,
+        aborted
+      });
+    });
+    child.on("close", (code, sig) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      resolvePromise({
+        stdout: Buffer.concat(stdoutChunks),
+        stderr: Buffer.concat(stderrChunks),
+        status: code,
+        signal: sig,
+        timedOut,
+        aborted
+      });
+    });
+  });
+}
+function killChild(child) {
+  if (child.killed || child.exitCode !== null) return;
+  try {
+    child.kill("SIGTERM");
+  } catch {
+  }
+  setTimeout(() => {
+    if (!child.killed && child.exitCode === null) {
+      try {
+        child.kill("SIGKILL");
+      } catch {
+      }
+    }
+  }, 500).unref();
+}
 function updateCwdFromCommand(command, baseCwd) {
   const cdMatches = [...command.matchAll(/(?:^|[;&|])\s*cd\s+(['"]?)([^\s;&|'"]+)\1/g)];
   if (cdMatches.length === 0) return;
@@ -1012,7 +1129,7 @@ function simpleDiff(oldLines, newLines) {
 }
 
 // src/tools/hooks.ts
-import { execSync as execSync2 } from "child_process";
+import { execSync } from "child_process";
 function shellEscape(value) {
   return "'" + value.replace(/'/g, "'\\''") + "'";
 }
@@ -1024,7 +1141,7 @@ function runHook(template, vars) {
   cmd = cmd.replace(/\{args\}/g, shellEscape(vars.args ?? ""));
   cmd = cmd.replace(/\{status\}/g, shellEscape(vars.status ?? ""));
   try {
-    execSync2(cmd, {
+    execSync(cmd, {
       timeout: 5e3,
       stdio: ["pipe", "pipe", "pipe"],
       encoding: "utf-8"
@@ -1247,6 +1364,11 @@ var ToolExecutor = class {
    * 防止用户输入 "y"+Enter 被同时触发 once('line') 和主循环 on('line')。
    */
   confirming = false;
+  /**
+   * Tool 执行进行中标志（executeAll 的生命周期）。
+   * repl.ts 的 SIGINT handler 在此为 true 时触发全局 interrupt（而不是退出程序）。
+   */
+  running = false;
   /** 在 confirm 期间用户输入的 slash 命令，由 repl.ts 主循环消费 */
   pendingSlashCommand = null;
   /** confirm() 的取消回调，由 SIGINT handler 调用 */
@@ -1381,25 +1503,30 @@ var ToolExecutor = class {
     }
   }
   async executeAll(calls) {
-    const phase = groupCallsByPhase(calls);
-    const results = new Array(calls.length);
-    const elapsed = await runSafePhases(phase, (c) => this.execute(c), results, "executor");
-    if (phase.safeParallel.length >= 2) {
-      console.log(theme.dim(`  \u26A1 ${phase.safeParallel.length} tools executed in parallel (${elapsed}ms)`));
-    }
-    if (phase.fileWriteCalls.length === 1) {
-      const { idx, call } = phase.fileWriteCalls[0];
-      results[idx] = await this.execute(call);
-    } else if (phase.fileWriteCalls.length >= 2) {
-      const batchResults = await this.executeBatchFileWrites(phase.fileWriteCalls.map((f) => f.call));
-      for (let i = 0; i < phase.fileWriteCalls.length; i++) {
-        results[phase.fileWriteCalls[i].idx] = batchResults[i];
+    this.running = true;
+    try {
+      const phase = groupCallsByPhase(calls);
+      const results = new Array(calls.length);
+      const elapsed = await runSafePhases(phase, (c) => this.execute(c), results, "executor");
+      if (phase.safeParallel.length >= 2) {
+        console.log(theme.dim(`  \u26A1 ${phase.safeParallel.length} tools executed in parallel (${elapsed}ms)`));
       }
+      if (phase.fileWriteCalls.length === 1) {
+        const { idx, call } = phase.fileWriteCalls[0];
+        results[idx] = await this.execute(call);
+      } else if (phase.fileWriteCalls.length >= 2) {
+        const batchResults = await this.executeBatchFileWrites(phase.fileWriteCalls.map((f) => f.call));
+        for (let i = 0; i < phase.fileWriteCalls.length; i++) {
+          results[phase.fileWriteCalls[i].idx] = batchResults[i];
+        }
+      }
+      for (const { idx, call } of phase.otherCalls) {
+        results[idx] = await this.execute(call);
+      }
+      return results;
+    } finally {
+      this.running = false;
     }
-    for (const { idx, call } of phase.otherCalls) {
-      results[idx] = await this.execute(call);
-    }
-    return results;
   }
   /**
    * 批量文件写入：展示所有文件的编号列表 + diff 预览，
@@ -2743,7 +2870,7 @@ function collectMatchingFiles(dirPath, rootPath, regex, results, maxResults) {
 }
 
 // src/tools/builtin/run-interactive.ts
-import { spawn } from "child_process";
+import { spawn as spawn2 } from "child_process";
 import { platform as platform2 } from "os";
 var IS_WINDOWS2 = platform2() === "win32";
 var runInteractiveTool = {
@@ -2807,7 +2934,7 @@ var runInteractiveTool = {
     };
     const prefixWarnings = [argsTypeWarning, stdinTypeWarning].filter(Boolean).join("");
     return new Promise((resolve4) => {
-      const child = spawn(executable, cmdArgs.map(String), {
+      const child = spawn2(executable, cmdArgs.map(String), {
         cwd: process.cwd(),
         env,
         stdio: ["pipe", "pipe", "pipe"]
@@ -2977,8 +3104,8 @@ var webFetchTool = {
       if (e.message.startsWith("Blocked:")) throw e;
       throw new NetworkError(`Invalid URL: "${url}"`);
     }
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), 2e4);
+    const controller2 = new AbortController();
+    const timeoutId = setTimeout(() => controller2.abort(), 2e4);
     let rawHtml;
     let finalUrl;
     let contentType;
@@ -2998,7 +3125,7 @@ var webFetchTool = {
         }
         await resolveAndCheck(parsedHop.hostname);
         const r = await fetch(currentUrl, {
-          signal: controller.signal,
+          signal: controller2.signal,
           headers: FETCH_HEADERS,
           redirect: "manual"
           // 手动控制重定向
@@ -3349,15 +3476,15 @@ var googleSearchTool = {
     url.searchParams.set("cx", cx);
     url.searchParams.set("q", query);
     url.searchParams.set("num", String(numResults));
-    const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+    const controller2 = new AbortController();
+    const timeout = setTimeout(() => controller2.abort(), REQUEST_TIMEOUT_MS);
     try {
       const response = await fetch(url.toString(), {
         method: "GET",
         headers: {
           "Accept": "application/json"
         },
-        signal: controller.signal
+        signal: controller2.signal
       });
       if (!response.ok) {
         const errorBody = await response.text().catch(() => "");
@@ -3741,7 +3868,7 @@ var spawnAgentTool = {
 };
 
 // src/tools/builtin/task-manager.ts
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 import { randomUUID } from "crypto";
 import { platform as platform3 } from "os";
 var MAX_OUTPUT_CHARS = 1e4;
@@ -3766,7 +3893,7 @@ function createTask(command, description) {
   const isWin = platform3() === "win32";
   const shell = isWin ? "cmd" : "sh";
   const shellFlag = isWin ? "/c" : "-c";
-  const proc = spawn2(shell, [shellFlag, command], {
+  const proc = spawn3(shell, [shellFlag, command], {
     stdio: ["ignore", "pipe", "pipe"],
     detached: false,
     env: { ...process.env, PYTHONUTF8: "1" }
@@ -4894,6 +5021,9 @@ export {
   theme,
   undoStack,
   renderDiff,
+  isInterrupted,
+  requestInterrupt,
+  resetInterrupt,
   rlInternal,
   groupCallsByPhase,
   runSafePhases,

package/dist/{chunk-US6MQO6W.js → chunk-ING3NMVR.js}

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

package/dist/{chunk-IGNYJUZU.js → chunk-KLSISB52.js}

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

package/dist/{chunk-MYQANQ6F.js → chunk-KPX72DTU.js}

@@ -2,7 +2,7 @@
 import {
   schemaToJsonSchema,
   truncateForPersist
-} from "./chunk-Z2V6EYPQ.js";
+} from "./chunk-CNI26J5Z.js";
 import {
   AuthError,
   ProviderError,
@@ -21,7 +21,7 @@ import {
   MCP_PROTOCOL_VERSION,
   MCP_TOOL_PREFIX,
   VERSION
-} from "./chunk-AKCXRW2Q.js";
+} from "./chunk-5IL2BHSD.js";
 
 // src/providers/claude.ts
 import Anthropic from "@anthropic-ai/sdk";

package/dist/electron-server.js

@@ -36,7 +36,7 @@ import {
   VERSION,
   buildUserIdentityPrompt,
   runTestsTool
-} from "./chunk-XQHCCV3A.js";
+} from "./chunk-A4TUAW4J.js";
 import {
   hasSemanticIndex,
   semanticSearch
@@ -3304,7 +3304,7 @@ var SessionManager = class {
 };
 
 // src/tools/builtin/bash.ts
-import { execSync } from "child_process";
+import { spawn } from "child_process";
 import { existsSync as existsSync4, readdirSync as readdirSync2, statSync } from "fs";
 import { platform } from "os";
 import { resolve } from "path";
@@ -3424,6 +3424,12 @@ var UndoStack = class {
 };
 var undoStack = new UndoStack();
 
+// src/core/interrupt.ts
+var controller = new AbortController();
+function currentAbortSignal() {
+  return controller.signal;
+}
+
 // src/tools/builtin/bash.ts
 var IS_WINDOWS = platform() === "win32";
 var SHELL = IS_WINDOWS ? "powershell.exe" : process.env["SHELL"] ?? "/bin/bash";
@@ -3506,21 +3512,40 @@ Important rules:
       parsedTargetsBefore.set(t, existsSync4(t));
     }
     try {
-      const output = execSync(actualCommand, {
-        timeout,
-        encoding: IS_WINDOWS ? "buffer" : "utf-8",
-        stdio: ["pipe", "pipe", "pipe"],
-        cwd: effectiveCwd,
-        shell: SHELL,
-        env: {
-          ...process.env,
-          PYTHONUTF8: "1",
-          PYTHONIOENCODING: "utf-8"
+      const { stdout, stderr, status, signal, timedOut, aborted } = await runShell(
+        actualCommand,
+        {
+          timeout,
+          cwd: effectiveCwd,
+          env: {
+            ...process.env,
+            PYTHONUTF8: "1",
+            PYTHONIOENCODING: "utf-8"
+          }
         }
-      });
+      );
+      if (aborted) {
+        pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, effectiveCwd);
+        throw new ToolError(
+          "bash",
+          `Command interrupted by user (Ctrl+C).
+
+[The user pressed Ctrl+C while this command was running. Stop the current task, summarize what was done so far, and wait for the user's next instruction. Do NOT retry this command or continue with further tool calls unless explicitly asked.]`
+        );
+      }
+      if (status !== 0 || timedOut) {
+        throw {
+          status,
+          signal,
+          code: timedOut ? "ETIMEDOUT" : void 0,
+          stdout,
+          stderr,
+          message: timedOut ? "ETIMEDOUT" : `exit ${status}`
+        };
+      }
       updateCwdFromCommand(command, effectiveCwd);
       pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, effectiveCwd);
-      const result = IS_WINDOWS && Buffer.isBuffer(output) ? output.toString("utf-8") : output;
+      const result = IS_WINDOWS && Buffer.isBuffer(stdout) ? stdout.toString("utf-8") : stdout;
       return result || "(command completed with no output)";
     } catch (err) {
       pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, effectiveCwd);
@@ -3640,6 +3665,84 @@ function pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, cwd) {
     }
   }
 }
+function runShell(command, opts) {
+  return new Promise((resolvePromise) => {
+    const shellArgs = IS_WINDOWS ? ["-NoProfile", "-NonInteractive", "-Command", command] : ["-c", command];
+    const child = spawn(SHELL, shellArgs, {
+      cwd: opts.cwd,
+      env: opts.env,
+      windowsHide: true,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    const stdoutChunks = [];
+    const stderrChunks = [];
+    let timedOut = false;
+    let aborted = false;
+    let settled = false;
+    child.stdout?.on("data", (chunk) => stdoutChunks.push(chunk));
+    child.stderr?.on("data", (chunk) => stderrChunks.push(chunk));
+    const timeoutTimer = setTimeout(() => {
+      timedOut = true;
+      killChild(child);
+    }, opts.timeout);
+    const signal = currentAbortSignal();
+    const onAbort = () => {
+      aborted = true;
+      killChild(child);
+    };
+    if (signal.aborted) {
+      onAbort();
+    } else {
+      signal.addEventListener("abort", onAbort, { once: true });
+    }
+    const cleanup = () => {
+      clearTimeout(timeoutTimer);
+      signal.removeEventListener("abort", onAbort);
+    };
+    child.on("error", (err) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      stderrChunks.push(Buffer.from(String(err.message ?? err)));
+      resolvePromise({
+        stdout: Buffer.concat(stdoutChunks),
+        stderr: Buffer.concat(stderrChunks),
+        status: null,
+        signal: null,
+        timedOut,
+        aborted
+      });
+    });
+    child.on("close", (code, sig) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      resolvePromise({
+        stdout: Buffer.concat(stdoutChunks),
+        stderr: Buffer.concat(stderrChunks),
+        status: code,
+        signal: sig,
+        timedOut,
+        aborted
+      });
+    });
+  });
+}
+function killChild(child) {
+  if (child.killed || child.exitCode !== null) return;
+  try {
+    child.kill("SIGTERM");
+  } catch {
+  }
+  setTimeout(() => {
+    if (!child.killed && child.exitCode === null) {
+      try {
+        child.kill("SIGKILL");
+      } catch {
+      }
+    }
+  }, 500).unref();
+}
 function updateCwdFromCommand(command, baseCwd) {
   const cdMatches = [...command.matchAll(/(?:^|[;&|])\s*cd\s+(['"]?)([^\s;&|'"]+)\1/g)];
   if (cdMatches.length === 0) return;
@@ -4233,7 +4336,7 @@ function simpleDiff(oldLines, newLines) {
 }
 
 // src/tools/hooks.ts
-import { execSync as execSync2 } from "child_process";
+import { execSync } from "child_process";
 function shellEscape(value) {
   return "'" + value.replace(/'/g, "'\\''") + "'";
 }
@@ -4245,7 +4348,7 @@ function runHook(template, vars) {
   cmd = cmd.replace(/\{args\}/g, shellEscape(vars.args ?? ""));
   cmd = cmd.replace(/\{status\}/g, shellEscape(vars.status ?? ""));
   try {
-    execSync2(cmd, {
+    execSync(cmd, {
       timeout: 5e3,
       stdio: ["pipe", "pipe", "pipe"],
       encoding: "utf-8"
@@ -4429,6 +4532,11 @@ var ToolExecutor = class {
    * 防止用户输入 "y"+Enter 被同时触发 once('line') 和主循环 on('line')。
    */
   confirming = false;
+  /**
+   * Tool 执行进行中标志（executeAll 的生命周期）。
+   * repl.ts 的 SIGINT handler 在此为 true 时触发全局 interrupt（而不是退出程序）。
+   */
+  running = false;
   /** 在 confirm 期间用户输入的 slash 命令，由 repl.ts 主循环消费 */
   pendingSlashCommand = null;
   /** confirm() 的取消回调，由 SIGINT handler 调用 */
@@ -4563,25 +4671,30 @@ var ToolExecutor = class {
     }
   }
   async executeAll(calls) {
-    const phase = groupCallsByPhase(calls);
-    const results = new Array(calls.length);
-    const elapsed = await runSafePhases(phase, (c) => this.execute(c), results, "executor");
-    if (phase.safeParallel.length >= 2) {
-      console.log(theme.dim(`  \u26A1 ${phase.safeParallel.length} tools executed in parallel (${elapsed}ms)`));
-    }
-    if (phase.fileWriteCalls.length === 1) {
-      const { idx, call } = phase.fileWriteCalls[0];
-      results[idx] = await this.execute(call);
-    } else if (phase.fileWriteCalls.length >= 2) {
-      const batchResults = await this.executeBatchFileWrites(phase.fileWriteCalls.map((f) => f.call));
-      for (let i = 0; i < phase.fileWriteCalls.length; i++) {
-        results[phase.fileWriteCalls[i].idx] = batchResults[i];
+    this.running = true;
+    try {
+      const phase = groupCallsByPhase(calls);
+      const results = new Array(calls.length);
+      const elapsed = await runSafePhases(phase, (c) => this.execute(c), results, "executor");
+      if (phase.safeParallel.length >= 2) {
+        console.log(theme.dim(`  \u26A1 ${phase.safeParallel.length} tools executed in parallel (${elapsed}ms)`));
       }
+      if (phase.fileWriteCalls.length === 1) {
+        const { idx, call } = phase.fileWriteCalls[0];
+        results[idx] = await this.execute(call);
+      } else if (phase.fileWriteCalls.length >= 2) {
+        const batchResults = await this.executeBatchFileWrites(phase.fileWriteCalls.map((f) => f.call));
+        for (let i = 0; i < phase.fileWriteCalls.length; i++) {
+          results[phase.fileWriteCalls[i].idx] = batchResults[i];
+        }
+      }
+      for (const { idx, call } of phase.otherCalls) {
+        results[idx] = await this.execute(call);
+      }
+      return results;
+    } finally {
+      this.running = false;
     }
-    for (const { idx, call } of phase.otherCalls) {
-      results[idx] = await this.execute(call);
-    }
-    return results;
   }
   /**
    * 批量文件写入：展示所有文件的编号列表 + diff 预览，
@@ -5925,7 +6038,7 @@ function collectMatchingFiles(dirPath, rootPath, regex, results, maxResults) {
 }
 
 // src/tools/builtin/run-interactive.ts
-import { spawn } from "child_process";
+import { spawn as spawn2 } from "child_process";
 import { platform as platform2 } from "os";
 var IS_WINDOWS2 = platform2() === "win32";
 var runInteractiveTool = {
@@ -5989,7 +6102,7 @@ var runInteractiveTool = {
     };
     const prefixWarnings = [argsTypeWarning, stdinTypeWarning].filter(Boolean).join("");
     return new Promise((resolve6) => {
-      const child = spawn(executable, cmdArgs.map(String), {
+      const child = spawn2(executable, cmdArgs.map(String), {
         cwd: process.cwd(),
         env,
         stdio: ["pipe", "pipe", "pipe"]
@@ -6159,8 +6272,8 @@ var webFetchTool = {
       if (e.message.startsWith("Blocked:")) throw e;
       throw new NetworkError(`Invalid URL: "${url}"`);
     }
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), 2e4);
+    const controller2 = new AbortController();
+    const timeoutId = setTimeout(() => controller2.abort(), 2e4);
     let rawHtml;
     let finalUrl;
     let contentType;
@@ -6180,7 +6293,7 @@ var webFetchTool = {
         }
         await resolveAndCheck(parsedHop.hostname);
         const r = await fetch(currentUrl, {
-          signal: controller.signal,
+          signal: controller2.signal,
           headers: FETCH_HEADERS,
           redirect: "manual"
           // 手动控制重定向
@@ -6531,15 +6644,15 @@ var googleSearchTool = {
     url.searchParams.set("cx", cx);
     url.searchParams.set("q", query);
     url.searchParams.set("num", String(numResults));
-    const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+    const controller2 = new AbortController();
+    const timeout = setTimeout(() => controller2.abort(), REQUEST_TIMEOUT_MS);
     try {
       const response = await fetch(url.toString(), {
         method: "GET",
         headers: {
           "Accept": "application/json"
         },
-        signal: controller.signal
+        signal: controller2.signal
       });
       if (!response.ok) {
         const errorBody = await response.text().catch(() => "");
@@ -6923,7 +7036,7 @@ var spawnAgentTool = {
 };
 
 // src/tools/builtin/task-manager.ts
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 import { randomUUID } from "crypto";
 import { platform as platform3 } from "os";
 var MAX_OUTPUT_CHARS = 1e4;
@@ -6948,7 +7061,7 @@ function createTask(command, description) {
   const isWin = platform3() === "win32";
   const shell = isWin ? "cmd" : "sh";
   const shellFlag = isWin ? "/c" : "-c";
-  const proc = spawn2(shell, [shellFlag, command], {
+  const proc = spawn3(shell, [shellFlag, command], {
     stdio: ["ignore", "pipe", "pipe"],
     detached: false,
     env: { ...process.env, PYTHONUTF8: "1" }
@@ -8070,7 +8183,7 @@ var ToolRegistry = class {
 };
 
 // src/mcp/client.ts
-import { spawn as spawn3 } from "child_process";
+import { spawn as spawn4 } from "child_process";
 var McpClient = class {
   serverId;
   config;
@@ -8108,7 +8221,7 @@ var McpClient = class {
   async connect() {
     const timeout = this.config.timeout ?? MCP_CONNECT_TIMEOUT;
     try {
-      this.process = spawn3(this.config.command, this.config.args ?? [], {
+      this.process = spawn4(this.config.command, this.config.args ?? [], {
         stdio: ["pipe", "pipe", "pipe"],
         env: { ...process.env, ...this.config.env },
         // Windows 上 npx 等是 .cmd 脚本，需要 shell 模式
@@ -9374,15 +9487,15 @@ function autoTrimSessionIfNeeded(session, sizeLimit = SESSION_SIZE_LIMIT) {
 // src/web/session-handler.ts
 import { existsSync as existsSync20, readFileSync as readFileSync13, appendFileSync as appendFileSync3, writeFileSync as writeFileSync8, mkdirSync as mkdirSync9, readdirSync as readdirSync9, statSync as statSync8 } from "fs";
 import { join as join13, resolve as resolve4 } from "path";
-import { execSync as execSync4 } from "child_process";
+import { execSync as execSync3 } from "child_process";
 
 // src/tools/git-context.ts
-import { execSync as execSync3 } from "child_process";
+import { execSync as execSync2 } from "child_process";
 import { existsSync as existsSync19 } from "fs";
 import { join as join12 } from "path";
 function runGit2(cmd, cwd) {
   try {
-    return execSync3(`git ${cmd}`, {
+    return execSync2(`git ${cmd}`, {
       cwd,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
@@ -11112,7 +11225,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
         let diff;
         try {
           const cmd = staged ? "git diff --staged" : "git diff";
-          diff = execSync4(cmd, { encoding: "utf-8", timeout: 1e4 }).trim();
+          diff = execSync3(cmd, { encoding: "utf-8", timeout: 1e4 }).trim();
         } catch {
           this.send({ type: "error", message: "Failed to run git diff." });
           break;
@@ -11151,7 +11264,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
         let secDiff;
         try {
           const cmd = secStaged ? "git diff --staged" : "git diff";
-          secDiff = execSync4(cmd, { encoding: "utf-8", timeout: 1e4 }).trim();
+          secDiff = execSync3(cmd, { encoding: "utf-8", timeout: 1e4 }).trim();
         } catch {
           this.send({ type: "error", message: "Failed to run git diff." });
           break;
@@ -11229,7 +11342,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-KHJ6YCPH.js");
+          const { executeTests } = await import("./run-tests-4XJLQNUW.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {

package/dist/{hub-A66CLTFF.js → hub-YRYUBSEQ.js}

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

package/dist/index.js

@@ -30,10 +30,10 @@ import {
   saveDevState,
   sessionHasMeaningfulContent,
   setupProxy
-} from "./chunk-MYQANQ6F.js";
+} from "./chunk-KPX72DTU.js";
 import {
   ConfigManager
-} from "./chunk-US6MQO6W.js";
+} from "./chunk-ING3NMVR.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -41,15 +41,18 @@ import {
   estimateTokens,
   googleSearchContext,
   initTheme,
+  isInterrupted,
   lastResponseStore,
   renderDiff,
+  requestInterrupt,
+  resetInterrupt,
   rlInternal,
   setContextWindow,
   setMaxOutputCap,
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-Z2V6EYPQ.js";
+} from "./chunk-CNI26J5Z.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   fileCheckpoints
@@ -67,7 +70,7 @@ import "./chunk-KJLJPUY2.js";
 import "./chunk-6VRJGH25.js";
 import "./chunk-2DXY7UGF.js";
 import "./chunk-KHYD3WXE.js";
-import "./chunk-IGNYJUZU.js";
+import "./chunk-KLSISB52.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   AUTHOR,
@@ -89,7 +92,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-AKCXRW2Q.js";
+} from "./chunk-5IL2BHSD.js";
 
 // src/index.ts
 import { program } from "commander";
@@ -2609,7 +2612,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-MKBVRMBA.js");
+          const { executeTests } = await import("./run-tests-JROEDZES.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -5097,6 +5100,7 @@ Session '${this.resumeSessionId}' not found.
     this.rl.on("SIGINT", () => {
       if (this.streamAbortController) {
         this.streamAbortController.abort();
+        requestInterrupt();
         return;
       }
       if (this.toolExecutor.confirming) {
@@ -5107,6 +5111,11 @@ Session '${this.resumeSessionId}' not found.
         askUserContext.cancelFn();
         return;
       }
+      if (this.toolExecutor.running) {
+        process.stdout.write(theme.warning("\n\u26A1 Ctrl+C \u2014 interrupting tool execution...\n"));
+        requestInterrupt();
+        return;
+      }
       this.handleExit();
     });
     this.showPrompt();
@@ -5237,6 +5246,7 @@ Session '${this.resumeSessionId}' not found.
 `)
       );
     }
+    resetInterrupt();
     const t0 = Date.now();
     try {
       const provider = this.providers.get(this.currentProvider);
@@ -6240,6 +6250,12 @@ ${systemPromptVolatile}` : systemPrompt;
         spawnAgentContext.configManager = this.config;
         ToolExecutor.currentMessageIndex = session.messages.length;
         const toolResults = await this.toolExecutor.executeAll(result.toolCalls);
+        if (isInterrupted()) {
+          spinner.stop();
+          process.stdout.write(theme.warning("\n\u26A1 Interrupted by user (Ctrl+C) \u2014 agentic loop stopped.\n"));
+          this.teardownInterjectionListener();
+          return;
+        }
         const thisRoundTools = result.toolCalls.map((tc) => tc.name);
         roundToolHistory.push({ round: round + 1, tools: thisRoundTools });
         const readFileCalls = result.toolCalls.filter((tc) => tc.name === "read_file");
@@ -6722,7 +6738,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-J7BPHI7D.js");
+  const { startWebServer } = await import("./server-WHTZFKVB.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) => {
@@ -6845,7 +6861,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-KZQHKPE5.js");
+    const batch = await import("./batch-SK2YCZEY.js");
     switch (action) {
       case "submit":
         if (!arg) {
@@ -6888,7 +6904,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-B6U5GMZ7.js");
+  const { startMcpServer } = await import("./server-DB4GMBDN.js");
   await startMcpServer({
     allowDestructive: !!options.allowDestructive,
     allowOutsideCwd: !!options.allowOutsideCwd,
@@ -7015,7 +7031,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-A66CLTFF.js");
+  const { startHub } = await import("./hub-YRYUBSEQ.js");
   await startHub(
     {
       topic: topic ?? "",

package/dist/{run-tests-KHJ6YCPH.js → run-tests-4XJLQNUW.js}

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

package/dist/{run-tests-MKBVRMBA.js → run-tests-JROEDZES.js}

@@ -2,8 +2,8 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-IGNYJUZU.js";
-import "./chunk-AKCXRW2Q.js";
+} from "./chunk-KLSISB52.js";
+import "./chunk-5IL2BHSD.js";
 export {
   executeTests,
   runTestsTool

package/dist/{server-B6U5GMZ7.js → server-DB4GMBDN.js}

@@ -3,7 +3,7 @@ import {
   ToolRegistry,
   getDangerLevel,
   schemaToJsonSchema
-} from "./chunk-Z2V6EYPQ.js";
+} from "./chunk-CNI26J5Z.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-IGNYJUZU.js";
+import "./chunk-KLSISB52.js";
 import {
   VERSION
-} from "./chunk-AKCXRW2Q.js";
+} from "./chunk-5IL2BHSD.js";
 
 // src/mcp/server.ts
 import { createInterface } from "readline";

package/dist/{server-J7BPHI7D.js → server-WHTZFKVB.js}

@@ -23,10 +23,10 @@ import {
   persistToolRound,
   rebuildExtraMessages,
   setupProxy
-} from "./chunk-MYQANQ6F.js";
+} from "./chunk-KPX72DTU.js";
 import {
   ConfigManager
-} from "./chunk-US6MQO6W.js";
+} from "./chunk-ING3NMVR.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -44,7 +44,7 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-Z2V6EYPQ.js";
+} from "./chunk-CNI26J5Z.js";
 import "./chunk-2ZD3YTVM.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-ANYYM4CF.js";
@@ -53,7 +53,7 @@ import "./chunk-KJLJPUY2.js";
 import "./chunk-6VRJGH25.js";
 import "./chunk-2DXY7UGF.js";
 import "./chunk-KHYD3WXE.js";
-import "./chunk-IGNYJUZU.js";
+import "./chunk-KLSISB52.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   AUTHOR,
@@ -72,7 +72,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-AKCXRW2Q.js";
+} from "./chunk-5IL2BHSD.js";
 
 // src/web/server.ts
 import express from "express";
@@ -2237,7 +2237,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-MKBVRMBA.js");
+          const { executeTests } = await import("./run-tests-JROEDZES.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {

package/dist/{task-orchestrator-JB5TZNBK.js → task-orchestrator-IQTIXEOM.js}

@@ -4,7 +4,7 @@ import {
   getDangerLevel,
   googleSearchContext,
   truncateOutput
-} from "./chunk-Z2V6EYPQ.js";
+} from "./chunk-CNI26J5Z.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-IGNYJUZU.js";
+import "./chunk-KLSISB52.js";
 import {
   SUBAGENT_ALLOWED_TOOLS
-} from "./chunk-AKCXRW2Q.js";
+} from "./chunk-5IL2BHSD.js";
 
 // src/hub/task-orchestrator.ts
 import { createInterface } from "readline";

package/package.json

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