claude-codex-wechat 0.1.11 → 0.1.13

package/dist/server/cli.js

@@ -2686,6 +2686,18 @@ var CodexAppServerClient = class {
 };
 
 // src/providers/codex/codexInteractiveRunner.ts
+function readAgentMessageItemId(value) {
+  if (!value || typeof value !== "object") return void 0;
+  const record = value;
+  if (typeof record.itemId === "string" && record.itemId) return record.itemId;
+  if (typeof record.id === "string" && record.id) return record.id;
+  if (record.item && typeof record.item === "object") {
+    const item = record.item;
+    if (typeof item.id === "string" && item.id) return item.id;
+    if (typeof item.itemId === "string" && item.itemId) return item.itemId;
+  }
+  return void 0;
+}
 function readThreadId(value) {
   if (!value || typeof value !== "object") return void 0;
   const record = value;
@@ -2726,7 +2738,8 @@ var CodexInteractiveRunner = class {
       sessionName: input.options?.sessionName,
       cwd: input.cwd,
       status: "idle",
-      pendingText: []
+      pendingEvents: [],
+      turnClosed: false
     };
     this.sessions.set(input.bridgeSessionId, session);
     return session;
@@ -2735,8 +2748,10 @@ var CodexInteractiveRunner = class {
     const session = this.sessions.get(input.bridgeSessionId);
     if (!session) throw new Error(`codex_session_not_found:${input.bridgeSessionId}`);
     const client = await this.ensureClient(session);
-    session.pendingText = [];
+    session.pendingEvents = [];
+    session.activeMessage = void 0;
     session.activeTurnId = void 0;
+    session.turnClosed = false;
     session.turnCompletedPromise = new Promise((resolve2) => {
       session.turnCompletedResolver = resolve2;
     });
@@ -2776,6 +2791,11 @@ var CodexInteractiveRunner = class {
     });
     const maybeTurnId = readTurnId(response);
     if (maybeTurnId) session.activeTurnId = maybeTurnId;
+    for (; ; ) {
+      const event = await this.takeNextEvent(session);
+      if (!event) break;
+      yield event;
+    }
     await session.turnCompletedPromise;
     if (session.threadId) {
       await this.syncThreadForResume({
@@ -2784,9 +2804,6 @@ var CodexInteractiveRunner = class {
         cwd: session.cwd
       });
     }
-    for (const text of session.pendingText) {
-      yield { type: "text_delta", text };
-    }
     yield {
       type: "session_state",
       state: {
@@ -2797,7 +2814,6 @@ var CodexInteractiveRunner = class {
         status: "idle"
       }
     };
-    yield { type: "message_done" };
   }
   async stopSession(bridgeSessionId) {
     const session = this.sessions.get(bridgeSessionId);
@@ -2813,6 +2829,10 @@ var CodexInteractiveRunner = class {
         turnId: session.activeTurnId
       }).catch(() => void 0);
     }
+    this.flushActiveMessage(session);
+    session.turnClosed = true;
+    session.eventResolver?.();
+    session.eventResolver = void 0;
     session.turnCompletedResolver?.();
     session.turnCompletedResolver = void 0;
   }
@@ -2834,13 +2854,24 @@ var CodexInteractiveRunner = class {
     await client.initialize();
     client.onNotification("item/agentMessage/delta", (params) => {
       const record = params;
-      if (typeof record.delta === "string" && record.delta) session.pendingText.push(record.delta);
+      if (typeof record.delta !== "string" || !record.delta) return;
+      const itemId = readAgentMessageItemId(record) ?? `fallback-${session.pendingEvents.length}`;
+      if (session.activeMessage?.itemId === itemId) {
+        session.activeMessage.text += record.delta;
+        return;
+      }
+      this.flushActiveMessage(session);
+      session.activeMessage = { itemId, text: record.delta };
     });
     client.onNotification("turn/started", (params) => {
       const turnId = readTurnId(params);
       if (turnId) session.activeTurnId = turnId;
     });
     client.onNotification("turn/completed", () => {
+      this.flushActiveMessage(session);
+      session.turnClosed = true;
+      session.eventResolver?.();
+      session.eventResolver = void 0;
       session.turnCompletedResolver?.();
       session.turnCompletedResolver = void 0;
     });
@@ -2853,6 +2884,27 @@ var CodexInteractiveRunner = class {
     session.client = client;
     return client;
   }
+  flushActiveMessage(session) {
+    if (!session.activeMessage?.text) return;
+    this.enqueueEvent(session, { type: "text_delta", text: session.activeMessage.text });
+    this.enqueueEvent(session, { type: "message_done" });
+    session.activeMessage = void 0;
+  }
+  enqueueEvent(session, event) {
+    session.pendingEvents.push(event);
+    session.eventResolver?.();
+    session.eventResolver = void 0;
+  }
+  async takeNextEvent(session) {
+    for (; ; ) {
+      const next = session.pendingEvents.shift();
+      if (next) return next;
+      if (session.turnClosed) return null;
+      await new Promise((resolve2) => {
+        session.eventResolver = resolve2;
+      });
+    }
+  }
 };
 
 // src/providers/codex/codexProvider.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-codex-wechat",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "private": false,
   "type": "module",
   "bin": {