jinzd-ai-cli 0.4.259 → 0.4.261

package/dist/electron-server.js

@@ -34,14 +34,14 @@ import {
   touchMemoryReferences,
   updateMemoryApproval,
   updateMemoryEntry
-} from "./chunk-KXAVUZKH.js";
+} from "./chunk-T7R7ILYT.js";
 import {
   redactJson,
   scanString
 } from "./chunk-YVTASHS5.js";
 import {
   runTestsTool
-} from "./chunk-V5FB72RK.js";
+} from "./chunk-KFNQESEG.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   APP_NAME,
@@ -73,7 +73,7 @@ import {
   SUBAGENT_MAX_ROUNDS_LIMIT,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-DLOOIAAD.js";
+} from "./chunk-R6DXWVVN.js";
 import {
   hasSemanticIndex,
   semanticSearch
@@ -987,7 +987,8 @@ var ClaudeProvider = class extends BaseProvider {
         max_tokens: request.maxTokens ?? 8192,
         temperature,
         thinking
-      });
+        // 非流式路径必须收 signal，否则 Ctrl+C 期间请求不可中断（同 openai-compatible 的同类遗漏）
+      }, { signal: request.signal });
       const content = this.extractContent(response.content);
       return {
         content,
@@ -1066,7 +1067,8 @@ var ClaudeProvider = class extends BaseProvider {
         max_tokens: request.maxTokens ?? 8192,
         temperature,
         thinking
-      });
+        // 轮次耗尽的总结轮对所有 provider 都走这条非流式路径——漏 signal 则 Ctrl+C 无效
+      }, { signal: request.signal });
       const usage = this.extractUsage(response.usage);
       const toolUseBlocks = response.content.filter(
         (b) => b.type === "tool_use"
@@ -1811,6 +1813,52 @@ CRITICAL \u2014 Batch file generation rules:
 4. Only produce a text summary AFTER all write_file calls have been made and returned success.
 5. The system compares every "file saved" claim against actual tool calls. Phantom claims trigger an automatic retry \u2014 do not waste rounds.`;
 var HALLUCINATION_CORRECTION_MESSAGE = "You did NOT actually call the write_file tool \u2014 the file was NOT created! Please immediately use the write_file tool via the function calling API to perform the actual file write. Do NOT describe file content in text \u2014 you MUST invoke write_file through the tool_calls mechanism.";
+var ACTION_WORD_RE = /(?:已[生保写创]|saved|written|created|完成.*(?:写入|保存|创建|生成)|输出|file\s+(?:saved|written|created))/i;
+var CLAUSE_BOUNDARY_RE = /[。．！？!?；;，,]/;
+var LIST_LINE_RE = /^\s*(?:[-*+]|\d+[.)]|\|)/;
+function hasWriteIntentNear(content, pathStart, pathEnd) {
+  const lineStart = content.lastIndexOf("\n", pathStart - 1) + 1;
+  const lineEndRaw = content.indexOf("\n", pathEnd);
+  const lineEnd = lineEndRaw === -1 ? content.length : lineEndRaw;
+  const currentLine = content.slice(lineStart, lineEnd);
+  const prevLineStart = lineStart === 0 ? 0 : content.lastIndexOf("\n", lineStart - 2) + 1;
+  const prevLine = lineStart === 0 ? "" : content.slice(prevLineStart, lineStart - 1);
+  const introColon = /[：:]\s*$/.test(prevLine);
+  if (LIST_LINE_RE.test(currentLine) || introColon) {
+    let pos = pathStart;
+    let linesBack = 0;
+    while (linesBack < 9 && pos > 0) {
+      pos--;
+      if (content[pos] === "\n") linesBack++;
+    }
+    const windowStart = pos === 0 ? 0 : pos + 1;
+    return ACTION_WORD_RE.test(content.slice(windowStart, lineEnd));
+  }
+  const boundaryBefore = (from) => {
+    for (let i = from - 1; i >= lineStart; i--) {
+      if (CLAUSE_BOUNDARY_RE.test(content[i] ?? "")) return i + 1;
+    }
+    return lineStart;
+  };
+  let clauseEnd = lineEnd;
+  for (let i = pathEnd; i < lineEnd; i++) {
+    if (CLAUSE_BOUNDARY_RE.test(content[i] ?? "")) {
+      clauseEnd = i + 1;
+      break;
+    }
+  }
+  const isBareClause = (text2) => text2.replace(/`[^`\n]*`/g, "").replace(content.slice(pathStart, pathEnd), "").replace(/[\s'"“”‘’()（）、,，。;；:：+\-和与及]/g, "").length <= 2;
+  let start = boundaryBefore(pathStart);
+  let text = content.slice(start, clauseEnd);
+  if (ACTION_WORD_RE.test(text)) return true;
+  for (let step = 0; step < 6 && start > lineStart && isBareClause(text); step++) {
+    const prevEnd = start - 1;
+    start = boundaryBefore(prevEnd);
+    text = content.slice(start, prevEnd);
+    if (ACTION_WORD_RE.test(text)) return true;
+  }
+  return false;
+}
 function extractClaimedFilePaths(content) {
   const paths = /* @__PURE__ */ new Set();
   const add = (p) => {
@@ -1818,36 +1866,19 @@ function extractClaimedFilePaths(content) {
     if (trimmed && /\.\w{1,6}$/.test(trimmed)) paths.add(trimmed);
   };
   let m;
-  const actionLineRe = /(?:已[生保写创]|saved|written|created|完成.*(?:写入|保存|创建|生成)|输出|file\s+(?:saved|written|created))/i;
   const backtickRe = /`([^`\n]+?\.\w{1,6})`/g;
   while ((m = backtickRe.exec(content)) !== null) {
-    let pos = m.index;
-    let linesBack = 0;
-    while (linesBack < 9 && pos > 0) {
-      pos--;
-      if (content[pos] === "\n") linesBack++;
-    }
-    const windowStart = pos === 0 ? 0 : pos + 1;
-    const lineEndIdx = content.indexOf("\n", m.index + m[0].length);
-    const window = content.slice(windowStart, lineEndIdx === -1 ? void 0 : lineEndIdx);
-    if (actionLineRe.test(window)) add(m[1]);
+    const pathStart = m.index + m[0].indexOf(m[1]);
+    if (hasWriteIntentNear(content, pathStart, pathStart + m[1].length)) add(m[1]);
   }
-  const zhRe = /(?:已保存(?:到)?|已写入(?:到)?|已创建|已生成|文件路径[：:]|保存为|写入到)\s*[`'”””]?([^\s`'”””，,。\n]+?\.\w{1,6})/g;
+  const zhRe = /(?:已保存(?:到)?|已写入(?:到)?|已创建|已生成|文件路径[：:]|保存为|写入到)\s*[`'”””]?([^\s`'”””，,。\n]+\.\w{1,6})/g;
   while ((m = zhRe.exec(content)) !== null) add(m[1]);
-  const enRe = /(?:saved|written|created)\s+(?:to|as|at)\s+[`'”]?([^\s`'”\n,]+?\.\w{1,6})/gi;
+  const enRe = /(?:saved|written|created)\s+(?:to|as|at)\s+[`'”]?([^\s`'”\n,]+\.\w{1,6})/gi;
   while ((m = enRe.exec(content)) !== null) add(m[1]);
   const checkRe = /✅[^\n`]*?[`'”]?([^\s`'”\n,，。]+?\.\w{1,6})/g;
   while ((m = checkRe.exec(content)) !== null) {
-    let pos = m.index;
-    let linesBack = 0;
-    while (linesBack < 9 && pos > 0) {
-      pos--;
-      if (content[pos] === "\n") linesBack++;
-    }
-    const windowStart = pos === 0 ? 0 : pos + 1;
-    const lineEndIdx = content.indexOf("\n", m.index + m[0].length);
-    const window = content.slice(windowStart, lineEndIdx === -1 ? void 0 : lineEndIdx);
-    if (actionLineRe.test(window)) add(m[1]);
+    const pathStart = m.index + m[0].lastIndexOf(m[1]);
+    if (hasWriteIntentNear(content, pathStart, pathStart + m[1].length)) add(m[1]);
   }
   return Array.from(paths);
 }
@@ -1960,7 +1991,7 @@ function findPhantomClaims(content, extraMessages) {
 }
 function buildPhantomCorrectionMessage(phantoms) {
   const list = phantoms.map((p) => `  - ${p}`).join("\n");
-  return "You claimed to have written the following file(s), but no matching write_file tool call was actually made in this turn:\n" + list + '\n\nEach of these files does NOT exist on disk. You MUST now invoke write_file (via the function calling API) for every missing file listed above. Do NOT output another "completion summary" until the tool calls have actually been made.';
+  return 'Your reply mentions the following file(s) alongside a "written / saved / created" claim, but no matching write_file or edit_file tool call was made in this turn:\n' + list + "\n\nIf you did intend to create or modify them, invoke write_file / edit_file NOW \u2014 they do not exist on disk yet, and you must not report the task as done until the tool calls return.\n\nIf you were only REFERENCING them (files you merely read, cited as examples, or named as prior art), then this was a false alarm: do NOT create them, do NOT overwrite anything. Simply restate your answer and say explicitly which of the listed paths you only read or cited. Creating a file that the user never asked for is worse than the false alarm.";
 }
 var DSML_PIPE_CLASS = "[|\\uFF5C\\u2502\\u2503\\u01C0]";
 var PSEUDO_TOOL_CALL_PATTERNS = [
@@ -2393,7 +2424,7 @@ async function consumeToolCallStream(stream, hooks = {}) {
       }
     }
   } catch (err) {
-    if (err instanceof Error && (err.name === "AbortError" || err.message.includes("aborted"))) {
+    if (isAbortError(err)) {
       aborted = true;
     } else {
       throw err;
@@ -2487,6 +2518,10 @@ var BudgetWarner = class {
     return null;
   }
 };
+function isAbortError(err) {
+  if (!(err instanceof Error)) return false;
+  return err.name === "AbortError" || err.name === "APIUserAbortError" || err.message.includes("aborted");
+}
 var EMPTY_RESPONSE_NUDGE = "Your previous response was empty \u2014 no text and no tool calls. This usually means the context window is nearly full. Please either: (1) continue the task by calling the next tool you need, or (2) give a concise final text summary of what has been accomplished so far and what remains. Do NOT repeat earlier long outputs.";
 var LENGTH_LIMIT_NUDGE = "Your previous attempt hit the model output token limit (finish_reason=length) before producing ANY answer text or tool call \u2014 the entire output budget was consumed by extended reasoning. Retrying the same way will fail identically. Do NOT reason at length again: start producing output immediately. If the deliverable is long, do NOT try to emit it in one response \u2014 write it to disk in several smaller write_file calls (part 1, part 2, ...), each well under the output limit, and keep any thinking short.";
 function describeFinishReason(fr) {
@@ -2591,6 +2626,8 @@ async function runAgentLoop(host) {
   const freeRounds = new FreeRoundTracker();
   const roundToolHistory = [];
   const hasWriteTools = host.toolDefs.some((t) => t.name === "write_file" || t.name === "edit_file");
+  let hallucinationRetries = 0;
+  const MAX_HALLUCINATION_RETRIES = 2;
   for (let round = 0; round < maxToolRounds; round++) {
     if (host.signal?.aborted) return { reason: "aborted", usage };
     host.onRoundStart?.(round, maxToolRounds);
@@ -2628,7 +2665,8 @@ async function runAgentLoop(host) {
       const phantomPaths = (coarseHallucination || alreadyWrote) && !host.planMode && hasWriteTools && content ? findPhantomClaims(content, extraMessages) : [];
       const bashRanThisTurn = extractBashCommands(extraMessages).length > 0;
       const coarseShouldFire = coarseHallucination && !bashRanThisTurn;
-      if ((phantomPaths.length > 0 || coarseShouldFire) && round < maxToolRounds - 1) {
+      if ((phantomPaths.length > 0 || coarseShouldFire) && round < maxToolRounds - 1 && hallucinationRetries < MAX_HALLUCINATION_RETRIES) {
+        hallucinationRetries++;
         host.onHallucinationRetry?.({ phantomPaths, round, alreadyRendered });
         const correctionMsg = phantomPaths.length > 0 ? buildPhantomCorrectionMessage(phantomPaths) : HALLUCINATION_CORRECTION_MESSAGE;
         const reasoningField = outcome.reasoningContent ? { reasoning_content: outcome.reasoningContent } : host.providerId === "deepseek" ? { reasoning_content: "" } : {};
@@ -2916,6 +2954,17 @@ var OpenAICompatibleProvider = class extends BaseProvider {
     }
     return msgs;
   }
+  /**
+   * 非流式请求必须把 `request.signal` 交给 SDK —— 否则 Ctrl+C 完全无效。
+   *
+   * 实战（v0.4.260）：东叔按建议把 `timeouts.deepseek` 提到 900000 后出卷，第 3 轮等了
+   * 11 分钟，**按 Ctrl+C 退不出去**。DeepSeek/Kimi 的 `enableStreamingToolCalls=false`
+   * 让整个 agentic 循环都走 `chatWithTools()` 这条阻塞路径，而这里此前只传了 `timeout`、
+   * 没传 `signal`：REPL 的 AbortController 一路传到 `request.signal` 就断在这一跳，
+   * 请求无法取消；`consumeToolCallStream()` 又只在**事件之间**检查 aborted，而回退路径
+   * 要等这个 await 返回后才会吐第一个事件 —— 于是中断只能等满超时（被我调高到 15 分钟）。
+   * 两个流式方法本来就传了 signal，唯独两个非流式方法漏了，属同一处遗漏的两半。
+   */
   async chat(request) {
     try {
       const response = await this.client.chat.completions.create({
@@ -2926,7 +2975,8 @@ var OpenAICompatibleProvider = class extends BaseProvider {
         stream: false,
         ...request.thinking ? { thinking: { type: "enabled" } } : {}
       }, {
-        timeout: request.timeout ?? this.defaultTimeout
+        timeout: request.timeout ?? this.defaultTimeout,
+        signal: request.signal
       });
       const firstChoice = response.choices?.[0];
       if (!firstChoice) {
@@ -3032,7 +3082,9 @@ var OpenAICompatibleProvider = class extends BaseProvider {
         stream: false,
         ...request.thinking ? { thinking: { type: "enabled" } } : {}
       }, {
-        timeout: request.timeout ?? this.defaultTimeout
+        timeout: request.timeout ?? this.defaultTimeout,
+        // 非流式路径同样必须收 signal，否则 Ctrl+C 期间整个请求不可中断（见 chat() 上方注释）
+        signal: request.signal
       });
       const firstChoice = response.choices?.[0];
       if (!firstChoice) {
@@ -3288,6 +3340,8 @@ var OpenAICompatibleProvider = class extends BaseProvider {
     }
   }
   wrapError(err) {
+    if (err instanceof OpenAI.APIUserAbortError) return err;
+    if (err instanceof Error && err.name === "AbortError") return err;
     if (err instanceof OpenAI.AuthenticationError) {
       return new AuthError(this.info.id);
     }
@@ -5059,9 +5113,9 @@ function buildWrappedCommand(command, id, isWindows) {
   if (!isWindows) {
     return `echo "${markerStart}"; ${command}; echo "${markerEnd}:$?"`;
   }
-  const inner = `${WIN_UTF8_PREAMBLE} Write-Output "${markerStart}"; ${command}; $__ok = $?; $__ec = $LASTEXITCODE; $__code = if ($__ok) { 0 } elseif ($null -ne $__ec -and $__ec -ne 0) { $__ec } else { 1 }; Write-Output "${markerEnd}:$__code"`;
-  const b64 = Buffer.from(inner, "utf-8").toString("base64");
-  return `Invoke-Expression ([System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String('${b64}')))`;
+  const b64 = Buffer.from(command, "utf-8").toString("base64");
+  const decoded = `[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String('${b64}'))`;
+  return `${WIN_UTF8_PREAMBLE} Write-Output "${markerStart}"; $global:LASTEXITCODE = 0; Invoke-Expression (${decoded}); $__ok = $?; $__ec = $LASTEXITCODE; $__code = if ($null -ne $__ec -and $__ec -ne 0) { $__ec } elseif ($__ok) { 0 } else { 1 }; Write-Output "${markerEnd}:$__code"`;
 }
 async function execInPool(sessionKey, command, timeout, cwd, abortSignal) {
   let entry = pool.get(sessionKey);
@@ -8424,7 +8478,9 @@ Note: Path can be absolute or relative to cwd.`,
       }
       const lines = [];
       if (anyFailed && stopOnError) {
-        lines.push(`ERROR: Batch edit aborted \u2014 ${appliedCount}/${edits.length} applied, then edit #${appliedCount} failed. No changes written (stop_on_error=true).`);
+        const failedIdx = reports.find((r) => !r.ok)?.index;
+        const failedLabel = failedIdx != null ? `#${failedIdx + 1}` : "an edit";
+        lines.push(`ERROR: Batch edit aborted \u2014 ${appliedCount}/${edits.length} applied, then edit ${failedLabel} failed. No changes written (stop_on_error=true).`);
       } else if (anyFailed) {
         lines.push(`Partial success: ${appliedCount}/${edits.length} edits applied to ${filePath} (stop_on_error=false).`);
       } else {
@@ -15313,7 +15369,7 @@ Cache:  write=${cacheCreate} read=${cacheRead}` : "";
 Cost:   ${formatCost(cost)}` : "";
   let memoryLine = "";
   try {
-    const { countPendingMemories } = await import("./persistent-memory-I4JV3CME.js");
+    const { countPendingMemories } = await import("./persistent-memory-P3COUZZM.js");
     const pending = countPendingMemories(ctx.config.getConfigDir());
     if (pending > 0) memoryLine = `
 Memory: \u26A0 ${pending} pending approval \u2014 see the Memory panel or /memory`;
@@ -16122,7 +16178,7 @@ async function handleSecurityReview(args, ctx) {
 async function handleTest(args, ctx) {
   ctx.send({ type: "info", message: "\u{1F9EA} Running tests..." });
   try {
-    const { executeTests } = await import("./run-tests-HFT5RUXF.js");
+    const { executeTests } = await import("./run-tests-7RYU4BK5.js");
     const argStr = args.join(" ").trim();
     let testArgs = {};
     if (argStr) {
@@ -16386,7 +16442,7 @@ async function handleMemory(args, ctx) {
     ctx.handleMemoryManage(sub, args[1], sub === "expire" ? args[2] : void 0);
   } else if (sub === "export") {
     if (args[1] === "md") {
-      const { exportMemoryEntries: exportMemoryEntries2 } = await import("./persistent-memory-I4JV3CME.js");
+      const { exportMemoryEntries: exportMemoryEntries2 } = await import("./persistent-memory-P3COUZZM.js");
       ctx.send({
         type: "export_data",
         format: "md",

package/dist/{hub-L7RSDS4J.js → hub-RCANK6SK.js}

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