Skip to content

fix(staged): prevent double review row when adopting already-running autoreview #638

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

Merged
matt2e merged 2 commits into from
Apr 16, 2026
Merged

fix(staged): prevent double review row when adopting already-running autoreview #638

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f036d0c
fix(staged): prevent double review row when adopting already-running …
matt2e Apr 16, 2026
a50ebc4
refactor(staged): extract registerRunningSession helper to reduce dup…
matt2e Apr 16, 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
55 changes: 38 additions & 17 deletions apps/staged/src/lib/features/branches/BranchCardSessionManager.svelte.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,17 @@ export default class BranchCardSessionManager {
}
}

/** Register a session on the frontend and mark it as running. */
private registerRunningSession(
sessionId: string,
projectId: string,
mode: BranchSessionType,
branchId: string
) {
sessionRegistry.register(sessionId, projectId, mode, branchId);
projectStateStore.addRunningSession(projectId, sessionId);
}

cancelAutoReview() {
if (this.autoReviewSessionId) {
commands.cancelSession(this.autoReviewSessionId).catch(() => {});
Expand All @@ -186,26 +197,37 @@ export default class BranchCardSessionManager {
const review = await commands.findFreshAutoReview(branch.id);
if (!review) return false;

await commands.setReviewAuto(review.id, false);

if (this.autoReviewSessionId) {
sessionRegistry.register(this.autoReviewSessionId, branch.projectId, 'review', branch.id);
projectStateStore.addRunningSession(branch.projectId, this.autoReviewSessionId);
}

// If the autoreview was interrupted before completing, resume it
const needsResume = !review.completedAt && review.sessionId && !this.autoReviewSessionId;
if (needsResume) {
await commands.resumeSession(
review.sessionId!,
'Continue reviewing the code changes on this branch.',
undefined,
// We're tracking the session locally — register it before revealing
this.registerRunningSession(
this.autoReviewSessionId,
branch.projectId,
'review',
branch.id
);
sessionRegistry.register(review.sessionId!, branch.projectId, 'review', branch.id);
projectStateStore.addRunningSession(branch.projectId, review.sessionId!);
} else if (!review.completedAt && review.sessionId) {
// The autoreview has a session we're not tracking. Check its status
// to decide whether to resume or just register it.
const session = await commands.getSession(review.sessionId);
if (session && session.status === 'running') {
// Session is already running (e.g. agent connected but frontend
// lost track) — just register it, no resume needed.
this.registerRunningSession(review.sessionId, branch.projectId, 'review', branch.id);
} else {
// Session exists but isn't running — resume it
await commands.resumeSession(
review.sessionId,
'Continue reviewing the code changes on this branch.',
undefined,
branch.id
);
this.registerRunningSession(review.sessionId, branch.projectId, 'review', branch.id);
}
}

// Only reveal the review after all fallible operations succeed
await commands.setReviewAuto(review.id, false);

this.autoReviewSessionId = null;
this.autoReviewId = null;

Expand Down Expand Up @@ -254,8 +276,7 @@ export default class BranchCardSessionManager {
throw new Error('Failed to start session: no session ID returned');
}

sessionRegistry.register(result.sessionId, branch.projectId, mode, branch.id);
projectStateStore.addRunningSession(branch.projectId, result.sessionId);
this.registerRunningSession(result.sessionId, branch.projectId, mode, branch.id);

this.pendingSessionItems = this.pendingSessionItems.map((item) =>
item.key === pendingKey
Expand Down