Skip to content

fix(cli): user-initiated abort no longer kills the ACP runner process #1678

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
FelixShowX wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(cli): user-initiated abort no longer kills the ACP runner process #1678

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 27 additions & 2 deletions packages/happy-cli/src/agent/acp/runAcp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,11 @@ export async function runAcp(opts: {
let shouldExit = false;
let abortController = new AbortController();
let pendingTurn: PendingTurn | null = null;
// A user-initiated abort makes AcpBackend.cancel() emit status 'stopped',
// which is indistinguishable from backend death. Track it so the runner
// survives user aborts and only exits on genuine backend failure.
let userAbortInFlight = false;
let turnCancelledByAbort = false;

const clearPendingTurn = (error?: Error) => {
if (!pendingTurn) {
Expand Down Expand Up @@ -815,7 +820,17 @@ export async function runAcp(opts: {
if (msg.status === 'idle') {
clearPendingTurn();
}
if (msg.status === 'error' || msg.status === 'stopped') {
if (msg.status === 'stopped' && userAbortInFlight) {
// User-initiated abort: end the current turn as cancelled, keep the
// runner alive instead of treating it as backend death.
userAbortInFlight = false;
thinking = false;
session.keepAlive(false, 'remote');
if (pendingTurn) {
turnCancelledByAbort = true;
clearPendingTurn();
}
} else if (msg.status === 'error' || msg.status === 'stopped') {
stopRunnerFromBackendStatus(msg.status, msg.detail);
}
}
Expand Down Expand Up @@ -859,11 +874,15 @@ export async function runAcp(opts: {
async function handleAbort() {
try {
if (acpSessionId) {
userAbortInFlight = true;
await backend.cancel(acpSessionId);
}
permissionHandler.reset();
abortController.abort();
} catch (error) {
// Cancel never reached the agent — don't let the flag mark a later
// genuine backend failure as user-initiated.
userAbortInFlight = false;
logger.debug(`[${opts.agentName}] Abort failed:`, error);
} finally {
abortController = new AbortController();
Expand Down Expand Up @@ -912,6 +931,11 @@ export async function runAcp(opts: {

logAcp('incoming', `Incoming prompt: ${formatUnknownForConsole(batch.message, ACP_EVENT_PREVIEW_CHARS)}`);
sendEnvelopes(sessionManager.startTurn());
// Guard against a stale flag: an abort that arrives while idle (e.g. just
// after a turn ended naturally, or when cancel() throws) must not cause a
// later genuine backend failure to be misread as a user abort.
userAbortInFlight = false;
turnCancelledByAbort = false;
const turnEnded = waitForTurnEnd();
try {
if (typeof batch.mode.permissionMode === 'string' && batch.mode.permissionMode.length > 0) {
Expand All @@ -922,7 +946,8 @@ export async function runAcp(opts: {
}
await backend.sendPrompt(acpSessionId, batch.message);
await turnEnded;
sendEnvelopes(sessionManager.endTurn('completed'));
sendEnvelopes(sessionManager.endTurn(turnCancelledByAbort ? 'cancelled' : 'completed'));
turnCancelledByAbort = false;
session.sendSessionEvent({ type: 'ready' });
if (verbose) {
logAcp('muted', `Outgoing prompt completion from ${opts.agentName}`);
Expand Down