claude-codex-wechat 0.1.36 → 0.1.38

package/dist/mcp/mediaServer.js

@@ -99,17 +99,22 @@ import { homedir } from "node:os";
 import { fileURLToPath } from "node:url";
 import { z as z2 } from "zod";
 var BRIDGE_API_URL2 = process.env.BRIDGE_API_URL || "http://localhost:8787";
-function findDouyinScript() {
-  const here = dirname(fileURLToPath(import.meta.url));
-  const candidates = [
-    // Bundled with project (primary)
-    join(here, "..", "scripts", "douyin-download.mjs"),
-    // Built output
-    join(here, "..", "..", "mcp", "scripts", "douyin-download.mjs"),
+function douyinScriptCandidates(baseDir) {
+  return [
+    // Source layout: src/mcp/tools -> src/mcp/scripts
+    join(baseDir, "..", "scripts", "douyin-download.mjs"),
+    // Bundled layout: dist/mcp/mediaServer.js -> dist/mcp/scripts
+    join(baseDir, "scripts", "douyin-download.mjs"),
+    // Older/alternate dist layout fallback
+    join(baseDir, "..", "..", "mcp", "scripts", "douyin-download.mjs"),
     // User skills locations (cross-platform)
     join(homedir(), ".agents", "skills", "douyin-download", "scripts", "douyin-download.mjs"),
     join(homedir(), ".claude", "skills", "douyin-download", "scripts", "douyin-download.mjs")
   ];
+}
+function findDouyinScript() {
+  const here = dirname(fileURLToPath(import.meta.url));
+  const candidates = douyinScriptCandidates(here);
   for (const p of candidates) {
     const resolved = resolve(p);
     if (existsSync(resolved)) return resolved;

package/dist/server/cli.js

@@ -2977,17 +2977,52 @@ function runHelpProbe(command) {
 }
 
 // src/providers/claude-code/claudeStreamingRunner.ts
+var IDLE_SENTINEL = /* @__PURE__ */ Symbol("idle_timeout");
+function capTail(text, capBytes) {
+  if (capBytes <= 0 || text.length <= capBytes) return text;
+  return text.slice(text.length - capBytes);
+}
+function readWithIdleTimeout(handle, ms) {
+  if (!ms || ms <= 0) return handle.read();
+  return new Promise((resolve2) => {
+    let settled = false;
+    const timer = setTimeout(() => {
+      if (!settled) {
+        settled = true;
+        resolve2(IDLE_SENTINEL);
+      }
+    }, ms);
+    timer.unref?.();
+    void handle.read().then((chunk) => {
+      if (!settled) {
+        settled = true;
+        clearTimeout(timer);
+        resolve2(chunk);
+      }
+    });
+  });
+}
 var ClaudeStreamingRunner = class {
   sessions = /* @__PURE__ */ new Map();
   command;
   spawner;
   capabilityProbe;
   mcpConfigPath;
+  idleTimeoutMs;
+  maxProcessAgeMs;
+  maxTurns;
+  stderrCapBytes;
+  maxLineBytes;
   constructor(input = {}) {
     this.command = input.command ?? "claude";
-    this.spawner = input.spawner ?? defaultClaudeStreamSpawner;
     this.capabilityProbe = input.capabilityProbe ?? probeAppendSystemPromptSupport;
     this.mcpConfigPath = input.mcpConfigPath;
+    this.idleTimeoutMs = input.idleTimeoutMs ?? 18e4;
+    this.maxProcessAgeMs = input.maxProcessAgeMs ?? 2 * 60 * 60 * 1e3;
+    this.maxTurns = input.maxTurns ?? 50;
+    this.stderrCapBytes = input.stderrCapBytes ?? 64 * 1024;
+    this.maxLineBytes = input.maxLineBytes ?? 10 * 1024 * 1024;
+    this.spawner = input.spawner ?? ((call) => defaultClaudeStreamSpawner(call, { stderrCapBytes: this.stderrCapBytes, maxLineBytes: this.maxLineBytes }));
   }
   async startSession(input) {
     const resumeId = input.options?.providerSessionId;
@@ -3000,7 +3035,8 @@ var ClaudeStreamingRunner = class {
       cwd: input.cwd,
       status: "idle",
       resumeId,
-      pendingFollowUps: 0
+      pendingFollowUps: 0,
+      turnCount: 0
     };
     this.sessions.set(input.bridgeSessionId, session);
     return session;
@@ -3015,7 +3051,13 @@ var ClaudeStreamingRunner = class {
     session.pendingFollowUps = 0;
     handle.write(userEnvelope(input.text));
     while (true) {
-      const chunk = await handle.read();
+      const chunk = await readWithIdleTimeout(handle, this.idleTimeoutMs);
+      if (chunk === IDLE_SENTINEL) {
+        handle.close();
+        session.handle = void 0;
+        yield { type: "error", error: "idle_timeout", code: "idle_timeout" };
+        return;
+      }
       if (chunk.type === "exit") {
         session.handle = void 0;
         yield { type: "error", error: chunk.stderr || `claude stream exited with ${chunk.code}` };
@@ -3064,6 +3106,7 @@ var ClaudeStreamingRunner = class {
           session.claudeSessionId = sessionId;
           session.resumeId = sessionId;
         }
+        session.turnCount += 1;
         yield { type: "message_done" };
         if (session.pendingFollowUps > 0) {
           session.pendingFollowUps -= 1;
@@ -3096,11 +3139,22 @@ var ClaudeStreamingRunner = class {
     this.sessions.delete(bridgeSessionId);
   }
   ensureHandle(session) {
-    if (session.handle) return session.handle;
+    if (session.handle && !this.shouldRetire(session)) return session.handle;
+    if (session.handle) {
+      session.handle.close();
+      session.handle = void 0;
+    }
     const args = buildStreamingArgs(session, this.mcpConfigPath);
     session.handle = this.spawner({ command: this.command, args, cwd: session.cwd });
+    session.spawnedAt = Date.now();
+    session.turnCount = 0;
     return session.handle;
   }
+  shouldRetire(session) {
+    if (this.maxTurns > 0 && session.turnCount >= this.maxTurns) return true;
+    if (this.maxProcessAgeMs > 0 && session.spawnedAt && Date.now() - session.spawnedAt >= this.maxProcessAgeMs) return true;
+    return false;
+  }
 };
 function buildStreamingArgs(session, mcpConfigPath) {
   const args = [
@@ -3147,7 +3201,9 @@ function parseJsonLine(line) {
     return null;
   }
 }
-function defaultClaudeStreamSpawner(call) {
+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() });
   let stderr = "";
   let buffer = "";
@@ -3169,9 +3225,15 @@ function defaultClaudeStreamSpawner(call) {
     for (const line of parts) {
       if (line.trim()) push({ type: "line", line });
     }
+    if (buffer.length > maxLineBytes) {
+      stderr = capTail(stderr + `
+[bridge] dropped oversized line buffer (${buffer.length} bytes)
+`, stderrCapBytes);
+      buffer = "";
+    }
   });
   child.stderr.on("data", (data) => {
-    stderr += String(data);
+    stderr = capTail(stderr + String(data), stderrCapBytes);
   });
   child.on("error", (error) => {
     push({ type: "exit", code: error.code ?? "ERROR", stderr: stderr || error.message });
@@ -3657,9 +3719,22 @@ var CodexProvider = class {
 };
 
 // src/providers/defaultProviders.ts
+function readEnvInt(raw, fallback) {
+  if (!raw) return fallback;
+  const n = Number.parseInt(raw, 10);
+  if (!Number.isFinite(n) || n <= 0) return fallback;
+  return n;
+}
 function createDefaultProviders(input = {}) {
+  const claudeRunner = new ClaudeStreamingRunner({
+    command: input.claudeCommand,
+    mcpConfigPath: input.mcpConfigPath,
+    idleTimeoutMs: readEnvInt(process.env.BRIDGE_CLAUDE_IDLE_TIMEOUT_MS, 18e4),
+    maxProcessAgeMs: readEnvInt(process.env.BRIDGE_CLAUDE_MAX_PROCESS_AGE_MS, 2 * 60 * 60 * 1e3),
+    maxTurns: readEnvInt(process.env.BRIDGE_CLAUDE_MAX_TURNS, 50)
+  });
   return [
-    new ClaudeCodeProvider({ runner: new ClaudeStreamingRunner({ command: input.claudeCommand, mcpConfigPath: input.mcpConfigPath }) }),
+    new ClaudeCodeProvider({ runner: claudeRunner }),
     new CodexProvider({ runner: new CodexInteractiveRunner({ command: input.codexCommand }) })
   ];
 }
@@ -4108,6 +4183,13 @@ var MessageRouter = class _MessageRouter {
     active.abort();
     void Promise.resolve(this.providers.get(active.providerId)?.interruptSession?.(active.bridgeSessionId)).catch(() => void 0);
   }
+  // 切换/清除当前会话前,回收旧 provider 的持久子进程,防止孤儿堆积。
+  // stopSession 内部是同步 close/kill,不会挂起;fire-and-forget,不阻塞命令链。
+  recycleProviderProcess(session) {
+    if (!session) return;
+    const provider = this.providers.get(session.providerId);
+    void Promise.resolve(provider?.stopSession(session.id)).catch(() => void 0);
+  }
   async runChatGeneration(message, user, text, seq) {
     const superseded = () => (this.latestMutatingSeq.get(message.chatId) ?? 0) > seq;
     if (superseded()) return;
@@ -4219,7 +4301,7 @@ var MessageRouter = class _MessageRouter {
             await this.sendToChat({ chatId: message.chatId, kind: "text", text: bufferedText });
             bufferedText = "";
           }
-          const errorText = `Provider error: ${event.error}`;
+          const errorText = event.code === "idle_timeout" ? "\u26A0\uFE0F \u4E0A\u4E00\u8F6E\u957F\u65F6\u95F4\u65E0\u54CD\u5E94(\u7591\u4F3C\u5DE5\u5177\u5361\u6B7B),\u5DF2\u81EA\u52A8\u7EC8\u6B62\u5E76\u4FDD\u7559\u4F1A\u8BDD\u3002\u76F4\u63A5\u91CD\u53D1\u6D88\u606F\u5373\u53EF\u7EE7\u7EED\u3002" : `Provider error: ${event.error}`;
           await this.sendToChat({
             chatId: message.chatId,
             kind: "status",
@@ -4272,9 +4354,11 @@ var MessageRouter = class _MessageRouter {
     }
     if (command.kind === "new_session") {
       this.pendingChoices.delete(chatId);
+      const previousSession = this.conversation.getCurrent();
       await this.preemptActiveGeneration(chatId);
-      const providerId = command.providerId ?? this.conversation.getCurrent()?.providerId ?? this.options.defaults?.defaultProvider ?? "claude-code";
-      const cwd = command.cwd ?? this.conversation.getCurrent()?.cwd ?? this.options.defaults?.defaultWorkspace ?? defaultWorkspaceDir();
+      this.recycleProviderProcess(previousSession);
+      const providerId = command.providerId ?? previousSession?.providerId ?? this.options.defaults?.defaultProvider ?? "claude-code";
+      const cwd = command.cwd ?? previousSession?.cwd ?? this.options.defaults?.defaultWorkspace ?? defaultWorkspaceDir();
       const session = this.conversation.create({
         chatId,
         ownerUserId: user.id,
@@ -4346,8 +4430,9 @@ var MessageRouter = class _MessageRouter {
         await this.sendToChat({ chatId, kind: "status", text: "\u7528\u6CD5\uFF1A/resume <\u7F16\u53F7>" });
         return;
       }
+      const previousSession = this.conversation.getCurrent();
       await this.preemptActiveGeneration(chatId);
-      let providerId = this.conversation.getCurrent()?.providerId ?? this.options.defaults?.defaultProvider ?? "claude-code";
+      let providerId = previousSession?.providerId ?? this.options.defaults?.defaultProvider ?? "claude-code";
       let resolvedId = ref;
       if (/^\d+$/.test(ref)) {
         const cached = this.sessionListCache.get(chatId);
@@ -4363,7 +4448,7 @@ var MessageRouter = class _MessageRouter {
         resolvedId = target;
         providerId = cached.providerId;
       }
-      const previousCwd = this.conversation.getCurrent()?.cwd;
+      const previousCwd = previousSession?.cwd;
       const provider = this.providers.get(providerId);
       if (!provider?.attachSession || !provider.listRecoverableSessions) {
         await this.sendToChat({ chatId, kind: "status", text: `\u5F53\u524D provider\uFF08${providerId}\uFF09\u4E0D\u652F\u6301\u4F1A\u8BDD\u6062\u590D` });
@@ -4374,6 +4459,7 @@ var MessageRouter = class _MessageRouter {
         await this.sendToChat({ chatId, kind: "status", text: `\u627E\u4E0D\u5230\u4F1A\u8BDD ${ref}` });
         return;
       }
+      this.recycleProviderProcess(previousSession);
       const cwdUnresolved = !candidate.cwd;
       const attached = await attachProviderSessionToBridge({
         conversationStore: this.conversation,

package/package.json

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