Skip to content

feat: add AskUserQuestion runtime and TUI#908

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
Astro-Han merged 6 commits into from
Jul 13, 2026
Merged

feat: add AskUserQuestion runtime and TUI #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
022abd0
refactor(runtime): share turn-scoped await registry
Astro-Han Jul 13, 2026
a4aa300
feat(runtime): add AskUserQuestion round trip
Astro-Han Jul 13, 2026
2e6a7e2
feat(cli): scope AskUserQuestion to TUI
Astro-Han Jul 13, 2026
2ed8a48
feat(cli): render AskUserQuestion in TUI
Astro-Han Jul 13, 2026
8b34eed
test(runtime): update turn lifecycle contract
Astro-Han Jul 13, 2026
5475dae
fix(cli): expose user question stop action
Astro-Han Jul 13, 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
23 changes: 22 additions & 1 deletion packages/cli/src/__tests__/pi-transcript.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -655,14 +655,35 @@ describe('Maka Pi TUI transcript', () => {
permissionMode: 'ask',
}, 100).map(stripAnsi);

assert.equal(state.pendingPermission?.requestId, 'permission-1');
assert.equal(state.pendingInteraction?.requestId, 'permission-1');
assert.ok(visibleLines.some((line) => line.includes('Permission required')));
assert.ok(visibleLines.some((line) => line.includes('Bash')));
assert.ok(visibleLines.some((line) => line.includes('npm test')));
assert.ok(visibleLines.some((line) => line.includes('y/Enter allow')));
assert.ok(visibleLines.some((line) => line.includes('n/Esc deny')));
});

test('queues permission and user-question requests in arrival order', () => {
const state = createMakaPiTranscriptState();
applyMakaSessionEventToTranscript(state, event({
type: 'permission_request', requestId: 'permission-1', toolUseId: 'tool-1',
toolName: 'Bash', category: 'shell_unsafe', reason: 'shell_dangerous', args: {},
}));
applyMakaSessionEventToTranscript(state, event({
type: 'user_question_request', requestId: 'question-1', toolUseId: 'tool-2',
questions: [{ question: 'Choose', options: [{ label: 'A' }, { label: 'B' }] }],
}));

assert.equal(state.pendingInteraction?.requestId, 'permission-1');
assert.deepEqual(state.queuedInteractions.map((item) => item.requestId), ['question-1']);

applyMakaSessionEventToTranscript(state, event({
type: 'permission_decision_ack', requestId: 'permission-1', toolUseId: 'tool-1', decision: 'allow',
}));
assert.equal(state.pendingInteraction?.requestId, 'question-1');
assert.deepEqual(state.queuedInteractions, []);
});

test('orders thinking entries by arrival, before text and around tools', () => {
const state = createMakaPiTranscriptState();

Expand Down
97 changes: 97 additions & 0 deletions packages/cli/src/__tests__/pi-tui-runner.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import {
type SessionSummary,
type StoredMessage,
type ThinkingLevel,
type UserQuestionResponse,
} from '@maka/core';
import type { ShellRunUpdate } from '@maka/runtime';
import type { MakaSessionDriver, MakaSessionRewindResult, MakaSessionSwitchResult, RewindTarget } from '../session-driver.js';
Expand DownExpand Up@@ -280,6 +281,65 @@ describe('Maka Pi TUI runner', () => {
]);
});

test('answers sequential questions with a choice, Escape, and Other input', async () => {
const terminal = new FakeTerminal();
const driver = new UserQuestionPromptDriver();
const run = runMakaPiTui({
title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
});

terminal.input('choose');
terminal.input('\r');
await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
assertBottomPickerPlacement(
terminal,
'Choose an approach',
'Maka claude-sonnet-4-5 claude-subscription ask /repo',
);
assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));

terminal.input('\r');
await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Keep the default'));
terminal.input('\x1b');
await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Anything else'));
terminal.input('\x1b[B');
terminal.input('\x1b[B');
terminal.input('\r');
await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Type another answer'));
assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));
terminal.input('Use the existing seam');
terminal.input('\r');

await waitFor(() => driver.responses.length === 1);
assert.deepEqual(driver.responses, [{
requestId: 'question-1',
answers: ['Extend', null, 'Use the existing seam'],
}]);

exitMaka(terminal);
await run;
});

test('Ctrl-C stops a turn while a user-question overlay is open', async () => {
const terminal = new FakeTerminal();
const driver = new UserQuestionPromptDriver();
const run = runMakaPiTui({
title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
});

terminal.input('choose');
terminal.input('\r');
await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
terminal.input('\x03');

await waitFor(() => driver.stopCalls === 1);
assert.deepEqual(driver.responses, []);
exitMaka(terminal);
await run;
});

test('toggles tool detail globally with Ctrl-O', async () => {
const terminal = new FakeTerminal();
const driver = new ToolOutputDriver();
Expand DownExpand Up@@ -2982,6 +3042,43 @@ class PermissionPromptDriver implements MakaSessionDriver {
}
}

class UserQuestionPromptDriver implements MakaSessionDriver {
readonly responses: UserQuestionResponse[] = [];
stopCalls = 0;
private release: (() => void) | undefined;

async listSessions(): Promise<SessionSummary[]> { return []; }
async *compactSession(): AsyncIterable<never> {}
async *sendPrompt(_prompt: string): AsyncIterable<SessionEvent> {
yield {
type: 'user_question_request', id: 'event-question', turnId: 'turn-1', ts: 1,
requestId: 'question-1', toolUseId: 'tool-1',
questions: [
{ question: 'Choose an approach', options: [{ label: 'Extend', description: 'Reuse the seam' }, { label: 'Separate' }] },
{ question: 'Keep the default', options: [{ label: 'Yes' }, { label: 'No' }] },
{ question: 'Anything else', options: [{ label: 'Nothing' }, { label: 'More detail' }] },
],
};
await new Promise<void>((resolve) => { this.release = resolve; });
yield { type: 'complete', id: 'complete-1', turnId: 'turn-1', ts: 2, stopReason: 'end_turn' };
}
async respondToUserQuestion(response: UserQuestionResponse): Promise<void> {
this.responses.push(response);
this.release?.();
}
async stop(): Promise<void> { this.stopCalls += 1; this.release?.(); }
async respondToPermission(_response: PermissionResponse): Promise<void> {}
async renameSession(): Promise<void> {}
async setModel(): Promise<void> {}
async setPermissionMode(): Promise<void> {}
async setThinkingLevel(): Promise<void> {}
async switchSession(sessionId: string): Promise<MakaSessionSwitchResult> { return switchResult(fakeSessionSummary(sessionId)); }
async listRewindTargets(): Promise<RewindTarget[]> { return []; }
async rewindToTurn(): Promise<MakaSessionRewindResult> { throw new Error('rewind not supported'); }
startNewSession(): void {}
getSessionId(): string { return 'session-1'; }
}

class InterruptibleTurnDriver implements MakaSessionDriver {
stopCalls = 0;
private releaseTurn: (() => void) | null = null;
Expand Down
52 changes: 48 additions & 4 deletions packages/cli/src/__tests__/runtime-bootstrap.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ describe('Maka CLI runtime bootstrap', () => {
});

const context = await createMakaCliRuntimeContext({
surface: 'tui',
workspaceRoot,
cwd: '/repo',
});
Expand DownExpand Up@@ -74,6 +75,7 @@ describe('Maka CLI runtime bootstrap', () => {
] as const;

const context = await createMakaCliRuntimeContext({
surface: 'tui',
workspaceRoot,
cwd: '/repo',
requestedConnectionSlug: 'selected-local',
Expand DownExpand Up@@ -131,6 +133,7 @@ describe('Maka CLI runtime bootstrap', () => {
permissionMode: 'explore',
});
const context = await createMakaCliRuntimeContext({
surface: 'tui',
workspaceRoot,
cwd: '/canonical-repo',
requestedConnectionSlug: 'local',
Expand DownExpand Up@@ -167,6 +170,7 @@ describe('Maka CLI runtime bootstrap', () => {
});

const context = await createMakaCliRuntimeContext({
surface: 'tui',
workspaceRoot,
cwd: '/repo',
});
Expand All@@ -180,6 +184,38 @@ describe('Maka CLI runtime bootstrap', () => {
});
});

test('registers AskUserQuestion only for the interactive TUI surface', async () => {
await withWorkspace(async (workspaceRoot) => {
const connectionStore = createConnectionStore(workspaceRoot);
await connectionStore.create({
slug: 'local',
name: 'Local Ollama',
providerType: 'ollama',
defaultModel: 'llama3.2',
});

const tui = await createMakaCliRuntimeContext({
workspaceRoot,
cwd: '/repo',
surface: 'tui',
});
const run = await createMakaCliRuntimeContext({
workspaceRoot,
cwd: '/repo',
surface: 'run',
});
try {
const tool = tui.tools.find((candidate) => candidate.name === 'AskUserQuestion');
assert.ok(tool);
assert.equal(tool.permissionRequired, false);
assert.equal(run.tools.some((candidate) => candidate.name === 'AskUserQuestion'), false);
} finally {
await tui.close();
await run.close();
}
});
});

test('registers the Skill tool so the CLI can load workspace skills', async () => {
await withWorkspace(async (workspaceRoot) => {
const connectionStore = createConnectionStore(workspaceRoot);
Expand All@@ -191,6 +227,7 @@ describe('Maka CLI runtime bootstrap', () => {
});

const context = await createMakaCliRuntimeContext({
surface: 'tui',
workspaceRoot,
cwd: '/repo',
});
Expand All@@ -214,6 +251,7 @@ describe('Maka CLI runtime bootstrap', () => {
});

const context = await createMakaCliRuntimeContext({
surface: 'tui',
workspaceRoot,
cwd: workspaceRoot,
});
Expand DownExpand Up@@ -289,7 +327,8 @@ describe('Maka CLI runtime bootstrap', () => {
await connectionStore.create({
slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
});
const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
const context = await createMakaCliRuntimeContext({
surface: 'tui', workspaceRoot, cwd: workspaceRoot });
const updates: ShellRunUpdate[] = [];
const unsubscribe = context.subscribeShellRunUpdates((update) => updates.push(update));
try {
Expand DownExpand Up@@ -326,7 +365,8 @@ describe('Maka CLI runtime bootstrap', () => {
await connectionStore.create({
slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
});
const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
const context = await createMakaCliRuntimeContext({
surface: 'tui', workspaceRoot, cwd: workspaceRoot });
try {
const parent = await context.runtime.createSession({
cwd: workspaceRoot, backend: 'ai-sdk', llmConnectionSlug: 'local',
Expand DownExpand Up@@ -362,7 +402,8 @@ describe('Maka CLI runtime bootstrap', () => {
await connectionStore.create({
slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
});
const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
const context = await createMakaCliRuntimeContext({
surface: 'tui', workspaceRoot, cwd: workspaceRoot });
try {
const bash = context.tools.find((tool) => tool.name === 'Bash');
assert.ok(bash);
Expand DownExpand Up@@ -407,6 +448,7 @@ describe('Maka CLI runtime bootstrap', () => {
});

const context = await createMakaCliRuntimeContext({
surface: 'tui',
workspaceRoot,
cwd: '/repo',
});
Expand DownExpand Up@@ -457,7 +499,8 @@ describe('Maka CLI runtime bootstrap', () => {
defaultModel: 'llama3.2',
});

const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: '/repo' });
const context = await createMakaCliRuntimeContext({
surface: 'tui', workspaceRoot, cwd: '/repo' });
const session = await context.runtime.createSession({
cwd: context.cwd,
backend: 'ai-sdk',
Expand DownExpand Up@@ -501,6 +544,7 @@ describe('Maka CLI runtime bootstrap', () => {
await credentialStore.setSecret('deepseek', 'api_key', 'test-key');

const context = await createMakaCliRuntimeContext({
surface: 'tui',
workspaceRoot,
cwd: '/repo',
});
Expand Down
25 changes: 25 additions & 0 deletions packages/cli/src/__tests__/session-driver.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import type {
SessionSummary,
StoredMessage,
UserMessageInput,
UserQuestionResponse,
} from '@maka/core';
import { createMakaSessionDriver } from '../session-driver.js';

Expand DownExpand Up@@ -438,6 +439,25 @@ describe('Maka session driver', () => {
}]);
});

test('routes user-question responses to the active session', async () => {
const runtime = new RecordingRuntime();
const driver = createMakaSessionDriver({
runtime,
cwd: '/repo',
llmConnectionSlug: 'anthropic',
model: 'claude-sonnet-4-5',
newId: nextId('turn'),
});

await collect(driver.sendPrompt('choose'));
await driver.respondToUserQuestion?.({ requestId: 'question-1', answers: ['A', null] });

assert.deepEqual(runtime.userQuestionResponses, [{
sessionId: 'session-1',
response: { requestId: 'question-1', answers: ['A', null] },
}]);
});

test('lists rewind targets newest-first, one per prompted turn, including the latest', async () => {
const runtime = new RecordingRuntime();
const driver = createMakaSessionDriver({
Expand DownExpand Up@@ -653,6 +673,7 @@ class RecordingRuntime {
readonly sent: Array<{ sessionId: string; input: UserMessageInput }> = [];
readonly compacted: Array<{ sessionId: string; input: { turnId?: string } }> = [];
readonly permissionResponses: Array<{ sessionId: string; response: PermissionResponse }> = [];
readonly userQuestionResponses: Array<{ sessionId: string; response: UserQuestionResponse }> = [];
readonly permissionModes: Array<{ sessionId: string; mode: PermissionMode }> = [];
readonly sessionUpdates: Array<{ sessionId: string; patch: { model?: string; llmConnectionSlug?: string; thinkingLevel?: import('@maka/core/model-thinking').ThinkingLevel | undefined; name?: string } }> = [];
readonly branched: Array<{ sessionId: string; sourceTurnId: string }> = [];
Expand DownExpand Up@@ -713,6 +734,10 @@ class RecordingRuntime {
this.permissionResponses.push({ sessionId, response });
}

async respondToUserQuestion(sessionId: string, response: UserQuestionResponse): Promise<void> {
this.userQuestionResponses.push({ sessionId, response });
}

async setPermissionMode(sessionId: string, mode: PermissionMode): Promise<SessionSummary> {
this.permissionModes.push({ sessionId, mode });
return {
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/cli.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function runMakaCli(argv: string[] = process.argv.slice(2)): Promis
let context;
try {
context = await createMakaCliRuntimeContext({
surface: 'tui',
workspaceRoot,
cwd: process.cwd(),
});
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat: add AskUserQuestion runtime and TUI by Astro-Han · Pull Request #908 · apache/maka · GitHub
Skip to content
feat: add AskUserQuestion runtime and TUI#908

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

Astro-Han
merged 6 commits into

from

Jul 13, 2026
 Merged


feat: add AskUserQuestion runtime and TUI
#908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
022abd0

refactor(runtime): share turn-scoped await registry


Astro-Han Jul 13, 2026
a4aa300

feat(runtime): add AskUserQuestion round trip


Astro-Han Jul 13, 2026
2e6a7e2

feat(cli): scope AskUserQuestion to TUI


Astro-Han Jul 13, 2026
2ed8a48

feat(cli): render AskUserQuestion in TUI


Astro-Han Jul 13, 2026
8b34eed

test(runtime): update turn lifecycle contract


Astro-Han Jul 13, 2026
5475dae

fix(cli): expose user question stop action


Astro-Han Jul 13, 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


23 changes: 22 additions & 1 deletion
packages/cli/src/__tests__/pi-transcript.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -655,14 +655,35 @@ describe('Maka Pi TUI transcript', () => {
 permissionMode: 'ask',
 }, 100).map(stripAnsi);

 assert.equal(state.pendingPermission?.requestId, 'permission-1');
 assert.equal(state.pendingInteraction?.requestId, 'permission-1');
 assert.ok(visibleLines.some((line) => line.includes('Permission required')));
 assert.ok(visibleLines.some((line) => line.includes('Bash')));
 assert.ok(visibleLines.some((line) => line.includes('npm test')));
 assert.ok(visibleLines.some((line) => line.includes('y/Enter allow')));
 assert.ok(visibleLines.some((line) => line.includes('n/Esc deny')));
 });

 test('queues permission and user-question requests in arrival order', () => {
 const state = createMakaPiTranscriptState();
 applyMakaSessionEventToTranscript(state, event({
 type: 'permission_request', requestId: 'permission-1', toolUseId: 'tool-1',
 toolName: 'Bash', category: 'shell_unsafe', reason: 'shell_dangerous', args: {},
 }));
 applyMakaSessionEventToTranscript(state, event({
 type: 'user_question_request', requestId: 'question-1', toolUseId: 'tool-2',
 questions: [{ question: 'Choose', options: [{ label: 'A' }, { label: 'B' }] }],
 }));

 assert.equal(state.pendingInteraction?.requestId, 'permission-1');
 assert.deepEqual(state.queuedInteractions.map((item) => item.requestId), ['question-1']);

 applyMakaSessionEventToTranscript(state, event({
 type: 'permission_decision_ack', requestId: 'permission-1', toolUseId: 'tool-1', decision: 'allow',
 }));
 assert.equal(state.pendingInteraction?.requestId, 'question-1');
 assert.deepEqual(state.queuedInteractions, []);
 });

 test('orders thinking entries by arrival, before text and around tools', () => {
 const state = createMakaPiTranscriptState();

Expand Down

97 changes: 97 additions & 0 deletions
packages/cli/src/__tests__/pi-tui-runner.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import {
 type SessionSummary,
 type StoredMessage,
 type ThinkingLevel,
 type UserQuestionResponse,
} from '@maka/core';
import type { ShellRunUpdate } from '@maka/runtime';
import type { MakaSessionDriver, MakaSessionRewindResult, MakaSessionSwitchResult, RewindTarget } from '../session-driver.js';
Expand DownExpand Up@@ -280,6 +281,65 @@ describe('Maka Pi TUI runner', () => {
 ]);
 });

 test('answers sequential questions with a choice, Escape, and Other input', async () => {
 const terminal = new FakeTerminal();
 const driver = new UserQuestionPromptDriver();
 const run = runMakaPiTui({
 title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
 connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
 });

 terminal.input('choose');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
 assertBottomPickerPlacement(
 terminal,
 'Choose an approach',
 'Maka claude-sonnet-4-5 claude-subscription ask /repo',
 );
 assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));

 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Keep the default'));
 terminal.input('\x1b');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Anything else'));
 terminal.input('\x1b[B');
 terminal.input('\x1b[B');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Type another answer'));
 assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));
 terminal.input('Use the existing seam');
 terminal.input('\r');

 await waitFor(() => driver.responses.length === 1);
 assert.deepEqual(driver.responses, [{
 requestId: 'question-1',
 answers: ['Extend', null, 'Use the existing seam'],
 }]);

 exitMaka(terminal);
 await run;
 });

 test('Ctrl-C stops a turn while a user-question overlay is open', async () => {
 const terminal = new FakeTerminal();
 const driver = new UserQuestionPromptDriver();
 const run = runMakaPiTui({
 title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
 connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
 });

 terminal.input('choose');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
 terminal.input('\x03');

 await waitFor(() => driver.stopCalls === 1);
 assert.deepEqual(driver.responses, []);
 exitMaka(terminal);
 await run;
 });

 test('toggles tool detail globally with Ctrl-O', async () => {
 const terminal = new FakeTerminal();
 const driver = new ToolOutputDriver();
Expand DownExpand Up@@ -2982,6 +3042,43 @@ class PermissionPromptDriver implements MakaSessionDriver {
 }
}

class UserQuestionPromptDriver implements MakaSessionDriver {
 readonly responses: UserQuestionResponse[] = [];
 stopCalls = 0;
 private release: (() => void) | undefined;

 async listSessions(): Promise<SessionSummary[]> { return []; }
 async *compactSession(): AsyncIterable<never> {}
 async *sendPrompt(_prompt: string): AsyncIterable<SessionEvent> {
 yield {
 type: 'user_question_request', id: 'event-question', turnId: 'turn-1', ts: 1,
 requestId: 'question-1', toolUseId: 'tool-1',
 questions: [
 { question: 'Choose an approach', options: [{ label: 'Extend', description: 'Reuse the seam' }, { label: 'Separate' }] },
 { question: 'Keep the default', options: [{ label: 'Yes' }, { label: 'No' }] },
 { question: 'Anything else', options: [{ label: 'Nothing' }, { label: 'More detail' }] },
 ],
 };
 await new Promise<void>((resolve) => { this.release = resolve; });
 yield { type: 'complete', id: 'complete-1', turnId: 'turn-1', ts: 2, stopReason: 'end_turn' };
 }
 async respondToUserQuestion(response: UserQuestionResponse): Promise<void> {
 this.responses.push(response);
 this.release?.();
 }
 async stop(): Promise<void> { this.stopCalls += 1; this.release?.(); }
 async respondToPermission(_response: PermissionResponse): Promise<void> {}
 async renameSession(): Promise<void> {}
 async setModel(): Promise<void> {}
 async setPermissionMode(): Promise<void> {}
 async setThinkingLevel(): Promise<void> {}
 async switchSession(sessionId: string): Promise<MakaSessionSwitchResult> { return switchResult(fakeSessionSummary(sessionId)); }
 async listRewindTargets(): Promise<RewindTarget[]> { return []; }
 async rewindToTurn(): Promise<MakaSessionRewindResult> { throw new Error('rewind not supported'); }
 startNewSession(): void {}
 getSessionId(): string { return 'session-1'; }
}

class InterruptibleTurnDriver implements MakaSessionDriver {
 stopCalls = 0;
 private releaseTurn: (() => void) | null = null;
Expand Down

52 changes: 48 additions & 4 deletions
packages/cli/src/__tests__/runtime-bootstrap.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand DownExpand Up@@ -74,6 +75,7 @@ describe('Maka CLI runtime bootstrap', () => {
 ] as const;

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 requestedConnectionSlug: 'selected-local',
Expand DownExpand Up@@ -131,6 +133,7 @@ describe('Maka CLI runtime bootstrap', () => {
 permissionMode: 'explore',
 });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/canonical-repo',
 requestedConnectionSlug: 'local',
Expand DownExpand Up@@ -167,6 +170,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand All@@ -180,6 +184,38 @@ describe('Maka CLI runtime bootstrap', () => {
 });
 });

 test('registers AskUserQuestion only for the interactive TUI surface', async () => {
 await withWorkspace(async (workspaceRoot) => {
 const connectionStore = createConnectionStore(workspaceRoot);
 await connectionStore.create({
 slug: 'local',
 name: 'Local Ollama',
 providerType: 'ollama',
 defaultModel: 'llama3.2',
 });

 const tui = await createMakaCliRuntimeContext({
 workspaceRoot,
 cwd: '/repo',
 surface: 'tui',
 });
 const run = await createMakaCliRuntimeContext({
 workspaceRoot,
 cwd: '/repo',
 surface: 'run',
 });
 try {
 const tool = tui.tools.find((candidate) => candidate.name === 'AskUserQuestion');
 assert.ok(tool);
 assert.equal(tool.permissionRequired, false);
 assert.equal(run.tools.some((candidate) => candidate.name === 'AskUserQuestion'), false);
 } finally {
 await tui.close();
 await run.close();
 }
 });
 });

 test('registers the Skill tool so the CLI can load workspace skills', async () => {
 await withWorkspace(async (workspaceRoot) => {
 const connectionStore = createConnectionStore(workspaceRoot);
Expand All@@ -191,6 +227,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand All@@ -214,6 +251,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: workspaceRoot,
 });
Expand DownExpand Up@@ -289,7 +327,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 const updates: ShellRunUpdate[] = [];
 const unsubscribe = context.subscribeShellRunUpdates((update) => updates.push(update));
 try {
Expand DownExpand Up@@ -326,7 +365,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 try {
 const parent = await context.runtime.createSession({
 cwd: workspaceRoot, backend: 'ai-sdk', llmConnectionSlug: 'local',
Expand DownExpand Up@@ -362,7 +402,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 try {
 const bash = context.tools.find((tool) => tool.name === 'Bash');
 assert.ok(bash);
Expand DownExpand Up@@ -407,6 +448,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand DownExpand Up@@ -457,7 +499,8 @@ describe('Maka CLI runtime bootstrap', () => {
 defaultModel: 'llama3.2',
 });

 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: '/repo' });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: '/repo' });
 const session = await context.runtime.createSession({
 cwd: context.cwd,
 backend: 'ai-sdk',
Expand DownExpand Up@@ -501,6 +544,7 @@ describe('Maka CLI runtime bootstrap', () => {
 await credentialStore.setSecret('deepseek', 'api_key', 'test-key');

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand Down

25 changes: 25 additions & 0 deletions
packages/cli/src/__tests__/session-driver.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import type {
 SessionSummary,
 StoredMessage,
 UserMessageInput,
 UserQuestionResponse,
} from '@maka/core';
import { createMakaSessionDriver } from '../session-driver.js';

Expand DownExpand Up@@ -438,6 +439,25 @@ describe('Maka session driver', () => {
 }]);
 });

 test('routes user-question responses to the active session', async () => {
 const runtime = new RecordingRuntime();
 const driver = createMakaSessionDriver({
 runtime,
 cwd: '/repo',
 llmConnectionSlug: 'anthropic',
 model: 'claude-sonnet-4-5',
 newId: nextId('turn'),
 });

 await collect(driver.sendPrompt('choose'));
 await driver.respondToUserQuestion?.({ requestId: 'question-1', answers: ['A', null] });

 assert.deepEqual(runtime.userQuestionResponses, [{
 sessionId: 'session-1',
 response: { requestId: 'question-1', answers: ['A', null] },
 }]);
 });

 test('lists rewind targets newest-first, one per prompted turn, including the latest', async () => {
 const runtime = new RecordingRuntime();
 const driver = createMakaSessionDriver({
Expand DownExpand Up@@ -653,6 +673,7 @@ class RecordingRuntime {
 readonly sent: Array<{ sessionId: string; input: UserMessageInput }> = [];
 readonly compacted: Array<{ sessionId: string; input: { turnId?: string } }> = [];
 readonly permissionResponses: Array<{ sessionId: string; response: PermissionResponse }> = [];
 readonly userQuestionResponses: Array<{ sessionId: string; response: UserQuestionResponse }> = [];
 readonly permissionModes: Array<{ sessionId: string; mode: PermissionMode }> = [];
 readonly sessionUpdates: Array<{ sessionId: string; patch: { model?: string; llmConnectionSlug?: string; thinkingLevel?: import('@maka/core/model-thinking').ThinkingLevel | undefined; name?: string } }> = [];
 readonly branched: Array<{ sessionId: string; sourceTurnId: string }> = [];
Expand DownExpand Up@@ -713,6 +734,10 @@ class RecordingRuntime {
 this.permissionResponses.push({ sessionId, response });
 }

 async respondToUserQuestion(sessionId: string, response: UserQuestionResponse): Promise<void> {
 this.userQuestionResponses.push({ sessionId, response });
 }

 async setPermissionMode(sessionId: string, mode: PermissionMode): Promise<SessionSummary> {
 this.permissionModes.push({ sessionId, mode });
 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/cli/src/cli.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function runMakaCli(argv: string[] = process.argv.slice(2)): Promis
 let context;
 try {
 context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: process.cwd(),
 });
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: add AskUserQuestion runtime and TUI by Astro-Han · Pull Request #908 · apache/maka · GitHub
Skip to content
feat: add AskUserQuestion runtime and TUI#908

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

Astro-Han
merged 6 commits into

from

Jul 13, 2026
 Merged


feat: add AskUserQuestion runtime and TUI
#908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
022abd0

refactor(runtime): share turn-scoped await registry


Astro-Han Jul 13, 2026
a4aa300

feat(runtime): add AskUserQuestion round trip


Astro-Han Jul 13, 2026
2e6a7e2

feat(cli): scope AskUserQuestion to TUI


Astro-Han Jul 13, 2026
2ed8a48

feat(cli): render AskUserQuestion in TUI


Astro-Han Jul 13, 2026
8b34eed

test(runtime): update turn lifecycle contract


Astro-Han Jul 13, 2026
5475dae

fix(cli): expose user question stop action


Astro-Han Jul 13, 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


23 changes: 22 additions & 1 deletion
packages/cli/src/__tests__/pi-transcript.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -655,14 +655,35 @@ describe('Maka Pi TUI transcript', () => {
 permissionMode: 'ask',
 }, 100).map(stripAnsi);

 assert.equal(state.pendingPermission?.requestId, 'permission-1');
 assert.equal(state.pendingInteraction?.requestId, 'permission-1');
 assert.ok(visibleLines.some((line) => line.includes('Permission required')));
 assert.ok(visibleLines.some((line) => line.includes('Bash')));
 assert.ok(visibleLines.some((line) => line.includes('npm test')));
 assert.ok(visibleLines.some((line) => line.includes('y/Enter allow')));
 assert.ok(visibleLines.some((line) => line.includes('n/Esc deny')));
 });

 test('queues permission and user-question requests in arrival order', () => {
 const state = createMakaPiTranscriptState();
 applyMakaSessionEventToTranscript(state, event({
 type: 'permission_request', requestId: 'permission-1', toolUseId: 'tool-1',
 toolName: 'Bash', category: 'shell_unsafe', reason: 'shell_dangerous', args: {},
 }));
 applyMakaSessionEventToTranscript(state, event({
 type: 'user_question_request', requestId: 'question-1', toolUseId: 'tool-2',
 questions: [{ question: 'Choose', options: [{ label: 'A' }, { label: 'B' }] }],
 }));

 assert.equal(state.pendingInteraction?.requestId, 'permission-1');
 assert.deepEqual(state.queuedInteractions.map((item) => item.requestId), ['question-1']);

 applyMakaSessionEventToTranscript(state, event({
 type: 'permission_decision_ack', requestId: 'permission-1', toolUseId: 'tool-1', decision: 'allow',
 }));
 assert.equal(state.pendingInteraction?.requestId, 'question-1');
 assert.deepEqual(state.queuedInteractions, []);
 });

 test('orders thinking entries by arrival, before text and around tools', () => {
 const state = createMakaPiTranscriptState();

Expand Down

97 changes: 97 additions & 0 deletions
packages/cli/src/__tests__/pi-tui-runner.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import {
 type SessionSummary,
 type StoredMessage,
 type ThinkingLevel,
 type UserQuestionResponse,
} from '@maka/core';
import type { ShellRunUpdate } from '@maka/runtime';
import type { MakaSessionDriver, MakaSessionRewindResult, MakaSessionSwitchResult, RewindTarget } from '../session-driver.js';
Expand DownExpand Up@@ -280,6 +281,65 @@ describe('Maka Pi TUI runner', () => {
 ]);
 });

 test('answers sequential questions with a choice, Escape, and Other input', async () => {
 const terminal = new FakeTerminal();
 const driver = new UserQuestionPromptDriver();
 const run = runMakaPiTui({
 title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
 connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
 });

 terminal.input('choose');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
 assertBottomPickerPlacement(
 terminal,
 'Choose an approach',
 'Maka claude-sonnet-4-5 claude-subscription ask /repo',
 );
 assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));

 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Keep the default'));
 terminal.input('\x1b');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Anything else'));
 terminal.input('\x1b[B');
 terminal.input('\x1b[B');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Type another answer'));
 assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));
 terminal.input('Use the existing seam');
 terminal.input('\r');

 await waitFor(() => driver.responses.length === 1);
 assert.deepEqual(driver.responses, [{
 requestId: 'question-1',
 answers: ['Extend', null, 'Use the existing seam'],
 }]);

 exitMaka(terminal);
 await run;
 });

 test('Ctrl-C stops a turn while a user-question overlay is open', async () => {
 const terminal = new FakeTerminal();
 const driver = new UserQuestionPromptDriver();
 const run = runMakaPiTui({
 title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
 connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
 });

 terminal.input('choose');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
 terminal.input('\x03');

 await waitFor(() => driver.stopCalls === 1);
 assert.deepEqual(driver.responses, []);
 exitMaka(terminal);
 await run;
 });

 test('toggles tool detail globally with Ctrl-O', async () => {
 const terminal = new FakeTerminal();
 const driver = new ToolOutputDriver();
Expand DownExpand Up@@ -2982,6 +3042,43 @@ class PermissionPromptDriver implements MakaSessionDriver {
 }
}

class UserQuestionPromptDriver implements MakaSessionDriver {
 readonly responses: UserQuestionResponse[] = [];
 stopCalls = 0;
 private release: (() => void) | undefined;

 async listSessions(): Promise<SessionSummary[]> { return []; }
 async *compactSession(): AsyncIterable<never> {}
 async *sendPrompt(_prompt: string): AsyncIterable<SessionEvent> {
 yield {
 type: 'user_question_request', id: 'event-question', turnId: 'turn-1', ts: 1,
 requestId: 'question-1', toolUseId: 'tool-1',
 questions: [
 { question: 'Choose an approach', options: [{ label: 'Extend', description: 'Reuse the seam' }, { label: 'Separate' }] },
 { question: 'Keep the default', options: [{ label: 'Yes' }, { label: 'No' }] },
 { question: 'Anything else', options: [{ label: 'Nothing' }, { label: 'More detail' }] },
 ],
 };
 await new Promise<void>((resolve) => { this.release = resolve; });
 yield { type: 'complete', id: 'complete-1', turnId: 'turn-1', ts: 2, stopReason: 'end_turn' };
 }
 async respondToUserQuestion(response: UserQuestionResponse): Promise<void> {
 this.responses.push(response);
 this.release?.();
 }
 async stop(): Promise<void> { this.stopCalls += 1; this.release?.(); }
 async respondToPermission(_response: PermissionResponse): Promise<void> {}
 async renameSession(): Promise<void> {}
 async setModel(): Promise<void> {}
 async setPermissionMode(): Promise<void> {}
 async setThinkingLevel(): Promise<void> {}
 async switchSession(sessionId: string): Promise<MakaSessionSwitchResult> { return switchResult(fakeSessionSummary(sessionId)); }
 async listRewindTargets(): Promise<RewindTarget[]> { return []; }
 async rewindToTurn(): Promise<MakaSessionRewindResult> { throw new Error('rewind not supported'); }
 startNewSession(): void {}
 getSessionId(): string { return 'session-1'; }
}

class InterruptibleTurnDriver implements MakaSessionDriver {
 stopCalls = 0;
 private releaseTurn: (() => void) | null = null;
Expand Down

52 changes: 48 additions & 4 deletions
packages/cli/src/__tests__/runtime-bootstrap.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand DownExpand Up@@ -74,6 +75,7 @@ describe('Maka CLI runtime bootstrap', () => {
 ] as const;

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 requestedConnectionSlug: 'selected-local',
Expand DownExpand Up@@ -131,6 +133,7 @@ describe('Maka CLI runtime bootstrap', () => {
 permissionMode: 'explore',
 });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/canonical-repo',
 requestedConnectionSlug: 'local',
Expand DownExpand Up@@ -167,6 +170,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand All@@ -180,6 +184,38 @@ describe('Maka CLI runtime bootstrap', () => {
 });
 });

 test('registers AskUserQuestion only for the interactive TUI surface', async () => {
 await withWorkspace(async (workspaceRoot) => {
 const connectionStore = createConnectionStore(workspaceRoot);
 await connectionStore.create({
 slug: 'local',
 name: 'Local Ollama',
 providerType: 'ollama',
 defaultModel: 'llama3.2',
 });

 const tui = await createMakaCliRuntimeContext({
 workspaceRoot,
 cwd: '/repo',
 surface: 'tui',
 });
 const run = await createMakaCliRuntimeContext({
 workspaceRoot,
 cwd: '/repo',
 surface: 'run',
 });
 try {
 const tool = tui.tools.find((candidate) => candidate.name === 'AskUserQuestion');
 assert.ok(tool);
 assert.equal(tool.permissionRequired, false);
 assert.equal(run.tools.some((candidate) => candidate.name === 'AskUserQuestion'), false);
 } finally {
 await tui.close();
 await run.close();
 }
 });
 });

 test('registers the Skill tool so the CLI can load workspace skills', async () => {
 await withWorkspace(async (workspaceRoot) => {
 const connectionStore = createConnectionStore(workspaceRoot);
Expand All@@ -191,6 +227,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand All@@ -214,6 +251,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: workspaceRoot,
 });
Expand DownExpand Up@@ -289,7 +327,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 const updates: ShellRunUpdate[] = [];
 const unsubscribe = context.subscribeShellRunUpdates((update) => updates.push(update));
 try {
Expand DownExpand Up@@ -326,7 +365,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 try {
 const parent = await context.runtime.createSession({
 cwd: workspaceRoot, backend: 'ai-sdk', llmConnectionSlug: 'local',
Expand DownExpand Up@@ -362,7 +402,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 try {
 const bash = context.tools.find((tool) => tool.name === 'Bash');
 assert.ok(bash);
Expand DownExpand Up@@ -407,6 +448,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand DownExpand Up@@ -457,7 +499,8 @@ describe('Maka CLI runtime bootstrap', () => {
 defaultModel: 'llama3.2',
 });

 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: '/repo' });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: '/repo' });
 const session = await context.runtime.createSession({
 cwd: context.cwd,
 backend: 'ai-sdk',
Expand DownExpand Up@@ -501,6 +544,7 @@ describe('Maka CLI runtime bootstrap', () => {
 await credentialStore.setSecret('deepseek', 'api_key', 'test-key');

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand Down

25 changes: 25 additions & 0 deletions
packages/cli/src/__tests__/session-driver.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import type {
 SessionSummary,
 StoredMessage,
 UserMessageInput,
 UserQuestionResponse,
} from '@maka/core';
import { createMakaSessionDriver } from '../session-driver.js';

Expand DownExpand Up@@ -438,6 +439,25 @@ describe('Maka session driver', () => {
 }]);
 });

 test('routes user-question responses to the active session', async () => {
 const runtime = new RecordingRuntime();
 const driver = createMakaSessionDriver({
 runtime,
 cwd: '/repo',
 llmConnectionSlug: 'anthropic',
 model: 'claude-sonnet-4-5',
 newId: nextId('turn'),
 });

 await collect(driver.sendPrompt('choose'));
 await driver.respondToUserQuestion?.({ requestId: 'question-1', answers: ['A', null] });

 assert.deepEqual(runtime.userQuestionResponses, [{
 sessionId: 'session-1',
 response: { requestId: 'question-1', answers: ['A', null] },
 }]);
 });

 test('lists rewind targets newest-first, one per prompted turn, including the latest', async () => {
 const runtime = new RecordingRuntime();
 const driver = createMakaSessionDriver({
Expand DownExpand Up@@ -653,6 +673,7 @@ class RecordingRuntime {
 readonly sent: Array<{ sessionId: string; input: UserMessageInput }> = [];
 readonly compacted: Array<{ sessionId: string; input: { turnId?: string } }> = [];
 readonly permissionResponses: Array<{ sessionId: string; response: PermissionResponse }> = [];
 readonly userQuestionResponses: Array<{ sessionId: string; response: UserQuestionResponse }> = [];
 readonly permissionModes: Array<{ sessionId: string; mode: PermissionMode }> = [];
 readonly sessionUpdates: Array<{ sessionId: string; patch: { model?: string; llmConnectionSlug?: string; thinkingLevel?: import('@maka/core/model-thinking').ThinkingLevel | undefined; name?: string } }> = [];
 readonly branched: Array<{ sessionId: string; sourceTurnId: string }> = [];
Expand DownExpand Up@@ -713,6 +734,10 @@ class RecordingRuntime {
 this.permissionResponses.push({ sessionId, response });
 }

 async respondToUserQuestion(sessionId: string, response: UserQuestionResponse): Promise<void> {
 this.userQuestionResponses.push({ sessionId, response });
 }

 async setPermissionMode(sessionId: string, mode: PermissionMode): Promise<SessionSummary> {
 this.permissionModes.push({ sessionId, mode });
 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/cli/src/cli.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function runMakaCli(argv: string[] = process.argv.slice(2)): Promis
 let context;
 try {
 context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: process.cwd(),
 });
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: add AskUserQuestion runtime and TUI by Astro-Han · Pull Request #908 · apache/maka · GitHub
Skip to content
feat: add AskUserQuestion runtime and TUI#908

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

Astro-Han
merged 6 commits into

from

Jul 13, 2026
 Merged


feat: add AskUserQuestion runtime and TUI
#908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
022abd0

refactor(runtime): share turn-scoped await registry


Astro-Han Jul 13, 2026
a4aa300

feat(runtime): add AskUserQuestion round trip


Astro-Han Jul 13, 2026
2e6a7e2

feat(cli): scope AskUserQuestion to TUI


Astro-Han Jul 13, 2026
2ed8a48

feat(cli): render AskUserQuestion in TUI


Astro-Han Jul 13, 2026
8b34eed

test(runtime): update turn lifecycle contract


Astro-Han Jul 13, 2026
5475dae

fix(cli): expose user question stop action


Astro-Han Jul 13, 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


23 changes: 22 additions & 1 deletion
packages/cli/src/__tests__/pi-transcript.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -655,14 +655,35 @@ describe('Maka Pi TUI transcript', () => {
 permissionMode: 'ask',
 }, 100).map(stripAnsi);

 assert.equal(state.pendingPermission?.requestId, 'permission-1');
 assert.equal(state.pendingInteraction?.requestId, 'permission-1');
 assert.ok(visibleLines.some((line) => line.includes('Permission required')));
 assert.ok(visibleLines.some((line) => line.includes('Bash')));
 assert.ok(visibleLines.some((line) => line.includes('npm test')));
 assert.ok(visibleLines.some((line) => line.includes('y/Enter allow')));
 assert.ok(visibleLines.some((line) => line.includes('n/Esc deny')));
 });

 test('queues permission and user-question requests in arrival order', () => {
 const state = createMakaPiTranscriptState();
 applyMakaSessionEventToTranscript(state, event({
 type: 'permission_request', requestId: 'permission-1', toolUseId: 'tool-1',
 toolName: 'Bash', category: 'shell_unsafe', reason: 'shell_dangerous', args: {},
 }));
 applyMakaSessionEventToTranscript(state, event({
 type: 'user_question_request', requestId: 'question-1', toolUseId: 'tool-2',
 questions: [{ question: 'Choose', options: [{ label: 'A' }, { label: 'B' }] }],
 }));

 assert.equal(state.pendingInteraction?.requestId, 'permission-1');
 assert.deepEqual(state.queuedInteractions.map((item) => item.requestId), ['question-1']);

 applyMakaSessionEventToTranscript(state, event({
 type: 'permission_decision_ack', requestId: 'permission-1', toolUseId: 'tool-1', decision: 'allow',
 }));
 assert.equal(state.pendingInteraction?.requestId, 'question-1');
 assert.deepEqual(state.queuedInteractions, []);
 });

 test('orders thinking entries by arrival, before text and around tools', () => {
 const state = createMakaPiTranscriptState();

Expand Down

97 changes: 97 additions & 0 deletions
packages/cli/src/__tests__/pi-tui-runner.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import {
 type SessionSummary,
 type StoredMessage,
 type ThinkingLevel,
 type UserQuestionResponse,
} from '@maka/core';
import type { ShellRunUpdate } from '@maka/runtime';
import type { MakaSessionDriver, MakaSessionRewindResult, MakaSessionSwitchResult, RewindTarget } from '../session-driver.js';
Expand DownExpand Up@@ -280,6 +281,65 @@ describe('Maka Pi TUI runner', () => {
 ]);
 });

 test('answers sequential questions with a choice, Escape, and Other input', async () => {
 const terminal = new FakeTerminal();
 const driver = new UserQuestionPromptDriver();
 const run = runMakaPiTui({
 title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
 connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
 });

 terminal.input('choose');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
 assertBottomPickerPlacement(
 terminal,
 'Choose an approach',
 'Maka claude-sonnet-4-5 claude-subscription ask /repo',
 );
 assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));

 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Keep the default'));
 terminal.input('\x1b');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Anything else'));
 terminal.input('\x1b[B');
 terminal.input('\x1b[B');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Type another answer'));
 assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));
 terminal.input('Use the existing seam');
 terminal.input('\r');

 await waitFor(() => driver.responses.length === 1);
 assert.deepEqual(driver.responses, [{
 requestId: 'question-1',
 answers: ['Extend', null, 'Use the existing seam'],
 }]);

 exitMaka(terminal);
 await run;
 });

 test('Ctrl-C stops a turn while a user-question overlay is open', async () => {
 const terminal = new FakeTerminal();
 const driver = new UserQuestionPromptDriver();
 const run = runMakaPiTui({
 title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
 connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
 });

 terminal.input('choose');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
 terminal.input('\x03');

 await waitFor(() => driver.stopCalls === 1);
 assert.deepEqual(driver.responses, []);
 exitMaka(terminal);
 await run;
 });

 test('toggles tool detail globally with Ctrl-O', async () => {
 const terminal = new FakeTerminal();
 const driver = new ToolOutputDriver();
Expand DownExpand Up@@ -2982,6 +3042,43 @@ class PermissionPromptDriver implements MakaSessionDriver {
 }
}

class UserQuestionPromptDriver implements MakaSessionDriver {
 readonly responses: UserQuestionResponse[] = [];
 stopCalls = 0;
 private release: (() => void) | undefined;

 async listSessions(): Promise<SessionSummary[]> { return []; }
 async *compactSession(): AsyncIterable<never> {}
 async *sendPrompt(_prompt: string): AsyncIterable<SessionEvent> {
 yield {
 type: 'user_question_request', id: 'event-question', turnId: 'turn-1', ts: 1,
 requestId: 'question-1', toolUseId: 'tool-1',
 questions: [
 { question: 'Choose an approach', options: [{ label: 'Extend', description: 'Reuse the seam' }, { label: 'Separate' }] },
 { question: 'Keep the default', options: [{ label: 'Yes' }, { label: 'No' }] },
 { question: 'Anything else', options: [{ label: 'Nothing' }, { label: 'More detail' }] },
 ],
 };
 await new Promise<void>((resolve) => { this.release = resolve; });
 yield { type: 'complete', id: 'complete-1', turnId: 'turn-1', ts: 2, stopReason: 'end_turn' };
 }
 async respondToUserQuestion(response: UserQuestionResponse): Promise<void> {
 this.responses.push(response);
 this.release?.();
 }
 async stop(): Promise<void> { this.stopCalls += 1; this.release?.(); }
 async respondToPermission(_response: PermissionResponse): Promise<void> {}
 async renameSession(): Promise<void> {}
 async setModel(): Promise<void> {}
 async setPermissionMode(): Promise<void> {}
 async setThinkingLevel(): Promise<void> {}
 async switchSession(sessionId: string): Promise<MakaSessionSwitchResult> { return switchResult(fakeSessionSummary(sessionId)); }
 async listRewindTargets(): Promise<RewindTarget[]> { return []; }
 async rewindToTurn(): Promise<MakaSessionRewindResult> { throw new Error('rewind not supported'); }
 startNewSession(): void {}
 getSessionId(): string { return 'session-1'; }
}

class InterruptibleTurnDriver implements MakaSessionDriver {
 stopCalls = 0;
 private releaseTurn: (() => void) | null = null;
Expand Down

52 changes: 48 additions & 4 deletions
packages/cli/src/__tests__/runtime-bootstrap.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand DownExpand Up@@ -74,6 +75,7 @@ describe('Maka CLI runtime bootstrap', () => {
 ] as const;

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 requestedConnectionSlug: 'selected-local',
Expand DownExpand Up@@ -131,6 +133,7 @@ describe('Maka CLI runtime bootstrap', () => {
 permissionMode: 'explore',
 });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/canonical-repo',
 requestedConnectionSlug: 'local',
Expand DownExpand Up@@ -167,6 +170,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand All@@ -180,6 +184,38 @@ describe('Maka CLI runtime bootstrap', () => {
 });
 });

 test('registers AskUserQuestion only for the interactive TUI surface', async () => {
 await withWorkspace(async (workspaceRoot) => {
 const connectionStore = createConnectionStore(workspaceRoot);
 await connectionStore.create({
 slug: 'local',
 name: 'Local Ollama',
 providerType: 'ollama',
 defaultModel: 'llama3.2',
 });

 const tui = await createMakaCliRuntimeContext({
 workspaceRoot,
 cwd: '/repo',
 surface: 'tui',
 });
 const run = await createMakaCliRuntimeContext({
 workspaceRoot,
 cwd: '/repo',
 surface: 'run',
 });
 try {
 const tool = tui.tools.find((candidate) => candidate.name === 'AskUserQuestion');
 assert.ok(tool);
 assert.equal(tool.permissionRequired, false);
 assert.equal(run.tools.some((candidate) => candidate.name === 'AskUserQuestion'), false);
 } finally {
 await tui.close();
 await run.close();
 }
 });
 });

 test('registers the Skill tool so the CLI can load workspace skills', async () => {
 await withWorkspace(async (workspaceRoot) => {
 const connectionStore = createConnectionStore(workspaceRoot);
Expand All@@ -191,6 +227,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand All@@ -214,6 +251,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: workspaceRoot,
 });
Expand DownExpand Up@@ -289,7 +327,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 const updates: ShellRunUpdate[] = [];
 const unsubscribe = context.subscribeShellRunUpdates((update) => updates.push(update));
 try {
Expand DownExpand Up@@ -326,7 +365,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 try {
 const parent = await context.runtime.createSession({
 cwd: workspaceRoot, backend: 'ai-sdk', llmConnectionSlug: 'local',
Expand DownExpand Up@@ -362,7 +402,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 try {
 const bash = context.tools.find((tool) => tool.name === 'Bash');
 assert.ok(bash);
Expand DownExpand Up@@ -407,6 +448,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand DownExpand Up@@ -457,7 +499,8 @@ describe('Maka CLI runtime bootstrap', () => {
 defaultModel: 'llama3.2',
 });

 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: '/repo' });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: '/repo' });
 const session = await context.runtime.createSession({
 cwd: context.cwd,
 backend: 'ai-sdk',
Expand DownExpand Up@@ -501,6 +544,7 @@ describe('Maka CLI runtime bootstrap', () => {
 await credentialStore.setSecret('deepseek', 'api_key', 'test-key');

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand Down

25 changes: 25 additions & 0 deletions
packages/cli/src/__tests__/session-driver.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import type {
 SessionSummary,
 StoredMessage,
 UserMessageInput,
 UserQuestionResponse,
} from '@maka/core';
import { createMakaSessionDriver } from '../session-driver.js';

Expand DownExpand Up@@ -438,6 +439,25 @@ describe('Maka session driver', () => {
 }]);
 });

 test('routes user-question responses to the active session', async () => {
 const runtime = new RecordingRuntime();
 const driver = createMakaSessionDriver({
 runtime,
 cwd: '/repo',
 llmConnectionSlug: 'anthropic',
 model: 'claude-sonnet-4-5',
 newId: nextId('turn'),
 });

 await collect(driver.sendPrompt('choose'));
 await driver.respondToUserQuestion?.({ requestId: 'question-1', answers: ['A', null] });

 assert.deepEqual(runtime.userQuestionResponses, [{
 sessionId: 'session-1',
 response: { requestId: 'question-1', answers: ['A', null] },
 }]);
 });

 test('lists rewind targets newest-first, one per prompted turn, including the latest', async () => {
 const runtime = new RecordingRuntime();
 const driver = createMakaSessionDriver({
Expand DownExpand Up@@ -653,6 +673,7 @@ class RecordingRuntime {
 readonly sent: Array<{ sessionId: string; input: UserMessageInput }> = [];
 readonly compacted: Array<{ sessionId: string; input: { turnId?: string } }> = [];
 readonly permissionResponses: Array<{ sessionId: string; response: PermissionResponse }> = [];
 readonly userQuestionResponses: Array<{ sessionId: string; response: UserQuestionResponse }> = [];
 readonly permissionModes: Array<{ sessionId: string; mode: PermissionMode }> = [];
 readonly sessionUpdates: Array<{ sessionId: string; patch: { model?: string; llmConnectionSlug?: string; thinkingLevel?: import('@maka/core/model-thinking').ThinkingLevel | undefined; name?: string } }> = [];
 readonly branched: Array<{ sessionId: string; sourceTurnId: string }> = [];
Expand DownExpand Up@@ -713,6 +734,10 @@ class RecordingRuntime {
 this.permissionResponses.push({ sessionId, response });
 }

 async respondToUserQuestion(sessionId: string, response: UserQuestionResponse): Promise<void> {
 this.userQuestionResponses.push({ sessionId, response });
 }

 async setPermissionMode(sessionId: string, mode: PermissionMode): Promise<SessionSummary> {
 this.permissionModes.push({ sessionId, mode });
 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/cli/src/cli.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function runMakaCli(argv: string[] = process.argv.slice(2)): Promis
 let context;
 try {
 context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: process.cwd(),
 });
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
feat: add AskUserQuestion runtime and TUI by Astro-Han · Pull Request #908 · apache/maka · GitHub
Skip to content
feat: add AskUserQuestion runtime and TUI#908

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

Astro-Han
merged 6 commits into

from

Jul 13, 2026
 Merged


feat: add AskUserQuestion runtime and TUI
#908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
022abd0

refactor(runtime): share turn-scoped await registry


Astro-Han Jul 13, 2026
a4aa300

feat(runtime): add AskUserQuestion round trip


Astro-Han Jul 13, 2026
2e6a7e2

feat(cli): scope AskUserQuestion to TUI


Astro-Han Jul 13, 2026
2ed8a48

feat(cli): render AskUserQuestion in TUI


Astro-Han Jul 13, 2026
8b34eed

test(runtime): update turn lifecycle contract


Astro-Han Jul 13, 2026
5475dae

fix(cli): expose user question stop action


Astro-Han Jul 13, 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


23 changes: 22 additions & 1 deletion
packages/cli/src/__tests__/pi-transcript.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -655,14 +655,35 @@ describe('Maka Pi TUI transcript', () => {
 permissionMode: 'ask',
 }, 100).map(stripAnsi);

 assert.equal(state.pendingPermission?.requestId, 'permission-1');
 assert.equal(state.pendingInteraction?.requestId, 'permission-1');
 assert.ok(visibleLines.some((line) => line.includes('Permission required')));
 assert.ok(visibleLines.some((line) => line.includes('Bash')));
 assert.ok(visibleLines.some((line) => line.includes('npm test')));
 assert.ok(visibleLines.some((line) => line.includes('y/Enter allow')));
 assert.ok(visibleLines.some((line) => line.includes('n/Esc deny')));
 });

 test('queues permission and user-question requests in arrival order', () => {
 const state = createMakaPiTranscriptState();
 applyMakaSessionEventToTranscript(state, event({
 type: 'permission_request', requestId: 'permission-1', toolUseId: 'tool-1',
 toolName: 'Bash', category: 'shell_unsafe', reason: 'shell_dangerous', args: {},
 }));
 applyMakaSessionEventToTranscript(state, event({
 type: 'user_question_request', requestId: 'question-1', toolUseId: 'tool-2',
 questions: [{ question: 'Choose', options: [{ label: 'A' }, { label: 'B' }] }],
 }));

 assert.equal(state.pendingInteraction?.requestId, 'permission-1');
 assert.deepEqual(state.queuedInteractions.map((item) => item.requestId), ['question-1']);

 applyMakaSessionEventToTranscript(state, event({
 type: 'permission_decision_ack', requestId: 'permission-1', toolUseId: 'tool-1', decision: 'allow',
 }));
 assert.equal(state.pendingInteraction?.requestId, 'question-1');
 assert.deepEqual(state.queuedInteractions, []);
 });

 test('orders thinking entries by arrival, before text and around tools', () => {
 const state = createMakaPiTranscriptState();

Expand Down

97 changes: 97 additions & 0 deletions
packages/cli/src/__tests__/pi-tui-runner.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import {
 type SessionSummary,
 type StoredMessage,
 type ThinkingLevel,
 type UserQuestionResponse,
} from '@maka/core';
import type { ShellRunUpdate } from '@maka/runtime';
import type { MakaSessionDriver, MakaSessionRewindResult, MakaSessionSwitchResult, RewindTarget } from '../session-driver.js';
Expand DownExpand Up@@ -280,6 +281,65 @@ describe('Maka Pi TUI runner', () => {
 ]);
 });

 test('answers sequential questions with a choice, Escape, and Other input', async () => {
 const terminal = new FakeTerminal();
 const driver = new UserQuestionPromptDriver();
 const run = runMakaPiTui({
 title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
 connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
 });

 terminal.input('choose');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
 assertBottomPickerPlacement(
 terminal,
 'Choose an approach',
 'Maka claude-sonnet-4-5 claude-subscription ask /repo',
 );
 assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));

 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Keep the default'));
 terminal.input('\x1b');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Anything else'));
 terminal.input('\x1b[B');
 terminal.input('\x1b[B');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Type another answer'));
 assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));
 terminal.input('Use the existing seam');
 terminal.input('\r');

 await waitFor(() => driver.responses.length === 1);
 assert.deepEqual(driver.responses, [{
 requestId: 'question-1',
 answers: ['Extend', null, 'Use the existing seam'],
 }]);

 exitMaka(terminal);
 await run;
 });

 test('Ctrl-C stops a turn while a user-question overlay is open', async () => {
 const terminal = new FakeTerminal();
 const driver = new UserQuestionPromptDriver();
 const run = runMakaPiTui({
 title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
 connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
 });

 terminal.input('choose');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
 terminal.input('\x03');

 await waitFor(() => driver.stopCalls === 1);
 assert.deepEqual(driver.responses, []);
 exitMaka(terminal);
 await run;
 });

 test('toggles tool detail globally with Ctrl-O', async () => {
 const terminal = new FakeTerminal();
 const driver = new ToolOutputDriver();
Expand DownExpand Up@@ -2982,6 +3042,43 @@ class PermissionPromptDriver implements MakaSessionDriver {
 }
}

class UserQuestionPromptDriver implements MakaSessionDriver {
 readonly responses: UserQuestionResponse[] = [];
 stopCalls = 0;
 private release: (() => void) | undefined;

 async listSessions(): Promise<SessionSummary[]> { return []; }
 async *compactSession(): AsyncIterable<never> {}
 async *sendPrompt(_prompt: string): AsyncIterable<SessionEvent> {
 yield {
 type: 'user_question_request', id: 'event-question', turnId: 'turn-1', ts: 1,
 requestId: 'question-1', toolUseId: 'tool-1',
 questions: [
 { question: 'Choose an approach', options: [{ label: 'Extend', description: 'Reuse the seam' }, { label: 'Separate' }] },
 { question: 'Keep the default', options: [{ label: 'Yes' }, { label: 'No' }] },
 { question: 'Anything else', options: [{ label: 'Nothing' }, { label: 'More detail' }] },
 ],
 };
 await new Promise<void>((resolve) => { this.release = resolve; });
 yield { type: 'complete', id: 'complete-1', turnId: 'turn-1', ts: 2, stopReason: 'end_turn' };
 }
 async respondToUserQuestion(response: UserQuestionResponse): Promise<void> {
 this.responses.push(response);
 this.release?.();
 }
 async stop(): Promise<void> { this.stopCalls += 1; this.release?.(); }
 async respondToPermission(_response: PermissionResponse): Promise<void> {}
 async renameSession(): Promise<void> {}
 async setModel(): Promise<void> {}
 async setPermissionMode(): Promise<void> {}
 async setThinkingLevel(): Promise<void> {}
 async switchSession(sessionId: string): Promise<MakaSessionSwitchResult> { return switchResult(fakeSessionSummary(sessionId)); }
 async listRewindTargets(): Promise<RewindTarget[]> { return []; }
 async rewindToTurn(): Promise<MakaSessionRewindResult> { throw new Error('rewind not supported'); }
 startNewSession(): void {}
 getSessionId(): string { return 'session-1'; }
}

class InterruptibleTurnDriver implements MakaSessionDriver {
 stopCalls = 0;
 private releaseTurn: (() => void) | null = null;
Expand Down

52 changes: 48 additions & 4 deletions
packages/cli/src/__tests__/runtime-bootstrap.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand DownExpand Up@@ -74,6 +75,7 @@ describe('Maka CLI runtime bootstrap', () => {
 ] as const;

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 requestedConnectionSlug: 'selected-local',
Expand DownExpand Up@@ -131,6 +133,7 @@ describe('Maka CLI runtime bootstrap', () => {
 permissionMode: 'explore',
 });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/canonical-repo',
 requestedConnectionSlug: 'local',
Expand DownExpand Up@@ -167,6 +170,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand All@@ -180,6 +184,38 @@ describe('Maka CLI runtime bootstrap', () => {
 });
 });

 test('registers AskUserQuestion only for the interactive TUI surface', async () => {
 await withWorkspace(async (workspaceRoot) => {
 const connectionStore = createConnectionStore(workspaceRoot);
 await connectionStore.create({
 slug: 'local',
 name: 'Local Ollama',
 providerType: 'ollama',
 defaultModel: 'llama3.2',
 });

 const tui = await createMakaCliRuntimeContext({
 workspaceRoot,
 cwd: '/repo',
 surface: 'tui',
 });
 const run = await createMakaCliRuntimeContext({
 workspaceRoot,
 cwd: '/repo',
 surface: 'run',
 });
 try {
 const tool = tui.tools.find((candidate) => candidate.name === 'AskUserQuestion');
 assert.ok(tool);
 assert.equal(tool.permissionRequired, false);
 assert.equal(run.tools.some((candidate) => candidate.name === 'AskUserQuestion'), false);
 } finally {
 await tui.close();
 await run.close();
 }
 });
 });

 test('registers the Skill tool so the CLI can load workspace skills', async () => {
 await withWorkspace(async (workspaceRoot) => {
 const connectionStore = createConnectionStore(workspaceRoot);
Expand All@@ -191,6 +227,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand All@@ -214,6 +251,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: workspaceRoot,
 });
Expand DownExpand Up@@ -289,7 +327,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 const updates: ShellRunUpdate[] = [];
 const unsubscribe = context.subscribeShellRunUpdates((update) => updates.push(update));
 try {
Expand DownExpand Up@@ -326,7 +365,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 try {
 const parent = await context.runtime.createSession({
 cwd: workspaceRoot, backend: 'ai-sdk', llmConnectionSlug: 'local',
Expand DownExpand Up@@ -362,7 +402,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 try {
 const bash = context.tools.find((tool) => tool.name === 'Bash');
 assert.ok(bash);
Expand DownExpand Up@@ -407,6 +448,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand DownExpand Up@@ -457,7 +499,8 @@ describe('Maka CLI runtime bootstrap', () => {
 defaultModel: 'llama3.2',
 });

 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: '/repo' });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: '/repo' });
 const session = await context.runtime.createSession({
 cwd: context.cwd,
 backend: 'ai-sdk',
Expand DownExpand Up@@ -501,6 +544,7 @@ describe('Maka CLI runtime bootstrap', () => {
 await credentialStore.setSecret('deepseek', 'api_key', 'test-key');

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand Down

25 changes: 25 additions & 0 deletions
packages/cli/src/__tests__/session-driver.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import type {
 SessionSummary,
 StoredMessage,
 UserMessageInput,
 UserQuestionResponse,
} from '@maka/core';
import { createMakaSessionDriver } from '../session-driver.js';

Expand DownExpand Up@@ -438,6 +439,25 @@ describe('Maka session driver', () => {
 }]);
 });

 test('routes user-question responses to the active session', async () => {
 const runtime = new RecordingRuntime();
 const driver = createMakaSessionDriver({
 runtime,
 cwd: '/repo',
 llmConnectionSlug: 'anthropic',
 model: 'claude-sonnet-4-5',
 newId: nextId('turn'),
 });

 await collect(driver.sendPrompt('choose'));
 await driver.respondToUserQuestion?.({ requestId: 'question-1', answers: ['A', null] });

 assert.deepEqual(runtime.userQuestionResponses, [{
 sessionId: 'session-1',
 response: { requestId: 'question-1', answers: ['A', null] },
 }]);
 });

 test('lists rewind targets newest-first, one per prompted turn, including the latest', async () => {
 const runtime = new RecordingRuntime();
 const driver = createMakaSessionDriver({
Expand DownExpand Up@@ -653,6 +673,7 @@ class RecordingRuntime {
 readonly sent: Array<{ sessionId: string; input: UserMessageInput }> = [];
 readonly compacted: Array<{ sessionId: string; input: { turnId?: string } }> = [];
 readonly permissionResponses: Array<{ sessionId: string; response: PermissionResponse }> = [];
 readonly userQuestionResponses: Array<{ sessionId: string; response: UserQuestionResponse }> = [];
 readonly permissionModes: Array<{ sessionId: string; mode: PermissionMode }> = [];
 readonly sessionUpdates: Array<{ sessionId: string; patch: { model?: string; llmConnectionSlug?: string; thinkingLevel?: import('@maka/core/model-thinking').ThinkingLevel | undefined; name?: string } }> = [];
 readonly branched: Array<{ sessionId: string; sourceTurnId: string }> = [];
Expand DownExpand Up@@ -713,6 +734,10 @@ class RecordingRuntime {
 this.permissionResponses.push({ sessionId, response });
 }

 async respondToUserQuestion(sessionId: string, response: UserQuestionResponse): Promise<void> {
 this.userQuestionResponses.push({ sessionId, response });
 }

 async setPermissionMode(sessionId: string, mode: PermissionMode): Promise<SessionSummary> {
 this.permissionModes.push({ sessionId, mode });
 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/cli/src/cli.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function runMakaCli(argv: string[] = process.argv.slice(2)): Promis
 let context;
 try {
 context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: process.cwd(),
 });
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: add AskUserQuestion runtime and TUI by Astro-Han · Pull Request #908 · apache/maka · GitHub
Skip to content
feat: add AskUserQuestion runtime and TUI#908

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

Astro-Han
merged 6 commits into

from

Jul 13, 2026
 Merged


feat: add AskUserQuestion runtime and TUI
#908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
022abd0

refactor(runtime): share turn-scoped await registry


Astro-Han Jul 13, 2026
a4aa300

feat(runtime): add AskUserQuestion round trip


Astro-Han Jul 13, 2026
2e6a7e2

feat(cli): scope AskUserQuestion to TUI


Astro-Han Jul 13, 2026
2ed8a48

feat(cli): render AskUserQuestion in TUI


Astro-Han Jul 13, 2026
8b34eed

test(runtime): update turn lifecycle contract


Astro-Han Jul 13, 2026
5475dae

fix(cli): expose user question stop action


Astro-Han Jul 13, 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


23 changes: 22 additions & 1 deletion
packages/cli/src/__tests__/pi-transcript.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -655,14 +655,35 @@ describe('Maka Pi TUI transcript', () => {
 permissionMode: 'ask',
 }, 100).map(stripAnsi);

 assert.equal(state.pendingPermission?.requestId, 'permission-1');
 assert.equal(state.pendingInteraction?.requestId, 'permission-1');
 assert.ok(visibleLines.some((line) => line.includes('Permission required')));
 assert.ok(visibleLines.some((line) => line.includes('Bash')));
 assert.ok(visibleLines.some((line) => line.includes('npm test')));
 assert.ok(visibleLines.some((line) => line.includes('y/Enter allow')));
 assert.ok(visibleLines.some((line) => line.includes('n/Esc deny')));
 });

 test('queues permission and user-question requests in arrival order', () => {
 const state = createMakaPiTranscriptState();
 applyMakaSessionEventToTranscript(state, event({
 type: 'permission_request', requestId: 'permission-1', toolUseId: 'tool-1',
 toolName: 'Bash', category: 'shell_unsafe', reason: 'shell_dangerous', args: {},
 }));
 applyMakaSessionEventToTranscript(state, event({
 type: 'user_question_request', requestId: 'question-1', toolUseId: 'tool-2',
 questions: [{ question: 'Choose', options: [{ label: 'A' }, { label: 'B' }] }],
 }));

 assert.equal(state.pendingInteraction?.requestId, 'permission-1');
 assert.deepEqual(state.queuedInteractions.map((item) => item.requestId), ['question-1']);

 applyMakaSessionEventToTranscript(state, event({
 type: 'permission_decision_ack', requestId: 'permission-1', toolUseId: 'tool-1', decision: 'allow',
 }));
 assert.equal(state.pendingInteraction?.requestId, 'question-1');
 assert.deepEqual(state.queuedInteractions, []);
 });

 test('orders thinking entries by arrival, before text and around tools', () => {
 const state = createMakaPiTranscriptState();

Expand Down

97 changes: 97 additions & 0 deletions
packages/cli/src/__tests__/pi-tui-runner.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import {
 type SessionSummary,
 type StoredMessage,
 type ThinkingLevel,
 type UserQuestionResponse,
} from '@maka/core';
import type { ShellRunUpdate } from '@maka/runtime';
import type { MakaSessionDriver, MakaSessionRewindResult, MakaSessionSwitchResult, RewindTarget } from '../session-driver.js';
Expand DownExpand Up@@ -280,6 +281,65 @@ describe('Maka Pi TUI runner', () => {
 ]);
 });

 test('answers sequential questions with a choice, Escape, and Other input', async () => {
 const terminal = new FakeTerminal();
 const driver = new UserQuestionPromptDriver();
 const run = runMakaPiTui({
 title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
 connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
 });

 terminal.input('choose');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
 assertBottomPickerPlacement(
 terminal,
 'Choose an approach',
 'Maka claude-sonnet-4-5 claude-subscription ask /repo',
 );
 assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));

 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Keep the default'));
 terminal.input('\x1b');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Anything else'));
 terminal.input('\x1b[B');
 terminal.input('\x1b[B');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Type another answer'));
 assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));
 terminal.input('Use the existing seam');
 terminal.input('\r');

 await waitFor(() => driver.responses.length === 1);
 assert.deepEqual(driver.responses, [{
 requestId: 'question-1',
 answers: ['Extend', null, 'Use the existing seam'],
 }]);

 exitMaka(terminal);
 await run;
 });

 test('Ctrl-C stops a turn while a user-question overlay is open', async () => {
 const terminal = new FakeTerminal();
 const driver = new UserQuestionPromptDriver();
 const run = runMakaPiTui({
 title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
 connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
 });

 terminal.input('choose');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
 terminal.input('\x03');

 await waitFor(() => driver.stopCalls === 1);
 assert.deepEqual(driver.responses, []);
 exitMaka(terminal);
 await run;
 });

 test('toggles tool detail globally with Ctrl-O', async () => {
 const terminal = new FakeTerminal();
 const driver = new ToolOutputDriver();
Expand DownExpand Up@@ -2982,6 +3042,43 @@ class PermissionPromptDriver implements MakaSessionDriver {
 }
}

class UserQuestionPromptDriver implements MakaSessionDriver {
 readonly responses: UserQuestionResponse[] = [];
 stopCalls = 0;
 private release: (() => void) | undefined;

 async listSessions(): Promise<SessionSummary[]> { return []; }
 async *compactSession(): AsyncIterable<never> {}
 async *sendPrompt(_prompt: string): AsyncIterable<SessionEvent> {
 yield {
 type: 'user_question_request', id: 'event-question', turnId: 'turn-1', ts: 1,
 requestId: 'question-1', toolUseId: 'tool-1',
 questions: [
 { question: 'Choose an approach', options: [{ label: 'Extend', description: 'Reuse the seam' }, { label: 'Separate' }] },
 { question: 'Keep the default', options: [{ label: 'Yes' }, { label: 'No' }] },
 { question: 'Anything else', options: [{ label: 'Nothing' }, { label: 'More detail' }] },
 ],
 };
 await new Promise<void>((resolve) => { this.release = resolve; });
 yield { type: 'complete', id: 'complete-1', turnId: 'turn-1', ts: 2, stopReason: 'end_turn' };
 }
 async respondToUserQuestion(response: UserQuestionResponse): Promise<void> {
 this.responses.push(response);
 this.release?.();
 }
 async stop(): Promise<void> { this.stopCalls += 1; this.release?.(); }
 async respondToPermission(_response: PermissionResponse): Promise<void> {}
 async renameSession(): Promise<void> {}
 async setModel(): Promise<void> {}
 async setPermissionMode(): Promise<void> {}
 async setThinkingLevel(): Promise<void> {}
 async switchSession(sessionId: string): Promise<MakaSessionSwitchResult> { return switchResult(fakeSessionSummary(sessionId)); }
 async listRewindTargets(): Promise<RewindTarget[]> { return []; }
 async rewindToTurn(): Promise<MakaSessionRewindResult> { throw new Error('rewind not supported'); }
 startNewSession(): void {}
 getSessionId(): string { return 'session-1'; }
}

class InterruptibleTurnDriver implements MakaSessionDriver {
 stopCalls = 0;
 private releaseTurn: (() => void) | null = null;
Expand Down

52 changes: 48 additions & 4 deletions
packages/cli/src/__tests__/runtime-bootstrap.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand DownExpand Up@@ -74,6 +75,7 @@ describe('Maka CLI runtime bootstrap', () => {
 ] as const;

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 requestedConnectionSlug: 'selected-local',
Expand DownExpand Up@@ -131,6 +133,7 @@ describe('Maka CLI runtime bootstrap', () => {
 permissionMode: 'explore',
 });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/canonical-repo',
 requestedConnectionSlug: 'local',
Expand DownExpand Up@@ -167,6 +170,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand All@@ -180,6 +184,38 @@ describe('Maka CLI runtime bootstrap', () => {
 });
 });

 test('registers AskUserQuestion only for the interactive TUI surface', async () => {
 await withWorkspace(async (workspaceRoot) => {
 const connectionStore = createConnectionStore(workspaceRoot);
 await connectionStore.create({
 slug: 'local',
 name: 'Local Ollama',
 providerType: 'ollama',
 defaultModel: 'llama3.2',
 });

 const tui = await createMakaCliRuntimeContext({
 workspaceRoot,
 cwd: '/repo',
 surface: 'tui',
 });
 const run = await createMakaCliRuntimeContext({
 workspaceRoot,
 cwd: '/repo',
 surface: 'run',
 });
 try {
 const tool = tui.tools.find((candidate) => candidate.name === 'AskUserQuestion');
 assert.ok(tool);
 assert.equal(tool.permissionRequired, false);
 assert.equal(run.tools.some((candidate) => candidate.name === 'AskUserQuestion'), false);
 } finally {
 await tui.close();
 await run.close();
 }
 });
 });

 test('registers the Skill tool so the CLI can load workspace skills', async () => {
 await withWorkspace(async (workspaceRoot) => {
 const connectionStore = createConnectionStore(workspaceRoot);
Expand All@@ -191,6 +227,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand All@@ -214,6 +251,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: workspaceRoot,
 });
Expand DownExpand Up@@ -289,7 +327,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 const updates: ShellRunUpdate[] = [];
 const unsubscribe = context.subscribeShellRunUpdates((update) => updates.push(update));
 try {
Expand DownExpand Up@@ -326,7 +365,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 try {
 const parent = await context.runtime.createSession({
 cwd: workspaceRoot, backend: 'ai-sdk', llmConnectionSlug: 'local',
Expand DownExpand Up@@ -362,7 +402,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 try {
 const bash = context.tools.find((tool) => tool.name === 'Bash');
 assert.ok(bash);
Expand DownExpand Up@@ -407,6 +448,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand DownExpand Up@@ -457,7 +499,8 @@ describe('Maka CLI runtime bootstrap', () => {
 defaultModel: 'llama3.2',
 });

 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: '/repo' });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: '/repo' });
 const session = await context.runtime.createSession({
 cwd: context.cwd,
 backend: 'ai-sdk',
Expand DownExpand Up@@ -501,6 +544,7 @@ describe('Maka CLI runtime bootstrap', () => {
 await credentialStore.setSecret('deepseek', 'api_key', 'test-key');

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand Down

25 changes: 25 additions & 0 deletions
packages/cli/src/__tests__/session-driver.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import type {
 SessionSummary,
 StoredMessage,
 UserMessageInput,
 UserQuestionResponse,
} from '@maka/core';
import { createMakaSessionDriver } from '../session-driver.js';

Expand DownExpand Up@@ -438,6 +439,25 @@ describe('Maka session driver', () => {
 }]);
 });

 test('routes user-question responses to the active session', async () => {
 const runtime = new RecordingRuntime();
 const driver = createMakaSessionDriver({
 runtime,
 cwd: '/repo',
 llmConnectionSlug: 'anthropic',
 model: 'claude-sonnet-4-5',
 newId: nextId('turn'),
 });

 await collect(driver.sendPrompt('choose'));
 await driver.respondToUserQuestion?.({ requestId: 'question-1', answers: ['A', null] });

 assert.deepEqual(runtime.userQuestionResponses, [{
 sessionId: 'session-1',
 response: { requestId: 'question-1', answers: ['A', null] },
 }]);
 });

 test('lists rewind targets newest-first, one per prompted turn, including the latest', async () => {
 const runtime = new RecordingRuntime();
 const driver = createMakaSessionDriver({
Expand DownExpand Up@@ -653,6 +673,7 @@ class RecordingRuntime {
 readonly sent: Array<{ sessionId: string; input: UserMessageInput }> = [];
 readonly compacted: Array<{ sessionId: string; input: { turnId?: string } }> = [];
 readonly permissionResponses: Array<{ sessionId: string; response: PermissionResponse }> = [];
 readonly userQuestionResponses: Array<{ sessionId: string; response: UserQuestionResponse }> = [];
 readonly permissionModes: Array<{ sessionId: string; mode: PermissionMode }> = [];
 readonly sessionUpdates: Array<{ sessionId: string; patch: { model?: string; llmConnectionSlug?: string; thinkingLevel?: import('@maka/core/model-thinking').ThinkingLevel | undefined; name?: string } }> = [];
 readonly branched: Array<{ sessionId: string; sourceTurnId: string }> = [];
Expand DownExpand Up@@ -713,6 +734,10 @@ class RecordingRuntime {
 this.permissionResponses.push({ sessionId, response });
 }

 async respondToUserQuestion(sessionId: string, response: UserQuestionResponse): Promise<void> {
 this.userQuestionResponses.push({ sessionId, response });
 }

 async setPermissionMode(sessionId: string, mode: PermissionMode): Promise<SessionSummary> {
 this.permissionModes.push({ sessionId, mode });
 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/cli/src/cli.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function runMakaCli(argv: string[] = process.argv.slice(2)): Promis
 let context;
 try {
 context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: process.cwd(),
 });
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: add AskUserQuestion runtime and TUI by Astro-Han · Pull Request #908 · apache/maka · GitHub
Skip to content
feat: add AskUserQuestion runtime and TUI#908

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

Astro-Han
merged 6 commits into

from

Jul 13, 2026
 Merged


feat: add AskUserQuestion runtime and TUI
#908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
022abd0

refactor(runtime): share turn-scoped await registry


Astro-Han Jul 13, 2026
a4aa300

feat(runtime): add AskUserQuestion round trip


Astro-Han Jul 13, 2026
2e6a7e2

feat(cli): scope AskUserQuestion to TUI


Astro-Han Jul 13, 2026
2ed8a48

feat(cli): render AskUserQuestion in TUI


Astro-Han Jul 13, 2026
8b34eed

test(runtime): update turn lifecycle contract


Astro-Han Jul 13, 2026
5475dae

fix(cli): expose user question stop action


Astro-Han Jul 13, 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


23 changes: 22 additions & 1 deletion
packages/cli/src/__tests__/pi-transcript.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -655,14 +655,35 @@ describe('Maka Pi TUI transcript', () => {
 permissionMode: 'ask',
 }, 100).map(stripAnsi);

 assert.equal(state.pendingPermission?.requestId, 'permission-1');
 assert.equal(state.pendingInteraction?.requestId, 'permission-1');
 assert.ok(visibleLines.some((line) => line.includes('Permission required')));
 assert.ok(visibleLines.some((line) => line.includes('Bash')));
 assert.ok(visibleLines.some((line) => line.includes('npm test')));
 assert.ok(visibleLines.some((line) => line.includes('y/Enter allow')));
 assert.ok(visibleLines.some((line) => line.includes('n/Esc deny')));
 });

 test('queues permission and user-question requests in arrival order', () => {
 const state = createMakaPiTranscriptState();
 applyMakaSessionEventToTranscript(state, event({
 type: 'permission_request', requestId: 'permission-1', toolUseId: 'tool-1',
 toolName: 'Bash', category: 'shell_unsafe', reason: 'shell_dangerous', args: {},
 }));
 applyMakaSessionEventToTranscript(state, event({
 type: 'user_question_request', requestId: 'question-1', toolUseId: 'tool-2',
 questions: [{ question: 'Choose', options: [{ label: 'A' }, { label: 'B' }] }],
 }));

 assert.equal(state.pendingInteraction?.requestId, 'permission-1');
 assert.deepEqual(state.queuedInteractions.map((item) => item.requestId), ['question-1']);

 applyMakaSessionEventToTranscript(state, event({
 type: 'permission_decision_ack', requestId: 'permission-1', toolUseId: 'tool-1', decision: 'allow',
 }));
 assert.equal(state.pendingInteraction?.requestId, 'question-1');
 assert.deepEqual(state.queuedInteractions, []);
 });

 test('orders thinking entries by arrival, before text and around tools', () => {
 const state = createMakaPiTranscriptState();

Expand Down

97 changes: 97 additions & 0 deletions
packages/cli/src/__tests__/pi-tui-runner.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import {
 type SessionSummary,
 type StoredMessage,
 type ThinkingLevel,
 type UserQuestionResponse,
} from '@maka/core';
import type { ShellRunUpdate } from '@maka/runtime';
import type { MakaSessionDriver, MakaSessionRewindResult, MakaSessionSwitchResult, RewindTarget } from '../session-driver.js';
Expand DownExpand Up@@ -280,6 +281,65 @@ describe('Maka Pi TUI runner', () => {
 ]);
 });

 test('answers sequential questions with a choice, Escape, and Other input', async () => {
 const terminal = new FakeTerminal();
 const driver = new UserQuestionPromptDriver();
 const run = runMakaPiTui({
 title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
 connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
 });

 terminal.input('choose');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
 assertBottomPickerPlacement(
 terminal,
 'Choose an approach',
 'Maka claude-sonnet-4-5 claude-subscription ask /repo',
 );
 assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));

 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Keep the default'));
 terminal.input('\x1b');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Anything else'));
 terminal.input('\x1b[B');
 terminal.input('\x1b[B');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Type another answer'));
 assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));
 terminal.input('Use the existing seam');
 terminal.input('\r');

 await waitFor(() => driver.responses.length === 1);
 assert.deepEqual(driver.responses, [{
 requestId: 'question-1',
 answers: ['Extend', null, 'Use the existing seam'],
 }]);

 exitMaka(terminal);
 await run;
 });

 test('Ctrl-C stops a turn while a user-question overlay is open', async () => {
 const terminal = new FakeTerminal();
 const driver = new UserQuestionPromptDriver();
 const run = runMakaPiTui({
 title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
 connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
 });

 terminal.input('choose');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
 terminal.input('\x03');

 await waitFor(() => driver.stopCalls === 1);
 assert.deepEqual(driver.responses, []);
 exitMaka(terminal);
 await run;
 });

 test('toggles tool detail globally with Ctrl-O', async () => {
 const terminal = new FakeTerminal();
 const driver = new ToolOutputDriver();
Expand DownExpand Up@@ -2982,6 +3042,43 @@ class PermissionPromptDriver implements MakaSessionDriver {
 }
}

class UserQuestionPromptDriver implements MakaSessionDriver {
 readonly responses: UserQuestionResponse[] = [];
 stopCalls = 0;
 private release: (() => void) | undefined;

 async listSessions(): Promise<SessionSummary[]> { return []; }
 async *compactSession(): AsyncIterable<never> {}
 async *sendPrompt(_prompt: string): AsyncIterable<SessionEvent> {
 yield {
 type: 'user_question_request', id: 'event-question', turnId: 'turn-1', ts: 1,
 requestId: 'question-1', toolUseId: 'tool-1',
 questions: [
 { question: 'Choose an approach', options: [{ label: 'Extend', description: 'Reuse the seam' }, { label: 'Separate' }] },
 { question: 'Keep the default', options: [{ label: 'Yes' }, { label: 'No' }] },
 { question: 'Anything else', options: [{ label: 'Nothing' }, { label: 'More detail' }] },
 ],
 };
 await new Promise<void>((resolve) => { this.release = resolve; });
 yield { type: 'complete', id: 'complete-1', turnId: 'turn-1', ts: 2, stopReason: 'end_turn' };
 }
 async respondToUserQuestion(response: UserQuestionResponse): Promise<void> {
 this.responses.push(response);
 this.release?.();
 }
 async stop(): Promise<void> { this.stopCalls += 1; this.release?.(); }
 async respondToPermission(_response: PermissionResponse): Promise<void> {}
 async renameSession(): Promise<void> {}
 async setModel(): Promise<void> {}
 async setPermissionMode(): Promise<void> {}
 async setThinkingLevel(): Promise<void> {}
 async switchSession(sessionId: string): Promise<MakaSessionSwitchResult> { return switchResult(fakeSessionSummary(sessionId)); }
 async listRewindTargets(): Promise<RewindTarget[]> { return []; }
 async rewindToTurn(): Promise<MakaSessionRewindResult> { throw new Error('rewind not supported'); }
 startNewSession(): void {}
 getSessionId(): string { return 'session-1'; }
}

class InterruptibleTurnDriver implements MakaSessionDriver {
 stopCalls = 0;
 private releaseTurn: (() => void) | null = null;
Expand Down

52 changes: 48 additions & 4 deletions
packages/cli/src/__tests__/runtime-bootstrap.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand DownExpand Up@@ -74,6 +75,7 @@ describe('Maka CLI runtime bootstrap', () => {
 ] as const;

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 requestedConnectionSlug: 'selected-local',
Expand DownExpand Up@@ -131,6 +133,7 @@ describe('Maka CLI runtime bootstrap', () => {
 permissionMode: 'explore',
 });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/canonical-repo',
 requestedConnectionSlug: 'local',
Expand DownExpand Up@@ -167,6 +170,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand All@@ -180,6 +184,38 @@ describe('Maka CLI runtime bootstrap', () => {
 });
 });

 test('registers AskUserQuestion only for the interactive TUI surface', async () => {
 await withWorkspace(async (workspaceRoot) => {
 const connectionStore = createConnectionStore(workspaceRoot);
 await connectionStore.create({
 slug: 'local',
 name: 'Local Ollama',
 providerType: 'ollama',
 defaultModel: 'llama3.2',
 });

 const tui = await createMakaCliRuntimeContext({
 workspaceRoot,
 cwd: '/repo',
 surface: 'tui',
 });
 const run = await createMakaCliRuntimeContext({
 workspaceRoot,
 cwd: '/repo',
 surface: 'run',
 });
 try {
 const tool = tui.tools.find((candidate) => candidate.name === 'AskUserQuestion');
 assert.ok(tool);
 assert.equal(tool.permissionRequired, false);
 assert.equal(run.tools.some((candidate) => candidate.name === 'AskUserQuestion'), false);
 } finally {
 await tui.close();
 await run.close();
 }
 });
 });

 test('registers the Skill tool so the CLI can load workspace skills', async () => {
 await withWorkspace(async (workspaceRoot) => {
 const connectionStore = createConnectionStore(workspaceRoot);
Expand All@@ -191,6 +227,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand All@@ -214,6 +251,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: workspaceRoot,
 });
Expand DownExpand Up@@ -289,7 +327,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 const updates: ShellRunUpdate[] = [];
 const unsubscribe = context.subscribeShellRunUpdates((update) => updates.push(update));
 try {
Expand DownExpand Up@@ -326,7 +365,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 try {
 const parent = await context.runtime.createSession({
 cwd: workspaceRoot, backend: 'ai-sdk', llmConnectionSlug: 'local',
Expand DownExpand Up@@ -362,7 +402,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 try {
 const bash = context.tools.find((tool) => tool.name === 'Bash');
 assert.ok(bash);
Expand DownExpand Up@@ -407,6 +448,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand DownExpand Up@@ -457,7 +499,8 @@ describe('Maka CLI runtime bootstrap', () => {
 defaultModel: 'llama3.2',
 });

 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: '/repo' });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: '/repo' });
 const session = await context.runtime.createSession({
 cwd: context.cwd,
 backend: 'ai-sdk',
Expand DownExpand Up@@ -501,6 +544,7 @@ describe('Maka CLI runtime bootstrap', () => {
 await credentialStore.setSecret('deepseek', 'api_key', 'test-key');

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand Down

25 changes: 25 additions & 0 deletions
packages/cli/src/__tests__/session-driver.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import type {
 SessionSummary,
 StoredMessage,
 UserMessageInput,
 UserQuestionResponse,
} from '@maka/core';
import { createMakaSessionDriver } from '../session-driver.js';

Expand DownExpand Up@@ -438,6 +439,25 @@ describe('Maka session driver', () => {
 }]);
 });

 test('routes user-question responses to the active session', async () => {
 const runtime = new RecordingRuntime();
 const driver = createMakaSessionDriver({
 runtime,
 cwd: '/repo',
 llmConnectionSlug: 'anthropic',
 model: 'claude-sonnet-4-5',
 newId: nextId('turn'),
 });

 await collect(driver.sendPrompt('choose'));
 await driver.respondToUserQuestion?.({ requestId: 'question-1', answers: ['A', null] });

 assert.deepEqual(runtime.userQuestionResponses, [{
 sessionId: 'session-1',
 response: { requestId: 'question-1', answers: ['A', null] },
 }]);
 });

 test('lists rewind targets newest-first, one per prompted turn, including the latest', async () => {
 const runtime = new RecordingRuntime();
 const driver = createMakaSessionDriver({
Expand DownExpand Up@@ -653,6 +673,7 @@ class RecordingRuntime {
 readonly sent: Array<{ sessionId: string; input: UserMessageInput }> = [];
 readonly compacted: Array<{ sessionId: string; input: { turnId?: string } }> = [];
 readonly permissionResponses: Array<{ sessionId: string; response: PermissionResponse }> = [];
 readonly userQuestionResponses: Array<{ sessionId: string; response: UserQuestionResponse }> = [];
 readonly permissionModes: Array<{ sessionId: string; mode: PermissionMode }> = [];
 readonly sessionUpdates: Array<{ sessionId: string; patch: { model?: string; llmConnectionSlug?: string; thinkingLevel?: import('@maka/core/model-thinking').ThinkingLevel | undefined; name?: string } }> = [];
 readonly branched: Array<{ sessionId: string; sourceTurnId: string }> = [];
Expand DownExpand Up@@ -713,6 +734,10 @@ class RecordingRuntime {
 this.permissionResponses.push({ sessionId, response });
 }

 async respondToUserQuestion(sessionId: string, response: UserQuestionResponse): Promise<void> {
 this.userQuestionResponses.push({ sessionId, response });
 }

 async setPermissionMode(sessionId: string, mode: PermissionMode): Promise<SessionSummary> {
 this.permissionModes.push({ sessionId, mode });
 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/cli/src/cli.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function runMakaCli(argv: string[] = process.argv.slice(2)): Promis
 let context;
 try {
 context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: process.cwd(),
 });
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
feat: add AskUserQuestion runtime and TUI by Astro-Han · Pull Request #908 · apache/maka · GitHub
Skip to content
feat: add AskUserQuestion runtime and TUI#908

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

Astro-Han
merged 6 commits into

from

Jul 13, 2026
 Merged


feat: add AskUserQuestion runtime and TUI
#908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
022abd0

refactor(runtime): share turn-scoped await registry


Astro-Han Jul 13, 2026
a4aa300

feat(runtime): add AskUserQuestion round trip


Astro-Han Jul 13, 2026
2e6a7e2

feat(cli): scope AskUserQuestion to TUI


Astro-Han Jul 13, 2026
2ed8a48

feat(cli): render AskUserQuestion in TUI


Astro-Han Jul 13, 2026
8b34eed

test(runtime): update turn lifecycle contract


Astro-Han Jul 13, 2026
5475dae

fix(cli): expose user question stop action


Astro-Han Jul 13, 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


23 changes: 22 additions & 1 deletion
packages/cli/src/__tests__/pi-transcript.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -655,14 +655,35 @@ describe('Maka Pi TUI transcript', () => {
 permissionMode: 'ask',
 }, 100).map(stripAnsi);

 assert.equal(state.pendingPermission?.requestId, 'permission-1');
 assert.equal(state.pendingInteraction?.requestId, 'permission-1');
 assert.ok(visibleLines.some((line) => line.includes('Permission required')));
 assert.ok(visibleLines.some((line) => line.includes('Bash')));
 assert.ok(visibleLines.some((line) => line.includes('npm test')));
 assert.ok(visibleLines.some((line) => line.includes('y/Enter allow')));
 assert.ok(visibleLines.some((line) => line.includes('n/Esc deny')));
 });

 test('queues permission and user-question requests in arrival order', () => {
 const state = createMakaPiTranscriptState();
 applyMakaSessionEventToTranscript(state, event({
 type: 'permission_request', requestId: 'permission-1', toolUseId: 'tool-1',
 toolName: 'Bash', category: 'shell_unsafe', reason: 'shell_dangerous', args: {},
 }));
 applyMakaSessionEventToTranscript(state, event({
 type: 'user_question_request', requestId: 'question-1', toolUseId: 'tool-2',
 questions: [{ question: 'Choose', options: [{ label: 'A' }, { label: 'B' }] }],
 }));

 assert.equal(state.pendingInteraction?.requestId, 'permission-1');
 assert.deepEqual(state.queuedInteractions.map((item) => item.requestId), ['question-1']);

 applyMakaSessionEventToTranscript(state, event({
 type: 'permission_decision_ack', requestId: 'permission-1', toolUseId: 'tool-1', decision: 'allow',
 }));
 assert.equal(state.pendingInteraction?.requestId, 'question-1');
 assert.deepEqual(state.queuedInteractions, []);
 });

 test('orders thinking entries by arrival, before text and around tools', () => {
 const state = createMakaPiTranscriptState();

Expand Down

97 changes: 97 additions & 0 deletions
packages/cli/src/__tests__/pi-tui-runner.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import {
 type SessionSummary,
 type StoredMessage,
 type ThinkingLevel,
 type UserQuestionResponse,
} from '@maka/core';
import type { ShellRunUpdate } from '@maka/runtime';
import type { MakaSessionDriver, MakaSessionRewindResult, MakaSessionSwitchResult, RewindTarget } from '../session-driver.js';
Expand DownExpand Up@@ -280,6 +281,65 @@ describe('Maka Pi TUI runner', () => {
 ]);
 });

 test('answers sequential questions with a choice, Escape, and Other input', async () => {
 const terminal = new FakeTerminal();
 const driver = new UserQuestionPromptDriver();
 const run = runMakaPiTui({
 title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
 connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
 });

 terminal.input('choose');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
 assertBottomPickerPlacement(
 terminal,
 'Choose an approach',
 'Maka claude-sonnet-4-5 claude-subscription ask /repo',
 );
 assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));

 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Keep the default'));
 terminal.input('\x1b');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Anything else'));
 terminal.input('\x1b[B');
 terminal.input('\x1b[B');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Type another answer'));
 assert.ok(plainTerminalOutput(terminal.screenOutput()).includes('Ctrl+C stop'));
 terminal.input('Use the existing seam');
 terminal.input('\r');

 await waitFor(() => driver.responses.length === 1);
 assert.deepEqual(driver.responses, [{
 requestId: 'question-1',
 answers: ['Extend', null, 'Use the existing seam'],
 }]);

 exitMaka(terminal);
 await run;
 });

 test('Ctrl-C stops a turn while a user-question overlay is open', async () => {
 const terminal = new FakeTerminal();
 const driver = new UserQuestionPromptDriver();
 const run = runMakaPiTui({
 title: 'Maka', driver, cwd: '/repo', model: 'claude-sonnet-4-5',
 connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal,
 });

 terminal.input('choose');
 terminal.input('\r');
 await waitFor(() => plainTerminalOutput(terminal.screenOutput()).includes('Choose an approach'));
 terminal.input('\x03');

 await waitFor(() => driver.stopCalls === 1);
 assert.deepEqual(driver.responses, []);
 exitMaka(terminal);
 await run;
 });

 test('toggles tool detail globally with Ctrl-O', async () => {
 const terminal = new FakeTerminal();
 const driver = new ToolOutputDriver();
Expand DownExpand Up@@ -2982,6 +3042,43 @@ class PermissionPromptDriver implements MakaSessionDriver {
 }
}

class UserQuestionPromptDriver implements MakaSessionDriver {
 readonly responses: UserQuestionResponse[] = [];
 stopCalls = 0;
 private release: (() => void) | undefined;

 async listSessions(): Promise<SessionSummary[]> { return []; }
 async *compactSession(): AsyncIterable<never> {}
 async *sendPrompt(_prompt: string): AsyncIterable<SessionEvent> {
 yield {
 type: 'user_question_request', id: 'event-question', turnId: 'turn-1', ts: 1,
 requestId: 'question-1', toolUseId: 'tool-1',
 questions: [
 { question: 'Choose an approach', options: [{ label: 'Extend', description: 'Reuse the seam' }, { label: 'Separate' }] },
 { question: 'Keep the default', options: [{ label: 'Yes' }, { label: 'No' }] },
 { question: 'Anything else', options: [{ label: 'Nothing' }, { label: 'More detail' }] },
 ],
 };
 await new Promise<void>((resolve) => { this.release = resolve; });
 yield { type: 'complete', id: 'complete-1', turnId: 'turn-1', ts: 2, stopReason: 'end_turn' };
 }
 async respondToUserQuestion(response: UserQuestionResponse): Promise<void> {
 this.responses.push(response);
 this.release?.();
 }
 async stop(): Promise<void> { this.stopCalls += 1; this.release?.(); }
 async respondToPermission(_response: PermissionResponse): Promise<void> {}
 async renameSession(): Promise<void> {}
 async setModel(): Promise<void> {}
 async setPermissionMode(): Promise<void> {}
 async setThinkingLevel(): Promise<void> {}
 async switchSession(sessionId: string): Promise<MakaSessionSwitchResult> { return switchResult(fakeSessionSummary(sessionId)); }
 async listRewindTargets(): Promise<RewindTarget[]> { return []; }
 async rewindToTurn(): Promise<MakaSessionRewindResult> { throw new Error('rewind not supported'); }
 startNewSession(): void {}
 getSessionId(): string { return 'session-1'; }
}

class InterruptibleTurnDriver implements MakaSessionDriver {
 stopCalls = 0;
 private releaseTurn: (() => void) | null = null;
Expand Down

52 changes: 48 additions & 4 deletions
packages/cli/src/__tests__/runtime-bootstrap.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand DownExpand Up@@ -74,6 +75,7 @@ describe('Maka CLI runtime bootstrap', () => {
 ] as const;

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 requestedConnectionSlug: 'selected-local',
Expand DownExpand Up@@ -131,6 +133,7 @@ describe('Maka CLI runtime bootstrap', () => {
 permissionMode: 'explore',
 });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/canonical-repo',
 requestedConnectionSlug: 'local',
Expand DownExpand Up@@ -167,6 +170,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand All@@ -180,6 +184,38 @@ describe('Maka CLI runtime bootstrap', () => {
 });
 });

 test('registers AskUserQuestion only for the interactive TUI surface', async () => {
 await withWorkspace(async (workspaceRoot) => {
 const connectionStore = createConnectionStore(workspaceRoot);
 await connectionStore.create({
 slug: 'local',
 name: 'Local Ollama',
 providerType: 'ollama',
 defaultModel: 'llama3.2',
 });

 const tui = await createMakaCliRuntimeContext({
 workspaceRoot,
 cwd: '/repo',
 surface: 'tui',
 });
 const run = await createMakaCliRuntimeContext({
 workspaceRoot,
 cwd: '/repo',
 surface: 'run',
 });
 try {
 const tool = tui.tools.find((candidate) => candidate.name === 'AskUserQuestion');
 assert.ok(tool);
 assert.equal(tool.permissionRequired, false);
 assert.equal(run.tools.some((candidate) => candidate.name === 'AskUserQuestion'), false);
 } finally {
 await tui.close();
 await run.close();
 }
 });
 });

 test('registers the Skill tool so the CLI can load workspace skills', async () => {
 await withWorkspace(async (workspaceRoot) => {
 const connectionStore = createConnectionStore(workspaceRoot);
Expand All@@ -191,6 +227,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand All@@ -214,6 +251,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: workspaceRoot,
 });
Expand DownExpand Up@@ -289,7 +327,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 const updates: ShellRunUpdate[] = [];
 const unsubscribe = context.subscribeShellRunUpdates((update) => updates.push(update));
 try {
Expand DownExpand Up@@ -326,7 +365,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 try {
 const parent = await context.runtime.createSession({
 cwd: workspaceRoot, backend: 'ai-sdk', llmConnectionSlug: 'local',
Expand DownExpand Up@@ -362,7 +402,8 @@ describe('Maka CLI runtime bootstrap', () => {
 await connectionStore.create({
 slug: 'local', name: 'Local Ollama', providerType: 'ollama', defaultModel: 'llama3.2',
 });
 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: workspaceRoot });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: workspaceRoot });
 try {
 const bash = context.tools.find((tool) => tool.name === 'Bash');
 assert.ok(bash);
Expand DownExpand Up@@ -407,6 +448,7 @@ describe('Maka CLI runtime bootstrap', () => {
 });

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand DownExpand Up@@ -457,7 +499,8 @@ describe('Maka CLI runtime bootstrap', () => {
 defaultModel: 'llama3.2',
 });

 const context = await createMakaCliRuntimeContext({ workspaceRoot, cwd: '/repo' });
 const context = await createMakaCliRuntimeContext({
 surface: 'tui', workspaceRoot, cwd: '/repo' });
 const session = await context.runtime.createSession({
 cwd: context.cwd,
 backend: 'ai-sdk',
Expand DownExpand Up@@ -501,6 +544,7 @@ describe('Maka CLI runtime bootstrap', () => {
 await credentialStore.setSecret('deepseek', 'api_key', 'test-key');

 const context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: '/repo',
 });
Expand Down

25 changes: 25 additions & 0 deletions
packages/cli/src/__tests__/session-driver.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import type {
 SessionSummary,
 StoredMessage,
 UserMessageInput,
 UserQuestionResponse,
} from '@maka/core';
import { createMakaSessionDriver } from '../session-driver.js';

Expand DownExpand Up@@ -438,6 +439,25 @@ describe('Maka session driver', () => {
 }]);
 });

 test('routes user-question responses to the active session', async () => {
 const runtime = new RecordingRuntime();
 const driver = createMakaSessionDriver({
 runtime,
 cwd: '/repo',
 llmConnectionSlug: 'anthropic',
 model: 'claude-sonnet-4-5',
 newId: nextId('turn'),
 });

 await collect(driver.sendPrompt('choose'));
 await driver.respondToUserQuestion?.({ requestId: 'question-1', answers: ['A', null] });

 assert.deepEqual(runtime.userQuestionResponses, [{
 sessionId: 'session-1',
 response: { requestId: 'question-1', answers: ['A', null] },
 }]);
 });

 test('lists rewind targets newest-first, one per prompted turn, including the latest', async () => {
 const runtime = new RecordingRuntime();
 const driver = createMakaSessionDriver({
Expand DownExpand Up@@ -653,6 +673,7 @@ class RecordingRuntime {
 readonly sent: Array<{ sessionId: string; input: UserMessageInput }> = [];
 readonly compacted: Array<{ sessionId: string; input: { turnId?: string } }> = [];
 readonly permissionResponses: Array<{ sessionId: string; response: PermissionResponse }> = [];
 readonly userQuestionResponses: Array<{ sessionId: string; response: UserQuestionResponse }> = [];
 readonly permissionModes: Array<{ sessionId: string; mode: PermissionMode }> = [];
 readonly sessionUpdates: Array<{ sessionId: string; patch: { model?: string; llmConnectionSlug?: string; thinkingLevel?: import('@maka/core/model-thinking').ThinkingLevel | undefined; name?: string } }> = [];
 readonly branched: Array<{ sessionId: string; sourceTurnId: string }> = [];
Expand DownExpand Up@@ -713,6 +734,10 @@ class RecordingRuntime {
 this.permissionResponses.push({ sessionId, response });
 }

 async respondToUserQuestion(sessionId: string, response: UserQuestionResponse): Promise<void> {
 this.userQuestionResponses.push({ sessionId, response });
 }

 async setPermissionMode(sessionId: string, mode: PermissionMode): Promise<SessionSummary> {
 this.permissionModes.push({ sessionId, mode });
 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/cli/src/cli.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function runMakaCli(argv: string[] = process.argv.slice(2)): Promis
 let context;
 try {
 context = await createMakaCliRuntimeContext({
 surface: 'tui',
 workspaceRoot,
 cwd: process.cwd(),
 });
Expand Down
Loading
Loading