jinzd-ai-cli 0.4.23 → 0.4.25

package/dist/index.js

@@ -8,7 +8,6 @@ import {
   SessionManager,
   SkillManager,
   TOOL_CALL_REMINDER,
-  checkPermission,
   clearDevState,
   detectsHallucinatedFileOp,
   formatGitContextForPrompt,
@@ -18,27 +17,26 @@ import {
   hadPreviousWriteToolCalls,
   loadDevState,
   parseSimpleYaml,
-  renderDiff,
-  runHook,
   saveDevState,
   sessionHasMeaningfulContent,
   setupProxy
-} from "./chunk-GBMVHLPA.js";
+} from "./chunk-SS7BQZ5R.js";
 import {
+  ToolExecutor,
   ToolRegistry,
   askUserContext,
-  getActiveMaxChars,
-  getDangerLevel,
   googleSearchContext,
   initTheme,
-  isFileWriteTool,
   lastResponseStore,
+  renderDiff,
   setContextWindow,
   spawnAgentContext,
   theme,
-  truncateOutput,
   undoStack
-} from "./chunk-PDVX5QJA.js";
+} from "./chunk-5GZQLJAY.js";
+import {
+  fileCheckpoints
+} from "./chunk-4BKXL7SM.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   AUTHOR,
@@ -59,16 +57,16 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-UA4BVWKV.js";
+} from "./chunk-AHH5I2U6.js";
 
 // src/index.ts
 import { program } from "commander";
 
 // src/repl/repl.ts
 import * as readline from "readline";
-import { existsSync as existsSync5, readFileSync as readFileSync4, readdirSync as readdirSync3, statSync as statSync3 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync3, readdirSync as readdirSync3, statSync as statSync3 } from "fs";
 import { join as join4, resolve as resolve2, extname as extname2, dirname as dirname3, basename as basename2 } from "path";
-import chalk5 from "chalk";
+import chalk4 from "chalk";
 
 // src/repl/renderer.ts
 import chalk from "chalk";
@@ -836,6 +834,39 @@ Please structure your review as follows:
 
 Severity levels: \u{1F534} Critical / \u{1F7E1} Warning / \u{1F535} Info`;
 }
+function buildSecurityReviewPrompt(diff, gitContextStr) {
+  return `# Security Vulnerability Review
+
+Analyze the following code changes **exclusively for security vulnerabilities**.
+
+## Categories to check:
+1. **Injection** \u2014 SQL, command, path traversal, XSS, template injection
+2. **Authentication & Authorization** \u2014 hardcoded credentials, missing auth checks, privilege escalation
+3. **Secrets & Sensitive Data** \u2014 API keys, tokens, passwords in code, logging sensitive data
+4. **Input Validation** \u2014 missing validation, unsafe deserialization, buffer issues
+5. **Cryptography** \u2014 weak algorithms, improper random, hardcoded IVs/salts
+6. **Dependencies** \u2014 known vulnerable packages, unsafe dynamic imports
+7. **File System** \u2014 path traversal, unsafe file permissions, symlink attacks
+8. **Network** \u2014 SSRF, insecure protocols, missing TLS validation
+
+## Git Status
+${gitContextStr}
+
+## Code Changes (diff)
+\`\`\`diff
+${diff}
+\`\`\`
+
+## Output Format
+For each finding:
+- **Severity**: \u{1F534} CRITICAL / \u{1F7E0} HIGH / \u{1F7E1} MEDIUM / \u{1F535} LOW / \u2139\uFE0F INFO
+- **Category**: (from list above)
+- **File & location**: file:line
+- **Description**: what the vulnerability is and how it could be exploited
+- **Recommended fix**: specific code change to resolve
+
+If no security issues found, state "\u2705 No security vulnerabilities detected" with a brief explanation of what was checked.`;
+}
 var CommandRegistry = class {
   commands = /* @__PURE__ */ new Map();
   register(command) {
@@ -884,6 +915,8 @@ function createDefaultCommands() {
           "  /skill [name|off|list]   - Manage agent skills (reusable prompt packs)",
           "  /checkpoint [save|restore|delete] <name> - Session checkpoints",
           "  /review [--staged] [--detailed] - AI code review from git diff",
+          "  /security-review [--staged]  - Security vulnerability scan on git diff",
+          "  /rewind [list|<n>]           - Rewind to message N (restores files too)",
           "  /commands [reload]       - List/reload custom commands (~/.aicli/commands/)",
           "  /test [command|filter]   - Run project tests and show structured report",
           "  /scaffold <description>  - Generate project scaffolding with AI",
@@ -1908,6 +1941,108 @@ ${hint}` : "")
         }
       }
     },
+    // ── /security-review ──────────────────────────────────────────
+    {
+      name: "security-review",
+      description: "Security vulnerability scan on git diff",
+      usage: "/security-review [--staged]",
+      async execute(args, ctx) {
+        const gitCtx = getGitContext();
+        if (!gitCtx) {
+          ctx.renderer.renderError("Not a git repository.");
+          return;
+        }
+        const staged = args.includes("--staged");
+        let diff;
+        try {
+          const cmd = staged ? "git diff --staged" : "git diff";
+          diff = execSync2(cmd, { encoding: "utf-8", timeout: 1e4 }).trim();
+        } catch {
+          ctx.renderer.renderError("Failed to run git diff.");
+          return;
+        }
+        if (!diff) {
+          console.log(theme.dim("  No changes to review." + (staged ? "" : " Try --staged for staged changes.")));
+          return;
+        }
+        const MAX_DIFF = 8e3;
+        let truncated = false;
+        if (diff.length > MAX_DIFF) {
+          const head = diff.slice(0, Math.floor(MAX_DIFF * 0.7));
+          const tail = diff.slice(diff.length - Math.floor(MAX_DIFF * 0.2));
+          diff = head + "\n\n... [diff truncated, " + diff.length + " chars total] ...\n\n" + tail;
+          truncated = true;
+        }
+        const prompt = buildSecurityReviewPrompt(diff, formatGitContextForPrompt(gitCtx));
+        console.log(theme.dim("  \u{1F512} Scanning for security vulnerabilities..."));
+        try {
+          const review = await ctx.chatOnce(prompt, { temperature: 0.2, maxTokens: 8192 });
+          console.log();
+          console.log(review);
+          console.log();
+          if (truncated) {
+            console.log(theme.warning("  \u26A0 Diff was truncated. Consider reviewing smaller changesets."));
+          }
+        } catch (err) {
+          ctx.renderer.renderError(`Security review failed: ${err.message}`);
+        }
+      }
+    },
+    // ── /rewind ───────────────────────────────────────────────────
+    {
+      name: "rewind",
+      description: "Rewind conversation to a previous message and restore file states",
+      usage: "/rewind [list | <n>]",
+      execute(args, ctx) {
+        const session = ctx.sessions.current;
+        if (!session || session.messages.length === 0) {
+          console.log(theme.dim("  No messages to rewind."));
+          return;
+        }
+        const sub = args[0];
+        if (sub === "list" || !sub) {
+          const msgs = session.messages;
+          console.log(theme.primary(`
+  Conversation messages (${msgs.length} total):
+`));
+          for (let i = 0; i < msgs.length; i++) {
+            const m = msgs[i];
+            const role = m.role.padEnd(10);
+            const text = getContentText(m.content).replace(/\n/g, " ").slice(0, 70);
+            const hasCheckpoint = fileCheckpoints.getMessageIndices().includes(i) ? " \u{1F4CC}" : "";
+            console.log(theme.dim(`  [${String(i + 1).padStart(3)}]`) + ` ${theme.info(role)} ${text}${hasCheckpoint}`);
+          }
+          console.log();
+          console.log(theme.dim("  Usage: /rewind <n>  \u2014 rewind to message N (1-based)"));
+          console.log(theme.dim("  \u{1F4CC} = file checkpoint exists at this point"));
+          console.log();
+          return;
+        }
+        const n = parseInt(sub, 10);
+        if (isNaN(n) || n < 1 || n > session.messages.length) {
+          ctx.renderer.renderError(`Invalid message number: ${sub}. Range: 1-${session.messages.length}`);
+          return;
+        }
+        const targetIndex = n;
+        const messagesRemoved = session.messages.length - targetIndex;
+        const { restored, deleted, files } = fileCheckpoints.restoreToMessageIndex(targetIndex);
+        session.messages = session.messages.slice(0, targetIndex);
+        session.checkpoints = session.checkpoints.filter((c) => c.messageIndex <= targetIndex);
+        session.updated = /* @__PURE__ */ new Date();
+        console.log(theme.success(`
+  \u2713 Rewound to message ${n}`));
+        console.log(theme.dim(`    Messages removed: ${messagesRemoved}`));
+        if (restored > 0 || deleted > 0) {
+          console.log(theme.dim(`    Files restored: ${restored}, files deleted: ${deleted}`));
+          for (const f of files) {
+            console.log(theme.dim(`      ${f}`));
+          }
+        } else {
+          console.log(theme.dim("    No file changes to revert."));
+        }
+        console.log();
+      }
+    },
     // ── /commands ─────────────────────────────────────────────────
     {
       name: "commands",
@@ -1944,7 +2079,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-7ZBI4ZTU.js");
+          const { executeTests } = await import("./run-tests-L3JNRB6X.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -2576,472 +2711,6 @@ function selectFromList(prompt, items, initialIndex = 0) {
   });
 }
 
-// src/tools/executor.ts
-import chalk4 from "chalk";
-import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
-var ToolExecutor = class {
-  constructor(registry) {
-    this.registry = registry;
-  }
-  round = 0;
-  totalRounds = 0;
-  /** readline 接口引用，由 repl.ts 注入，用于 confirm() 读取用户输入 */
-  rl = null;
-  /**
-   * confirm() 进行中标志。
-   * repl.ts 的主循环 line handler 在此为 true 时忽略输入，
-   * 防止用户输入 "y"+Enter 被同时触发 once('line') 和主循环 on('line')。
-   */
-  confirming = false;
-  /** 在 confirm 期间用户输入的 slash 命令，由 repl.ts 主循环消费 */
-  pendingSlashCommand = null;
-  /** confirm() 的取消回调，由 SIGINT handler 调用 */
-  cancelConfirmFn = null;
-  /**
-   * 会话级 auto-approve：跳过所有 write/destructive 确认（仅当前会话有效）。
-   * 通过 /yolo 命令切换。destructive 操作仍会显示警告但不阻塞。
-   */
-  sessionAutoApprove = false;
-  /**
-   * 由外部（repl.ts SIGINT handler）调用，将当前 confirm() 等待视为用户按 N 取消。
-   * 若当前没有 confirm() 进行中，无操作。
-   */
-  cancelConfirm() {
-    if (this.cancelConfirmFn) {
-      this.cancelConfirmFn();
-    }
-  }
-  setRoundInfo(current, total) {
-    this.round = current;
-    this.totalRounds = total;
-  }
-  /**
-   * 注入 readline 接口，供 confirm() 使用。
-   * 必须在 start() 之前调用，rl 初始化后立即注入。
-   */
-  setReadline(rl) {
-    this.rl = rl;
-  }
-  /** 钩子配置（可选） */
-  hookConfig;
-  /** 权限规则（可选） */
-  permissionRules = [];
-  defaultPermission = "confirm";
-  /** 注入 hooks 和 permission rules 配置 */
-  setConfig(opts) {
-    this.hookConfig = opts.hookConfig;
-    if (opts.permissionRules) this.permissionRules = opts.permissionRules;
-    if (opts.defaultPermission) this.defaultPermission = opts.defaultPermission;
-  }
-  async execute(call) {
-    const tool = this.registry.get(call.name);
-    if (!tool) {
-      return {
-        callId: call.id,
-        content: `Unknown tool: ${call.name}`,
-        isError: true
-      };
-    }
-    const dangerLevel = getDangerLevel(call.name, call.arguments);
-    runHook(this.hookConfig?.preToolExecution, {
-      tool: call.name,
-      dangerLevel,
-      args: JSON.stringify(call.arguments).slice(0, 200)
-    });
-    if (this.permissionRules.length > 0) {
-      const action = checkPermission(call.name, call.arguments, dangerLevel, this.permissionRules, this.defaultPermission);
-      if (action === "deny") {
-        return { callId: call.id, content: `[Permission denied] Tool ${call.name} is blocked by permission rules. Do not retry.`, isError: true };
-      }
-      if (action === "auto-approve") {
-        this.printToolCall(call);
-        try {
-          const rawContent = await tool.execute(call.arguments);
-          const content = truncateOutput(rawContent, call.name);
-          const wasTruncated = content !== rawContent;
-          this.printToolResult(call.name, rawContent, false, wasTruncated);
-          runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "ok" });
-          return { callId: call.id, content, isError: false };
-        } catch (err) {
-          const message = err instanceof Error ? err.message : String(err);
-          this.printToolResult(call.name, message, true, false);
-          runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "error" });
-          return { callId: call.id, content: message, isError: true };
-        }
-      }
-    }
-    if (this.sessionAutoApprove && dangerLevel !== "safe") {
-      this.printToolCall(call);
-      if (dangerLevel === "write") this.printDiffPreview(call);
-      console.log(theme.warning("  \u26A1 Auto-approved (session /yolo mode)"));
-      try {
-        const rawContent = await tool.execute(call.arguments);
-        const content = truncateOutput(rawContent, call.name);
-        const wasTruncated = content !== rawContent;
-        this.printToolResult(call.name, rawContent, false, wasTruncated);
-        runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "ok" });
-        return { callId: call.id, content, isError: false };
-      } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        this.printToolResult(call.name, message, true, false);
-        runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "error" });
-        return { callId: call.id, content: message, isError: true };
-      }
-    }
-    if (dangerLevel === "write") {
-      this.printToolCall(call);
-      this.printDiffPreview(call);
-      const confirmed = await this.confirm(call, dangerLevel);
-      if (!confirmed) {
-        return {
-          callId: call.id,
-          content: `[User cancelled] The user declined the ${call.name} operation. Do not retry without asking.`,
-          isError: true
-        };
-      }
-    } else if (dangerLevel === "destructive") {
-      const confirmed = await this.confirm(call, dangerLevel);
-      if (!confirmed) {
-        return {
-          callId: call.id,
-          content: `[User cancelled] The user declined the destructive ${call.name} operation. Do not retry without asking.`,
-          isError: true
-        };
-      }
-      this.printToolCall(call);
-    } else {
-      this.printToolCall(call);
-    }
-    try {
-      const rawContent = await tool.execute(call.arguments);
-      const content = truncateOutput(rawContent, call.name);
-      const wasTruncated = content !== rawContent;
-      this.printToolResult(call.name, rawContent, false, wasTruncated);
-      runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "ok" });
-      return { callId: call.id, content, isError: false };
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      this.printToolResult(call.name, message, true, false);
-      runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "error" });
-      return { callId: call.id, content: message, isError: true };
-    }
-  }
-  async executeAll(calls) {
-    const safeCalls = [];
-    const fileWriteCalls = [];
-    const otherCalls = [];
-    for (let i = 0; i < calls.length; i++) {
-      const call = calls[i];
-      const level = getDangerLevel(call.name, call.arguments);
-      if (level === "safe") {
-        safeCalls.push({ idx: i, call });
-      } else if (isFileWriteTool(call.name) && level === "write") {
-        fileWriteCalls.push({ idx: i, call });
-      } else {
-        otherCalls.push({ idx: i, call });
-      }
-    }
-    const results = new Array(calls.length);
-    await Promise.all(
-      safeCalls.map(async ({ idx, call }) => {
-        results[idx] = await this.execute(call);
-      })
-    );
-    if (fileWriteCalls.length === 1) {
-      const { idx, call } = fileWriteCalls[0];
-      results[idx] = await this.execute(call);
-    } else if (fileWriteCalls.length >= 2) {
-      const batchResults = await this.executeBatchFileWrites(fileWriteCalls.map((f) => f.call));
-      for (let i = 0; i < fileWriteCalls.length; i++) {
-        results[fileWriteCalls[i].idx] = batchResults[i];
-      }
-    }
-    for (const { idx, call } of otherCalls) {
-      results[idx] = await this.execute(call);
-    }
-    return results;
-  }
-  /**
-   * 批量文件写入：展示所有文件的编号列表 + diff 预览，
-   * 然后让用户 approve all / reject all / 选择性 approve。
-   */
-  async executeBatchFileWrites(calls) {
-    console.log();
-    console.log(theme.heading(`\u270E Batch file writes (${calls.length} files):`));
-    console.log(theme.dim("\u2500".repeat(50)));
-    for (let i = 0; i < calls.length; i++) {
-      const call = calls[i];
-      const filePath = String(call.arguments["path"] ?? "");
-      console.log(theme.warning(`  [${i + 1}] `) + chalk4.white(call.name) + theme.dim(": ") + theme.accent(filePath));
-      this.printDiffPreview(call);
-    }
-    console.log(theme.dim("\u2500".repeat(50)));
-    const decision = this.sessionAutoApprove ? "all" : await this.batchConfirm(calls.length);
-    if (this.sessionAutoApprove) {
-      console.log(theme.warning("  \u26A1 All auto-approved (session /yolo mode)"));
-    }
-    const results = [];
-    for (let i = 0; i < calls.length; i++) {
-      const call = calls[i];
-      const approved = decision === "all" || decision !== "none" && decision.has(i + 1);
-      if (approved) {
-        const tool = this.registry.get(call.name);
-        if (!tool) {
-          results.push({ callId: call.id, content: `Unknown tool: ${call.name}`, isError: true });
-          continue;
-        }
-        try {
-          const rawContent = await tool.execute(call.arguments);
-          const content = truncateOutput(rawContent, call.name);
-          const wasTruncated = content !== rawContent;
-          this.printToolResult(call.name, rawContent, false, wasTruncated);
-          results.push({ callId: call.id, content, isError: false });
-        } catch (err) {
-          const message = err instanceof Error ? err.message : String(err);
-          this.printToolResult(call.name, message, true, false);
-          results.push({ callId: call.id, content: message, isError: true });
-        }
-      } else {
-        console.log(theme.dim(`  [${i + 1}] `) + theme.dim("rejected"));
-        results.push({ callId: call.id, content: `[User rejected] The user rejected this ${call.name} operation. Do not retry without asking.`, isError: true });
-      }
-    }
-    return results;
-  }
-  /**
-   * 批量确认：让用户选择 approve all / reject all / 指定编号。
-   * 返回 'all' | 'none' | Set<number>（1-based 编号）
-   */
-  batchConfirm(count) {
-    const prompt = theme.warning(`  [a]pprove all  [r]eject all  [1,${count > 1 ? count : "2"},..] approve specific: `);
-    if (!this.rl) {
-      process.stdout.write(theme.warning("No readline: auto-rejected.\n"));
-      return Promise.resolve("none");
-    }
-    const rl = this.rl;
-    const rlAny = rl;
-    const savedOutput = rlAny.output;
-    rlAny.output = process.stdout;
-    rl.resume();
-    process.stdout.write(prompt);
-    this.confirming = true;
-    return new Promise((resolve3) => {
-      let completed = false;
-      const cleanup = (result) => {
-        if (completed) return;
-        completed = true;
-        rl.removeListener("line", onLine);
-        this.cancelConfirmFn = null;
-        rl.pause();
-        rlAny.output = savedOutput;
-        this.confirming = false;
-        resolve3(result);
-      };
-      const onLine = (line) => {
-        const trimmed = line.trim();
-        if (trimmed.startsWith("/")) {
-          this.pendingSlashCommand = trimmed;
-          process.stdout.write(theme.dim(`
-(command "${trimmed}" queued, will execute after current operation)
-`));
-          cleanup("none");
-          return;
-        }
-        const input2 = trimmed.toLowerCase();
-        if (input2 === "a" || input2 === "all" || input2 === "y") {
-          cleanup("all");
-        } else if (input2 === "r" || input2 === "reject" || input2 === "n" || input2 === "") {
-          cleanup("none");
-        } else {
-          const nums = input2.split(/[,\s]+/).map(Number).filter((n) => !isNaN(n) && n >= 1 && n <= count);
-          if (nums.length > 0) {
-            cleanup(new Set(nums));
-          } else {
-            cleanup("none");
-          }
-        }
-      };
-      this.cancelConfirmFn = () => {
-        process.stdout.write(theme.dim("\n(cancelled)\n"));
-        cleanup("none");
-      };
-      try {
-        rl.once("line", onLine);
-      } catch {
-        cleanup("none");
-      }
-    });
-  }
-  printToolCall(call) {
-    const dangerLevel = getDangerLevel(call.name, call.arguments);
-    console.log();
-    const icon = dangerLevel === "write" ? theme.toolCall("\u270E Tool: ") : theme.heading(theme.accent("\u2699 Tool: "));
-    const roundBadge = this.totalRounds > 0 ? theme.dim(` [${this.round}/${this.totalRounds}]`) : "";
-    console.log(icon + chalk4.white(call.name) + roundBadge);
-    for (const [key, val] of Object.entries(call.arguments)) {
-      let valStr;
-      if (Array.isArray(val)) {
-        const json = JSON.stringify(val);
-        valStr = json.length > 160 ? json.slice(0, 160) + "..." : json;
-      } else if (typeof val === "string" && val.length > 120) {
-        valStr = val.slice(0, 120) + "...";
-      } else {
-        valStr = String(val);
-      }
-      console.log(theme.dim(`  ${key}: `) + chalk4.white(valStr));
-    }
-  }
-  /**
-   * 对 write_file / edit_file 在执行前展示 diff 预览。
-   * - write_file：比较旧文件内容与新内容
-   * - edit_file (replace)：比较旧字符串与新字符串
-   * - edit_file (insert/delete)：显示操作摘要，不做 diff（变化明确）
-   */
-  printDiffPreview(call) {
-    if (call.name === "write_file") {
-      const filePath = String(call.arguments["path"] ?? "");
-      const newContent = String(call.arguments["content"] ?? "");
-      if (!filePath) return;
-      if (existsSync3(filePath)) {
-        let oldContent;
-        try {
-          oldContent = readFileSync2(filePath, "utf-8");
-        } catch {
-          return;
-        }
-        if (oldContent === newContent) {
-          console.log(theme.dim("  (file content unchanged)"));
-          return;
-        }
-        const diff = renderDiff(oldContent, newContent, { filePath, contextLines: 3 });
-        console.log(theme.dim("  \u2500\u2500 diff preview \u2500\u2500"));
-        console.log(diff);
-        console.log();
-      } else {
-        const lines = newContent.split("\n");
-        const preview = lines.slice(0, 20).map((l) => theme.success(`+ ${l}`)).join("\n");
-        const more = lines.length > 20 ? theme.dim(`
-  ... (+${lines.length - 20} more lines)`) : "";
-        console.log(theme.dim("  \u2500\u2500 new file preview \u2500\u2500"));
-        console.log(preview + more);
-        console.log();
-      }
-    } else if (call.name === "edit_file") {
-      const filePath = String(call.arguments["path"] ?? "");
-      if (!filePath || !existsSync3(filePath)) return;
-      const oldStr = call.arguments["old_str"];
-      const newStr = call.arguments["new_str"];
-      if (oldStr !== void 0) {
-        const diff = renderDiff(
-          String(oldStr),
-          String(newStr ?? ""),
-          { filePath, contextLines: 2 }
-        );
-        console.log(theme.dim("  \u2500\u2500 diff preview \u2500\u2500"));
-        console.log(diff);
-        console.log();
-      } else if (call.arguments["insert_after_line"] !== void 0) {
-        const line = Number(call.arguments["insert_after_line"]);
-        const insertContent = String(call.arguments["insert_content"] ?? "");
-        const insertLines = insertContent.split("\n");
-        const preview = insertLines.slice(0, 5).map((l) => theme.success(`+ ${l}`)).join("\n");
-        const more = insertLines.length > 5 ? theme.dim(`
-  ... (+${insertLines.length - 5} more lines)`) : "";
-        console.log(theme.dim(`  \u2500\u2500 insert after line ${line} \u2500\u2500`));
-        console.log(preview + more);
-        console.log();
-      } else if (call.arguments["delete_from_line"] !== void 0) {
-        const from = Number(call.arguments["delete_from_line"]);
-        const to = Number(call.arguments["delete_to_line"] ?? from);
-        let fileContent;
-        try {
-          fileContent = readFileSync2(filePath, "utf-8");
-        } catch {
-          return;
-        }
-        const fileLines = fileContent.split("\n");
-        const deleted = fileLines.slice(from - 1, to);
-        const preview = deleted.slice(0, 5).map((l) => theme.error(`- ${l}`)).join("\n");
-        const more = deleted.length > 5 ? theme.dim(`
-  ... (-${deleted.length - 5} more lines)`) : "";
-        console.log(theme.dim(`  \u2500\u2500 delete lines ${from}\u2013${to} \u2500\u2500`));
-        console.log(preview + more);
-        console.log();
-      }
-    }
-  }
-  printToolResult(name, content, isError, wasTruncated) {
-    if (isError) {
-      console.log(theme.error(`\u26A0 ${name} error: `) + theme.dim(content.slice(0, 300)));
-    } else {
-      const lines = content.split("\n");
-      const maxLines = name === "run_interactive" ? 40 : 8;
-      const preview = lines.slice(0, maxLines).join("\n");
-      const moreLines = lines.length > maxLines ? theme.dim(`
-  ... (${lines.length - maxLines} more lines)`) : "";
-      const truncatedNote = wasTruncated ? theme.warning(`
-  \u26A1 Output truncated to ${getActiveMaxChars()} chars before sending to AI`) : "";
-      console.log(theme.toolResult("\u2713 Result: ") + theme.dim(preview) + moreLines + truncatedNote);
-    }
-    console.log();
-  }
-  confirm(call, level) {
-    const color = level === "destructive" ? theme.error : theme.warning;
-    const label = level === "destructive" ? "\u26A0 DESTRUCTIVE" : "\u270E Write";
-    console.log();
-    console.log(color(`${label} operation: `) + theme.heading(call.name));
-    for (const [key, val] of Object.entries(call.arguments)) {
-      const valStr = typeof val === "string" && val.length > 200 ? val.slice(0, 200) + "..." : String(val);
-      console.log(theme.dim(`  ${key}: `) + valStr);
-    }
-    if (!this.rl) {
-      process.stdout.write(theme.warning("No readline: auto-rejected.\n"));
-      return Promise.resolve(false);
-    }
-    const rl = this.rl;
-    const rlAny = rl;
-    const savedOutput = rlAny.output;
-    rlAny.output = process.stdout;
-    rl.resume();
-    process.stdout.write(color("Proceed? [y/N] (type y + Enter to confirm) "));
-    this.confirming = true;
-    return new Promise((resolve3) => {
-      let completed = false;
-      const cleanup = (answer) => {
-        if (completed) return;
-        completed = true;
-        rl.removeListener("line", onLine);
-        this.cancelConfirmFn = null;
-        rl.pause();
-        rlAny.output = savedOutput;
-        this.confirming = false;
-        resolve3(answer === "y");
-      };
-      const onLine = (line) => {
-        const trimmed = line.trim();
-        if (trimmed.startsWith("/")) {
-          this.pendingSlashCommand = trimmed;
-          process.stdout.write(theme.dim(`
-(command "${trimmed}" queued, will execute after current operation)
-`));
-          cleanup("n");
-          return;
-        }
-        cleanup(trimmed.toLowerCase());
-      };
-      this.cancelConfirmFn = () => {
-        process.stdout.write(theme.dim("\n(cancelled)\n"));
-        cleanup("n");
-      };
-      try {
-        rl.once("line", onLine);
-      } catch {
-        cleanup("n");
-      }
-    });
-  }
-};
-
 // src/tools/builtin/stream-to-file.ts
 var streamToFileContext = {
   provider: null,
@@ -3335,13 +3004,13 @@ Managing ${displayName} API Key`);
 };
 
 // src/repl/custom-commands.ts
-import { existsSync as existsSync4, readFileSync as readFileSync3, readdirSync as readdirSync2, mkdirSync as mkdirSync3 } from "fs";
+import { existsSync as existsSync3, readFileSync as readFileSync2, readdirSync as readdirSync2, mkdirSync as mkdirSync3 } from "fs";
 import { join as join3, extname } from "path";
 import { execSync as execSync3 } from "child_process";
 function parseCommandFile(filePath) {
   let content;
   try {
-    content = readFileSync3(filePath, "utf-8");
+    content = readFileSync2(filePath, "utf-8");
   } catch {
     return null;
   }
@@ -3365,7 +3034,7 @@ function expandTemplate(template, args) {
   result = result.replace(/\{\{input\}\}/g, args.join(" "));
   result = result.replace(/\{\{file:([^}]+)\}\}/g, (_m, p) => {
     try {
-      return readFileSync3(p.trim(), "utf-8");
+      return readFileSync2(p.trim(), "utf-8");
     } catch {
       return `[Error: cannot read ${p.trim()}]`;
     }
@@ -3390,7 +3059,7 @@ var CustomCommandManager = class {
   commands = /* @__PURE__ */ new Map();
   loadCommands() {
     this.commands.clear();
-    if (!existsSync4(this.commandsDir)) {
+    if (!existsSync3(this.commandsDir)) {
       mkdirSync3(this.commandsDir, { recursive: true });
       return 0;
     }
@@ -3473,7 +3142,7 @@ function parseAtReferences(input2, cwd) {
     const absPath = resolve2(cwd, rawPath);
     const ext = extname2(rawPath).toLowerCase();
     const mime = IMAGE_MIME[ext];
-    if (!existsSync5(absPath)) {
+    if (!existsSync4(absPath)) {
       refs.push({ path: rawPath, type: "notfound" });
       continue;
     }
@@ -3483,7 +3152,7 @@ function parseAtReferences(input2, cwd) {
         refs.push({ path: rawPath, type: "toolarge" });
         continue;
       }
-      const data = readFileSync4(absPath).toString("base64");
+      const data = readFileSync3(absPath).toString("base64");
       imageParts.push({
         type: "image_url",
         image_url: { url: `data:${mime};base64,${data}` }
@@ -3491,7 +3160,7 @@ function parseAtReferences(input2, cwd) {
       refs.push({ path: rawPath, type: "image" });
       textBody = textBody.replace(match[0], "").trim();
     } else {
-      const content = readFileSync4(absPath, "utf-8");
+      const content = readFileSync3(absPath, "utf-8");
       const inlined = `
 
 [File: ${rawPath}]
@@ -3741,7 +3410,7 @@ ${treeLines.join("\n")}`
           if (!TEXT_EXTS.has(ext) && !isSpecial) continue;
           if (st.size > MAX_FILE_CHARS * 3) continue;
           try {
-            let content = readFileSync4(fullPath, "utf-8");
+            let content = readFileSync3(fullPath, "utf-8");
             if (content.length > MAX_FILE_CHARS) {
               content = content.slice(0, MAX_FILE_CHARS) + `
 ... (truncated, ${content.length} chars total)`;
@@ -3771,7 +3440,7 @@ ${content}
    */
   addExtraContextDir(dirPath) {
     const absPath = resolve2(dirPath);
-    if (!existsSync5(absPath)) {
+    if (!existsSync4(absPath)) {
       return { success: false, charCount: 0, added: false, error: `Directory not found: ${dirPath}` };
     }
     let isDir;
@@ -3806,8 +3475,8 @@ ${content}
   findContextFile(dir, candidates = CONTEXT_FILE_CANDIDATES) {
     for (const candidate of candidates) {
       const fullPath = join4(dir, candidate);
-      if (existsSync5(fullPath)) {
-        const content = readFileSync4(fullPath, "utf-8").trim();
+      if (existsSync4(fullPath)) {
+        const content = readFileSync3(fullPath, "utf-8").trim();
         if (content) return { filePath: fullPath, content };
       }
     }
@@ -3836,9 +3505,9 @@ ${content}
     const gitRoot = getGitRoot(cwd);
     const projectRoot = gitRoot ?? cwd;
     const mcpPath = join4(projectRoot, MCP_PROJECT_CONFIG_NAME);
-    if (!existsSync5(mcpPath)) return null;
+    if (!existsSync4(mcpPath)) return null;
     try {
-      const raw = JSON.parse(readFileSync4(mcpPath, "utf-8"));
+      const raw = JSON.parse(readFileSync3(mcpPath, "utf-8"));
       const servers = raw?.mcpServers;
       if (!servers || typeof servers !== "object") {
         process.stderr.write(
@@ -3884,8 +3553,8 @@ ${content}
         );
         return { layers: [], mergedContent: "" };
       }
-      if (existsSync5(fullPath)) {
-        const content = readFileSync4(fullPath, "utf-8").trim();
+      if (existsSync4(fullPath)) {
+        const content = readFileSync3(fullPath, "utf-8").trim();
         if (content) {
           const layer = {
             level: "project",
@@ -3943,8 +3612,8 @@ ${content}
    */
   loadMemoryContent() {
     const memoryPath = join4(this.config.getConfigDir(), MEMORY_FILE_NAME);
-    if (!existsSync5(memoryPath)) return null;
-    let content = readFileSync4(memoryPath, "utf-8").trim();
+    if (!existsSync4(memoryPath)) return null;
+    let content = readFileSync3(memoryPath, "utf-8").trim();
     if (!content) return null;
     if (content.length > MEMORY_MAX_CHARS) {
       content = content.slice(-MEMORY_MAX_CHARS);
@@ -4179,7 +3848,7 @@ ${response.content.trim()}
     const planTag = this.planMode ? theme.warning("[PLAN]") : "";
     const modelParams = this.getModelParams();
     const thinkTag = modelParams.thinking ? theme.accent("[THINK]") : "";
-    const promptStr = theme.success(`[${this.currentProvider}]`) + skillTag + planTag + thinkTag + chalk5.white(" > ");
+    const promptStr = theme.success(`[${this.currentProvider}]`) + skillTag + planTag + thinkTag + chalk4.white(" > ");
     this.rl.setPrompt(promptStr);
   }
   showPrompt() {
@@ -4698,7 +4367,7 @@ Session '${this.resumeSessionId}' not found.
       const dir = normalized.includes("/") ? dirname3(normalized) : ".";
       const prefix = normalized.includes("/") ? basename2(normalized) : normalized;
       const absDir = resolve2(process.cwd(), dir);
-      if (!existsSync5(absDir)) return [];
+      if (!existsSync4(absDir)) return [];
       const entries = readdirSync3(absDir);
       const results = [];
       for (const entry of entries) {
@@ -5244,6 +4913,7 @@ You have a maximum of ${MAX_TOOL_ROUNDS} tool call rounds for this task. Plan ef
         spawnAgentContext.systemPrompt = systemPrompt;
         spawnAgentContext.modelParams = modelParams;
         spawnAgentContext.configManager = this.config;
+        ToolExecutor.currentMessageIndex = session.messages.length;
         const toolResults = await this.toolExecutor.executeAll(result.toolCalls);
         const thisRoundTools = result.toolCalls.map((tc) => tc.name);
         roundToolHistory.push({ round: round + 1, tools: thisRoundTools });
@@ -5691,7 +5361,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-SD5ICBFP.js");
+  const { startWebServer } = await import("./server-V3IZSAMO.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) => {
@@ -5924,7 +5594,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-YN245LMP.js");
+  const { startHub } = await import("./hub-JOYPSPR2.js");
   await startHub(
     {
       topic: topic ?? "",