From d18618f48f18c0af5c4bba889a087557ab53a6df Mon Sep 17 00:00:00 2001
From: Billard <82095453+iacker@users.noreply.github.com>
Date: Wed, 8 Apr 2026 16:03:15 +0200
Subject: [PATCH] fix(honcho): respect HOME-anchored default profile fallback

---
 plugins/memory/honcho/client.py    |  3 ++-
 tests/honcho_plugin/test_client.py | 40 ++++++++++++++++++++++++------
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/plugins/memory/honcho/client.py b/plugins/memory/honcho/client.py
index 612bcd239ce..de34642911e 100644
--- a/plugins/memory/honcho/client.py
+++ b/plugins/memory/honcho/client.py
@@ -21,6 +21,7 @@ from dataclasses import dataclass, field
 from pathlib import Path
 
 from hermes_constants import get_hermes_home
+from hermes_cli.profiles import _get_default_hermes_home
 from typing import Any, TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -73,7 +74,7 @@ def resolve_config_path() -> Path:
         return local_path
 
     # Default profile's config — host blocks accumulate here via setup/clone
-    default_path = Path.home() / ".hermes" / "honcho.json"
+    default_path = _get_default_hermes_home() / "honcho.json"
     if default_path != local_path and default_path.exists():
         return default_path
 
diff --git a/tests/honcho_plugin/test_client.py b/tests/honcho_plugin/test_client.py
index 95180b2dce3..8e011a5f94f 100644
--- a/tests/honcho_plugin/test_client.py
+++ b/tests/honcho_plugin/test_client.py
@@ -6,6 +6,8 @@ import os
 from pathlib import Path
 from unittest.mock import patch, MagicMock
 
+from hermes_cli.profiles import _get_default_hermes_home
+
 import pytest
 
 from plugins.memory.honcho.client import (
@@ -349,18 +351,22 @@ class TestResolveConfigPath:
             result = resolve_config_path()
         assert result == local_cfg
 
-    def test_falls_back_to_global_when_no_local(self, tmp_path):
+    def test_falls_back_to_default_profile_when_no_local(self, tmp_path, monkeypatch):
         hermes_home = tmp_path / "hermes"
         hermes_home.mkdir()
-        # No honcho.json in HERMES_HOME — also isolate ~/.hermes so
-        # the default-profile fallback doesn't hit the real filesystem.
         fake_home = tmp_path / "fakehome"
         fake_home.mkdir()
+        default_cfg = fake_home / ".hermes" / "honcho.json"
+        default_cfg.parent.mkdir(parents=True)
+        default_cfg.write_text('{"apiKey": "default-key"}')
 
-        with patch.dict(os.environ, {"HERMES_HOME": str(hermes_home)}), \
-             patch.object(Path, "home", return_value=fake_home):
-            result = resolve_config_path()
-        assert result == fake_home / ".honcho" / "config.json"
+        monkeypatch.setattr(Path, "home", lambda: fake_home)
+        monkeypatch.setenv("HERMES_HOME", str(hermes_home))
+
+        result = resolve_config_path()
+
+        assert _get_default_hermes_home() == fake_home / ".hermes"
+        assert result == default_cfg
 
     def test_falls_back_to_global_without_hermes_home_env(self, tmp_path):
         fake_home = tmp_path / "fakehome"
@@ -383,6 +389,26 @@ class TestResolveConfigPath:
             assert resolve_global_config_path() == fake_home / ".honcho" / "config.json"
             assert resolve_config_path() == fake_home / ".honcho" / "config.json"
 
+    def test_from_global_config_uses_default_profile_fallback(self, tmp_path, monkeypatch):
+        hermes_home = tmp_path / "hermes"
+        hermes_home.mkdir()
+        fake_home = tmp_path / "fakehome"
+        fake_home.mkdir()
+        default_cfg = fake_home / ".hermes" / "honcho.json"
+        default_cfg.parent.mkdir(parents=True)
+        default_cfg.write_text(json.dumps({
+            "apiKey": "default-key",
+            "workspace": "default-ws",
+        }))
+
+        monkeypatch.setattr(Path, "home", lambda: fake_home)
+        monkeypatch.setenv("HERMES_HOME", str(hermes_home))
+
+        config = HonchoClientConfig.from_global_config()
+
+        assert config.api_key == "default-key"
+        assert config.workspace_id == "default-ws"
+
     def test_from_global_config_uses_local_path(self, tmp_path):
         hermes_home = tmp_path / "hermes"
         hermes_home.mkdir()