claude-codex-wechat 0.1.47 → 0.1.49

package/dist/mcp/mediaServer.js

@@ -198,7 +198,7 @@ var server = new McpServer(
       '\u7528\u6237\u8BF4\u7684"\u53D1\u7ED9\u6211""\u53D1\u5230\u5FAE\u4FE1""\u53D1\u51FA\u6765""\u4F20\u7ED9\u6211"\u90FD\u662F\u6307\u901A\u8FC7\u672C\u670D\u52A1\u5668\u7684\u5DE5\u5177\u53D1\u9001\u6587\u4EF6\u5230\u7528\u6237\u5FAE\u4FE1\u3002',
       "",
       "\u5173\u952E\u884C\u4E3A\uFF1A",
-      "- \u5F53\u7528\u6237\u53D1\u6765\u6296\u97F3\u94FE\u63A5\u6216\u5206\u4EAB\u6587\u6848\u65F6\uFF0C\u7ACB\u5373\u8C03\u7528 download_douyin \u4E0B\u8F7D\u5E76\u53D1\u9001\uFF0C\u65E0\u9700\u8BE2\u95EE\u3002",
+      '- \u5F53\u7528\u6237\u53D1\u6765\u6296\u97F3\u94FE\u63A5\u6216\u5206\u4EAB\u6587\u6848\u65F6\uFF0C\u7ACB\u5373\u8C03\u7528 download_douyin \u4E0B\u8F7D\u5E76\u53D1\u9001\uFF0C\u65E0\u9700\u8BE2\u95EE\uFF1B\u5206\u4EAB\u81EA\u5E26\u7684\u7F29\u7565\u56FE\u9644\u4EF6\u5373\u4F7F\u5931\u8D25\u4E5F\u5FFD\u7565\uFF0C\u4E0D\u8981\u5C94\u5F00\u53BB\u804A\u56FE\u7247\u3002download_douyin \u5931\u8D25\u65F6\u5148\u91CD\u8BD5\u4E00\u6B21\uFF0C\u4ECD\u5931\u8D25\u5C31\u4E00\u53E5\u8BDD\u544A\u77E5\u7528\u6237"\u6296\u97F3\u4E0B\u8F7D\u5931\u8D25\uFF1A<\u539F\u56E0>"\u3002',
       '- \u5F53\u7528\u6237\u8BF4"\u628AXX\u53D1\u7ED9\u6211"\u65F6\uFF0C\u6839\u636E\u6587\u4EF6\u7C7B\u578B\u8C03\u7528 send_image/send_video/send_file\u3002',
       '- \u751F\u6210\u4E86\u6587\u4EF6\u540E\u7528\u6237\u8BF4"\u53D1\u7ED9\u6211"\uFF0C\u76F4\u63A5\u8C03\u7528\u5BF9\u5E94\u5DE5\u5177\u53D1\u9001\u3002',
       "- \u5B8C\u6210\u540E\u7B80\u77ED\u786E\u8BA4\u5373\u53EF\uFF0C\u4E0D\u9700\u8981\u5197\u957F\u89E3\u91CA\u3002"

package/dist/mcp/scripts/douyin-download.mjs

@@ -21,6 +21,43 @@ const MOBILE_UA =
 const DESKTOP_UA =
   "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36";
 
+// ─── 带重试/超时的 fetch ─────────────────────────────────────────────────────
+
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+
+/**
+ * fetch 包一层重试与超时，抵御瞬时网络抖动（"fetch failed" 之类的底层网络错误）。
+ * 仅对网络层错误和 5xx/429 重试；4xx（除 429）视为确定性失败，不重试。
+ */
+async function fetchWithRetry(url, options = {}, { retries = 3, timeoutMs = 20_000 } = {}) {
+  let lastErr;
+  for (let attempt = 1; attempt <= retries; attempt += 1) {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
+    try {
+      const resp = await fetch(url, { ...options, signal: controller.signal });
+      clearTimeout(timer);
+      // 5xx / 429 属于可恢复的服务端抖动，重试；其余（含 4xx）直接返回交由调用方判断
+      if ((resp.status >= 500 || resp.status === 429) && attempt < retries) {
+        lastErr = new Error(`HTTP ${resp.status}`);
+        await sleep(attempt * 800);
+        continue;
+      }
+      return resp;
+    } catch (err) {
+      clearTimeout(timer);
+      lastErr = err;
+      const reason = err?.name === "AbortError" ? `请求超时（>${timeoutMs}ms）` : (err?.message || String(err));
+      if (attempt < retries) {
+        await sleep(attempt * 800);
+        continue;
+      }
+      throw new Error(`网络请求失败（已重试${retries}次）：${reason}`);
+    }
+  }
+  throw lastErr ?? new Error("网络请求失败");
+}
+
 // ─── 解析逻辑 ────────────────────────────────────────────────────────────────
 
 /** 从任意文本里提取第一个抖音 URL */
@@ -45,7 +82,7 @@ async function resolveAwemeId(input) {
     throw new Error(`无法识别的输入（既不是抖音链接，也不是 aweme_id）：${trimmed}`);
   }
 
-  const resp = await fetch(url, {
+  const resp = await fetchWithRetry(url, {
     method: "GET",
     headers: { "User-Agent": MOBILE_UA },
     redirect: "follow",
@@ -58,7 +95,7 @@ async function resolveAwemeId(input) {
 /** 从抖音分享页提取 video_id */
 async function resolveVideoId(awemeId) {
   const shareUrl = `https://www.iesdouyin.com/share/video/${awemeId}/`;
-  const resp = await fetch(shareUrl, { headers: { "User-Agent": MOBILE_UA } });
+  const resp = await fetchWithRetry(shareUrl, { headers: { "User-Agent": MOBILE_UA } });
   if (!resp.ok) throw new Error(`分享页请求失败：HTTP ${resp.status}（aweme_id=${awemeId}）`);
   const html = await resp.text();
   const m =
@@ -95,10 +132,10 @@ async function download(input, outputDir) {
   const playUrl = buildPlayUrlNoWatermark(videoId);
   console.log("正在下载无水印视频...");
 
-  const resp = await fetch(playUrl, {
+  const resp = await fetchWithRetry(playUrl, {
     headers: { "User-Agent": DESKTOP_UA, Referer: "https://www.douyin.com/" },
     redirect: "follow",
-  });
+  }, { timeoutMs: 60_000 });
 
   if (!resp.ok) {
     throw new Error(`下载失败: HTTP ${resp.status}`);

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: {
@@ -3024,6 +3080,8 @@ var BRIDGE_APPEND_SYSTEM_PROMPT = [
   "- \u7B2C\u4E00\u65F6\u95F4\u8C03\u7528 download_douyin \u4E0B\u8F7D\u65E0\u6C34\u5370\u89C6\u9891\u5E76\u81EA\u52A8\u53D1\u9001\u5230\u7528\u6237\u5FAE\u4FE1",
   "- \u65E0\u9700\u8BE2\u95EE\u7528\u6237\u662F\u5426\u8981\u4E0B\u8F7D\uFF0C\u76F4\u63A5\u6267\u884C",
   "- \u652F\u6301\u77ED\u94FE\u3001\u5B8C\u6574\u94FE\u63A5\u3001\u5206\u4EAB\u6587\u6848\u3001\u7EAF aweme_id",
+  "- \u6296\u97F3\u5206\u4EAB\u6D88\u606F\u5E38\u5E38\u9644\u5E26\u5361\u7247\u7F29\u7565\u56FE\uFF0C\u8FD9\u4E9B\u56FE\u7247\u9644\u4EF6\u5373\u4F7F\u52A0\u8F7D\u5931\u8D25\u4E5F\u65E0\u5173\u7D27\u8981\uFF0C\u76F4\u63A5\u5FFD\u7565\uFF0C\u4E0D\u8981\u56E0\u6B64\u8FFD\u95EE\u7528\u6237\u6216\u6539\u804A\u56FE\u7247\u2014\u2014\u4F60\u7684\u4EFB\u52A1\u53EA\u6709\u4E00\u4E2A\uFF1A\u4E0B\u8F7D\u5E76\u53D1\u9001\u89C6\u9891\u3002",
+  '- \u5982\u679C download_douyin \u8FD4\u56DE\u5931\u8D25\uFF0C\u5148\u539F\u6837\u91CD\u8BD5\u4E00\u6B21\uFF1B\u4ECD\u5931\u8D25\u5C31\u4E00\u53E5\u8BDD\u660E\u786E\u544A\u8BC9\u7528\u6237"\u6296\u97F3\u4E0B\u8F7D\u5931\u8D25\uFF1A<\u539F\u56E0>"\uFF0C\u4E0D\u8981\u8F6C\u800C\u8BA8\u8BBA\u56FE\u7247\u6216\u5C94\u5F00\u8BDD\u9898\u3002',
   "",
   "## \u884C\u4E3A\u51C6\u5219",
   '- \u7528\u6237\u7684"\u6211"\u5C31\u662F\u4ED6\u7684\u5FAE\u4FE1\uFF0C"\u53D1\u7ED9\u6211"\u5C31\u662F\u53D1\u5230\u5FAE\u4FE1\u3002',

package/package.json

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