@@ -2,7 +2,7 @@ import { afterEach, describe, expect, test } from "bun:test";
22 import { mkdtempSync, rmSync } from "node:fs";
33 import { tmpdir } from "node:os";
44 import { join } from "node:path";
5-import type { Node } from "@cel-tui/types";
5+import type { ContainerNode, Node } from "@cel-tui/types";
66 import type { AssistantMessage, Model } from "@mariozechner/pi-ai";
77 import {
88 createAssistantMessageEventStream,
@@ -16,6 +16,7 @@ import {
1616 } from "@mariozechner/pi-ai";
1717 import type { AppState } from "./index.ts";
1818 import {
19+ appendPromptHistory,
1920 createSession,
2021 createUiMessage,
2122 loadMessages,
@@ -38,12 +39,14 @@ import {
3839 type InputController,
3940 type PendingToolCall,
4041 previewToolRenderLines,
42+ renderActiveOverlay,
4143 renderAssistantMessage,
4244 renderBaseLayout,
4345 renderInputArea,
4446 renderStatusBar,
4547 renderStreamingResponse,
4648 renderToolResult,
49+ resetUiState,
4750 type ToolRenderLine,
4851 } from "./ui.ts";
4952
@@ -85,6 +88,22 @@ function findTextNode(node: Node | null, content: string): Node | null {
8588 return null;
8689 }
8790
91+function findNodeWithKeyPress(node: Node | null): ContainerNode | null {
92+ if (!node || node.type === "textinput" || node.type === "text") {
93+ return null;
94+ }
95+ if (typeof node.props.onKeyPress === "function") {
96+ return node;
97+ }
98+ for (const child of node.children) {
99+ const found = findNodeWithKeyPress(child);
100+ if (found) {
101+ return found;
102+ }
103+ }
104+ return null;
105+}
106+
88107 const tempDirs: string[] = [];
89108
90109 function createTempDir(): string {
@@ -153,6 +172,7 @@ function makeAssistantWithUsage(
153172 }
154173
155174 afterEach(() => {
175+ resetUiState();
156176 for (const dir of tempDirs.splice(0)) {
157177 rmSync(dir, { recursive: true, force: true });
158178 }
@@ -430,6 +450,43 @@ describe("ui rendering", () => {
430450 }
431451 });
432452
453+ test("submitted prompts are stored as raw global input-history entries", async () => {
454+ const faux = registerFauxProvider();
455+ const state = createTestState();
456+ const originalPath = process.env.PATH;
457+ process.env.PATH = `${process.env.PATH ?? ""}:/usr/bin:/bin`;
458+ state.cwd = process.cwd();
459+ state.canonicalCwd = process.cwd();
460+ state.model = faux.getModel();
461+ faux.setResponses([fauxAssistantMessage("Done.")]);
462+
463+ try {
464+ handleInput(" hello from history ", state);
465+
466+ await waitFor(() => state.session !== null);
467+ const rows = state.db
468+ .query<
469+ { text: string; cwd: string; session_id: string | null },
470+ []
471+ >("SELECT text, cwd, session_id FROM prompt_history ORDER BY id DESC LIMIT 1")
472+ .all();
473+
474+ expect(rows).toHaveLength(1);
475+ expect(rows[0]?.text).toBe(" hello from history ");
476+ expect(rows[0]?.cwd).toBe(state.cwd);
477+ expect(rows[0]?.session_id).toBe(state.session?.id ?? null);
478+
479+ await waitFor(() =>
480+ state.messages.some((message) => message.role === "assistant"),
481+ );
482+ } finally {
483+ await stopRunningTurn(state);
484+ process.env.PATH = originalPath;
485+ faux.unregister();
486+ state.db.close();
487+ }
488+ });
489+
433490 test("/new clears the active session and defers replacement session creation", async () => {
434491 const faux = registerFauxProvider();
435492 const state = createTestState();
@@ -758,6 +815,132 @@ describe("ui rendering", () => {
758815 }
759816 });
760817
818+ test("Ctrl+R opens input history with newest prompts first", () => {
819+ const state = createTestState();
820+
821+ try {
822+ appendPromptHistory(state.db, {
823+ text: "older prompt",
824+ cwd: "/tmp/older",
825+ });
826+ appendPromptHistory(state.db, {
827+ text: "newest prompt",
828+ cwd: "/tmp/newer",
829+ });
830+
831+ const controller = createInputController(state);
832+ const base = renderBaseLayout(state, 80, controller);
833+
834+ expect(base.type).toBe("vstack");
835+ if (base.type !== "vstack") {
836+ throw new Error("Expected base layout to be a vstack");
837+ }
838+
839+ base.props.onKeyPress?.("ctrl+r");
840+
841+ const overlay = renderActiveOverlay(state);
842+ const text = collectText(overlay);
843+ const newestIndex = text.findIndex((line) =>
844+ line.includes("newest prompt"),
845+ );
846+ const olderIndex = text.findIndex((line) =>
847+ line.includes("older prompt"),
848+ );
849+
850+ expect(overlay).not.toBeNull();
851+ expect(text).toContain("Input history");
852+ expect(newestIndex).toBeGreaterThan(-1);
853+ expect(olderIndex).toBeGreaterThan(-1);
854+ expect(newestIndex).toBeLessThan(olderIndex);
855+ } finally {
856+ state.db.close();
857+ }
858+ });
859+
860+ test("selecting input history restores the exact raw prompt into the input", () => {
861+ const state = createTestState();
862+ const rawPrompt = "first line\nsecond line";
863+
864+ try {
865+ appendPromptHistory(state.db, {
866+ text: "older prompt",
867+ cwd: "/tmp/older",
868+ });
869+ appendPromptHistory(state.db, {
870+ text: rawPrompt,
871+ cwd: state.cwd,
872+ });
873+
874+ const controller = createInputController(state);
875+ const base = renderBaseLayout(state, 80, controller);
876+ if (base.type !== "vstack") {
877+ throw new Error("Expected base layout to be a vstack");
878+ }
879+
880+ base.props.onKeyPress?.("ctrl+r");
881+
882+ const overlay = renderActiveOverlay(state);
883+ const selectNode = findNodeWithKeyPress(overlay);
884+
885+ expect(selectNode).not.toBeNull();
886+ if (!selectNode) {
887+ throw new Error("Expected overlay to contain a Select root");
888+ }
889+
890+ selectNode.props.onKeyPress?.("enter");
891+
892+ expect(renderActiveOverlay(state)).toBeNull();
893+ const input = renderInputArea(state.theme, controller);
894+ if (input.type !== "textinput") {
895+ throw new Error("Expected input area to render a TextInput");
896+ }
897+ expect(input.props.value).toBe(rawPrompt);
898+ } finally {
899+ state.db.close();
900+ }
901+ });
902+
903+ test("dismissing input history keeps the current draft unchanged", () => {
904+ const state = createTestState();
905+ const draft = "draft prompt";
906+
907+ try {
908+ appendPromptHistory(state.db, {
909+ text: "saved prompt",
910+ cwd: state.cwd,
911+ });
912+
913+ const controller = createInputController(state);
914+ controller.onChange(draft);
915+
916+ const base = renderBaseLayout(state, 80, controller);
917+ if (base.type !== "vstack") {
918+ throw new Error("Expected base layout to be a vstack");
919+ }
920+
921+ base.props.onKeyPress?.("ctrl+r");
922+
923+ const overlay = renderActiveOverlay(state);
924+ const selectNode = findNodeWithKeyPress(overlay);
925+
926+ expect(selectNode).not.toBeNull();
927+ if (!selectNode) {
928+ throw new Error("Expected overlay to contain a Select root");
929+ }
930+
931+ selectNode.props.onBlur?.();
932+
933+ expect(renderActiveOverlay(state)).toBeNull();
934+ const input = renderInputArea(state.theme, controller);
935+ if (input.type !== "textinput") {
936+ throw new Error("Expected input area to render a TextInput");
937+ }
938+ expect(input.props.value).toBe(draft);
939+ } finally {
940+ state.db.close();
941+ }
942+ });
943+
761944 test("renderToolResult uses themed accent colors for tool headers", () => {
762945 const theme: Theme = {
763946 ...DEFAULT_THEME,