claude-codex-wechat 0.1.59 → 0.1.60

package/dist/server/cli.js

@@ -757,10 +757,23 @@ async function hasClaudeHistoryDisplay(input) {
 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;
+  const content = await readFile2(sessionPath, "utf8").catch(() => null);
+  if (content === null) return null;
+  let count = 0;
+  let lastUuid = "";
+  for (const line of content.split(/\r?\n/)) {
+    if (!line.trim()) continue;
+    try {
+      const record = JSON.parse(line);
+      if ((record.type === "user" || record.type === "assistant") && typeof record.uuid === "string") {
+        count += 1;
+        lastUuid = record.uuid;
+      }
+    } catch {
+    }
+  }
   return {
-    fingerprint: `claude:${input.sessionId}:${Math.trunc(metadata.mtimeMs)}:${metadata.size}`,
+    fingerprint: `claude:${input.sessionId}:conv:${count}:${lastUuid}`,
     observedAt: Date.now()
   };
 }
@@ -1017,10 +1030,23 @@ async function findRecoverableCodexSessionPath(sessionId, env = process.env) {
 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;
+  const content = await readFile3(sessionPath, "utf8").catch(() => null);
+  if (content === null) return null;
+  let count = 0;
+  let lastTimestamp = "";
+  for (const line of content.split(/\r?\n/)) {
+    if (!line.trim()) continue;
+    try {
+      const record = JSON.parse(line);
+      if (record.type === "response_item") {
+        count += 1;
+        lastTimestamp = typeof record.timestamp === "string" ? record.timestamp : "";
+      }
+    } catch {
+    }
+  }
   return {
-    fingerprint: `codex:${input.sessionId}:${Math.trunc(metadata.mtimeMs)}:${metadata.size}`,
+    fingerprint: `codex:${input.sessionId}:conv:${count}:${lastTimestamp}`,
     observedAt: Date.now()
   };
 }
@@ -4617,11 +4643,10 @@ var MessageRouter = class _MessageRouter {
     if ((this.latestMutatingSeq.get(message.chatId) ?? 0) > seq) {
       return { status: "accepted" };
     }
-    const chatText = this.resolveChoiceReply(message.chatId, command.text);
-    if (await this.maybeSteer(message.chatId, chatText)) {
+    if (await this.maybeSteer(message.chatId, command.text)) {
       return { status: "accepted" };
     }
-    await this.runExclusive(() => this.runChatGeneration(message, user, chatText, seq));
+    await this.runExclusive(() => this.runChatGeneration(message, user, command.text, seq));
     return { status: "accepted" };
   }
   // 消费一次上一轮暂存的 AskUserQuestion 选项：纯序号回复翻译成对应选项文字，
@@ -4643,7 +4668,7 @@ var MessageRouter = class _MessageRouter {
     if (!active) return Promise.resolve(false);
     const provider = this.providers.get(active.providerId);
     if (!provider?.steerSession) return Promise.resolve(false);
-    return provider.steerSession(active.bridgeSessionId, text).then(() => true);
+    return provider.steerSession(active.bridgeSessionId, this.resolveChoiceReply(chatId, text)).then(() => true);
   }
   // Serialize session-mutating work onto one global chain. The chain is updated
   // synchronously (no await before the assignment) so two non-blocking channel
@@ -4687,6 +4712,17 @@ var MessageRouter = class _MessageRouter {
     }).catch(() => null);
     if (!version || !session.lastSeenNativeFingerprint) return { ok: true };
     if (version.fingerprint === session.lastSeenNativeFingerprint) return { ok: true };
+    if (LEGACY_NATIVE_FINGERPRINT.test(session.lastSeenNativeFingerprint)) {
+      this.conversation.update({ lastSeenNativeFingerprint: version.fingerprint }, session.id);
+      return { ok: true };
+    }
+    if (provider.attachSession) {
+      try {
+        await this.reattachSession(session, provider);
+        return { ok: true };
+      } catch {
+      }
+    }
     this.conversation.update({
       staleReason: "native_advanced_elsewhere",
       lastActivityAt: Date.now()
@@ -4696,6 +4732,27 @@ var MessageRouter = class _MessageRouter {
       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"
     };
   }
+  // 回收旧子进程并以 resume 方式重新挂载同一原生会话，使其加载另一端追加的最新历史。
+  async reattachSession(current, provider) {
+    if (!current.providerSessionId || !provider.attachSession) return;
+    for (const [chatId, pending] of this.pendingChoices) {
+      if (pending.sessionId === current.id) this.pendingChoices.delete(chatId);
+    }
+    this.recycleProviderProcess(current);
+    const reattached = await provider.attachSession({
+      candidateId: current.providerSessionId,
+      bridgeSessionId: current.id,
+      cwd: current.cwd
+    });
+    this.conversation.update({
+      providerSessionId: reattached.providerSessionId ?? current.providerSessionId,
+      status: reattached.status,
+      lastSeenNativeFingerprint: void 0,
+      lastReloadedAt: Date.now(),
+      staleReason: void 0,
+      lastActivityAt: Date.now()
+    }, current.id);
+  }
   async refreshNativeFingerprint(session, provider) {
     if (!session.providerSessionId || !provider.getNativeVersion) return;
     const version = await provider.getNativeVersion({
@@ -4709,7 +4766,7 @@ var MessageRouter = class _MessageRouter {
       lastActivityAt: Date.now()
     }, session.id);
   }
-  async runChatGeneration(message, user, text, seq) {
+  async runChatGeneration(message, user, rawText, seq) {
     const superseded = () => (this.latestMutatingSeq.get(message.chatId) ?? 0) > seq;
     if (superseded()) return;
     const sessionResumeTitle = buildSessionBridgeName({
@@ -4765,6 +4822,7 @@ var MessageRouter = class _MessageRouter {
       await this.sendToChat({ chatId: message.chatId, kind: "status", text: freshness.message });
       return;
     }
+    const text = this.resolveChoiceReply(message.chatId, rawText);
     const genId = ++this.generationSeq;
     let abortGeneration;
     const aborted = new Promise((resolve3) => {
@@ -4912,20 +4970,7 @@ var MessageRouter = class _MessageRouter {
         return;
       }
       await this.preemptActiveGeneration(chatId);
-      this.recycleProviderProcess(current);
-      const reattached = await provider.attachSession({
-        candidateId: current.providerSessionId,
-        bridgeSessionId: current.id,
-        cwd: current.cwd
-      });
-      this.conversation.update({
-        providerSessionId: reattached.providerSessionId ?? current.providerSessionId,
-        status: reattached.status,
-        lastSeenNativeFingerprint: void 0,
-        lastReloadedAt: Date.now(),
-        staleReason: void 0,
-        lastActivityAt: Date.now()
-      }, current.id);
+      await this.reattachSession(current, provider);
       await this.sendToChat({ chatId, kind: "status", text: "\u5DF2\u91CD\u65B0\u52A0\u8F7D\u5F53\u524D\u4F1A\u8BDD\uFF0C\u53EF\u7EE7\u7EED\u5BF9\u8BDD\u3002" });
       return;
     }
@@ -5087,6 +5132,7 @@ var MessageRouter = class _MessageRouter {
     }
   }
 };
+var LEGACY_NATIVE_FINGERPRINT = /^(claude|codex):[^:]+:\d+:\d+$/;
 function summarizeResumeTitle(text) {
   const normalized = text.replace(/\s+/g, " ").trim();
   if (!normalized) return void 0;

package/package.json

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