Skip to content

Prompt History and PR Pane -> Primary #1070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arul28 merged 4 commits into from
Aug 10, 2026
Merged

Prompt History and PR Pane -> Primary #1070

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23189e0
ship: prepare prompt history and PR pane
arul28 Aug 10, 2026
cb99dfc
fix: close prompt history review races
arul28 Aug 10, 2026
34b96f2
fix: clean up pending prompt stashes on unmount
arul28 Aug 10, 2026
931e562
fix: honor multiline prompt navigation boundaries
arul28 Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
356 changes: 355 additions & 1 deletion apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* @vitest-environment jsdom */

import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { cleanup, fireEvent, render, screen, waitFor, within, type RenderResult } from "@testing-library/react";
import { act, cleanup, fireEvent, render, screen, waitFor, within, type RenderResult } from "@testing-library/react";
import type { ComponentProps } from "react";
import type {
IosElementContextItem,
Expand Down Expand Up @@ -1139,6 +1139,360 @@ describe("AgentChatComposer", () => {
expect(document.activeElement).toBe(textbox);
});

it("cycles the selected chat's prompt history and restores the draft", () => {
const onDraftChange = vi.fn();
const onPromptHistoryNavigate = vi.fn();
const promptHistory = [
{ text: "First prompt", eventKey: "prompt-1" },
{ text: "Second prompt", eventKey: "prompt-2" },
] as const;
const props = buildComposerProps({
draft: "unfinished draft",
onDraftChange,
onPromptHistoryNavigate,
promptHistory,
turnActive: false,
});
const view = render(<AgentChatComposer {...props} />);
const textbox = screen.getByRole("textbox") as HTMLTextAreaElement;

textbox.focus();
textbox.setSelectionRange(0, 0);
fireEvent.keyDown(textbox, { key: "ArrowUp" });
expect(onDraftChange).toHaveBeenLastCalledWith("Second prompt");
expect(onPromptHistoryNavigate).toHaveBeenLastCalledWith(promptHistory[1]);

view.rerender(<AgentChatComposer {...props} draft="Second prompt" />);
textbox.setSelectionRange(textbox.value.length, textbox.value.length);
fireEvent.keyDown(textbox, { key: "ArrowUp" });
expect(onDraftChange).toHaveBeenLastCalledWith("First prompt");
expect(onPromptHistoryNavigate).toHaveBeenLastCalledWith(promptHistory[0]);

view.rerender(<AgentChatComposer {...props} draft="First prompt" />);
textbox.setSelectionRange(textbox.value.length, textbox.value.length);
fireEvent.keyDown(textbox, { key: "ArrowDown" });
expect(onDraftChange).toHaveBeenLastCalledWith("Second prompt");

view.rerender(<AgentChatComposer {...props} draft="Second prompt" />);
textbox.setSelectionRange(textbox.value.length, textbox.value.length);
fireEvent.keyDown(textbox, { key: "ArrowDown" });
expect(onDraftChange).toHaveBeenLastCalledWith("unfinished draft");
expect(onPromptHistoryNavigate).toHaveBeenLastCalledWith(null);
});

it("keeps the selected prompt anchored when older history is prepended", () => {
const onDraftChange = vi.fn();
const initialHistory = [
{ text: "Older prompt", eventKey: "prompt-1" },
{ text: "Latest prompt", eventKey: "prompt-2" },
] as const;
const props = buildComposerProps({
draft: "unfinished draft",
onDraftChange,
promptHistory: initialHistory,
turnActive: false,
});
const view = render(<AgentChatComposer {...props} />);
const textbox = screen.getByRole("textbox") as HTMLTextAreaElement;

textbox.focus();
textbox.setSelectionRange(0, 0);
fireEvent.keyDown(textbox, { key: "ArrowUp" });
expect(onDraftChange).toHaveBeenLastCalledWith("Latest prompt");

view.rerender(
<AgentChatComposer
{...props}
draft="Latest prompt"
promptHistory={[
{ text: "Newly loaded oldest prompt", eventKey: "prompt-0" },
...initialHistory,
]}
/>,
);
textbox.setSelectionRange(textbox.value.length, textbox.value.length);
fireEvent.keyDown(textbox, { key: "ArrowUp" });

expect(onDraftChange).toHaveBeenLastCalledWith("Older prompt");
});

it("keeps multiline caret motion after an interrupted history sequence", () => {
const onDraftChange = vi.fn();
const promptHistory = [
{ text: "Older line one\nOlder line two", eventKey: "prompt-1" },
{ text: "Latest line one\nLatest line two", eventKey: "prompt-2" },
] as const;
const props = buildComposerProps({
draft: "",
onDraftChange,
promptHistory,
turnActive: false,
});
const view = render(<AgentChatComposer {...props} />);
const textbox = screen.getByRole("textbox") as HTMLTextAreaElement;

textbox.focus();
textbox.setSelectionRange(0, 0);
fireEvent.keyDown(textbox, { key: "ArrowUp" });
expect(onDraftChange).toHaveBeenLastCalledWith(promptHistory[1].text);

view.rerender(<AgentChatComposer {...props} draft={promptHistory[1].text} />);
textbox.setSelectionRange(textbox.value.length, textbox.value.length);
fireEvent.pointerDown(document.body);
fireEvent.keyDown(textbox, { key: "ArrowUp" });

// The click canceled the rapid-history sequence. At the end of a multiline
// prompt, a single ArrowUp belongs to native caret movement.
expect(onDraftChange).toHaveBeenCalledTimes(1);

textbox.setSelectionRange(0, 0);
fireEvent.keyDown(textbox, { key: "ArrowUp" });
expect(onDraftChange).toHaveBeenLastCalledWith(promptHistory[0].text);
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.

it("treats a direction change as an interruption of the rapid sequence", () => {
const onDraftChange = vi.fn();
const promptHistory = [
{ text: "Oldest line one\nOldest line two", eventKey: "prompt-1" },
{ text: "Middle line one\nMiddle line two", eventKey: "prompt-2" },
{ text: "Latest line one\nLatest line two", eventKey: "prompt-3" },
] as const;
const props = buildComposerProps({
draft: "unfinished draft",
onDraftChange,
promptHistory,
turnActive: false,
});
const view = render(<AgentChatComposer {...props} />);
const textbox = screen.getByRole("textbox") as HTMLTextAreaElement;

textbox.focus();
textbox.setSelectionRange(0, 0);
fireEvent.keyDown(textbox, { key: "ArrowUp" });
view.rerender(<AgentChatComposer {...props} draft={promptHistory[2].text} />);
textbox.setSelectionRange(textbox.value.length, textbox.value.length);
fireEvent.keyDown(textbox, { key: "ArrowUp" });
view.rerender(<AgentChatComposer {...props} draft={promptHistory[1].text} />);
textbox.setSelectionRange(textbox.value.length, textbox.value.length);
fireEvent.keyDown(textbox, { key: "ArrowDown" });
view.rerender(<AgentChatComposer {...props} draft={promptHistory[2].text} />);
textbox.setSelectionRange(textbox.value.length, textbox.value.length);

// The Up after a Down is no longer part of the Down sequence. At the end
// of a multiline prompt it therefore belongs to native caret movement.
fireEvent.keyDown(textbox, { key: "ArrowUp" });
expect(onDraftChange).toHaveBeenCalledTimes(3);
});

it("expires the rapid-history window after three seconds", () => {
vi.useFakeTimers();
try {
const onDraftChange = vi.fn();
const promptHistory = [
{ text: "Older line one\nOlder line two", eventKey: "prompt-1" },
{ text: "Latest line one\nLatest line two", eventKey: "prompt-2" },
] as const;
const props = buildComposerProps({
draft: "",
onDraftChange,
promptHistory,
turnActive: false,
});
const view = render(<AgentChatComposer {...props} />);
const textbox = screen.getByRole("textbox") as HTMLTextAreaElement;

textbox.focus();
textbox.setSelectionRange(0, 0);
fireEvent.keyDown(textbox, { key: "ArrowUp" });
view.rerender(<AgentChatComposer {...props} draft={promptHistory[1].text} />);
textbox.setSelectionRange(textbox.value.length, textbox.value.length);
act(() => vi.advanceTimersByTime(3_001));
fireEvent.keyDown(textbox, { key: "ArrowUp" });

expect(onDraftChange).toHaveBeenCalledTimes(1);
} finally {
vi.useRealTimers();
}
});

it("auto-stashes an unsent draft before selecting the latest prompt", async () => {
const create = vi.fn().mockResolvedValue({
id: "stash-auto-1",
text: "unfinished draft",
provider: "codex",
modelId: "openai/gpt-5.4",
createdAt: "2026-08-10T12:00:00.000Z",
});
(window as any).ade = {
agentChat: {
promptStashes: {
list: vi.fn().mockResolvedValue([]),
create,
delete: vi.fn().mockResolvedValue(true),
},
},
};
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
const onDraftChange = vi.fn();
const props = buildComposerProps({
draft: "unfinished draft",
onDraftChange,
promptHistory: [{ text: "Latest prompt", eventKey: "prompt-1" }],
turnActive: false,
});
render(<AgentChatComposer {...props} />);
const textbox = screen.getByRole("textbox") as HTMLTextAreaElement;

textbox.focus();
textbox.setSelectionRange(textbox.value.length, textbox.value.length);
fireEvent.keyDown(textbox, { key: "ArrowUp" });

await waitFor(() => expect(create).toHaveBeenCalledWith({
text: "unfinished draft",
provider: "codex",
modelId: "openai/gpt-5.4",
}, null));
expect(onDraftChange).toHaveBeenCalledWith("Latest prompt");
});

it("consumes an auto-stash that finishes after history navigation is interrupted", async () => {
let resolveCreate: ((entry: {
id: string;
text: string;
provider: string;
modelId: string;
createdAt: string;
}) => void) | undefined;
const create = vi.fn().mockImplementation(() => new Promise((resolve) => {
resolveCreate = resolve;
}));
const remove = vi.fn().mockResolvedValue(true);
(window as any).ade = {
agentChat: {
promptStashes: {
list: vi.fn().mockResolvedValue([]),
create,
delete: remove,
},
},
};
const props = buildComposerProps({
draft: "unfinished draft",
promptHistory: [{ text: "Latest prompt", eventKey: "prompt-1" }],
turnActive: false,
});
const view = render(<AgentChatComposer {...props} />);
const textbox = screen.getByRole("textbox") as HTMLTextAreaElement;

textbox.focus();
textbox.setSelectionRange(textbox.value.length, textbox.value.length);
fireEvent.keyDown(textbox, { key: "ArrowUp" });
await waitFor(() => expect(create).toHaveBeenCalledTimes(1));

view.rerender(<AgentChatComposer {...props} draft="newer draft" />);
resolveCreate?.({
id: "stash-auto-interrupted-1",
text: "unfinished draft",
provider: "codex",
modelId: "openai/gpt-5.4",
createdAt: "2026-08-10T12:00:00.000Z",
});

await waitFor(() => expect(remove).toHaveBeenCalledWith(
{ id: "stash-auto-interrupted-1" },
null,
));
});

it("consumes an auto-stash that finishes after the composer unmounts", async () => {
let resolveCreate: ((entry: {
id: string;
text: string;
provider: string;
modelId: string;
createdAt: string;
}) => void) | undefined;
const create = vi.fn().mockImplementation(() => new Promise((resolve) => {
resolveCreate = resolve;
}));
const remove = vi.fn().mockResolvedValue(true);
(window as any).ade = {
agentChat: {
promptStashes: {
list: vi.fn().mockResolvedValue([]),
create,
delete: remove,
},
},
};
const props = buildComposerProps({
draft: "unfinished draft",
promptHistory: [{ text: "Latest prompt", eventKey: "prompt-1" }],
turnActive: false,
});
const view = render(<AgentChatComposer {...props} />);
const textbox = screen.getByRole("textbox") as HTMLTextAreaElement;

textbox.focus();
textbox.setSelectionRange(textbox.value.length, textbox.value.length);
fireEvent.keyDown(textbox, { key: "ArrowUp" });
await waitFor(() => expect(create).toHaveBeenCalledTimes(1));

view.unmount();
resolveCreate?.({
id: "stash-auto-unmounted-1",
text: "unfinished draft",
provider: "codex",
modelId: "openai/gpt-5.4",
createdAt: "2026-08-10T12:00:00.000Z",
});

await waitFor(() => expect(remove).toHaveBeenCalledWith(
{ id: "stash-auto-unmounted-1" },
null,
));
});

it("consumes the auto-stash when history restores the original draft", async () => {
const create = vi.fn().mockResolvedValue({
id: "stash-auto-restore-1",
text: "unfinished draft",
provider: "codex",
modelId: "openai/gpt-5.4",
createdAt: "2026-08-10T12:00:00.000Z",
});
const remove = vi.fn().mockResolvedValue(true);
(window as any).ade = {
agentChat: {
promptStashes: {
list: vi.fn().mockResolvedValue([]),
create,
delete: remove,
},
},
};
const props = buildComposerProps({
draft: "unfinished draft",
promptHistory: [{ text: "Latest prompt", eventKey: "prompt-1" }],
turnActive: false,
});
const view = render(<AgentChatComposer {...props} />);
const textbox = screen.getByRole("textbox") as HTMLTextAreaElement;

textbox.focus();
textbox.setSelectionRange(textbox.value.length, textbox.value.length);
fireEvent.keyDown(textbox, { key: "ArrowUp" });
await waitFor(() => expect(create).toHaveBeenCalledTimes(1));

view.rerender(<AgentChatComposer {...props} draft="Latest prompt" />);
textbox.setSelectionRange(textbox.value.length, textbox.value.length);
fireEvent.keyDown(textbox, { key: "ArrowDown" });

await waitFor(() => expect(remove).toHaveBeenCalledWith(
{ id: "stash-auto-restore-1" },
null,
));
});

it("stop only interrupts the active turn", () => {
const props = renderComposer();

Expand Down
Loading
Loading