@fangyb/ahchat-bridge 0.1.24 → 0.1.25

package/dist/cli.cjs

@@ -27107,8 +27107,8 @@ function getReadableStream(readStream) {
   if (typeof Readable2.toWeb === "function") {
     return Readable2.toWeb(readStream);
   }
-  const require2 = process.getBuiltinModule("module").createRequire(importMetaUrl);
-  const polyfill = require2("node-readable-to-web-readable-stream");
+  const require3 = process.getBuiltinModule("module").createRequire(importMetaUrl);
+  const polyfill = require3("node-readable-to-web-readable-stream");
   return polyfill.makeDefaultReadableStreamFromNodeReadable(readStream);
 }
 function getNetworkStream(url2) {
@@ -35773,8 +35773,8 @@ var init_pdf = __esm({
     };
     NodeCanvasFactory = class extends BaseCanvasFactory {
       _createCanvas(width, height) {
-        const require2 = process.getBuiltinModule("module").createRequire(importMetaUrl);
-        const canvas = require2("@napi-rs/canvas");
+        const require3 = process.getBuiltinModule("module").createRequire(importMetaUrl);
+        const canvas = require3("@napi-rs/canvas");
         return canvas.createCanvas(width, height);
       }
     };
@@ -60030,6 +60030,7 @@ function ensureDir(dirPath) {
 // src/claudeRuntime.ts
 init_cjs_shims();
 var import_node_fs3 = require("fs");
+var import_node_module = require("module");
 var import_node_path5 = __toESM(require("path"), 1);
 
 // src/logger.ts
@@ -61536,6 +61537,7 @@ function normalizeBridgeServerUrls(rawUrl) {
 
 // src/claudeRuntime.ts
 var logger = createModuleLogger("bridge.claudeRuntime");
+var require2 = (0, import_node_module.createRequire)(importMetaUrl);
 var EXPLICIT_CLAUDE_EXECUTABLE_ENV = "AHCHAT_CLAUDE_EXECUTABLE";
 var BUNDLED_CLAUDE_PATH_ENV = "AHCHAT_BUNDLED_CLAUDE_PATH";
 function normalizePath(value) {
@@ -61585,6 +61587,118 @@ function validateCandidate(source, candidatePath) {
     version: version3
   };
 }
+function getSdkRuntimeTargets() {
+  const binaryName = process.platform === "win32" ? "claude.exe" : "claude";
+  const targetPrefix = "@anthropic-ai/claude-agent-sdk";
+  if (process.platform === "darwin") {
+    if (process.arch === "arm64" || process.arch === "x64") {
+      return [{ packageName: `${targetPrefix}-darwin-${process.arch}`, binaryName }];
+    }
+    return [];
+  }
+  if (process.platform === "win32") {
+    if (process.arch === "arm64" || process.arch === "x64") {
+      return [{ packageName: `${targetPrefix}-win32-${process.arch}`, binaryName }];
+    }
+    return [];
+  }
+  if (process.platform === "linux") {
+    if (process.arch === "arm64" || process.arch === "x64") {
+      return [
+        { packageName: `${targetPrefix}-linux-${process.arch}`, binaryName },
+        { packageName: `${targetPrefix}-linux-${process.arch}-musl`, binaryName }
+      ];
+    }
+  }
+  return [];
+}
+function safeResolve(specifier, paths) {
+  try {
+    return require2.resolve(specifier, paths ? { paths } : void 0);
+  } catch {
+    return void 0;
+  }
+}
+function resolveClaudeAgentSdkDir() {
+  const sdkEntry = safeResolve("@anthropic-ai/claude-agent-sdk");
+  if (!sdkEntry) return void 0;
+  try {
+    return import_node_path5.default.dirname((0, import_node_fs3.realpathSync)(sdkEntry));
+  } catch {
+    return import_node_path5.default.dirname(sdkEntry);
+  }
+}
+function findPnpmStoreDir(fromDir) {
+  let current = fromDir;
+  while (current !== import_node_path5.default.dirname(current)) {
+    if (import_node_path5.default.basename(current) === ".pnpm") return current;
+    current = import_node_path5.default.dirname(current);
+  }
+  return void 0;
+}
+function resolvePnpmRuntimeBinary(sdkDir, target) {
+  const pnpmStoreDir = findPnpmStoreDir(sdkDir);
+  if (!pnpmStoreDir) return void 0;
+  const encodedName = target.packageName.replace("/", "+");
+  let entries;
+  try {
+    entries = (0, import_node_fs3.readdirSync)(pnpmStoreDir);
+  } catch {
+    return void 0;
+  }
+  for (const entry of entries) {
+    if (!entry.startsWith(`${encodedName}@`)) continue;
+    const candidate = import_node_path5.default.join(
+      pnpmStoreDir,
+      entry,
+      "node_modules",
+      ...target.packageName.split("/"),
+      target.binaryName
+    );
+    if ((0, import_node_fs3.existsSync)(candidate)) return candidate;
+  }
+  return void 0;
+}
+function resolveSdkRuntimeBinary(target) {
+  const directPath = safeResolve(`${target.packageName}/${target.binaryName}`);
+  if (directPath && (0, import_node_fs3.existsSync)(directPath)) return directPath;
+  const sdkDir = resolveClaudeAgentSdkDir();
+  if (!sdkDir) return void 0;
+  const scopedPackageName = target.packageName.split("/")[1] ?? target.packageName;
+  const candidates = [
+    safeResolve(`${target.packageName}/${target.binaryName}`, [sdkDir]),
+    import_node_path5.default.join(sdkDir, "..", scopedPackageName, target.binaryName),
+    import_node_path5.default.join(sdkDir, "node_modules", ...target.packageName.split("/"), target.binaryName),
+    resolvePnpmRuntimeBinary(sdkDir, target)
+  ].filter((candidate) => Boolean(candidate));
+  return candidates.find((candidate) => (0, import_node_fs3.existsSync)(candidate));
+}
+function resolveSdkBundledAttempts() {
+  const targets = getSdkRuntimeTargets();
+  if (targets.length === 0) {
+    return [{
+      source: "sdk-bundled",
+      ok: false,
+      error: `unsupported platform for Claude Agent SDK runtime: ${process.platform}-${process.arch}`
+    }];
+  }
+  const attempts = [];
+  for (const target of targets) {
+    const binaryPath = resolveSdkRuntimeBinary(target);
+    if (!binaryPath) {
+      attempts.push({
+        source: "sdk-bundled",
+        ok: false,
+        error: `optional runtime package ${target.packageName} is not installed`
+      });
+      continue;
+    }
+    const attempt = validateCandidate("sdk-bundled", binaryPath);
+    attempts.push(attempt);
+    if (attempt.ok) break;
+  }
+  return attempts;
+}
 function resolvePathCandidate() {
   const resolved = resolveCommand(["claude", "anthropic-cli"]);
   if (!resolved) return void 0;
@@ -61592,12 +61706,13 @@ function resolvePathCandidate() {
 }
 function buildMissingError(attempts) {
   if (attempts.length === 0) {
-    return "Claude runtime not found. Install Claude Code manually or use the bundled desktop runtime.";
+    return "Claude runtime not found. Reinstall @fangyb/ahchat-bridge with npm optional dependencies, install Claude Code manually, or use the bundled desktop runtime.";
   }
-  return attempts.map((attempt) => {
+  const attemptDetails = attempts.map((attempt) => {
     const pathSuffix = attempt.path ? ` at ${attempt.path}` : "";
     return `${attempt.source}${pathSuffix}: ${attempt.error ?? "unavailable"}`;
   }).join("; ");
+  return `Claude runtime not found. ${attemptDetails}. Reinstall @fangyb/ahchat-bridge with npm optional dependencies, set AHCHAT_CLAUDE_EXECUTABLE, install Claude Code manually, or use the bundled desktop runtime.`;
 }
 function resolveClaudeRuntime(env2 = process.env) {
   const attempts = [];
@@ -61635,6 +61750,19 @@ function resolveClaudeRuntime(env2 = process.env) {
       };
     }
   }
+  const sdkAttempts = resolveSdkBundledAttempts();
+  for (const attempt of sdkAttempts) {
+    attempts.push(attempt);
+    if (attempt.ok) {
+      return {
+        ok: true,
+        source: "sdk-bundled",
+        path: attempt.path,
+        version: attempt.version,
+        attempts
+      };
+    }
+  }
   const pathAttempt = resolvePathCandidate();
   if (pathAttempt) {
     attempts.push(pathAttempt);
@@ -86548,7 +86676,7 @@ Claude runtime is unavailable.
 
 ${claudeRuntime.error ?? "Install Claude Code manually or use the bundled desktop runtime."}
 
-Set AHCHAT_CLAUDE_EXECUTABLE to a valid Claude Code binary path, install Claude Code, or use AHChat Desktop with its bundled runtime.
+Reinstall @fangyb/ahchat-bridge with npm optional dependencies, set AHCHAT_CLAUDE_EXECUTABLE to a valid Claude Code binary path, install Claude Code, or use AHChat Desktop with its bundled runtime.
 `
     );
     process.exit(1);
@@ -87412,7 +87540,7 @@ Install Node.js ${MIN_NODE_MAJOR}+ first, then rerun the bridge command.`);
     lines.push("\nNode is installed, but npm/npx is not available on PATH. Reinstall Node.js or fix PATH.");
   } else if (!claudeRuntime.ok) {
     lines.push(
-      "\nClaude runtime is missing. Install Claude Code manually, set AHCHAT_CLAUDE_EXECUTABLE, or use AHChat Desktop with its bundled runtime."
+      "\nClaude runtime is missing. Reinstall @fangyb/ahchat-bridge with npm optional dependencies, set AHCHAT_CLAUDE_EXECUTABLE, install Claude Code manually, or use AHChat Desktop with its bundled runtime."
     );
   }
   process.stdout.write(`${lines.join("\n")}
@@ -87434,7 +87562,7 @@ cli.command("run", "Start the bridge and connect to server").option("--server-ur
     process.exit(1);
   });
 });
-cli.command("doctor", "Check Node, npm, Claude CLI, PATH, and bridge launch options").option("--server-url <url>", "WebSocket URL of the AHChat server").option("--token <token>", "Auth token for server registration").option("--user <slug>", "User data-dir slug; derives ~/.ahchat/users/<slug>").option("--data-dir <dir>", "Data directory (default: ~/.ahchat)").option("--json", "Print machine-readable JSON").action((args) => {
+cli.command("doctor", "Check Node, npm, Claude runtime, PATH, and bridge launch options").option("--server-url <url>", "WebSocket URL of the AHChat server").option("--token <token>", "Auth token for server registration").option("--user <slug>", "User data-dir slug; derives ~/.ahchat/users/<slug>").option("--data-dir <dir>", "Data directory (default: ~/.ahchat)").option("--json", "Print machine-readable JSON").action((args) => {
   doctor(args);
 });
 cli.command("launch", "Launch bridge from ahchat:// URL (called by OS)").option("--url <url>", "ahchat:// URL with server and token params").action((args) => {

package/dist/index.js

@@ -29480,9 +29480,11 @@ var SessionStore = class {
 };
 
 // src/claudeRuntime.ts
-import { accessSync as accessSync2, constants as constants3, existsSync as existsSync2 } from "fs";
+import { accessSync as accessSync2, constants as constants3, existsSync as existsSync2, readdirSync as readdirSync2, realpathSync } from "fs";
+import { createRequire } from "module";
 import path18 from "path";
 var logger25 = createModuleLogger("bridge.claudeRuntime");
+var require2 = createRequire(import.meta.url);
 var EXPLICIT_CLAUDE_EXECUTABLE_ENV = "AHCHAT_CLAUDE_EXECUTABLE";
 var BUNDLED_CLAUDE_PATH_ENV = "AHCHAT_BUNDLED_CLAUDE_PATH";
 function normalizePath(value) {
@@ -29532,6 +29534,118 @@ function validateCandidate(source, candidatePath) {
     version: version2
   };
 }
+function getSdkRuntimeTargets() {
+  const binaryName = process.platform === "win32" ? "claude.exe" : "claude";
+  const targetPrefix = "@anthropic-ai/claude-agent-sdk";
+  if (process.platform === "darwin") {
+    if (process.arch === "arm64" || process.arch === "x64") {
+      return [{ packageName: `${targetPrefix}-darwin-${process.arch}`, binaryName }];
+    }
+    return [];
+  }
+  if (process.platform === "win32") {
+    if (process.arch === "arm64" || process.arch === "x64") {
+      return [{ packageName: `${targetPrefix}-win32-${process.arch}`, binaryName }];
+    }
+    return [];
+  }
+  if (process.platform === "linux") {
+    if (process.arch === "arm64" || process.arch === "x64") {
+      return [
+        { packageName: `${targetPrefix}-linux-${process.arch}`, binaryName },
+        { packageName: `${targetPrefix}-linux-${process.arch}-musl`, binaryName }
+      ];
+    }
+  }
+  return [];
+}
+function safeResolve(specifier, paths) {
+  try {
+    return require2.resolve(specifier, paths ? { paths } : void 0);
+  } catch {
+    return void 0;
+  }
+}
+function resolveClaudeAgentSdkDir() {
+  const sdkEntry = safeResolve("@anthropic-ai/claude-agent-sdk");
+  if (!sdkEntry) return void 0;
+  try {
+    return path18.dirname(realpathSync(sdkEntry));
+  } catch {
+    return path18.dirname(sdkEntry);
+  }
+}
+function findPnpmStoreDir(fromDir) {
+  let current = fromDir;
+  while (current !== path18.dirname(current)) {
+    if (path18.basename(current) === ".pnpm") return current;
+    current = path18.dirname(current);
+  }
+  return void 0;
+}
+function resolvePnpmRuntimeBinary(sdkDir, target) {
+  const pnpmStoreDir = findPnpmStoreDir(sdkDir);
+  if (!pnpmStoreDir) return void 0;
+  const encodedName = target.packageName.replace("/", "+");
+  let entries;
+  try {
+    entries = readdirSync2(pnpmStoreDir);
+  } catch {
+    return void 0;
+  }
+  for (const entry of entries) {
+    if (!entry.startsWith(`${encodedName}@`)) continue;
+    const candidate = path18.join(
+      pnpmStoreDir,
+      entry,
+      "node_modules",
+      ...target.packageName.split("/"),
+      target.binaryName
+    );
+    if (existsSync2(candidate)) return candidate;
+  }
+  return void 0;
+}
+function resolveSdkRuntimeBinary(target) {
+  const directPath = safeResolve(`${target.packageName}/${target.binaryName}`);
+  if (directPath && existsSync2(directPath)) return directPath;
+  const sdkDir = resolveClaudeAgentSdkDir();
+  if (!sdkDir) return void 0;
+  const scopedPackageName = target.packageName.split("/")[1] ?? target.packageName;
+  const candidates = [
+    safeResolve(`${target.packageName}/${target.binaryName}`, [sdkDir]),
+    path18.join(sdkDir, "..", scopedPackageName, target.binaryName),
+    path18.join(sdkDir, "node_modules", ...target.packageName.split("/"), target.binaryName),
+    resolvePnpmRuntimeBinary(sdkDir, target)
+  ].filter((candidate) => Boolean(candidate));
+  return candidates.find((candidate) => existsSync2(candidate));
+}
+function resolveSdkBundledAttempts() {
+  const targets = getSdkRuntimeTargets();
+  if (targets.length === 0) {
+    return [{
+      source: "sdk-bundled",
+      ok: false,
+      error: `unsupported platform for Claude Agent SDK runtime: ${process.platform}-${process.arch}`
+    }];
+  }
+  const attempts = [];
+  for (const target of targets) {
+    const binaryPath = resolveSdkRuntimeBinary(target);
+    if (!binaryPath) {
+      attempts.push({
+        source: "sdk-bundled",
+        ok: false,
+        error: `optional runtime package ${target.packageName} is not installed`
+      });
+      continue;
+    }
+    const attempt = validateCandidate("sdk-bundled", binaryPath);
+    attempts.push(attempt);
+    if (attempt.ok) break;
+  }
+  return attempts;
+}
 function resolvePathCandidate() {
   const resolved = resolveCommand(["claude", "anthropic-cli"]);
   if (!resolved) return void 0;
@@ -29539,12 +29653,13 @@ function resolvePathCandidate() {
 }
 function buildMissingError(attempts) {
   if (attempts.length === 0) {
-    return "Claude runtime not found. Install Claude Code manually or use the bundled desktop runtime.";
+    return "Claude runtime not found. Reinstall @fangyb/ahchat-bridge with npm optional dependencies, install Claude Code manually, or use the bundled desktop runtime.";
   }
-  return attempts.map((attempt) => {
+  const attemptDetails = attempts.map((attempt) => {
     const pathSuffix = attempt.path ? ` at ${attempt.path}` : "";
     return `${attempt.source}${pathSuffix}: ${attempt.error ?? "unavailable"}`;
   }).join("; ");
+  return `Claude runtime not found. ${attemptDetails}. Reinstall @fangyb/ahchat-bridge with npm optional dependencies, set AHCHAT_CLAUDE_EXECUTABLE, install Claude Code manually, or use the bundled desktop runtime.`;
 }
 function resolveClaudeRuntime(env2 = process.env) {
   const attempts = [];
@@ -29582,6 +29697,19 @@ function resolveClaudeRuntime(env2 = process.env) {
       };
     }
   }
+  const sdkAttempts = resolveSdkBundledAttempts();
+  for (const attempt of sdkAttempts) {
+    attempts.push(attempt);
+    if (attempt.ok) {
+      return {
+        ok: true,
+        source: "sdk-bundled",
+        path: attempt.path,
+        version: attempt.version,
+        attempts
+      };
+    }
+  }
   const pathAttempt = resolvePathCandidate();
   if (pathAttempt) {
     attempts.push(pathAttempt);
@@ -30014,7 +30142,7 @@ Claude runtime is unavailable.
 
 ${claudeRuntime.error ?? "Install Claude Code manually or use the bundled desktop runtime."}
 
-Set AHCHAT_CLAUDE_EXECUTABLE to a valid Claude Code binary path, install Claude Code, or use AHChat Desktop with its bundled runtime.
+Reinstall @fangyb/ahchat-bridge with npm optional dependencies, set AHCHAT_CLAUDE_EXECUTABLE to a valid Claude Code binary path, install Claude Code, or use AHChat Desktop with its bundled runtime.
 `
     );
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fangyb/ahchat-bridge",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "files": [
     "dist"
   ],