From 4fb07994df0832178b0c74046243e018060ca051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=94=AF?= Date: Wed, 23 Sep 2026 18:55:00 +0800 Subject: [PATCH] =?UTF-8?q?fix(hermes-zhiyi):=20recall=20=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=85=A8=E5=BA=93=E8=B7=A8=20namespace=20=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=EF=BC=88=E4=BF=AE=E5=A4=8D=20memory=5Fsearch=20?= =?UTF-8?q?=E7=9C=8B=E4=B8=8D=E5=88=B0=20a06-main=20=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98,=20t=5F4171e2ad=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ZhiYiClient.recall: agent_id 默认 hermes-a06 → None, namespace 可选 - prefetch: 改为全库检索(原 ZHIYI_AGENT_ID 默认值导致只搜 hermes-main) - commit/写入侧语义不变;备份 ~/.hermes/backups/zhiyi-ns-isolation-fix-20260923/ - 验收: 改后 recall('SOUL.md 精简…') top1 = a06-main worklog score 0.8847 ✓ - 生效需 gateway 重启(本体批准后执行) --- plugins/hermes-zhiyi/__init__.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/plugins/hermes-zhiyi/__init__.py b/plugins/hermes-zhiyi/__init__.py index 287eb43..f1eb040 100644 --- a/plugins/hermes-zhiyi/__init__.py +++ b/plugins/hermes-zhiyi/__init__.py @@ -184,11 +184,21 @@ class ZhiYiClient: return None def recall(self, query: str, top_k: int = 5, - agent_id: str = "hermes-a06") -> List[Dict[str, Any]]: - """语义搜索 ZhiYi 记忆。返回 [{content, score, category}, ...]。""" + agent_id: Optional[str] = None, + namespace: Optional[str] = None) -> List[Dict[str, Any]]: + """语义搜索 ZhiYi 记忆。返回 [{content, score, category}, ...]。 + + namespace="" / agent_id=None → 全库跨 ns 检索(zhiyi recallUncached namespace=="" 路径)。 + 2026-09-23: 此前固定传 agent_id="hermes-a06" 导致检索只限 hermes-main, + 而 worker 写入 a06-main 的记忆完全搜不到(namespace 隔离 bug)。 + """ try: - payload = {"query": query, "top_k": top_k, "use_rerank": True, - "agent_id": agent_id} + payload: Dict[str, Any] = {"query": query, "top_k": top_k, "use_rerank": True} + if namespace is not None: + payload["namespace"] = namespace + elif agent_id is not None: + payload["agent_id"] = agent_id + # 两者都不传 → resolveRecallNamespace("", "", query) → namespace="" → 全库 r = self._session.post(self._url("/api/v1/recall"), json=payload, timeout=self.timeout) if r.status_code == 200: data = r.json() @@ -500,9 +510,9 @@ class HermesZhiYiMemoryProvider(MemoryProvider): blocks.append(" (可用 memory_feedback 标记 memory_id 有用/无用)") # 语义搜索(如果缓存没有命中) + # 2026-09-23: 改为全库跨 ns 检索(不传 agent_id),修复 a06-main 记忆对主脑不可见的问题 if results is None: - results = self._client.recall(query.strip(), top_k=3, - agent_id=os.environ.get("ZHIYI_AGENT_ID", "hermes-a06")) + results = self._client.recall(query.strip(), top_k=3) for r in results: score = r.get("score", 0) content = r.get("content", "") or r.get("text", "") or r.get("snippet", "")