claude-codex-wechat 0.1.46 → 0.1.48

package/README.md

@@ -88,13 +88,13 @@ claude-codex-wechat doctor
 }
 ```
 
-如需接入自建的公网中转服务（relay-server），在同一份配置里加上：
+默认配置只保留 relay 地址；`authToken` 会在首次启动时自动生成并写回 `config.json`。
+
+如需改为接入自建的公网中转服务（relay-server），在同一份配置里覆盖 relay 地址，并把 `authToken` 换成该 relay 接受的真实 token：
 
 ```json
 {
   "tunnel": {
-    "provider": "relay",
-    "enabled": true,
     "relay": {
       "serverUrl": "wss://your-relay-host/agent",
       "authToken": "replace-with-relay-auth-token"

package/config.example.json

@@ -16,11 +16,8 @@
     }
   },
   "tunnel": {
-    "provider": "relay",
-    "enabled": false,
     "relay": {
-      "serverUrl": "wss://wechat.style520.com/agent",
-      "authToken": "replace-with-relay-auth-token"
+      "serverUrl": "wss://wechat.style520.com/agent"
     }
   }
 }

package/dist/server/cli.js

@@ -497,7 +497,7 @@ var FileWeixinStateStore = class {
 };
 
 // src/providers/claude-code/nativeSessions.ts
-import { appendFile, mkdir as mkdir2, readdir as readdir2, readFile as readFile2, stat as stat2, writeFile } from "node:fs/promises";
+import { appendFile, mkdir as mkdir2, readdir as readdir2, readFile as readFile2, stat as stat2, unlink as unlink2, writeFile } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
 import { basename as basename2, dirname as dirname2, join as join3 } from "node:path";
 
@@ -528,6 +528,19 @@ function parseSessionBridgeName(value) {
 function resolveClaudeConfigDir(env = process.env) {
   return join3(env.HOME || homedir2(), ".claude");
 }
+async function prepareClaudeSessionForResume(input) {
+  const env = input.env ?? process.env;
+  const index = await readClaudeRuntimeSessionIndex(env);
+  const record = index.get(input.sessionId.trim());
+  if (!record || record.kind !== "bg") return { ok: true, adoptedBackground: false };
+  if (record.status && record.status !== "idle") {
+    return { ok: false, reason: "background_session_running" };
+  }
+  if (record.path) {
+    await unlink2(record.path).catch(() => void 0);
+  }
+  return { ok: true, adoptedBackground: true };
+}
 async function listRecoverableClaudeSessions(env = process.env) {
   const projectsDir = join3(resolveClaudeConfigDir(env), "projects");
   const historyIndex = await readClaudeHistoryIndex(env);
@@ -685,6 +698,30 @@ async function readClaudeSessionMetadata(filePath) {
   }
   return { aiTitle, lastPrompt, sessionName, cwd };
 }
+async function readClaudeRuntimeSessionIndex(env) {
+  const sessionsDir = join3(resolveClaudeConfigDir(env), "sessions");
+  const index = /* @__PURE__ */ new Map();
+  try {
+    const entries = await readdir2(sessionsDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isFile() || entry.isSymbolicLink() || !String(entry.name).endsWith(".json")) continue;
+      const path = join3(sessionsDir, String(entry.name));
+      try {
+        const raw = await readFile2(path, "utf8");
+        const record = JSON.parse(raw);
+        const sessionId = typeof record.sessionId === "string" ? record.sessionId.trim() : "";
+        if (!sessionId) continue;
+        const kind = typeof record.kind === "string" ? record.kind.trim() : void 0;
+        const status = typeof record.status === "string" ? record.status.trim() : void 0;
+        index.set(sessionId, { kind, status, path });
+      } catch {
+      }
+    }
+  } catch {
+    return index;
+  }
+  return index;
+}
 async function readClaudeHistoryIndex(env) {
   const historyPath = join3(resolveClaudeConfigDir(env), "history.jsonl");
   const index = /* @__PURE__ */ new Map();
@@ -1373,6 +1410,12 @@ function registerChannelAdminRoutes(input) {
     if (!input.conversation) {
       return reply.code(500).send({ ok: false, error: "current_conversation_store_unavailable" });
     }
+    if (request.body.providerId === "claude-code") {
+      const prepared = await prepareClaudeSessionForResume({ sessionId: request.body.providerSessionId });
+      if (!prepared.ok) {
+        return reply.code(409).send({ ok: false, error: "claude_background_session_still_running" });
+      }
+    }
     const recoverableCandidate = provider.listRecoverableSessions ? (await provider.listRecoverableSessions()).find((candidate) => candidate.id === request.body.providerSessionId) : void 0;
     const attached = await attachProviderSessionToBridge({
       conversationStore: input.conversation,
@@ -1387,6 +1430,19 @@ function registerChannelAdminRoutes(input) {
       resumeTitle: recoverableCandidate?.resumeTitle
     });
     input.events?.emit({ type: "channel.current-session-changed" });
+    try {
+      const providerLabel = attached.providerId === "codex" ? "Codex" : "Claude";
+      const lines = [`### \u5DF2\u63A5\u5165 ${providerLabel} \u4F1A\u8BDD`];
+      if (attached.providerSessionId) lines.push(`- \`sessionId\`: \`${attached.providerSessionId}\``);
+      lines.push(`- \`cwd\`: \`${attached.cwd}\``);
+      await input.channel?.sendMessage({
+        chatId: request.body.chatId ?? user.platformUserId,
+        kind: "status",
+        text: lines.join("\n")
+      });
+    } catch (err) {
+      input.app.log.warn({ err }, "sessions_attach_notify_failed");
+    }
     return {
       ok: true,
       session: {
@@ -5640,7 +5696,6 @@ async function startDaemon(options) {
     defaultProvider: config.bridge?.defaultProvider ?? "claude-code",
     defaultWorkspace: config.bridge?.defaultWorkspace ?? process.cwd(),
     tunnel: {
-      enabled: true,
       ...config.tunnel?.relay ? { relay: config.tunnel.relay } : {}
     }
   };

package/package.json

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