Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions src/tui/runner/reconnect-recovery.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,34 @@ describe("reconnect recovery selection", () => {
expect(delivered).toHaveLength(1);
});

test("does not replay when the accepted generation becomes stale", () => {
const state = createReconnectRecoveryState();
const attempt = state.begin(operatorMessage(), "xai");
state.observe(attempt, credentialRetry());
state.observe(attempt, credentialFailure("xai/default-2"));
const pending = required(state.settle(attempt), "pending recovery");

let completeReconnect: ((connected: boolean) => void) | undefined;
applyReconnectRecoverySelection({
state,
generation: pending.generation,
selectedId: reconnectRecoveryItemId(pending.scope),
reconnect: (_scope, onComplete) => {
completeReconnect = onComplete;
},
armContinuation: () => {
throw new Error("should not arm");
},
cancelContinuation: () => undefined,
deliverContinuation: () => {
throw new Error("should not deliver");
},
});

state.begin(operatorMessage(), "anthropic");
completeReconnect?.(true);
});

test("cancel, failure, and committed attempts never replay", () => {
for (const connected of [false, true]) {
const state = createReconnectRecoveryState();
Expand Down
11 changes: 10 additions & 1 deletion src/tui/runner/reconnect-recovery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,9 @@ export function createReconnectRecoveryState() {
replay: !claimed.committed,
};
},
isCurrent(generation: number): boolean {
return generation === nextGeneration;
},
clear(): void {
pending = null;
nextGeneration++;
Expand All @@ -208,7 +211,13 @@ export function applyReconnectRecoverySelection(args: {
const onComplete = (connected: boolean): void => {
if (completed) return;
completed = true;
if (!connected || !acceptance.replay) return;
if (
!connected ||
!acceptance.replay ||
!args.state.isCurrent(acceptance.generation)
) {
return;
}
args.armContinuation(acceptance.generation);
try {
args.deliverContinuation(
Expand Down
Loading