# NousResearch/hermes-agent · Improving git state detection in update logic

## Open now

- Nothing open on GitHub.

These items address correctness of divergence detection and update behavior, including avoiding false divergence reports, skipping updates during rebase, handling edge cases like index locks and lazy-fetch failures, and writing rescue refs when fast-forward fails.

## TL;DR

- 3 member(s): 0 open issue(s), 1 closed issue(s), 0 open PR(s), 1 merged PR(s), 1 PR(s) closed without merging.
- A fix was merged to main in PR #126166. Verify it addresses your case.
- **Recommended:** read PR #126166 (and any competing PRs below) before filing. Confirm the merged change covers your symptom.

## Maintainer resolution verdict

- Internal-tracker verdict over this cluster's issue members: `resolved` · deciding PR(s): `pr-126166`. This is distinct from the fix status above. Weigh it yourself.

## How this cluster was grouped

- Link evidence (`STRUCTURAL_SPANNING`): every member is connected by structural evidence: shared changed files, or a closing/superseded reference.
- Pairwise link density `0.67`: the share of member pairs that carry a link, counting a structural link in full and a relevance-only link at 0.36. `1.00` means every pair is linked.

## Closed / duplicate issues

- #124642: hermes update reports "history diverged", writes a rescue ref and advises HEAD is now at ad4c40d8ecb catalog: pin antigravity-subscription-directsdk v1.0.4 when the fast-forward failed for another reason (index.lock, lazy-fetch failure)

## Prior & competing PRs

- **#126166: hermes update tells the truth about git state: no false divergence, no update under a rebase, no 'complete' with a parked patch, works from a PM venv**. merged to main · fix tier `verified`
  - maintainer direction: category `merged`
  - files: `hermes_cli/_early_recovery.py`, `hermes_cli/update_cmd.py`, `hermes_cli/update_cmd_stash.py`, `hermes_cli/update_owning_install.py`, `tests/e2e/core/upgrade/git/test_foreign_state.py`, `tests/e2e/core/upgrade/git/test_local_modifications.py`, `tests/e2e/core/upgrade/git/test_truthful_outcome.py`, `tests/e2e/core/upgrade/pm/test_stamps_and_doctor.py`, `tests/hermes_cli/test_update_autostash.py`, `tests/hermes_cli/test_update_diverged_rescue_ref.py`, `tests/hermes_cli/test_update_owning_install.py`, `tests/hermes_cli/test_update_parked_branch_guard.py`
- **#124665: fix(update): prove divergence before reset fallback**. closed without merge
  - maintainer direction: category `uncategorized`; implication `needs_llm`; refs `384ab5795e98dea6962319745a4d0d3717dc99cd`, `#124642`, `#121174`, `#114925`, `#119509`, `#118148`, `#94680`, `#120339`

## Fix status

- Merged to main in PR #126166 (cited above). No release data is tracked. Verify downstream.
- Fix last verified (merged) `2026-09-28`.