Skip to content

fix(cli): cancel MCP management operations #4847

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

Open
liuxiaocs7 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix(cli): cancel MCP management operations #4847

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
7248489
fix(cli): cancel MCP management operations
liuxiaocs7 Sep 5, 2026
189e706
refactor(cli): simplify MCP cancellation support
liuxiaocs7 Sep 5, 2026
fa69e01
fix(mcp): address cancellation review findings
liuxiaocs7 Sep 6, 2026
29ac502
fix(cli): mark post-retirement persistence failures out of sync
liuxiaocs7 Sep 6, 2026
12282db
fix(mcp): preserve cancellation across committed teardown
liuxiaocs7 Sep 6, 2026
0b9adf4
test(cli): stabilize post-retirement cancellation timing
liuxiaocs7 Sep 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions packages/cli/src/__tests__/pi-tui-mcp-status.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,39 @@ describe('MCP management overlay', () => {
});
}

test('Esc aborts the active MCP action and ignores its late result', async () => {
let actionSignal: AbortSignal | undefined;
let resolveAction!: (result: TuiMcpActionResult) => void;
const actionResult = new Promise<TuiMcpActionResult>((resolve) => {
resolveAction = resolve;
});
const mcp = surface(listSnapshot());
mcp.execute = async (_action, options?: { signal?: AbortSignal }) => {
actionSignal = options?.signal;
return actionResult;
};
const overlay = new McpManagementOverlay({
locale: 'en',
surface: mcp,
viewportRows: () => 8,
onClose: () => undefined,
onChange: () => undefined,
});

overlay.handleInput('t');
await new Promise<void>((resolve) => setImmediate(resolve));
assert.equal(actionSignal?.aborted, false);

overlay.handleInput('\u001b');
assert.equal(actionSignal?.aborted, true);
resolveAction({ status: 'tested', test: testResult(true), effect: 'published' });
await new Promise<void>((resolve) => setImmediate(resolve));

const text = overlay.render(100).map(stripAnsi).join('\n');
assert.doesNotMatch(text, /MCP server responded successfully/u);
assert.match(text, /filesystem/u);
});

const resultCopy = TUI_COPY_RESOURCES['mcp-status'].en.editor.results;
const RESULT_CASES: readonly [TuiMcpActionResult, keyof typeof resultCopy][] = [
[{ status: 'conflict', reason: 'exists' }, 'exists'],
Expand All @@ -430,9 +463,11 @@ describe('MCP management overlay', () => {
[{ status: 'conflict', reason: 'stale_import' }, 'stale_import'],
[{ status: 'conflict', reason: 'missing' }, 'missing'],
[{ status: 'failed', reason: 'closed' }, 'closed'],
[{ status: 'failed', reason: 'cancelled' }, 'cancelled'],
[{ status: 'failed', reason: 'invalid-config' }, 'invalid-config'],
[{ status: 'failed', reason: 'credential-cleanup-failed' }, 'credential-cleanup-failed'],
[{ status: 'failed', reason: 'persist-failed' }, 'persist-failed'],
[{ status: 'failed', reason: 'rollback-failed' }, 'rollback-failed'],
[{ status: 'failed', reason: 'manager-failed' }, 'manager-failed'],
[{ status: 'applied', effect: 'published' }, 'published'],
[{ status: 'applied', effect: 'pending_host' }, 'pending_host'],
Expand Down
Loading