From be8ce602d07a33e42d1f540923719616b7d50cbc Mon Sep 17 00:00:00 2001 From: Erosika Date: Tue, 8 Sep 2026 16:12:46 -0400 Subject: [PATCH] fix(honcho): keep a rotation that lands while the setup wizard is still asking questions install_grant writes the login grant to disk before the wizard's later prompts. _apply_grant_to_host wrote it only into the live cfg, so _write_config saw the grant as an edit and copied it over whatever a serve child rotated onto disk meanwhile. The snapshot now takes the grant too, so the final save leaves the newer on-disk grant alone. --- plugins/memory/honcho/cli.py | 19 +++++++++++-------- tests/honcho_plugin/test_cli.py | 15 +++++++++++++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/plugins/memory/honcho/cli.py b/plugins/memory/honcho/cli.py index d1442b569b..7c8598d3a5 100644 --- a/plugins/memory/honcho/cli.py +++ b/plugins/memory/honcho/cli.py @@ -572,10 +572,13 @@ def _headless() -> tuple[bool, bool]: return False, True -def _apply_grant_to_host(hermes_host: dict, cred) -> None: - """Store an OAuth grant on the host block; the wizard's final save persists it.""" +def _apply_grant_to_host(cfg: dict, hermes_host: dict, cred) -> None: + """Store an OAuth grant on the host block and in ``cfg``'s snapshot. install_grant already wrote it to disk, + so the final save must not copy it over a rotation that lands during the later prompts.""" hermes_host["apiKey"] = cred.access_token hermes_host["oauth"] = cred.oauth_block() + if (snapshot := getattr(cfg, "snapshot", None)) is not None: + snapshot.setdefault("hosts", {}).setdefault(_host_key(), {}).update(apiKey=cred.access_token, oauth=cred.oauth_block()) if cred.consent_peer_name: # default the peer prompt to the consent name hermes_host["peerName"] = cred.consent_peer_name print(" Authorized — token saved. Let's finish configuring.\n") @@ -603,7 +606,7 @@ def _setup_local_auth(cfg: dict, hermes_host: dict) -> None: print("\n No local JWT set. Local no-auth ready.") -def _setup_device_login(hermes_host: dict, write_path: Path, *, open_browser: bool) -> bool: +def _setup_device_login(cfg: dict, hermes_host: dict, write_path: Path, *, open_browser: bool) -> bool: """RFC 8628 device-code sign-in. Returns False if setup must abort.""" from plugins.memory.honcho.oauth_flow import ( AccessDenied, AuthorizationTimeout, DeviceCode, DeviceCodeExpired, DeviceFlowError, authorize_via_device_code, @@ -633,12 +636,12 @@ def _setup_device_login(hermes_host: dict, write_path: Path, *, open_browser: bo if isinstance(e, DeviceFlowError) and e.error == "http_429" else f"\n Device sign-in failed: {e}\n" + _RETRY_HINT) else: print(" approved") - _apply_grant_to_host(hermes_host, cred) + _apply_grant_to_host(cfg, hermes_host, cred) return True return False -def _setup_browser_login(hermes_host: dict, write_path: Path) -> bool: +def _setup_browser_login(cfg: dict, hermes_host: dict, write_path: Path) -> bool: """Loopback OAuth sign-in. Tokens merge into the in-memory cfg so the wizard's final save keeps them; settings stay wizard-owned (apply_config=False). Returns False on abort.""" from plugins.memory.honcho.oauth_flow import authorize_via_loopback @@ -654,7 +657,7 @@ def _setup_browser_login(hermes_host: dict, write_path: Path) -> bool: except Exception as e: print(f" OAuth sign-in failed: {e}\n" + _RETRY_HINT) return False - _apply_grant_to_host(hermes_host, cred) + _apply_grant_to_host(cfg, hermes_host, cred) return True @@ -683,9 +686,9 @@ def _setup_cloud_auth(cfg: dict, hermes_host: dict, write_path: Path) -> bool: default=default_method).strip().lower() if device_available and method in {"device", "d"}: - return _setup_device_login(hermes_host, write_path, open_browser=can_browse and not is_remote) + return _setup_device_login(cfg, hermes_host, write_path, open_browser=can_browse and not is_remote) if method in {"oauth", "o"}: - return _setup_browser_login(hermes_host, write_path) + return _setup_browser_login(cfg, hermes_host, write_path) # A leftover grant on the host block would shadow the pasted key. stale_grant = existing_oauth is not None or is_oauth_access_token(hermes_host.get("apiKey")) current = ("" if stale_grant else hermes_host.get("apiKey", "")) or cfg.get("apiKey", "") diff --git a/tests/honcho_plugin/test_cli.py b/tests/honcho_plugin/test_cli.py index 2534a680d7..257f04c86b 100644 --- a/tests/honcho_plugin/test_cli.py +++ b/tests/honcho_plugin/test_cli.py @@ -892,6 +892,21 @@ class TestWriteConfigMergesOntoDisk: honcho_cli._write_config(cfg) assert json.loads(cfg_path.read_text())["hosts"]["hermes"] == {"apiKey": "hch-v3-pasted"} + def test_a_grant_the_login_installed_yields_to_a_later_rotation(self, monkeypatch, tmp_path): + import plugins.memory.honcho.oauth as oauth + honcho_cli, cfg_path = self._paths(monkeypatch, tmp_path, {"hosts": {"hermes": {"peerName": "alice"}}}) + monkeypatch.setattr(honcho_cli, "_host_key", lambda: "hermes") + cfg = honcho_cli._read_config() + grant = {"access_token": "hch-at-login", "refresh_token": "hch-rt-login", "expires_in": 3600} + cred = oauth.install_grant(cfg_path, "hermes", grant, client_id="c", token_endpoint="e", apply_config=False) + honcho_cli._apply_grant_to_host(cfg, cfg["hosts"]["hermes"], cred) + self._rotate_on_disk(cfg_path) + cfg["hosts"]["hermes"]["recallMode"] = "tools" + honcho_cli._write_config(cfg) + out = json.loads(cfg_path.read_text())["hosts"]["hermes"] + assert out["apiKey"] == "hch-at-new" and out["oauth"] == {"refreshToken": "hch-rt-new"} + assert out["peerName"] == "alice" and out["recallMode"] == "tools" + @pytest.mark.parametrize("build", [lambda cli: {"hosts": {"other": {"apiKey": "o"}}}, lambda cli: dict(cli._read_config())], ids=["never read", "rebuilt from the read"]) def test_a_plain_dict_is_written_whole(self, monkeypatch, tmp_path, build):