Fork upstream sync in hermes update command

Fixes on record

Merged to main. A stamp counts the issues a fix is linked to.

• #33452 fix(update): check upstream even when origin/main has no new commits (salvages #4873)

  merged to main

  files: hermes_cli/main.py, tests/hermes_cli/test_cmd_update.py

  Show the diff

  • hermes_cli/main.py

    @@ -8928,6 +8928,11 @@ def _cmd_update_impl(args, gateway_mode: bool):
     
             if commit_count == 0:
                 _invalidate_update_cache()
    +
    +            # Even if origin is up to date, the fork may be behind upstream
    +            if is_fork and branch == "main":
    +                _sync_with_upstream_if_needed(git_cmd, PROJECT_ROOT)
    +
                 # Restore stash and switch back to original branch if we moved
                 if auto_stash_ref is not None:
                     _restore_stashed_changes(

  • tests/hermes_cli/test_cmd_update.py

    @@ -106,6 +106,33 @@ def test_update_already_up_to_date(
             pull_cmds = [c for c in commands if "pull" in c]
             assert len(pull_cmds) == 0
     
    +    @patch("shutil.which", return_value=None)
    +    @patch("subprocess.run")
    +    def test_update_on_fork_checks_upstream_when_origin_up_to_date(
    +        self, mock_run, _mock_which, mock_args, capsys
    +    ):
    +        """Regression for issue #26172: forks whose local HEAD already matches
    +        origin/main must still consult upstream/main before printing
    +        "Already up to date!" — otherwise a fork that's caught up to its own
    +        origin but behind NousResearch/hermes-agent silently misses updates.
    +        """
    +        from hermes_cli import main as hm
    +
    +        mock_run.side_effect = _make_run_side_effect(
    +            branch="main", verify_ok=True, commit_count="0"
    +        )
    +
    +        with patch.object(
    +            hm,
    +            "_get_origin_url",
    +            return_value="https://github.com/example/hermes-agent.git",
    +        ), patch.object(hm, "_sync_with_upstream_if_needed") as sync_mock:
    +            cmd_update(mock_args)
    +
    +        sync_mock.assert_called_once_with(["git"], PROJECT_ROOT)
    +        captured = capsys.readouterr()
    +        assert "Already up to date!" in captured.out
    +
         @patch("shutil.which")
         @patch("subprocess.run")
         def test_update_refreshes_repo_and_tui_node_dependencies(