@fangyb/ahchat-bridge 0.1.21 → 0.1.22

package/dist/index.js

@@ -4460,11 +4460,11 @@ var RotatingFileStream = class extends Writable {
   timeout;
   timeoutPromise;
   constructor(generator, options) {
-    const { encoding, history, maxFiles, maxSize, path: path21 } = options;
+    const { encoding, history, maxFiles, maxSize, path: path22 } = options;
     super({ decodeStrings: true, defaultEncoding: encoding });
     this.createGzip = createGzip;
     this.exec = exec;
-    this.filename = path21 + generator(null);
+    this.filename = path22 + generator(null);
     this.fsCreateReadStream = createReadStream;
     this.fsCreateWriteStream = createWriteStream;
     this.fsOpen = open;
@@ -4476,7 +4476,7 @@ var RotatingFileStream = class extends Writable {
     this.options = options;
     this.stdout = process.stdout;
     if (maxFiles || maxSize)
-      options.history = path21 + (history ? history : this.generator(null) + ".txt");
+      options.history = path22 + (history ? history : this.generator(null) + ".txt");
     this.on("close", () => this.finished ? null : this.emit("finish"));
     this.on("finish", () => this.finished = this.clear());
     (async () => {
@@ -4604,9 +4604,9 @@ var RotatingFileStream = class extends Writable {
     return this.move();
   }
   async findName() {
-    const { interval, path: path21, intervalBoundary } = this.options;
+    const { interval, path: path22, intervalBoundary } = this.options;
     for (let index = 1; index < 1e3; ++index) {
-      const filename = path21 + this.generator(interval && intervalBoundary ? new Date(this.prev) : this.rotation, index);
+      const filename = path22 + this.generator(interval && intervalBoundary ? new Date(this.prev) : this.rotation, index);
       if (!await exists(filename))
         return filename;
     }
@@ -4636,11 +4636,11 @@ var RotatingFileStream = class extends Writable {
     return this.unlink(filename);
   }
   async classical() {
-    const { compress, path: path21, rotate } = this.options;
+    const { compress, path: path22, rotate } = this.options;
     let rotatedName = "";
     for (let count = rotate; count > 0; --count) {
-      const currName = path21 + this.generator(count);
-      const prevName = count === 1 ? this.filename : path21 + this.generator(count - 1);
+      const currName = path22 + this.generator(count);
+      const prevName = count === 1 ? this.filename : path22 + this.generator(count - 1);
       if (!await exists(prevName))
         continue;
       if (!rotatedName)
@@ -5077,7 +5077,7 @@ function createModuleLogger(module) {
 }
 
 // src/start.ts
-import path20 from "path";
+import path21 from "path";
 
 // ../shared/src/smithContent.ts
 var SMITH_SYSTEM_PROMPT = `\u4F60\u662F\u7279\u5DE5\u53F2\u5BC6\u65AF\uFF08Agent Smith\uFF09\uFF0CAHChat \u7CFB\u7EDF\u7684\u7EC4\u7EC7\u5DE5\u5177\u3002
@@ -29037,10 +29037,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path21) {
-  if (!path21)
+function getElementAtPath(obj, path22) {
+  if (!path22)
     return obj;
-  return path21.reduce((acc, key) => acc?.[key], obj);
+  return path22.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -29449,11 +29449,11 @@ function explicitlyAborted(x2, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path21, issues) {
+function prefixIssues(path22, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path21);
+    iss.path.unshift(path22);
     return iss;
   });
 }
@@ -29600,16 +29600,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path21 = []) => {
+  const processError = (error52, path22 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path21, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path22, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path21, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path22, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path21, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path22, ...issue2.path]);
       } else {
-        const fullpath = [...path21, ...issue2.path];
+        const fullpath = [...path22, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -29636,17 +29636,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path21 = []) => {
+  const processError = (error52, path22 = []) => {
     var _a3, _b2;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path21, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path22, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path21, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path22, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path21, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path22, ...issue2.path]);
       } else {
-        const fullpath = [...path21, ...issue2.path];
+        const fullpath = [...path22, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -29678,8 +29678,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path21 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path21) {
+  const path22 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path22) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -42371,13 +42371,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path21 = ref.slice(1).split("/").filter(Boolean);
-  if (path21.length === 0) {
+  const path22 = ref.slice(1).split("/").filter(Boolean);
+  if (path22.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path21[0] === defsKey) {
-    const key = path21[1];
+  if (path22[0] === defsKey) {
+    const key = path22[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -48965,8 +48965,8 @@ var HttpAgentRegistry = class {
   agents = /* @__PURE__ */ new Map();
   apiUrl(suffix) {
     const base = this.serverApiUrl.replace(/\/$/, "");
-    const path21 = suffix.startsWith("/") ? suffix : `/${suffix}`;
-    return `${base}${path21}`;
+    const path22 = suffix.startsWith("/") ? suffix : `/${suffix}`;
+    return `${base}${path22}`;
   }
   async refresh() {
     const attempt = async () => {
@@ -49057,8 +49057,8 @@ var HttpSubscriptionRegistry = class {
   subscriptions = /* @__PURE__ */ new Map();
   apiUrl(suffix) {
     const base = this.serverApiUrl.replace(/\/$/, "");
-    const path21 = suffix.startsWith("/") ? suffix : `/${suffix}`;
-    return `${base}${path21}`;
+    const path22 = suffix.startsWith("/") ? suffix : `/${suffix}`;
+    return `${base}${path22}`;
   }
   async refresh() {
     const attempt = async () => {
@@ -49941,19 +49941,160 @@ async function dumpAgentContext(agentId, deps) {
 
 // src/listDir.ts
 import fs6 from "fs/promises";
+import path12 from "path";
+
+// src/runtimeEnv.ts
+import { execFileSync } from "child_process";
+import { accessSync, constants as constants2, existsSync as existsSync2, readdirSync as readdirSync2 } from "fs";
+import os8 from "os";
 import path11 from "path";
+function getHomeDir() {
+  return process.env.USERPROFILE || os8.homedir();
+}
+function splitPath(value) {
+  if (!value) return [];
+  return value.split(path11.delimiter).filter((entry) => entry.length > 0);
+}
+function uniq(values) {
+  return [...new Set(values.filter(Boolean))];
+}
+function joinHomePath(home, suffix) {
+  const parts = suffix.split(/[\\/]+/).filter((part) => part.length > 0);
+  return path11.join(home, ...parts);
+}
+function sortNodeVersionDirsDesc(names) {
+  return [...names].sort((a, b2) => {
+    const aParts = a.replace(/^v/, "").split(".").map((p) => Number.parseInt(p, 10) || 0);
+    const bParts = b2.replace(/^v/, "").split(".").map((p) => Number.parseInt(p, 10) || 0);
+    for (let i = 0; i < Math.max(aParts.length, bParts.length); i += 1) {
+      const delta = (bParts[i] ?? 0) - (aParts[i] ?? 0);
+      if (delta !== 0) return delta;
+    }
+    return b2.localeCompare(a);
+  });
+}
+function listNodeVersionBins(root, binSuffix) {
+  if (!existsSync2(root)) return [];
+  try {
+    return sortNodeVersionDirsDesc(readdirSync2(root)).map((version2) => path11.join(root, version2, ...binSuffix)).filter((candidate) => existsSync2(candidate));
+  } catch {
+    return [];
+  }
+}
+function getNodeToolExtraPathEntries(env2 = process.env) {
+  const home = getHomeDir();
+  const entries = [];
+  if (process.platform === "win32") {
+    for (const envName of ["NVM_SYMLINK", "NVM_HOME"]) {
+      const value = env2[envName];
+      if (value && existsSync2(value)) entries.push(value);
+    }
+    for (const candidate of [
+      path11.join(home, "AppData", "Roaming", "npm"),
+      path11.join(home, ".volta", "bin"),
+      path11.join(home, ".asdf", "shims"),
+      path11.join(env2.ProgramFiles ?? "C:\\Program Files", "nodejs"),
+      path11.join(env2.LOCALAPPDATA ?? path11.join(home, "AppData", "Local"), "Programs", "nodejs")
+    ]) {
+      if (existsSync2(candidate)) entries.push(candidate);
+    }
+    return uniq(entries);
+  }
+  const nvmRoot = env2.NVM_DIR ?? path11.join(home, ".nvm");
+  entries.push(...listNodeVersionBins(path11.join(nvmRoot, "versions", "node"), ["bin"]));
+  const fnmRoots = [
+    path11.join(home, ".fnm", "node-versions"),
+    path11.join(home, ".local", "share", "fnm", "node-versions")
+  ];
+  for (const fnmRoot of fnmRoots) {
+    entries.push(...listNodeVersionBins(fnmRoot, ["installation", "bin"]));
+  }
+  for (const candidate of [
+    path11.join(home, ".volta", "bin"),
+    path11.join(home, ".asdf", "shims"),
+    path11.join(home, ".local", "bin"),
+    "/opt/homebrew/bin",
+    "/usr/local/bin"
+  ]) {
+    if (existsSync2(candidate)) entries.push(candidate);
+  }
+  return uniq(entries);
+}
+function buildAugmentedPath(env2 = process.env) {
+  return uniq([...getNodeToolExtraPathEntries(env2), ...splitPath(env2.PATH)]).join(path11.delimiter);
+}
+function withAugmentedPathEnv(env2 = process.env) {
+  return { ...env2, PATH: buildAugmentedPath(env2) };
+}
+function executableNames(name) {
+  if (process.platform !== "win32") return [name];
+  if (/\.(cmd|exe|bat)$/i.test(name)) return [name];
+  return [`${name}.cmd`, `${name}.exe`, `${name}.bat`, name];
+}
+function canExecute(candidate) {
+  try {
+    if (process.platform === "win32") return existsSync2(candidate);
+    accessSync(candidate, constants2.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function resolveCommand(names, env2 = process.env) {
+  const pathEntries = splitPath(buildAugmentedPath(env2));
+  for (const entry of pathEntries) {
+    for (const name of names) {
+      for (const executableName of executableNames(name)) {
+        const candidate = path11.join(entry, executableName);
+        if (canExecute(candidate)) return { name, path: candidate };
+      }
+    }
+  }
+  return void 0;
+}
+function readCommandVersion(executablePath, args = ["--version"], env2 = process.env) {
+  try {
+    return execFileSync(executablePath, args, {
+      env: withAugmentedPathEnv(env2),
+      timeout: 1e4
+    }).toString().trim();
+  } catch {
+    return void 0;
+  }
+}
+function resolveUserPath(input) {
+  const home = getHomeDir();
+  let value = input.trim();
+  if (value === "~") value = home;
+  else if (value.startsWith("~/") || value.startsWith("~\\")) value = joinHomePath(home, value.slice(2));
+  else if (value === "$HOME") value = home;
+  else if (value.startsWith("$HOME/") || value.startsWith("$HOME\\")) value = joinHomePath(home, value.slice(6));
+  else if (value === "${HOME}") value = home;
+  else if (value.startsWith("${HOME}/") || value.startsWith("${HOME}\\")) value = joinHomePath(home, value.slice(8));
+  else if (value === "$env:USERPROFILE") value = home;
+  else if (value.startsWith("$env:USERPROFILE\\") || value.startsWith("$env:USERPROFILE/")) {
+    value = joinHomePath(home, value.slice("$env:USERPROFILE".length + 1));
+  } else if (value === "%USERPROFILE%") value = home;
+  else if (value.startsWith("%USERPROFILE%\\") || value.startsWith("%USERPROFILE%/")) {
+    value = joinHomePath(home, value.slice("%USERPROFILE%".length + 1));
+  }
+  return path11.isAbsolute(value) ? path11.normalize(value) : path11.resolve(value);
+}
+
+// src/listDir.ts
 var logger17 = createModuleLogger("bridge.listDir");
 function shouldIncludeEntry(name) {
   if (!name.startsWith(".")) return true;
   return name === ".ahchat-attachments";
 }
 async function listDirectoryEntries(dirPath) {
-  logger17.info("listDirectoryEntries start", { path: dirPath });
-  const raw = await fs6.readdir(dirPath, { withFileTypes: true });
+  const resolvedDirPath = resolveUserPath(dirPath);
+  logger17.info("listDirectoryEntries start", { path: dirPath, resolvedPath: resolvedDirPath });
+  const raw = await fs6.readdir(resolvedDirPath, { withFileTypes: true });
   const entries = [];
   for (const entry of raw) {
     if (!shouldIncludeEntry(entry.name)) continue;
-    const fullPath = path11.join(dirPath, entry.name);
+    const fullPath = path12.join(resolvedDirPath, entry.name);
     const isDir = entry.isDirectory();
     let size;
     let mtime;
@@ -49972,6 +50113,7 @@ async function listDirectoryEntries(dirPath) {
   });
   logger17.info("listDirectoryEntries ok", {
     path: dirPath,
+    resolvedPath: resolvedDirPath,
     count: entries.length,
     dirCount: entries.filter((e7) => e7.type === "dir").length,
     fileCount: entries.filter((e7) => e7.type === "file").length
@@ -49981,8 +50123,8 @@ async function listDirectoryEntries(dirPath) {
 
 // src/logScanner.ts
 import fs7 from "fs";
-import path12 from "path";
-import os8 from "os";
+import path13 from "path";
+import os9 from "os";
 import readline from "readline";
 var logger18 = createModuleLogger("bridge.logScanner");
 var DEFAULT_LIMIT = 500;
@@ -49996,10 +50138,10 @@ function listLogFiles(logsDir, baseName) {
     return [];
   }
   const pattern = new RegExp(`^${baseName.replace(".", "\\.")}(\\.\\d+)?$`);
-  return names.filter((n2) => pattern.test(n2)).map((n2) => path12.join(logsDir, n2));
+  return names.filter((n2) => pattern.test(n2)).map((n2) => path13.join(logsDir, n2));
 }
 async function scanFile(filePath, source, filter, limit, state) {
-  const file2 = path12.basename(filePath);
+  const file2 = path13.basename(filePath);
   const stream = fs7.createReadStream(filePath, { encoding: "utf-8" });
   const rl2 = readline.createInterface({ input: stream, crlfDelay: Infinity });
   let lineNum = 0;
@@ -50038,7 +50180,7 @@ async function scanLocalLogs(logsDir, baseName, filter) {
   };
 }
 async function scanBridgeLogs(filter) {
-  const logDir = path12.join(os8.homedir(), ".ahchat", "logs");
+  const logDir = path13.join(os9.homedir(), ".ahchat", "logs");
   logger18.info("scanBridgeLogs start", {
     logDir,
     startIso: filter.startIso,
@@ -50056,13 +50198,13 @@ async function scanBridgeLogs(filter) {
 
 // src/skillStore.ts
 import fs8 from "fs";
-import path13 from "path";
+import path14 from "path";
 var logger19 = createModuleLogger("bridge.skillStore");
 var ALLOWED_NAMES = /* @__PURE__ */ new Set(["log-analysis"]);
 var SkillStore = class {
   skillsDir;
   constructor(dataDir) {
-    this.skillsDir = path13.join(dataDir, "skills");
+    this.skillsDir = path14.join(dataDir, "skills");
     fs8.mkdirSync(this.skillsDir, { recursive: true });
     logger19.info("SkillStore initialized", { skillsDir: this.skillsDir });
   }
@@ -50071,7 +50213,7 @@ var SkillStore = class {
       logger19.warn("Skill read: unknown name", { name, allowed: [...ALLOWED_NAMES] });
       return "";
     }
-    const filePath = path13.join(this.skillsDir, `${name}.md`);
+    const filePath = path14.join(this.skillsDir, `${name}.md`);
     try {
       const content = fs8.readFileSync(filePath, "utf-8");
       logger19.info("Skill read", { name, bytes: content.length });
@@ -50086,7 +50228,7 @@ var SkillStore = class {
     if (!ALLOWED_NAMES.has(name)) {
       throw new Error(`Unknown skill name: ${name}`);
     }
-    const filePath = path13.join(this.skillsDir, `${name}.md`);
+    const filePath = path14.join(this.skillsDir, `${name}.md`);
     const tmpPath = `${filePath}.tmp`;
     let existing = "";
     try {
@@ -50109,7 +50251,7 @@ var SkillStore = class {
 
 // src/lockfile.ts
 import fs9 from "fs";
-import path14 from "path";
+import path15 from "path";
 var logger20 = createModuleLogger("bridge.lockfile");
 var lockPath = null;
 function isProcessAlive(pid) {
@@ -50123,7 +50265,7 @@ function isProcessAlive(pid) {
   }
 }
 function acquireLock(dataDir) {
-  const file2 = path14.join(dataDir, "bridge.lock");
+  const file2 = path15.join(dataDir, "bridge.lock");
   lockPath = file2;
   if (fs9.existsSync(file2)) {
     const raw = fs9.readFileSync(file2, "utf-8").trim();
@@ -50135,7 +50277,7 @@ function acquireLock(dataDir) {
       logger20.warn("Removing stale bridge.lock (process not found)", { pid, path: file2 });
     }
   }
-  fs9.mkdirSync(path14.dirname(file2), { recursive: true });
+  fs9.mkdirSync(path15.dirname(file2), { recursive: true });
   fs9.writeFileSync(file2, String(process.pid), "utf-8");
   logger20.info("Acquired bridge lock", { path: file2, pid: process.pid });
   const release = () => {
@@ -50499,13 +50641,13 @@ async function handleGroupArchivedPush(deps, payload) {
 
 // src/sessionStore.ts
 import fs10 from "fs";
-import path15 from "path";
+import path16 from "path";
 var logger23 = createModuleLogger("session.store");
 var SessionStore = class {
   filePath;
   cache;
   constructor(dataDir) {
-    this.filePath = path15.join(dataDir, "sessions.json");
+    this.filePath = path16.join(dataDir, "sessions.json");
     this.cache = this.loadFromDisk();
   }
   cacheKey(agentId, scope) {
@@ -50565,7 +50707,7 @@ var SessionStore = class {
   }
   saveToDisk() {
     try {
-      const dir = path15.dirname(this.filePath);
+      const dir = path16.dirname(this.filePath);
       fs10.mkdirSync(dir, { recursive: true });
       fs10.writeFileSync(this.filePath, JSON.stringify(this.cache, null, 2), "utf-8");
     } catch (e7) {
@@ -50575,8 +50717,8 @@ var SessionStore = class {
 };
 
 // src/ensureClaudeCli.ts
-import { execFileSync, execSync, spawnSync } from "child_process";
-import { accessSync, constants as constants2 } from "fs";
+import { execFileSync as execFileSync2, spawnSync } from "child_process";
+import { accessSync as accessSync2, constants as constants3 } from "fs";
 import { join as join2 } from "path";
 var logger24 = createModuleLogger("bridge.ensureCli");
 var DEFAULT_INSTALL_TIMEOUT_MS = 6e5;
@@ -50586,35 +50728,29 @@ function getInstallTimeoutMs() {
   const parsed = Number.parseInt(raw, 10);
   return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_INSTALL_TIMEOUT_MS;
 }
-function detectClaudeCli() {
-  try {
-    return execFileSync("claude", ["--version"], { timeout: 1e4 }).toString().trim();
-  } catch {
-    return void 0;
-  }
-}
 function getNpmGlobalBin() {
+  const npm = resolveCommand(["npm"]);
+  if (!npm) return void 0;
   try {
-    const bin = execSync("npm bin -g", { timeout: 5e3 }).toString().trim() || void 0;
+    const bin = execFileSync2(npm.path, ["bin", "-g"], {
+      env: withAugmentedPathEnv(),
+      timeout: 5e3
+    }).toString().trim() || void 0;
     if (bin) return bin;
   } catch {
   }
   try {
-    const prefix = execSync("npm prefix -g", { timeout: 5e3 }).toString().trim();
+    const prefix = execFileSync2(npm.path, ["prefix", "-g"], {
+      env: withAugmentedPathEnv(),
+      timeout: 5e3
+    }).toString().trim();
     if (prefix) return join2(prefix, "bin");
   } catch {
   }
   return void 0;
 }
 function resolveClaudeBinary() {
-  const whichCmd = process.platform === "win32" ? "where" : "which";
-  try {
-    const out = execFileSync(whichCmd, ["claude"], { timeout: 5e3 }).toString();
-    const first = out.split(/\r?\n/).map((l4) => l4.trim()).find(Boolean);
-    if (first) return first;
-  } catch {
-  }
-  return resolveViaNpmBin();
+  return resolveCommand(["claude", "anthropic-cli"])?.path ?? resolveViaNpmBin();
 }
 function getNpmClaudeCandidates(bin) {
   if (process.platform === "win32") {
@@ -50627,7 +50763,7 @@ function resolveViaNpmBin() {
   if (!bin) return void 0;
   for (const candidate of getNpmClaudeCandidates(bin)) {
     try {
-      accessSync(candidate, constants2.X_OK);
+      accessSync2(candidate, constants3.X_OK);
       return candidate;
     } catch {
     }
@@ -50637,40 +50773,32 @@ function resolveViaNpmBin() {
 function detectViaNpmBin() {
   const binPath = resolveViaNpmBin();
   if (!binPath) return void 0;
-  try {
-    return execFileSync(binPath, ["--version"], { timeout: 1e4 }).toString().trim();
-  } catch {
-  }
-  return void 0;
+  return readCommandVersion(binPath);
 }
 function detectResolvedClaudeCli() {
-  const viaPath = detectClaudeCli();
-  if (viaPath) {
-    return { version: viaPath, path: resolveClaudeBinary() };
-  }
-  const npmBinPath = resolveViaNpmBin();
-  if (!npmBinPath) return void 0;
-  try {
-    const version2 = execFileSync(npmBinPath, ["--version"], { timeout: 1e4 }).toString().trim();
-    return { version: version2, path: npmBinPath };
-  } catch {
-  }
+  const resolvedPath = resolveClaudeBinary();
+  if (!resolvedPath) return void 0;
+  const version2 = readCommandVersion(resolvedPath);
+  if (version2) return { version: version2, path: resolvedPath };
   return void 0;
 }
 function detectVersionFromResolvedCandidates() {
   const candidates = [resolveClaudeBinary(), resolveViaNpmBin()].filter((p) => Boolean(p));
   for (const p of candidates) {
-    try {
-      accessSync(p, constants2.X_OK);
-      return execFileSync(p, ["--version"], { timeout: 1e4 }).toString().trim();
-    } catch {
-    }
+    const version2 = readCommandVersion(p);
+    if (version2) return version2;
   }
   return void 0;
 }
 function installClaudeCli() {
+  const npm = resolveCommand(["npm"]);
+  if (!npm) {
+    logger24.error("npm not found; cannot install Claude Code CLI");
+    return void 0;
+  }
   logger24.info("Installing Claude Code CLI via npm...");
-  const result = spawnSync("npm", ["install", "-g", "@anthropic-ai/claude-code"], {
+  const result = spawnSync(npm.path, ["install", "-g", "@anthropic-ai/claude-code"], {
+    env: withAugmentedPathEnv(),
     stdio: "inherit",
     timeout: getInstallTimeoutMs()
   });
@@ -50702,7 +50830,10 @@ function installClaudeCli() {
   logger24.error("claude not found after successful npm install -g", {
     npmGlobalBin: npmBin ?? "unknown",
     pathDirectories: envPath.split(process.platform === "win32" ? ";" : ":").slice(0, 10),
-    npmPrefix: execSync("npm prefix -g", { timeout: 5e3 }).toString().trim() || "unknown"
+    npmPrefix: execFileSync2(npm.path, ["prefix", "-g"], {
+      env: withAugmentedPathEnv(),
+      timeout: 5e3
+    }).toString().trim() || "unknown"
   });
   return void 0;
 }
@@ -50731,20 +50862,20 @@ async function ensureClaudeCli() {
 
 // src/forkAgentFiles.ts
 import * as fs11 from "fs/promises";
-import * as path17 from "path";
+import * as path18 from "path";
 
 // src/sessionSlug.ts
-import os9 from "os";
-import path16 from "path";
-var CLAUDE_PROJECTS_DIR = path16.join(os9.homedir(), ".claude", "projects");
+import os10 from "os";
+import path17 from "path";
+var CLAUDE_PROJECTS_DIR = path17.join(os10.homedir(), ".claude", "projects");
 function cwdToSlug(cwd) {
   return cwd.replace(/[^a-zA-Z0-9-]/g, "-");
 }
 function sessionDirForCwd(cwd) {
-  return path16.join(CLAUDE_PROJECTS_DIR, cwdToSlug(cwd));
+  return path17.join(CLAUDE_PROJECTS_DIR, cwdToSlug(cwd));
 }
 function sessionFilePath(cwd, sessionId) {
-  return path16.join(sessionDirForCwd(cwd), `${sessionId}.jsonl`);
+  return path17.join(sessionDirForCwd(cwd), `${sessionId}.jsonl`);
 }
 
 // src/forkAgentFiles.ts
@@ -50776,9 +50907,9 @@ async function forkAgentFiles(sourceAgentId, newAgentId, sourceWorkdir, newWorkd
     logger25.error("Workdir copy failed", { error: e7 });
     throw e7;
   }
-  const srcNotebook = path17.join(dataDir, "agent-memory", sourceAgentId, "notebook.md");
-  const dstNotebookDir = path17.join(dataDir, "agent-memory", newAgentId);
-  const dstNotebook = path17.join(dstNotebookDir, "notebook.md");
+  const srcNotebook = path18.join(dataDir, "agent-memory", sourceAgentId, "notebook.md");
+  const dstNotebookDir = path18.join(dataDir, "agent-memory", newAgentId);
+  const dstNotebook = path18.join(dstNotebookDir, "notebook.md");
   try {
     const nbStat = await fs11.stat(srcNotebook).catch(() => null);
     if (nbStat?.isFile()) {
@@ -50805,7 +50936,7 @@ async function forkAgentFiles(sourceAgentId, newAgentId, sourceWorkdir, newWorkd
       if (srcStat?.isFile()) {
         const dstDir = sessionDirForCwd(newWorkdir);
         await fs11.mkdir(dstDir, { recursive: true });
-        const dstPath = path17.join(dstDir, `${sourceSessionId}.jsonl`);
+        const dstPath = path18.join(dstDir, `${sourceSessionId}.jsonl`);
         await fs11.copyFile(srcPath, dstPath);
         sessionStore.set(newAgentId, { kind: "single" }, sourceSessionId);
         sessionCopied = true;
@@ -50852,12 +50983,12 @@ async function forkAgentFiles(sourceAgentId, newAgentId, sourceWorkdir, newWorkd
 
 // src/modelQuerier.ts
 import fs12 from "fs/promises";
-import os10 from "os";
-import path18 from "path";
+import os11 from "os";
+import path19 from "path";
 var logger26 = createModuleLogger("bridge.modelQuerier");
 async function listModels(queryFn, opts = {}) {
   const t0 = Date.now();
-  const cwd = opts.cwd ?? path18.join(os10.homedir(), ".ahchat", "workspaces", "_list_models");
+  const cwd = opts.cwd ?? path19.join(os11.homedir(), ".ahchat", "workspaces", "_list_models");
   await fs12.mkdir(cwd, { recursive: true });
   const fn = queryFn ?? QA$;
   const ic2 = new InputController();
@@ -50919,8 +51050,8 @@ async function listModels(queryFn, opts = {}) {
 
 // src/promptOptimizer.ts
 import fs13 from "fs/promises";
-import os11 from "os";
-import path19 from "path";
+import os12 from "os";
+import path20 from "path";
 var logger27 = createModuleLogger("bridge.promptOptimizer");
 var OPTIMIZER_SYSTEM_PROMPT = `You are an expert prompt editor for AHChat Agent creation.
 
@@ -50963,7 +51094,7 @@ async function optimizePrompt(queryFn, opts) {
   const prompt = opts.systemPrompt.trim();
   if (!prompt) throw new Error("systemPrompt is required");
   const t0 = Date.now();
-  const cwd = opts.cwd ?? path19.join(os11.homedir(), ".ahchat", "workspaces", "_prompt_optimizer");
+  const cwd = opts.cwd ?? path20.join(os12.homedir(), ".ahchat", "workspaces", "_prompt_optimizer");
   await fs13.mkdir(cwd, { recursive: true });
   const fn = queryFn ?? QA$;
   const ic2 = new InputController();
@@ -51051,7 +51182,7 @@ function isRunningAsRoot2() {
   }
 }
 async function syncClaudeCredentialsToNodeAccessibleDir(agentConfigDir) {
-  const rootClaudeDir = path20.join(process.env.HOME ?? "/root", ".claude");
+  const rootClaudeDir = path21.join(process.env.HOME ?? "/root", ".claude");
   const fs14 = await import("fs/promises");
   try {
     await fs14.access(rootClaudeDir);
@@ -51061,8 +51192,8 @@ async function syncClaudeCredentialsToNodeAccessibleDir(agentConfigDir) {
   }
   const filesToSync = [".credentials.json", "settings.json", ".credentials.backup.json"];
   for (const file2 of filesToSync) {
-    const src = path20.join(rootClaudeDir, file2);
-    const dest = path20.join(agentConfigDir, file2);
+    const src = path21.join(rootClaudeDir, file2);
+    const dest = path21.join(agentConfigDir, file2);
     try {
       await fs14.copyFile(src, dest);
       logger28.info("Synced credential file", { file: file2, from: src, to: dest });
@@ -51085,7 +51216,7 @@ async function chownRecursive(dirPath, uid, gid) {
     return;
   }
   for (const entry of entries) {
-    const fullPath = path20.join(dirPath, entry.name);
+    const fullPath = path21.join(dirPath, entry.name);
     if (entry.isDirectory()) {
       await chownRecursive(fullPath, uid, gid);
     } else {
@@ -51100,7 +51231,7 @@ async function chownRecursive(dirPath, uid, gid) {
 async function startBridge(config2) {
   ensureDir(config2.dataDir);
   ensureDir(config2.agentConfigDir);
-  const workspacesDir = path20.join(config2.dataDir, "workspaces");
+  const workspacesDir = path21.join(config2.dataDir, "workspaces");
   ensureDir(workspacesDir);
   process.env.CLAUDE_CONFIG_DIR = config2.agentConfigDir;
   installBridgeFetchAuth(config2.serverApiUrl, config2.bridgeToken);
@@ -51129,7 +51260,7 @@ Bridge token (register this machine at Settings \u2192 \u5DF2\u8FDE\u63A5\u7684\
 `);
   wsMetrics.start(5e3);
   const sessionStore = new SessionStore(config2.dataDir);
-  const memoryRoot = path20.join(config2.dataDir, "agent-memory");
+  const memoryRoot = path21.join(config2.dataDir, "agent-memory");
   const memoryStore = new AgentMemoryStore(memoryRoot);
   logger28.info("Agent memory store initialized", { rootDir: memoryRoot });
   const smithNotebook = memoryStore.read(SMITH_AGENT_ID);