jinzd-ai-cli 0.4.285 → 0.4.287

package/dist/{batch-R563COWE.js → batch-6OH7D5YU.js}

@@ -1,12 +1,15 @@
 #!/usr/bin/env node
+import {
+  loadJsonState
+} from "./chunk-RS7SKYTS.js";
 import {
   ConfigManager
-} from "./chunk-DV5D7RXZ.js";
+} from "./chunk-5F7BGV72.js";
 import "./chunk-TU3L3PW7.js";
 import {
   atomicWriteFileSync
 } from "./chunk-IW3Q7AE5.js";
-import "./chunk-PHK7QQH3.js";
+import "./chunk-UDFK5Q52.js";
 
 // src/cli/batch.ts
 import Anthropic from "@anthropic-ai/sdk";
@@ -64,14 +67,14 @@ function getBatchesPath(config) {
   return join(config.getConfigDir(), "batches.json");
 }
 function loadTrackedBatches(config) {
-  const p = getBatchesPath(config);
-  if (!existsSync(p)) return [];
-  try {
-    const data = JSON.parse(readFileSync(p, "utf-8"));
-    return Array.isArray(data.batches) ? data.batches : [];
-  } catch {
-    return [];
-  }
+  return loadJsonState(getBatchesPath(config), {
+    label: "batch tracking",
+    fallback: () => [],
+    parse: (raw) => {
+      const data = raw;
+      return Array.isArray(data?.batches) ? data.batches : null;
+    }
+  }).value;
 }
 function saveTrackedBatches(config, batches) {
   mkdirSync(config.getConfigDir(), { recursive: true });

package/dist/{chat-index-TDU3S2MG.js → chat-index-DGUOUUQW.js}

@@ -5,9 +5,9 @@ import {
   getChatIndexStatus,
   loadChatIndex,
   searchChatMemory
-} from "./chunk-YOVHMQEJ.js";
-import "./chunk-FSC6KEWU.js";
+} from "./chunk-I4GQRMFV.js";
 import "./chunk-JV5N65KN.js";
+import "./chunk-FSC6KEWU.js";
 import "./chunk-6BUTA5VW.js";
 export {
   buildChatIndex,

package/dist/{chunk-VLM4SKKX.js → chunk-3BHJKMPQ.js}

@@ -1,6 +1,6 @@
 import {
   TEST_TIMEOUT
-} from "./chunk-LF6SPK7I.js";
+} from "./chunk-CYUAHF6X.js";
 
 // src/tools/builtin/run-tests.ts
 import { execSync, spawnSync } from "child_process";

package/dist/{chunk-UW33KJW5.js → chunk-3Y5BCGD2.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   VERSION
-} from "./chunk-PHK7QQH3.js";
+} from "./chunk-UDFK5Q52.js";
 
 // src/cli/ci-format.ts
 var DEFAULT_CI_THRESHOLDS = {

package/dist/{chunk-DV5D7RXZ.js → chunk-5F7BGV72.js}

@@ -11,7 +11,7 @@ import {
   CONFIG_FILE_NAME,
   HISTORY_DIR_NAME,
   PLUGINS_DIR_NAME
-} from "./chunk-PHK7QQH3.js";
+} from "./chunk-UDFK5Q52.js";
 
 // src/config/config-manager.ts
 import { readFileSync, existsSync, mkdirSync } from "fs";

package/dist/{chunk-UGY5SVNX.js → chunk-ALSSNFNK.js}

@@ -53,9 +53,76 @@ var BaseProvider = class {
   }
 };
 
+// src/core/network-error.ts
+var NETWORK_CODES = /* @__PURE__ */ new Set([
+  "ECONNREFUSED",
+  // 端口没人听（代理没起来最常见）
+  "ECONNRESET",
+  // 对端断开
+  "ENOTFOUND",
+  // DNS 查不到
+  "EAI_AGAIN",
+  // DNS 临时失败
+  "ETIMEDOUT",
+  // 连接超时
+  "EHOSTUNREACH",
+  "ENETUNREACH",
+  "EPIPE",
+  "UND_ERR_SOCKET",
+  // undici：socket 意外关闭
+  "UND_ERR_CONNECT_TIMEOUT"
+]);
+var TRANSIENT_CODES = /* @__PURE__ */ new Set(["ECONNRESET", "UND_ERR_SOCKET", "EPIPE", "EAI_AGAIN"]);
+function findCause(err, depth = 0) {
+  if (!err || depth > 4) return null;
+  const e = err;
+  if (typeof e.code === "string") {
+    return {
+      code: e.code,
+      address: e.address ? `${e.address}${e.port !== void 0 ? `:${e.port}` : ""}` : void 0,
+      message: e.message
+    };
+  }
+  if (Array.isArray(e.errors) && e.errors.length > 0) {
+    for (const inner of e.errors) {
+      const found = findCause(inner, depth + 1);
+      if (found) return found;
+    }
+  }
+  return findCause(e.cause, depth + 1);
+}
+function describeNetworkFailure(err, ctx = {}) {
+  const cause = findCause(err);
+  const topMessage = err instanceof Error ? err.message : String(err);
+  const looksNetwork = cause?.code && NETWORK_CODES.has(cause.code) || topMessage === "fetch failed" || topMessage.includes("Connection error");
+  if (!looksNetwork) return null;
+  const code = cause?.code;
+  const address = cause?.address;
+  const transient = !!code && TRANSIENT_CODES.has(code);
+  const what = code ? `${code}${address ? ` ${address}` : ""}` : cause?.message ?? "no further detail from the network layer";
+  const where = ctx.target ? ` while connecting to ${ctx.target}` : "";
+  const parts = [`Connection failed${where} (${what}).`];
+  if (ctx.proxyUrl) {
+    parts.push(`The request went through the proxy from config.proxy (${ctx.proxyUrl}).`);
+    if (code === "ECONNREFUSED") {
+      parts.push(`That address refused the connection \u2014 the proxy is probably not running. Start it, or unset config.proxy to connect directly.`);
+    }
+  }
+  if (transient) {
+    parts.push(`This usually means an idle connection was dropped by the other side \u2014 just send the message again.`);
+  } else if (code === "ENOTFOUND" || code === "EAI_AGAIN") {
+    parts.push(`DNS lookup failed \u2014 check the network connection${ctx.proxyUrl ? " and the proxy" : ""}.`);
+  } else if (code === "ETIMEDOUT" || code === "UND_ERR_CONNECT_TIMEOUT") {
+    parts.push(`The connection timed out before it was established${ctx.proxyUrl ? " \u2014 check whether the proxy can reach this host" : ""}.`);
+  }
+  return { code, address, transient, message: parts.join(" ") };
+}
+
 // src/providers/claude.ts
 var CACHE_MIN_SYSTEM_CHARS = 2e3;
 var ClaudeProvider = class extends BaseProvider {
+  /** 生效的代理（网络失败时点名它，见 core/network-error.ts）。 */
+  activeProxyUrl;
   client;
   info = {
     id: "claude",
@@ -90,6 +157,7 @@ var ClaudeProvider = class extends BaseProvider {
       baseURL: options?.baseUrl
     };
     const proxyUrl = options?.proxy;
+    this.activeProxyUrl = proxyUrl;
     try {
       const { Agent, ProxyAgent, fetch: undiciFetch } = await import("undici");
       const STREAM_BODY_TIMEOUT = 30 * 60 * 1e3;
@@ -614,6 +682,8 @@ var ClaudeProvider = class extends BaseProvider {
     if (err instanceof Anthropic.RateLimitError) {
       return new RateLimitError("claude");
     }
+    const net = describeNetworkFailure(err, { target: "api.anthropic.com", proxyUrl: this.activeProxyUrl });
+    if (net) return new ProviderError("claude", net.message, err instanceof Error ? err : void 0);
     if (err instanceof Error) {
       return new ProviderError("claude", err.message, err);
     }
@@ -930,10 +1000,11 @@ var GeminiProvider = class extends BaseProvider {
           err
         );
       }
-      if (msg.includes("fetch failed") || msg.includes("ECONNREFUSED") || msg.includes("ETIMEDOUT") || msg.includes("ENOTFOUND") || msg.includes("socket hang up")) {
+      const net = describeNetworkFailure(err, { target: "generativelanguage.googleapis.com" });
+      if (net || msg.includes("socket hang up")) {
         return new ProviderError(
           "gemini",
-          `Network connection failed: ${msg}
+          `${net?.message ?? `Network connection failed: ${msg}`}
 Node.js does not automatically use system proxies. Try one of the following:
   1. Set environment variable: set HTTPS_PROXY=http://127.0.0.1:<proxy-port>
   2. Configure an accessible Gemini API mirror URL in config.json under customBaseUrls.gemini`,
@@ -1002,6 +1073,8 @@ function readRetryCount(headers) {
 }
 var OpenAICompatibleProvider = class extends BaseProvider {
   client;
+  /** 生效的代理（wrapError 要在网络失败时点名它）；未配代理时为 undefined。 */
+  activeProxyUrl;
   defaultTimeout = 6e4;
   // ms
   /**
@@ -1031,13 +1104,17 @@ var OpenAICompatibleProvider = class extends BaseProvider {
       const { Agent, ProxyAgent, fetch: undiciFetch } = await import("undici");
       const STREAM_BODY_TIMEOUT = 30 * 60 * 1e3;
       const STREAM_HEADERS_TIMEOUT = 5 * 60 * 1e3;
+      const KEEP_ALIVE_TIMEOUT = 2e3;
+      this.activeProxyUrl = proxyUrl;
       const dispatcher = proxyUrl ? new ProxyAgent({
         uri: proxyUrl,
         bodyTimeout: STREAM_BODY_TIMEOUT,
-        headersTimeout: STREAM_HEADERS_TIMEOUT
+        headersTimeout: STREAM_HEADERS_TIMEOUT,
+        keepAliveTimeout: KEEP_ALIVE_TIMEOUT
       }) : new Agent({
         bodyTimeout: STREAM_BODY_TIMEOUT,
-        headersTimeout: STREAM_HEADERS_TIMEOUT
+        headersTimeout: STREAM_HEADERS_TIMEOUT,
+        keepAliveTimeout: KEEP_ALIVE_TIMEOUT
       });
       clientOptions.fetch = ((url, init) => {
         const retryCount = readRetryCount(init?.headers);
@@ -1511,11 +1588,24 @@ var OpenAICompatibleProvider = class extends BaseProvider {
     if (err instanceof OpenAI.RateLimitError) {
       return new RateLimitError(this.info.id);
     }
+    const net = describeNetworkFailure(err, {
+      target: this.hostLabel(),
+      proxyUrl: this.activeProxyUrl
+    });
+    if (net) return new ProviderError(this.info.id, net.message, err instanceof Error ? err : void 0);
     if (err instanceof Error) {
       return new ProviderError(this.info.id, err.message, err);
     }
     return new ProviderError(this.info.id, String(err));
   }
+  /** 请求实际打向的主机，用于「连谁失败了」。 */
+  hostLabel() {
+    try {
+      return new URL(this.info.baseUrl ?? this.defaultBaseUrl).host;
+    } catch {
+      return this.info.id;
+    }
+  }
 };
 
 // src/providers/deepseek.ts

package/dist/{chunk-KLBMKONV.js → chunk-AXSWLNCU.js}

@@ -11,7 +11,7 @@ import {
   searchPersistentMemories,
   touchMemoryReferences,
   updateMemoryEntry
-} from "./chunk-AOF4K5N7.js";
+} from "./chunk-ERDFOXYK.js";
 import {
   indexProject
 } from "./chunk-4DEMGCK4.js";
@@ -30,7 +30,7 @@ import {
   runHook,
   runLifecycleHooks,
   runTool
-} from "./chunk-5CC5HQFW.js";
+} from "./chunk-HEUB5PV6.js";
 import {
   buildTruncatedArgumentsError,
   getDangerLevel,
@@ -50,14 +50,14 @@ import {
 } from "./chunk-4BKXL7SM.js";
 import {
   runTestsTool
-} from "./chunk-6G7Y2VG4.js";
+} from "./chunk-L7RAEUUN.js";
 import {
   CONFIG_DIR_NAME,
   DEFAULT_MAX_TOOL_OUTPUT_CHARS_CAP,
   SUBAGENT_ALLOWED_TOOLS,
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT
-} from "./chunk-PHK7QQH3.js";
+} from "./chunk-UDFK5Q52.js";
 
 // src/tools/shell-pool.ts
 import { spawn as spawn2 } from "child_process";

package/dist/chunk-CGLYJRFA.js

@@ -0,0 +1,95 @@
+// src/tools/git-context.ts
+import { execSync } from "child_process";
+import { existsSync } from "fs";
+import { join } from "path";
+function runGit(cmd, cwd) {
+  try {
+    return execSync(`git ${cmd}`, {
+      cwd,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: 5e3
+    }).trim();
+  } catch {
+    return null;
+  }
+}
+function getGitRoot(cwd = process.cwd()) {
+  return runGit("rev-parse --show-toplevel", cwd);
+}
+function getGitContext(cwd = process.cwd()) {
+  if (!existsSync(join(cwd, ".git"))) {
+    const result = runGit("rev-parse --git-dir", cwd);
+    if (!result) return null;
+  }
+  const branch = runGit("rev-parse --abbrev-ref HEAD", cwd);
+  if (!branch) return null;
+  const statusOutput = runGit("status --porcelain", cwd) ?? "";
+  const statusLines = statusOutput ? statusOutput.split("\n").filter(Boolean) : [];
+  const stagedFiles = [];
+  const changedFiles = [];
+  for (const line of statusLines) {
+    const xy = line.slice(0, 2);
+    const file = line.slice(3).trim();
+    const indexStatus = xy[0];
+    const workStatus = xy[1];
+    if (indexStatus && indexStatus !== " " && indexStatus !== "?") {
+      stagedFiles.push(`${indexStatus} ${file}`);
+    }
+    if (workStatus && workStatus !== " ") {
+      changedFiles.push(`${workStatus} ${file}`);
+    }
+  }
+  const logOutput = runGit("log --oneline -3", cwd) ?? "";
+  const recentCommits = logOutput ? logOutput.split("\n").filter(Boolean) : [];
+  const unpushedOutput = runGit("log @{u}..HEAD --oneline", cwd);
+  const hasUnpushed = unpushedOutput !== null && unpushedOutput.trim().length > 0;
+  return {
+    branch,
+    changedFiles,
+    stagedFiles,
+    recentCommits,
+    hasUnpushed
+  };
+}
+function formatGitContextForPrompt(ctx) {
+  const lines = ["# Git Repository Status", ""];
+  lines.push(`- **Branch**: \`${ctx.branch}\``);
+  if (ctx.stagedFiles.length > 0) {
+    lines.push(`- **Staged** (${ctx.stagedFiles.length} files):`);
+    for (const f of ctx.stagedFiles.slice(0, 10)) {
+      lines.push(`  - ${f}`);
+    }
+    if (ctx.stagedFiles.length > 10) {
+      lines.push(`  - ... and ${ctx.stagedFiles.length - 10} more`);
+    }
+  }
+  if (ctx.changedFiles.length > 0) {
+    lines.push(`- **Modified** (${ctx.changedFiles.length} files):`);
+    for (const f of ctx.changedFiles.slice(0, 10)) {
+      lines.push(`  - ${f}`);
+    }
+    if (ctx.changedFiles.length > 10) {
+      lines.push(`  - ... and ${ctx.changedFiles.length - 10} more`);
+    }
+  }
+  if (ctx.stagedFiles.length === 0 && ctx.changedFiles.length === 0) {
+    lines.push("- **Working tree**: clean");
+  }
+  if (ctx.recentCommits.length > 0) {
+    lines.push("- **Recent commits**:");
+    for (const c of ctx.recentCommits) {
+      lines.push(`  - ${c}`);
+    }
+  }
+  if (ctx.hasUnpushed) {
+    lines.push("- \u26A0\uFE0F Has unpushed commits");
+  }
+  return lines.join("\n");
+}
+
+export {
+  getGitRoot,
+  getGitContext,
+  formatGitContextForPrompt
+};

package/dist/{chunk-LF6SPK7I.js → chunk-CYUAHF6X.js}

@@ -1,5 +1,5 @@
 // src/core/constants.ts
-var VERSION = "0.4.285";
+var VERSION = "0.4.287";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";
@@ -14,6 +14,8 @@ var MEMORY_STORE_FILE_NAME = "memory.jsonl";
 var MEMORY_MAX_CHARS = 1e4;
 var DEV_STATE_FILE_NAME = "dev-state.md";
 var DEFAULT_MAX_TOKENS = 8192;
+var DEFAULT_TEMPERATURE = 0.7;
+var MAX_HISTORY_DAYS = 30;
 var DEFAULT_MAX_TOOL_ROUNDS = 200;
 var DEFAULT_MAX_TOOL_OUTPUT_CHARS_CAP = 5e5;
 var MCP_TOOL_PREFIX = "mcp__";
@@ -83,6 +85,7 @@ var SUBAGENT_ALLOWED_TOOLS = /* @__PURE__ */ new Set([
   "search_code"
 ]);
 var CONTEXT_PRESSURE_THRESHOLD = 0.8;
+var CONTEXT_WARNING_THRESHOLD = 0.6;
 var TEST_TIMEOUT = 3e5;
 var AGENTIC_BEHAVIOR_GUIDELINE = `# Important Behavioral Guidelines
 
@@ -127,6 +130,7 @@ Address the user personally and adapt your communication style to their backgrou
 var AUTHOR = "Jin Zhengdong";
 var AUTHOR_EMAIL = "zhengdong.jin@gmail.com";
 var DESCRIPTION = "Cross-platform REPL-style AI conversation tool with multi-provider and agentic tool calling support";
+var REPO_URL = "https://github.com/jinzhengdong/ai-cli";
 
 export {
   VERSION,
@@ -144,6 +148,8 @@ export {
   MEMORY_MAX_CHARS,
   DEV_STATE_FILE_NAME,
   DEFAULT_MAX_TOKENS,
+  DEFAULT_TEMPERATURE,
+  MAX_HISTORY_DAYS,
   DEFAULT_MAX_TOOL_ROUNDS,
   DEFAULT_MAX_TOOL_OUTPUT_CHARS_CAP,
   MCP_TOOL_PREFIX,
@@ -157,10 +163,12 @@ export {
   SUBAGENT_MAX_ROUNDS_LIMIT,
   SUBAGENT_ALLOWED_TOOLS,
   CONTEXT_PRESSURE_THRESHOLD,
+  CONTEXT_WARNING_THRESHOLD,
   TEST_TIMEOUT,
   AGENTIC_BEHAVIOR_GUIDELINE,
   buildUserIdentityPrompt,
   AUTHOR,
   AUTHOR_EMAIL,
-  DESCRIPTION
+  DESCRIPTION,
+  REPO_URL
 };

package/dist/{chunk-AOF4K5N7.js → chunk-ERDFOXYK.js}

@@ -13,7 +13,7 @@ import {
   MEMORY_FILE_NAME,
   MEMORY_MAX_CHARS,
   MEMORY_STORE_FILE_NAME
-} from "./chunk-PHK7QQH3.js";
+} from "./chunk-UDFK5Q52.js";
 
 // src/memory/persistent-memory.ts
 import { copyFileSync, existsSync, mkdirSync, readFileSync, statSync } from "fs";

package/dist/{chunk-XGRZA5V6.js → chunk-EU6NMK7G.js}

@@ -8,13 +8,13 @@ import {
   listHooks,
   listInstalledPlugins,
   resetStats
-} from "./chunk-5CC5HQFW.js";
+} from "./chunk-HEUB5PV6.js";
 import {
   ProviderRegistry
-} from "./chunk-UGY5SVNX.js";
+} from "./chunk-ALSSNFNK.js";
 import {
   ConfigManager
-} from "./chunk-DV5D7RXZ.js";
+} from "./chunk-5F7BGV72.js";
 import {
   getGitRoot
 } from "./chunk-HOSJZMQS.js";
@@ -26,7 +26,7 @@ import {
   MCP_PROJECT_CONFIG_NAME,
   MEMORY_FILE_NAME,
   VERSION
-} from "./chunk-PHK7QQH3.js";
+} from "./chunk-UDFK5Q52.js";
 
 // src/diagnostics/doctor-report.ts
 import { existsSync as existsSync3, statSync as statSync2 } from "fs";

package/dist/{chunk-5CC5HQFW.js → chunk-HEUB5PV6.js}

@@ -1,14 +1,17 @@
 #!/usr/bin/env node
+import {
+  loadJsonState
+} from "./chunk-RS7SKYTS.js";
 import {
   atomicWriteFileSync
 } from "./chunk-IW3Q7AE5.js";
 import {
   CONFIG_DIR_NAME,
   PLUGINS_DIR_NAME
-} from "./chunk-PHK7QQH3.js";
+} from "./chunk-UDFK5Q52.js";
 
 // src/diagnostics/tool-stats.ts
-import { existsSync, readFileSync, mkdirSync } from "fs";
+import { mkdirSync } from "fs";
 import { join, dirname } from "path";
 import { homedir } from "os";
 var STATS_FILE_NAME = "tool-stats.json";
@@ -23,19 +26,16 @@ function statsFilePath() {
   return join(base, STATS_FILE_NAME);
 }
 function load() {
-  const path = statsFilePath();
-  if (!existsSync(path)) {
-    return { version: STATS_VERSION, startedAt: (/* @__PURE__ */ new Date()).toISOString(), entries: {} };
-  }
-  try {
-    const raw = JSON.parse(readFileSync(path, "utf-8"));
-    if (raw.version !== STATS_VERSION || !raw.entries) {
-      return { version: STATS_VERSION, startedAt: (/* @__PURE__ */ new Date()).toISOString(), entries: {} };
+  const empty = () => ({ version: STATS_VERSION, startedAt: (/* @__PURE__ */ new Date()).toISOString(), entries: {} });
+  return loadJsonState(statsFilePath(), {
+    label: "tool statistics",
+    fallback: empty,
+    parse: (raw) => {
+      const data = raw;
+      if (!data || data.version !== STATS_VERSION || !data.entries) return null;
+      return data;
     }
-    return raw;
-  } catch {
-    return { version: STATS_VERSION, startedAt: (/* @__PURE__ */ new Date()).toISOString(), entries: {} };
-  }
+  }).value;
 }
 function ensureLoaded() {
   if (state === null) state = load();
@@ -121,7 +121,7 @@ function installFlushOnExit() {
 }
 
 // src/plugins/plugin-manager.ts
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, readdirSync, readFileSync as readFileSync2, realpathSync, cpSync, rmSync, statSync } from "fs";
+import { existsSync, mkdirSync as mkdirSync2, readdirSync, readFileSync, realpathSync, cpSync, rmSync, statSync } from "fs";
 import { basename, dirname as dirname2, join as join2, relative, resolve, sep } from "path";
 import { createHash } from "crypto";
 import { z } from "zod";
@@ -192,9 +192,9 @@ function statePath(configDir) {
 }
 function loadState(configDir) {
   const file = statePath(configDir);
-  if (!existsSync2(file)) return { version: 2, plugins: [] };
+  if (!existsSync(file)) return { version: 2, plugins: [] };
   try {
-    const parsed = JSON.parse(readFileSync2(file, "utf-8"));
+    const parsed = JSON.parse(readFileSync(file, "utf-8"));
     const rawPlugins = Array.isArray(parsed.plugins) ? parsed.plugins : [];
     return { version: 2, plugins: rawPlugins.map((p) => migrateEntry(p)) };
   } catch {
@@ -252,7 +252,7 @@ function extractCommandPaths(command, pluginDir) {
     try {
       const abs = resolve(resolvedDir, ref);
       if (!abs.startsWith(resolvedDir + sep)) continue;
-      if (existsSync2(abs)) {
+      if (existsSync(abs)) {
         const real = realpathSync(abs);
         if (!real.startsWith(resolvedDir + sep)) continue;
         valid.push(relative(resolvedDir, real));
@@ -285,7 +285,7 @@ function hashPluginContent(pluginDir, manifest) {
   const sorted = [...assetRels].sort();
   const hasher = createHash("sha256");
   const manifestPath = join2(resolvedDir, MANIFEST_RELATIVE);
-  hasher.update(normalizeForHash(readFileSync2(manifestPath)));
+  hasher.update(normalizeForHash(readFileSync(manifestPath)));
   for (const rel of sorted) {
     const abs = resolve(resolvedDir, rel);
     if (!abs.startsWith(resolvedDir + sep)) {
@@ -305,7 +305,7 @@ function hashPluginContent(pluginDir, manifest) {
     if (!realPath.startsWith(resolvedDir + sep)) {
       throw new Error(`plugin asset symlink escapes plugin dir: ${rel} \u2192 ${realPath}`);
     }
-    hasher.update(normalizeForHash(readFileSync2(abs)));
+    hasher.update(normalizeForHash(readFileSync(abs)));
   }
   return hasher.digest("hex");
 }
@@ -313,14 +313,14 @@ function effectiveHash(entry) {
   return entry.contentHash ?? entry.hash ?? "";
 }
 function readPluginManifest(manifestPath) {
-  return PluginManifestSchema.parse(JSON.parse(readFileSync2(manifestPath, "utf-8")));
+  return PluginManifestSchema.parse(JSON.parse(readFileSync(manifestPath, "utf-8")));
 }
 function findPluginSourceDir(inputPath) {
   const abs = resolve(inputPath);
   const direct = statSync(abs).isDirectory() ? abs : dirname2(abs);
-  if (existsSync2(pluginManifestPath(direct))) return direct;
+  if (existsSync(pluginManifestPath(direct))) return direct;
   const nested = join2(direct, ".aicli-plugin");
-  if (existsSync2(join2(nested, "plugin.json"))) return direct;
+  if (existsSync(join2(nested, "plugin.json"))) return direct;
   throw new Error(`plugin manifest not found: ${MANIFEST_RELATIVE}`);
 }
 function installPlugin(configDir, inputPath) {
@@ -328,7 +328,7 @@ function installPlugin(configDir, inputPath) {
   const manifest = readPluginManifest(pluginManifestPath(sourceDir));
   const targetDir = join2(pluginRoot(configDir), manifest.name);
   mkdirSync2(pluginRoot(configDir), { recursive: true });
-  if (existsSync2(targetDir)) rmSync(targetDir, { recursive: true, force: true });
+  if (existsSync(targetDir)) rmSync(targetDir, { recursive: true, force: true });
   cpSync(sourceDir, targetDir, { recursive: true });
   const manifestPath = pluginManifestPath(targetDir);
   const contentHash = hashPluginContent(targetDir, manifest);
@@ -386,7 +386,7 @@ function getInstalledPlugin(configDir, name) {
 }
 function listInstalledPlugins(configDir) {
   const root = pluginRoot(configDir);
-  if (!existsSync2(root)) return [];
+  if (!existsSync(root)) return [];
   const state2 = loadState(configDir);
   const out = [];
   for (const entry of readdirSync(root)) {
@@ -397,7 +397,7 @@ function listInstalledPlugins(configDir) {
       continue;
     }
     const manifestPath = pluginManifestPath(dir);
-    if (!existsSync2(manifestPath)) continue;
+    if (!existsSync(manifestPath)) continue;
     try {
       const manifest = readPluginManifest(manifestPath);
       const contentHash = hashPluginContent(dir, manifest);
@@ -437,7 +437,7 @@ function uniqueDirs(plugin, rels) {
   for (const rel of rels) {
     const abs = resolve(plugin.dir, rel);
     if (!abs.startsWith(resolve(plugin.dir))) continue;
-    if (existsSync2(abs)) dirs.add(statSync(abs).isDirectory() ? abs : dirname2(abs));
+    if (existsSync(abs)) dirs.add(statSync(abs).isDirectory() ? abs : dirname2(abs));
   }
   return [...dirs];
 }
@@ -509,7 +509,7 @@ function describePlugin(plugin) {
 // src/tools/hooks.ts
 import { execSync } from "child_process";
 import { createHash as createHash2 } from "crypto";
-import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as readFileSync3 } from "fs";
+import { existsSync as existsSync2, mkdirSync as mkdirSync3, readFileSync as readFileSync2 } from "fs";
 import { join as join3 } from "path";
 var TRUST_FILE = "hooks-trust.json";
 var DEFAULT_TIMEOUT_MS = 5e3;
@@ -523,9 +523,9 @@ function hookTrustPath(configDir) {
 }
 function loadHookTrustStore(configDir) {
   const file = hookTrustPath(configDir);
-  if (!existsSync3(file)) return { records: [] };
+  if (!existsSync2(file)) return { records: [] };
   try {
-    const parsed = JSON.parse(readFileSync3(file, "utf-8"));
+    const parsed = JSON.parse(readFileSync2(file, "utf-8"));
     return { records: Array.isArray(parsed.records) ? parsed.records : [] };
   } catch {
     return { records: [] };