@qduc/term2 0.9.4 → 0.10.1

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

@@ -1,5 +1,7 @@
 import { ConversationAdapter } from './conversation-adapter.js';
-export function createConversationAdapterForRuntime(runtime, { deps }) {
+import { createSessionQueuePersistence } from './queue-persistence.js';
+import { isTestEnvironment } from '../settings/settings-env.js';
+export function createConversationAdapterForRuntime(runtime, { deps, queueForeground }) {
     const { logger, settingsService, sessionContextService } = deps;
     return new ConversationAdapter({
         sessionId: runtime.sessionId,
@@ -13,6 +15,8 @@ export function createConversationAdapterForRuntime(runtime, { deps }) {
         logs: runtime.logs,
         approval: runtime.approval,
         turnFlow: runtime.turns,
+        queueForeground,
+        queuePersistence: queueForeground && !isTestEnvironment() ? createSessionQueuePersistence(runtime.sessionId) : undefined,
     });
 }
 //# sourceMappingURL=conversation-adapter-factory.js.map

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;AAUhE,MAAM,UAAU,mCAAmC,CACjD,OAAuB,EACvB,EAAE,IAAI,EAAoC;IAE1C,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,QAAQ,EAAE,OAAO,CAAC,KAAK;KACxB,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;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,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"}

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

@@ -6,6 +6,7 @@ import { type UserTurn } from '../../types/user-turn.js';
 import type { SessionRuntime, SessionLogs, SessionApprovalQuery } from '../session/session-composition.js';
 import type { SessionManager } from '../session/session-manager.js';
 import type { AskUserAnswerSink, SubagentEventSinkHost } from '../conversation-agent-client.js';
+import { type QueuePersistence } from '../queue/queue-controller.js';
 export type SendMessageOptions = {
     onTextChunk?: (fullText: string, chunk: string) => void;
     onReasoningChunk?: (fullText: string, chunk: string) => void;
@@ -14,6 +15,7 @@ export type SendMessageOptions = {
     hallucinationRetryCount?: number;
     bypassInputSurgeGuard?: boolean;
     replayFromHistory?: boolean;
+    preferredMessageId?: string;
 };
 export type HandleApprovalDecisionOptions = {
     onTextChunk?: (fullText: string, chunk: string) => void;
@@ -22,8 +24,35 @@ export type HandleApprovalDecisionOptions = {
     onEvent?: (event: ConversationEvent) => void;
     approvalAnswer?: string;
 };
-export type TurnFlow = Pick<SessionRuntime['turns'], 'start' | 'continueAfterApproval'>;
+export type TurnFlow = Pick<SessionRuntime['turns'], 'start' | 'continueAfterApproval'> & {
+    abort?: () => void;
+};
+type QueuedMessageSnapshot = {
+    readonly requestId: string;
+    readonly recovered?: boolean;
+};
+export type QueueStateKind = 'idle' | 'running' | 'awaiting_active_action' | 'cancelling' | 'completing' | 'paused' | 'awaiting_preflight';
+export interface QueueStateSnapshot {
+    readonly queueLength: number;
+    readonly stateKind: QueueStateKind;
+    readonly pauseReason?: 'failure' | 'manual' | 'recovered_interrupted';
+}
+export type QueueStateObserver = (snapshot: QueueStateSnapshot) => void;
 export type ConversationEventSink = (event: ConversationEvent) => void;
+/**
+ * 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).
+ * The receiver can use this to surface the message in the UI (e.g. append it
+ * to the message list at the correct timeline position).
+ *
+ * `requestId` is the internal id assigned by the adapter in sendMessage().
+ * `input` is the original turn so callers can render the full content,
+ * including images and skill attachments.
+ */
+export type QueuedTurnStartObserver = (execution: {
+    readonly requestId: string;
+    readonly input: string | UserTurn;
+}) => void;
 export declare class ConversationAdapter {
     #private;
     constructor(deps: {
@@ -38,9 +67,30 @@ export declare class ConversationAdapter {
         logs: SessionLogs;
         approval: SessionApprovalQuery;
         turnFlow: TurnFlow;
+        queueForeground?: boolean;
+        queuePersistence?: QueuePersistence<QueuedMessageSnapshot>;
     });
     setEventSink(sink: ConversationEventSink | null): void;
-    sendMessage(input: string | UserTurn, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount, bypassInputSurgeGuard, replayFromHistory, }?: SendMessageOptions): Promise<ConversationTerminal>;
+    setQueueStateObserver(observer: QueueStateObserver | null): void;
+    setQueuedTurnStartObserver(observer: QueuedTurnStartObserver | null): void;
+    isQueueActive(): boolean;
+    sendMessage(input: string | UserTurn, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount, bypassInputSurgeGuard, replayFromHistory, preferredMessageId, }?: SendMessageOptions): Promise<ConversationTerminal>;
+    resumeQueue(): Promise<void>;
+    discardQueue(): Promise<void>;
+    /**
+     * Remove the last (most recently queued) item from the queue and return its
+     * text so the caller can move it back to the input box. Returns null when
+     * the queue is empty, the adapter has no queue (pass-through mode), or the
+     * underlying controller rejects the removal.
+     *
+     * Also pops the matching pending message from the internal pending list so
+     * the queue/pending state observers fire consistently.
+     */
+    removeLastQueuedItem(): Promise<{
+        text: string;
+    } | null>;
+    abort(): void;
     handleApprovalDecision(answer: string, rejectionReason?: string, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, approvalAnswer }?: 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

@@ -1,6 +1,7 @@
 import { collectTerminalResult } from '../session/terminal-result-collector.js';
 import { getCallIdFromObject } from '../interruption-info.js';
 import { normalizeUserTurn } from '../../types/user-turn.js';
+import { QueueController, } from '../queue/queue-controller.js';
 export class ConversationAdapter {
     #sessionId;
     #startedAt;
@@ -14,6 +15,17 @@ export class ConversationAdapter {
     #logs;
     #approval;
     #turnFlow;
+    #pendingMessages = [];
+    #messagesById = new Map();
+    #queue;
+    #nextQueuedMessageId = 1;
+    #nextActionId = 1;
+    #activeTurn = Promise.resolve();
+    #cancellation = Promise.resolve();
+    #approvalExecutionId = null;
+    #approvalActionId = null;
+    #queueStateObserver = null;
+    #queuedTurnStartObserver = null;
     constructor(deps) {
         this.#sessionId = deps.sessionId;
         this.#startedAt = deps.startedAt;
@@ -26,10 +38,62 @@ export class ConversationAdapter {
         this.#logs = deps.logs;
         this.#approval = deps.approval;
         this.#turnFlow = deps.turnFlow;
+        if (deps.queueForeground) {
+            const driver = {
+                start: (execution) => this.#startQueuedTurn(execution),
+                cancel: async () => {
+                    await this.#activeTurn;
+                },
+            };
+            this.#queue = new QueueController({
+                driver,
+                snapshotFactory: (item) => {
+                    if (Date.parse(item.submittedAt) < Date.parse(this.#startedAt)) {
+                        return { requestId: `recovered:${item.id}`, recovered: true };
+                    }
+                    const pending = this.#pendingMessages.shift();
+                    return pending ? { requestId: pending.requestId } : { requestId: `recovered:${item.id}`, recovered: true };
+                },
+                persistence: deps.queuePersistence,
+            });
+        }
+        else {
+            this.#queue = null;
+        }
     }
     setEventSink(sink) {
         this.#eventSink = sink;
     }
+    setQueueStateObserver(observer) {
+        this.#queueStateObserver = observer;
+        // Immediately notify with current state
+        this.#notifyQueueState();
+    }
+    setQueuedTurnStartObserver(observer) {
+        this.#queuedTurnStartObserver = observer;
+    }
+    isQueueActive() {
+        if (!this.#queue) {
+            // Without a queue, the adapter is a pass-through. Treat the adapter as
+            // active only while the run-as-foreground path is in flight.
+            return false;
+        }
+        const state = this.#queue.state();
+        return (state.kind === 'running' ||
+            state.kind === 'awaiting_active_action' ||
+            state.kind === 'cancelling' ||
+            state.kind === 'completing');
+    }
+    #notifyQueueState() {
+        if (!this.#queue || !this.#queueStateObserver)
+            return;
+        const state = this.#queue.state();
+        this.#queueStateObserver({
+            queueLength: state.queue.length,
+            stateKind: state.kind,
+            pauseReason: 'reason' in state ? state.reason : undefined,
+        });
+    }
     #getTrafficMode() {
         if (!this.#settingsService)
             return 'standard';
@@ -56,7 +120,146 @@ export class ConversationAdapter {
             firstUserMessagePreview,
         }, fn);
     }
-    async sendMessage(input, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount = 0, bypassInputSurgeGuard, replayFromHistory, } = {}) {
+    async sendMessage(input, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount = 0, bypassInputSurgeGuard, replayFromHistory, preferredMessageId, } = {}) {
+        const queue = this.#queue;
+        if (!queue) {
+            return this.#executeMessage(input, {
+                onTextChunk,
+                onReasoningChunk,
+                onCommandMessage,
+                onEvent,
+                hallucinationRetryCount,
+                bypassInputSurgeGuard,
+                replayFromHistory,
+            });
+        }
+        return new Promise((resolve, reject) => {
+            const requestId = preferredMessageId ?? String(this.#nextQueuedMessageId++);
+            const message = {
+                input,
+                options: {
+                    onTextChunk,
+                    onReasoningChunk,
+                    onCommandMessage,
+                    onEvent,
+                    hallucinationRetryCount,
+                    bypassInputSurgeGuard,
+                    replayFromHistory,
+                },
+                resolve,
+                reject,
+            };
+            this.#messagesById.set(requestId, message);
+            this.#pendingMessages.push({ requestId, message });
+            void queue
+                .command({ kind: 'submit', text: normalizeUserTurn(input).text || '\u0000queued-message' })
+                .then(() => this.#notifyQueueState());
+        });
+    }
+    async resumeQueue() {
+        if (!this.#queue)
+            return;
+        await this.#cancellation;
+        await this.#queue.command({ kind: 'resume_queue' });
+        this.#notifyQueueState();
+    }
+    async discardQueue() {
+        if (!this.#queue)
+            return;
+        await this.#queue.command({ kind: 'discard_queue' });
+        this.#notifyQueueState();
+    }
+    /**
+     * Remove the last (most recently queued) item from the queue and return its
+     * text so the caller can move it back to the input box. Returns null when
+     * the queue is empty, the adapter has no queue (pass-through mode), or the
+     * underlying controller rejects the removal.
+     *
+     * Also pops the matching pending message from the internal pending list so
+     * the queue/pending state observers fire consistently.
+     */
+    async removeLastQueuedItem() {
+        const queue = this.#queue;
+        if (!queue)
+            return null;
+        const state = queue.state();
+        if (state.queue.length === 0)
+            return null;
+        // The queue is FIFO. The "last" queued item is the one at the tail.
+        const lastItem = state.queue[state.queue.length - 1];
+        const result = await queue.command({ kind: 'remove_queued', itemId: lastItem.id });
+        if (result.kind !== 'accepted')
+            return null;
+        // The pending message list is in submission order. The corresponding
+        // pending entry for this item is the last one we added. Removing it keeps
+        // the adapter's internal bookkeeping consistent with the queue controller.
+        this.#pendingMessages.pop();
+        // Note: we don't need to touch #messagesById here because the queue head
+        // has not yet started executing this item (it was still queued), so there
+        // is no pending execution for it to resolve. The pending message entry
+        // was only there to support the snapshot factory if the head was popped.
+        this.#notifyQueueState();
+        return { text: lastItem.text };
+    }
+    abort() {
+        if (!this.#queue) {
+            this.#turnFlow.abort?.();
+            return;
+        }
+        this.#turnFlow.abort?.();
+        this.#cancellation = this.#queue.command({ kind: 'cancel' }).then(() => {
+            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.
+        const message = this.#messagesById.get(execution.snapshot.requestId);
+        if (message && this.#queuedTurnStartObserver) {
+            try {
+                this.#queuedTurnStartObserver({
+                    requestId: execution.snapshot.requestId,
+                    input: message.input,
+                });
+            }
+            catch (error) {
+                this.#logger.error('queuedTurnStartObserver threw', {
+                    error: error instanceof Error ? error.message : String(error),
+                });
+            }
+        }
+        this.#activeTurn = this.#runQueuedTurn(execution);
+    }
+    async #runQueuedTurn(execution) {
+        const message = this.#messagesById.get(execution.snapshot.requestId);
+        if (message)
+            this.#messagesById.delete(execution.snapshot.requestId);
+        try {
+            const result = await this.#executeMessage(message?.input ?? execution.item.text, message?.options ?? {});
+            if (result.type === 'approval_required') {
+                this.#approvalExecutionId = execution.executionId;
+                this.#approvalActionId = `adapter-action-${this.#nextActionId++}`;
+                await this.#queue.event({
+                    kind: 'tool_approval_requested',
+                    executionId: execution.executionId,
+                    actionId: this.#approvalActionId,
+                    request: {}, // existing runtime doesn't expose typed tool request details
+                });
+                this.#notifyQueueState();
+                message?.resolve(result);
+                return;
+            }
+            await this.#queue.event({ kind: 'completed', executionId: execution.executionId, terminal: result });
+            this.#notifyQueueState();
+            message?.resolve(result);
+        }
+        catch (error) {
+            await this.#queue.event({ kind: 'failed', executionId: execution.executionId, failure: error });
+            this.#notifyQueueState();
+            message?.reject(error);
+        }
+    }
+    async #executeMessage(input, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount = 0, bypassInputSurgeGuard, replayFromHistory, } = {}) {
         const turn = normalizeUserTurn(input);
         return this.#withTrafficContext(turn.text, async () => {
             const wrappedOnEvent = (event) => {
@@ -118,42 +321,94 @@ export class ConversationAdapter {
             answer: answer === 'y' ? 'y' : 'n',
             ...(rejectionReason ? { rejectionReason } : {}),
         });
-        return this.#withTrafficContext(undefined, async () => {
-            const wrappedOnEvent = (event) => {
-                this.#logs.dispatchEventToLog(event);
-                this.#eventSink?.(event);
-                onEvent?.(event);
-            };
-            this.#subagentEventSinkHost?.setSubagentEventSink(wrappedOnEvent);
-            let result;
-            try {
-                result = await collectTerminalResult(this.#turnFlow.continueAfterApproval({ answer, rejectionReason }), {
-                    onTextChunk,
-                    onReasoningChunk,
-                    onCommandMessage,
-                    onEvent: wrappedOnEvent,
-                    getRawInterruption: () => this.#approval.getPendingInterruption(),
-                    onFinalEvent: (event) => {
-                        this.#logger.debug('handleApprovalDecision received final event', {
-                            sessionId: this.#sessionId,
-                            hasUsage: Boolean(event.usage),
-                            usage: event.usage,
-                        });
-                    },
+        try {
+            // If queue tracks this approval, resolve the typed action before continuing.
+            if (this.#queue && this.#approvalExecutionId && this.#approvalActionId) {
+                const actionCmd = await this.#queue.command({
+                    kind: 'resolve_tool_approval',
+                    executionId: this.#approvalExecutionId,
+                    actionId: this.#approvalActionId,
+                    approved: answer === 'y',
                 });
+                this.#notifyQueueState();
+                // If the queue rejected (e.g. stale from concurrent cancel), proceed
+                // with the direct continuation but do not attempt further queue events.
+                if (actionCmd.kind !== 'accepted') {
+                    this.#approvalExecutionId = null;
+                    this.#approvalActionId = null;
+                }
             }
-            finally {
-                this.#subagentEventSinkHost?.setSubagentEventSink(null);
-            }
-            if (result && result.type === 'response') {
-                this.#logger.debug('handleApprovalDecision returning response', {
-                    sessionId: this.#sessionId,
-                    hasUsage: Boolean(result.usage),
-                    usage: result.usage,
-                });
+            const result = await this.#withTrafficContext(undefined, async () => {
+                const wrappedOnEvent = (event) => {
+                    this.#logs.dispatchEventToLog(event);
+                    this.#eventSink?.(event);
+                    onEvent?.(event);
+                };
+                this.#subagentEventSinkHost?.setSubagentEventSink(wrappedOnEvent);
+                let result;
+                try {
+                    result = await collectTerminalResult(this.#turnFlow.continueAfterApproval({ answer, rejectionReason }), {
+                        onTextChunk,
+                        onReasoningChunk,
+                        onCommandMessage,
+                        onEvent: wrappedOnEvent,
+                        getRawInterruption: () => this.#approval.getPendingInterruption(),
+                        onFinalEvent: (event) => {
+                            this.#logger.debug('handleApprovalDecision received final event', {
+                                sessionId: this.#sessionId,
+                                hasUsage: Boolean(event.usage),
+                                usage: event.usage,
+                            });
+                        },
+                    });
+                }
+                finally {
+                    this.#subagentEventSinkHost?.setSubagentEventSink(null);
+                }
+                if (result && result.type === 'response') {
+                    this.#logger.debug('handleApprovalDecision returning response', {
+                        sessionId: this.#sessionId,
+                        hasUsage: Boolean(result.usage),
+                        usage: result.usage,
+                    });
+                }
+                return result;
+            });
+            if (result && this.#queue && this.#approvalExecutionId) {
+                const executionId = this.#approvalExecutionId;
+                if (result.type === 'approval_required') {
+                    // A continuation may request another tool approval. Keep the same
+                    // queue execution active and replace its resolved action rather than
+                    // retiring it and dispatching the next message while the turn is
+                    // still awaiting approval.
+                    this.#approvalActionId = `adapter-action-${this.#nextActionId++}`;
+                    await this.#queue.event({
+                        kind: 'tool_approval_requested',
+                        executionId,
+                        actionId: this.#approvalActionId,
+                        request: {},
+                    });
+                    this.#notifyQueueState();
+                }
+                else {
+                    this.#approvalExecutionId = null;
+                    this.#approvalActionId = null;
+                    await this.#queue.event({ kind: 'completed', executionId, terminal: result });
+                    this.#notifyQueueState();
+                }
             }
             return result;
-        });
+        }
+        catch (error) {
+            if (this.#queue && this.#approvalExecutionId) {
+                const executionId = this.#approvalExecutionId;
+                this.#approvalExecutionId = null;
+                this.#approvalActionId = null;
+                await this.#queue.event({ kind: 'failed', executionId, failure: error });
+                this.#notifyQueueState();
+            }
+            throw error;
+        }
     }
 }
 //# sourceMappingURL=conversation-adapter.js.map

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

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

package/dist/services/conversation/conversation-input-routing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-input-routing.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-input-routing.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,+BAA+B,GACvC;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,GACpE;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAC5C;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;AAE7B,wBAAgB,+BAA+B,CAAC,KAAK,EAAE;IACrD,IAAI,EAAE,MAAM,CAAC;IACb,uBAAuB,EAAE,OAAO,CAAC;IACjC,yBAAyB,EAAE,OAAO,CAAC;IACnC,kBAAkB,EAAE,OAAO,CAAC;CAC7B,GAAG,+BAA+B,CAclC;AAED,wBAAgB,yBAAyB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,CAMtG"}
+{"version":3,"file":"conversation-input-routing.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-input-routing.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,+BAA+B,GACvC;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,GACpE;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAC5C;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;AAE7B,wBAAgB,+BAA+B,CAAC,KAAK,EAAE;IACrD,IAAI,EAAE,MAAM,CAAC;IACb,uBAAuB,EAAE,OAAO,CAAC;IACjC,yBAAyB,EAAE,OAAO,CAAC;IACnC,kBAAkB,EAAE,OAAO,CAAC;CAC7B,GAAG,+BAA+B,CAclC;AAED,wBAAgB,yBAAyB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,CAUtG"}

package/dist/services/conversation/conversation-input-routing.js

@@ -1,4 +1,4 @@
-import { isDeniedReadApproveAnswer } from '../../contracts/conversation.js';
+import { isDeniedReadApproveAnswer, isDockerHostControlApproveAnswer, isReadFileSessionApproveAnswer, } from '../../contracts/conversation.js';
 export function routeConversationTurnSubmission(input) {
     if (input.waitingForAskUserAnswer) {
         return { kind: 'approval_answer', answer: 'y', approvalAnswer: input.text };
@@ -12,7 +12,9 @@ export function routeConversationTurnSubmission(input) {
     return { kind: 'pass_through' };
 }
 export function normalizeApprovalDecision(answer) {
-    if (isDeniedReadApproveAnswer(answer)) {
+    if (isDeniedReadApproveAnswer(answer) ||
+        isDockerHostControlApproveAnswer(answer) ||
+        isReadFileSessionApproveAnswer(answer)) {
         return { answer };
     }
     return { answer: 'y', approvalAnswer: answer };

package/dist/services/conversation/conversation-input-routing.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-input-routing.js","sourceRoot":"","sources":["../../../source/services/conversation/conversation-input-routing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAQ5E,MAAM,UAAU,+BAA+B,CAAC,KAK/C;IACC,IAAI,KAAK,CAAC,uBAAuB,EAAE,CAAC;QAClC,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;IAC9E,CAAC;IAED,IAAI,KAAK,CAAC,yBAAyB,EAAE,CAAC;QACpC,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;IAC1D,CAAC;IAED,IAAI,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC7B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC7B,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,MAAe;IACvD,IAAI,yBAAyB,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC;AACjD,CAAC"}
+{"version":3,"file":"conversation-input-routing.js","sourceRoot":"","sources":["../../../source/services/conversation/conversation-input-routing.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,gCAAgC,EAChC,8BAA8B,GAC/B,MAAM,iCAAiC,CAAC;AAQzC,MAAM,UAAU,+BAA+B,CAAC,KAK/C;IACC,IAAI,KAAK,CAAC,uBAAuB,EAAE,CAAC;QAClC,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;IAC9E,CAAC;IAED,IAAI,KAAK,CAAC,yBAAyB,EAAE,CAAC;QACpC,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;IAC1D,CAAC;IAED,IAAI,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC7B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC7B,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,MAAe;IACvD,IACE,yBAAyB,CAAC,MAAM,CAAC;QACjC,gCAAgC,CAAC,MAAM,CAAC;QACxC,8BAA8B,CAAC,MAAM,CAAC,EACtC,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC;AACjD,CAAC"}

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

@@ -2,6 +2,7 @@ import type { ConversationOrchestratorConfig } from './conversation-orchestrator
 import type { NormalizedUsage } from '../../utils/ai/token-usage.js';
 import { type UserTurn } from '../../types/user-turn.js';
 export declare class ConversationOrchestrator {
+    #private;
     private config;
     private pendingApproval;
     private askUserAnswers;
@@ -18,6 +19,13 @@ export declare class ConversationOrchestrator {
         text: string;
         images?: UserTurn['images'];
     } | null;
+    /**
+     * Cancel the most recently queued message and return its text so the UI
+     * can move it back into the input box. Returns null when there are no
+     * pending queued messages, the service cannot cancel the tail item, or the
+     * service does not implement cancellation.
+     */
+    removeLastQueuedPendingMessage(): Promise<string | null>;
     retryLastToolOutput(): Promise<boolean>;
     undoToUserMessage(uiIndex: number): string | null;
     sendUserMessage(input: string | UserTurn, options?: {
@@ -27,6 +35,12 @@ export declare class ConversationOrchestrator {
     private createTurnSession;
     private createOnEventHandler;
     private applyServiceResult;
+    /**
+     * Append a previously-queued user message into the message list. Called by
+     * the queue when it actually starts processing the next turn. After the
+     * append, the pending indicator above the input box is cleared.
+     */
+    private moveQueuedMessageIntoList;
     private annotateCommandMessage;
     private clearsThinkingIndicator;
     private resetAskUserState;

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

@@ -1 +1 @@
-{"version":3,"file":"conversation-orchestrator.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-orchestrator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,8BAA8B,EAAiB,MAAM,sCAAsC,CAAC;AAK1G,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAcrE,OAAO,EAKL,KAAK,QAAQ,EACd,MAAM,0BAA0B,CAAC;AAIlC,qBAAa,wBAAwB;IAMvB,OAAO,CAAC,MAAM;IAL1B,OAAO,CAAC,eAAe,CAAgC;IACvD,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,2BAA2B,CAAK;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAe;IAE/C,YAAoB,MAAM,EAAE,8BAA8B,EAEzD;IAED,eAAe,CAAC,EACd,cAAc,EACd,OAAO,GACR,EAAE,IAAI,CAAC,8BAA8B,EAAE,gBAAgB,GAAG,SAAS,CAAC,GAAG,IAAI,CAG3E;IAED,gBAAgB,IAAI,eAAe,GAAG,IAAI,CAEzC;IAED,oBAAoB,IAAI,IAAI,CAQ3B;IAED,gBAAgB,IAAI,IAAI,CAGvB;IAEK,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAcvC;IAED,cAAc,IAAI,IAAI,CAMrB;IAED,mBAAmB,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;KAAE,GAAG,IAAI,CAmB1E;IAEK,mBAAmB,IAAI,OAAO,CAAC,OAAO,CAAC,CAgD5C;IAED,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAqBhD;IAEK,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,OAAO,CAAC,EAAE;QAAE,qBAAqB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAyE5G;IAEK,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA4H7G;IAED,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,oBAAoB;IAsC5B,OAAO,CAAC,kBAAkB;IA8C1B,OAAO,CAAC,sBAAsB;IAe9B,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,QAAQ;CAOjB"}
+{"version":3,"file":"conversation-orchestrator.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-orchestrator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,8BAA8B,EAAiB,MAAM,sCAAsC,CAAC;AAK1G,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAcrE,OAAO,EAKL,KAAK,QAAQ,EACd,MAAM,0BAA0B,CAAC;AAIlC,qBAAa,wBAAwB;;IAOvB,OAAO,CAAC,MAAM;IAN1B,OAAO,CAAC,eAAe,CAAgC;IACvD,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,2BAA2B,CAAK;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAe;IAG/C,YAAoB,MAAM,EAAE,8BAA8B,EAuBzD;IAED,eAAe,CAAC,EACd,cAAc,EACd,OAAO,GACR,EAAE,IAAI,CAAC,8BAA8B,EAAE,gBAAgB,GAAG,SAAS,CAAC,GAAG,IAAI,CAG3E;IAED,gBAAgB,IAAI,eAAe,GAAG,IAAI,CAEzC;IAED,oBAAoB,IAAI,IAAI,CAQ3B;IAED,gBAAgB,IAAI,IAAI,CAGvB;IAEK,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAevC;IAED,cAAc,IAAI,IAAI,CAcrB;IAED,mBAAmB,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;KAAE,GAAG,IAAI,CAoB1E;IAED;;;;;OAKG;IACG,8BAA8B,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAe7D;IAEK,mBAAmB,IAAI,OAAO,CAAC,OAAO,CAAC,CAgD5C;IAED,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAsBhD;IAEK,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,OAAO,CAAC,EAAE;QAAE,qBAAqB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA4F5G;IAEK,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA4H7G;IAED,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,oBAAoB;IAsC5B,OAAO,CAAC,kBAAkB;IA8C1B;;;;OAIG;IACH,OAAO,CAAC,yBAAyB;IAoCjC,OAAO,CAAC,sBAAsB;IAe9B,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,QAAQ;CAOjB"}