@mulmobridge/chat-service 1.3.1 → 1.3.2

package/dist/relay.js

@@ -9,6 +9,7 @@
 import { EVENT_TYPES, resolveReplyTimeoutMs } from "@mulmobridge/protocol";
 import { createKeyedSerializer } from "./keyed-serializer.js";
 import { remainingReplyMs } from "./reply-deadline.js";
+import { startChatWhenIdle } from "./start-when-idle.js";
 // ── Factory ──────────────────────────────────────────────────
 export function createRelay(deps) {
     const serialize = createKeyedSerializer();
@@ -76,7 +77,8 @@ async function processRelayMessage(deps, params, budget) {
         logger.info("chat-service", "message expired before its turn started", { transportId, externalChatId });
         return { kind: "ok", reply: EXPIRED_BEFORE_START_REPLY };
     }
-    const result = await startChat({
+    const idleStartDeps = { startChat, onSessionEvent, remainingMs: () => remainingOf(budget, deps) };
+    const result = await startChatWhenIdle(idleStartDeps, {
         message: text,
         roleId: chatState.roleId,
         chatSessionId: chatState.sessionId,
@@ -86,18 +88,12 @@ async function processRelayMessage(deps, params, budget) {
         // we forward the whole bag untouched.
         bridgeOptions,
     });
+    if (result.kind === "expired") {
+        logger.info("chat-service", "message expired waiting for the session to finish", { transportId, externalChatId });
+        return { kind: "ok", reply: EXPIRED_BEFORE_START_REPLY };
+    }
     if (result.kind === "error") {
         const status = result.status ?? 500;
-        if (status === 409) {
-            // Session busy — tell the bridge to retry. Keep the HTTP
-            // response shape the old handler returned (status 409 on
-            // the HTTP side, "ok" reply text on the socket side — both
-            // layers decide how to serialise).
-            return {
-                kind: "ok",
-                reply: "A previous message is still being processed. Please wait.",
-            };
-        }
         logger.error("chat-service", "startChat failed", {
             transportId,
             externalChatId,

package/dist/start-when-idle.d.ts

@@ -0,0 +1,11 @@
+import type { OnSessionEventFn, StartChatFn, StartChatParams, StartChatResult } from "./types.js";
+export type IdleStartResult = StartChatResult | {
+    kind: "expired";
+};
+export interface IdleStartDeps {
+    startChat: StartChatFn;
+    onSessionEvent: OnSessionEventFn;
+    /** Milliseconds this message may still wait; 0 once its limit has passed. */
+    remainingMs: () => number;
+}
+export declare function startChatWhenIdle(deps: IdleStartDeps, params: StartChatParams): Promise<IdleStartResult>;

package/dist/start-when-idle.js

@@ -0,0 +1,52 @@
+// Start a bridge turn even when the session is still busy with an earlier run.
+//
+// A turn cut off at its reply limit leaves its agent running, so the next
+// turn's `startChat()` used to get 409 and the message was dropped with
+// "please wait" (#3320). Instead, wait for that run to finish — within the
+// message's own remaining time — and start then.
+import { EVENT_TYPES } from "@mulmobridge/protocol";
+// `startChat()` answers 409 before it saves or broadcasts anything, so trying again is safe.
+const isBusy = (result) => result.kind === "error" && result.status === 409;
+function waitForSessionFinished(onSessionEvent, sessionId, timeoutMs) {
+    const handles = {};
+    const finished = new Promise((resolve) => {
+        handles.settle = (value) => {
+            handles.done = true;
+            clearTimeout(handles.timer);
+            handles.unsubscribe?.();
+            resolve(value);
+        };
+    });
+    const settle = (value) => handles.settle?.(value);
+    handles.timer = setTimeout(() => settle(false), timeoutMs);
+    handles.unsubscribe = onSessionEvent(sessionId, (event) => {
+        if (event.type === EVENT_TYPES.sessionFinished)
+            settle(true);
+    });
+    // A listener fired during subscription settled before `unsubscribe` existed.
+    if (handles.done)
+        handles.unsubscribe();
+    // A cancelled wait still settles, so nothing is left pending behind it.
+    return { finished, cancel: () => settle(false) };
+}
+async function retryWhenFinished(deps, params) {
+    const remainingMs = deps.remainingMs();
+    if (remainingMs === 0)
+        return { kind: "expired" };
+    // Subscribe BEFORE trying again: a run that ends between the 409 and the
+    // subscription would otherwise never be seen, and this would wait out the limit.
+    const wait = waitForSessionFinished(deps.onSessionEvent, params.chatSessionId, remainingMs);
+    const retried = await deps.startChat(params).catch((err) => {
+        wait.cancel();
+        throw err;
+    });
+    if (!isBusy(retried)) {
+        wait.cancel();
+        return retried;
+    }
+    return (await wait.finished) ? retryWhenFinished(deps, params) : { kind: "expired" };
+}
+export async function startChatWhenIdle(deps, params) {
+    const first = await deps.startChat(params);
+    return isBusy(first) ? retryWhenFinished(deps, params) : first;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mulmobridge/chat-service",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Server-side chat service for MulmoBridge — socket.io + REST bridge to Claude Code agents",
   "type": "module",
   "main": "./dist/index.js",