@qduc/term2 0.11.0 → 0.11.1

package/dist/prompts/prompt-profiles.ts

@@ -31,6 +31,11 @@ export const PROMPT_PROFILES: PromptProfile[] = [
     basePromptFile: 'codex.md',
     matches: ({ normalizedModel }) => normalizedModel.includes('gpt-5') && normalizedModel.includes('codex'),
   },
+  {
+    id: 'gpt-5.6',
+    basePromptFile: 'gpt-5.6.md',
+    matches: ({ normalizedModel }) => normalizedModel.includes('gpt-5.6'),
+  },
   {
     id: 'gpt-5.5',
     basePromptFile: 'gpt-5.5.md',

package/dist/prompts/search-via-shell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-via-shell.d.ts","sourceRoot":"","sources":["../../source/prompts/search-via-shell.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAcpE,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AAED,wBAAgB,yBAAyB,CAAC,OAAO,GAAE,qBAA0B,GAAG,MAAM,CAiDrF"}
+{"version":3,"file":"search-via-shell.d.ts","sourceRoot":"","sources":["../../source/prompts/search-via-shell.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAcpE,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AAED,wBAAgB,yBAAyB,CAAC,OAAO,GAAE,qBAA0B,GAAG,MAAM,CAgCrF"}

package/dist/prompts/search-via-shell.js

@@ -22,32 +22,15 @@ export function getSearchViaShellAddendum(options = {}) {
 
 Use the \`shell\` tool with the standard CLI binaries.`;
     const textSearch = hasRg
-        ? `**For text search**, use \`rg\` (ripgrep). Examples:
-- \`rg "pattern" src/\` — basic search, respects \`.gitignore\` by default.
-- \`rg -i "pattern" .\` — case-insensitive.
-- \`rg --no-ignore "pattern" .\` — when you need to search \`node_modules\`, build output, or anything in \`.gitignore\`.
-- \`rg -uu "pattern" .\` — include hidden + gitignored.
-- \`rg -g '*.ts' "pattern" .\` — restrict by glob.
-- \`rg -t ts "pattern" .\` — restrict by language preset.
-- \`rg -n "pattern" .\` — show line numbers (useful for follow-up edits).
-- \`rg -l "pattern" .\` — list files only.
-- \`rg -C 3 "pattern" .\` — 3 lines of context.
-- **Always pass an explicit path** (e.g. \`.\` or \`src/\`) to \`rg\`. When no path is given and stdin is a pipe, ripgrep reads stdin instead of searching the filesystem, returning no results.`
-        : `**For text search**, use \`grep\`. Examples:
-- \`grep -rn "pattern" src/\` — recursive search with line numbers.
-- \`grep -ri "pattern" src/\` — case-insensitive recursive search.
-- \`grep -rl "pattern" src/\` — list matching files only.
-- \`grep -C 3 "pattern" src/\` — show 3 lines of context.`;
+        ? `**For text search**, use \`rg\` (ripgrep). It respects \`.gitignore\` by default; \`--no-ignore\` or \`-uu\` when you need to search past it.
+
+**Always pass an explicit path** (e.g. \`.\` or \`src/\`). With no path given and stdin attached to a pipe, ripgrep reads stdin instead of searching the filesystem and silently returns no results.`
+        : `**For text search**, use \`grep\`, with \`-rn\` for a recursive search reporting line numbers.`;
     const fileSearch = hasFd
-        ? `**For file search**, use \`fd\`. Examples:
-- \`fd '\\.ts$'\` — regex over basenames.
-- \`fd -e ts\` — by extension.
-- \`fd -H -I\` — include hidden + gitignored (\`-uu\` style).
-- \`fd 'pattern' path/\` — scoped to a directory.`
-        : `**For file search**, use \`find\`. Examples:
-- \`find src/ -type f -name '*.ts'\` — search a subtree by basename glob.
-- **Always search from a specific path, not \`/\`.** Scanning the whole filesystem can exhaust resources on large trees.
-- When using \`find -regex\` with alternation, put the longest alternative first: \`'.*\\.(tsx|ts)'\` works; \`'.*\\.(ts|tsx)'\` silently skips \`.tsx\`.`;
+        ? `**For file search**, use \`fd\`. It also respects \`.gitignore\`; \`-H -I\` includes hidden and ignored files.`
+        : `**For file search**, use \`find\`, scoped to a specific path rather than \`/\` — scanning the whole filesystem can exhaust resources on large trees.
+
+With \`find -regex\` alternation, put the longest alternative first: \`'.*\\.(tsx|ts)'\` matches, while \`'.*\\.(ts|tsx)'\` silently skips \`.tsx\`.`;
     const hygiene = `**General shell hygiene:**
 - Quote paths that contain spaces.
 - Prefer absolute paths or paths relative to a known root; avoid \`cd\`.

package/dist/prompts/search-via-shell.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-via-shell.js","sourceRoot":"","sources":["../../source/prompts/search-via-shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1C,SAAS,kBAAkB,CAAC,GAAW;IACrC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE;YAC3C,KAAK,EAAE,QAAQ;YACf,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAOD,MAAM,UAAU,yBAAyB,CAAC,OAAO,GAA0B,EAAE;IAC3E,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,kBAAkB,CAAC;IAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,EAAE,QAAQ,EAAE,IAAI,KAAK,CAAC;IAE/D,sEAAsE;IACtE,6EAA6E;IAC7E,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAEnD,MAAM,MAAM,GAAG;;uDAEsC,CAAC;IAEtD,MAAM,UAAU,GAAG,KAAK;QACtB,CAAC,CAAC;;;;;;;;;;iMAU2L;QAC7L,CAAC,CAAC;;;;0DAIoD,CAAC;IAEzD,MAAM,UAAU,GAAG,KAAK;QACtB,CAAC,CAAC;;;;kDAI4C;QAC9C,CAAC,CAAC;;;0JAGoJ,CAAC;IAEzJ,MAAM,OAAO,GAAG;;;;2GAIyF,CAAC;IAE1G,OAAO,GAAG,MAAM,OAAO,UAAU,OAAO,UAAU,OAAO,OAAO,EAAE,CAAC;AACrE,CAAC"}
+{"version":3,"file":"search-via-shell.js","sourceRoot":"","sources":["../../source/prompts/search-via-shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1C,SAAS,kBAAkB,CAAC,GAAW;IACrC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE;YAC3C,KAAK,EAAE,QAAQ;YACf,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAOD,MAAM,UAAU,yBAAyB,CAAC,OAAO,GAA0B,EAAE;IAC3E,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,kBAAkB,CAAC;IAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,EAAE,QAAQ,EAAE,IAAI,KAAK,CAAC;IAE/D,sEAAsE;IACtE,6EAA6E;IAC7E,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAEnD,MAAM,MAAM,GAAG;;uDAEsC,CAAC;IAEtD,MAAM,UAAU,GAAG,KAAK;QACtB,CAAC,CAAC;;qMAE+L;QACjM,CAAC,CAAC,gGAAgG,CAAC;IAErG,MAAM,UAAU,GAAG,KAAK;QACtB,CAAC,CAAC,gHAAgH;QAClH,CAAC,CAAC;;qJAE+I,CAAC;IAEpJ,MAAM,OAAO,GAAG;;;;2GAIyF,CAAC;IAE1G,OAAO,GAAG,MAAM,OAAO,UAAU,OAAO,UAAU,OAAO,OAAO,EAAE,CAAC;AACrE,CAAC"}

package/dist/prompts/search-via-shell.test.ts

@@ -49,3 +49,21 @@ it('getSearchViaShellAddendum falls back to grep and find when both missing', ()
   expect(includesWord(result, 'find')).toBe(true);
   expect(result.toLowerCase().includes('hygiene')).toBe(true);
 });
+
+it('getSearchViaShellAddendum warns that pathless rg reads stdin', () => {
+  const result = getSearchViaShellAddendum({
+    checkBinary: () => true,
+  });
+
+  expect(result.toLowerCase()).toContain('explicit path');
+  expect(result.toLowerCase()).toContain('stdin');
+});
+
+it('getSearchViaShellAddendum warns about find -regex alternation ordering', () => {
+  const result = getSearchViaShellAddendum({
+    checkBinary: () => false,
+  });
+
+  expect(result).toContain('-regex');
+  expect(result.toLowerCase()).toContain('longest alternative first');
+});

package/dist/prompts/search-via-shell.ts

@@ -32,33 +32,16 @@ export function getSearchViaShellAddendum(options: SearchViaShellOptions = {}):
 Use the \`shell\` tool with the standard CLI binaries.`;
 
   const textSearch = hasRg
-    ? `**For text search**, use \`rg\` (ripgrep). Examples:
-- \`rg "pattern" src/\` — basic search, respects \`.gitignore\` by default.
-- \`rg -i "pattern" .\` — case-insensitive.
-- \`rg --no-ignore "pattern" .\` — when you need to search \`node_modules\`, build output, or anything in \`.gitignore\`.
-- \`rg -uu "pattern" .\` — include hidden + gitignored.
-- \`rg -g '*.ts' "pattern" .\` — restrict by glob.
-- \`rg -t ts "pattern" .\` — restrict by language preset.
-- \`rg -n "pattern" .\` — show line numbers (useful for follow-up edits).
-- \`rg -l "pattern" .\` — list files only.
-- \`rg -C 3 "pattern" .\` — 3 lines of context.
-- **Always pass an explicit path** (e.g. \`.\` or \`src/\`) to \`rg\`. When no path is given and stdin is a pipe, ripgrep reads stdin instead of searching the filesystem, returning no results.`
-    : `**For text search**, use \`grep\`. Examples:
-- \`grep -rn "pattern" src/\` — recursive search with line numbers.
-- \`grep -ri "pattern" src/\` — case-insensitive recursive search.
-- \`grep -rl "pattern" src/\` — list matching files only.
-- \`grep -C 3 "pattern" src/\` — show 3 lines of context.`;
+    ? `**For text search**, use \`rg\` (ripgrep). It respects \`.gitignore\` by default; \`--no-ignore\` or \`-uu\` when you need to search past it.
+
+**Always pass an explicit path** (e.g. \`.\` or \`src/\`). With no path given and stdin attached to a pipe, ripgrep reads stdin instead of searching the filesystem and silently returns no results.`
+    : `**For text search**, use \`grep\`, with \`-rn\` for a recursive search reporting line numbers.`;
 
   const fileSearch = hasFd
-    ? `**For file search**, use \`fd\`. Examples:
-- \`fd '\\.ts$'\` — regex over basenames.
-- \`fd -e ts\` — by extension.
-- \`fd -H -I\` — include hidden + gitignored (\`-uu\` style).
-- \`fd 'pattern' path/\` — scoped to a directory.`
-    : `**For file search**, use \`find\`. Examples:
-- \`find src/ -type f -name '*.ts'\` — search a subtree by basename glob.
-- **Always search from a specific path, not \`/\`.** Scanning the whole filesystem can exhaust resources on large trees.
-- When using \`find -regex\` with alternation, put the longest alternative first: \`'.*\\.(tsx|ts)'\` works; \`'.*\\.(ts|tsx)'\` silently skips \`.tsx\`.`;
+    ? `**For file search**, use \`fd\`. It also respects \`.gitignore\`; \`-H -I\` includes hidden and ignored files.`
+    : `**For file search**, use \`find\`, scoped to a specific path rather than \`/\` — scanning the whole filesystem can exhaust resources on large trees.
+
+With \`find -regex\` alternation, put the longest alternative first: \`'.*\\.(tsx|ts)'\` matches, while \`'.*\\.(ts|tsx)'\` silently skips \`.tsx\`.`;
 
   const hygiene = `**General shell hygiene:**
 - Quote paths that contain spaces.

package/dist/prompts/subagent-delegation.test.ts

@@ -1,5 +1,6 @@
 import { it, expect } from 'vitest';
 import { getSubagentDelegationAddendum } from './subagent-delegation.js';
+import { getAsyncSubagentDelegationAddendum } from './async-subagent-delegation.js';
 
 it('getSubagentDelegationAddendum returns non-empty delegation guidance', () => {
   const result = getSubagentDelegationAddendum();
@@ -70,3 +71,17 @@ it('does not advertise the librarian when persistent memory is disabled', () =>
   const result = getSubagentDelegationAddendum({ memoryEnabled: false });
   expect(result.includes('librarian')).toBe(false);
 });
+
+it('async control guidance distinguishes steering, cancellation, answers, and fresh-turn limits honestly', () => {
+  const result = getAsyncSubagentDelegationAddendum({ orchestratorMode: true, controlsEnabled: true });
+
+  expect(result).toContain('`send_message`');
+  expect(result).toContain('`cancel_run`');
+  expect(result).toContain('name or runId');
+  expect(result).toContain('`reply_to`');
+  expect(result).toContain('fresh session turn');
+  expect(result).toContain('maximum of three continuation segments');
+  expect(result).toContain('not SDK live injection');
+  expect(result).toContain('single point of contact');
+  expect(result).toContain('Do NOT call `get_subagent_result` immediately');
+});

package/dist/prompts/subagents/researcher.md

@@ -23,6 +23,12 @@ You have access to web search and web fetch tools, and read-only access to the w
 - Use only tools listed in the Available Tool Guidance section. If a tool is not listed there, it is not available.
 - Use available read, search, and code-context tools to inspect workspace files when relevant.
 
+## Asking the orchestrator
+
+- Use `ask_orchestrator` only for a genuine blocker that cannot be resolved from the task, workspace, or available research tools. State the specific decision needed.
+- The tool is available only when listed in your tools. It asks the owning orchestrator, never the user; do not contact the user directly.
+- Continue after the answer and finish the research task rather than ending or relaunching it.
+
 ## Approach
 
 1. Identify what information is needed.

package/dist/prompts/subagents/worker-prompt.test.ts

@@ -0,0 +1,35 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { it, expect } from 'vitest';
+
+const workerPrompt = fs.readFileSync(path.join(import.meta.dirname, 'worker.md'), 'utf-8');
+const researcherPrompt = fs.readFileSync(path.join(import.meta.dirname, 'researcher.md'), 'utf-8');
+
+it('worker prompt still requires running a validation command', () => {
+  const lower = workerPrompt.toLowerCase();
+  expect(lower).toContain('validation command');
+});
+
+it('worker prompt notes that validation and diff stat are auto-captured', () => {
+  const lower = workerPrompt.toLowerCase();
+  expect(lower).toContain('automatically captures');
+  expect(lower).toContain('diff stat');
+  expect(lower).toContain('do not need to paste the full output');
+});
+
+it('worker prompt mentions that shell-driven edits may not appear in diff stat', () => {
+  const lower = workerPrompt.toLowerCase();
+  expect(lower).toContain('shell-driven edits');
+  expect(lower).toContain('may not appear');
+});
+
+it('execution role prompts reserve ask_orchestrator for genuine blockers and never direct user contact', () => {
+  for (const prompt of [workerPrompt, researcherPrompt]) {
+    const lower = prompt.toLowerCase();
+    expect(lower).toContain('ask_orchestrator');
+    expect(lower).toContain('genuine blocker');
+    expect(lower).toContain('decision needed');
+    expect(lower).toContain('continue after');
+    expect(lower).toContain('do not contact the user');
+  }
+});

package/dist/prompts/subagents/worker.md

@@ -24,6 +24,12 @@ You have read and write access to the workspace (within the assigned write bound
 - Read relevant files before editing them.
 - Keep edits limited to the assigned scope. Do not broaden the task.
 
+## Asking the orchestrator
+
+- Use `ask_orchestrator` only for a genuine blocker that cannot be resolved from the task, workspace, or available tools. State the specific decision needed, not an open-ended status update.
+- The tool is available only when listed in your tools. It asks the owning orchestrator, never the user; do not contact the user directly.
+- After the answer arrives, continue after it and complete the assigned work. Do not terminate or relaunch the task merely because you asked.
+
 ## Scope discipline
 
 - If the parent names editable, read-only, or forbidden files in the task, obey those boundaries strictly.
@@ -45,5 +51,7 @@ After completing the task, return a concise report that includes:
 - Any issues encountered or assumptions made
 - Any scope conflicts: work you identified as needed but that fell outside your assigned scope
 
+The harness automatically captures the last validation command you ran (test/lint/typecheck/tsc/build) with its exit status and output, and a per-file line-change diff stat from your write-tool edits. You still need to run a validation command and may state which command you ran, but you do not need to paste the full output — the structured evidence is captured for you. Shell-driven edits outside the write tools may not appear in the diff stat; mention them in your summary if they matter.
+
 Do not include implementation details that are already visible in the diff.
 Do not claim work you did not do.

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

@@ -16,6 +16,8 @@ export type SendMessageOptions = {
     bypassInputSurgeGuard?: boolean;
     replayFromHistory?: boolean;
     preferredMessageId?: string;
+    /** The turn is model input only and must not be projected as a user message in the UI. */
+    suppressUserMessageDisplay?: boolean;
 };
 export type HandleApprovalDecisionOptions = {
     onTextChunk?: (fullText: string, chunk: string) => void;
@@ -52,6 +54,7 @@ export type ConversationEventSink = (event: ConversationEvent) => void;
 export type QueuedTurnStartObserver = (execution: {
     readonly requestId: string;
     readonly input: string | UserTurn;
+    readonly suppressUserMessageDisplay?: boolean;
 }) => void;
 export declare class ConversationAdapter {
     #private;
@@ -68,13 +71,18 @@ export declare class ConversationAdapter {
         approval: SessionApprovalQuery;
         turnFlow: TurnFlow;
         queueForeground?: boolean;
+        queueCapacity?: number;
+        /** Test seam: bound how long cancel waits for a hung active turn. */
+        activeCancelTimeoutMs?: number;
         queuePersistence?: QueuePersistence<QueuedMessageSnapshot>;
     });
     setEventSink(sink: ConversationEventSink | null): void;
     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>;
+    /** Whether the foreground queue owns a new submission's UI lifecycle. */
+    isQueueOwningSubmissions(): boolean;
+    sendMessage(input: string | UserTurn, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount, bypassInputSurgeGuard, replayFromHistory, preferredMessageId, suppressUserMessageDisplay, }?: SendMessageOptions): Promise<ConversationTerminal>;
     resumeQueue(): Promise<void>;
     discardQueue(): Promise<void>;
     /**
@@ -83,10 +91,10 @@ export declare class ConversationAdapter {
      * 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.
+     * The item is correlated by its controller id, never its queue position.
      */
     removeLastQueuedItem(): Promise<{
+        id: string;
         text: string;
     } | null>;
     abort(): 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

@@ -2,6 +2,20 @@ 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';
+const QUEUED_NON_TEXT_PLACEHOLDER = '[queued non-text user turn]';
+const LEGACY_QUEUED_MESSAGE_PLACEHOLDER = '\u0000queued-message';
+/** Upper bound for waiting on an active turn during cancel so the queue cannot stick in `cancelling`. */
+const ACTIVE_CANCEL_TIMEOUT_MS = 10_000;
+function queueCancellationError(message) {
+    const error = new Error(message);
+    error.name = 'AbortError';
+    return error;
+}
+function delay(ms) {
+    return new Promise((resolve) => {
+        setTimeout(resolve, ms);
+    });
+}
 export class ConversationAdapter {
     #sessionId;
     #startedAt;
@@ -15,17 +29,18 @@ export class ConversationAdapter {
     #logs;
     #approval;
     #turnFlow;
-    #pendingMessages = [];
     #messagesById = new Map();
     #queue;
     #nextQueuedMessageId = 1;
     #nextActionId = 1;
     #activeTurn = Promise.resolve();
+    #activeRequestId = null;
     #cancellation = Promise.resolve();
     #approvalExecutionId = null;
     #approvalActionId = null;
     #queueStateObserver = null;
     #queuedTurnStartObserver = null;
+    #activeCancelTimeoutMs;
     constructor(deps) {
         this.#sessionId = deps.sessionId;
         this.#startedAt = deps.startedAt;
@@ -38,22 +53,26 @@ export class ConversationAdapter {
         this.#logs = deps.logs;
         this.#approval = deps.approval;
         this.#turnFlow = deps.turnFlow;
+        this.#activeCancelTimeoutMs = deps.activeCancelTimeoutMs ?? ACTIVE_CANCEL_TIMEOUT_MS;
         if (deps.queueForeground) {
             const driver = {
                 start: (execution) => this.#startQueuedTurn(execution),
                 cancel: async () => {
-                    await this.#activeTurn;
+                    // 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),
+                    ]);
                 },
             };
             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 };
+                    const message = this.#messagesById.get(item.id);
+                    return message ? { requestId: item.id } : { requestId: item.id, recovered: true };
                 },
+                capacity: deps.queueCapacity,
                 persistence: deps.queuePersistence,
             });
         }
@@ -84,6 +103,13 @@ export class ConversationAdapter {
             state.kind === 'cancelling' ||
             state.kind === 'completing');
     }
+    /** Whether the foreground queue owns a new submission's UI lifecycle. */
+    isQueueOwningSubmissions() {
+        if (!this.#queue)
+            return false;
+        const state = this.#queue.state();
+        return state.kind !== 'idle' || state.queue.length > 0;
+    }
     #notifyQueueState() {
         if (!this.#queue || !this.#queueStateObserver)
             return;
@@ -120,7 +146,7 @@ export class ConversationAdapter {
             firstUserMessagePreview,
         }, fn);
     }
-    async sendMessage(input, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount = 0, bypassInputSurgeGuard, replayFromHistory, preferredMessageId, } = {}) {
+    async sendMessage(input, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount = 0, bypassInputSurgeGuard, replayFromHistory, preferredMessageId, suppressUserMessageDisplay, } = {}) {
         const queue = this.#queue;
         if (!queue) {
             return this.#executeMessage(input, {
@@ -135,8 +161,12 @@ export class ConversationAdapter {
         }
         return new Promise((resolve, reject) => {
             const requestId = preferredMessageId ?? String(this.#nextQueuedMessageId++);
+            if (this.#messagesById.has(requestId)) {
+                reject(new Error(`A queued message already uses request id ${requestId}`));
+                return;
+            }
             const message = {
-                input,
+                input: typeof input === 'string' ? input : structuredClone(input),
                 options: {
                     onTextChunk,
                     onReasoningChunk,
@@ -145,15 +175,27 @@ export class ConversationAdapter {
                     hallucinationRetryCount,
                     bypassInputSurgeGuard,
                     replayFromHistory,
+                    suppressUserMessageDisplay,
                 },
                 resolve,
                 reject,
             };
             this.#messagesById.set(requestId, message);
-            this.#pendingMessages.push({ requestId, message });
+            const displayText = normalizeUserTurn(input).text;
+            const controllerText = displayText.trim() ? displayText : QUEUED_NON_TEXT_PLACEHOLDER;
             void queue
-                .command({ kind: 'submit', text: normalizeUserTurn(input).text || '\u0000queued-message' })
-                .then(() => this.#notifyQueueState());
+                .command({ kind: 'submit', id: requestId, text: controllerText })
+                .then((result) => {
+                if (result.kind !== 'accepted') {
+                    const reason = result.kind === 'rejected' ? result.reason : result.kind;
+                    this.#settleFailure(requestId, new Error(`Foreground queue rejected message: ${reason}`));
+                }
+                this.#notifyQueueState();
+            })
+                .catch((error) => {
+                this.#settleFailure(requestId, error);
+                this.#notifyQueueState();
+            });
         });
     }
     async resumeQueue() {
@@ -166,7 +208,13 @@ export class ConversationAdapter {
     async discardQueue() {
         if (!this.#queue)
             return;
-        await this.#queue.command({ kind: 'discard_queue' });
+        const queuedIds = this.#queue.state().queue.map((item) => item.id);
+        const result = await this.#queue.command({ kind: 'discard_queue' });
+        if (result.kind === 'accepted') {
+            for (const requestId of queuedIds) {
+                this.#settleFailure(requestId, queueCancellationError('Queued message was discarded'));
+            }
+        }
         this.#notifyQueueState();
     }
     /**
@@ -175,8 +223,7 @@ export class ConversationAdapter {
      * 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.
+     * The item is correlated by its controller id, never its queue position.
      */
     async removeLastQueuedItem() {
         const queue = this.#queue;
@@ -187,27 +234,39 @@ export class ConversationAdapter {
             return null;
         // The queue is FIFO. The "last" queued item is the one at the tail.
         const lastItem = state.queue[state.queue.length - 1];
+        // Prefer the in-memory turn text: controller text may be a non-text placeholder.
+        const pending = this.#messagesById.get(lastItem.id);
+        const restoredText = pending
+            ? normalizeUserTurn(pending.input).text
+            : lastItem.text === QUEUED_NON_TEXT_PLACEHOLDER || lastItem.text === LEGACY_QUEUED_MESSAGE_PLACEHOLDER
+                ? ''
+                : lastItem.text;
         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.#settleFailure(lastItem.id, queueCancellationError('Queued message was removed'));
         this.#notifyQueueState();
-        return { text: lastItem.text };
+        return { id: lastItem.id, text: restoredText };
     }
     abort() {
         if (!this.#queue) {
             this.#turnFlow.abort?.();
             return;
         }
+        // Abort the live model/tool turn, then ask the controller to leave running
+        // and pause with retained work. If the active turn fails to settle on its
+        // own (a hung generator, missing abort hook, etc.), force-settle the active
+        // request so orchestrator awaits cannot stick forever. Retained queued
+        // requests stay pending — pause is not a terminal fate.
         this.#turnFlow.abort?.();
+        const activeRequestId = this.#activeRequestId;
         this.#cancellation = this.#queue.command({ kind: 'cancel' }).then(() => {
+            if (activeRequestId && this.#messagesById.has(activeRequestId)) {
+                this.#settleFailure(activeRequestId, queueCancellationError('Active turn was cancelled'));
+            }
+            if (this.#activeRequestId === activeRequestId) {
+                this.#activeRequestId = null;
+            }
             this.#notifyQueueState();
         });
     }
@@ -220,6 +279,7 @@ export class ConversationAdapter {
                 this.#queuedTurnStartObserver({
                     requestId: execution.snapshot.requestId,
                     input: message.input,
+                    suppressUserMessageDisplay: message.options.suppressUserMessageDisplay,
                 });
             }
             catch (error) {
@@ -228,14 +288,31 @@ export class ConversationAdapter {
                 });
             }
         }
-        this.#activeTurn = this.#runQueuedTurn(execution);
+        this.#activeRequestId = execution.snapshot.requestId;
+        this.#activeTurn = this.#runQueuedTurn(execution).finally(() => {
+            if (this.#activeRequestId === execution.snapshot.requestId) {
+                this.#activeRequestId = null;
+            }
+        });
     }
+    /**
+     * Run one foreground queue item.
+     *
+     * Failure policy: a failed active turn emits `failed` to the controller, which
+     * pauses the queue (`reason: 'failure'`) whenever retained work remains. The
+     * next item does not auto-start; the user must resume or discard. Cancellation
+     * of the active turn is the same shape with `reason: 'manual'`.
+     */
     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 ?? {});
+            const recoveredInput = execution.item.text === QUEUED_NON_TEXT_PLACEHOLDER || execution.item.text === LEGACY_QUEUED_MESSAGE_PLACEHOLDER
+                ? null
+                : execution.item.text;
+            if (!message && !recoveredInput) {
+                throw new Error('Recovered queued message has no executable text input');
+            }
+            const result = await this.#executeMessage(message?.input ?? recoveredInput, message?.options ?? {});
             if (result.type === 'approval_required') {
                 this.#approvalExecutionId = execution.executionId;
                 this.#approvalActionId = `adapter-action-${this.#nextActionId++}`;
@@ -246,19 +323,34 @@ export class ConversationAdapter {
                     request: {}, // existing runtime doesn't expose typed tool request details
                 });
                 this.#notifyQueueState();
-                message?.resolve(result);
+                this.#settleSuccess(execution.snapshot.requestId, result);
                 return;
             }
             await this.#queue.event({ kind: 'completed', executionId: execution.executionId, terminal: result });
             this.#notifyQueueState();
-            message?.resolve(result);
+            this.#settleSuccess(execution.snapshot.requestId, result);
         }
         catch (error) {
+            // Controller pauses with retained queue on failure when work remains.
             await this.#queue.event({ kind: 'failed', executionId: execution.executionId, failure: error });
             this.#notifyQueueState();
-            message?.reject(error);
+            this.#settleFailure(execution.snapshot.requestId, error);
         }
     }
+    #settleSuccess(requestId, terminal) {
+        const message = this.#messagesById.get(requestId);
+        if (!message)
+            return;
+        this.#messagesById.delete(requestId);
+        message.resolve(terminal);
+    }
+    #settleFailure(requestId, error) {
+        const message = this.#messagesById.get(requestId);
+        if (!message)
+            return;
+        this.#messagesById.delete(requestId);
+        message.reject(error);
+    }
     async #executeMessage(input, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount = 0, bypassInputSurgeGuard, replayFromHistory, } = {}) {
         const turn = normalizeUserTurn(input);
         return this.#withTrafficContext(turn.text, async () => {