@pentoshi/clai 3.6.0 → 3.7.3

package/dist/app/commands/registry.d.ts

@@ -5,11 +5,6 @@ export interface CommandHelpEntry {
     readonly description: string;
     readonly aliases: readonly string[];
 }
-/**
- * One typed source of truth for slash commands. Registration is closed once
- * seeded; handlers are attached by whichever frontend consumes the registry so
- * UI-coupled handler bodies are not duplicated across legacy and v2.
- */
 export declare class CommandRegistry {
     private readonly byName;
     private readonly aliasToName;
@@ -25,11 +20,6 @@ export declare class CommandRegistry {
     help(): CommandHelpEntry[];
     /** Parse a raw `/name args` line into a resolved invocation, or undefined. */
     parse(line: string, context?: CommandContext): CommandInvocation | undefined;
-    /**
-     * True when a submitted line should be treated as a slash-command attempt
-     * (known name, unique prefix, or command-shaped word) rather than a prompt.
-     * Paths like `/Users/...` return false.
-     */
     looksLikeCommand(line: string): boolean;
     /** Resolve + run the registered handler. Returns false if unknown/unhandled. */
     dispatch(invocation: {
@@ -38,8 +28,4 @@ export declare class CommandRegistry {
         context?: CommandContext | undefined;
     }): Promise<boolean>;
 }
-/**
- * Seed a registry from the shared legacy command catalogue so v2 and the
- * classic REPL agree on the command set without a second hand-maintained list.
- */
 export declare function buildDefaultCommandRegistry(): CommandRegistry;

package/dist/app/commands/registry.js

@@ -1,11 +1,5 @@
 import { slashCommands } from "../../repl/slash-commands.js";
 import { normalizeCommandName, } from "./command.js";
-/**
- * Canonical command -> alias names. The legacy catalogue lists aliases as
- * separate rows ("alias for /X"); here they collapse onto one canonical
- * command so menus, help, keybindings, and dispatch all derive from a single
- * definition (CMD-002, FEATURE_PARITY "aliases point to the same handler").
- */
 const ALIAS_GROUPS = {
     provider: ["use"],
     search: ["search-provider"],
@@ -13,11 +7,6 @@ const ALIAS_GROUPS = {
     think: ["thinking"],
     exit: ["quit"],
 };
-/**
- * One typed source of truth for slash commands. Registration is closed once
- * seeded; handlers are attached by whichever frontend consumes the registry so
- * UI-coupled handler bodies are not duplicated across legacy and v2.
- */
 export class CommandRegistry {
     byName = new Map();
     aliasToName = new Map();
@@ -102,11 +91,6 @@ export class CommandRegistry {
         }
         return undefined;
     }
-    /**
-     * True when a submitted line should be treated as a slash-command attempt
-     * (known name, unique prefix, or command-shaped word) rather than a prompt.
-     * Paths like `/Users/...` return false.
-     */
     looksLikeCommand(line) {
         if (!line.startsWith("/") || line.length < 2)
             return false;
@@ -136,10 +120,6 @@ export class CommandRegistry {
         return true;
     }
 }
-/**
- * Seed a registry from the shared legacy command catalogue so v2 and the
- * classic REPL agree on the command set without a second hand-maintained list.
- */
 export function buildDefaultCommandRegistry() {
     const registry = new CommandRegistry();
     const aliasNames = new Set();

package/dist/app/commands/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/app/commands/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EACL,oBAAoB,GAKrB,MAAM,cAAc,CAAC;AAEtB;;;;;GAKG;AACH,MAAM,YAAY,GAAsC;IACtD,QAAQ,EAAE,CAAC,KAAK,CAAC;IACjB,MAAM,EAAE,CAAC,iBAAiB,CAAC;IAC3B,QAAQ,EAAE,CAAC,WAAW,CAAC;IACvB,KAAK,EAAE,CAAC,UAAU,CAAC;IACnB,IAAI,EAAE,CAAC,MAAM,CAAC;CACf,CAAC;AASF;;;;GAIG;AACH,MAAM,OAAO,eAAe;IACT,MAAM,GAAG,IAAI,GAAG,EAA6B,CAAC;IAC9C,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;IACxC,QAAQ,GAAG,IAAI,GAAG,EAA0B,CAAC;IAE9D,QAAQ,CAAC,UAA6B;QACpC,MAAM,IAAI,GAAG,oBAAoB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACxD,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,EAAE,CAAC,CAAC;QACrD,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,GAAG,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,KAAK,MAAM,KAAK,IAAI,UAAU,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;YAC7C,MAAM,UAAU,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBACpE,MAAM,IAAI,KAAK,CAAC,4BAA4B,UAAU,EAAE,CAAC,CAAC;YAC5D,CAAC;YACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,OAAO,CAAC,WAAmB;QACzB,MAAM,IAAI,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QACvC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,GAAG,CAAC,WAAmB;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,SAAS,CAAC;IACjD,CAAC;IAED,GAAG,CAAC,WAAmB;QACrB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClD,CAAC;IAED,GAAG;QACD,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,UAAU,CAAC,WAAmB,EAAE,OAAuB;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACvC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,WAAW,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,4EAA4E;IAC5E,WAAW,CAAC,MAAc;QACxB,MAAM,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAwB,EAAE,CAAC;QACxC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YACvC,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;YACjD,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC9B,OAAO,EAAE,IAAI,GAAG,CAAC,IAAI,EAAE;YACvB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,OAAO,EAAE,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;SACjD,CAAC,CAAC,CAAC;IACN,CAAC;IAED,8EAA8E;IAC9E,KAAK,CACH,IAAY,EACZ,UAA0B,QAAQ;QAElC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,SAAS,CAAC;QAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QACjE,MAAM,IAAI,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACpE,mEAAmE;QACnE,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAChE,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpC,IAAI,KAAK;YAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QACjD,mEAAmE;QACnE,6CAA6C;QAC7C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QACnD,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,gBAAgB,CAAC,IAAY;QAC3B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACtD,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACzE,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YAAE,OAAO,IAAI,CAAC;QAC1C,IAAI,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;QACzD,OAAO,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/C,CAAC;IAED,gFAAgF;IAChF,KAAK,CAAC,QAAQ,CAAC,UAId;QACC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QACxB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QAC3B,MAAM,OAAO,CAAC;YACZ,IAAI;YACJ,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,EAAE;YAC3B,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,QAAQ;SACxC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,UAAU,2BAA2B;IACzC,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IACrC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAClD,KAAK,MAAM,KAAK,IAAI,OAAO;YAAE,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAS,CAAC,kCAAkC;QACtE,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACnC,QAAQ,CAAC,QAAQ,CAAC;YAChB,IAAI;YACJ,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAChC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/app/commands/registry.ts"],"names":[],"mappings":"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"}

package/dist/app/controllers/disposable.d.ts

@@ -1,11 +1,6 @@
 export interface Disposable {
     dispose(): void;
 }
-/**
- * Owns a set of disposables and tears them down in reverse creation order
- * (ARCHITECTURE.md lifecycle). Disposal is idempotent (REL-001): a second call
- * is a no-op, and one throwing disposer does not prevent the rest from running.
- */
 export declare class CompositeDisposable implements Disposable {
     private readonly items;
     private disposed;

package/dist/app/controllers/disposable.js

@@ -1,8 +1,3 @@
-/**
- * Owns a set of disposables and tears them down in reverse creation order
- * (ARCHITECTURE.md lifecycle). Disposal is idempotent (REL-001): a second call
- * is a no-op, and one throwing disposer does not prevent the rest from running.
- */
 export class CompositeDisposable {
     items = [];
     disposed = false;

package/dist/app/controllers/disposable.js.map

@@ -1 +1 @@
-{"version":3,"file":"disposable.js","sourceRoot":"","sources":["../../../src/app/controllers/disposable.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,MAAM,OAAO,mBAAmB;IACb,KAAK,GAAiB,EAAE,CAAC;IAClC,QAAQ,GAAG,KAAK,CAAC;IAEzB,GAAG,CAAuB,IAAO;QAC/B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,MAAM,MAAM,GAAc,EAAE,CAAC;QAC7B,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC;gBACH,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;YAC3B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QACtB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;CACF"}
+{"version":3,"file":"disposable.js","sourceRoot":"","sources":["../../../src/app/controllers/disposable.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,mBAAmB;IACb,KAAK,GAAiB,EAAE,CAAC;IAClC,QAAQ,GAAG,KAAK,CAAC;IAEzB,GAAG,CAAuB,IAAO;QAC/B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,MAAM,MAAM,GAAc,EAAE,CAAC;QAC7B,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC;gBACH,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;YAC3B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QACtB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;CACF"}

package/dist/app/controllers/job-controller.d.ts

@@ -1,10 +1,6 @@
 import type { ToolResult } from "../../types.js";
 import type { BackgroundJob, JobsPort } from "../ports/jobs-port.js";
 import type { Disposable } from "./disposable.js";
-/**
- * Thin lifecycle wrapper over `JobsPort` (CORE-004). Jobs live in the core
- * manager and survive UI rerenders; this controller only observes and commands.
- */
 export declare class JobController implements Disposable {
     private readonly jobs;
     constructor(jobs: JobsPort);
@@ -12,7 +8,7 @@ export declare class JobController implements Disposable {
     running(): BackgroundJob[];
     get(id: string): BackgroundJob | undefined;
     tail(id: string, bytes?: number): Promise<ToolResult>;
-    stop(id: string): ToolResult;
+    stop(id: string): Promise<ToolResult>;
     start(command: string, options?: {
         cwd?: string | undefined;
         name?: string | undefined;

package/dist/app/controllers/job-controller.js

@@ -1,7 +1,3 @@
-/**
- * Thin lifecycle wrapper over `JobsPort` (CORE-004). Jobs live in the core
- * manager and survive UI rerenders; this controller only observes and commands.
- */
 export class JobController {
     jobs;
     constructor(jobs) {

package/dist/app/controllers/job-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"job-controller.js","sourceRoot":"","sources":["../../../src/app/controllers/job-controller.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,MAAM,OAAO,aAAa;IACK;IAA7B,YAA6B,IAAc;QAAd,SAAI,GAAJ,IAAI,CAAU;IAAG,CAAC;IAE/C,IAAI;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAC1B,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,GAAG,CAAC,EAAU;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,CAAC,EAAU,EAAE,KAAc;QAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,CAAC,EAAU;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CACH,OAAe,EACf,OAAiE;QAEjE,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,OAAO;QACL,gEAAgE;IAClE,CAAC;CACF"}
+{"version":3,"file":"job-controller.js","sourceRoot":"","sources":["../../../src/app/controllers/job-controller.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,aAAa;IACK;IAA7B,YAA6B,IAAc;QAAd,SAAI,GAAJ,IAAI,CAAU;IAAG,CAAC;IAE/C,IAAI;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAC1B,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,GAAG,CAAC,EAAU;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,CAAC,EAAU,EAAE,KAAc;QAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,CAAC,EAAU;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CACH,OAAe,EACf,OAAiE;QAEjE,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,OAAO;QACL,gEAAgE;IAClE,CAAC;CACF"}

package/dist/app/controllers/plan-controller.d.ts

@@ -3,23 +3,20 @@ import type { AnyAppEvent } from "../events/app-event.js";
 import type { PersistencePort } from "../ports/persistence-port.js";
 import type { Disposable } from "./disposable.js";
 export type PlanListener = () => void;
-/**
- * Holds the one current plan entity and keeps it in sync with the event stream
- * (PLAN-003: mutate the existing plan, never append duplicates). Approval and
- * discard mutate persisted status through the persistence port. Observable so
- * the UI can bind reactively without polling (PLAN-002).
- */
 export declare class PlanController implements Disposable {
     private readonly persistence;
     private plan;
+    private loadGeneration;
+    private activeSessionId;
     private readonly listeners;
     constructor(persistence: PersistencePort);
     current(): SessionPlan | undefined;
     subscribe(listener: PlanListener): () => void;
     observe(event: AnyAppEvent): void;
     /**
-     * Load the plan for `sessionId` from disk into memory. Clears the in-memory
-     * plan when none is stored (so switching sessions never leaves a stale card).
+     * Load the plan for `sessionId` from disk into memory. The previous session's
+     * projection is cleared synchronously, and a generation token prevents a
+     * slower old-session load from repopulating the controller after /new.
      */
     load(sessionId: string): Promise<SessionPlan | undefined>;
     /** Drop the in-memory plan without touching disk. */

package/dist/app/controllers/plan-controller.js

@@ -1,12 +1,8 @@
-/**
- * Holds the one current plan entity and keeps it in sync with the event stream
- * (PLAN-003: mutate the existing plan, never append duplicates). Approval and
- * discard mutate persisted status through the persistence port. Observable so
- * the UI can bind reactively without polling (PLAN-002).
- */
 export class PlanController {
     persistence;
     plan;
+    loadGeneration = 0;
+    activeSessionId;
     listeners = new Set();
     constructor(persistence) {
         this.persistence = persistence;
@@ -20,29 +16,48 @@ export class PlanController {
     }
     observe(event) {
         if (event.type === "plan-updated") {
+            const eventSessionId = event.payload.plan.sessionId;
+            if (this.activeSessionId && eventSessionId !== this.activeSessionId) {
+                return;
+            }
+            this.activeSessionId ??= eventSessionId;
+            // A live event is newer than any in-flight disk projection.
+            this.loadGeneration += 1;
             this.plan = event.payload.plan;
             this.notify();
         }
     }
     /**
-     * Load the plan for `sessionId` from disk into memory. Clears the in-memory
-     * plan when none is stored (so switching sessions never leaves a stale card).
+     * Load the plan for `sessionId` from disk into memory. The previous session's
+     * projection is cleared synchronously, and a generation token prevents a
+     * slower old-session load from repopulating the controller after /new.
      */
     async load(sessionId) {
-        this.plan = await this.persistence.loadPlan(sessionId);
+        this.activeSessionId = sessionId;
+        const generation = ++this.loadGeneration;
+        this.plan = undefined;
+        this.notify();
+        const loaded = await this.persistence.loadPlan(sessionId);
+        if (generation !== this.loadGeneration)
+            return this.plan;
+        this.plan = loaded;
         this.notify();
         return this.plan;
     }
     /** Drop the in-memory plan without touching disk. */
     clear() {
-        if (!this.plan)
-            return;
+        // Always invalidate pending loads, even when the visible projection is
+        // already empty (a late promise must not resurrect it).
+        this.loadGeneration += 1;
+        const changed = this.plan !== undefined;
         this.plan = undefined;
-        this.notify();
+        if (changed)
+            this.notify();
     }
     async approve() {
         if (!this.plan)
             return undefined;
+        this.loadGeneration += 1;
         const next = { ...this.plan, status: "approved" };
         this.plan = next;
         await this.persistence.savePlan(next);
@@ -52,12 +67,15 @@ export class PlanController {
     async discard() {
         if (!this.plan)
             return;
+        this.loadGeneration += 1;
         const { sessionId } = this.plan;
         this.plan = undefined;
         await this.persistence.deletePlan(sessionId);
         this.notify();
     }
     dispose() {
+        this.loadGeneration += 1;
+        this.activeSessionId = undefined;
         this.plan = undefined;
         this.listeners.clear();
     }

package/dist/app/controllers/plan-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"plan-controller.js","sourceRoot":"","sources":["../../../src/app/controllers/plan-controller.ts"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,MAAM,OAAO,cAAc;IAII;IAHrB,IAAI,CAA0B;IACrB,SAAS,GAAG,IAAI,GAAG,EAAgB,CAAC;IAErD,YAA6B,WAA4B;QAA5B,gBAAW,GAAX,WAAW,CAAiB;IAAG,CAAC;IAE7D,OAAO;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,SAAS,CAAC,QAAsB;QAC9B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7B,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,CAAC,KAAkB;QACxB,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YAClC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,IAAI,CAAC,SAAiB;QAC1B,IAAI,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,qDAAqD;IACrD,KAAK;QACH,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO;QACvB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,SAAS,CAAC;QACjC,MAAM,IAAI,GAAgB,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;QAC/D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO;QACvB,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAChC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAEO,MAAM;QACZ,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS;YAAE,QAAQ,EAAE,CAAC;IACpD,CAAC;CACF"}
+{"version":3,"file":"plan-controller.js","sourceRoot":"","sources":["../../../src/app/controllers/plan-controller.ts"],"names":[],"mappings":"AAQA,MAAM,OAAO,cAAc;IAMI;IALrB,IAAI,CAA0B;IAC9B,cAAc,GAAG,CAAC,CAAC;IACnB,eAAe,CAAqB;IAC3B,SAAS,GAAG,IAAI,GAAG,EAAgB,CAAC;IAErD,YAA6B,WAA4B;QAA5B,gBAAW,GAAX,WAAW,CAAiB;IAAG,CAAC;IAE7D,OAAO;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,SAAS,CAAC,QAAsB;QAC9B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7B,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,CAAC,KAAkB;QACxB,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YAClC,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC;YACpD,IAAI,IAAI,CAAC,eAAe,IAAI,cAAc,KAAK,IAAI,CAAC,eAAe,EAAE,CAAC;gBACpE,OAAO;YACT,CAAC;YACD,IAAI,CAAC,eAAe,KAAK,cAAc,CAAC;YACxC,4DAA4D;YAC5D,IAAI,CAAC,cAAc,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,IAAI,CAAC,SAAiB;QAC1B,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;QACjC,MAAM,UAAU,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,UAAU,KAAK,IAAI,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC,IAAI,CAAC;QACzD,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;QACnB,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,qDAAqD;IACrD,KAAK;QACH,uEAAuE;QACvE,wDAAwD;QACxD,IAAI,CAAC,cAAc,IAAI,CAAC,CAAC;QACzB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;QACxC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,IAAI,OAAO;YAAE,IAAI,CAAC,MAAM,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,SAAS,CAAC;QACjC,IAAI,CAAC,cAAc,IAAI,CAAC,CAAC;QACzB,MAAM,IAAI,GAAgB,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;QAC/D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO;QACvB,IAAI,CAAC,cAAc,IAAI,CAAC,CAAC;QACzB,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAChC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,cAAc,IAAI,CAAC,CAAC;QACzB,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAEO,MAAM;QACZ,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS;YAAE,QAAQ,EAAE,CAAC;IACpD,CAAC;CACF"}

package/dist/app/controllers/session-controller.d.ts

@@ -37,22 +37,10 @@ export interface SessionControllerDeps {
     readonly idFactory?: IdFactory | undefined;
     readonly clock?: Clock | undefined;
     readonly mintTurnId?: (() => TurnId) | undefined;
-    /**
-     * Optional snapshot of the visual transcript for history.db (classic shape).
-     * When provided, completed turns upsert session + transcript so /history
-     * can restore tools and prompts, not only ChatMessage[].
-     */
     readonly getTranscriptSnapshot?: (() => ClassicTranscriptItem[] | undefined) | undefined;
     /** When true, never persist sessions or generate AI titles (CLI --no-history). */
     readonly noHistory?: boolean | undefined;
 }
-/**
- * Owns session-level state (mode, provider/model, cumulative history, queued
- * drafts) and runs turns through a single `TurnController`. Cumulative history
- * follows the current runner contract: `onMessages` hands back the full
- * conversation for the turn (prior context + this turn), which replaces the
- * stored history and is persisted on completion.
- */
 export type TurnEndListener = (result: TurnResult) => void;
 export type SessionStateListener = () => void;
 export declare class SessionController implements Disposable {
@@ -72,6 +60,12 @@ export declare class SessionController implements Disposable {
      * settles, {@link continueQueue} runs this before any remaining queue items.
      */
     private priorityPrompt;
+    /**
+     * Display override for the next turn only (`null` = hide YOU bubble).
+     * Used when implement/revision directives are queued while a turn is running.
+     */
+    private nextTurnDisplayPrompt;
+    private nextTurnDisplayArmed;
     /** Re-entrancy guard for {@link continueQueue}. */
     private continuingQueue;
     private provider;
@@ -115,46 +109,37 @@ export declare class SessionController implements Disposable {
     compact(sessionTranscript?: string, keepRecent?: number, signal?: AbortSignal): Promise<CompactResult>;
     /** Persist current messages (+ optional visual transcript) under this session id. */
     persistNow(name?: string): Promise<void>;
-    /**
-     * Ask the model for a short conversation title and upsert it into history.
-     * Cadence matches classic TUI: first completed exchange, then every +2 user
-     * turns so the name tracks the evolving topic.
-     */
     maybeRefreshTitle(): Promise<void>;
     estimateContext(): {
         messages: number;
         tokens: number;
     };
-    enqueue(prompt: string): void;
-    queued(): readonly string[];
-    removeQueued(index: number): void;
     /**
-     * Remove a queued draft and return its text (for "Edit" → composer).
-     * Returns undefined when the index is out of range.
+     * Queue a prompt while a turn is running. Optional displayPrompt is applied
+     * to the next dequeued turn (null hides the YOU bubble).
      */
+    enqueue(prompt: string, opts?: {
+        displayPrompt?: string | null | undefined;
+    }): void;
+    queued(): readonly string[];
+    removeQueued(index: number): void;
     takeQueued(index: number): string | undefined;
     /** Edit a queued draft in place before it runs (INPUT-007). */
     editQueued(index: number, text: string): void;
     /** Move a queued draft to a new position before it runs (INPUT-007). */
     reorderQueued(fromIndex: number, toIndex: number): void;
-    /**
-     * Send a queued prompt immediately. If a turn is running, abort it first;
-     * the chosen prompt runs next (ahead of any remaining queue). If idle,
-     * submit it now.
-     */
     sendQueuedNow(index: number): void;
     abort(): void;
-    /**
-     * After a turn settles, run any "send now" priority prompt, then drain the
-     * queue one-by-one. Safe to call from onTurnEnd (re-entrancy guarded).
-     */
     continueQueue(): Promise<void>;
+    private consumeNextTurnDisplay;
     /** In-memory plan-approval flag consumed by the agent gate (CORE-005). */
     setPlanApproved(value: boolean): void;
     isPlanApproved(): boolean;
     /** Fires after every turn settles (completed/aborted/error), including drain. */
     onTurnEnd(listener: TurnEndListener): () => void;
-    submit(prompt: string): Promise<TurnResult>;
+    submit(prompt: string, opts?: {
+        displayPrompt?: string | null | undefined;
+    }): Promise<TurnResult>;
     /**
      * Runs queued prompts one at a time while idle; stops on first
      * non-completion. Prefer {@link continueQueue} from the UI so priority

package/dist/app/controllers/session-controller.js

@@ -1,5 +1,6 @@
 import { compactMessagesWithSummary, estimateMessagesTokens, } from "../../agent/context-manager.js";
 import { createSessionPolicy } from "../../agent/session-policy.js";
+import { resolveTurnInput } from "../../attachments/service.js";
 import { generateSessionTitle } from "../../agent/session-title.js";
 import { completeWithProvider } from "../../llm/router.js";
 import { clearTextOnlyModels } from "../../llm/tool-protocol.js";
@@ -29,6 +30,12 @@ export class SessionController {
      * settles, {@link continueQueue} runs this before any remaining queue items.
      */
     priorityPrompt;
+    /**
+     * Display override for the next turn only (`null` = hide YOU bubble).
+     * Used when implement/revision directives are queued while a turn is running.
+     */
+    nextTurnDisplayPrompt = undefined;
+    nextTurnDisplayArmed = false;
     /** Re-entrancy guard for {@link continueQueue}. */
     continuingQueue = false;
     provider;
@@ -157,15 +164,9 @@ export class SessionController {
             throw new Error("a turn is already running");
         if (this.compactingFlag)
             throw new Error("compaction already in progress");
-        // Fall back to config defaults so /compact works even before a turn sets
-        // the live provider/model on the session controller — including right after
-        // /history resume when no turn has run yet in this process.
         const cfg = getConfig();
         const provider = this.provider ?? cfg.defaultProvider;
         const model = this.model ?? cfg.defaultModel;
-        // Snapshot history at start: includes /history resume + any new turns.
-        // compactMessagesWithSummary keeps the recent tail and summarizes the rest
-        // together with the visual session transcript (when provided).
         const historySnapshot = [...this.history];
         this.compactingFlag = true;
         this.notifyState();
@@ -238,11 +239,6 @@ export class SessionController {
             transcript,
         });
     }
-    /**
-     * Ask the model for a short conversation title and upsert it into history.
-     * Cadence matches classic TUI: first completed exchange, then every +2 user
-     * turns so the name tracks the evolving topic.
-     */
     async maybeRefreshTitle() {
         if (this.deps.noHistory || getConfig().privateMode)
             return;
@@ -290,7 +286,15 @@ export class SessionController {
             tokens: estimateMessagesTokens(this.history),
         };
     }
-    enqueue(prompt) {
+    /**
+     * Queue a prompt while a turn is running. Optional displayPrompt is applied
+     * to the next dequeued turn (null hides the YOU bubble).
+     */
+    enqueue(prompt, opts) {
+        if (opts && "displayPrompt" in opts) {
+            this.nextTurnDisplayPrompt = opts.displayPrompt;
+            this.nextTurnDisplayArmed = true;
+        }
         const text = prompt.trim();
         if (!text)
             return;
@@ -306,10 +310,6 @@ export class SessionController {
             this.notifyState();
         }
     }
-    /**
-     * Remove a queued draft and return its text (for "Edit" → composer).
-     * Returns undefined when the index is out of range.
-     */
     takeQueued(index) {
         if (index < 0 || index >= this.queue.length)
             return undefined;
@@ -338,11 +338,6 @@ export class SessionController {
             this.queue.splice(toIndex, 0, moved);
         this.notifyState();
     }
-    /**
-     * Send a queued prompt immediately. If a turn is running, abort it first;
-     * the chosen prompt runs next (ahead of any remaining queue). If idle,
-     * submit it now.
-     */
     sendQueuedNow(index) {
         const text = this.takeQueued(index);
         if (text === undefined)
@@ -358,10 +353,6 @@ export class SessionController {
     abort() {
         this.turn.abort();
     }
-    /**
-     * After a turn settles, run any "send now" priority prompt, then drain the
-     * queue one-by-one. Safe to call from onTurnEnd (re-entrancy guarded).
-     */
     async continueQueue() {
         if (this.continuingQueue || this.turn.running)
             return;
@@ -382,13 +373,22 @@ export class SessionController {
                 }
                 if (next === undefined || !next.trim())
                     continue;
-                await this.runTurn(next);
+                const displayOpts = this.consumeNextTurnDisplay();
+                await this.runTurn(next, displayOpts);
             }
         }
         finally {
             this.continuingQueue = false;
         }
     }
+    consumeNextTurnDisplay() {
+        if (!this.nextTurnDisplayArmed)
+            return undefined;
+        this.nextTurnDisplayArmed = false;
+        const displayPrompt = this.nextTurnDisplayPrompt;
+        this.nextTurnDisplayPrompt = undefined;
+        return { displayPrompt };
+    }
     /** In-memory plan-approval flag consumed by the agent gate (CORE-005). */
     setPlanApproved(value) {
         this.policy.planApproved.value = value;
@@ -401,11 +401,18 @@ export class SessionController {
         this.turnEndListeners.add(listener);
         return () => this.turnEndListeners.delete(listener);
     }
-    async submit(prompt) {
+    async submit(prompt, opts) {
         if (this.turn.running) {
             throw new Error("a turn is already running; enqueue() while busy");
         }
-        return this.runTurn(prompt);
+        // Explicit submit opts win over any armed queue display override.
+        if (opts && "displayPrompt" in opts) {
+            this.nextTurnDisplayArmed = false;
+            this.nextTurnDisplayPrompt = undefined;
+            return this.runTurn(prompt, opts);
+        }
+        const displayOpts = this.consumeNextTurnDisplay();
+        return this.runTurn(prompt, displayOpts ?? opts);
     }
     /**
      * Runs queued prompts one at a time while idle; stops on first
@@ -426,12 +433,29 @@ export class SessionController {
         }
         return results;
     }
-    async runTurn(prompt) {
-        const request = {
+    async runTurn(prompt, opts) {
+        const config = getConfig();
+        const provider = this.provider ?? config.defaultProvider;
+        const model = this.model ?? getProviderModel(provider);
+        const resolved = resolveTurnInput({
             prompt,
-            provider: this.provider,
-            model: this.model,
+            mode: this.mode,
+            provider,
+            model,
+        });
+        if (resolved.fallbackReason)
+            this.notice("info", resolved.fallbackReason);
+        const request = {
+            prompt: resolved.prompt,
+            mode: resolved.mode,
+            provider: resolved.provider,
+            model: resolved.model,
             history: this.history,
+            attachments: resolved.attachments,
+            images: resolved.images,
+            ...(opts?.displayPrompt !== undefined
+                ? { displayPrompt: opts.displayPrompt }
+                : {}),
         };
         const pending = this.turn.run(request, {
             confirm: this.deps.confirm,
@@ -442,9 +466,6 @@ export class SessionController {
                 this.notifyState();
             },
         });
-        // `TurnController.run` marks itself active synchronously before its first
-        // await, so this makes the RUNNING strip appear even before a provider
-        // emits its first status event.
         this.notifyState();
         const result = await pending;
         if (result.status === "completed") {