@qduc/term2 0.32.2 → 0.34.0

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

@@ -6,7 +6,7 @@ import { type UserTurn } from '../../types/user-turn.js';
 import type { InputSurgeApproval } from '../input-surge-approval.js';
 import type { ProviderInputItem } from '../../contracts/provider-input.js';
 import type { SessionRuntime, SessionLogs, SessionApprovalQuery } from '../../core/session-runtime.js';
-import type { SessionManager } from '../session/session-manager.js';
+import type { SessionLifecycle } from '../session/session-lifecycle.js';
 import type { PendingInteractionState } from '../session/pending-interaction-state.js';
 import type { AskUserAnswerSink, SubagentEventSinkHost } from '../conversation-agent-client.js';
 import type { SessionIdentity } from '../session/session-identity.js';
@@ -24,7 +24,7 @@ export type SendMessageOptions = {
     preferredMessageId?: string;
     /** The turn is model input only and must not be projected as a user message in the UI. */
     suppressUserMessageDisplay?: boolean;
-    /** A busy-input steer supersedes the active foreground turn. */
+    /** Busy input joins the next model boundary, or queues if that turn releases it. */
     busyMode?: 'steer' | 'follow_up';
 };
 export type HandleApprovalDecisionOptions = {
@@ -121,7 +121,7 @@ export declare class ConversationAdapter {
         logger: ILoggingService;
         settingsService?: ISettingsService;
         sessionContextService: ISessionContextService;
-        userTurns: Pick<SessionManager, 'listUserTurns'>;
+        userTurns: Pick<SessionLifecycle, 'listUserTurns'>;
         logs: SessionLogs;
         approval: SessionApprovalQuery;
         /** Session-owned interaction projection; omitted by low-level legacy tests. */
@@ -162,20 +162,7 @@ export declare class ConversationAdapter {
      */
     queueStateKind(): QueueStateKind | 'none';
     queuedSubmissionCount(): number;
-    /**
-     * Deliver a user message into the turn already running, as a user message the
-     * model reads after the tool results of the round in flight.
-     *
-     * Resolves true once the running turn has taken it. Resolves false when that
-     * turn offers no further request boundary — it is finishing, or parked on an
-     * approval — leaving the caller to send the message as its own turn.
-     *
-     * `options.id` is the submission's address (see `## The three stages`):
-     * while this call is outstanding, `id` is tracked in `#pendingSteerIds` so
-     * `retractSubmission`/`editSubmission` can route to it. Omitted by the one
-     * caller that has no such id — background subagent notifications, via
-     * `injectIntoActiveTurn` directly — which can never be retracted or edited.
-     */
+    /** Compatibility view of mailbox admission; submitMessage also owns fallback. */
     steerActiveTurn(input: string | UserTurn, options?: {
         id?: string;
     }): Promise<boolean>;
@@ -196,38 +183,21 @@ export declare class ConversationAdapter {
     injectIntoActiveTurn(items: readonly ProviderInputItem[], options?: {
         id?: string;
     }): Promise<boolean>;
-    /**
-     * Retract a submission before it reaches the model, addressed by the id
-     * `sendMessage`/`steerActiveTurn` were given (`preferredMessageId`), which
-     * is the same id the UI already keys `pendingQueuedMessages` on.
-     *
-     * Routes by stage (`## The three stages`): a still-waiting steer goes to
-     * `retractSteer` on the run loop; a queued item goes to the controller's
-     * `remove_queued`.
-     *
-     * A pending steer has no matching `#messagesById` entry to settle — its
-     * caller (`steerActiveTurn`) awaits the `turnFlow.steer` promise directly,
-     * not a queued `sendMessage`. `retractSteer` resolves that promise itself
-     * (with `'retracted'`), which `injectIntoActiveTurn` reports as `false` to
-     * that caller. A queued item, by contrast, *does* have a `sendMessage`
-     * promise parked in `#messagesById`, which this settles with an
-     * `AbortError` — the same shape `removeLastQueuedItem` already used.
-     */
+    /** Mutate only the owner's still-pending record and its queue/mailbox projection. */
     retractSubmission(id: string): Promise<SubmissionMutation>;
-    /**
-     * Replace a submission's content in place, without changing its stage or
-     * position — a pending steer stays a steer at its slot, a queued item keeps
-     * its queue index and steer-ahead-of-follow-ups priority.
-     *
-     * **The trap**: the controller queue stores display `text` only.
-     * `#runQueuedTurn` executes `message.input` from `#messagesById`, so
-     * issuing `edit_queued` alone redraws the new text but sends the old turn.
-     * This replaces the `#messagesById` entry's `input` first, keeping the
-     * `QUEUED_NON_TEXT_PLACEHOLDER` substitution `sendMessage` applies to the
-     * controller's display copy.
-     */
+    /** Keep the executable payload and display projection in the same mutation. */
     editSubmission(id: string, turn: UserTurn): Promise<SubmissionMutation>;
-    sendMessage(input: string | UserTurn, { onAdmission, onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount, inputSurgeApproval, replayFromHistory, preferredMessageId, busyMode, suppressUserMessageDisplay, }?: SendMessageOptions): Promise<ConversationTerminal>;
+    /** Own steer admission and fallback with the same id and latest payload. */
+    submitMessage(input: string | UserTurn, options?: SendMessageOptions, delivery?: {
+        onSteerSettled(admitted: boolean, input: string | UserTurn): void;
+        prepareFollowUp?(input: string | UserTurn): string | UserTurn;
+    }): Promise<{
+        kind: 'steered';
+    } | {
+        kind: 'turn';
+        terminal: ConversationTerminal;
+    }>;
+    sendMessage(input: string | UserTurn, options?: SendMessageOptions): Promise<ConversationTerminal>;
     prepareMessage(input: string | UserTurn, ids: PreparedMessageIds): Promise<PreparedMessageResult>;
     commitMessage(leaseId: string): Promise<void>;
     cancelPreparedMessage(leaseId: string): Promise<void>;

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,3 +1,4 @@
+import { injectSkillIntoTurn } from '../../types/user-turn.js';
 import { collectTerminalResult, TerminalResultCollectorExhaustionError } from '../session/terminal-result-collector.js';
 import { getCallIdFromObject } from '../interruption-info.js';
 import { normalizeUserTurn } from '../../types/user-turn.js';
@@ -42,15 +43,8 @@ export class ConversationAdapter {
     #approval;
     #pendingInteraction;
     #turnFlow;
-    #messagesById = new Map();
-    /**
-     * Ids currently handed to `turnFlow.steer` and not yet settled. Populated
-     * right before the call and cleared when that steer's promise resolves
-     * (admitted, released, or retracted) — this is what lets
-     * `retractSubmission`/`editSubmission` tell a pending steer apart from a
-     * queued item sharing the same id space, per `## The three stages`.
-     */
-    #pendingSteerIds = new Set();
+    /** Executable payload and lifecycle; queue/mailbox entries are projections. */
+    #submissions = new Map();
     #queue;
     #nextQueuedMessageId = 1;
     #nextActionId = 1;
@@ -117,7 +111,7 @@ export class ConversationAdapter {
             this.#queue = new QueueController({
                 driver,
                 snapshotFactory: (item) => {
-                    const message = this.#messagesById.get(item.id);
+                    const message = this.#submissions.get(item.id);
                     return message ? { requestId: item.id } : { requestId: item.id, recovered: true };
                 },
                 capacity: deps.queueCapacity,
@@ -226,25 +220,26 @@ export class ConversationAdapter {
             firstUserMessagePreview,
         }, fn);
     }
-    /**
-     * Deliver a user message into the turn already running, as a user message the
-     * model reads after the tool results of the round in flight.
-     *
-     * Resolves true once the running turn has taken it. Resolves false when that
-     * turn offers no further request boundary — it is finishing, or parked on an
-     * approval — leaving the caller to send the message as its own turn.
-     *
-     * `options.id` is the submission's address (see `## The three stages`):
-     * while this call is outstanding, `id` is tracked in `#pendingSteerIds` so
-     * `retractSubmission`/`editSubmission` can route to it. Omitted by the one
-     * caller that has no such id — background subagent notifications, via
-     * `injectIntoActiveTurn` directly — which can never be retracted or edited.
-     */
+    /** Compatibility view of mailbox admission; submitMessage also owns fallback. */
     async steerActiveTurn(input, options) {
         const turn = normalizeUserTurn(input);
         if (!turn.text.trim() && !turn.images?.length)
             return false;
-        return this.injectIntoActiveTurn([userTurnToProviderItem(turn, { steering: true })], options);
+        const id = options?.id;
+        // Addressed legacy callers share the registry; normal submissions already
+        // own their record before asking the mailbox to admit its projection.
+        const record = id && !this.#submissions.has(id)
+            ? { stage: 'pending_steer', input: turn, options: {}, resolve: () => undefined, reject: () => undefined }
+            : undefined;
+        if (id && record)
+            this.#submissions.set(id, record);
+        try {
+            return await this.injectIntoActiveTurn([userTurnToProviderItem(turn, { steering: true })], options);
+        }
+        finally {
+            if (id && record && this.#submissions.get(id) === record)
+                this.#submissions.delete(id);
+        }
     }
     /**
      * Hand pre-built items to the turn already running, admitted at its next
@@ -266,43 +261,19 @@ export class ConversationAdapter {
         if (!this.isQueueActive())
             return false;
         const id = options?.id;
-        if (id)
-            this.#pendingSteerIds.add(id);
-        try {
-            const outcome = await this.#turnFlow.steer(items, id ? { id } : undefined);
-            return outcome === 'admitted';
-        }
-        finally {
-            if (id)
-                this.#pendingSteerIds.delete(id);
-        }
+        const outcome = await this.#turnFlow.steer(items, id ? { id } : undefined);
+        return outcome === 'admitted';
     }
-    /**
-     * Retract a submission before it reaches the model, addressed by the id
-     * `sendMessage`/`steerActiveTurn` were given (`preferredMessageId`), which
-     * is the same id the UI already keys `pendingQueuedMessages` on.
-     *
-     * Routes by stage (`## The three stages`): a still-waiting steer goes to
-     * `retractSteer` on the run loop; a queued item goes to the controller's
-     * `remove_queued`.
-     *
-     * A pending steer has no matching `#messagesById` entry to settle — its
-     * caller (`steerActiveTurn`) awaits the `turnFlow.steer` promise directly,
-     * not a queued `sendMessage`. `retractSteer` resolves that promise itself
-     * (with `'retracted'`), which `injectIntoActiveTurn` reports as `false` to
-     * that caller. A queued item, by contrast, *does* have a `sendMessage`
-     * promise parked in `#messagesById`, which this settles with an
-     * `AbortError` — the same shape `removeLastQueuedItem` already used.
-     */
+    /** Mutate only the owner's still-pending record and its queue/mailbox projection. */
     async retractSubmission(id) {
-        if (this.#pendingSteerIds.has(id)) {
+        if (this.#submissions.get(id)?.stage === 'pending_steer') {
             if (!this.#turnFlow.retractSteer) {
                 throw new Error(`ConversationAdapter.retractSubmission: pending steer '${id}' has no turnFlow.retractSteer to route to`);
             }
             const retracted = this.#turnFlow.retractSteer(id);
             if (!retracted)
                 return { kind: 'too_late', stage: 'started' };
-            this.#pendingSteerIds.delete(id);
+            this.#submissions.delete(id);
             return { kind: 'applied', stage: 'pending_steer' };
         }
         if (this.#queue) {
@@ -316,45 +287,42 @@ export class ConversationAdapter {
                 return { kind: 'applied', stage: 'queued' };
             }
         }
-        if (this.#messagesById.has(id))
+        if (this.#submissions.has(id))
             return { kind: 'too_late', stage: 'started' };
         return { kind: 'unknown_id' };
     }
-    /**
-     * Replace a submission's content in place, without changing its stage or
-     * position — a pending steer stays a steer at its slot, a queued item keeps
-     * its queue index and steer-ahead-of-follow-ups priority.
-     *
-     * **The trap**: the controller queue stores display `text` only.
-     * `#runQueuedTurn` executes `message.input` from `#messagesById`, so
-     * issuing `edit_queued` alone redraws the new text but sends the old turn.
-     * This replaces the `#messagesById` entry's `input` first, keeping the
-     * `QUEUED_NON_TEXT_PLACEHOLDER` substitution `sendMessage` applies to the
-     * controller's display copy.
-     */
+    /** Keep the executable payload and display projection in the same mutation. */
     async editSubmission(id, turn) {
-        if (this.#pendingSteerIds.has(id)) {
+        if (this.#submissions.get(id)?.stage === 'pending_steer') {
             if (!this.#turnFlow.editSteer) {
                 throw new Error(`ConversationAdapter.editSubmission: pending steer '${id}' has no turnFlow.editSteer to route to`);
             }
-            const item = userTurnToProviderItem(normalizeUserTurn(turn), { steering: true });
+            const submission = this.#submissions.get(id);
+            const item = userTurnToProviderItem(normalizeUserTurn(submission.prepareInput?.(turn) ?? turn), {
+                steering: true,
+            });
             const edited = this.#turnFlow.editSteer(id, [item]);
-            return edited ? { kind: 'applied', stage: 'pending_steer' } : { kind: 'too_late', stage: 'started' };
+            if (!edited)
+                return { kind: 'too_late', stage: 'started' };
+            submission.input = structuredClone(turn);
+            const { inputSurgeApproval: _approval, ...options } = submission.options;
+            submission.options = options;
+            return { kind: 'applied', stage: 'pending_steer' };
         }
         if (this.#queue) {
             const inQueue = this.#queue.state().queue.some((item) => item.id === id);
             if (inQueue) {
-                const message = this.#messagesById.get(id);
+                const message = this.#submissions.get(id);
                 if (!message)
                     return { kind: 'unknown_id' };
                 const { inputSurgeApproval: _invalidatedApproval, ...options } = message.options;
-                this.#messagesById.set(id, { ...message, input: structuredClone(turn), options });
+                this.#submissions.set(id, { ...message, input: structuredClone(turn), options });
                 const displayText = normalizeUserTurn(turn).text;
                 const controllerText = displayText.trim() ? displayText : QUEUED_NON_TEXT_PLACEHOLDER;
                 const result = await this.#queue.command({ kind: 'edit_queued', itemId: id, text: controllerText });
                 if (result.kind !== 'accepted') {
-                    if (this.#messagesById.has(id)) {
-                        this.#messagesById.set(id, message);
+                    if (this.#submissions.has(id)) {
+                        this.#submissions.set(id, message);
                     }
                     return { kind: 'too_late', stage: 'started' };
                 }
@@ -362,14 +330,66 @@ export class ConversationAdapter {
                 return { kind: 'applied', stage: 'queued' };
             }
         }
-        if (this.#messagesById.has(id))
+        if (this.#submissions.has(id))
             return { kind: 'too_late', stage: 'started' };
         return { kind: 'unknown_id' };
     }
-    async sendMessage(input, { onAdmission, onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount = 0, inputSurgeApproval, replayFromHistory, preferredMessageId, busyMode, suppressUserMessageDisplay, } = {}) {
+    /** Own steer admission and fallback with the same id and latest payload. */
+    async submitMessage(input, options = {}, delivery) {
+        const id = options.preferredMessageId ?? String(this.#nextQueuedMessageId++);
+        if (this.#submissions.has(id))
+            throw new Error(`A submission already uses request id ${id}`);
+        const submission = {
+            stage: 'pending_steer',
+            prepareInput: (value) => (typeof value === 'string' ? value : injectSkillIntoTurn(value)),
+            input: structuredClone(input),
+            options,
+            resolve: () => undefined,
+            reject: () => undefined,
+        };
+        if (options.busyMode !== 'steer' || !this.isQueueOwningSubmissions()) {
+            return {
+                kind: 'turn',
+                terminal: await this.#sendMessage(submission.input, {
+                    ...options,
+                    preferredMessageId: id,
+                }, submission),
+            };
+        }
+        this.#submissions.set(id, submission);
+        const epoch = this.#cancellationEpoch;
+        try {
+            const admitted = await this.steerActiveTurn(submission.prepareInput(submission.input), { id });
+            if ((!admitted && epoch !== this.#cancellationEpoch) || this.#submissions.get(id) !== submission) {
+                throw queueCancellationError('Pending submission was cancelled');
+            }
+            delivery?.onSteerSettled(admitted, submission.input);
+            if (admitted) {
+                this.#submissions.delete(id);
+                return { kind: 'steered' };
+            }
+            submission.input = delivery?.prepareFollowUp?.(submission.input) ?? submission.input;
+            return {
+                kind: 'turn',
+                terminal: await this.#sendMessage(submission.input, {
+                    ...submission.options,
+                    preferredMessageId: id,
+                }, submission),
+            };
+        }
+        finally {
+            if (this.#submissions.get(id) === submission && submission.stage === 'pending_steer') {
+                this.#submissions.delete(id);
+            }
+        }
+    }
+    sendMessage(input, options = {}) {
+        return this.#sendMessage(input, options);
+    }
+    async #sendMessage(input, { onAdmission, onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount = 0, inputSurgeApproval, replayFromHistory, preferredMessageId, busyMode, suppressUserMessageDisplay, } = {}, existing) {
         const queue = this.#queue;
         if (!queue) {
-            return this.#executeMessage(input, {
+            return this.#executeMessage(existing?.prepareInput?.(input) ?? input, {
                 onTextChunk,
                 onReasoningChunk,
                 onCommandMessage,
@@ -385,11 +405,13 @@ export class ConversationAdapter {
         }
         return new Promise((resolve, reject) => {
             const requestId = preferredMessageId ?? String(this.#nextQueuedMessageId++);
-            if (this.#messagesById.has(requestId)) {
+            if (this.#submissions.has(requestId) && this.#submissions.get(requestId) !== existing) {
                 reject(new Error(`A queued message already uses request id ${requestId}`));
                 return;
             }
             const message = {
+                stage: 'queued',
+                prepareInput: existing?.prepareInput,
                 input: typeof input === 'string' ? input : structuredClone(input),
                 options: {
                     onTextChunk,
@@ -405,7 +427,9 @@ export class ConversationAdapter {
                 resolve,
                 reject,
             };
-            this.#messagesById.set(requestId, message);
+            if (existing)
+                Object.assign(existing, message);
+            this.#submissions.set(requestId, existing ?? message);
             const displayText = normalizeUserTurn(input).text;
             const controllerText = displayText.trim() ? displayText : QUEUED_NON_TEXT_PLACEHOLDER;
             void queue
@@ -582,7 +606,7 @@ export class ConversationAdapter {
                 };
                 void proof.completion.then(settle, settle);
             }
-            if (this.#cancellationProven && activeRequestId && this.#messagesById.has(activeRequestId)) {
+            if (this.#cancellationProven && activeRequestId && this.#submissions.has(activeRequestId)) {
                 this.#settleFailure(activeRequestId, queueCancellationError('Active turn was cancelled'));
             }
             if (this.#cancellationProven && this.#activeRequestId === activeRequestId) {
@@ -599,9 +623,11 @@ export class ConversationAdapter {
     #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
+        // Recovered items have no #submissions 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);
+        const message = this.#submissions.get(execution.snapshot.requestId);
+        if (message)
+            message.stage = 'started';
         if (this.#queuedTurnStartObserver) {
             try {
                 this.#queuedTurnStartObserver({
@@ -632,7 +658,7 @@ export class ConversationAdapter {
      * of the active turn is the same shape with `reason: 'manual'`.
      */
     async #runQueuedTurn(execution) {
-        const message = this.#messagesById.get(execution.snapshot.requestId);
+        const message = this.#submissions.get(execution.snapshot.requestId);
         try {
             const recoveredInput = execution.item.text === QUEUED_NON_TEXT_PLACEHOLDER || execution.item.text === LEGACY_QUEUED_MESSAGE_PLACEHOLDER
                 ? null
@@ -640,7 +666,7 @@ export class ConversationAdapter {
             if (!message && !recoveredInput) {
                 throw new Error('Recovered queued message has no executable text input');
             }
-            const result = await this.#executeMessage(message?.input ?? recoveredInput, message?.options ?? {}, execution.snapshot.requestId);
+            const result = await this.#executeMessage(message ? message.prepareInput?.(message.input) ?? message.input : recoveredInput, message?.options ?? {}, execution.snapshot.requestId);
             if (result.type === 'approval_required') {
                 this.#approvalExecutionId = execution.executionId;
                 this.#approvalActionId = `adapter-action-${this.#nextActionId++}`;
@@ -700,17 +726,17 @@ export class ConversationAdapter {
         }
     }
     #settleSuccess(requestId, terminal) {
-        const message = this.#messagesById.get(requestId);
+        const message = this.#submissions.get(requestId);
         if (!message)
             return;
-        this.#messagesById.delete(requestId);
+        this.#submissions.delete(requestId);
         message.resolve(terminal);
     }
     #settleFailure(requestId, error) {
-        const message = this.#messagesById.get(requestId);
+        const message = this.#submissions.get(requestId);
         if (!message)
             return;
-        this.#messagesById.delete(requestId);
+        this.#submissions.delete(requestId);
         message.reject(error);
     }
     async #collectTerminalResult(events, options, cancellationEpoch, requestId) {