@parall/agent-core 1.43.0 → 1.45.0

package/dist/gateway-base.js

@@ -4,7 +4,7 @@ import * as path from 'node:path';
 import { ApiError, MENTION_ALL_USER_ID } from '@parall/sdk';
 import { buildEventBody, buildEventBodyForForkResult, buildForkResultPrefix, buildForkScopePrefix, } from './event-format.js';
 import { buildErrorStepContent, } from './dispatch-adapter.js';
-import { consumeMessageWorkItem, consumeTypedDispatch, dispatchLaneGroup, } from './gateway-lane-flow.js';
+import { consumeMessageWorkItem, consumeTypedDispatch, dispatchLaneGroup, resolveDispatchByID, settleDrainedTypedGroup, typedLedgerEventIds, } from './gateway-lane-flow.js';
 import { LaneLedger } from './lane-ledger.js';
 import { routeTrigger } from './routing.js';
 import { clearDispatchMessageId, clearDispatchMetrics, clearDispatchNoReply, clearSessionMessageId, getDispatchMetrics, recordDeliverText, recordMessageSend, recordNoReply, recordToolCall, resetDispatchMetrics, setDispatchMessageId, setDispatchNoReply, setSessionChatId, setSessionMessageId, } from './session-state.js';
@@ -256,25 +256,28 @@ export class ParallAgentGateway {
                 // level claim/ack would consume or clear the wrong sibling.
                 await this.consumeTypedDispatch(data.dispatch_event_id
                     ? { dispatchEventId: data.dispatch_event_id }
-                    : { sourceType: 'task_activity', sourceId: data.id }, (dispatchEventId) => this.handleTaskAssignment(data, data.id, dispatchEventId), (dispatchEventId) => {
-                    if (dispatchEventId) {
-                        return this.ackDispatchEvent(dispatchEventId, () => {
+                    : { sourceType: 'task_activity', sourceId: data.id }, (dispatchEventId) => this.handleTaskAssignment(data, data.id, dispatchEventId), {
+                    legacyAck: (dispatchEventId) => {
+                        if (dispatchEventId) {
+                            return this.ackDispatchEvent(dispatchEventId, () => {
+                                this.dispatchedTasks.delete(`${data.id}:${data.updated_at}`);
+                            });
+                        }
+                        return this.opts.client
+                            .ackDispatch(this.opts.config.org_id, {
+                            source_type: 'task_activity',
+                            source_id: data.id,
+                        })
+                            .then(() => true, (err) => {
+                            // Same contract as ackDispatchEvent: a failed ack is a
+                            // failed consume (arms backoff) and must free the hot-path
+                            // dedupe so the re-drive isn't rejected by this pod forever.
                             this.dispatchedTasks.delete(`${data.id}:${data.updated_at}`);
+                            this.opts.log?.warn(`dispatch ack failed for task ${data.id}, releasing for re-drive: ${String(err)}`);
+                            return false;
                         });
-                    }
-                    return this.opts.client
-                        .ackDispatch(this.opts.config.org_id, {
-                        source_type: 'task_activity',
-                        source_id: data.id,
-                    })
-                        .then(() => true, (err) => {
-                        // Same contract as ackDispatchEvent: a failed ack is a
-                        // failed consume (arms backoff) and must free the hot-path
-                        // dedupe so the re-drive isn't rejected by this pod forever.
-                        this.dispatchedTasks.delete(`${data.id}:${data.updated_at}`);
-                        this.opts.log?.warn(`dispatch ack failed for task ${data.id}, releasing for re-drive: ${String(err)}`);
-                        return false;
-                    });
+                    },
+                    clearDedupe: () => this.dispatchedTasks.delete(`${data.id}:${data.updated_at}`),
                 });
             }
             catch (err) {
@@ -296,7 +299,10 @@ export class ParallAgentGateway {
                 if (!data.source_id || !data.task_id)
                     return;
                 try {
-                    await this.consumeTypedDispatch({ dispatchEventId: data.id }, () => this.handleTaskComment(data.source_id, data.task_id ?? '', data.actor_id, data.delivery_reason), () => this.ackDispatchEvent(data.id, () => this.clearTypedDispatchDedupe(data)));
+                    await this.consumeTypedDispatch({ dispatchEventId: data.id }, (dispatchEventId) => this.handleTaskComment(data.source_id, data.task_id ?? '', data.actor_id, data.delivery_reason, dispatchEventId), {
+                        legacyAck: () => this.ackDispatchEvent(data.id, () => this.clearTypedDispatchDedupe(data)),
+                        clearDedupe: () => this.clearTypedDispatchDedupe(data),
+                    });
                 }
                 catch (err) {
                     this.opts.log?.error(`task comment dispatch failed for ${data.source_id}: ${String(err)}`);
@@ -306,7 +312,10 @@ export class ParallAgentGateway {
                 if (!data.source_id)
                     return;
                 try {
-                    await this.consumeTypedDispatch({ dispatchEventId: data.id }, () => this.handleWikiComment(data.source_id, data.actor_id, data.delivery_reason), () => this.ackDispatchEvent(data.id, () => this.clearTypedDispatchDedupe(data)));
+                    await this.consumeTypedDispatch({ dispatchEventId: data.id }, (dispatchEventId) => this.handleWikiComment(data.source_id, data.actor_id, data.delivery_reason, dispatchEventId), {
+                        legacyAck: () => this.ackDispatchEvent(data.id, () => this.clearTypedDispatchDedupe(data)),
+                        clearDedupe: () => this.clearTypedDispatchDedupe(data),
+                    });
                 }
                 catch (err) {
                     this.opts.log?.error(`wiki comment dispatch failed for ${data.source_id}: ${String(err)}`);
@@ -319,7 +328,10 @@ export class ParallAgentGateway {
                     await this.consumeTypedDispatch({ dispatchEventId: data.id }, (dispatchEventId) => this.handleTaskDispatch(data.task_id ?? '', data.source_id ?? data.task_id ?? '', {
                         allowCreator: true,
                         dispatchEventId,
-                    }), () => this.ackDispatchEvent(data.id, () => this.clearTypedDispatchDedupe(data)));
+                    }), {
+                        legacyAck: () => this.ackDispatchEvent(data.id, () => this.clearTypedDispatchDedupe(data)),
+                        clearDedupe: () => this.clearTypedDispatchDedupe(data),
+                    });
                 }
                 catch (err) {
                     this.opts.log?.error(`task update dispatch failed for ${data.task_id}: ${String(err)}`);
@@ -329,7 +341,10 @@ export class ParallAgentGateway {
                 if (!data.source_id)
                     return;
                 try {
-                    await this.consumeTypedDispatch({ dispatchEventId: data.id }, () => this.fetchAndHandleScheduleFire(data.source_id, data.actor_id), () => this.ackDispatchEvent(data.id, () => this.clearTypedDispatchDedupe(data)));
+                    await this.consumeTypedDispatch({ dispatchEventId: data.id }, (dispatchEventId) => this.fetchAndHandleScheduleFire(data.source_id, data.actor_id, dispatchEventId), {
+                        legacyAck: () => this.ackDispatchEvent(data.id, () => this.clearTypedDispatchDedupe(data)),
+                        clearDedupe: () => this.clearTypedDispatchDedupe(data),
+                    });
                 }
                 catch (err) {
                     this.opts.log?.error(`schedule fire dispatch failed for ${data.source_id}: ${String(err)}`);
@@ -339,7 +354,10 @@ export class ParallAgentGateway {
                 if (!data.source_id)
                     return;
                 try {
-                    await this.consumeTypedDispatch({ dispatchEventId: data.id }, () => this.fetchAndHandleExternalTriggerRun(data.source_id), () => this.ackDispatchEvent(data.id, () => this.clearTypedDispatchDedupe(data)));
+                    await this.consumeTypedDispatch({ dispatchEventId: data.id }, (dispatchEventId) => this.fetchAndHandleExternalTriggerRun(data.source_id, dispatchEventId), {
+                        legacyAck: () => this.ackDispatchEvent(data.id, () => this.clearTypedDispatchDedupe(data)),
+                        clearDedupe: () => this.clearTypedDispatchDedupe(data),
+                    });
                 }
                 catch (err) {
                     this.opts.log?.error(`external trigger dispatch failed for ${data.source_id}: ${String(err)}`);
@@ -349,7 +367,10 @@ export class ParallAgentGateway {
                 if (!data.source_id)
                     return;
                 try {
-                    await this.consumeTypedDispatch({ dispatchEventId: data.id }, () => this.fetchAndHandleChannelMessage(data.source_id), () => this.ackDispatchEvent(data.id, () => this.clearTypedDispatchDedupe(data)));
+                    await this.consumeTypedDispatch({ dispatchEventId: data.id }, (dispatchEventId) => this.fetchAndHandleChannelMessage(data.source_id, dispatchEventId), {
+                        legacyAck: () => this.ackDispatchEvent(data.id, () => this.clearTypedDispatchDedupe(data)),
+                        clearDedupe: () => this.clearTypedDispatchDedupe(data),
+                    });
                 }
                 catch (err) {
                     this.opts.log?.error(`channel message dispatch failed for ${data.source_id}: ${String(err)}`);
@@ -359,7 +380,10 @@ export class ParallAgentGateway {
                 if (!data.source_id)
                     return;
                 try {
-                    await this.consumeTypedDispatch({ dispatchEventId: data.id }, () => this.fetchAndHandleApprovalDecided(data.source_id, data.actor_id, data.chat_id ?? null), () => this.ackDispatchEvent(data.id, () => this.clearTypedDispatchDedupe(data)));
+                    await this.consumeTypedDispatch({ dispatchEventId: data.id }, (dispatchEventId) => this.fetchAndHandleApprovalDecided(data.source_id, data.actor_id, data.chat_id ?? null, dispatchEventId), {
+                        legacyAck: () => this.ackDispatchEvent(data.id, () => this.clearTypedDispatchDedupe(data)),
+                        clearDedupe: () => this.clearTypedDispatchDedupe(data),
+                    });
                 }
                 catch (err) {
                     this.opts.log?.error(`approval decided dispatch failed for ${data.source_id}: ${String(err)}`);
@@ -410,6 +434,44 @@ export class ParallAgentGateway {
         this.dispatchedMessages.add(id);
         return true;
     }
+    /**
+     * Lane currently being dispatched per session — lets external activity
+     * signals renew exactly the caller's lane (renewing all lanes would keep
+     * an unrelated stalled fork's lane leased forever).
+     */
+    sessionActiveLanes = new Map();
+    noteSessionLane(sessionKey, laneKey) {
+        if (laneKey == null)
+            this.sessionActiveLanes.delete(sessionKey);
+        else
+            this.sessionActiveLanes.set(sessionKey, laneKey);
+    }
+    /**
+     * External runtime-activity signal for adapters whose tool activity does
+     * not flow through the RuntimeEvent stream (openclaw hooks call this from
+     * the tool-call lifecycle): renews the session's OWN active ledger lane so
+     * a long tool call cannot outlive the lease and get dethroned mid-turn.
+     * No-op without an active ledger lane for the session.
+     */
+    touchRuntimeActivity(sessionKey) {
+        if (this.ledgerDisabled)
+            return;
+        const laneKey = this.sessionActiveLanes.get(sessionKey);
+        if (laneKey)
+            this.laneLedger?.renewByKey(laneKey);
+    }
+    /** Sessions whose in-flight turn surfaced a runtime error event. */
+    turnErrorSessions = new Set();
+    /**
+     * Consume (read-and-clear) the error marker for sessionKey's last turn.
+     * Feeds complete's turn_outcome so an error turn's lane members are
+     * released for retry instead of no_action-swept (design §3). Consuming
+     * (rather than peeking) keeps one-shot fork session keys from accumulating
+     * in the set forever.
+     */
+    consumeTurnError(sessionKey) {
+        return this.turnErrorSessions.delete(sessionKey);
+    }
     async emitDispatchReceived(event) {
         const sourceType = event.ackSourceType ?? (event.type === 'task' ? 'task_activity' : 'message');
         const sourceId = event.ackSourceId ?? event.messageId;
@@ -418,6 +480,20 @@ export class ParallAgentGateway {
             source_id: sourceId,
         });
     }
+    /**
+     * Sticky: the server answered a by-id complete with 400 (predates the
+     * form). Typed resolution falls back to the legacy ack for the rest of
+     * the process lifetime.
+     */
+    typedByIdCompleteUnsupported = false;
+    // Typed-face ledger helpers live in gateway-lane-flow.ts; thin delegates
+    // keep the site code and tests on the class surface.
+    typedLedgerEventIds(events) {
+        return typedLedgerEventIds(this.laneFlowHost(), events);
+    }
+    resolveDispatchByID(dispatchEventId, lane) {
+        return resolveDispatchByID(this.laneFlowHost(), dispatchEventId, lane);
+    }
     /** True when this event's lifecycle is owned by the dispatch lane ledger. */
     usesLaneLedger(event) {
         return this.laneLedger != null && !this.ledgerDisabled && this.laneLedger.handles(event);
@@ -452,15 +528,16 @@ export class ParallAgentGateway {
     dispatchLaneGroup(opts) {
         return dispatchLaneGroup(this.laneFlowHost(), opts);
     }
-    consumeTypedDispatch(ref, run, ack) {
-        return consumeTypedDispatch(this.laneFlowHost(), ref, run, ack);
+    consumeTypedDispatch(ref, run, hooks) {
+        return consumeTypedDispatch(this.laneFlowHost(), ref, run, hooks);
     }
-    // Typed completion must wait until the administrative ack has either
-    // committed or failed. Errors stay best-effort: a failed ack leaves the row
-    // received, so Complete releases and re-drives it safely. The boolean
-    // outcome feeds the typed-consume backoff — an ack that failed must count
-    // as a failed consume, or an ack outage would clear the backoff entry and
-    // let the release re-drive spin at wire speed.
+    // Legacy administrative ack (ledger-disabled fallback only). Typed
+    // completion must wait until the ack has either committed or failed.
+    // Errors stay best-effort: a failed ack leaves the row received, so
+    // Complete releases and re-drives it safely. The boolean outcome feeds the
+    // typed-consume backoff — an ack that failed must count as a failed
+    // consume, or an ack outage would clear the backoff entry and let the
+    // release re-drive spin at wire speed.
     ackDispatchEvent(dispatchEventId, onFailure) {
         return this.opts.client.ackDispatchByID(this.opts.config.org_id, dispatchEventId).then(() => true, (err) => {
             // Complete will return the still-received item to pending and publish
@@ -471,6 +548,9 @@ export class ParallAgentGateway {
             return false;
         });
     }
+    // PARITY: this switch and gateway-lane-flow's clearTypedDedupeForEvent must
+    // handle the same typed source families — extend BOTH when adding a typed
+    // event type (same dedupe entries, keyed from different event shapes).
     clearTypedDispatchDedupe(item) {
         switch (item.event_type) {
             case 'task_assign':
@@ -814,6 +894,7 @@ export class ParallAgentGateway {
             this.pendingRestartNotification = null;
         }
         resetDispatchMetrics(sessionKey);
+        this.turnErrorSessions.delete(sessionKey);
         return runWithSessionKey(sessionKey, async () => {
             let dispatchSpan = null;
             setSessionChatId(sessionKey, event.targetId);
@@ -950,6 +1031,9 @@ export class ParallAgentGateway {
                         pendingSendCallIds.delete(runtimeEvent.callId)) {
                         recordMessageSend(sessionKey, !runtimeEvent.error);
                     }
+                    if (runtimeEvent.type === 'error') {
+                        this.turnErrorSessions.add(sessionKey);
+                    }
                     await this.createRuntimeStep(binding.agentSessionId, event, runtimeEvent, stepIdFilePath, contextFilePath, laneContextFilePath);
                 }
                 if (!binding) {
@@ -1122,7 +1206,12 @@ export class ParallAgentGateway {
                             body: buildForkScopePrefix(last) + buildEventBody(last),
                             earlier,
                             captureText: batchText,
-                            hasMoreLocal: () => fork.queue.length > 0,
+                            // Per-LANE residue check (parity with the main-buffer path):
+                            // the fork queue can hold several lanes (channel + thread of
+                            // the same chat). A whole-queue check would defer THIS lane's
+                            // complete behind another lane's items and never revisit it —
+                            // its members would sit received until lease expiry.
+                            hasMoreLocal: () => fork.queue.some((it) => this.dispatchGroupKey(it.event) === this.dispatchGroupKey(last)),
                         });
                         if (outcome === 'foreign') {
                             // Another pod owns the lane — the events stay pending server-side.
@@ -1130,10 +1219,32 @@ export class ParallAgentGateway {
                                 item.resolve(false);
                             break;
                         }
+                        if (outcome === 'failed') {
+                            // Error turn: complete(error) already released the members for
+                            // redelivery. Do NOT push them to processedEvents — the redrive
+                            // must not arrive wearing an "already handled" prefix. Keep
+                            // draining; the released work rejoins the next claim.
+                            for (const item of items)
+                                item.resolve(false);
+                            continue;
+                        }
                         dispatched = outcome === 'dispatched';
                     }
                     else {
                         dispatched = await this.runDispatch(last, fork.fork.sessionKey, buildForkScopePrefix(last) + buildEventBody(last), earlier, batchText);
+                        if (dispatched &&
+                            this.typedLedgerEventIds(events) &&
+                            this.consumeTurnError(fork.fork.sessionKey)) {
+                            // Typed error turn in a fork: report failure to the awaiting
+                            // typed consumes so the members release for a budgeted retry,
+                            // and do NOT record the events as handled — the redrive must
+                            // not arrive wearing an "already handled" prefix. Keep draining
+                            // (an error turn is not a shutdown).
+                            this.opts.log?.info(`typed fork turn for ${last.messageId} surfaced a runtime error — releasing for retry`);
+                            for (const item of items)
+                                item.resolve(false);
+                            continue;
+                        }
                     }
                     if (!dispatched) {
                         // Shutdown short-circuit — resolve un-acked so the server requeues
@@ -1168,6 +1279,10 @@ export class ParallAgentGateway {
             }
         }
         finally {
+            // One-shot fork keys are never dispatched again — drop any error marker
+            // the legacy (non-ledger) path left unconsumed, or the set grows with
+            // every failed ephemeral fork.
+            this.turnErrorSessions.delete(fork.fork.sessionKey);
             if (fork.deadlineTimer) {
                 clearTimeout(fork.deadlineTimer);
                 fork.deadlineTimer = null;
@@ -1295,18 +1410,32 @@ export class ParallAgentGateway {
                         this.dispatchState.pendingForkResults.unshift(...pendingFork);
                         continue;
                     }
+                    if (outcome === 'failed') {
+                        // Error turn settled with complete(error) — members released for
+                        // redelivery. The fork results were not consumed by the failed
+                        // turn; keep them for the next real dispatch.
+                        this.dispatchState.pendingForkResults.unshift(...pendingFork);
+                        continue;
+                    }
                     // Dispatched — resolution happened server-side (reply cover or
                     // no_action sweep); no legacy acks.
                     continue;
                 }
-                try {
-                    await this.emitDispatchReceived(event);
-                }
-                catch (err) {
-                    this.opts.log?.warn?.(`mark-received failed for buffered dispatch, leaving unacked for retry: ${String(err)}`);
-                    this.dispatchState.mainBuffer.unshift(...events);
-                    this.dispatchState.pendingForkResults.unshift(...pendingFork);
-                    break;
+                // Buffered typed events are the one wrapper-less dispatch path: their
+                // consumeTypedDispatch guard returned long ago (buffer-main resolves
+                // false) and released the claims, so THIS site owns their resolution.
+                // Message groups here are the ledger-disabled legacy flow.
+                const typedRefs = this.typedLedgerEventIds(events);
+                if (!typedRefs) {
+                    try {
+                        await this.emitDispatchReceived(event);
+                    }
+                    catch (err) {
+                        this.opts.log?.warn?.(`mark-received failed for buffered dispatch, leaving unacked for retry: ${String(err)}`);
+                        this.dispatchState.mainBuffer.unshift(...events);
+                        this.dispatchState.pendingForkResults.unshift(...pendingFork);
+                        break;
+                    }
                 }
                 const dispatched = await this.runDispatch(event, this.opts.runtimeKey, forkPrefix + buildEventBody(event), earlier);
                 if (!dispatched) {
@@ -1317,6 +1446,13 @@ export class ParallAgentGateway {
                     this.dispatchState.pendingForkResults.unshift(...pendingFork);
                     break;
                 }
+                if (typedRefs) {
+                    // Wrapper-less resolution of the buffered typed group — protocol
+                    // lives in gateway-lane-flow.ts. The turn-error marker is consumed
+                    // HERE, before this loop can start another turn on the session.
+                    await settleDrainedTypedGroup(this.laneFlowHost(), events, typedRefs, this.consumeTurnError(this.opts.runtimeKey));
+                    continue;
+                }
                 for (const bufferedEvent of events) {
                     const sourceType = bufferedEvent.ackSourceType ??
                         (bufferedEvent.type === 'task' ? 'task_activity' : 'message');
@@ -1397,21 +1533,36 @@ export class ParallAgentGateway {
                     }
                     return outcome === 'dispatched';
                 }
-                try {
-                    await this.emitDispatchReceived(event);
-                }
-                catch (err) {
-                    this.opts.log?.warn?.(`mark-received failed, leaving unacked for retry: ${String(err)}`);
-                    this.dispatchState.mainDispatching = false;
-                    this.dispatchState.mainCurrentTargetId = undefined;
-                    this.mainCurrentGroupKey = undefined;
-                    this.dispatchState.mainPreDispatchBranchPoint = undefined;
-                    this.dispatchState.pendingForkResults.unshift(...pendingFork);
-                    return false;
+                // Ledger-claimed typed events skip the legacy received write — the
+                // claim already marked the row received, and a second mark here would
+                // wipe its lease owner (the 0713 black-hole shape on the typed face).
+                const typedRefs = this.typedLedgerEventIds([event]);
+                if (!typedRefs) {
+                    try {
+                        await this.emitDispatchReceived(event);
+                    }
+                    catch (err) {
+                        this.opts.log?.warn?.(`mark-received failed, leaving unacked for retry: ${String(err)}`);
+                        this.dispatchState.mainDispatching = false;
+                        this.dispatchState.mainCurrentTargetId = undefined;
+                        this.mainCurrentGroupKey = undefined;
+                        this.dispatchState.mainPreDispatchBranchPoint = undefined;
+                        this.dispatchState.pendingForkResults.unshift(...pendingFork);
+                        return false;
+                    }
                 }
                 let dispatched = false;
                 try {
                     dispatched = await this.runDispatch(event, this.opts.runtimeKey, forkPrefix + buildEventBody(event));
+                    if (dispatched && typedRefs && this.consumeTurnError(this.opts.runtimeKey)) {
+                        // Typed error turn: report failure to the enclosing typed consume
+                        // so the member releases for a budgeted retry instead of being
+                        // terminally resolved (tech-debt: typed-dispatch-error-outcome).
+                        // Consumed HERE, before the finally's drain can start another
+                        // turn on this session and clear the marker.
+                        this.opts.log?.info(`typed dispatch turn for ${event.messageId} surfaced a runtime error — releasing for retry`);
+                        dispatched = false;
+                    }
                     if (!dispatched) {
                         // Shutdown short-circuit — restore the fork results so a future
                         // pod can replay them, and return false so handleMessage skips ack.
@@ -1438,9 +1589,16 @@ export class ParallAgentGateway {
                     // fold leaves the event buffered — the drain claims it as its own
                     // turn. Injection requires an exact lane match (same chat AND same
                     // thread) — a thread message never rides a channel turn.
+                    // The adapter-capability check comes BEFORE the fold: on a
+                    // buffer-only adapter (openclaw — no enqueueDuringDispatch) a
+                    // folded-but-never-injected member would be broad-covered by the
+                    // current turn's reply without the model ever seeing it. Leaving
+                    // the event un-folded keeps it buffered; the drain claims it as
+                    // its own turn and folds it there.
                     if (this.mainCurrentGroupKey === this.dispatchGroupKey(event) &&
+                        this.opts.dispatchAdapter.enqueueDuringDispatch != null &&
                         (await this.laneLedger?.steerLive(event)) &&
-                        (await this.opts.dispatchAdapter.enqueueDuringDispatch?.(this.opts.runtimeKey, buildEventBody(event)))) {
+                        (await this.opts.dispatchAdapter.enqueueDuringDispatch(this.opts.runtimeKey, buildEventBody(event)))) {
                         this.opts.log?.info(`steer folded+injected for ${event.messageId} (will drain for bookkeeping)`);
                     }
                 }
@@ -1474,13 +1632,21 @@ export class ParallAgentGateway {
                     this.dispatchState.mainBuffer.push(event);
                     return false;
                 }
-                try {
-                    await this.emitDispatchReceived(event);
-                }
-                catch (err) {
-                    this.opts.log?.warn?.(`mark-received failed for fork dispatch, leaving unacked for retry: ${String(err)}`);
-                    this.dispatchState.mainBuffer.push(event);
-                    return false;
+                // Ledger-managed events must never touch the legacy received surface
+                // — the fork's lane claim marks them received. A mark-received here
+                // outruns the claim, strands the row ownerless, and the chat goes
+                // silent (the 0713 black hole; dispatch-convergence-design.md §6).
+                // Same rule for ledger-claimed typed events: their dsp-lane claim
+                // owns received-ness, and a re-mark would wipe the lease owner.
+                if (!this.usesLaneLedger(event) && !this.typedLedgerEventIds([event])) {
+                    try {
+                        await this.emitDispatchReceived(event);
+                    }
+                    catch (err) {
+                        this.opts.log?.warn?.(`mark-received failed for fork dispatch, leaving unacked for retry: ${String(err)}`);
+                        this.dispatchState.mainBuffer.push(event);
+                        return false;
+                    }
                 }
                 const fork = await this.opts.dispatchAdapter.forkSession({
                     sessionKey: this.opts.runtimeKey,
@@ -1667,7 +1833,10 @@ export class ParallAgentGateway {
             return;
         await this.consumeTypedDispatch({ dispatchEventId: item.id }, (dispatchEventId) => this.handleTaskDispatch(item.task_id ?? '', item.source_id ?? item.task_id ?? '', {
             dispatchEventId,
-        }), (dispatchEventId) => this.ackDispatchEvent(dispatchEventId ?? item.id, () => this.clearTypedDispatchDedupe(item)));
+        }), {
+            legacyAck: (dispatchEventId) => this.ackDispatchEvent(dispatchEventId ?? item.id, () => this.clearTypedDispatchDedupe(item)),
+            clearDedupe: () => this.clearTypedDispatchDedupe(item),
+        });
     }
     consumeMessageWorkItem(item) {
         return consumeMessageWorkItem(this.laneFlowHost(), item);
@@ -1729,7 +1898,7 @@ export class ParallAgentGateway {
         }
         return this.handleTaskAssignment(task, ackSourceId, opts.dispatchEventId);
     }
-    async handleTaskComment(commentId, taskId, actorId, deliveryReason) {
+    async handleTaskComment(commentId, taskId, actorId, deliveryReason, dispatchEventId) {
         if (this.shuttingDown)
             return false; // drain window — let server requeue via catch-up
         const dedupeKey = `comment:${commentId}`;
@@ -1791,6 +1960,7 @@ export class ParallAgentGateway {
             deliveryReason: deliveryReason ?? undefined,
             ackSourceType: 'comment',
             ackSourceId: commentId,
+            dispatchEventId,
         };
         let dispatched;
         try {
@@ -1806,7 +1976,7 @@ export class ParallAgentGateway {
         }
         return dispatched;
     }
-    async handleWikiComment(commentId, actorId, deliveryReason) {
+    async handleWikiComment(commentId, actorId, deliveryReason, dispatchEventId) {
         if (this.shuttingDown)
             return false; // drain window — let server requeue via catch-up
         // Shares the comment dedupe namespace with handleTaskComment; comment IDs
@@ -1859,6 +2029,7 @@ export class ParallAgentGateway {
             replyTargetUri: comment.target_uri,
             ackSourceType: 'comment',
             ackSourceId: commentId,
+            dispatchEventId,
         };
         let dispatched;
         try {
@@ -1882,7 +2053,7 @@ export class ParallAgentGateway {
      * access to already-delivered run snapshots, and the runtime must not crash
      * or retry forever in that case.
      */
-    async fetchAndHandleScheduleFire(runId, actorId) {
+    async fetchAndHandleScheduleFire(runId, actorId, dispatchEventId) {
         let run = null;
         try {
             run = await this.opts.client.getScheduleRun(this.opts.config.org_id, runId);
@@ -1903,9 +2074,9 @@ export class ParallAgentGateway {
         }
         if (!run)
             return true;
-        return this.handleScheduleFire(run, actorId);
+        return this.handleScheduleFire(run, actorId, dispatchEventId);
     }
-    async handleScheduleFire(run, actorId) {
+    async handleScheduleFire(run, actorId, dispatchEventId) {
         if (this.shuttingDown)
             return false; // drain window — let server requeue via catch-up
         const dedupeKey = `schedule_run:${run.id}`;
@@ -1929,6 +2100,7 @@ export class ParallAgentGateway {
             attachedUri: run.fired_attached_uri ?? undefined,
             ackSourceType: 'schedule_run',
             ackSourceId: run.id,
+            dispatchEventId,
         };
         let dispatched;
         try {
@@ -1943,7 +2115,7 @@ export class ParallAgentGateway {
         }
         return dispatched;
     }
-    async fetchAndHandleExternalTriggerRun(runId) {
+    async fetchAndHandleExternalTriggerRun(runId, dispatchEventId) {
         let run = null;
         try {
             run = await this.opts.client.getExternalTriggerRun(this.opts.config.org_id, runId);
@@ -1959,14 +2131,14 @@ export class ParallAgentGateway {
         }
         if (!run)
             return true;
-        return this.handleExternalTriggerRun(run);
+        return this.handleExternalTriggerRun(run, dispatchEventId);
     }
     // fetchAndHandleChannelMessage resolves a channel_message dispatch to its
     // durable ChannelMessage + conversation and hands it to the inbound
     // pipeline. targetId = the ChannelConversation id, so per-conversation
     // multi-turn continuity rides the same per-target session mechanics as
     // chats. Design: docs/engineering-design/external-im-channel-design.md.
-    async fetchAndHandleChannelMessage(messageId) {
+    async fetchAndHandleChannelMessage(messageId, dispatchEventId) {
         if (this.shuttingDown)
             return false;
         // Capped dedupe (the chat-message path, not the unbounded task set): a busy
@@ -2040,6 +2212,7 @@ export class ParallAgentGateway {
             channelCliCapable: cliCapable,
             ackSourceType: 'channel_message',
             ackSourceId: msg.id,
+            dispatchEventId,
         };
         // Release the claim if the event isn't actually dispatched (or throws) so
         // a retry can re-attempt — same contract as the chat-message path.
@@ -2056,7 +2229,7 @@ export class ParallAgentGateway {
         }
         return dispatched;
     }
-    async handleExternalTriggerRun(run) {
+    async handleExternalTriggerRun(run, dispatchEventId) {
         if (this.shuttingDown)
             return false;
         const dedupeKey = `external_trigger_run:${run.id}`;
@@ -2084,6 +2257,7 @@ export class ParallAgentGateway {
             attachedUri,
             ackSourceType: 'external_trigger_run',
             ackSourceId: run.id,
+            dispatchEventId,
         };
         let dispatched;
         try {
@@ -2098,7 +2272,7 @@ export class ParallAgentGateway {
         }
         return dispatched;
     }
-    async fetchAndHandleApprovalDecided(approvalId, actorId, chatId) {
+    async fetchAndHandleApprovalDecided(approvalId, actorId, chatId, dispatchEventId) {
         let approval = null;
         try {
             approval = await this.opts.client.getApproval(approvalId);
@@ -2131,6 +2305,11 @@ export class ParallAgentGateway {
             senderName: 'approver',
             messageId: approval.id,
             body,
+            // The WorkItem's real source pair. Without it the legacy fallback
+            // guessed ('message', approval_id) — a pair no row matches.
+            ackSourceType: 'approval',
+            ackSourceId: approval.id,
+            dispatchEventId,
         };
         let dispatched;
         try {
@@ -2181,7 +2360,26 @@ export class ParallAgentGateway {
                     break;
                 if (overflowMode && processed >= CATCHUP_MAX) {
                     try {
-                        await this.opts.client.ackDispatchByID(this.opts.config.org_id, item.id);
+                        // Administrative drop of the overflow backlog (summarized to the
+                        // agent instead of dispatched). Ledger path: by-id complete —
+                        // closes the pending row and refuses (stale) one a live lane
+                        // owns; the legacy ack stays as the ledger-disabled / pre-by-id
+                        // fallback.
+                        if (this.laneLedger && !this.ledgerDisabled && !this.typedByIdCompleteUnsupported) {
+                            const outcome = await this.resolveDispatchByID(item.id);
+                            if (outcome === 'unsupported') {
+                                this.typedByIdCompleteUnsupported = true;
+                                await this.opts.client.ackDispatchByID(this.opts.config.org_id, item.id);
+                            }
+                            else if (outcome === 'failed') {
+                                throw new Error('by-id complete failed');
+                            }
+                            // 'stale' counts as skipped: a live lane owns the row and its
+                            // turn will resolve it — nothing left for catch-up to do.
+                        }
+                        else {
+                            await this.opts.client.ackDispatchByID(this.opts.config.org_id, item.id);
+                        }
                         skipped++;
                         const key = item.event_type;
                         skippedByType.set(key, (skippedByType.get(key) ?? 0) + 1);
@@ -2193,12 +2391,15 @@ export class ParallAgentGateway {
                 }
                 processed++;
                 try {
-                    const ackItem = () => this.ackDispatchEvent(item.id, () => this.clearTypedDispatchDedupe(item));
+                    const typedHooks = {
+                        legacyAck: () => this.ackDispatchEvent(item.id, () => this.clearTypedDispatchDedupe(item)),
+                        clearDedupe: () => this.clearTypedDispatchDedupe(item),
+                    };
                     if (item.event_type === 'task_assign' && item.task_id) {
                         try {
                             await this.consumeTypedDispatch({ dispatchEventId: item.id }, (dispatchEventId) => this.handleTaskDispatch(item.task_id ?? '', item.source_id ?? item.task_id ?? '', {
                                 dispatchEventId,
-                            }), ackItem);
+                            }), typedHooks);
                         }
                         catch (err) {
                             this.opts.log?.warn(`catch-up task fetch failed for ${item.task_id}, leaving pending: ${String(err)}`);
@@ -2210,7 +2411,7 @@ export class ParallAgentGateway {
                             await this.consumeTypedDispatch({ dispatchEventId: item.id }, (dispatchEventId) => this.handleTaskDispatch(item.task_id ?? '', item.source_id ?? item.task_id ?? '', {
                                 allowCreator: true,
                                 dispatchEventId,
-                            }), ackItem);
+                            }), typedHooks);
                         }
                         catch (err) {
                             this.opts.log?.warn(`catch-up task fetch failed for ${item.task_id}, leaving pending: ${String(err)}`);
@@ -2218,22 +2419,22 @@ export class ParallAgentGateway {
                         }
                     }
                     else if (item.event_type === 'task_comment' && item.source_id && item.task_id) {
-                        await this.consumeTypedDispatch({ dispatchEventId: item.id }, () => this.handleTaskComment(item.source_id, item.task_id ?? '', item.actor_id, item.delivery_reason), ackItem);
+                        await this.consumeTypedDispatch({ dispatchEventId: item.id }, (dispatchEventId) => this.handleTaskComment(item.source_id, item.task_id ?? '', item.actor_id, item.delivery_reason, dispatchEventId), typedHooks);
                     }
                     else if (item.event_type === 'wiki_comment' && item.source_id) {
-                        await this.consumeTypedDispatch({ dispatchEventId: item.id }, () => this.handleWikiComment(item.source_id, item.actor_id, item.delivery_reason), ackItem);
+                        await this.consumeTypedDispatch({ dispatchEventId: item.id }, (dispatchEventId) => this.handleWikiComment(item.source_id, item.actor_id, item.delivery_reason, dispatchEventId), typedHooks);
                     }
                     else if (item.event_type === 'schedule.fire' && item.source_id) {
-                        await this.consumeTypedDispatch({ dispatchEventId: item.id }, () => this.fetchAndHandleScheduleFire(item.source_id, item.actor_id), ackItem);
+                        await this.consumeTypedDispatch({ dispatchEventId: item.id }, (dispatchEventId) => this.fetchAndHandleScheduleFire(item.source_id, item.actor_id, dispatchEventId), typedHooks);
                     }
                     else if (item.event_type === 'external_trigger' && item.source_id) {
-                        await this.consumeTypedDispatch({ dispatchEventId: item.id }, () => this.fetchAndHandleExternalTriggerRun(item.source_id), ackItem);
+                        await this.consumeTypedDispatch({ dispatchEventId: item.id }, (dispatchEventId) => this.fetchAndHandleExternalTriggerRun(item.source_id, dispatchEventId), typedHooks);
                     }
                     else if (item.event_type === 'channel_message' && item.source_id) {
-                        await this.consumeTypedDispatch({ dispatchEventId: item.id }, () => this.fetchAndHandleChannelMessage(item.source_id), ackItem);
+                        await this.consumeTypedDispatch({ dispatchEventId: item.id }, (dispatchEventId) => this.fetchAndHandleChannelMessage(item.source_id, dispatchEventId), typedHooks);
                     }
                     else if (item.event_type === 'approval_decided' && item.source_id) {
-                        await this.consumeTypedDispatch({ dispatchEventId: item.id }, () => this.fetchAndHandleApprovalDecided(item.source_id, item.actor_id, item.chat_id ?? null), ackItem);
+                        await this.consumeTypedDispatch({ dispatchEventId: item.id }, (dispatchEventId) => this.fetchAndHandleApprovalDecided(item.source_id, item.actor_id, item.chat_id ?? null, dispatchEventId), typedHooks);
                     }
                     else if (item.event_type === 'message' && item.source_id && item.chat_id) {
                         await this.consumeMessageWorkItem({