fix: detect reset-driven session divergence in status #948
+214
−0
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,10 +18,17 @@ import ( | |
| "github.com/entireio/cli/cmd/entire/cli/settings" | ||
| "github.com/entireio/cli/cmd/entire/cli/strategy" | ||
| "github.com/entireio/cli/cmd/entire/cli/stringutil" | ||
| "github.com/entireio/cli/cmd/entire/cli/trailers" | ||
|
|
||
| "github.com/go-git/go-git/v6" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| type headLinkage struct { | ||
| commitHash string | ||
| checkpointID string | ||
| } | ||
|
|
||
| func newStatusCmd() *cobra.Command { | ||
| var detailed bool | ||
|
|
||
|
|
@@ -244,6 +251,12 @@ func writeActiveSessions(ctx context.Context, w io.Writer, sty statusStyles) { | |
| return | ||
| } | ||
|
|
||
| repoRoot, head, headErr := currentHeadLinkage(ctx) | ||
| divergenceWarnings := make(map[string]string) | ||
| if headErr == nil && repoRoot != "" && head.commitHash != "" { | ||
| divergenceWarnings = reconcileActiveSessionHeadDivergence(ctx, store, active, repoRoot, head) | ||
| } | ||
|
|
||
| // Group by worktree path | ||
| groups := make(map[string]*worktreeGroup) | ||
| for _, s := range active { | ||
|
|
@@ -342,6 +355,9 @@ func writeActiveSessions(ctx context.Context, w io.Writer, sty statusStyles) { | |
| } else { | ||
| fmt.Fprintln(w, sty.render(sty.dim, statsLine)) | ||
| } | ||
| if warning := divergenceWarnings[st.SessionID]; warning != "" { | ||
| fmt.Fprintf(w, "%s %s\n", sty.render(sty.yellow, "!"), sty.render(sty.yellow, warning)) | ||
| } | ||
| fmt.Fprintln(w) | ||
| } | ||
| } | ||
|
|
@@ -427,3 +443,77 @@ func resolveWorktreeBranchGit(ctx context.Context, worktreePath string) string { | |
| } | ||
| return detachedHEADDisplay | ||
| } | ||
|
|
||
| func currentHeadLinkage(ctx context.Context) (string, headLinkage, error) { | ||
| repoRoot, err := paths.WorktreeRoot(ctx) | ||
| if err != nil { | ||
| return "", headLinkage{}, fmt.Errorf("resolve worktree root: %w", err) | ||
| } | ||
|
|
||
| repo, err := git.PlainOpen(repoRoot) | ||
| if err != nil { | ||
| return "", headLinkage{}, fmt.Errorf("open repo: %w", err) | ||
| } | ||
|
|
||
| headRef, err := repo.Head() | ||
| if err != nil { | ||
| return "", headLinkage{}, fmt.Errorf("resolve HEAD: %w", err) | ||
| } | ||
|
|
||
| commit, err := repo.CommitObject(headRef.Hash()) | ||
| if err != nil { | ||
| return "", headLinkage{}, fmt.Errorf("load HEAD commit: %w", err) | ||
| } | ||
|
|
||
| head := headLinkage{commitHash: headRef.Hash().String()} | ||
| if checkpointIDs := trailers.ParseAllCheckpoints(commit.Message); len(checkpointIDs) > 0 { | ||
| head.checkpointID = checkpointIDs[0].String() | ||
| } | ||
|
Comment on lines
+468
to
+471
There was a problem hiding this comment. The new reset-reconciliation logic is covered for the single-trailer case, but there's no test covering HEAD commits that contain multiple There was a problem hiding this comment. Only first checkpoint ID checked, missing valid matchesLow Severity
Additional Locations (1)  Reviewed by Cursor Bugbot for commit f692674. Configure here. |
||
|
|
||
| return repoRoot, head, nil | ||
| } | ||
|
|
||
| func reconcileActiveSessionHeadDivergence( | ||
| ctx context.Context, | ||
| store *session.StateStore, | ||
| active []*session.State, | ||
| repoRoot string, | ||
| head headLinkage, | ||
| ) map[string]string { | ||
| warnings := make(map[string]string) | ||
| normalizedRepoRoot := normalizeWorktreePath(repoRoot) | ||
|
|
||
| for _, st := range active { | ||
| if normalizeWorktreePath(st.WorktreePath) != normalizedRepoRoot || st.BaseCommit == "" || st.BaseCommit == head.commitHash { | ||
| continue | ||
| } | ||
|
|
||
| if !st.LastCheckpointID.IsEmpty() && head.checkpointID != "" && st.LastCheckpointID.String() == head.checkpointID { | ||
| st.BaseCommit = head.commitHash | ||
| st.AttributionBaseCommit = head.commitHash | ||
| if err := store.Save(ctx, st); err != nil { | ||
| warnings[st.SessionID] = "tracking diverged from current HEAD; failed to refresh local linkage state" | ||
| } | ||
| continue | ||
| } | ||
|
|
||
| if head.checkpointID != "" { | ||
| warnings[st.SessionID] = "tracking diverged from current HEAD; HEAD links to checkpoint " + head.checkpointID | ||
| continue | ||
| } | ||
|
|
||
| warnings[st.SessionID] = "tracking diverged from current HEAD after git history movement" | ||
| } | ||
|
|
||
| return warnings | ||
| } | ||
|
|
||
| func normalizeWorktreePath(path string) string { | ||
| if path == "" { | ||
| return "" | ||
| } | ||
| if resolved, err := filepath.EvalSymlinks(path); err == nil { | ||
| return filepath.Clean(resolved) | ||
| } | ||
| return filepath.Clean(path) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
currentHeadLinkage only records the first
Entire-Checkpointtrailer (checkpointIDs[0]).trailers.ParseAllCheckpointsexplicitly supports multiple checkpoint trailers (e.g., squash merges) while preserving order, so HEAD may legitimately link to several checkpoints. With the current implementation, a session whoseLastCheckpointIDmatches a later trailer will incorrectly fail to reconcile and will show a divergence warning. Consider storing all parsed checkpoint IDs (e.g., as a[]stringor amap[string]struct{}inheadLinkage) and treating HEAD as matching ifLastCheckpointIDequals any of them; update the warning text accordingly (e.g., mention the matched/available checkpoint IDs).