@khorsheed/dsh-room 0.2.3 → 0.2.4

package/lib/types/dispatch.d.ts

@@ -138,7 +138,17 @@ export declare class DispatchEngine {
      * coordinator for plan work, else the dispatch's `replyTo`), at most once
      * per delivery. Public so a removal can settle the waits it breaks.
      */
+    /** Report-gate decisions per recipient, one at a time (see reportOutcome). */
+    private readonly gateQueues;
+    /**
+     * Gate one arrived report for the member waiting on it. Decisions for the
+     * same recipient run one at a time: a decision-model judgement takes a
+     * second or two, and a later report deciding meanwhile (the 「最后一个结果」
+     * rule) would hand over its batch without the one still being judged —
+     * which then got held behind a round that had already answered.
+     */
     reportOutcome(room: Session, dispatchSeq: number, deliveryId: string, fromId: string, outcome: string, text: string): Promise<void>;
+    private gateReport;
     /**
      * Mark the relays this run delivered as sent. Delivery = the member's own
      * session received the prompt (the followup accepted / the CLI run

package/lib/types/dispatch.js

@@ -451,7 +451,28 @@ export class DispatchEngine {
      * coordinator for plan work, else the dispatch's `replyTo`), at most once
      * per delivery. Public so a removal can settle the waits it breaks.
      */
+    /** Report-gate decisions per recipient, one at a time (see reportOutcome). */
+    gateQueues = new Map();
+    /**
+     * Gate one arrived report for the member waiting on it. Decisions for the
+     * same recipient run one at a time: a decision-model judgement takes a
+     * second or two, and a later report deciding meanwhile (the 「最后一个结果」
+     * rule) would hand over its batch without the one still being judged —
+     * which then got held behind a round that had already answered.
+     */
     async reportOutcome(room, dispatchSeq, deliveryId, fromId, outcome, text) {
+        const source = room.snapshotEvents().find(event => event.seq === dispatchSeq);
+        const key = `${room.id} ${source?.type === 'room/dispatch' ? source.data.replyTo ?? '' : ''}`;
+        const next = (this.gateQueues.get(key) ?? Promise.resolve())
+            .catch(() => { })
+            .then(() => this.gateReport(room, dispatchSeq, deliveryId, fromId, outcome, text));
+        this.gateQueues.set(key, next);
+        void next.then(() => { if (this.gateQueues.get(key) === next)
+            this.gateQueues.delete(key); }, () => { if (this.gateQueues.get(key) === next)
+            this.gateQueues.delete(key); });
+        return next;
+    }
+    async gateReport(room, dispatchSeq, deliveryId, fromId, outcome, text) {
         const events = room.snapshotEvents();
         const source = events.find(event => event.seq === dispatchSeq);
         if (source?.type !== 'room/dispatch' || (source.data.origin !== 'coordinator' && source.data.origin !== 'member') || source.data.replyTo === undefined)

package/lib/types/index.js

@@ -891,6 +891,12 @@ let RoomService = (() => {
             const loaded = await this.loadCold(request.sessionId);
             if (!loaded.ok)
                 return { ok: false, error: loaded.error };
+            // A held report's wake timer lives in the process that held it: after a
+            // restart nothing would ever hand it over. A cold room holding one is
+            // brought live, whose recovery hands every untimed hold over.
+            if (this.ctx.sessions.get(request.sessionId) === undefined && (loaded.state.deliveries ?? []).some(row => row.status === 'held')) {
+                void this.ensureLive(request.sessionId).catch((error) => { this.ctx.logger.warn(`room: reviving held reports failed: ${String(error)}`); });
+            }
             return { ok: true, value: { ...this.engine.view(request.sessionId, loaded.state), ...loaded.state.plan === undefined ? {} : { plan: this.plans.view(request.sessionId, loaded.state.plan) } } };
         }
         /**

package/package.json

@@ -7,7 +7,7 @@
     "cordis",
     "multi-agent"
   ],
-  "version": "0.2.3",
+  "version": "0.2.4",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
@@ -85,7 +85,7 @@
     "@deepseek-ai/dsh-tool-todo": "^0.1.0-rc.6 || ^0.2.0-rc.1 || ^0.2.1-rc.1",
     "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.2.0-rc.1 || ^0.2.1-rc.1",
     "@deepseek-ai/dsh-typert-protocol": "^0.1.0-rc.6 || ^0.2.0-rc.1 || ^0.2.1-rc.1",
-    "@khorsheed/dsh-local-agent": "^0.2.0",
+    "@khorsheed/dsh-local-agent": "^0.2.1",
     "react": "^18.2.0",
     "@deepseek-ai/dsh-client-ui-sidebar-right": "^0.1.0-rc.6 || ^0.2.0-rc.1 || ^0.2.1-rc.1"
   },