Skip to content

refactor(components): standardize approval selects and decision handling #15

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
remarkablemark merged 2 commits into from
May 6, 2026
Merged

refactor(components): standardize approval selects and decision handling #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f908648
refactor(components): use Select in PlanApproval
remarkablemark May 6, 2026
68b4e9e
refactor(components): update margins in ToolApproval
remarkablemark May 6, 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
27 changes: 14 additions & 13 deletions src/components/App.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Text } from 'ink';
import { render } from 'ink-testing-library';

import { tick } from '../utils/test';
import { test } from '../utils';

vi.mock('../utils', () => ({
vi.mock('../utils', async () => ({
...(await vi.importActual('../utils')),
config: {
loadConfig: vi.fn(() => ({
host: 'http://localhost:11434',
Expand Down Expand Up @@ -97,18 +98,18 @@ describe('App', () => {
const { lastFrame, rerender } = render(<App />);
capturedCallbacks.onCommand?.('/model');
rerender(<App />);
await tick();
await test.tick();
expect(lastFrame()).toContain('ModelPicker');
});

it('returns to chat and updates model when onSelect is called', async () => {
const { lastFrame, rerender } = render(<App />);
capturedCallbacks.onCommand?.('/model');
rerender(<App />);
await tick();
await test.tick();
capturedCallbacks.onSelect?.('llama3');
rerender(<App />);
await tick();
await test.tick();
expect(lastFrame()).toContain('llama3');
expect(lastFrame()).not.toContain('ModelPicker');
});
Expand All @@ -117,10 +118,10 @@ describe('App', () => {
const { lastFrame, rerender } = render(<App />);
capturedCallbacks.onCommand?.('/model');
rerender(<App />);
await tick();
await test.tick();
capturedCallbacks.onCancel?.();
rerender(<App />);
await tick();
await test.tick();
expect(lastFrame()).not.toContain('ModelPicker');
expect(lastFrame()).toContain('>');
});
Expand All @@ -129,7 +130,7 @@ describe('App', () => {
const { lastFrame, rerender } = render(<App />);
capturedCallbacks.onCommand?.('/unknown');
rerender(<App />);
await tick();
await test.tick();
expect(lastFrame()).not.toContain('ModelPicker');
});

Expand All @@ -142,19 +143,19 @@ describe('App', () => {
// Call the callback passed to Footer - cycles to Auto
capturedCallbacks.onToggleMode?.();
rerender(<App />);
await tick();
await test.tick();
expect(lastFrame()).toContain('Mode: Auto');

// Call again - cycles to Plan
capturedCallbacks.onToggleMode?.();
rerender(<App />);
await tick();
await test.tick();
expect(lastFrame()).toContain('Mode: Plan');

// Call again - cycles back to Safe
capturedCallbacks.onToggleMode?.();
rerender(<App />);
await tick();
await test.tick();
expect(lastFrame()).toContain('Mode: Safe');
});

Expand All @@ -165,12 +166,12 @@ describe('App', () => {

capturedCallbacks.onModeChange?.('auto');
rerender(<App />);
await tick();
await test.tick();
expect(lastFrame()).toContain('Mode: Auto');

capturedCallbacks.onModeChange?.('safe');
rerender(<App />);
await tick();
await test.tick();
expect(lastFrame()).toContain('Mode: Safe');
});
});
123 changes: 66 additions & 57 deletions src/components/Chat/Chat.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import { Text } from 'ink';
import { render } from 'ink-testing-library';

import { MODE } from '../../constants';
import { ollama, tools } from '../../utils';
import { tick } from '../../utils/test';
import { DECISION, MODE } from '../../constants';
import { ollama, test, tools } from '../../utils';

const mockState = vi.hoisted(() => ({
handlers: [] as ((value: string) => void)[],
handler: undefined as ((value: string) => void) | undefined,
testInput: '',
shouldReset: false,
clear() {
this.handlers.length = 0;
this.handler = undefined;
this.testInput = '';
this.shouldReset = true;
},
Expand All @@ -23,19 +22,35 @@ const planApprovalState = vi.hoisted(() => ({
},
}));

const toolApprovalState = vi.hoisted(() => ({
onChange: undefined as ((value: DECISION.Decision) => void) | undefined,
clear() {
this.onChange = undefined;
},
}));

vi.mock('@inkjs/ui', async () => {
const actual = await vi.importActual<typeof import('@inkjs/ui')>('@inkjs/ui');
const actual = await vi.importActual('@inkjs/ui');
const { Text } = await import('ink');
return {
...actual,
Select: ({
options,
onChange,
}: {
options: { label: string; value: MODE.Name }[];
onChange?: (value: MODE.Name) => void;
options: { label: string; value: string }[];
onChange?: (value: string) => void;
}) => {
planApprovalState.onChange = onChange;
const isPlanApproval = options.some(({ value }) =>
Object.values(MODE.NAME).includes(value as MODE.Name),
);

if (isPlanApproval) {
planApprovalState.onChange = onChange;
} else {
toolApprovalState.onChange = onChange;
}

return (
<>
{options.map(({ value, label }) => (
Expand All @@ -47,33 +62,29 @@ vi.mock('@inkjs/ui', async () => {
};
});

vi.mock('../../utils', async () => {
const actual =
await vi.importActual<typeof import('../../utils')>('../../utils');
return {
...actual,
ollama: {
streamChat: vi.fn().mockImplementation(function* () {
yield { type: 'content', content: 'Mocked' };
yield { type: 'content', content: ' response' };
}),
},
tools: {
TOOLS: [],
READ_ONLY_TOOLS: new Set(),
DANGEROUS_TOOLS: new Set(),
executeTool: vi.fn(),
},
};
});
vi.mock('../../utils', async () => ({
...(await vi.importActual('../../utils')),
ollama: {
streamChat: vi.fn().mockImplementation(function* () {
yield { type: 'content', content: 'Mocked' };
yield { type: 'content', content: ' response' };
}),
},
tools: {
TOOLS: [],
READ_ONLY_TOOLS: new Set(),
DANGEROUS_TOOLS: new Set(),
executeTool: vi.fn(),
},
}));

vi.mock('./Input', () => ({
Input: (props: {
onSubmit?: (value: string) => void;
isDisabled?: boolean;
}) => {
if (props.onSubmit) {
mockState.handlers.push(props.onSubmit);
mockState.handler = props.onSubmit;
}

if (props.isDisabled) {
Expand Down Expand Up @@ -102,30 +113,33 @@ async function typeText(
) {
mockState.testInput = text;
rerender(tree);
await tick();
await test.tick();
}

function submitInput(value: string) {
for (const handler of mockState.handlers) {
handler(value);
}
mockState.handler?.(value);
mockState.clear();
}

function choosePlanMode(mode: MODE.Name) {
planApprovalState.onChange?.(mode);
}

function chooseToolDecision(decision: DECISION.Decision) {
toolApprovalState.onChange?.(decision);
}

async function waitForStream() {
// Allow time for async generator to yield values
await tick(10);
await test.tick(10);
}

function resetChatMocks() {
vi.restoreAllMocks();
vi.clearAllMocks();
mockState.clear();
planApprovalState.clear();
toolApprovalState.clear();
tools.TOOLS.splice(0, tools.TOOLS.length);
vi.mocked(ollama.streamChat).mockImplementation(async function* () {
await Promise.resolve();
Expand All @@ -151,7 +165,7 @@ describe('Chat', () => {
onModeChange={onModeChange}
/>,
);
await tick();
await test.tick();
const frame = lastFrame() ?? '';
expect(frame).not.toContain('coding assistant');
expect(frame).toContain('>');
Expand All @@ -167,7 +181,7 @@ describe('Chat', () => {
/>
);
const { lastFrame, rerender } = render(chat);
await tick();
await test.tick();
await typeText(rerender, 'hello', chat);
submitInput('hello');
rerender(chat);
Expand All @@ -186,7 +200,7 @@ describe('Chat', () => {
/>
);
const { lastFrame, rerender } = render(chat);
await tick();
await test.tick();
await typeText(rerender, 'hello', chat);
submitInput('hello');
rerender(chat);
Expand All @@ -206,13 +220,13 @@ describe('Chat', () => {
/>
);
const { lastFrame, rerender } = render(chat);
await tick();
await test.tick();
const beforeFrame = lastFrame() ?? '';
const systemLineCount = beforeFrame.split('\n').length;
await typeText(rerender, ' ', chat);
submitInput(' ');
rerender(chat);
await tick();
await test.tick();
const afterFrame = lastFrame() ?? '';
const afterLineCount = afterFrame.split('\n').length;
// After submitting blank input, line count should not increase
Expand All @@ -231,7 +245,7 @@ describe('Chat', () => {
/>
);
const { lastFrame, rerender } = render(chat);
await tick();
await test.tick();
await typeText(rerender, 'first', chat);
submitInput('first');
rerender(chat);
Expand Down Expand Up @@ -260,7 +274,7 @@ describe('Chat', () => {
const { rerender } = render(chat);
submitInput('/model');
rerender(chat);
await tick();
await test.tick();
expect(onCommand).toHaveBeenCalledWith('/model');
});

Expand Down Expand Up @@ -715,7 +729,7 @@ describe('Chat with tool calls', () => {
expect(lastFrame()).toContain('Plan Generated');

choosePlanMode(MODE.NAME.PLAN);
await tick();
await test.tick();
rerender(chat);

expect(onModeChange).toHaveBeenCalledWith(MODE.NAME.PLAN);
Expand All @@ -724,7 +738,7 @@ describe('Chat with tool calls', () => {
);

choosePlanMode(MODE.NAME.AUTO);
await tick();
await test.tick();
});

it('executes an approved plan immediately in auto mode', async () => {
Expand Down Expand Up @@ -867,7 +881,7 @@ describe('Chat with tool calls', () => {
onModeChange={vi.fn()}
/>
);
const { lastFrame, rerender, stdin } = render(chat);
const { lastFrame, rerender } = render(chat);

await typeText(rerender, 'write a file', chat);
submitInput('write a file');
Expand All @@ -878,11 +892,8 @@ describe('Chat with tool calls', () => {
// Verify approval prompt is shown
expect(lastFrame()).toContain('Tool requires approval');

// Reject the tool (move to No with right arrow, then Enter)
stdin.write('\x1B[C'); // Right arrow
await tick();
stdin.write('\r'); // Enter
await tick();
chooseToolDecision(DECISION.REJECT);
await waitForStream();
rerender(chat);

// Should show rejection message
Expand Down Expand Up @@ -928,7 +939,7 @@ describe('Chat with tool calls', () => {
onModeChange={vi.fn()}
/>
);
const { lastFrame, rerender, stdin } = render(chat);
const { lastFrame, rerender } = render(chat);

await typeText(rerender, 'write a file', chat);
submitInput('write a file');
Expand All @@ -939,9 +950,8 @@ describe('Chat with tool calls', () => {
// Verify approval prompt is shown
expect(lastFrame()).toContain('Tool requires approval');

// Approve the tool by pressing Enter (yes is default)
stdin.write('\r'); // Enter
await tick();
chooseToolDecision(DECISION.APPROVE);
await waitForStream();
rerender(chat);

// Should have called executeTool
Expand Down Expand Up @@ -991,17 +1001,16 @@ describe('Chat with tool calls', () => {
onModeChange={vi.fn()}
/>
);
const { rerender, stdin } = render(chat);
const { rerender } = render(chat);

await typeText(rerender, 'write a file', chat);
submitInput('write a file');
rerender(chat);
await waitForStream();
rerender(chat);

// Approve the tool by pressing Enter
stdin.write('\r');
await tick();
chooseToolDecision(DECISION.APPROVE);
await waitForStream();
rerender(chat);

// Should have called executeTool
Expand Down
Loading
Loading