electron-rare/Aperant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(terminal): capture generation after clearAutoResumeQueue to prevent self-cancel

Browse Source 
resumeAllPendingClaude captured autoResumeGeneration before calling
clearAutoResumeQueue(), which increments the generation counter. This
caused the generation mismatch check to always evaluate true, aborting
the function before resuming any terminals. Move the capture to after
the clear call so the function only aborts on genuinely new external
cancellations.

Also documents the implicit mutex invariant between the active-terminal
effect, processAutoResumeQueue, and resumeAllPendingClaude.

Co-Authored-By: Claude Opus 4.6 <[email protected]>
This commit is contained in:
AndyMik90
2026-02-20 12:38:06 +01:00
co-authored by Claude Opus 4.6
parent d613df36db
commit 37e95e8b09
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/frontend/src/renderer/stores/terminal-store.ts
+11 -4
View File
@@ -125,6 +125,12 @@ const AUTO_RESUME_INITIAL_DELAY_MS = 1500;
const AUTO_RESUME_STAGGER_MS = 500;
// Auto-resume queue state (single-threaded JS assumption - see processAutoResumeQueue)
//
// Mutex invariant: The active-terminal effect (which triggers enqueueAutoResume) and
// processAutoResumeQueue / resumeAllPendingClaude are mutually coordinated through
// clearAutoResumeQueue(). When a project switch or "Resume All" occurs, clearAutoResumeQueue()
// cancels any pending timer, empties the queue, and bumps autoResumeGeneration to abort
// any in-flight processing run. This ensures only one resumption path is active at a time.
let autoResumeQueue: string[] = [];
let autoResumeTimer: ReturnType<typeof setTimeout> | null = null;
let autoResumeProcessing = false;
@@ -674,14 +680,15 @@ export const useTerminalStore = create<TerminalState>((set, get) => ({
}
isResumingAll = true;
// Capture generation BEFORE clearAutoResumeQueue() bumps it, so this call
// doesn't immediately invalidate itself, but CAN be cancelled by external calls
const generation = autoResumeGeneration;
try {
// Clear auto-resume queue to prevent redundant processing
clearAutoResumeQueue();
// Capture generation AFTER clearAutoResumeQueue() bumps it, so this call
// doesn't immediately self-cancel, but CAN be cancelled by subsequent external
// calls to clearAutoResumeQueue() (e.g., project switch)
const generation = autoResumeGeneration;
const state = get();
// Filter terminals with pending Claude resume