Make prompt capture fast and resilient

Hop-State: A_06FN8D0CK06GY5XBDYZ632R
Hop-Proposal: R_06FN8CY2FJBV5QA0WFEDWHR
Hop-Task: T_06FN8C4PMFJRT8APV4G03Y8
Hop-Attempt: AT_06FN8C4PMFRJEE4B7KKQ740
This commit is contained in:
cyph3rasi
2026-07-11 19:42:05 -07:00
committed by Hop
parent ff62e89596
commit 4364e1d8a4
4 changed files with 54 additions and 15 deletions
+9 -13
View File
@@ -1640,17 +1640,17 @@ func (s *Service) reconcileDerivedRefs(ctx context.Context, reconcileAccepted bo
if err != nil {
return err
}
refs, err := s.Repo.ListHiddenRefs(ctx)
if err != nil {
return err
}
for _, row := range rows {
state := row.State
if err := s.Repo.VerifyObjects(ctx, state.GitCommit, state.SourceTree); err != nil {
return fmt.Errorf("state %s references unavailable Git data: %w", state.ID, err)
}
name := "states/" + state.ID
commit, exists, err := s.Repo.ReadHiddenRef(ctx, name)
if err != nil {
return err
}
if !exists || commit != state.GitCommit {
if refs[name] != state.GitCommit {
if err := s.Repo.VerifyObjects(ctx, state.GitCommit, state.SourceTree); err != nil {
return fmt.Errorf("state %s references unavailable Git data: %w", state.ID, err)
}
if err := s.Repo.UpdateHiddenRef(ctx, name, state.GitCommit); err != nil {
return fmt.Errorf("repair Git pin for state %s: %w", state.ID, err)
}
@@ -1668,11 +1668,7 @@ func (s *Service) reconcileDerivedRefs(ctx context.Context, reconcileAccepted bo
if err != nil {
return err
}
commit, exists, err := s.Repo.ReadHiddenRef(ctx, acceptedRef)
if err != nil {
return err
}
if !exists || commit != head.GitCommit {
if refs[acceptedRef] != head.GitCommit {
if err := s.Repo.UpdateHiddenRef(ctx, acceptedRef, head.GitCommit); err != nil {
return fmt.Errorf("repair accepted Git ref: %w", err)
}