fix: clear stale rebaseError when rebase succeeds

When a rebase succeeds, explicitly clear rebaseError and
lastRebaseAttempt fields to prevent stale error data from persisting
alongside rebaseStatus=clean. Since updateMetadata merges updates,
we must set these fields to empty strings to remove them from the
metadata file.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
Prateek 2026-02-16 09:57:17 +05:30
parent 0642cadbc8
commit 133c00628d
1 changed files with 3 additions and 1 deletions

View File

@ -581,11 +581,13 @@ export function createLifecycleManager(deps: LifecycleManagerDeps): LifecycleMan
});
if (result.success) {
// Silent success - update metadata
// Silent success - update metadata and clear error fields
updateMetadata(sessionsDir, session.id, {
lastRebaseTime: new Date().toISOString(),
lastRebaseMainSHA: mainBranchSHA,
rebaseStatus: "clean",
rebaseError: "", // Clear stale error from previous failure
lastRebaseAttempt: "", // Clear stale attempt timestamp
});
// Clear reaction tracker for rebase-conflicts (prevents stale state on re-conflict)