indifferentketchup
372651bcb1
opencode emits one trailing session.idle/error for a turn cancelled via client.session.abort(), carrying only a sessionID (no turn id). The warm-server backend settled activeTurn on that event, so after Stop + an immediate new message the orphan idle settled the NEXT turn early as success (one-click reachable since v2.6.5's Send->Stop composer). Adds a pure per-session guard (backends/turn-guard.ts: armAbortGuard / noteTurnActivity / consumeTerminal over swallowNextTerminal) wired into opencode-server.ts: abort arms it, the next terminal is swallowed once, and a new turn's first delta self-heals so a never-arriving orphan can't strand a real turn. Test-first; 3 regression tests in turn-guard.test.ts. Paseo parallel: 1d38aac. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
39 lines
1.5 KiB
TypeScript
39 lines
1.5 KiB
TypeScript
/**
|
|
* Guard against opencode's post-abort "orphan" terminal event (F.1).
|
|
*
|
|
* When a turn is aborted (`client.session.abort`), opencode emits one trailing
|
|
* `session.idle` / `session.error` for the cancelled turn. Without a guard that
|
|
* orphan settles whatever turn currently holds the session slot — which, after
|
|
* the user immediately sends another message, is the NEXT turn, settling it early
|
|
* as success (the v2.6.5 Stop-button bug). opencode terminal events carry only a
|
|
* `sessionID` (no turn id), so we can't match by id; instead we swallow exactly
|
|
* one terminal per abort, and self-heal if that orphan never arrives.
|
|
*/
|
|
export interface AbortTerminalGuard {
|
|
/** True between an abort and the orphan terminal event that follows it. */
|
|
swallowNextTerminal: boolean;
|
|
}
|
|
|
|
/** Arm on abort: the next terminal event for this session is the orphan. */
|
|
export function armAbortGuard(g: AbortTerminalGuard): void {
|
|
g.swallowNextTerminal = true;
|
|
}
|
|
|
|
/**
|
|
* A new turn produced activity (delta) → the orphan window is over. Self-heals
|
|
* the case where opencode emits no orphan idle (e.g. abort-before-prompt), so a
|
|
* real terminal still settles instead of being swallowed forever.
|
|
*/
|
|
export function noteTurnActivity(g: AbortTerminalGuard): void {
|
|
g.swallowNextTerminal = false;
|
|
}
|
|
|
|
/** Decide a terminal (idle/error): swallow the post-abort orphan once, else settle. */
|
|
export function consumeTerminal(g: AbortTerminalGuard): 'swallow' | 'settle' {
|
|
if (g.swallowNextTerminal) {
|
|
g.swallowNextTerminal = false;
|
|
return 'swallow';
|
|
}
|
|
return 'settle';
|
|
}
|