claude-codex-wechat 0.1.40 → 0.1.44

package/dist/server/cli.js

@@ -639,6 +639,16 @@ async function hasClaudeHistoryDisplay(input) {
   }
   return false;
 }
+async function getClaudeNativeVersion(input) {
+  const sessionPath = await findRecoverableClaudeSessionPath(input.sessionId, input.env ?? process.env);
+  if (!sessionPath) return null;
+  const metadata = await stat2(sessionPath).catch(() => null);
+  if (!metadata?.isFile()) return null;
+  return {
+    fingerprint: `claude:${input.sessionId}:${Math.trunc(metadata.mtimeMs)}:${metadata.size}`,
+    observedAt: Date.now()
+  };
+}
 async function readClaudeSessionMetadata(filePath) {
   const content = await readFile2(filePath, "utf8");
   let aiTitle;
@@ -865,6 +875,16 @@ async function findRecoverableCodexSessionPath(sessionId, env = process.env) {
   }
   return await walk(root, 0);
 }
+async function getCodexNativeVersion(input) {
+  const sessionPath = await findRecoverableCodexSessionPath(input.sessionId, input.env ?? process.env);
+  if (!sessionPath) return null;
+  const metadata = await stat3(sessionPath).catch(() => null);
+  if (!metadata?.isFile()) return null;
+  return {
+    fingerprint: `codex:${input.sessionId}:${Math.trunc(metadata.mtimeMs)}:${metadata.size}`,
+    observedAt: Date.now()
+  };
+}
 async function readCodexSessionIndex(env) {
   const indexPath = join4(env.CODEX_HOME || join4(env.HOME || homedir3(), ".codex"), "session_index.jsonl");
   const index = /* @__PURE__ */ new Map();
@@ -2786,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) {
@@ -2794,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) {
@@ -2836,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 [];
@@ -2950,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) {
@@ -3204,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 = [];
@@ -3299,6 +3384,12 @@ var ClaudeCodeProvider = class {
   async listRecoverableSessions() {
     return await listRecoverableClaudeSessions();
   }
+  async getNativeVersion(input) {
+    return await getClaudeNativeVersion({
+      sessionId: input.providerSessionId,
+      cwd: input.cwd
+    });
+  }
   async attachSession(input) {
     return await this.options.runner.startSession({
       bridgeSessionId: input.bridgeSessionId,
@@ -3323,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", () => {
@@ -3784,6 +3876,12 @@ var CodexProvider = class {
   async listRecoverableSessions() {
     return await listRecoverableCodexSessions();
   }
+  async getNativeVersion(input) {
+    return await getCodexNativeVersion({
+      sessionId: input.providerSessionId,
+      cwd: input.cwd
+    });
+  }
   async attachSession(input) {
     return await this.options.runner.startSession({
       bridgeSessionId: input.bridgeSessionId,
@@ -3954,6 +4052,9 @@ function parseBridgeCommand(input) {
   if (command === "/resume") {
     return { kind: "resume_session", ref: first ?? "" };
   }
+  if (command === "/reload") {
+    return { kind: "reload_session" };
+  }
   if (command === "/new") {
     if (!first) return { kind: "new_session", providerId: null, cwd: null };
     const colonIndex = first.indexOf(":");
@@ -3983,7 +4084,8 @@ var BRIDGE_COMMAND_HELP_GROUPS = [
       { command: "/new claude|codex", desc: "\u65B0\u5EFA\u6307\u5B9A provider \u4F1A\u8BDD" },
       { command: "/new <\u76EE\u5F55>", desc: "\u5728\u6307\u5B9A\u76EE\u5F55\u6309\u5F53\u524D provider \u65B0\u5EFA\u4F1A\u8BDD" },
       { command: "/new claude:<\u76EE\u5F55>", desc: "\u65B0\u5EFA\u6307\u5B9A provider + \u6307\u5B9A\u76EE\u5F55\u4F1A\u8BDD" },
-      { command: "/stop", desc: "\u4E2D\u65AD\u5F53\u524D\u6B63\u5728\u751F\u6210\u7684\u56DE\u590D\uFF08\u4F1A\u8BDD\u4FDD\u7559\uFF09" }
+      { command: "/stop", desc: "\u4E2D\u65AD\u5F53\u524D\u6B63\u5728\u751F\u6210\u7684\u56DE\u590D\uFF08\u4F1A\u8BDD\u4FDD\u7559\uFF09" },
+      { command: "/reload", desc: "\u5F53\u524D\u4F1A\u8BDD\u5DF2\u88AB\u53E6\u4E00\u7AEF\u7EE7\u7EED\u540E\uFF0C\u91CD\u8F7D\u539F\u751F\u4F1A\u8BDD\u72B6\u6001\u518D\u7EE7\u7EED" }
     ]
   },
   {
@@ -4276,6 +4378,36 @@ var MessageRouter = class _MessageRouter {
     const provider = this.providers.get(session.providerId);
     void Promise.resolve(provider?.stopSession(session.id)).catch(() => void 0);
   }
+  async ensureSessionFresh(session, provider) {
+    if (!session.providerSessionId || !provider.getNativeVersion) return { ok: true };
+    const version = await provider.getNativeVersion({
+      providerSessionId: session.providerSessionId,
+      cwd: session.cwd
+    }).catch(() => null);
+    if (!version || !session.lastSeenNativeFingerprint) return { ok: true };
+    if (version.fingerprint === session.lastSeenNativeFingerprint) return { ok: true };
+    this.conversation.update({
+      staleReason: "native_advanced_elsewhere",
+      lastActivityAt: Date.now()
+    }, session.id);
+    return {
+      ok: false,
+      message: "\u8BE5\u4F1A\u8BDD\u5DF2\u5728\u53E6\u4E00\u7AEF\u7EE7\u7EED\uFF0C\u5F53\u524D\u6865\u63A5\u72B6\u6001\u5DF2\u8FC7\u671F\u3002\u8BF7\u5148 /reload \u540E\u518D\u7EE7\u7EED\u3002"
+    };
+  }
+  async refreshNativeFingerprint(session, provider) {
+    if (!session.providerSessionId || !provider.getNativeVersion) return;
+    const version = await provider.getNativeVersion({
+      providerSessionId: session.providerSessionId,
+      cwd: session.cwd
+    }).catch(() => null);
+    if (!version) return;
+    this.conversation.update({
+      lastSeenNativeFingerprint: version.fingerprint,
+      staleReason: void 0,
+      lastActivityAt: Date.now()
+    }, session.id);
+  }
   async runChatGeneration(message, user, text, seq) {
     const superseded = () => (this.latestMutatingSeq.get(message.chatId) ?? 0) > seq;
     if (superseded()) return;
@@ -4327,6 +4459,11 @@ var MessageRouter = class _MessageRouter {
       }
       await this.persistBridgeMetadata(updated);
     }
+    const freshness = await this.ensureSessionFresh(this.conversation.getCurrent() ?? session, provider);
+    if (!freshness.ok) {
+      await this.sendToChat({ chatId: message.chatId, kind: "status", text: freshness.message });
+      return;
+    }
     const genId = ++this.generationSeq;
     let abortGeneration;
     const aborted = new Promise((resolve2) => {
@@ -4403,6 +4540,10 @@ var MessageRouter = class _MessageRouter {
         const finalBinding = this.conversation.getCurrent();
         if (finalBinding?.id === session.id && finalBinding.providerSessionId) {
           await this.persistBridgeMetadata(finalBinding).catch(() => void 0);
+          const refreshedBinding = this.conversation.getCurrent();
+          if (refreshedBinding?.id === session.id && refreshedBinding.providerSessionId) {
+            await this.refreshNativeFingerprint(refreshedBinding, provider).catch(() => void 0);
+          }
         }
       }
     } finally {
@@ -4438,6 +4579,44 @@ var MessageRouter = class _MessageRouter {
       await this.sendToChat({ chatId, kind: "status", text: "\u5DF2\u4E2D\u65AD\u5F53\u524D\u751F\u6210\uFF0C\u4F1A\u8BDD\u4FDD\u7559" });
       return;
     }
+    if (command.kind === "reload_session") {
+      this.pendingChoices.delete(chatId);
+      const current = this.conversation.getCurrent();
+      if (!current) {
+        await this.sendToChat({ chatId, kind: "status", text: "No active session" });
+        return;
+      }
+      if (!current.providerSessionId) {
+        await this.sendToChat({ chatId, kind: "status", text: "\u5F53\u524D\u4F1A\u8BDD\u8FD8\u6CA1\u6709\u539F\u751F provider \u4F1A\u8BDD\u53EF\u91CD\u8F7D" });
+        return;
+      }
+      const provider = this.providers.get(current.providerId);
+      if (!provider?.attachSession) {
+        await this.sendToChat({ chatId, kind: "status", text: `\u5F53\u524D provider\uFF08${current.providerId}\uFF09\u4E0D\u652F\u6301\u4F1A\u8BDD\u91CD\u8F7D` });
+        return;
+      }
+      await this.preemptActiveGeneration(chatId);
+      this.recycleProviderProcess(current);
+      const reattached = await provider.attachSession({
+        candidateId: current.providerSessionId,
+        bridgeSessionId: current.id,
+        cwd: current.cwd
+      });
+      const version = await provider.getNativeVersion?.({
+        providerSessionId: reattached.providerSessionId ?? current.providerSessionId,
+        cwd: current.cwd
+      }).catch(() => null);
+      this.conversation.update({
+        providerSessionId: reattached.providerSessionId ?? current.providerSessionId,
+        status: reattached.status,
+        lastSeenNativeFingerprint: version?.fingerprint,
+        lastReloadedAt: Date.now(),
+        staleReason: void 0,
+        lastActivityAt: Date.now()
+      }, current.id);
+      await this.sendToChat({ chatId, kind: "status", text: "\u5DF2\u91CD\u65B0\u52A0\u8F7D\u5F53\u524D\u4F1A\u8BDD\uFF0C\u53EF\u7EE7\u7EED\u5BF9\u8BDD\u3002" });
+      return;
+    }
     if (command.kind === "new_session") {
       this.pendingChoices.delete(chatId);
       const previousSession = this.conversation.getCurrent();
@@ -5494,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 } } : {},
@@ -6063,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);