claude-codex-wechat 0.1.37 → 0.1.39

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

@@ -3452,6 +3452,34 @@ var CodexAppServerClient = class {
 };
 
 // src/providers/codex/codexInteractiveRunner.ts
+var IDLE_SENTINEL2 = /* @__PURE__ */ Symbol("idle_timeout");
+function withIdleTimeout(promise, ms) {
+  if (!ms || ms <= 0) return promise;
+  return new Promise((resolve2, reject) => {
+    let settled = false;
+    const timer = setTimeout(() => {
+      if (!settled) {
+        settled = true;
+        resolve2(IDLE_SENTINEL2);
+      }
+    }, ms);
+    timer.unref?.();
+    void promise.then(
+      (value) => {
+        if (settled) return;
+        settled = true;
+        clearTimeout(timer);
+        resolve2(value);
+      },
+      (error) => {
+        if (settled) return;
+        settled = true;
+        clearTimeout(timer);
+        reject(error);
+      }
+    );
+  });
+}
 function readAgentMessageItemId(value) {
   if (!value || typeof value !== "object") return void 0;
   const record = value;
@@ -3491,9 +3519,11 @@ var CodexInteractiveRunner = class {
   sessions = /* @__PURE__ */ new Map();
   command;
   syncThreadForResume;
+  idleTimeoutMs;
   constructor(input = {}) {
     this.command = input.command;
     this.syncThreadForResume = input.syncThreadForResume ?? syncCodexThreadForResume;
+    this.idleTimeoutMs = input.idleTimeoutMs ?? 18e4;
   }
   async startSession(input) {
     const session = {
@@ -3513,7 +3543,11 @@ var CodexInteractiveRunner = class {
   async *sendMessage(input) {
     const session = this.sessions.get(input.bridgeSessionId);
     if (!session) throw new Error(`codex_session_not_found:${input.bridgeSessionId}`);
-    const client = await this.ensureClient(session);
+    const client = await this.requireLiveClient(session);
+    if (!client) {
+      yield { type: "error", error: "idle_timeout", code: "idle_timeout" };
+      return;
+    }
     session.pendingEvents = [];
     session.activeMessage = void 0;
     session.activeTurnId = void 0;
@@ -3522,20 +3556,30 @@ var CodexInteractiveRunner = class {
       session.turnCompletedResolver = resolve2;
     });
     if (session.threadId) {
-      await client.request("thread/resume", {
+      const resumed = await withIdleTimeout(client.request("thread/resume", {
         threadId: session.threadId,
         cwd: session.cwd,
         persistExtendedHistory: true
-      }).catch(() => void 0);
+      }).catch(() => void 0), this.idleTimeoutMs);
+      if (resumed === IDLE_SENTINEL2) {
+        await this.handleIdleTimeout(session);
+        yield { type: "error", error: "idle_timeout", code: "idle_timeout" };
+        return;
+      }
     } else {
-      const started = await client.request("thread/start", {
+      const started = await withIdleTimeout(client.request("thread/start", {
         cwd: session.cwd,
         threadSource: "user",
         persistExtendedHistory: true,
         experimentalRawEvents: true,
         sandboxPolicy: { type: "disabled" },
         approvalMode: "never"
-      });
+      }), this.idleTimeoutMs);
+      if (started === IDLE_SENTINEL2) {
+        await this.handleIdleTimeout(session);
+        yield { type: "error", error: "idle_timeout", code: "idle_timeout" };
+        return;
+      }
       session.threadId = readThreadId(started);
       session.providerSessionId = session.threadId;
       if (!session.threadId) throw new Error("codex_app_server_missing_thread_id");
@@ -3550,15 +3594,27 @@ var CodexInteractiveRunner = class {
         }
       };
     }
-    const response = await client.request("turn/start", {
+    const response = await withIdleTimeout(client.request("turn/start", {
       threadId: session.threadId,
       cwd: session.cwd,
       input: [{ type: "text", text: input.text }]
-    });
+    }), this.idleTimeoutMs);
+    if (response === IDLE_SENTINEL2) {
+      await this.handleIdleTimeout(session);
+      while (session.pendingEvents.length > 0) yield session.pendingEvents.shift();
+      yield { type: "error", error: "idle_timeout", code: "idle_timeout" };
+      return;
+    }
     const maybeTurnId = readTurnId(response);
     if (maybeTurnId) session.activeTurnId = maybeTurnId;
     for (; ; ) {
-      const event = await this.takeNextEvent(session);
+      const event = await withIdleTimeout(this.takeNextEvent(session), this.idleTimeoutMs);
+      if (event === IDLE_SENTINEL2) {
+        await this.handleIdleTimeout(session);
+        while (session.pendingEvents.length > 0) yield session.pendingEvents.shift();
+        yield { type: "error", error: "idle_timeout", code: "idle_timeout" };
+        return;
+      }
       if (!event) break;
       yield event;
     }
@@ -3617,7 +3673,14 @@ var CodexInteractiveRunner = class {
       command: this.command,
       cwd: session.cwd
     });
-    await client.initialize();
+    session.client = client;
+    try {
+      await client.initialize();
+    } catch (error) {
+      session.client = void 0;
+      await client.dispose().catch(() => void 0);
+      throw error;
+    }
     client.onNotification("item/agentMessage/delta", (params) => {
       const record = params;
       if (typeof record.delta !== "string" || !record.delta) return;
@@ -3647,9 +3710,27 @@ var CodexInteractiveRunner = class {
     client.onRequest("item/fileChange/requestApproval", async (_id, params) => {
       return { decision: "approve" };
     });
-    session.client = client;
     return client;
   }
+  async requireLiveClient(session) {
+    const client = await withIdleTimeout(this.ensureClient(session), this.idleTimeoutMs);
+    if (client === IDLE_SENTINEL2) {
+      await this.handleIdleTimeout(session);
+      return null;
+    }
+    return client;
+  }
+  async handleIdleTimeout(session) {
+    this.flushActiveMessage(session);
+    session.turnClosed = true;
+    session.eventResolver?.();
+    session.eventResolver = void 0;
+    session.turnCompletedResolver?.();
+    session.turnCompletedResolver = void 0;
+    const client = session.client;
+    session.client = void 0;
+    await client?.dispose().catch(() => void 0);
+  }
   flushActiveMessage(session) {
     if (!session.activeMessage?.text) return;
     this.enqueueEvent(session, { type: "text_delta", text: session.activeMessage.text });
@@ -3735,7 +3816,12 @@ function createDefaultProviders(input = {}) {
   });
   return [
     new ClaudeCodeProvider({ runner: claudeRunner }),
-    new CodexProvider({ runner: new CodexInteractiveRunner({ command: input.codexCommand }) })
+    new CodexProvider({
+      runner: new CodexInteractiveRunner({
+        command: input.codexCommand,
+        idleTimeoutMs: readEnvInt(process.env.BRIDGE_CODEX_IDLE_TIMEOUT_MS, 18e4)
+      })
+    })
   ];
 }
 

package/package.json

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