@bastani/atomic 0.9.10 → 0.9.11-alpha.10

package/dist/modes/interactive/interactive-prompt-restore.d.ts

@@ -0,0 +1,58 @@
+import type { InteractiveModeBase } from "./interactive-mode-base.ts";
+/**
+ * True when the prompt never reached an agent turn because the transport
+ * rejected it, so the typed text is still user-owned.
+ *
+ * Admission is the only input, and it is decisive. Every rejection `RpcClient`
+ * raises is built through `rpcTransportError`, and an accepted request is
+ * re-marked per request, so the classification already knows whether the child
+ * took ownership.
+ *
+ * Message text is deliberately not consulted. A provider, extension, or command
+ * error is free to contain a phrase like `Agent process stopped` after the
+ * engine admitted and ran the submission; restoring the draft there would hide
+ * a real failure and invite a duplicate run. Node also documents `error.message`
+ * as free to change in any release.
+ */
+export declare function isEngineSendFailure(error: unknown): boolean;
+/** Separator between a restored submission and text typed while it was pending. */
+export declare const RESTORED_DRAFT_SEPARATOR = "\n\n";
+/**
+ * Merge a rejected submission back into the live editor buffer in temporal
+ * order: the failed submission first, then whatever the user typed while the
+ * send was still pending.
+ *
+ * Presence is measured on the raw string, never on `trim()`, so whitespace-only
+ * typing is preserved too. Neither side is trimmed or normalized here.
+ */
+export declare function mergeRestoredDraft(draft: string, currentText: string): string;
+export interface PromptDraftRestoreTarget {
+    /** True once the submission reached an agent turn (`agent_start` observed). */
+    turnStarted: boolean;
+    /** Text to put back, exactly as the editor handed it to the submit callback. */
+    draft: string;
+    getEditorText(): string;
+    setEditorText(text: string): void;
+    editorOwnsInput(): boolean;
+    focusEditor(): void;
+    requestRender(): void;
+}
+/**
+ * Put a rejected submission back in the editor instead of discarding it.
+ *
+ * Only for a send that never landed: once the agent turn has started, the text
+ * belongs to the transcript and a mid-turn failure must not resurrect it.
+ * Returns true when the draft was restored.
+ */
+export declare function restoreUnsentPromptDraft(error: unknown, target: PromptDraftRestoreTarget): boolean;
+/**
+ * Host-bound restore used by every submit path (the prompt loop and the direct
+ * dispatch branches that bypass it).
+ *
+ * Returns true when the failure was a send the engine never accepted and the
+ * draft is back in the editor; false means the caller owns the error.
+ */
+export declare function restoreFailedSubmissionDraft(mode: InteractiveModeBase, error: unknown, draft: string, options?: {
+    turnStarted?: boolean;
+}): boolean;
+//# sourceMappingURL=interactive-prompt-restore.d.ts.map

package/dist/modes/interactive/interactive-prompt-restore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"interactive-prompt-restore.d.ts","sourceRoot":"","sources":["../../../src/modes/interactive/interactive-prompt-restore.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEtE;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAE3D;AAED,mFAAmF;AACnF,eAAO,MAAM,wBAAwB,SAAS,CAAC;AAE/C;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAE7E;AAED,MAAM,WAAW,wBAAwB;IACxC,+EAA+E;IAC/E,WAAW,EAAE,OAAO,CAAC;IACrB,gFAAgF;IAChF,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,IAAI,MAAM,CAAC;IACxB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,eAAe,IAAI,OAAO,CAAC;IAC3B,WAAW,IAAI,IAAI,CAAC;IACpB,aAAa,IAAI,IAAI,CAAC;CACtB;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAQlG;AAED;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAC3C,IAAI,EAAE,mBAAmB,EACzB,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GACjC,OAAO,CA2BT"}

package/dist/modes/interactive/interactive-prompt-restore.js

@@ -0,0 +1,87 @@
+import { isRpcRequestAcceptedFailure, isRpcTransportFailure } from "../rpc/rpc-transport-error.js";
+/**
+ * True when the prompt never reached an agent turn because the transport
+ * rejected it, so the typed text is still user-owned.
+ *
+ * Admission is the only input, and it is decisive. Every rejection `RpcClient`
+ * raises is built through `rpcTransportError`, and an accepted request is
+ * re-marked per request, so the classification already knows whether the child
+ * took ownership.
+ *
+ * Message text is deliberately not consulted. A provider, extension, or command
+ * error is free to contain a phrase like `Agent process stopped` after the
+ * engine admitted and ran the submission; restoring the draft there would hide
+ * a real failure and invite a duplicate run. Node also documents `error.message`
+ * as free to change in any release.
+ */
+export function isEngineSendFailure(error) {
+    return isRpcTransportFailure(error) && !isRpcRequestAcceptedFailure(error);
+}
+/** Separator between a restored submission and text typed while it was pending. */
+export const RESTORED_DRAFT_SEPARATOR = "\n\n";
+/**
+ * Merge a rejected submission back into the live editor buffer in temporal
+ * order: the failed submission first, then whatever the user typed while the
+ * send was still pending.
+ *
+ * Presence is measured on the raw string, never on `trim()`, so whitespace-only
+ * typing is preserved too. Neither side is trimmed or normalized here.
+ */
+export function mergeRestoredDraft(draft, currentText) {
+    return currentText.length === 0 ? draft : `${draft}${RESTORED_DRAFT_SEPARATOR}${currentText}`;
+}
+/**
+ * Put a rejected submission back in the editor instead of discarding it.
+ *
+ * Only for a send that never landed: once the agent turn has started, the text
+ * belongs to the transcript and a mid-turn failure must not resurrect it.
+ * Returns true when the draft was restored.
+ */
+export function restoreUnsentPromptDraft(error, target) {
+    if (target.turnStarted)
+        return false;
+    if (!isEngineSendFailure(error))
+        return false;
+    target.setEditorText(mergeRestoredDraft(target.draft, target.getEditorText()));
+    // Never steal focus from a modal that took over while the send was pending.
+    if (target.editorOwnsInput())
+        target.focusEditor();
+    target.requestRender();
+    return true;
+}
+/**
+ * Host-bound restore used by every submit path (the prompt loop and the direct
+ * dispatch branches that bypass it).
+ *
+ * Returns true when the failure was a send the engine never accepted and the
+ * draft is back in the editor; false means the caller owns the error.
+ */
+export function restoreFailedSubmissionDraft(mode, error, draft, options) {
+    // Submissions still waiting in the queue were never sent either. They come
+    // back with this one, in FIFO order, because leaving them queued would let
+    // each later failure prepend a newer draft above older restored text.
+    const queued = mode.pendingUserInputs;
+    const restored = restoreUnsentPromptDraft(error, {
+        turnStarted: options?.turnStarted === true,
+        draft: [draft, ...queued.map((submission) => submission.draft)].join(RESTORED_DRAFT_SEPARATOR),
+        // Expand first: a large paste lives in the editor's private paste registry
+        // and shows only a `[paste #1 … chars]` marker in the visible buffer, and
+        // setText() clears that registry. Reading the marker would round-trip dead
+        // text and destroy the payload.
+        getEditorText: () => mode.editor.getExpandedText?.() ?? mode.editor.getText(),
+        setEditorText: (text) => mode.editor.setText(text),
+        editorOwnsInput: () => mode.editorContainer.children.includes(mode.editor),
+        focusEditor: () => mode.ui.setFocus(mode.editor),
+        requestRender: () => mode.ui.requestRender(),
+    });
+    // A draft the host itself put back is a draft, never cooked startup input.
+    // Without this, the next getUserInput() would run the startup-input recovery
+    // over the restored text and replay a command-like draft as a submission —
+    // re-running the very command whose send just failed.
+    if (restored) {
+        queued.length = 0;
+        mode.startupCookedInputRecovered = true;
+    }
+    return restored;
+}
+//# sourceMappingURL=interactive-prompt-restore.js.map

package/dist/modes/interactive/interactive-prompt-restore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interactive-prompt-restore.js","sourceRoot":"","sources":["../../../src/modes/interactive/interactive-prompt-restore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAGnG;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAc;IACjD,OAAO,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;AAC5E,CAAC;AAED,mFAAmF;AACnF,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC;AAE/C;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAa,EAAE,WAAmB;IACpE,OAAO,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,wBAAwB,GAAG,WAAW,EAAE,CAAC;AAC/F,CAAC;AAcD;;;;;;GAMG;AACH,MAAM,UAAU,wBAAwB,CAAC,KAAc,EAAE,MAAgC;IACxF,IAAI,MAAM,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IACrC,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IAC/E,4EAA4E;IAC5E,IAAI,MAAM,CAAC,eAAe,EAAE;QAAE,MAAM,CAAC,WAAW,EAAE,CAAC;IACnD,MAAM,CAAC,aAAa,EAAE,CAAC;IACvB,OAAO,IAAI,CAAC;AACb,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,4BAA4B,CAC3C,IAAyB,EACzB,KAAc,EACd,KAAa,EACb,OAAmC;IAEnC,2EAA2E;IAC3E,2EAA2E;IAC3E,sEAAsE;IACtE,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC;IACtC,MAAM,QAAQ,GAAG,wBAAwB,CAAC,KAAK,EAAE;QAChD,WAAW,EAAE,OAAO,EAAE,WAAW,KAAK,IAAI;QAC1C,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC;QAC9F,2EAA2E;QAC3E,0EAA0E;QAC1E,2EAA2E;QAC3E,gCAAgC;QAChC,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;QAC7E,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;QAClD,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QAC1E,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QAChD,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE;KAC5C,CAAC,CAAC;IACH,2EAA2E;IAC3E,6EAA6E;IAC7E,2EAA2E;IAC3E,sDAAsD;IACtD,IAAI,QAAQ,EAAE,CAAC;QACd,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC;IACzC,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC","sourcesContent":["import { isRpcRequestAcceptedFailure, isRpcTransportFailure } from \"../rpc/rpc-transport-error.ts\";\nimport type { InteractiveModeBase } from \"./interactive-mode-base.ts\";\n\n/**\n * True when the prompt never reached an agent turn because the transport\n * rejected it, so the typed text is still user-owned.\n *\n * Admission is the only input, and it is decisive. Every rejection `RpcClient`\n * raises is built through `rpcTransportError`, and an accepted request is\n * re-marked per request, so the classification already knows whether the child\n * took ownership.\n *\n * Message text is deliberately not consulted. A provider, extension, or command\n * error is free to contain a phrase like `Agent process stopped` after the\n * engine admitted and ran the submission; restoring the draft there would hide\n * a real failure and invite a duplicate run. Node also documents `error.message`\n * as free to change in any release.\n */\nexport function isEngineSendFailure(error: unknown): boolean {\n\treturn isRpcTransportFailure(error) && !isRpcRequestAcceptedFailure(error);\n}\n\n/** Separator between a restored submission and text typed while it was pending. */\nexport const RESTORED_DRAFT_SEPARATOR = \"\\n\\n\";\n\n/**\n * Merge a rejected submission back into the live editor buffer in temporal\n * order: the failed submission first, then whatever the user typed while the\n * send was still pending.\n *\n * Presence is measured on the raw string, never on `trim()`, so whitespace-only\n * typing is preserved too. Neither side is trimmed or normalized here.\n */\nexport function mergeRestoredDraft(draft: string, currentText: string): string {\n\treturn currentText.length === 0 ? draft : `${draft}${RESTORED_DRAFT_SEPARATOR}${currentText}`;\n}\n\nexport interface PromptDraftRestoreTarget {\n\t/** True once the submission reached an agent turn (`agent_start` observed). */\n\tturnStarted: boolean;\n\t/** Text to put back, exactly as the editor handed it to the submit callback. */\n\tdraft: string;\n\tgetEditorText(): string;\n\tsetEditorText(text: string): void;\n\teditorOwnsInput(): boolean;\n\tfocusEditor(): void;\n\trequestRender(): void;\n}\n\n/**\n * Put a rejected submission back in the editor instead of discarding it.\n *\n * Only for a send that never landed: once the agent turn has started, the text\n * belongs to the transcript and a mid-turn failure must not resurrect it.\n * Returns true when the draft was restored.\n */\nexport function restoreUnsentPromptDraft(error: unknown, target: PromptDraftRestoreTarget): boolean {\n\tif (target.turnStarted) return false;\n\tif (!isEngineSendFailure(error)) return false;\n\ttarget.setEditorText(mergeRestoredDraft(target.draft, target.getEditorText()));\n\t// Never steal focus from a modal that took over while the send was pending.\n\tif (target.editorOwnsInput()) target.focusEditor();\n\ttarget.requestRender();\n\treturn true;\n}\n\n/**\n * Host-bound restore used by every submit path (the prompt loop and the direct\n * dispatch branches that bypass it).\n *\n * Returns true when the failure was a send the engine never accepted and the\n * draft is back in the editor; false means the caller owns the error.\n */\nexport function restoreFailedSubmissionDraft(\n\tmode: InteractiveModeBase,\n\terror: unknown,\n\tdraft: string,\n\toptions?: { turnStarted?: boolean },\n): boolean {\n\t// Submissions still waiting in the queue were never sent either. They come\n\t// back with this one, in FIFO order, because leaving them queued would let\n\t// each later failure prepend a newer draft above older restored text.\n\tconst queued = mode.pendingUserInputs;\n\tconst restored = restoreUnsentPromptDraft(error, {\n\t\tturnStarted: options?.turnStarted === true,\n\t\tdraft: [draft, ...queued.map((submission) => submission.draft)].join(RESTORED_DRAFT_SEPARATOR),\n\t\t// Expand first: a large paste lives in the editor's private paste registry\n\t\t// and shows only a `[paste #1 … chars]` marker in the visible buffer, and\n\t\t// setText() clears that registry. Reading the marker would round-trip dead\n\t\t// text and destroy the payload.\n\t\tgetEditorText: () => mode.editor.getExpandedText?.() ?? mode.editor.getText(),\n\t\tsetEditorText: (text) => mode.editor.setText(text),\n\t\teditorOwnsInput: () => mode.editorContainer.children.includes(mode.editor),\n\t\tfocusEditor: () => mode.ui.setFocus(mode.editor),\n\t\trequestRender: () => mode.ui.requestRender(),\n\t});\n\t// A draft the host itself put back is a draft, never cooked startup input.\n\t// Without this, the next getUserInput() would run the startup-input recovery\n\t// over the restored text and replay a command-like draft as a submission —\n\t// re-running the very command whose send just failed.\n\tif (restored) {\n\t\tqueued.length = 0;\n\t\tmode.startupCookedInputRecovered = true;\n\t}\n\treturn restored;\n}\n"]}

package/dist/modes/interactive/interactive-prompt-turn.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=interactive-prompt-turn.d.ts.map

package/dist/modes/interactive/interactive-prompt-turn.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"interactive-prompt-turn.d.ts","sourceRoot":"","sources":["../../../src/modes/interactive/interactive-prompt-turn.ts"],"names":[],"mappings":""}

package/dist/modes/interactive/interactive-prompt-turn.js

@@ -0,0 +1,56 @@
+import { tryExecuteSessionSlashCommand } from "../../core/agent-session-prompt.js";
+import { yieldToEventLoop } from "../../utils/event-loop.js";
+import { InteractiveModeBase } from "./interactive-mode-base.js";
+import { restoreFailedSubmissionDraft } from "./interactive-prompt-restore.js";
+import { toInteractiveSubmission } from "./interactive-submission.js";
+InteractiveModeBase.prototype.runUserPromptTurn = async function (input) {
+    const { text: userInput, draft } = toInteractiveSubmission(input);
+    // Show the working spinner immediately on submit so there is no visible gap
+    // while prompt preflight runs before the agent emits `agent_start`. The
+    // ownership flag keeps deferred startup from tearing it down mid-way.
+    this.promptTurnWorkingLoaderActive = true;
+    this.showWorkingLoaderNow();
+    const deferredStartupNeedsPromptGate = this.deferredStartupPending || this.deferredStartupPromise !== undefined;
+    // Yield once so the freshly-mounted spinner paints before synchronous
+    // preflight work can block the event loop.
+    await yieldToEventLoop();
+    // A submission that never reaches an agent turn stays user-owned, so track
+    // whether the turn actually started before deciding to restore the draft.
+    let turnStarted = false;
+    const unsubscribeTurnStart = this.session.subscribe((event) => {
+        if (event.type === "agent_start")
+            turnStarted = true;
+    });
+    try {
+        if (deferredStartupNeedsPromptGate) {
+            await this.ensureDeferredStartupComplete();
+        }
+        // The public facade omits prototype-installed command methods, but the
+        // interactive runtime always owns the concrete AgentSession dispatcher.
+        const handledSlashCommand = await tryExecuteSessionSlashCommand(this.session, userInput);
+        if (!handledSlashCommand) {
+            await this.session.resumeQueuedMessages();
+            await this.session.prompt(userInput);
+        }
+    }
+    catch (error) {
+        this.discardDeferredRenderedUserInput(userInput);
+        const restored = restoreFailedSubmissionDraft(this, error, draft, { turnStarted });
+        // A restored draft already tells the user the submission did not land, and
+        // the recovery status explains why. A red transport error beside it is noise.
+        if (!restored) {
+            this.showError(error instanceof Error ? error.message : "Unknown error occurred");
+        }
+    }
+    finally {
+        unsubscribeTurnStart();
+        this.promptTurnWorkingLoaderActive = false;
+        // A submission that resolves without starting an agent turn (e.g. a
+        // handled slash command) never emits `agent_end`, so clear the pre-shown
+        // spinner here when idle to avoid a lingering indicator.
+        if (!this.session.isStreaming) {
+            this.stopWorkingLoader();
+        }
+    }
+};
+//# sourceMappingURL=interactive-prompt-turn.js.map

package/dist/modes/interactive/interactive-prompt-turn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interactive-prompt-turn.js","sourceRoot":"","sources":["../../../src/modes/interactive/interactive-prompt-turn.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAA8B,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAElG,mBAAmB,CAAC,SAAS,CAAC,iBAAiB,GAAG,KAAK,WAEtD,KAAqC;IAErC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAClE,4EAA4E;IAC5E,wEAAwE;IACxE,sEAAsE;IACtE,IAAI,CAAC,6BAA6B,GAAG,IAAI,CAAC;IAC1C,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC5B,MAAM,8BAA8B,GAAG,IAAI,CAAC,sBAAsB,IAAI,IAAI,CAAC,sBAAsB,KAAK,SAAS,CAAC;IAChH,sEAAsE;IACtE,2CAA2C;IAC3C,MAAM,gBAAgB,EAAE,CAAC;IACzB,2EAA2E;IAC3E,0EAA0E;IAC1E,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;QAC7D,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa;YAAE,WAAW,GAAG,IAAI,CAAC;IACtD,CAAC,CAAC,CAAC;IACH,IAAI,CAAC;QACJ,IAAI,8BAA8B,EAAE,CAAC;YACpC,MAAM,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAC5C,CAAC;QACD,uEAAuE;QACvE,wEAAwE;QACxE,MAAM,mBAAmB,GAAG,MAAM,6BAA6B,CAC9D,IAAI,CAAC,OAC+F,EACpG,SAAS,CACT,CAAC;QACF,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC;YAC1C,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;IACF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,IAAI,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC;QACjD,MAAM,QAAQ,GAAG,4BAA4B,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QACnF,2EAA2E;QAC3E,8EAA8E;QAC9E,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,IAAI,CAAC,SAAS,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;QACnF,CAAC;IACF,CAAC;YAAS,CAAC;QACV,oBAAoB,EAAE,CAAC;QACvB,IAAI,CAAC,6BAA6B,GAAG,KAAK,CAAC;QAC3C,oEAAoE;QACpE,yEAAyE;QACzE,yDAAyD;QACzD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC/B,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC1B,CAAC;IACF,CAAC;AACF,CAAC,CAAC","sourcesContent":["import type { AgentSessionInternalSurface } from \"../../core/agent-session-methods.ts\";\nimport { tryExecuteSessionSlashCommand } from \"../../core/agent-session-prompt.ts\";\nimport { yieldToEventLoop } from \"../../utils/event-loop.ts\";\nimport { InteractiveModeBase } from \"./interactive-mode-base.ts\";\nimport { restoreFailedSubmissionDraft } from \"./interactive-prompt-restore.ts\";\nimport { type InteractiveSubmission, toInteractiveSubmission } from \"./interactive-submission.ts\";\n\nInteractiveModeBase.prototype.runUserPromptTurn = async function (\n\tthis: InteractiveModeBase,\n\tinput: InteractiveSubmission | string,\n): Promise<void> {\n\tconst { text: userInput, draft } = toInteractiveSubmission(input);\n\t// Show the working spinner immediately on submit so there is no visible gap\n\t// while prompt preflight runs before the agent emits `agent_start`. The\n\t// ownership flag keeps deferred startup from tearing it down mid-way.\n\tthis.promptTurnWorkingLoaderActive = true;\n\tthis.showWorkingLoaderNow();\n\tconst deferredStartupNeedsPromptGate = this.deferredStartupPending || this.deferredStartupPromise !== undefined;\n\t// Yield once so the freshly-mounted spinner paints before synchronous\n\t// preflight work can block the event loop.\n\tawait yieldToEventLoop();\n\t// A submission that never reaches an agent turn stays user-owned, so track\n\t// whether the turn actually started before deciding to restore the draft.\n\tlet turnStarted = false;\n\tconst unsubscribeTurnStart = this.session.subscribe((event) => {\n\t\tif (event.type === \"agent_start\") turnStarted = true;\n\t});\n\ttry {\n\t\tif (deferredStartupNeedsPromptGate) {\n\t\t\tawait this.ensureDeferredStartupComplete();\n\t\t}\n\t\t// The public facade omits prototype-installed command methods, but the\n\t\t// interactive runtime always owns the concrete AgentSession dispatcher.\n\t\tconst handledSlashCommand = await tryExecuteSessionSlashCommand(\n\t\t\tthis.session as typeof this.session &\n\t\t\t\tPick<AgentSessionInternalSurface, \"_tryExecuteBuiltinSlashCommand\" | \"_tryExecuteExtensionCommand\">,\n\t\t\tuserInput,\n\t\t);\n\t\tif (!handledSlashCommand) {\n\t\t\tawait this.session.resumeQueuedMessages();\n\t\t\tawait this.session.prompt(userInput);\n\t\t}\n\t} catch (error) {\n\t\tthis.discardDeferredRenderedUserInput(userInput);\n\t\tconst restored = restoreFailedSubmissionDraft(this, error, draft, { turnStarted });\n\t\t// A restored draft already tells the user the submission did not land, and\n\t\t// the recovery status explains why. A red transport error beside it is noise.\n\t\tif (!restored) {\n\t\t\tthis.showError(error instanceof Error ? error.message : \"Unknown error occurred\");\n\t\t}\n\t} finally {\n\t\tunsubscribeTurnStart();\n\t\tthis.promptTurnWorkingLoaderActive = false;\n\t\t// A submission that resolves without starting an agent turn (e.g. a\n\t\t// handled slash command) never emits `agent_end`, so clear the pre-shown\n\t\t// spinner here when idle to avoid a lingering indicator.\n\t\tif (!this.session.isStreaming) {\n\t\t\tthis.stopWorkingLoader();\n\t\t}\n\t}\n};\n"]}

package/dist/modes/interactive/interactive-queueing.js

@@ -1,18 +1,14 @@
 import { InteractiveModeBase } from "./interactive-mode-base.js";
-import { Spacer, TruncatedText, combineQueuedMessagesForEditor, theme } from "./interactive-mode-deps.js";
+import { combineQueuedMessagesForEditor, Spacer, TruncatedText, theme } from "./interactive-mode-deps.js";
 InteractiveModeBase.prototype.getAllQueuedMessages = function () {
     return {
         steering: [
             ...this.session.getSteeringMessages(),
-            ...this.compactionQueuedMessages
-                .filter((msg) => msg.mode === "steer")
-                .map((msg) => msg.text),
+            ...this.compactionQueuedMessages.filter((msg) => msg.mode === "steer").map((msg) => msg.text),
         ],
         followUp: [
             ...this.session.getFollowUpMessages(),
-            ...this.compactionQueuedMessages
-                .filter((msg) => msg.mode === "followUp")
-                .map((msg) => msg.text),
+            ...this.compactionQueuedMessages.filter((msg) => msg.mode === "followUp").map((msg) => msg.text),
         ],
     };
 };
@@ -128,9 +124,10 @@ InteractiveModeBase.prototype.flushCompactionQueue = async function (options) {
         for (const message of preCommands) {
             await this.session.prompt(message.text);
         }
-        // Send first prompt (starts streaming)
+        // Start a prompt when idle, or preserve its delivery mode if a run is
+        // still winding down after compaction.
         const promptPromise = this.session
-            .prompt(firstPrompt.text)
+            .prompt(firstPrompt.text, { streamingBehavior: firstPrompt.mode })
             .catch((error) => {
             restoreQueue(error);
         });

package/dist/modes/interactive/interactive-queueing.js.map

@@ -1 +1 @@
-{"version":3,"file":"interactive-queueing.js","sourceRoot":"","sources":["../../../src/modes/interactive/interactive-queueing.ts"],"names":[],"mappings":"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","sourcesContent":["import { InteractiveModeBase } from \"./interactive-mode-base.ts\";\nimport { Spacer, TruncatedText, combineQueuedMessagesForEditor, theme } from \"./interactive-mode-deps.ts\";\n\nInteractiveModeBase.prototype.getAllQueuedMessages = function(this: InteractiveModeBase): { steering: string[]; followUp: string[] } {\n    return {\n      steering: [\n        ...this.session.getSteeringMessages(),\n        ...this.compactionQueuedMessages\n          .filter((msg) => msg.mode === \"steer\")\n          .map((msg) => msg.text),\n      ],\n      followUp: [\n        ...this.session.getFollowUpMessages(),\n        ...this.compactionQueuedMessages\n          .filter((msg) => msg.mode === \"followUp\")\n          .map((msg) => msg.text),\n      ],\n    };\n  };\n\nInteractiveModeBase.prototype.clearAllQueues = function(this: InteractiveModeBase): { steering: string[]; followUp: string[] } {\n    const { steering, followUp } = this.session.clearQueue();\n    const compactionSteering = this.compactionQueuedMessages\n      .filter((msg) => msg.mode === \"steer\")\n      .map((msg) => msg.text);\n    const compactionFollowUp = this.compactionQueuedMessages\n      .filter((msg) => msg.mode === \"followUp\")\n      .map((msg) => msg.text);\n    this.compactionQueuedMessages = [];\n    return {\n      steering: [...steering, ...compactionSteering],\n      followUp: [...followUp, ...compactionFollowUp],\n    };\n  };\n\nInteractiveModeBase.prototype.updatePendingMessagesDisplay = function(this: InteractiveModeBase): void {\n    this.pendingMessagesContainer.clear();\n    const { steering: steeringMessages, followUp: followUpMessages } =\n      this.getAllQueuedMessages();\n    if (steeringMessages.length > 0 || followUpMessages.length > 0) {\n      this.pendingMessagesContainer.addChild(new Spacer(1));\n      for (const message of steeringMessages) {\n        const text = theme.fg(\"dim\", `Steering: ${message}`);\n        this.pendingMessagesContainer.addChild(new TruncatedText(text, 1, 0));\n      }\n      for (const message of followUpMessages) {\n        const text = theme.fg(\"dim\", `Follow-up: ${message}`);\n        this.pendingMessagesContainer.addChild(new TruncatedText(text, 1, 0));\n      }\n      const dequeueHint = this.getAppKeyDisplay(\"app.message.dequeue\");\n      const hintText = theme.fg(\n        \"dim\",\n        `↳ ${dequeueHint} to edit all queued messages`,\n      );\n      this.pendingMessagesContainer.addChild(new TruncatedText(hintText, 1, 0));\n    }\n  };\n\nInteractiveModeBase.prototype.restoreQueuedMessagesToEditor = function(this: InteractiveModeBase, options?: {\n    abort?: boolean;\n    currentText?: string;\n  }): number {\n    const { steering, followUp } = this.clearAllQueues();\n    const allQueued = [...steering, ...followUp];\n    if (allQueued.length === 0) {\n      this.updatePendingMessagesDisplay();\n      if (options?.abort) {\n        void this.session.abort();\n      }\n      return 0;\n    }\n    const currentText = options?.currentText ?? this.editor.getText();\n    const combinedText = combineQueuedMessagesForEditor(allQueued, currentText);\n    this.editor.setText(combinedText);\n    this.updatePendingMessagesDisplay();\n    if (options?.abort) {\n      void this.session.abort();\n    }\n    return allQueued.length;\n  };\n\nInteractiveModeBase.prototype.queueCompactionMessage = function(this: InteractiveModeBase, text: string, mode: \"steer\" | \"followUp\"): void {\n    this.compactionQueuedMessages.push({ text, mode });\n    this.editor.addToHistory?.(text);\n    this.editor.setText(\"\");\n    this.updatePendingMessagesDisplay();\n    this.showStatus(\"Queued message for after compaction\");\n  };\n\nInteractiveModeBase.prototype.isExtensionCommand = function(this: InteractiveModeBase, text: string): boolean {\n    if (!text.startsWith(\"/\")) return false;\n\n    const extensionRunner = this.session.extensionRunner;\n\n    const spaceIndex = text.indexOf(\" \");\n    const commandName =\n      spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);\n    return !!extensionRunner.getCommand(commandName);\n  };\n\nInteractiveModeBase.prototype.flushCompactionQueue = async function(this: InteractiveModeBase, options?: {\n    willRetry?: boolean;\n  }): Promise<void> {\n    if (this.compactionQueuedMessages.length === 0) {\n      return;\n    }\n\n    const queuedMessages = [...this.compactionQueuedMessages];\n    this.compactionQueuedMessages = [];\n    this.updatePendingMessagesDisplay();\n\n    const restoreQueue = (error: unknown) => {\n      this.session.clearQueue();\n      this.compactionQueuedMessages = queuedMessages;\n      this.updatePendingMessagesDisplay();\n      this.showError(\n        `Failed to send queued message${queuedMessages.length > 1 ? \"s\" : \"\"}: ${\n          error instanceof Error ? error.message : String(error)\n        }`,\n      );\n    };\n\n    try {\n      if (options?.willRetry) {\n        // When retry is pending, queue messages for the retry turn\n        for (const message of queuedMessages) {\n          if (this.isExtensionCommand(message.text)) {\n            await this.session.prompt(message.text);\n          } else if (message.mode === \"followUp\") {\n            await this.session.followUp(message.text);\n          } else {\n            await this.session.steer(message.text);\n          }\n        }\n        this.updatePendingMessagesDisplay();\n        return;\n      }\n\n      // Find first non-extension-command message to use as prompt\n      const firstPromptIndex = queuedMessages.findIndex(\n        (message) => !this.isExtensionCommand(message.text),\n      );\n      if (firstPromptIndex === -1) {\n        // All extension commands - execute them all\n        for (const message of queuedMessages) {\n          await this.session.prompt(message.text);\n        }\n        return;\n      }\n\n      // Execute any extension commands before the first prompt\n      const preCommands = queuedMessages.slice(0, firstPromptIndex);\n      const firstPrompt = queuedMessages[firstPromptIndex];\n      const rest = queuedMessages.slice(firstPromptIndex + 1);\n\n      for (const message of preCommands) {\n        await this.session.prompt(message.text);\n      }\n\n      // Send first prompt (starts streaming)\n      const promptPromise = this.session\n        .prompt(firstPrompt.text)\n        .catch((error) => {\n          restoreQueue(error);\n        });\n\n      // Queue remaining messages\n      for (const message of rest) {\n        if (this.isExtensionCommand(message.text)) {\n          await this.session.prompt(message.text);\n        } else if (message.mode === \"followUp\") {\n          await this.session.followUp(message.text);\n        } else {\n          await this.session.steer(message.text);\n        }\n      }\n      this.updatePendingMessagesDisplay();\n      void promptPromise;\n    } catch (error) {\n      restoreQueue(error);\n    }\n  };\n\nInteractiveModeBase.prototype.flushPendingBashComponents = function(this: InteractiveModeBase): void {\n    for (const component of this.pendingBashComponents) {\n      this.pendingMessagesContainer.removeChild(component);\n      this.chatContainer.addChild(component);\n    }\n    this.pendingBashComponents = [];\n  };\n"]}
+{"version":3,"file":"interactive-queueing.js","sourceRoot":"","sources":["../../../src/modes/interactive/interactive-queueing.ts"],"names":[],"mappings":"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","sourcesContent":["import { InteractiveModeBase } from \"./interactive-mode-base.ts\";\nimport { combineQueuedMessagesForEditor, Spacer, TruncatedText, theme } from \"./interactive-mode-deps.ts\";\n\nInteractiveModeBase.prototype.getAllQueuedMessages = function (this: InteractiveModeBase): {\n\tsteering: string[];\n\tfollowUp: string[];\n} {\n\treturn {\n\t\tsteering: [\n\t\t\t...this.session.getSteeringMessages(),\n\t\t\t...this.compactionQueuedMessages.filter((msg) => msg.mode === \"steer\").map((msg) => msg.text),\n\t\t],\n\t\tfollowUp: [\n\t\t\t...this.session.getFollowUpMessages(),\n\t\t\t...this.compactionQueuedMessages.filter((msg) => msg.mode === \"followUp\").map((msg) => msg.text),\n\t\t],\n\t};\n};\n\nInteractiveModeBase.prototype.clearAllQueues = function (this: InteractiveModeBase): {\n\tsteering: string[];\n\tfollowUp: string[];\n} {\n\tconst { steering, followUp } = this.session.clearQueue();\n\tconst compactionSteering = this.compactionQueuedMessages\n\t\t.filter((msg) => msg.mode === \"steer\")\n\t\t.map((msg) => msg.text);\n\tconst compactionFollowUp = this.compactionQueuedMessages\n\t\t.filter((msg) => msg.mode === \"followUp\")\n\t\t.map((msg) => msg.text);\n\tthis.compactionQueuedMessages = [];\n\treturn {\n\t\tsteering: [...steering, ...compactionSteering],\n\t\tfollowUp: [...followUp, ...compactionFollowUp],\n\t};\n};\n\nInteractiveModeBase.prototype.updatePendingMessagesDisplay = function (this: InteractiveModeBase): void {\n\tthis.pendingMessagesContainer.clear();\n\tconst { steering: steeringMessages, followUp: followUpMessages } = this.getAllQueuedMessages();\n\tif (steeringMessages.length > 0 || followUpMessages.length > 0) {\n\t\tthis.pendingMessagesContainer.addChild(new Spacer(1));\n\t\tfor (const message of steeringMessages) {\n\t\t\tconst text = theme.fg(\"dim\", `Steering: ${message}`);\n\t\t\tthis.pendingMessagesContainer.addChild(new TruncatedText(text, 1, 0));\n\t\t}\n\t\tfor (const message of followUpMessages) {\n\t\t\tconst text = theme.fg(\"dim\", `Follow-up: ${message}`);\n\t\t\tthis.pendingMessagesContainer.addChild(new TruncatedText(text, 1, 0));\n\t\t}\n\t\tconst dequeueHint = this.getAppKeyDisplay(\"app.message.dequeue\");\n\t\tconst hintText = theme.fg(\"dim\", `↳ ${dequeueHint} to edit all queued messages`);\n\t\tthis.pendingMessagesContainer.addChild(new TruncatedText(hintText, 1, 0));\n\t}\n};\n\nInteractiveModeBase.prototype.restoreQueuedMessagesToEditor = function (\n\tthis: InteractiveModeBase,\n\toptions?: {\n\t\tabort?: boolean;\n\t\tcurrentText?: string;\n\t},\n): number {\n\tconst { steering, followUp } = this.clearAllQueues();\n\tconst allQueued = [...steering, ...followUp];\n\tif (allQueued.length === 0) {\n\t\tthis.updatePendingMessagesDisplay();\n\t\tif (options?.abort) {\n\t\t\tvoid this.session.abort();\n\t\t}\n\t\treturn 0;\n\t}\n\tconst currentText = options?.currentText ?? this.editor.getText();\n\tconst combinedText = combineQueuedMessagesForEditor(allQueued, currentText);\n\tthis.editor.setText(combinedText);\n\tthis.updatePendingMessagesDisplay();\n\tif (options?.abort) {\n\t\tvoid this.session.abort();\n\t}\n\treturn allQueued.length;\n};\n\nInteractiveModeBase.prototype.queueCompactionMessage = function (\n\tthis: InteractiveModeBase,\n\ttext: string,\n\tmode: \"steer\" | \"followUp\",\n): void {\n\tthis.compactionQueuedMessages.push({ text, mode });\n\tthis.editor.addToHistory?.(text);\n\tthis.editor.setText(\"\");\n\tthis.updatePendingMessagesDisplay();\n\tthis.showStatus(\"Queued message for after compaction\");\n};\n\nInteractiveModeBase.prototype.isExtensionCommand = function (this: InteractiveModeBase, text: string): boolean {\n\tif (!text.startsWith(\"/\")) return false;\n\n\tconst extensionRunner = this.session.extensionRunner;\n\n\tconst spaceIndex = text.indexOf(\" \");\n\tconst commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);\n\treturn !!extensionRunner.getCommand(commandName);\n};\n\nInteractiveModeBase.prototype.flushCompactionQueue = async function (\n\tthis: InteractiveModeBase,\n\toptions?: {\n\t\twillRetry?: boolean;\n\t},\n): Promise<void> {\n\tif (this.compactionQueuedMessages.length === 0) {\n\t\treturn;\n\t}\n\n\tconst queuedMessages = [...this.compactionQueuedMessages];\n\tthis.compactionQueuedMessages = [];\n\tthis.updatePendingMessagesDisplay();\n\n\tconst restoreQueue = (error: unknown) => {\n\t\tthis.session.clearQueue();\n\t\tthis.compactionQueuedMessages = queuedMessages;\n\t\tthis.updatePendingMessagesDisplay();\n\t\tthis.showError(\n\t\t\t`Failed to send queued message${queuedMessages.length > 1 ? \"s\" : \"\"}: ${\n\t\t\t\terror instanceof Error ? error.message : String(error)\n\t\t\t}`,\n\t\t);\n\t};\n\n\ttry {\n\t\tif (options?.willRetry) {\n\t\t\t// When retry is pending, queue messages for the retry turn\n\t\t\tfor (const message of queuedMessages) {\n\t\t\t\tif (this.isExtensionCommand(message.text)) {\n\t\t\t\t\tawait this.session.prompt(message.text);\n\t\t\t\t} else if (message.mode === \"followUp\") {\n\t\t\t\t\tawait this.session.followUp(message.text);\n\t\t\t\t} else {\n\t\t\t\t\tawait this.session.steer(message.text);\n\t\t\t\t}\n\t\t\t}\n\t\t\tthis.updatePendingMessagesDisplay();\n\t\t\treturn;\n\t\t}\n\n\t\t// Find first non-extension-command message to use as prompt\n\t\tconst firstPromptIndex = queuedMessages.findIndex((message) => !this.isExtensionCommand(message.text));\n\t\tif (firstPromptIndex === -1) {\n\t\t\t// All extension commands - execute them all\n\t\t\tfor (const message of queuedMessages) {\n\t\t\t\tawait this.session.prompt(message.text);\n\t\t\t}\n\t\t\treturn;\n\t\t}\n\n\t\t// Execute any extension commands before the first prompt\n\t\tconst preCommands = queuedMessages.slice(0, firstPromptIndex);\n\t\tconst firstPrompt = queuedMessages[firstPromptIndex];\n\t\tconst rest = queuedMessages.slice(firstPromptIndex + 1);\n\n\t\tfor (const message of preCommands) {\n\t\t\tawait this.session.prompt(message.text);\n\t\t}\n\n\t\t// Start a prompt when idle, or preserve its delivery mode if a run is\n\t\t// still winding down after compaction.\n\t\tconst promptPromise = this.session\n\t\t\t.prompt(firstPrompt.text, { streamingBehavior: firstPrompt.mode })\n\t\t\t.catch((error) => {\n\t\t\t\trestoreQueue(error);\n\t\t\t});\n\n\t\t// Queue remaining messages\n\t\tfor (const message of rest) {\n\t\t\tif (this.isExtensionCommand(message.text)) {\n\t\t\t\tawait this.session.prompt(message.text);\n\t\t\t} else if (message.mode === \"followUp\") {\n\t\t\t\tawait this.session.followUp(message.text);\n\t\t\t} else {\n\t\t\t\tawait this.session.steer(message.text);\n\t\t\t}\n\t\t}\n\t\tthis.updatePendingMessagesDisplay();\n\t\tvoid promptPromise;\n\t} catch (error) {\n\t\trestoreQueue(error);\n\t}\n};\n\nInteractiveModeBase.prototype.flushPendingBashComponents = function (this: InteractiveModeBase): void {\n\tfor (const component of this.pendingBashComponents) {\n\t\tthis.pendingMessagesContainer.removeChild(component);\n\t\tthis.chatContainer.addChild(component);\n\t}\n\tthis.pendingBashComponents = [];\n};\n"]}

package/dist/modes/interactive/interactive-render-chat.js

@@ -1,17 +1,17 @@
-import { InteractiveModeBase } from "./interactive-mode-base.js";
-import { Spacer, Text, parseSkillBlock, AssistantMessageComponent, BashExecutionComponent, BranchSummaryMessageComponent, chatEntriesFromAgentMessages, renderChatMessageEntry, addChatTranscriptEntry, CompactionBoundaryMessageComponent, CustomMessageComponent, SkillInvocationMessageComponent, ToolExecutionComponent, UserMessageComponent, recordTimeSinceReset, theme } from "./interactive-mode-deps.js";
-import { yieldToEventLoop } from "../../utils/event-loop.js";
+import { CACHE_TTL_MS, collectCacheMisses } from "../../core/cache-stats.js";
 import { VERBATIM_COMPACTION_PREFIX } from "../../core/messages.js";
+import { buildContextEntries, sessionEntryToContextMessages } from "../../core/session-manager.js";
+import { yieldToEventLoop } from "../../utils/event-loop.js";
 import { IsolatedInteractiveRuntime } from "../interactive-engine/isolated-runtime.js";
 import { RemoteCustomMessageComponent, RemoteToolExecutionComponent } from "../interactive-engine/remote-renderer.js";
+import { CustomEntryComponent } from "./components/custom-entry.js";
+import { InteractiveModeBase } from "./interactive-mode-base.js";
+import { AssistantMessageComponent, addChatTranscriptEntry, BashExecutionComponent, BranchSummaryMessageComponent, CompactionBoundaryMessageComponent, CustomMessageComponent, chatEntriesFromAgentMessages, parseSkillBlock, recordTimeSinceReset, renderChatMessageEntry, SkillInvocationMessageComponent, Spacer, Text, ToolExecutionComponent, theme, UserMessageComponent, } from "./interactive-mode-deps.js";
 InteractiveModeBase.prototype.showStatus = function (message) {
     const children = this.chatContainer.children;
     const last = children.length > 0 ? children[children.length - 1] : undefined;
     const secondLast = children.length > 1 ? children[children.length - 2] : undefined;
-    if (last &&
-        secondLast &&
-        last === this.lastStatusText &&
-        secondLast === this.lastStatusSpacer) {
+    if (last && secondLast && last === this.lastStatusText && secondLast === this.lastStatusSpacer) {
         this.lastStatusText.setText(theme.fg("dim", message));
         this.ui.requestRender();
         return;
@@ -77,19 +77,28 @@ InteractiveModeBase.prototype.chatMessageRenderOptions = function () {
         imageWidthCells: this.settingsManager.getImageWidthCells(),
         outputPad: this.outputPad,
         getToolDefinition: isolated ? undefined : (toolName) => this.getRegisteredToolDefinition(toolName),
-        getCustomMessageRenderer: isolated ? undefined : (customType) => this.session.extensionRunner.getMessageRenderer(customType),
-        createToolComponent: isolated ? (entry) => {
-            const component = new RemoteToolExecutionComponent(entry.toolName, entry.toolCallId, entry.args, { showImages: this.settingsManager.getShowImages(), imageWidthCells: this.settingsManager.getImageWidthCells() }, this.runtimeHost, () => this.ui.requestRender());
-            component.setExpanded(this.toolOutputExpanded);
-            if (entry.result)
-                component.updateResult(entry.result, entry.isPartial ?? false);
-            return component;
-        } : undefined,
-        createCustomMessageComponent: isolated ? (message) => {
-            const component = new RemoteCustomMessageComponent(message, this.runtimeHost, () => this.ui.requestRender());
-            component.setExpanded(this.toolOutputExpanded);
-            return component;
-        } : undefined,
+        getCustomMessageRenderer: isolated
+            ? undefined
+            : (customType) => this.session.extensionRunner.getMessageRenderer(customType),
+        createToolComponent: isolated
+            ? (entry) => {
+                const component = new RemoteToolExecutionComponent(entry.toolName, entry.toolCallId, entry.args, {
+                    showImages: this.settingsManager.getShowImages(),
+                    imageWidthCells: this.settingsManager.getImageWidthCells(),
+                }, this.runtimeHost, () => this.ui.requestRender());
+                component.setExpanded(this.toolOutputExpanded);
+                if (entry.result)
+                    component.updateResult(entry.result, entry.isPartial ?? false);
+                return component;
+            }
+            : undefined,
+        createCustomMessageComponent: isolated
+            ? (message) => {
+                const component = new RemoteCustomMessageComponent(message, this.runtimeHost, () => this.ui.requestRender(), this.outputPad);
+                component.setExpanded(this.toolOutputExpanded);
+                return component;
+            }
+            : undefined,
     };
 };
 InteractiveModeBase.prototype.addRenderedChatEntry = function (entry) {
@@ -103,6 +112,20 @@ InteractiveModeBase.prototype.addCompactionBoundaryToChat = function (result) {
     component.setExpanded(this.toolOutputExpanded);
     this.chatContainer.addChild(component);
 };
+InteractiveModeBase.prototype.addCustomEntryToChat = function (entry) {
+    const renderer = this.session.extensionRunner.getEntryRenderer(entry.customType);
+    if (!renderer)
+        return;
+    const component = new CustomEntryComponent(entry, renderer);
+    component.setExpanded(this.toolOutputExpanded);
+    if (!component.hasContent())
+        return;
+    const streamingIndex = this.streamingComponent ? this.chatContainer.children.indexOf(this.streamingComponent) : -1;
+    if (streamingIndex >= 0)
+        this.chatContainer.children.splice(streamingIndex, 0, component);
+    else
+        this.chatContainer.addChild(component);
+};
 InteractiveModeBase.prototype.addMessageToChat = function (message, options) {
     switch (message.role) {
         case "bashExecution": {
@@ -110,17 +133,15 @@ InteractiveModeBase.prototype.addMessageToChat = function (message, options) {
             if (message.output) {
                 component.appendOutput(message.output);
             }
-            component.setComplete(message.exitCode, message.cancelled, message.truncated
-                ? { truncated: true }
-                : undefined, message.fullOutputPath);
+            component.setComplete(message.exitCode, message.cancelled, message.truncated ? { truncated: true } : undefined, message.fullOutputPath);
             this.chatContainer.addChild(component);
             break;
         }
         case "custom": {
             if (message.display) {
                 const component = this.runtimeHost instanceof IsolatedInteractiveRuntime
-                    ? new RemoteCustomMessageComponent(message, this.runtimeHost, () => this.ui.requestRender())
-                    : new CustomMessageComponent(message, this.session.extensionRunner.getMessageRenderer(message.customType), this.getMarkdownThemeWithSettings());
+                    ? new RemoteCustomMessageComponent(message, this.runtimeHost, () => this.ui.requestRender(), this.outputPad)
+                    : new CustomMessageComponent(message, this.session.extensionRunner.getMessageRenderer(message.customType), this.getMarkdownThemeWithSettings(), this.outputPad);
                 component.setExpanded(this.toolOutputExpanded);
                 this.chatContainer.addChild(component);
             }
@@ -186,9 +207,7 @@ InteractiveModeBase.prototype.renderSessionContext = function (sessionContext, o
     const entries = chatEntriesFromAgentMessages(sessionContext.messages);
     for (const entry of entries) {
         const component = this.addRenderedChatEntry(entry);
-        if (entry.kind === "tool" &&
-            entry.isPartial !== false &&
-            component instanceof ToolExecutionComponent) {
+        if (entry.kind === "tool" && entry.isPartial !== false && component instanceof ToolExecutionComponent) {
             this.pendingTools.set(entry.toolCallId, component);
         }
         if (options.populateHistory && entry.kind === "user") {
@@ -200,23 +219,83 @@ InteractiveModeBase.prototype.renderSessionContext = function (sessionContext, o
     }
     this.ui.requestRender();
 };
+InteractiveModeBase.prototype.renderSessionEntries = function (sessionEntries, options = {}) {
+    this.pendingTools.clear();
+    const deferredInputs = [...this.deferredRenderedUserInputs];
+    this.deferredRenderedUserInputs = [];
+    this.deferredRenderedUserInputComponents.clear();
+    if (options.updateFooter) {
+        this.footer.invalidate();
+        this.updateEditorBorderColor();
+    }
+    let messageBuffer = [];
+    let firstMessage = true;
+    const flushMessages = () => {
+        if (options.suppressCompactionBoundary &&
+            firstMessage &&
+            isSynthesizedCompactionBoundary(messageBuffer[0], options.suppressCompactionBoundary)) {
+            messageBuffer = messageBuffer.slice(1);
+        }
+        firstMessage = false;
+        for (const entry of chatEntriesFromAgentMessages(messageBuffer)) {
+            const component = this.addRenderedChatEntry(entry);
+            if (entry.kind === "tool" && entry.isPartial !== false && component instanceof ToolExecutionComponent) {
+                this.pendingTools.set(entry.toolCallId, component);
+            }
+            if (options.populateHistory && entry.kind === "user")
+                this.editor.addToHistory?.(entry.text);
+        }
+        messageBuffer = [];
+    };
+    for (const entry of sessionEntries) {
+        if (entry.type === "custom") {
+            flushMessages();
+            this.addCustomEntryToChat(entry);
+        }
+        else {
+            messageBuffer.push(...sessionEntryToContextMessages(entry));
+        }
+    }
+    flushMessages();
+    if (this.settingsManager.getShowCacheMissNotices()) {
+        for (const miss of collectCacheMisses(sessionEntries, {
+            getModel: (provider, model) => this.session.modelRuntime.getModel(provider, model),
+        }).values()) {
+            const cause = miss.modelChanged
+                ? " after model switch"
+                : miss.idleMs >= CACHE_TTL_MS
+                    ? " after cache TTL expiry"
+                    : "";
+            this.chatContainer.addChild(new Text(theme.fg("warning", `Prompt cache miss${cause}: ${miss.missedTokens.toLocaleString()} tokens re-billed ($${miss.missedCost.toFixed(3)})`), 1, 0));
+        }
+    }
+    for (const input of deferredInputs)
+        this.renderDeferredUserInput(input);
+    this.ui.requestRender();
+};
 InteractiveModeBase.prototype.attachStartupNoticesContainer = function (options = {}) {
-    const isAttached = this.chatContainer.children.includes(this.startupNoticesContainer);
-    if (isAttached)
+    const disclosureIndex = this.chatContainer.children.indexOf(this.resourceDisclosureContainer);
+    const noticesIndex = this.chatContainer.children.indexOf(this.startupNoticesContainer);
+    if (disclosureIndex >= 0 && noticesIndex >= 0)
         return;
-    if (options.resetDetached) {
-        this.startupNoticesContainer.clear();
+    if (disclosureIndex < 0) {
+        if (options.resetDetached)
+            this.resourceDisclosureContainer.clear();
+        if (noticesIndex >= 0)
+            this.chatContainer.children.splice(noticesIndex, 0, this.resourceDisclosureContainer);
+        else
+            this.chatContainer.addChild(this.resourceDisclosureContainer);
+    }
+    if (noticesIndex < 0) {
+        if (options.resetDetached)
+            this.startupNoticesContainer.clear();
+        this.chatContainer.addChild(this.startupNoticesContainer);
     }
-    this.chatContainer.addChild(this.startupNoticesContainer);
 };
 InteractiveModeBase.prototype.renderInitialMessages = function () {
     this.attachStartupNoticesContainer({ resetDetached: true });
-    // Get aligned messages and entries from session context
-    const context = this.sessionManager.buildSessionContext();
-    this.renderSessionContext(context, {
-        updateFooter: true,
-        populateHistory: true,
-    });
+    const entries = buildContextEntries(this.sessionManager.getEntries(), this.sessionManager.getLeafId());
+    this.renderSessionEntries(entries, { updateFooter: true, populateHistory: true });
 };
 InteractiveModeBase.prototype.getUserInput = async function () {
     for (let attempt = 0; !this.startupCookedInputRecovered && attempt < 10; attempt += 1) {
@@ -234,9 +313,9 @@ InteractiveModeBase.prototype.getUserInput = async function () {
             continue;
         }
         return new Promise((resolve) => {
-            this.onInputCallback = (text) => {
+            this.onInputCallback = (submission) => {
                 this.onInputCallback = undefined;
-                resolve(text);
+                resolve(submission);
             };
             if (!this.inputHandlerReadyRecorded) {
                 this.inputHandlerReadyRecorded = true;
@@ -262,13 +341,11 @@ InteractiveModeBase.prototype.getUserInput = async function () {
 };
 InteractiveModeBase.prototype.rebuildChatFromMessages = function (options = {}) {
     this.chatContainer.clear();
+    if (options.resetStartupDisclosure)
+        this.resourceDisclosureContainer.clear();
     this.attachStartupNoticesContainer();
-    let context = this.sessionManager.buildSessionContext();
-    const synthesizedBoundary = options.suppressCompactionBoundary;
-    if (synthesizedBoundary && isSynthesizedCompactionBoundary(context.messages[0], synthesizedBoundary)) {
-        context = { ...context, messages: context.messages.slice(1) };
-    }
-    this.renderSessionContext(context);
+    const entries = buildContextEntries(this.sessionManager.getEntries(), this.sessionManager.getLeafId());
+    this.renderSessionEntries(entries, { suppressCompactionBoundary: options.suppressCompactionBoundary });
 };
 function isSynthesizedCompactionBoundary(message, result) {
     if (message?.role !== "custom" || message.customType !== "compaction" || !message.display)
@@ -277,7 +354,10 @@ function isSynthesizedCompactionBoundary(message, result) {
     if (details?.strategy !== "verbatim-lines")
         return false;
     const content = Array.isArray(message.content)
-        ? message.content.filter((block) => block.type === "text").map((block) => block.text).join("\n")
+        ? message.content
+            .filter((block) => block.type === "text")
+            .map((block) => block.text)
+            .join("\n")
         : message.content;
     return content === VERBATIM_COMPACTION_PREFIX + result.compactedText;
 }