claude-codex-wechat 0.1.41 → 0.1.44

package/dist/server/cli.js

@@ -2806,7 +2806,7 @@ function isTemporaryShim(candidate) {
   const tempDir = tmpdir();
   return candidate.startsWith(tempDir);
 }
-async function findExecutable(command) {
+async function findExecutable(command, pathEnv) {
   const extensions = executableExtensions();
   if (command.includes("/") || command.includes("\\")) {
     for (const ext of extensions) {
@@ -2814,7 +2814,7 @@ async function findExecutable(command) {
     }
     return void 0;
   }
-  const dirs = (process.env.PATH ?? "").split(delimiter).filter(Boolean);
+  const dirs = (pathEnv ?? "").split(delimiter).filter(Boolean);
   let fallback;
   for (const dir of dirs) {
     for (const ext of extensions) {
@@ -2856,6 +2856,71 @@ function statePath(filename) {
   return join9(tmpdir(), filename);
 }
 
+// src/shared/loginShellEnv.ts
+import { spawnSync } from "node:child_process";
+import { delimiter as delimiter2 } from "node:path";
+var DELIMITER = "__CCW_LOGIN_ENV_DELIM_5f3a2b7c__";
+function parseEnvBlock(block) {
+  const env = {};
+  let currentKey = null;
+  const normalized = block.replace(/\n$/, "");
+  for (const line of normalized.split("\n")) {
+    const match = /^([A-Za-z_][A-Za-z0-9_]*)=(.*)$/.exec(line);
+    if (match) {
+      currentKey = match[1];
+      env[currentKey] = match[2];
+    } else if (currentKey) {
+      env[currentKey] = `${env[currentKey]}
+${line}`;
+    }
+  }
+  return env;
+}
+function captureLoginShellEnv(deps = {}) {
+  const platform = deps.platform ?? process.platform;
+  if (platform === "win32") return null;
+  const run = deps.run ?? spawnSync;
+  const shell = deps.shell ?? process.env.SHELL ?? "/bin/zsh";
+  const timeoutMs = deps.timeoutMs ?? 5e3;
+  const command = `printf %s '${DELIMITER}'; env; printf %s '${DELIMITER}'`;
+  try {
+    const result = run(shell, ["-l", "-i", "-c", command], {
+      timeout: timeoutMs,
+      encoding: "utf8",
+      maxBuffer: 8 * 1024 * 1024
+    });
+    const stdout = typeof result.stdout === "string" ? result.stdout : "";
+    const start = stdout.indexOf(DELIMITER);
+    const end = stdout.indexOf(DELIMITER, start + DELIMITER.length);
+    if (start === -1 || end === -1 || end <= start) return null;
+    const block = stdout.slice(start + DELIMITER.length, end);
+    const env = parseEnvBlock(block);
+    if (!env.PATH) return null;
+    return env;
+  } catch {
+    return null;
+  }
+}
+var cache;
+function resolveLoginShellEnv() {
+  if (cache !== void 0) return cache;
+  cache = captureLoginShellEnv();
+  if (cache === null && process.platform !== "win32") {
+    console.warn(
+      "[claude-codex-wechat] \u7EC8\u7AEF\u73AF\u5883\u590D\u523B\u5931\u8D25\uFF0C\u5DF2\u9000\u56DE process.env\uFF08PATH/\u51ED\u8BC1\u53EF\u80FD\u4E0E\u7EC8\u7AEF\u4E0D\u4E00\u81F4\uFF09\u3002\u82E5 provider \u62A5\u300C\u627E\u4E0D\u5230\u300D\u6216\u300C\u4EE4\u724C\u5DF2\u8FC7\u671F\u300D\uFF0C\u8BF7\u4ECE\u4EA4\u4E92\u7EC8\u7AEF\u91CD\u542F daemon\u3002"
+    );
+  }
+  return cache;
+}
+function resolveTerminalSearchPath() {
+  return mergeSearchPath(resolveLoginShellEnv()?.PATH, process.env.PATH);
+}
+function mergeSearchPath(primary, fallback) {
+  if (!primary) return fallback;
+  if (!fallback) return primary;
+  return `${primary}${delimiter2}${fallback}`;
+}
+
 // src/providers/claude-code/assistantContent.ts
 function extractAssistantBlocks(message) {
   if (!message || typeof message !== "object") return [];
@@ -2970,12 +3035,12 @@ var BRIDGE_APPEND_SYSTEM_PROMPT = [
 
 // src/providers/claude-code/claudeCapabilities.ts
 import { spawn as spawn2 } from "node:child_process";
-var cache = /* @__PURE__ */ new Map();
+var cache2 = /* @__PURE__ */ new Map();
 var probeAppendSystemPromptSupport = (command) => {
-  const cached = cache.get(command);
+  const cached = cache2.get(command);
   if (cached) return cached;
   const result = runHelpProbe(command);
-  cache.set(command, result);
+  cache2.set(command, result);
   return result;
 };
 function runHelpProbe(command) {
@@ -3224,7 +3289,7 @@ function parseJsonLine(line) {
 function defaultClaudeStreamSpawner(call, opts = {}) {
   const stderrCapBytes = opts.stderrCapBytes ?? 64 * 1024;
   const maxLineBytes = opts.maxLineBytes ?? 10 * 1024 * 1024;
-  const child = spawn3(call.command, call.args, { cwd: expandTilde(call.cwd) ?? call.cwd, stdio: ["pipe", "pipe", "pipe"], shell: useShellForCli() });
+  const child = spawn3(call.command, call.args, { cwd: expandTilde(call.cwd) ?? call.cwd, stdio: ["pipe", "pipe", "pipe"], shell: useShellForCli(), env: resolveLoginShellEnv() ?? process.env });
   let stderr = "";
   let buffer = "";
   const queue = [];
@@ -3349,7 +3414,8 @@ var CodexAppServerClient = class {
     this.child = spawn4(command, ["app-server", "--listen", "stdio://"], {
       cwd: input.cwd,
       stdio: ["pipe", "pipe", "pipe"],
-      shell: useShellForCli()
+      shell: useShellForCli(),
+      env: resolveLoginShellEnv() ?? process.env
     });
     this.child.stdout.on("data", (chunk) => this.onStdout(String(chunk)));
     this.child.stderr.on("data", () => {
@@ -5607,8 +5673,9 @@ function listLanIpv4Addresses() {
   return Object.values(networkInterfaces()).flat().filter((iface) => Boolean(iface)).filter((iface) => iface.family === "IPv4" && !iface.internal).map((iface) => iface.address);
 }
 async function resolveProviderCommands(providers) {
-  const claudeCommand = providers?.claude?.command ?? await findExecutable("claude");
-  const codexCommand = providers?.codex?.command ?? await findExecutable("codex");
+  const searchPath = resolveTerminalSearchPath();
+  const claudeCommand = providers?.claude?.command ?? await findExecutable("claude", searchPath);
+  const codexCommand = providers?.codex?.command ?? await findExecutable("codex", searchPath);
   if (!claudeCommand && !codexCommand) return void 0;
   return {
     ...claudeCommand ? { claude: { command: claudeCommand } } : {},
@@ -6176,9 +6243,10 @@ async function cmdDoctor() {
   console.log("claude-codex-wechat doctor\n");
   report("\u914D\u7F6E\u6587\u4EF6", existsSync11(configPath) ? configPath : `\u7F3A\u5931 (${configPath})\uFF0C\u9996\u6B21 start \u65F6\u81EA\u52A8\u521B\u5EFA`);
   report("\u524D\u7AEF\u4EA7\u7269", existsSync11(webRoot) ? webRoot : `\u7F3A\u5931 (${webRoot})`);
-  const claude = await findExecutable("claude");
+  const searchPath = resolveTerminalSearchPath();
+  const claude = await findExecutable("claude", searchPath);
   report("claude \u53EF\u6267\u884C", claude ?? "\u672A\u627E\u5230\uFF0C\u9700\u5148\u5B89\u88C5\u5E76\u767B\u5F55 Claude Code");
-  const codex = await findExecutable("codex");
+  const codex = await findExecutable("codex", searchPath);
   report("codex \u53EF\u6267\u884C", codex ?? "\u672A\u627E\u5230\uFF08\u4EC5\u4F7F\u7528 Claude \u65F6\u53EF\u5FFD\u7565\uFF09");
   if (existsSync11(configPath)) {
     const config = loadBridgeConfig(configPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-codex-wechat",
-  "version": "0.1.41",
+  "version": "0.1.44",
   "private": false,
   "type": "module",
   "packageManager": "pnpm@11.5.0",