@qduc/term2 0.13.0 → 0.15.0

package/dist/services/conversation/conversation-adapter-factory.js

@@ -1,7 +1,7 @@
 import { ConversationAdapter } from './conversation-adapter.js';
 import { createSessionQueuePersistence } from './queue-persistence.js';
 import { isTestEnvironment } from '../settings/settings-env.js';
-export function createConversationAdapterForRuntime(runtime, { deps, queueForeground }) {
+export function createConversationAdapterForRuntime(runtime, { deps, queueForeground, queueCapacity, preparedLeaseTtlMs, activeCancelTimeoutMs, discardOnFailure, }) {
     const { logger, settingsService, sessionContextService } = deps;
     return new ConversationAdapter({
         sessionId: runtime.sessionId,
@@ -17,6 +17,10 @@ export function createConversationAdapterForRuntime(runtime, { deps, queueForegr
         pendingInteraction: runtime.pendingInteraction,
         turnFlow: runtime.turns,
         queueForeground,
+        queueCapacity,
+        preparedLeaseTtlMs,
+        activeCancelTimeoutMs,
+        discardOnFailure,
         queuePersistence: queueForeground && !isTestEnvironment() ? createSessionQueuePersistence(runtime.sessionId) : undefined,
     });
 }

package/dist/services/conversation/conversation-adapter-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-adapter-factory.js","sourceRoot":"","sources":["../../../source/services/conversation/conversation-adapter-factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAWhE,MAAM,UAAU,mCAAmC,CACjD,OAAuB,EACvB,EAAE,IAAI,EAAE,eAAe,EAAoC;IAE3D,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,qBAAqB,EAAE,GAAG,IAAI,CAAC;IAChE,OAAO,IAAI,mBAAmB,CAAC;QAC7B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,SAAS,EAAE,OAAO,CAAC,gBAAgB;QACnC,iBAAiB,EAAE,OAAO,CAAC,KAAK,CAAC,aAAa;QAC9C,qBAAqB,EAAE,OAAO,CAAC,KAAK,CAAC,cAAc;QACnD,MAAM;QACN,eAAe;QACf,qBAAqB;QACrB,SAAS,EAAE,OAAO,CAAC,KAAK;QACxB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,QAAQ,EAAE,OAAO,CAAC,KAAK;QACvB,eAAe;QACf,gBAAgB,EACd,eAAe,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,6BAA6B,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;KACzG,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"conversation-adapter-factory.js","sourceRoot":"","sources":["../../../source/services/conversation/conversation-adapter-factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAehE,MAAM,UAAU,mCAAmC,CACjD,OAAuB,EACvB,EACE,IAAI,EACJ,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,qBAAqB,EACrB,gBAAgB,GACiB;IAEnC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,qBAAqB,EAAE,GAAG,IAAI,CAAC;IAChE,OAAO,IAAI,mBAAmB,CAAC;QAC7B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,SAAS,EAAE,OAAO,CAAC,gBAAgB;QACnC,iBAAiB,EAAE,OAAO,CAAC,KAAK,CAAC,aAAa;QAC9C,qBAAqB,EAAE,OAAO,CAAC,KAAK,CAAC,cAAc;QACnD,MAAM;QACN,eAAe;QACf,qBAAqB;QACrB,SAAS,EAAE,OAAO,CAAC,KAAK;QACxB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,QAAQ,EAAE,OAAO,CAAC,KAAK;QACvB,eAAe;QACf,aAAa;QACb,kBAAkB;QAClB,qBAAqB;QACrB,gBAAgB;QAChB,gBAAgB,EACd,eAAe,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,6BAA6B,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;KACzG,CAAC,CAAC;AACL,CAAC"}

package/dist/services/conversation/conversation-adapter.d.ts

@@ -1,19 +1,21 @@
 import type { ILoggingService, ISessionContextService, ISettingsService } from '../service-interfaces.js';
-import type { ConversationEvent } from './conversation-events.js';
+import type { ConversationEventSink } from './conversation-events.js';
 import type { CommandMessage } from '../../tools/types.js';
 import type { ConversationTerminal } from '../../contracts/conversation.js';
 import { type UserTurn } from '../../types/user-turn.js';
 import type { ProviderInputItem } from '../../contracts/provider-input.js';
-import type { SessionRuntime, SessionLogs, SessionApprovalQuery } from '../session/session-composition.js';
+import type { SessionRuntime, SessionLogs, SessionApprovalQuery } from '../../core/index.js';
 import type { SessionManager } from '../session/session-manager.js';
 import type { PendingInteractionState } from '../session/pending-interaction-state.js';
 import type { AskUserAnswerSink, SubagentEventSinkHost } from '../conversation-agent-client.js';
 import { type QueuePersistence } from '../queue/queue-controller.js';
 export type SendMessageOptions = {
+    /** Internal admission callback; called when a queued submission is accepted or rejected. */
+    onAdmission?: (error?: unknown) => void;
     onTextChunk?: (fullText: string, chunk: string) => void;
     onReasoningChunk?: (fullText: string, chunk: string) => void;
     onCommandMessage?: (message: CommandMessage) => void;
-    onEvent?: (event: ConversationEvent) => void;
+    onEvent?: ConversationEventSink;
     hallucinationRetryCount?: number;
     bypassInputSurgeGuard?: boolean;
     replayFromHistory?: boolean;
@@ -27,7 +29,7 @@ export type HandleApprovalDecisionOptions = {
     onTextChunk?: (fullText: string, chunk: string) => void;
     onReasoningChunk?: (fullText: string, chunk: string) => void;
     onCommandMessage?: (message: CommandMessage) => void;
-    onEvent?: (event: ConversationEvent) => void;
+    onEvent?: ConversationEventSink;
     approvalAnswer?: string;
     /**
      * End the turn once this decision's tool result is recorded, without giving
@@ -38,7 +40,7 @@ export type HandleApprovalDecisionOptions = {
 };
 export type TurnFlow = Pick<SessionRuntime['turns'], 'start' | 'continueAfterApproval'> & {
     continueAfterPostExecuteApproval?: SessionRuntime['turns']['continueAfterPostExecuteApproval'];
-    abort?: () => void;
+    abort?: () => void | Promise<void>;
     steer?: SessionRuntime['turns']['steer'];
     retractSteer?: SessionRuntime['turns']['retractSteer'];
     editSteer?: SessionRuntime['turns']['editSteer'];
@@ -75,7 +77,27 @@ export interface QueueStateSnapshot {
     readonly pauseReason?: 'failure' | 'manual' | 'recovered_interrupted';
 }
 export type QueueStateObserver = (snapshot: QueueStateSnapshot) => void;
-export type ConversationEventSink = (event: ConversationEvent) => void;
+export type { ConversationEventSink } from './conversation-events.js';
+export type PreparedMessageIds = {
+    readonly turnId: string;
+    readonly clientRequestId: string;
+};
+export type PreparedMessageResult = {
+    readonly kind: 'prepared';
+    readonly leaseId: string;
+    readonly turnId: string;
+} | {
+    readonly kind: 'rejected';
+    readonly reason: 'busy' | 'queue_full' | 'closed';
+};
+export type AbortDiscardResult = {
+    readonly discardedTurnIds: string[];
+    readonly proven: boolean;
+};
+export declare class AdmissionLeaseError extends Error {
+    readonly code: 'stale' | 'wrong_session' | 'already_settled' | 'closed';
+    constructor(code: AdmissionLeaseError['code']);
+}
 /**
  * Fired by the adapter when the queue has actually started executing a queued
  * message (i.e. after the in-flight turn finished and the next head is popped).
@@ -105,12 +127,15 @@ export declare class ConversationAdapter {
         logs: SessionLogs;
         approval: SessionApprovalQuery;
         /** Session-owned interaction projection; omitted by low-level legacy tests. */
-        pendingInteraction?: Pick<PendingInteractionState, 'present' | 'clear'>;
+        pendingInteraction?: Pick<PendingInteractionState, 'present' | 'clear' | 'getSnapshot'>;
         turnFlow: TurnFlow;
         queueForeground?: boolean;
         queueCapacity?: number;
         /** Test seam: bound how long cancel waits for a hung active turn. */
         activeCancelTimeoutMs?: number;
+        /** Gateway-only finite reservation policy; legacy callers retain Infinity. */
+        preparedLeaseTtlMs?: number;
+        discardOnFailure?: boolean;
         queuePersistence?: QueuePersistence<QueuedMessageSnapshot>;
     });
     setEventSink(sink: ConversationEventSink | null): void;
@@ -193,11 +218,18 @@ export declare class ConversationAdapter {
      * controller's display copy.
      */
     editSubmission(id: string, turn: UserTurn): Promise<SubmissionMutation>;
-    sendMessage(input: string | UserTurn, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount, bypassInputSurgeGuard, replayFromHistory, preferredMessageId, suppressUserMessageDisplay, busyMode, }?: SendMessageOptions): Promise<ConversationTerminal>;
+    sendMessage(input: string | UserTurn, { onAdmission, onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount, bypassInputSurgeGuard, replayFromHistory, preferredMessageId, suppressUserMessageDisplay, busyMode, }?: SendMessageOptions): Promise<ConversationTerminal>;
+    prepareMessage(input: string | UserTurn, ids: PreparedMessageIds): Promise<PreparedMessageResult>;
+    commitMessage(leaseId: string): Promise<void>;
+    cancelPreparedMessage(leaseId: string): Promise<void>;
+    abortAndDiscard(): Promise<AbortDiscardResult>;
+    closeAdmission(): string[];
+    reopenAdmission(): void;
+    preparedMessageCount(): number;
+    consumeFailureDiscardedTurnIds(): string[];
     resumeQueue(): Promise<void>;
     discardQueue(): Promise<void>;
     abort(): void;
     handleApprovalDecision(answer: string, rejectionReason?: string, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, approvalAnswer, stopAfterApprovalResolution, }?: HandleApprovalDecisionOptions): Promise<ConversationTerminal | null>;
 }
-export {};
 //# sourceMappingURL=conversation-adapter.d.ts.map

package/dist/services/conversation/conversation-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-adapter.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conversation-adapter.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-adapter.ts"],"names":[],"mappings":"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"}

package/dist/services/conversation/conversation-adapter.js

@@ -17,6 +17,14 @@ function delay(ms) {
         setTimeout(resolve, ms);
     });
 }
+export class AdmissionLeaseError extends Error {
+    code;
+    constructor(code) {
+        super('message admission lease rejected');
+        this.name = 'AdmissionLeaseError';
+        this.code = code;
+    }
+}
 export class ConversationAdapter {
     #sessionId;
     #startedAt;
@@ -48,12 +56,21 @@ export class ConversationAdapter {
     #cancellingRequestId = null;
     #cancellationEpoch = 0;
     #cancellation = Promise.resolve();
+    #cancellationProven = true;
+    #activeAbortCompletion = null;
     #approvalExecutionId = null;
     #approvalActionId = null;
     #postExecuteApproval = null;
     #queueStateObserver = null;
     #queuedTurnStartObserver = null;
     #activeCancelTimeoutMs;
+    #queueCapacity;
+    #preparedLeaseTtlMs;
+    #discardOnFailure;
+    #failureDiscardedTurnIds = [];
+    #preparedMessages = new Map();
+    #cancelledLeases = new Set();
+    #admissionClosed = false;
     constructor(deps) {
         this.#sessionId = deps.sessionId;
         this.#startedAt = deps.startedAt;
@@ -68,17 +85,20 @@ export class ConversationAdapter {
         this.#pendingInteraction = deps.pendingInteraction ?? null;
         this.#turnFlow = deps.turnFlow;
         this.#activeCancelTimeoutMs = deps.activeCancelTimeoutMs ?? ACTIVE_CANCEL_TIMEOUT_MS;
+        this.#queueCapacity = deps.queueCapacity ?? Infinity;
+        this.#preparedLeaseTtlMs = deps.preparedLeaseTtlMs ?? 10_000;
+        this.#discardOnFailure = deps.discardOnFailure === true;
         if (deps.queueForeground) {
             const driver = {
                 start: (execution) => this.#startQueuedTurn(execution),
                 cancel: async () => {
-                    // Prefer natural abort settlement, but never block queue cancel forever
-                    // if the underlying turn ignores abort.
-                    await Promise.race([
-                        this.#activeTurn.then(() => undefined, () => undefined),
-                        delay(this.#activeCancelTimeoutMs),
+                    // Prefer natural abort settlement, but report whether the bounded
+                    // barrier actually proved that the active execution stopped.
+                    const result = await Promise.race([
+                        (this.#activeAbortCompletion ?? this.#activeTurn).then(() => true, () => true),
+                        delay(this.#activeCancelTimeoutMs).then(() => false),
                     ]);
-                    return true;
+                    return result;
                 },
             };
             this.#queue = new QueueController({
@@ -311,7 +331,7 @@ export class ConversationAdapter {
             return { kind: 'too_late', stage: 'started' };
         return { kind: 'unknown_id' };
     }
-    async sendMessage(input, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount = 0, bypassInputSurgeGuard, replayFromHistory, preferredMessageId, suppressUserMessageDisplay, busyMode, } = {}) {
+    async sendMessage(input, { onAdmission, onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount = 0, bypassInputSurgeGuard, replayFromHistory, preferredMessageId, suppressUserMessageDisplay, busyMode, } = {}) {
         const queue = this.#queue;
         if (!queue) {
             return this.#executeMessage(input, {
@@ -322,8 +342,8 @@ export class ConversationAdapter {
                 hallucinationRetryCount,
                 bypassInputSurgeGuard,
                 replayFromHistory,
-            }).then((result) => {
-                this.#recordPendingInteraction(result);
+            }).then(async (result) => {
+                await this.#recordPendingInteraction(result);
                 return result;
             });
         }
@@ -354,19 +374,117 @@ export class ConversationAdapter {
             const controllerText = displayText.trim() ? displayText : QUEUED_NON_TEXT_PLACEHOLDER;
             void queue
                 .command({ kind: busyMode === 'steer' ? 'steer' : 'submit', id: requestId, text: controllerText })
-                .then((result) => {
+                .then(async (result) => {
                 if (result.kind !== 'accepted') {
                     const reason = result.kind === 'rejected' ? result.reason : result.kind;
-                    this.#settleFailure(requestId, new Error(`Foreground queue rejected message: ${reason}`));
+                    const error = new Error(`Foreground queue rejected message: ${reason}`);
+                    onAdmission?.(error);
+                    await this.#eventSink?.({ type: 'error', message: error.message, kind: 'admission_rejected' });
+                    this.#settleFailure(requestId, error);
+                }
+                else {
+                    onAdmission?.();
                 }
                 this.#notifyQueueState();
             })
                 .catch((error) => {
+                onAdmission?.(error);
                 this.#settleFailure(requestId, error);
                 this.#notifyQueueState();
             });
         });
     }
+    async prepareMessage(input, ids) {
+        const now = Date.now();
+        for (const [leaseId, prepared] of this.#preparedMessages) {
+            if (prepared.expiresAt <= now)
+                this.#preparedMessages.delete(leaseId);
+        }
+        if (this.#admissionClosed)
+            return { kind: 'rejected', reason: 'closed' };
+        if (!ids.turnId ||
+            !ids.clientRequestId ||
+            [...this.#preparedMessages.values()].some((prepared) => prepared.turnId === ids.turnId || prepared.clientRequestId === ids.clientRequestId)) {
+            return { kind: 'rejected', reason: 'busy' };
+        }
+        const state = this.#queue?.state();
+        if (!this.#queue && this.isQueueActive())
+            return { kind: 'rejected', reason: 'busy' };
+        if (state && state.queue.length + this.#preparedMessages.size >= this.#queueCapacity) {
+            return { kind: 'rejected', reason: 'queue_full' };
+        }
+        const leaseId = crypto.randomUUID();
+        this.#preparedMessages.set(leaseId, {
+            input: typeof input === 'string' ? input : structuredClone(input),
+            turnId: ids.turnId,
+            clientRequestId: ids.clientRequestId,
+            expiresAt: Date.now() + this.#preparedLeaseTtlMs,
+        });
+        return { kind: 'prepared', leaseId, turnId: ids.turnId };
+    }
+    async commitMessage(leaseId) {
+        if (this.#admissionClosed)
+            throw new AdmissionLeaseError('closed');
+        const prepared = this.#preparedMessages.get(leaseId);
+        if (!prepared)
+            throw new AdmissionLeaseError('stale');
+        if (prepared.expiresAt <= Date.now()) {
+            this.#preparedMessages.delete(leaseId);
+            throw new AdmissionLeaseError('stale');
+        }
+        this.#preparedMessages.delete(leaseId);
+        await new Promise((resolve, reject) => {
+            const terminal = this.sendMessage(prepared.input, {
+                preferredMessageId: prepared.turnId,
+                onAdmission: (error) => (error ? reject(error) : resolve()),
+            });
+            // The admission callback reports queue rejection; this handler prevents
+            // the later terminal rejection from becoming an unhandled promise.
+            terminal.then(() => undefined, () => undefined);
+        });
+    }
+    async cancelPreparedMessage(leaseId) {
+        if (this.#admissionClosed)
+            throw new AdmissionLeaseError('closed');
+        if (this.#cancelledLeases.has(leaseId))
+            return;
+        const prepared = this.#preparedMessages.get(leaseId);
+        if (!prepared)
+            throw new AdmissionLeaseError('stale');
+        this.#preparedMessages.delete(leaseId);
+        if (prepared.expiresAt <= Date.now())
+            throw new AdmissionLeaseError('stale');
+        this.#cancelledLeases.add(leaseId);
+    }
+    async abortAndDiscard() {
+        const discarded = [...this.#preparedMessages.values()].map((item) => item.turnId);
+        this.#preparedMessages.clear();
+        this.abort();
+        await this.#cancellation;
+        if (this.#queue) {
+            discarded.push(...this.#queue.state().queue.map((item) => item.id));
+            await this.discardQueue();
+        }
+        return { discardedTurnIds: [...new Set(discarded)], proven: this.#cancellationProven };
+    }
+    closeAdmission() {
+        this.#admissionClosed = true;
+        const discarded = [...this.#preparedMessages.values()].map((item) => item.turnId);
+        this.#preparedMessages.clear();
+        return discarded;
+    }
+    reopenAdmission() {
+        if (this.#cancellationProven)
+            this.#admissionClosed = false;
+    }
+    preparedMessageCount() {
+        return this.#preparedMessages.size;
+    }
+    consumeFailureDiscardedTurnIds() {
+        const discarded = [...new Set(this.#failureDiscardedTurnIds)];
+        this.#failureDiscardedTurnIds.length = 0;
+        return discarded;
+    }
     async resumeQueue() {
         if (!this.#queue)
             return;
@@ -400,30 +518,36 @@ export class ConversationAdapter {
         // requests stay pending — pause is not a terminal fate.
         const activeRequestId = this.#activeRequestId;
         this.#cancellingRequestId = activeRequestId;
-        this.#turnFlow.abort?.();
-        this.#cancellation = this.#queue.command({ kind: 'cancel' }).then(() => {
-            if (activeRequestId && this.#messagesById.has(activeRequestId)) {
+        this.#activeAbortCompletion = Promise.resolve(this.#turnFlow.abort?.());
+        this.#cancellationProven = true;
+        this.#cancellation = this.#queue.command({ kind: 'cancel' }).then((result) => {
+            this.#cancellationProven = result.kind !== 'rejected' || result.reason !== 'cancellation_unproven';
+            if (this.#cancellationProven && activeRequestId && this.#messagesById.has(activeRequestId)) {
                 this.#settleFailure(activeRequestId, queueCancellationError('Active turn was cancelled'));
             }
-            if (this.#activeRequestId === activeRequestId) {
+            if (this.#cancellationProven && this.#activeRequestId === activeRequestId) {
                 this.#activeRequestId = null;
             }
-            if (this.#cancellingRequestId === activeRequestId) {
+            if (this.#cancellationProven && this.#cancellingRequestId === activeRequestId) {
                 this.#cancellingRequestId = null;
             }
+            if (this.#cancellationProven)
+                this.#activeAbortCompletion = null;
             this.#notifyQueueState();
         });
     }
     #startQueuedTurn(execution) {
         // Notify the orchestrator/UI before kicking off the run so that the user
         // message can be appended to the message list with the correct timeline.
+        // Recovered items have no #messagesById entry; still fire so a delivered
+        // row cannot stay in the pending list after the queue has started it.
         const message = this.#messagesById.get(execution.snapshot.requestId);
-        if (message && this.#queuedTurnStartObserver) {
+        if (this.#queuedTurnStartObserver) {
             try {
                 this.#queuedTurnStartObserver({
                     requestId: execution.snapshot.requestId,
-                    input: message.input,
-                    suppressUserMessageDisplay: message.options.suppressUserMessageDisplay,
+                    input: message?.input ?? execution.item.text,
+                    suppressUserMessageDisplay: message?.options.suppressUserMessageDisplay,
                 });
             }
             catch (error) {
@@ -467,13 +591,13 @@ export class ConversationAdapter {
                     request: {}, // existing runtime doesn't expose typed tool request details
                 });
                 this.#notifyQueueState();
-                this.#recordPendingInteraction(result);
+                await this.#recordPendingInteraction(result);
                 this.#settleSuccess(execution.snapshot.requestId, result);
                 return;
             }
             await this.#queue.event({ kind: 'completed', executionId: execution.executionId, terminal: result });
             this.#notifyQueueState();
-            this.#recordPendingInteraction(result);
+            await this.#recordPendingInteraction(result);
             this.#settleSuccess(execution.snapshot.requestId, result);
         }
         catch (error) {
@@ -482,9 +606,37 @@ export class ConversationAdapter {
                 ? queueCancellationError('Active turn was cancelled')
                 : error;
             // Controller pauses with retained queue on failure when work remains.
-            await this.#queue.event({ kind: 'failed', executionId: execution.executionId, failure });
-            this.#notifyQueueState();
-            this.#settleFailure(execution.snapshot.requestId, failure);
+            try {
+                await this.#queue.event({ kind: 'failed', executionId: execution.executionId, failure });
+                if (this.#discardOnFailure) {
+                    this.#failureDiscardedTurnIds.push(...this.#queue.state().queue.map((item) => item.id));
+                    await this.discardQueue();
+                }
+                this.#notifyQueueState();
+            }
+            catch (queueError) {
+                this.#logger.error('Failed to settle queued turn failure state', {
+                    error: queueError instanceof Error ? queueError.message : String(queueError),
+                });
+            }
+            try {
+                await this.#eventSink?.({
+                    type: 'error',
+                    message: failure instanceof Error ? failure.message : String(failure),
+                    kind: 'turn_failed',
+                });
+            }
+            catch (eventError) {
+                // The failure event is itself critical at the gateway boundary. It
+                // must not prevent the owning submission from settling or leave
+                // #activeTurn as an unhandled rejection.
+                this.#logger.error('Failed to publish queued turn failure event', {
+                    error: eventError instanceof Error ? eventError.message : String(eventError),
+                });
+            }
+            finally {
+                this.#settleFailure(execution.snapshot.requestId, failure);
+            }
         }
     }
     #settleSuccess(requestId, terminal) {
@@ -519,14 +671,24 @@ export class ConversationAdapter {
         const turn = normalizeUserTurn(input);
         const cancellationEpoch = this.#cancellationEpoch;
         return this.#withTrafficContext(turn.text, async () => {
-            const wrappedOnEvent = (event) => {
+            const wrappedOnEvent = async (event) => {
+                if (event.type === 'approval_required') {
+                    // Install the authoritative session snapshot before any gateway/UI
+                    // sink sees the approval event. The runtime retains the private
+                    // interruption in SessionApprovalQuery; this public event carries
+                    // only its already-sanitized descriptor shape.
+                    this.#pendingInteraction?.present({
+                        ...event.approval,
+                        rawInterruption: null,
+                    });
+                }
+                await this.#eventSink?.(event);
                 this.#logs.dispatchEventToLog(event);
-                this.#eventSink?.(event);
-                onEvent?.(event);
+                await onEvent?.(event);
             };
-            this.#subagentEventSinkHost?.setSubagentEventSink(wrappedOnEvent);
             let result;
             try {
+                await this.#subagentEventSinkHost?.setSubagentEventSink(wrappedOnEvent);
                 const startOptions = { retries: { hallucinationRetryCount } };
                 if (bypassInputSurgeGuard !== undefined) {
                     startOptions.bypassInputSurgeGuard = bypassInputSurgeGuard;
@@ -551,7 +713,7 @@ export class ConversationAdapter {
             }
             finally {
                 this.#subagentEventSinkHost?.cancelSubagentRuns?.();
-                this.#subagentEventSinkHost?.setSubagentEventSink(null);
+                await this.#subagentEventSinkHost?.setSubagentEventSink(null);
             }
             if (result.type === 'response') {
                 this.#logger.debug('sendMessage returning response', {
@@ -638,14 +800,24 @@ export class ConversationAdapter {
                     return null;
             }
             const result = await this.#withTrafficContext(undefined, async () => {
-                const wrappedOnEvent = (event) => {
+                const wrappedOnEvent = async (event) => {
+                    if (event.type === 'approval_required') {
+                        // Install the authoritative session snapshot before any gateway/UI
+                        // sink sees the approval event. The runtime retains the private
+                        // interruption in SessionApprovalQuery; this public event carries
+                        // only its already-sanitized descriptor shape.
+                        this.#pendingInteraction?.present({
+                            ...event.approval,
+                            rawInterruption: null,
+                        });
+                    }
+                    await this.#eventSink?.(event);
                     this.#logs.dispatchEventToLog(event);
-                    this.#eventSink?.(event);
-                    onEvent?.(event);
+                    await onEvent?.(event);
                 };
-                this.#subagentEventSinkHost?.setSubagentEventSink(wrappedOnEvent);
                 let result;
                 try {
+                    await this.#subagentEventSinkHost?.setSubagentEventSink(wrappedOnEvent);
                     result = await this.#collectTerminalResult(postExecuteApproval
                         ? this.#turnFlow.continueAfterPostExecuteApproval()
                         : this.#turnFlow.continueAfterApproval({
@@ -669,7 +841,7 @@ export class ConversationAdapter {
                 }
                 finally {
                     this.#subagentEventSinkHost?.cancelSubagentRuns?.();
-                    this.#subagentEventSinkHost?.setSubagentEventSink(null);
+                    await this.#subagentEventSinkHost?.setSubagentEventSink(null);
                 }
                 if (result && result.type === 'response') {
                     this.#logger.debug('handleApprovalDecision returning response', {
@@ -705,7 +877,7 @@ export class ConversationAdapter {
                 }
             }
             if (result)
-                this.#recordPendingInteraction(result);
+                await this.#recordPendingInteraction(result);
             return result;
         }
         catch (error) {
@@ -719,9 +891,18 @@ export class ConversationAdapter {
             throw error;
         }
     }
-    #recordPendingInteraction(result) {
+    async #recordPendingInteraction(result) {
         if (result.type === 'approval_required') {
-            this.#pendingInteraction?.present(result.approval);
+            // The event bridge presents before publication. Keep a fallback for
+            // terminal/test paths that return an approval without emitting its event,
+            // but never replace an already-live snapshot (which would change its
+            // optimistic-concurrency ID).
+            if (!this.#pendingInteraction?.getSnapshot?.()) {
+                const safeApproval = { ...result.approval, rawInterruption: null };
+                this.#pendingInteraction?.present(safeApproval);
+                const approvalEvent = { type: 'approval_required', approval: safeApproval };
+                await this.#eventSink?.(approvalEvent);
+            }
         }
         else {
             this.#pendingInteraction?.clear();