engine7 7.1.82 → 7.1.83

package/dist/cli.mjs

@@ -105,7 +105,7 @@ async function pollRegistration(domain, deviceCode, interval, deadline, onLog, s
     if (res.client_id && res.client_secret) {
       return {
         appId: res.client_id,
-        appSecret: result.appSecret,
+        appSecret: res.client_secret,
         openId: res.user_info?.open_id,
         domain: currentDomain
       };
@@ -138,13 +138,13 @@ async function registerFeishuApp(options = {}) {
   options.onQrCode?.(qrUrl);
   log(`\u8BF7\u7528\u98DE\u4E66 App \u626B\u63CF\u4E8C\u7EF4\u7801\uFF08${expireIn}\u79D2\u540E\u8FC7\u671F\uFF09...`);
   const deadline = Date.now() + Math.min(expireIn, timeoutSec) * 1e3;
-  const result2 = await pollRegistration(domain, deviceCode, interval, deadline, log, options.signal);
-  if (result2) {
-    log(`\u2705 \u6CE8\u518C\u6210\u529F\uFF01App ID: ${result2.appId}`);
+  const result = await pollRegistration(domain, deviceCode, interval, deadline, log, options.signal);
+  if (result) {
+    log(`\u2705 \u6CE8\u518C\u6210\u529F\uFF01App ID: ${result.appId}`);
   } else {
     log("\u23F0 \u4E8C\u7EF4\u7801\u5DF2\u8FC7\u671F");
   }
-  return result2;
+  return result;
 }
 function sleep(ms) {
   return new Promise((resolve11) => setTimeout(resolve11, ms));
@@ -407,20 +407,20 @@ function formatForWechat(content) {
     const m = l.match(/^#{1,4}\s+(.*)/);
     return m ? `\u3010${m[1].trim()}\u3011` : l;
   });
-  const result2 = [];
+  const result = [];
   for (const line of lines) {
     if (line.trim().startsWith("|") && line.trim().endsWith("|")) {
       if (/^\|[\s:-]+\|$/.test(line.trim())) continue;
       const cells = line.trim().slice(1, -1).split("|").map((c) => c.trim());
       if (cells.every((c) => /^[-:]+$/.test(c))) continue;
-      result2.push(`\u2022 ${cells.join(" | ")}`);
+      result.push(`\u2022 ${cells.join(" | ")}`);
     } else {
-      result2.push(line);
+      result.push(line);
     }
   }
   const out = [];
   let prevBlank = false;
-  for (const l of result2) {
+  for (const l of result) {
     if (!l.trim() && prevBlank) continue;
     out.push(l);
     prevBlank = !l.trim();
@@ -3017,12 +3017,12 @@ var init_openai_provider = __esm({
         }, "openai", this.config.proxy);
         let response;
         while (true) {
-          const result2 = await retryGen.next();
-          if (result2.done) {
-            response = result2.value;
+          const result = await retryGen.next();
+          if (result.done) {
+            response = result.value;
             break;
           }
-          const { type: _retryType, ...retryFields } = result2.value;
+          const { type: _retryType, ...retryFields } = result.value;
           yield { type: "api_retry", ...retryFields };
         }
         if (!response.ok) {
@@ -3386,12 +3386,12 @@ var init_anthropic_provider = __esm({
         }, "anthropic", this.config.proxy);
         let response;
         while (true) {
-          const result2 = await retryGen.next();
-          if (result2.done) {
-            response = result2.value;
+          const result = await retryGen.next();
+          if (result.done) {
+            response = result.value;
             break;
           }
-          const { type: _retryType, ...retryFields } = result2.value;
+          const { type: _retryType, ...retryFields } = result.value;
           yield { type: "api_retry", ...retryFields };
         }
         if (!response.ok) {
@@ -3755,12 +3755,12 @@ var init_gemini_provider = __esm({
         }, "gemini", this.config.proxy);
         let response;
         while (true) {
-          const result2 = await retryGen.next();
-          if (result2.done) {
-            response = result2.value;
+          const result = await retryGen.next();
+          if (result.done) {
+            response = result.value;
             break;
           }
-          const { type: _retryType, ...retryFields } = result2.value;
+          const { type: _retryType, ...retryFields } = result.value;
           yield { type: "api_retry", ...retryFields };
         }
         if (!response.ok) {
@@ -4094,21 +4094,21 @@ function parseHookOutput(stdout) {
 }
 function processHookJSONOutput(params) {
   const { json, command, hookEvent, stdout, stderr, exitCode, durationMs } = params;
-  const result2 = {};
+  const result = {};
   if (json.continue === false) {
-    result2.preventContinuation = true;
+    result.preventContinuation = true;
     if (json.stopReason) {
-      result2.stopReason = json.stopReason;
+      result.stopReason = json.stopReason;
     }
   }
   if (json.decision) {
     switch (json.decision) {
       case "approve":
-        result2.permissionBehavior = "allow";
+        result.permissionBehavior = "allow";
         break;
       case "block":
-        result2.permissionBehavior = "deny";
-        result2.blockingError = {
+        result.permissionBehavior = "deny";
+        result.blockingError = {
           blockingError: json.reason || "Blocked by hook",
           command
         };
@@ -4116,41 +4116,41 @@ function processHookJSONOutput(params) {
     }
   }
   if (json.systemMessage) {
-    result2.message = `[hook] ${json.systemMessage}`;
+    result.message = `[hook] ${json.systemMessage}`;
   }
   if (json.hookSpecificOutput) {
     const hso = json.hookSpecificOutput;
     if ("permissionDecision" in hso && hso.permissionDecision) {
       switch (hso.permissionDecision) {
         case "allow":
-          result2.permissionBehavior = "allow";
+          result.permissionBehavior = "allow";
           break;
         case "deny":
-          result2.permissionBehavior = "deny";
+          result.permissionBehavior = "deny";
           break;
         case "ask":
-          result2.permissionBehavior = "ask";
+          result.permissionBehavior = "ask";
           break;
       }
       if ("permissionDecisionReason" in hso) {
-        result2.hookPermissionDecisionReason = hso.permissionDecisionReason;
+        result.hookPermissionDecisionReason = hso.permissionDecisionReason;
       }
       if ("updatedInput" in hso && hso.updatedInput) {
-        result2.updatedInput = hso.updatedInput;
+        result.updatedInput = hso.updatedInput;
       }
     }
     if ("additionalContext" in hso && hso.additionalContext) {
-      result2.additionalContext = hso.additionalContext;
+      result.additionalContext = hso.additionalContext;
     }
     if ("initialUserMessage" in hso && hso.initialUserMessage) {
-      result2.initialUserMessage = hso.initialUserMessage;
+      result.initialUserMessage = hso.initialUserMessage;
     }
   }
-  if (!result2.blockingError) {
+  if (!result.blockingError) {
     const elapsed = durationMs ? ` (${durationMs}ms)` : "";
-    result2.message = result2.message || `[hook:${hookEvent}] success${elapsed}`;
+    result.message = result.message || `[hook:${hookEvent}] success${elapsed}`;
   }
-  return result2;
+  return result;
 }
 async function execCommandHook(hook, hookEvent, hookName, jsonInput, signal, hookId, ctx) {
   const hookTimeoutMs = hook.timeout ? hook.timeout * 1e3 : TOOL_HOOK_EXECUTION_TIMEOUT_MS;
@@ -4256,17 +4256,17 @@ async function executeOneHook(hook, hookEvent, hookName, hookInput, toolUseID, s
       };
     }
     const jsonInput = JSON.stringify(hookInput);
-    const result2 = await execCommandHook(hook, hookEvent, hookName, jsonInput, signal, hookId, ctx);
+    const result = await execCommandHook(hook, hookEvent, hookName, jsonInput, signal, hookId, ctx);
     const durationMs = Date.now() - startMs;
-    if (result2.aborted) {
+    if (result.aborted) {
       return {
         outcome: "cancelled",
         message: `[hook:${hookEvent}] cancelled`,
         hook
       };
     }
-    if (result2.status === 2) {
-      const blockingError = result2.stderr || result2.stdout || "Blocked by hook";
+    if (result.status === 2) {
+      const blockingError = result.stderr || result.stdout || "Blocked by hook";
       return {
         outcome: "blocking",
         blockingError: { blockingError, command: hook.command },
@@ -4274,22 +4274,22 @@ async function executeOneHook(hook, hookEvent, hookName, hookInput, toolUseID, s
         hook
       };
     }
-    if (result2.status !== 0) {
+    if (result.status !== 0) {
       return {
         outcome: "non_blocking_error",
-        message: `[hook:${hookEvent}] error (exit ${result2.status}): ${result2.stderr || result2.stdout}`,
+        message: `[hook:${hookEvent}] error (exit ${result.status}): ${result.stderr || result.stdout}`,
         hook
       };
     }
-    const parsed = parseHookOutput(result2.stdout);
+    const parsed = parseHookOutput(result.stdout);
     if (parsed.json && isSyncHookJSONOutput(parsed.json)) {
       const processed = processHookJSONOutput({
         json: parsed.json,
         command: hook.command,
         hookEvent,
-        stdout: result2.stdout,
-        stderr: result2.stderr,
-        exitCode: result2.status,
+        stdout: result.stdout,
+        stderr: result.stderr,
+        exitCode: result.status,
         durationMs
       });
       return {
@@ -4298,7 +4298,7 @@ async function executeOneHook(hook, hookEvent, hookName, hookInput, toolUseID, s
         hook
       };
     }
-    const textOutput = parsed.plainText || result2.stdout || "";
+    const textOutput = parsed.plainText || result.stdout || "";
     if (textOutput && (hookEvent === "UserPromptSubmit" || hookEvent === "SessionStart")) {
       return {
         outcome: "success",
@@ -4325,31 +4325,31 @@ function aggregateResults(results) {
     additionalContexts: []
   };
   let hasBlocking = false;
-  for (const result2 of results) {
-    if (result2.blockingError) {
-      aggregated.blockingError = result2.blockingError;
+  for (const result of results) {
+    if (result.blockingError) {
+      aggregated.blockingError = result.blockingError;
       hasBlocking = true;
     }
-    if (result2.preventContinuation) {
+    if (result.preventContinuation) {
       aggregated.preventContinuation = true;
     }
-    if (result2.stopReason) {
-      aggregated.stopReason = result2.stopReason;
+    if (result.stopReason) {
+      aggregated.stopReason = result.stopReason;
     }
-    if (result2.permissionBehavior) {
-      aggregated.permissionBehavior = result2.permissionBehavior;
+    if (result.permissionBehavior) {
+      aggregated.permissionBehavior = result.permissionBehavior;
     }
-    if (result2.additionalContext) {
-      aggregated.additionalContexts.push(result2.additionalContext);
+    if (result.additionalContext) {
+      aggregated.additionalContexts.push(result.additionalContext);
     }
-    if (result2.initialUserMessage) {
-      aggregated.initialUserMessage = result2.initialUserMessage;
+    if (result.initialUserMessage) {
+      aggregated.initialUserMessage = result.initialUserMessage;
     }
-    if (result2.updatedInput) {
-      aggregated.updatedInput = result2.updatedInput;
+    if (result.updatedInput) {
+      aggregated.updatedInput = result.updatedInput;
     }
-    if (result2.message && !result2.blockingError) {
-      aggregated.message = result2.message;
+    if (result.message && !result.blockingError) {
+      aggregated.message = result.message;
     }
   }
   if (aggregated.additionalContexts.length === 0) {
@@ -4606,9 +4606,9 @@ async function executeOne(tc, ctx, signal) {
     if (preResult.updatedInput) {
       args = { ...args, ...preResult.updatedInput };
     }
-    const result2 = await tool.handler(args, ctx, signal);
-    await executePostToolUseHooks(tc.function.name, args, result2.content, hookCtx, signal);
-    return { call: tc, result: result2, summary: null };
+    const result = await tool.handler(args, ctx, signal);
+    await executePostToolUseHooks(tc.function.name, args, result.content, hookCtx, signal);
+    return { call: tc, result, summary: null };
   } catch (err) {
     await executePostToolUseFailureHooks(tc.function.name, args, err.message, hookCtx, signal);
     return { call: tc, result: { content: `Tool error: ${err.message}`, isError: true }, summary: null };
@@ -5388,7 +5388,7 @@ function maybeTimeBasedMicrocompact(messages, gapThresholdMinutes = TIME_BASED_M
   const clearSet = new Set(compactableToolCallIds.filter((id) => !keepSet.has(id)));
   if (clearSet.size === 0) return null;
   let tokensSaved = 0;
-  const result2 = messages.map((msg2) => {
+  const result = messages.map((msg2) => {
     if (msg2.role !== "tool") return msg2;
     if (!msg2.tool_call_id || !clearSet.has(msg2.tool_call_id)) return msg2;
     if (msg2.content === TIME_BASED_MC_CLEARED_MESSAGE) return msg2;
@@ -5401,7 +5401,7 @@ function maybeTimeBasedMicrocompact(messages, gapThresholdMinutes = TIME_BASED_M
   if (tokensSaved === 0) return null;
   const clearedIds = [...clearSet].map((id) => id.slice(0, 8)).join(",");
   compactLog(TAG2, `Cleared ${clearSet.size} old tool results (~${tokensSaved} tokens), kept last ${keepSet.size} (cleared IDs: ${clearedIds})`);
-  return { messages: result2, tokensSaved };
+  return { messages: result, tokensSaved };
 }
 function microcompactMessages(messages) {
   const toolMsgCount = messages.filter((m) => m.role === "tool").length;
@@ -5484,10 +5484,10 @@ function smartCompressToolResult(content, essentialFields, sizeLimit) {
         }
       }
       if (mini.length > 0) {
-        const result2 = JSON.stringify(mini, null, 0);
-        if (result2.length < content.length * 0.3) {
+        const result = JSON.stringify(mini, null, 0);
+        if (result.length < content.length * 0.3) {
           return `[Extracted ${mini.length}/${data.length} items]
-${result2}`;
+${result}`;
         }
       }
     }
@@ -5551,7 +5551,7 @@ function splitByUserTurns(messages) {
 function step1_smartExtract(messages, essentialFields) {
   let compressed = 0;
   const largeToolResults = [];
-  const result2 = messages.map((m) => {
+  const result = messages.map((m) => {
     if (m.role === "tool" && typeof m.content === "string" && m.content.length > TOOL_SIZE_LIMIT) {
       const originalLen = m.content.length;
       largeToolResults.push(`tool_call_id=${m.tool_call_id?.slice(0, 8)}... ${originalLen}chars`);
@@ -5567,7 +5567,7 @@ function step1_smartExtract(messages, essentialFields) {
   if (largeToolResults.length > 0 && compressed === 0) {
     compactLog(TAG3, `Step 1 smartExtract: found ${largeToolResults.length} large tool results but none could be compressed`);
   }
-  return { messages: result2, compressed };
+  return { messages: result, compressed };
 }
 function step2_compressOldTurns(messages, maxTokens, toolResultMode = "minimal") {
   const { system, turns } = splitByUserTurns(messages);
@@ -5616,7 +5616,7 @@ function step2_compressOldTurns(messages, maxTokens, toolResultMode = "minimal")
 function step3_truncateLarge(messages) {
   let truncated = 0;
   const details = [];
-  const result2 = messages.map((m) => {
+  const result = messages.map((m) => {
     if (m.role === "tool" && typeof m.content === "string" && m.content.length > TOOL_SIZE_LIMIT) {
       const originalLen = m.content.length;
       truncated++;
@@ -5631,7 +5631,7 @@ function step3_truncateLarge(messages) {
   if (truncated > 0) {
     compactLog(TAG3, `Step 3 truncateLarge: ${truncated} tool results truncated (${details.join("; ")})`);
   }
-  return { messages: result2, truncated };
+  return { messages: result, truncated };
 }
 function step4_fifoDelete(messages, maxTokens) {
   if (estimateMessageTokens(messages) <= maxTokens) {
@@ -5725,7 +5725,7 @@ var init_ruleCompact = __esm({
 // src/compact/autoCompact.ts
 function stripImageBlocks(messages) {
   let stripped = 0;
-  const result2 = messages.map((m) => {
+  const result = messages.map((m) => {
     if (isAttachmentMessage(m) || typeof m.content === "string" || !m.content) return m;
     const filtered = m.content.filter((b) => {
       if (b.type === "image") {
@@ -5738,7 +5738,7 @@ function stripImageBlocks(messages) {
     if (filtered.length === 1 && filtered[0].type === "text") return { ...m, content: filtered[0].text };
     return { ...m, content: filtered };
   });
-  return { messages: result2, stripped };
+  return { messages: result, stripped };
 }
 function getEffectiveContextWindowSize(config) {
   const contextWindow = config.contextWindow || DEFAULT_COMPACT_CONFIG.contextWindow;
@@ -5757,9 +5757,9 @@ function shouldAutoCompact(messages, config) {
   }
   const tokenCount = estimateMessageTokens(messages);
   const threshold = getAutoCompactThreshold(config);
-  const result2 = tokenCount >= threshold;
-  compactLog(TAG4, `tokens=${tokenCount} threshold=${threshold} triggered=${result2}`);
-  return result2;
+  const result = tokenCount >= threshold;
+  compactLog(TAG4, `tokens=${tokenCount} threshold=${threshold} triggered=${result}`);
+  return result;
 }
 async function autoCompactIfNeeded(messages, config, tracking, provider, model, signal, hookCtx) {
   if (config.enabled === false) {
@@ -5956,17 +5956,17 @@ function getBackgroundUsageNote() {
   return "You can use the `run_in_background` parameter to run the command in the background. Only use this if you don't need the result immediately and are OK being notified when the command completes later. You do not need to check the output right away - you'll be notified when it finishes. You do not need to use '&' at the end of the command when using this parameter.";
 }
 function prependBullets2(items) {
-  const result2 = [];
+  const result = [];
   for (const item of items) {
     if (Array.isArray(item)) {
       for (const sub of item) {
-        result2.push(`  - ${sub}`);
+        result.push(`  - ${sub}`);
       }
     } else {
-      result2.push(`- ${item}`);
+      result.push(`- ${item}`);
     }
   }
-  return result2;
+  return result;
 }
 function getExecPrompt() {
   const toolPreferenceItems = [
@@ -6054,17 +6054,17 @@ function isDestructiveCommand(command) {
   return DESTRUCTIVE_PATTERNS.some((p) => p.test(trimmed));
 }
 function sanitizeEnv(env) {
-  const result2 = {};
+  const result = {};
   for (const [k, v] of Object.entries(env)) {
     if (ENV_ALLOW_KEYS.includes(k)) {
-      result2[k] = v;
+      result[k] = v;
       continue;
     }
     if (!BLOCKED_ENV_KEYS.some((b) => k.toUpperCase().includes(b))) {
-      result2[k] = v;
+      result[k] = v;
     }
   }
-  return result2;
+  return result;
 }
 var DANGEROUS_COMMANDS, DESTRUCTIVE_PATTERNS, BLOCKED_ENV_KEYS, ENV_ALLOW_KEYS;
 var init_bashSecurity = __esm({
@@ -6185,12 +6185,12 @@ function findShell() {
     return cachedShell;
   }
   try {
-    const result2 = execSync("where.exe bash", {
+    const result = execSync("where.exe bash", {
       encoding: "utf-8",
       timeout: 5e3,
       stdio: ["ignore", "pipe", "ignore"]
     });
-    const candidates = result2.trim().split(/\r?\n/).map((s) => s.trim()).filter(Boolean);
+    const candidates = result.trim().split(/\r?\n/).map((s) => s.trim()).filter(Boolean);
     const nonWsl = candidates.find((p) => !isWslBash(p));
     if (nonWsl && fs7.existsSync(nonWsl)) {
       cachedShell = { shell: nonWsl, args: ["-c"] };
@@ -7590,7 +7590,7 @@ var init_query = __esm({
                       type: "status",
                       text: `\u{1F9F9} Compacting context (${currentMessages.length} messages) so I can continue without losing history...`
                     };
-                    const result2 = await autoCompactIfNeeded(
+                    const result = await autoCompactIfNeeded(
                       currentMessages,
                       this.compactConfig,
                       this.autoCompactTracking,
@@ -7604,25 +7604,25 @@ var init_query = __esm({
                         cwd: context.workspace || process.env.ENGINE_WORKSPACE || ""
                       } : void 0
                     );
-                    if (result2.wasCompacted) {
-                      currentMessages = result2.messages;
+                    if (result.wasCompacted) {
+                      currentMessages = result.messages;
                       this.autoCompactTracking.compacted = true;
-                      this.autoCompactTracking.consecutiveFailures = result2.consecutiveFailures;
-                      console.log(`${this.logPrefix} Post-compact: ${currentMessages.length} messages, failures=${result2.consecutiveFailures}`);
-                      if (result2.compactionResult) {
+                      this.autoCompactTracking.consecutiveFailures = result.consecutiveFailures;
+                      console.log(`${this.logPrefix} Post-compact: ${currentMessages.length} messages, failures=${result.consecutiveFailures}`);
+                      if (result.compactionResult) {
                         yield {
                           type: "compact",
-                          preTokens: result2.compactionResult.preCompactTokenCount,
-                          postTokens: result2.compactionResult.postCompactTokenCount,
+                          preTokens: result.compactionResult.preCompactTokenCount,
+                          postTokens: result.compactionResult.postCompactTokenCount,
                           messages: currentMessages
                         };
                         yield {
                           type: "status",
-                          text: `\u2705 Context compacted (${result2.compactionResult.preCompactTokenCount.toLocaleString()} \u2192 ${result2.compactionResult.postCompactTokenCount.toLocaleString()} tokens). Continuing from where I left off.`
+                          text: `\u2705 Context compacted (${result.compactionResult.preCompactTokenCount.toLocaleString()} \u2192 ${result.compactionResult.postCompactTokenCount.toLocaleString()} tokens). Continuing from where I left off.`
                         };
                       }
                     } else {
-                      this.autoCompactTracking.consecutiveFailures = result2.consecutiveFailures;
+                      this.autoCompactTracking.consecutiveFailures = result.consecutiveFailures;
                     }
                     this.pendingFlushTurns = 0;
                   }
@@ -8693,13 +8693,13 @@ function recoverOrphanedParallelToolResults(allEntries, chain, byUuid, seen) {
   }
   if (recoveredCount === 0) return chain;
   console.log(`[reader] Recovered ${recoveredCount} orphaned parallel tool results`);
-  const result2 = [];
+  const result = [];
   for (const m of chain) {
-    result2.push(m);
+    result.push(m);
     const toInsert = inserts.get(m.uuid);
-    if (toInsert) result2.push(...toInsert);
+    if (toInsert) result.push(...toInsert);
   }
-  return result2;
+  return result;
 }
 async function readSessionHistory(filePath) {
   const stat4 = fs11.statSync(filePath);
@@ -8824,18 +8824,18 @@ function entryToSessionMessage(entry) {
         if (block.thinkingSignature) thinkingSig = block.thinkingSignature;
       }
     }
-    const result2 = {
+    const result = {
       role: "assistant",
       content: textContent,
       timestamp: entry.timestamp,
       _raw: entry.raw
     };
-    if (thinkingContent) result2.reasoning_content = thinkingContent;
-    if (thinkingSig) result2.thinking_signature = thinkingSig;
+    if (thinkingContent) result.reasoning_content = thinkingContent;
+    if (thinkingSig) result.thinking_signature = thinkingSig;
     if (toolCalls.length > 0) {
-      result2.tool_calls = toolCalls;
+      result.tool_calls = toolCalls;
     }
-    return result2;
+    return result;
   } else if (role === "toolResult") {
     const text = extractText2(m.content);
     return {
@@ -9629,9 +9629,9 @@ ${items.join("\n")}` };
         let content;
         let encoding;
         try {
-          const result3 = readFileContent(filePath);
-          content = result3.content;
-          encoding = result3.encoding;
+          const result2 = readFileContent(filePath);
+          content = result2.content;
+          encoding = result2.encoding;
         } catch (e) {
           return { content: e.message, isError: true };
         }
@@ -9648,7 +9648,7 @@ ${items.join("\n")}` };
         const mtime = new Date(stat4.mtimeMs).toLocaleString();
         const info = encoding !== "utf8" ? `[${encoding}] ` : "";
         const header = `${info}${filePath} (${totalLines} \u884C, ${stat4.size} bytes, \u4FEE\u6539: ${mtime})`;
-        const result2 = [
+        const result = [
           header,
           "\u2500".repeat(60),
           numbered.join("\n"),
@@ -9657,7 +9657,7 @@ ${items.join("\n")}` };
         ].join("\n");
         return { content: loopWarning ? `${loopWarning}
 
-${result2}` : result2 };
+${result}` : result };
       },
       isConcurrencySafe: () => true,
       isReadOnly: () => true
@@ -9869,19 +9869,19 @@ function isOpeningContext(chars, index) {
 }
 function applyCurlyDoubleQuotes(str) {
   const chars = [...str];
-  const result2 = [];
+  const result = [];
   for (let i = 0; i < chars.length; i++) {
     if (chars[i] === '"') {
-      result2.push(isOpeningContext(chars, i) ? LEFT_DOUBLE_CURLY : RIGHT_DOUBLE_CURLY);
+      result.push(isOpeningContext(chars, i) ? LEFT_DOUBLE_CURLY : RIGHT_DOUBLE_CURLY);
     } else {
-      result2.push(chars[i]);
+      result.push(chars[i]);
     }
   }
-  return result2.join("");
+  return result.join("");
 }
 function applyCurlySingleQuotes(str) {
   const chars = [...str];
-  const result2 = [];
+  const result = [];
   for (let i = 0; i < chars.length; i++) {
     if (chars[i] === "'") {
       const prev = i > 0 ? chars[i - 1] : void 0;
@@ -9889,25 +9889,25 @@ function applyCurlySingleQuotes(str) {
       const prevIsLetter = prev !== void 0 && /\p{L}/u.test(prev);
       const nextIsLetter = next !== void 0 && /\p{L}/u.test(next);
       if (prevIsLetter && nextIsLetter) {
-        result2.push(RIGHT_SINGLE_CURLY);
+        result.push(RIGHT_SINGLE_CURLY);
       } else {
-        result2.push(isOpeningContext(chars, i) ? LEFT_SINGLE_CURLY : RIGHT_SINGLE_CURLY);
+        result.push(isOpeningContext(chars, i) ? LEFT_SINGLE_CURLY : RIGHT_SINGLE_CURLY);
       }
     } else {
-      result2.push(chars[i]);
+      result.push(chars[i]);
     }
   }
-  return result2.join("");
+  return result.join("");
 }
 function preserveQuoteStyle(oldString, actualOldString, newString) {
   if (oldString === actualOldString) return newString;
   const hasDouble = actualOldString.includes(LEFT_DOUBLE_CURLY) || actualOldString.includes(RIGHT_DOUBLE_CURLY);
   const hasSingle = actualOldString.includes(LEFT_SINGLE_CURLY) || actualOldString.includes(RIGHT_SINGLE_CURLY);
   if (!hasDouble && !hasSingle) return newString;
-  let result2 = newString;
-  if (hasDouble) result2 = applyCurlyDoubleQuotes(result2);
-  if (hasSingle) result2 = applyCurlySingleQuotes(result2);
-  return result2;
+  let result = newString;
+  if (hasDouble) result = applyCurlyDoubleQuotes(result);
+  if (hasSingle) result = applyCurlySingleQuotes(result);
+  return result;
 }
 function applyEditToFile(originalContent, oldString, newString, replaceAll = false) {
   const f = replaceAll ? (content, search2, replace) => content.replaceAll(search2, () => replace) : (content, search2, replace) => content.replace(search2, () => replace);
@@ -9930,23 +9930,23 @@ function generateEditDiff(fileContent, actualOldString, actualNewString, context
   const oldLines = actualOldString.split(/\r?\n/);
   const newLines = actualNewString.split(/\r?\n/);
   const fileLines = fileContent.split(/\r?\n/);
-  const result2 = [];
+  const result = [];
   const ctxStart = Math.max(0, startLine - contextLines);
   for (let i = ctxStart; i < startLine; i++) {
-    result2.push(` ${fileLines[i] ?? ""}`);
+    result.push(` ${fileLines[i] ?? ""}`);
   }
   for (let i = 0; i < oldLines.length; i++) {
-    result2.push(`-${oldLines[i]}`);
+    result.push(`-${oldLines[i]}`);
   }
   for (let i = 0; i < newLines.length; i++) {
-    result2.push(`+${newLines[i]}`);
+    result.push(`+${newLines[i]}`);
   }
   const afterStart = startLine + oldLines.length;
   const afterEnd = Math.min(fileLines.length, afterStart + contextLines);
   for (let i = afterStart; i < afterEnd; i++) {
-    result2.push(` ${fileLines[i] ?? ""}`);
+    result.push(` ${fileLines[i] ?? ""}`);
   }
-  return result2.join("\n");
+  return result.join("\n");
 }
 var LEFT_SINGLE_CURLY, RIGHT_SINGLE_CURLY, LEFT_DOUBLE_CURLY, RIGHT_DOUBLE_CURLY, MAX_EDIT_FILE_SIZE;
 var init_edit = __esm({
@@ -10333,19 +10333,19 @@ var init_grep = __esm({
             rgArgs.push("--glob", p);
           }
         }
-        const result2 = await ripGrep(rgArgs, searchPath);
-        if (result2.timedOut) {
+        const result = await ripGrep(rgArgs, searchPath);
+        if (result.timedOut) {
           return {
             content: `\u641C\u7D22\u8D85\u65F6\uFF08${RG_TIMEOUT_MS / 1e3}\u79D2\uFF09\u3002\u5C1D\u8BD5\u7F29\u5C0F\u641C\u7D22\u8303\u56F4\u6216\u4F7F\u7528\u66F4\u5177\u4F53\u7684 pattern\u3002`,
             isError: true
           };
         }
-        if (result2.lines.length === 0) {
+        if (result.lines.length === 0) {
           return { content: "No files found" };
         }
         const cwd = ctx.workspace;
         if (outputMode === "content") {
-          const { items: limited2, appliedLimit: appliedLimit2 } = applyHeadLimit(result2.lines, headLimit, offset);
+          const { items: limited2, appliedLimit: appliedLimit2 } = applyHeadLimit(result.lines, headLimit, offset);
           const finalLines = limited2.map((line) => {
             const colonIdx = line.indexOf(":");
             if (colonIdx > 0) {
@@ -10363,7 +10363,7 @@ var init_grep = __esm({
           return { content: content + suffix2 };
         }
         if (outputMode === "count") {
-          const { items: limited2, appliedLimit: appliedLimit2 } = applyHeadLimit(result2.lines, headLimit, offset);
+          const { items: limited2, appliedLimit: appliedLimit2 } = applyHeadLimit(result.lines, headLimit, offset);
           const finalLines = limited2.map((line) => {
             const colonIdx = line.lastIndexOf(":");
             if (colonIdx > 0) {
@@ -10385,7 +10385,7 @@ var init_grep = __esm({
 Found ${totalMatches} total occurrences across ${limited2.length} files.${limitInfo2 ? ` with pagination = ${limitInfo2}` : ""}`;
           return { content: content + summary };
         }
-        const { items: limited, appliedLimit } = applyHeadLimit(result2.lines, headLimit, offset);
+        const { items: limited, appliedLimit } = applyHeadLimit(result.lines, headLimit, offset);
         const filenames = limited.map((line) => {
           const colonIdx = line.indexOf(":");
           const fpath = colonIdx > 0 ? line.substring(0, colonIdx) : line;
@@ -10939,7 +10939,7 @@ async function runAgent(opts) {
       console.warn(`[agent:${agentId}] No visualRegistry in context, cannot bind Discord channel for "${visualName}"`);
     }
   }
-  let result2 = "";
+  let result = "";
   let toolUseCount = 0;
   try {
     for await (const chunk of subEngine.query(messages, runAbort.signal, opts.context)) {
@@ -10970,12 +10970,12 @@ async function runAgent(opts) {
         }
       }
       if (chunk.type === "text" && chunk.text) {
-        result2 += chunk.text;
+        result += chunk.text;
       }
       if (chunk.type === "result") {
         const resultContent = chunk.content;
         if (resultContent) {
-          result2 = resultContent;
+          result = resultContent;
         }
       }
     }
@@ -10983,11 +10983,11 @@ async function runAgent(opts) {
     agentRegistry.unregister(agentId);
   }
   const durationMs = Date.now() - startTime;
-  console.log(`[agent:${agentId}] ${agentDef.agentType} completed in ${durationMs}ms, ${toolUseCount} tools, ${result2.length} chars`);
+  console.log(`[agent:${agentId}] ${agentDef.agentType} completed in ${durationMs}ms, ${toolUseCount} tools, ${result.length} chars`);
   return {
     agentId,
     agentType: agentDef.agentType,
-    content: result2 || "(no output from agent)",
+    content: result || "(no output from agent)",
     totalToolUseCount: toolUseCount,
     totalDurationMs: durationMs
   };
@@ -12133,7 +12133,7 @@ var init_AgentTool = __esm({
           console.log(`[AgentTool] Background requested but running synchronously (headless limitation)`);
         }
         try {
-          const result2 = await runAgent({
+          const result = await runAgent({
             prompt,
             description,
             subagentType,
@@ -12150,9 +12150,9 @@ var init_AgentTool = __esm({
             // visual 系统用这个 name 创建频道
           });
           const parts = [
-            result2.content,
+            result.content,
             "",
-            `[Agent: ${result2.agentType}, ${result2.totalDurationMs}ms, ${result2.totalToolUseCount} tool uses]`
+            `[Agent: ${result.agentType}, ${result.totalDurationMs}ms, ${result.totalToolUseCount} tool uses]`
           ];
           visualEmitter?.emitAgentDone(agentLabel);
           return {
@@ -12949,7 +12949,7 @@ var init_my_eyes = __esm({
           ]
         };
         try {
-          let result2 = "";
+          let result = "";
           const stream = provider.streamChat({
             model: modelId,
             messages: [userMsg],
@@ -12959,13 +12959,13 @@ var init_my_eyes = __esm({
           });
           for await (const chunk of stream) {
             if (chunk.type === "text" && chunk.text) {
-              result2 += chunk.text;
+              result += chunk.text;
             }
           }
-          if (!result2.trim()) {
+          if (!result.trim()) {
             return { content: "Image analysis returned empty.", isError: true };
           }
-          return { content: result2 };
+          return { content: result };
         } catch (e) {
           return { content: `Image analysis failed: ${e.message}`, isError: true };
         }
@@ -14343,18 +14343,18 @@ function parseDuration(s) {
 }
 function expandDates(input) {
   const parts = input.split(",").map((s) => s.trim()).filter(Boolean);
-  const result2 = [];
+  const result = [];
   for (const part of parts) {
     const range = parseDateRange(part);
     if (range && range.dEnd > range.dStart) {
       for (let d = range.dStart; d <= range.dEnd; d++) {
-        result2.push(`${range.month}/${d}`);
+        result.push(`${range.month}/${d}`);
       }
     } else {
-      result2.push(part);
+      result.push(part);
     }
   }
-  return result2;
+  return result;
 }
 function timeToMin(t) {
   const [hh, mm] = t.split(":").map(Number);
@@ -14557,16 +14557,16 @@ function addBatch(db2, args) {
     ).run(args.event, dateStr, args.time, args.time, durationMin, remindMin, remindAt, 0, nowIso(), args.channel || null, args.channelTarget || null);
     ok.push(`#${r.lastInsertRowid} ${dateStr}`);
   }
-  let result2 = `\u2705 \u6210\u529F ${ok.length} \u6761`;
-  if (skipped.length > 0) result2 += `\uFF0C\u26A0\uFE0F \u51B2\u7A81\u8DF3\u8FC7 ${skipped.length} \u6761`;
-  result2 += `
+  let result = `\u2705 \u6210\u529F ${ok.length} \u6761`;
+  if (skipped.length > 0) result += `\uFF0C\u26A0\uFE0F \u51B2\u7A81\u8DF3\u8FC7 ${skipped.length} \u6761`;
+  result += `
 ${ok.map((s) => `  ${s}`).join("\n")}`;
   if (skipped.length > 0) {
-    result2 += `
+    result += `
 \u51B2\u7A81\u8BE6\u60C5\uFF1A
 ${skipped.map((s) => `  ${s}`).join("\n")}`;
   }
-  return result2;
+  return result;
 }
 function addTask(db2, args) {
   const { dateStr, timeExact, event: event2, docPath } = args;
@@ -14807,7 +14807,7 @@ var init_calendar = __esm({
         if (!action) return { content: "Error: action is required", isError: true };
         try {
           const db2 = openDb(ctx.workspace);
-          let result2;
+          let result;
           let isAddTask = false;
           if (action === "add") {
             const event2 = args.event?.trim();
@@ -14816,22 +14816,22 @@ var init_calendar = __esm({
             const repeat = args.repeat || (args.weekly ? "weekly" : "once");
             if (repeat === "daily" || repeat === "weekdays") {
               if (!args.time) return { content: "Error: add daily/weekdays needs time (e.g. 23:00)", isError: true };
-              result2 = addDaily(db2, { time: args.time, event: event2, repeatType: repeat, remind, channel: ctx.channel, channelTarget: ctx.channelTarget });
+              result = addDaily(db2, { time: args.time, event: event2, repeatType: repeat, remind, channel: ctx.channel, channelTarget: ctx.channelTarget });
             } else if (repeat === "weekly") {
               const day = args.day;
               if (!day) return { content: "Error: add weekly needs day", isError: true };
-              result2 = addWeekly(db2, { day, event: event2, time: args.time, duration: args.duration, remind, channel: ctx.channel, channelTarget: ctx.channelTarget });
+              result = addWeekly(db2, { day, event: event2, time: args.time, duration: args.duration, remind, channel: ctx.channel, channelTarget: ctx.channelTarget });
             } else {
               const date = args.date?.trim();
               if (!date) return { content: "Error: add once needs date (e.g. 5/26)", isError: true };
-              result2 = addDate(db2, { dateStr: date, event: event2, time: args.time, duration: args.duration, remind, channel: ctx.channel, channelTarget: ctx.channelTarget });
+              result = addDate(db2, { dateStr: date, event: event2, time: args.time, duration: args.duration, remind, channel: ctx.channel, channelTarget: ctx.channelTarget });
             }
           } else if (action === "add-batch") {
             const event2 = args.event?.trim();
             const datesInput = args.dates?.trim();
             if (!event2) return { content: "Error: add-batch needs event", isError: true };
             if (!datesInput) return { content: 'Error: add-batch needs dates (e.g. "7/2,7/4,7/6-7/10")', isError: true };
-            result2 = addBatch(db2, { datesInput, event: event2, time: args.time, duration: args.duration, remind: args.remind, channel: ctx.channel, channelTarget: ctx.channelTarget });
+            result = addBatch(db2, { datesInput, event: event2, time: args.time, duration: args.duration, remind: args.remind, channel: ctx.channel, channelTarget: ctx.channelTarget });
           } else if (action === "add-task") {
             isAddTask = true;
             const event2 = args.event?.trim();
@@ -14842,60 +14842,60 @@ var init_calendar = __esm({
             if (!date) return { content: "Error: add-task needs date (e.g. 7/5)", isError: true };
             if (!timeExact || !timeExact.includes(":")) return { content: "Error: add-task needs time_exact (HH:MM, e.g. 14:00)", isError: true };
             if (!docPath) return { content: "\u274C \u521B\u5EFA\u5931\u8D25\uFF1Aadd-task \u5FC5\u987B\u4F20 doc_path\u3002\n\u6CA1\u6709\u6587\u6863\u652F\u6491\u7684 task \u4E0D\u662F\u5408\u683C\u7684 task\u3002\n\u8BF7\u5148\u5728 docs/todo/ \u4E0B\u521B\u5EFA\u6587\u6863\uFF08\u547D\u540D\uFF1AYYYY-MM-DD_\u4E3B\u9898.md \u6216 \u4EFB\u52A1\u540D.md\uFF09\uFF0C\u7136\u540E\u4F20 doc_path \u53C2\u6570\u3002", isError: true };
-            result2 = addTask(db2, { dateStr: date, timeExact, event: event2, remind: args.remind, channel: ctx.channel, channelTarget: ctx.channelTarget, docPath });
+            result = addTask(db2, { dateStr: date, timeExact, event: event2, remind: args.remind, channel: ctx.channel, channelTarget: ctx.channelTarget, docPath });
           } else if (action === "reschedule") {
             if (args.id == null) return { content: "Error: reschedule needs id", isError: true };
             const date = args.date?.trim();
             const timeExact = args.time_exact?.trim();
             if (!date) return { content: "Error: reschedule needs date (e.g. 7/10)", isError: true };
             if (!timeExact || !timeExact.includes(":")) return { content: "Error: reschedule needs time_exact (HH:MM)", isError: true };
-            result2 = reschedule(db2, { id: args.id, dateStr: date, timeExact, remind: args.remind });
+            result = reschedule(db2, { id: args.id, dateStr: date, timeExact, remind: args.remind });
           } else if (action === "link-doc") {
             if (args.id == null) return { content: "Error: link-doc needs id", isError: true };
             const docPath = args.doc_path?.trim();
             if (!docPath) return { content: "Error: link-doc needs doc_path", isError: true };
-            result2 = linkDoc(db2, args.id, docPath);
+            result = linkDoc(db2, args.id, docPath);
           } else if (action === "find-doc") {
             if (args.id == null) return { content: "Error: find-doc needs id", isError: true };
-            result2 = findDoc(db2, args.id);
+            result = findDoc(db2, args.id);
           } else if (action === "list") {
-            result2 = list(db2, { all: !!args.all });
+            result = list(db2, { all: !!args.all });
           } else if (action === "done") {
             if (args.id == null) return { content: "Error: done needs id", isError: true };
-            result2 = done(db2, args.id);
+            result = done(db2, args.id);
           } else if (action === "pending") {
-            result2 = pending(db2);
+            result = pending(db2);
           } else if (action === "search") {
             const kw = args.event?.trim();
             if (!kw) return { content: "Error: search needs keyword (event field)", isError: true };
-            result2 = search(db2, kw);
+            result = search(db2, kw);
           } else if (action === "archive") {
             if (args.id == null) return { content: "Error: archive needs id", isError: true };
-            result2 = archive(db2, args.id);
+            result = archive(db2, args.id);
           } else if (action === "delete") {
             if (args.id == null) return { content: "Error: delete needs id", isError: true };
-            result2 = archive(db2, args.id);
+            result = archive(db2, args.id);
           } else if (action === "cleanup") {
-            result2 = cleanup(db2);
+            result = cleanup(db2);
           } else if (action === "stats") {
-            result2 = stats(db2);
+            result = stats(db2);
           } else {
             return { content: `Error: unknown action '${action}'`, isError: true };
           }
           db2.close();
-          const isFailed = result2.startsWith("\u274C") || result2.includes("Error") || result2.includes("\u7528\u6CD5");
+          const isFailed = result.startsWith("\u274C") || result.includes("Error") || result.includes("\u7528\u6CD5");
           if (isAddTask && !isFailed) {
             const { enqueueNotification: enqueueNotification2, buildCalendarNotification: buildCalendarNotification2 } = await Promise.resolve().then(() => (init_task_manager(), task_manager_exports));
             const sessionId = ctx.sessionId || "main";
             const channel = ctx.channel;
             const channelTarget = ctx.channelTarget;
             if (!channel || !channelTarget) {
-              return { content: result2 };
+              return { content: result };
             }
-            const notif = buildCalendarNotification2("task-created", [result2 + "\n\n\u8BF7\u6309\u4EE5\u4E0B\u6B65\u9AA4\u540C\u6B65\uFF1A\n1. \u5148\u62C6 Phase\uFF08\u5217\u51FA\u5B50\u4EFB\u52A1\uFF0C\u6807 - [ ] / - [~] / - [!] \u72B6\u6001\uFF09\u2014 \u4E0D\u62C6 Phase \u76F4\u63A5\u5E72\u6D3B = 3-Strike \u7B2C1\u6B21\n2. \u540C\u6B65\u5230 SESSION-STATE.md\uFF08- [~] \u4EFB\u52A1\u540D \u2014 started M/D HH:MM\uFF09\n3. \u7528\u4EFB\u52A1\u7BA1\u7406\u5DE5\u5177\u8DDF\u8E2A\uFF08\u5982 TodoWrite\uFF09\n4. \u5927\u4EFB\u52A1\u5199 docs/todo/YYYY-MM-DD_\u4E3B\u9898.md\uFF08\u80CC\u666F+\u65B9\u6848+\u9A8C\u8BC1\u6807\u51C6\uFF09\n5. \u5B8C\u6210\u540E\uFF1ASESSION-STATE \u6807 - [x] + calendar done <id>"]);
+            const notif = buildCalendarNotification2("task-created", [result + "\n\n\u8BF7\u6309\u4EE5\u4E0B\u6B65\u9AA4\u540C\u6B65\uFF1A\n1. \u5148\u62C6 Phase\uFF08\u5217\u51FA\u5B50\u4EFB\u52A1\uFF0C\u6807 - [ ] / - [~] / - [!] \u72B6\u6001\uFF09\u2014 \u4E0D\u62C6 Phase \u76F4\u63A5\u5E72\u6D3B = 3-Strike \u7B2C1\u6B21\n2. \u540C\u6B65\u5230 SESSION-STATE.md\uFF08- [~] \u4EFB\u52A1\u540D \u2014 started M/D HH:MM\uFF09\n3. \u7528\u4EFB\u52A1\u7BA1\u7406\u5DE5\u5177\u8DDF\u8E2A\uFF08\u5982 TodoWrite\uFF09\n4. \u5927\u4EFB\u52A1\u5199 docs/todo/YYYY-MM-DD_\u4E3B\u9898.md\uFF08\u80CC\u666F+\u65B9\u6848+\u9A8C\u8BC1\u6807\u51C6\uFF09\n5. \u5B8C\u6210\u540E\uFF1ASESSION-STATE \u6807 - [x] + calendar done <id>"]);
             enqueueNotification2(notif, { sessionId, channel, channelTarget });
           }
-          return { content: result2 };
+          return { content: result };
         } catch (e) {
           return { content: `Calendar ${action} failed: ${e.message}`, isError: true };
         }
@@ -15195,10 +15195,10 @@ var init_TodoWriteTool = __esm({
         const allDone = todos.length > 0 && todos.every((t) => t.status === "completed");
         const newTodos = allDone ? [] : todos;
         saveTodos(sessionId, newTodos);
-        let result2 = "Todos have been successfully. Ensure that you use the todo list to track your progress. Please proceed with the current task as applicable";
+        let result = "Todos have been successfully. Ensure that you use the todo list to track your progress. Please proceed with the current task as applicable";
         if (allDone && todos.length >= 3) {
         }
-        return { content: result2 };
+        return { content: result };
       },
       isReadOnly: () => false,
       isConcurrencySafe: () => false
@@ -17026,16 +17026,16 @@ var init_task_output = __esm({
         }
         let task = initialTask;
         if (block && (task.status === "running" || task.status === "pending")) {
-          const result3 = await waitForTaskCompletion(taskId, timeout, signal);
-          if (!result3) {
+          const result2 = await waitForTaskCompletion(taskId, timeout, signal);
+          if (!result2) {
             return { content: `Task ${taskId} was aborted or not found`, isError: true };
           }
-          task = result3;
+          task = result2;
         }
         const output = getTaskOutput(taskId);
         const truncated = output.length > 5e4 ? output.slice(0, 5e4) + "\n...[output truncated]" : output;
         const retrievalStatus = !block && (task.status === "running" || task.status === "pending") ? "not_ready" : block && (task.status === "running" || task.status === "pending") ? "timeout" : "success";
-        const result2 = {
+        const result = {
           retrieval_status: retrievalStatus,
           task: {
             task_id: task.id,
@@ -17047,7 +17047,7 @@ var init_task_output = __esm({
           }
         };
         return {
-          content: JSON.stringify(result2, null, 2)
+          content: JSON.stringify(result, null, 2)
         };
       },
       isConcurrencySafe: () => true,
@@ -17195,7 +17195,7 @@ var init_reply_blocklist = __esm({
         const workspace = ctx.workspace || process.env.ENGINE_WORKSPACE || ".";
         const stripIds = ctx?.channelConfig?.discord?.stripMentionIds || [];
         ensureLoaded(workspace, stripIds);
-        let result2;
+        let result;
         switch (action) {
           case "list": {
             const lines = ["**\u81EA\u52A8\u56DE\u590D\u5C4F\u853D\u5217\u8868\uFF1A**"];
@@ -17209,14 +17209,14 @@ var init_reply_blocklist = __esm({
                 lines.push(`  - \`${id}\``);
               }
             }
-            result2 = { content: lines.join("\n") };
+            result = { content: lines.join("\n") };
             break;
           }
           case "block_all": {
             state.blockAll = true;
             save(workspace);
             console.log(`[reply-blocklist] Block ALL enabled`);
-            result2 = { content: '\u{1F6AB} \u5DF2\u5C4F\u853D\u6240\u6709\u4EBA\u7684\u81EA\u52A8\u56DE\u590D\u3002\u7528 action="unblock_all" \u89E3\u9664\u3002' };
+            result = { content: '\u{1F6AB} \u5DF2\u5C4F\u853D\u6240\u6709\u4EBA\u7684\u81EA\u52A8\u56DE\u590D\u3002\u7528 action="unblock_all" \u89E3\u9664\u3002' };
             break;
           }
           case "unblock_all": {
@@ -17224,7 +17224,7 @@ var init_reply_blocklist = __esm({
             state.blockedUserIds = [];
             save(workspace);
             console.log(`[reply-blocklist] Block ALL disabled, list cleared`);
-            result2 = { content: "\u2705 \u5DF2\u89E3\u9664\u6240\u6709\u4EBA\u5C4F\u853D\uFF0C\u6E05\u7A7A\u5C4F\u853D\u5217\u8868\u3002" };
+            result = { content: "\u2705 \u5DF2\u89E3\u9664\u6240\u6709\u4EBA\u5C4F\u853D\uFF0C\u6E05\u7A7A\u5C4F\u853D\u5217\u8868\u3002" };
             break;
           }
           case "add": {
@@ -17241,7 +17241,7 @@ var init_reply_blocklist = __esm({
             }
             save(workspace);
             console.log(`[reply-blocklist] Added ${added} user(s): ${ids.join(", ")}`);
-            result2 = { content: `\u2705 \u5DF2\u5C4F\u853D ${added} \u4EBA\uFF08\u5171 ${state.blockedUserIds.length} \u4EBA\uFF09\u3002\u5C4F\u853D\u5217\u8868\uFF1A${state.blockedUserIds.join(", ")}` };
+            result = { content: `\u2705 \u5DF2\u5C4F\u853D ${added} \u4EBA\uFF08\u5171 ${state.blockedUserIds.length} \u4EBA\uFF09\u3002\u5C4F\u853D\u5217\u8868\uFF1A${state.blockedUserIds.join(", ")}` };
             break;
           }
           case "remove": {
@@ -17254,11 +17254,11 @@ var init_reply_blocklist = __esm({
             const removed = before - state.blockedUserIds.length;
             save(workspace);
             console.log(`[reply-blocklist] Removed ${removed} user(s)`);
-            result2 = { content: `\u2705 \u5DF2\u79FB\u9664 ${removed} \u4EBA\uFF08\u5269 ${state.blockedUserIds.length} \u4EBA\uFF09\u3002` };
+            result = { content: `\u2705 \u5DF2\u79FB\u9664 ${removed} \u4EBA\uFF08\u5269 ${state.blockedUserIds.length} \u4EBA\uFF09\u3002` };
             break;
           }
           default:
-            result2 = { content: `Error: \u672A\u77E5\u64CD\u4F5C "${action}"`, isError: true };
+            result = { content: `Error: \u672A\u77E5\u64CD\u4F5C "${action}"`, isError: true };
         }
         const adapters = globalThis.__channelAdapters;
         if (adapters) {
@@ -17267,7 +17267,7 @@ var init_reply_blocklist = __esm({
             discordAdapter.addStripMentionIds(state.blockedUserIds);
           }
         }
-        return result2;
+        return result;
       },
       isConcurrencySafe: () => true,
       isReadOnly: () => false
@@ -17749,9 +17749,9 @@ Select up to ${topK} most relevant (return their 1-indexed numbers as JSON {"sel
         const parsed = JSON.parse(jsonMatch[0]);
         if (parsed.selected && Array.isArray(parsed.selected)) {
           const indices = parsed.selected.filter((n) => n >= 1 && n <= candidates.length).map((n) => n - 1);
-          const result2 = indices.map((i) => candidates[i]);
-          console.log(`[memdir] rerank: ${model} selected ${result2.length}/${candidates.length} candidates (indices: ${indices.map((i) => i + 1).join(",")})`);
-          return result2.slice(0, topK);
+          const result = indices.map((i) => candidates[i]);
+          console.log(`[memdir] rerank: ${model} selected ${result.length}/${candidates.length} candidates (indices: ${indices.map((i) => i + 1).join(",")})`);
+          return result.slice(0, topK);
         }
       } catch {
       }
@@ -17977,7 +17977,7 @@ async function findRelevantMemoriesEveros(query, _memoryDir, alreadySurfaced = /
       } else {
       }
     }
-    const result2 = [];
+    const result = [];
     const seenSubjects = /* @__PURE__ */ new Set();
     for (const ep of episodes) {
       if (ep.score < minScore) continue;
@@ -17987,7 +17987,7 @@ async function findRelevantMemoriesEveros(query, _memoryDir, alreadySurfaced = /
       if (surfacedSubjects.has(subject)) continue;
       if (seenSubjects.has(subject)) continue;
       seenSubjects.add(subject);
-      result2.push({
+      result.push({
         path: virtualPath,
         mtimeMs: ep.timestamp ? new Date(ep.timestamp).getTime() : Date.now(),
         content: `### ${ep.subject}
@@ -17995,10 +17995,10 @@ async function findRelevantMemoriesEveros(query, _memoryDir, alreadySurfaced = /
 ${ep.episode || ep.summary}`,
         header: formatEverosHeader(ep)
       });
-      if (result2.length >= topK) break;
+      if (result.length >= topK) break;
     }
-    console.log(`[memdir] everos recall: returning ${result2.length} memories (after dedup)`);
-    return result2;
+    console.log(`[memdir] everos recall: returning ${result.length} memories (after dedup)`);
+    return result;
   } catch (e) {
     const ms = Date.now() - t0;
     console.warn(`[memdir] everos recall: error after ${ms}ms: ${e?.message ?? e}`);
@@ -18455,10 +18455,10 @@ ${conversationText}`
           channelManager: null
         };
         let toolCount = 0;
-        let result2 = "";
+        let result = "";
         for await (const chunk of extractEngine.query(extractMessages, void 0, toolContext)) {
           if (chunk.type === "text" && chunk.text) {
-            result2 += chunk.text;
+            result += chunk.text;
           }
           if (chunk.type === "tool_call") {
             toolCount++;
@@ -18469,7 +18469,7 @@ ${conversationText}`
         persistState(workspace);
         const duration = Date.now() - startTime;
         console.log(
-          `[memory] extractMemories finished in ${duration}ms \u2014 ${toolCount} tools used, ${result2.length} chars`
+          `[memory] extractMemories finished in ${duration}ms \u2014 ${toolCount} tools used, ${result.length} chars`
         );
       } catch (error) {
         console.warn(
@@ -18884,18 +18884,18 @@ function truncateSessionMemoryForCompact(content) {
   let wasTruncated = false;
   for (const line of lines) {
     if (line.startsWith("# ")) {
-      const result3 = flushSessionSection(currentSectionHeader, currentSectionLines, maxCharsPerSection);
-      outputLines.push(...result3.lines);
-      wasTruncated = wasTruncated || result3.wasTruncated;
+      const result2 = flushSessionSection(currentSectionHeader, currentSectionLines, maxCharsPerSection);
+      outputLines.push(...result2.lines);
+      wasTruncated = wasTruncated || result2.wasTruncated;
       currentSectionHeader = line;
       currentSectionLines = [];
     } else {
       currentSectionLines.push(line);
     }
   }
-  const result2 = flushSessionSection(currentSectionHeader, currentSectionLines, maxCharsPerSection);
-  outputLines.push(...result2.lines);
-  wasTruncated = wasTruncated || result2.wasTruncated;
+  const result = flushSessionSection(currentSectionHeader, currentSectionLines, maxCharsPerSection);
+  outputLines.push(...result.lines);
+  wasTruncated = wasTruncated || result.wasTruncated;
   return { truncatedContent: outputLines.join("\n"), wasTruncated };
 }
 function flushSessionSection(sectionHeader, sectionLines, maxCharsPerSection) {
@@ -19082,10 +19082,10 @@ ${messages.filter((m) => m.role === "user" || m.role === "assistant").slice(-20)
       channelManager: null
     };
     let toolCount = 0;
-    let result2 = "";
+    let result = "";
     for await (const chunk of extractEngine.query(extractMessages, void 0, toolContext)) {
       if (chunk.type === "text" && chunk.text) {
-        result2 += chunk.text;
+        result += chunk.text;
       }
       if (chunk.type === "tool_call") {
         toolCount++;
@@ -19094,7 +19094,7 @@ ${messages.filter((m) => m.role === "user" || m.role === "assistant").slice(-20)
     recordExtractionTokenCount(roughTokenCountEstimation5(
       messages.map((m) => typeof m.content === "string" ? m.content : "").join("")
     ));
-    console.log(`[sessionMemory] extraction complete: ${toolCount} edits applied, ${result2.length} chars`);
+    console.log(`[sessionMemory] extraction complete: ${toolCount} edits applied, ${result.length} chars`);
     return {
       fired: true,
       summary: `Applied ${toolCount} edits to session notes`
@@ -19477,23 +19477,23 @@ ${sessionIds.map((id) => `- ${id}`).join("\n")}`;
       workspace,
       channelManager: null
     };
-    let result2 = "";
+    let result = "";
     let turnCount = 0;
     dlog("dream query START");
     for await (const chunk of dreamEngine.query(messages, void 0, toolContext)) {
       if (chunk.type === "text") {
-        result2 += chunk.text || "";
+        result += chunk.text || "";
       }
       if (chunk.type === "tool_call") {
         turnCount++;
         dlog(`dream turn ${turnCount}: tool_call`);
       }
     }
-    dlog(`dream query DONE \u2014 ${turnCount} tool_calls, result=${result2.length} chars`);
+    dlog(`dream query DONE \u2014 ${turnCount} tool_calls, result=${result.length} chars`);
     await recordConsolidation(memoryDir);
     dlog(`recordConsolidation OK \u2014 wrote .consolidate-lock`);
     console.log(`[autoDream] completed \u2014 reviewed ${sessionIds.length} sessions`);
-    return { fired: true, summary: result2.slice(0, 500) };
+    return { fired: true, summary: result.slice(0, 500) };
   } catch (e) {
     const err = e;
     dlog(`CATCH failed: ${err.message}
@@ -20268,11 +20268,11 @@ ${text}` : text });
         toolOverride: void 0,
         disableThinking: extractP?.disableThinking ?? true
       });
-      executeAutoDream2().then((result2) => {
-        if (result2.fired) {
-          console.log(`[autoDream] completed: ${result2.summary?.slice(0, 200)}`);
+      executeAutoDream2().then((result) => {
+        if (result.fired) {
+          console.log(`[autoDream] completed: ${result.summary?.slice(0, 200)}`);
         } else {
-          console.log(`[autoDream] not fired: ${result2.reason}`);
+          console.log(`[autoDream] not fired: ${result.reason}`);
         }
       }).catch((err) => {
         console.warn(`[handle-query] AutoDream error: ${err.message}`);
@@ -20656,10 +20656,10 @@ function emitInit(sessionId, model) {
     session_id: sessionId
   });
 }
-function emitTurn(result2, model) {
+function emitTurn(result, model) {
   const content = [];
-  if (result2.thinking) content.push({ type: "thinking", text: result2.thinking });
-  content.push({ type: "text", text: result2.text });
+  if (result.thinking) content.push({ type: "thinking", text: result.thinking });
+  content.push({ type: "text", text: result.text });
   writeLine({
     type: "assistant",
     message: {
@@ -20672,25 +20672,25 @@ function emitTurn(result2, model) {
       usage: { input_tokens: 0, output_tokens: 0 }
     },
     uuid: randomUUID9(),
-    session_id: result2.sessionId
+    session_id: result.sessionId
   });
   writeLine({
     type: "result",
-    subtype: result2.ok ? "success" : "error_during_execution",
-    is_error: !result2.ok,
-    ...result2.terminalReason ? { terminal_reason: result2.terminalReason } : {},
-    duration_ms: result2.durationMs,
-    duration_api_ms: result2.durationMs,
-    num_turns: result2.numTurns,
-    result: result2.text,
+    subtype: result.ok ? "success" : "error_during_execution",
+    is_error: !result.ok,
+    ...result.terminalReason ? { terminal_reason: result.terminalReason } : {},
+    duration_ms: result.durationMs,
+    duration_api_ms: result.durationMs,
+    num_turns: result.numTurns,
+    result: result.text,
     stop_reason: "end_turn",
     total_cost_usd: 0,
     usage: { input_tokens: 0, output_tokens: 0 },
     modelUsage: {},
     permission_denials: [],
-    errors: result2.errors,
+    errors: result.errors,
     uuid: randomUUID9(),
-    session_id: result2.sessionId
+    session_id: result.sessionId
   });
 }
 async function doCcRun(argv) {
@@ -20778,9 +20778,9 @@ async function doCcRun(argv) {
     process.stderr.write("cc-run: \u6CA1\u6536\u5230 prompt\uFF08-p \u6216 stdin user message \u5747\u4E3A\u7A7A\uFF09\n");
     return 1;
   }
-  let result2;
+  let result;
   try {
-    result2 = await runQuery(args);
+    result = await runQuery(args);
   } catch (e) {
     const errMsg = String(e?.message || e);
     process.stderr.write(`cc-run: ${errMsg}
@@ -20803,10 +20803,10 @@ async function doCcRun(argv) {
     return 1;
   }
   if (args.outputFormat === "stream-json") {
-    emitTurn(result2, model);
+    emitTurn(result, model);
     await flushStdout();
   } else {
-    process.stdout.write(result2.text.endsWith("\n") ? result2.text : result2.text + "\n");
+    process.stdout.write(result.text.endsWith("\n") ? result.text : result.text + "\n");
     await flushStdout();
   }
   return 0;
@@ -20829,6 +20829,8 @@ __export(cli_travel_exports, {
   doExport: () => doExport,
   doImport: () => doImport,
   loadTravelConfig: () => loadTravelConfig,
+  parseImportArgs: () => parseImportArgs,
+  resolveArchiveForTest: () => resolveArchiveForTest,
   saveTravelConfig: () => saveTravelConfig
 });
 import * as path29 from "node:path";
@@ -20847,26 +20849,26 @@ function saveTravelConfig(cfg) {
   fs27.writeFileSync(CONFIG_PATH, JSON.stringify(cfg, null, 2));
 }
 function sanitizeContent(content, dirs) {
-  let result2 = content;
+  let result = content;
   for (const { placeholder, getOriginal } of PATH_PLACEHOLDERS) {
     const original = getOriginal(dirs);
     if (original) {
-      result2 = result2.split(original).join(placeholder);
-      result2 = result2.split(original.replace(/\//g, "\\")).join(placeholder);
-      result2 = result2.split(original.replace(/\//g, "\\\\")).join(placeholder);
+      result = result.split(original).join(placeholder);
+      result = result.split(original.replace(/\//g, "\\")).join(placeholder);
+      result = result.split(original.replace(/\//g, "\\\\")).join(placeholder);
     }
   }
-  return result2;
+  return result;
 }
 function restoreContent(content, dirs) {
-  let result2 = content;
+  let result = content;
   for (const { placeholder, getOriginal } of PATH_PLACEHOLDERS) {
     const target = getOriginal(dirs);
     if (target) {
-      result2 = result2.split(placeholder).join(target);
+      result = result.split(placeholder).join(target);
     }
   }
-  return result2;
+  return result;
 }
 function isTextFile(filePath) {
   const ext = path29.extname(filePath).toLowerCase();
@@ -21133,21 +21135,55 @@ async function doExport(opts) {
   }
   await uploadToGitHub(cfg, archiveFile, agentName, version, manifest);
 }
+function parseImportArgs(args) {
+  let stateDir = "";
+  let agentName = "";
+  let version = "";
+  let archiveFile = "";
+  let dryRun2 = false;
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === "--state-dir" && args[i + 1]) stateDir = args[++i];
+    else if (args[i] === "--agent" && args[i + 1]) agentName = args[++i];
+    else if (args[i] === "--version" && args[i + 1]) version = args[++i];
+    else if (args[i] === "--file" && args[i + 1]) archiveFile = args[++i];
+    else if (args[i] === "--dry-run") dryRun2 = true;
+  }
+  if (!stateDir) throw new Error("import \u9700\u8981 --state-dir <path>");
+  if (!agentName) agentName = path29.basename(stateDir);
+  return { stateDir, agentName, version, archiveFile, dryRun: dryRun2 };
+}
+async function resolveArchiveForTest(opts) {
+  if (opts.archiveFile) {
+    if (!fs27.existsSync(opts.archiveFile)) {
+      throw new Error(`\u672C\u5730\u5305\u4E0D\u5B58\u5728: ${opts.archiveFile}`);
+    }
+    return opts.archiveFile;
+  }
+  return opts.downloadFallback();
+}
 async function doImport(opts) {
-  const { agentName, stateDir, version, dryRun: dryRun2 } = opts;
+  const { agentName, stateDir, version, archiveFile, dryRun: dryRun2 } = opts;
   console.log(`\u{1F4E5} engine7 import`);
   console.log(`   agent: ${agentName}`);
   console.log(`   target: ${stateDir}`);
-  const cfg = loadTravelConfig();
-  if (!cfg || !cfg.githubToken) {
-    console.error(`\u274C \u672A\u914D\u7F6E GitHub\uFF0C\u65E0\u6CD5\u4E0B\u8F7D`);
-    console.error(`   \u914D\u7F6E: \u7F16\u8F91 ${CONFIG_PATH}`);
-    process.exit(1);
-  }
   const tmpDir = path29.join(os4.tmpdir(), `engine7-import-${agentName}-${Date.now()}`);
   fs27.mkdirSync(tmpDir, { recursive: true });
-  const archiveFile = await downloadFromGitHub(cfg, agentName, version, tmpDir);
-  console.log(`\u2705 \u4E0B\u8F7D\u5B8C\u6210: ${archiveFile}`);
+  const resolved = await resolveArchiveForTest({
+    archiveFile: archiveFile || "",
+    tmpDir,
+    downloadFallback: async () => {
+      const cfg = loadTravelConfig();
+      if (!cfg || !cfg.githubToken) {
+        console.error(`\u274C \u672A\u914D\u7F6E GitHub\uFF0C\u65E0\u6CD5\u4E0B\u8F7D`);
+        console.error(`   \u914D\u7F6E: \u7F16\u8F91 ${CONFIG_PATH}`);
+        console.error(`   \u6216\u7528 --file <\u672C\u5730\u5305.tar.gz> \u79BB\u7EBF\u5BFC\u5165`);
+        process.exit(1);
+      }
+      return downloadFromGitHub(cfg, agentName, version, tmpDir);
+    }
+  });
+  const finalArchive = resolved;
+  console.log(`\u2705 \u5305\u5C31\u7EEA: ${finalArchive}`);
   if (dryRun2) {
     console.log(`
 [DRY RUN] \u53EA\u4E0B\u8F7D\u4E0D\u6062\u590D`);
@@ -21155,7 +21191,7 @@ async function doImport(opts) {
   }
   console.log(`\u{1F4C2} \u89E3\u5305\u4E2D...`);
   const tarExe = process.platform === "win32" ? "C:\\Windows\\System32\\tar.exe" : "tar";
-  execSync2(`"${tarExe}" -xzf "${archiveFile}" -C "${tmpDir}"`, { stdio: "pipe" });
+  execSync2(`"${tarExe}" -xzf "${finalArchive}" -C "${tmpDir}"`, { stdio: "pipe" });
   const stagingDir = path29.join(tmpDir, agentName);
   const manifestPath = path29.join(stagingDir, "manifest.json");
   if (!fs27.existsSync(manifestPath)) {
@@ -21798,7 +21834,7 @@ async function configureFeishu(rl, v) {
   const feishuMode = await ask(rl, "\u9009\u62E9 (1/2)", "1");
   if (feishuMode === "1") {
     console.log("\n\u{1F4DD} \u6B63\u5728\u751F\u6210\u98DE\u4E66\u4E8C\u7EF4\u7801...\n");
-    const result2 = await registerFeishuApp({
+    const result = await registerFeishuApp({
       onLog: (msg2) => console.log(`  ${msg2}`),
       onQrCode: async (url) => {
         try {
@@ -21812,14 +21848,14 @@ async function configureFeishu(rl, v) {
         }
       }
     });
-    if (result2) {
-      v.feishuAppId = result2.appId;
-      v.feishuAppSecret = result2.appSecret;
-      v.feishuOpenId = result2.openId || "";
+    if (result) {
+      v.feishuAppId = result.appId;
+      v.feishuAppSecret = result.appSecret;
+      v.feishuOpenId = result.openId || "";
       console.log(`
-  \u2705 App ID: ${result2.appId}`);
-      console.log(`  \u2705 App Secret: ${result2.appSecret.slice(0, 6)}...`);
-      if (result2.openId) console.log(`  \u2705 Open ID: ${result2.openId}`);
+  \u2705 App ID: ${result.appId}`);
+      console.log(`  \u2705 App Secret: ${result.appSecret.slice(0, 6)}...`);
+      if (result.openId) console.log(`  \u2705 Open ID: ${result.openId}`);
     } else {
       console.log("\n  \u26A0\uFE0F \u626B\u7801\u8D85\u65F6\u6216\u5931\u8D25\uFF0C\u8BF7\u624B\u52A8\u8F93\u5165");
       v.feishuAppId = await ask(rl, "\u98DE\u4E66 App ID");
@@ -22281,7 +22317,7 @@ async function main() {
       console.log("\u{1F527} \u98DE\u4E66\u626B\u7801\u63A5\u5165...");
       const { registerFeishuApp: registerFeishuApp2 } = await Promise.resolve().then(() => (init_feishu_quick_register(), feishu_quick_register_exports));
       const { renderQrTerminal: renderQrTerminal2 } = await Promise.resolve().then(() => (init_qr_render(), qr_render_exports));
-      const result2 = await registerFeishuApp2({
+      const result = await registerFeishuApp2({
         onLog: (msg2) => console.log(`  ${msg2}`),
         onQrCode: async (url) => {
           try {
@@ -22293,7 +22329,7 @@ async function main() {
           }
         }
       });
-      if (!result2) {
+      if (!result) {
         console.error("\u274C \u626B\u7801\u8D85\u65F6\u6216\u5931\u8D25");
         process.exit(1);
       }
@@ -22316,13 +22352,13 @@ async function main() {
       if (configFile2 && fs28.existsSync(configFile2)) {
         const j = JSON.parse(fs28.readFileSync(configFile2, "utf8"));
         j.channels = j.channels || {};
-        j.channels.feishu = { enabled: true, appId: result2.appId, appSecret: result2.appSecret, connectionMode: "websocket", dmPolicy: "pairing", groupPolicy: "open" };
+        j.channels.feishu = { enabled: true, appId: result.appId, appSecret: result.appSecret, connectionMode: "websocket", dmPolicy: "pairing", groupPolicy: "open" };
         fs28.writeFileSync(configFile2, JSON.stringify(j, null, 2), "utf8");
         console.log("\u2705 \u98DE\u4E66\u901A\u9053\u5DF2\u5199\u5165: " + configFile2);
         console.log("\u91CD\u542F\u751F\u6548: engine7 restart");
       } else {
         console.log("\u26A0\uFE0F \u6CA1\u627E\u5230 config\uFF0C\u624B\u52A8\u52A0\uFF1A");
-        console.log(JSON.stringify({ feishu: { enabled: true, appId: result2.appId, appSecret: result2.appSecret, connectionMode: "websocket", dmPolicy: "pairing", groupPolicy: "open" } }, null, 2));
+        console.log(JSON.stringify({ feishu: { enabled: true, appId: result.appId, appSecret: result.appSecret, connectionMode: "websocket", dmPolicy: "pairing", groupPolicy: "open" } }, null, 2));
       }
       process.exit(0);
     }
@@ -22406,11 +22442,13 @@ async function main() {
     let importStateDir = "";
     let agentName = "";
     let version = "";
+    let archiveFile = "";
     let dryRun2 = false;
     for (let i = 1; i < args.length; i++) {
       if (args[i] === "--state-dir" && args[i + 1]) importStateDir = args[++i];
       else if (args[i] === "--agent" && args[i + 1]) agentName = args[++i];
       else if (args[i] === "--version" && args[i + 1]) version = args[++i];
+      else if (args[i] === "--file" && args[i + 1]) archiveFile = args[++i];
       else if (args[i] === "--dry-run") dryRun2 = true;
     }
     if (!importStateDir) {
@@ -22418,7 +22456,7 @@ async function main() {
       process.exit(1);
     }
     if (!agentName) agentName = path30.basename(importStateDir);
-    await doImport2({ agentName, stateDir: importStateDir, version, dryRun: dryRun2 });
+    await doImport2({ agentName, stateDir: importStateDir, version, archiveFile: archiveFile || void 0, dryRun: dryRun2 });
     process.exit(0);
   }
   if (subcommand === "start" || subcommand === "restart") {