Skip to content

Preserve git action progress until HTTP completion #1388

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
juliusmarminge merged 1 commit into from
Mar 24, 2026
+9 −6
Merged

Preserve git action progress until HTTP completion #1388

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
15 changes: 9 additions & 6 deletions apps/web/src/components/GitActionsControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,13 +347,16 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
progress.lastOutputLine = null;
break;
case "action_finished":
progress.phaseStartedAtMs = null;
progress.hookStartedAtMs = null;
break;
// Don't clear timestamps here — the HTTP response handler (line 496)
// sets activeGitActionProgressRef to null and shows the success toast.
// Clearing timestamps early causes the "Running for Xs" description
// to disappear before the success state renders, leaving a bare
// "Pushing..." toast in the gap between the WS event and HTTP response.
return;
case "action_failed":
progress.phaseStartedAtMs = null;
progress.hookStartedAtMs = null;
break;
// Same reasoning as action_finished — let the HTTP error handler
// manage the final toast state to avoid a flash of bare title.
return;
}

updateActiveProgressToast();
Expand Down