@astralform/js 4.9.0 → 4.9.1

package/dist/index.cjs

@@ -1338,6 +1338,7 @@ function translateWireEvent(wire) {
 
 // src/session.ts
 var SSE_MAX_RECONNECTS = 6;
+var SSE_STALL_TIMEOUT_MS = 45e3;
 var TOOL_RESULT_MAX_RETRIES = 3;
 var CONVERSATION_PAGE_SIZE = 50;
 function sseReconnectDelayMs(attempt) {
@@ -1589,14 +1590,23 @@ var ChatSession = class {
   async consumeEventStream(jobId, conversationId, messageId, executeClientTools) {
     const signal = this.abortController?.signal;
     for (let attempt = 0; ; attempt++) {
-      const stream = this.client.streamJobEvents(jobId, this.lastSeq, signal);
+      if (signal?.aborted) return;
+      const attemptController = new AbortController();
+      const linkAbort = () => attemptController.abort();
+      signal?.addEventListener("abort", linkAbort);
       let sawTerminal;
       try {
+        const stream = this.client.streamJobEvents(
+          jobId,
+          this.lastSeq,
+          attemptController.signal
+        );
         sawTerminal = await this.pumpStream(
           stream,
           conversationId,
           messageId,
-          executeClientTools
+          executeClientTools,
+          () => attemptController.abort()
         );
       } catch (err) {
         if (signal?.aborted) return;
@@ -1606,6 +1616,8 @@ var ChatSession = class {
         if (attempt >= SSE_MAX_RECONNECTS) throw err;
         await this.sleepUnlessAborted(sseReconnectDelayMs(attempt + 1), signal);
         continue;
+      } finally {
+        signal?.removeEventListener("abort", linkAbort);
       }
       if (sawTerminal || signal?.aborted) return;
       if (attempt >= SSE_MAX_RECONNECTS) {
@@ -1618,35 +1630,66 @@ var ChatSession = class {
    * Consume a single SSE stream to exhaustion. Returns whether a terminal
    * event (``message_stop`` / ``error``) was seen, so the caller can decide
    * whether an ended stream means "turn done" vs "dropped, reconnect".
+   *
+   * ``onStall`` aborts the per-attempt connection: if no event arrives within
+   * SSE_STALL_TIMEOUT_MS (backend keepalives land every 15s), the stream is a
+   * zombie — ``reader.read()`` will never settle — so we kill the fetch and
+   * throw a ConnectionError, feeding the caller's reconnect-from-lastSeq loop.
    */
-  async pumpStream(stream, conversationId, messageId, executeClientTools) {
+  async pumpStream(stream, conversationId, messageId, executeClientTools, onStall) {
     let sawTerminal = false;
-    for await (const raw of stream) {
-      let parsed;
-      try {
-        const data = JSON.parse(raw.data);
-        if (typeof data !== "object" || data === null || typeof data.type !== "string") {
-          if (typeof data?.seq === "number") {
+    const iterator = stream[Symbol.asyncIterator]();
+    try {
+      while (true) {
+        const next = iterator.next();
+        let stallTimer;
+        const stall = new Promise((_, reject) => {
+          stallTimer = setTimeout(() => {
+            reject(
+              new ConnectionError(
+                `Stream stalled: no events for ${SSE_STALL_TIMEOUT_MS}ms`
+              )
+            );
+            onStall?.();
+          }, SSE_STALL_TIMEOUT_MS);
+        });
+        let result;
+        try {
+          result = await Promise.race([next, stall]);
+        } finally {
+          clearTimeout(stallTimer);
+        }
+        if (result.done) break;
+        const raw = result.value;
+        let parsed;
+        try {
+          const data = JSON.parse(raw.data);
+          if (typeof data !== "object" || data === null || typeof data.type !== "string") {
+            if (typeof data?.seq === "number") {
+              this.lastSeq = data.seq;
+            }
+            continue;
+          }
+          parsed = data;
+          if (typeof data.seq === "number") {
             this.lastSeq = data.seq;
           }
+        } catch {
           continue;
         }
-        parsed = data;
-        if (typeof data.seq === "number") {
-          this.lastSeq = data.seq;
+        if (parsed.type === "message_stop" || parsed.type === "error") {
+          sawTerminal = true;
         }
-      } catch {
-        continue;
-      }
-      if (parsed.type === "message_stop" || parsed.type === "error") {
-        sawTerminal = true;
+        await this.dispatchWireEvent(
+          parsed,
+          conversationId,
+          messageId,
+          executeClientTools
+        );
       }
-      await this.dispatchWireEvent(
-        parsed,
-        conversationId,
-        messageId,
-        executeClientTools
-      );
+    } finally {
+      void iterator.return?.(void 0).catch(() => {
+      });
     }
     return sawTerminal;
   }