diff --git a/plugins/hermes-zhiyi/__init__.py b/plugins/hermes-zhiyi/__init__.py index 3bbd3f8..78d735e 100644 --- a/plugins/hermes-zhiyi/__init__.py +++ b/plugins/hermes-zhiyi/__init__.py @@ -42,10 +42,31 @@ MEMORY_CACHE.mkdir(parents=True, exist_ok=True) # Default — override via .env ZHIYI_URL DEFAULT_ZHIYI_URL = "http://localhost:7821" -ZHIYI_TIMEOUT = 10 # seconds per request +ZHIYI_TIMEOUT = 60 # seconds per request (2026-09-11: 20→60,实测蒸馏满载时 recall 可 >20s 被静默吞成"无记忆") -# API Key — read from .env ZHIYI_API_KEY -ZHIYI_API_KEY = os.environ.get("ZHIYI_API_KEY", "zhiyi-dev-key-2026") +# API Key — 优先级:ZHIYI_API_KEY 环境变量 → /var/lib/memoryweave/.api-key 第 1 个非注释非 legacy 行 +# 找不到时抛异常(不用默认值,避免静默回退到旧密钥) +def _load_zhiyi_key() -> str: + key = os.environ.get("ZHIYI_API_KEY") + if key: + return key.strip() + key_file = Path("/var/lib/memoryweave/.api-key") + if key_file.exists(): + for line in key_file.read_text().splitlines(): + stripped = line.strip() + if not stripped or stripped.startswith("#") or stripped.startswith("legacy:"): + continue + return stripped + raise RuntimeError( + "zhiyi plugin: 找不到织忆 API 密钥。" + "设置 ZHIYI_API_KEY 环境变量,或确保 /var/lib/memoryweave/.api-key 存在。" + ) + +try: + ZHIYI_API_KEY = _load_zhiyi_key() +except RuntimeError as _e: + logger.warning("zhiyi plugin key resolution failed: %s", _e) + ZHIYI_API_KEY = "" # 运行期请求会 401,但 import 不炸 # 日志中只暴露 key 的前 4 位,用于调试 _ZHIYI_KEY_PREFIX = ZHIYI_API_KEY[:4] if ZHIYI_API_KEY else "NONE" @@ -101,6 +122,7 @@ class ZhiYiClient: def __init__(self, base_url: str, timeout: int = 10): self.base_url = base_url.rstrip("/") self.timeout = timeout + self._last_conflicts: list = [] # 最近一次 commit 的冲突检测结果(2026-09-03) self._session = requests.Session() self._session.headers.update({ "Content-Type": "application/json", @@ -136,6 +158,9 @@ class ZhiYiClient: r = self._session.post(self._url("/api/v1/commit"), json=payload, timeout=self.timeout) if r.status_code in (200, 201): data = r.json() + # 冲突检测结果(zhiyid DetectContradiction):记录供调用方感知, + # 避免"冲突记忆静默写入 → 蒸馏成污染记忆"(2026-09-03 记忆治理修复) + self._last_conflicts = data.get("conflicts") or [] cid = ( data.get("commit_id") or data.get("episode_id") @@ -164,8 +189,9 @@ class ZhiYiClient: """语义搜索 ZhiYi 记忆。返回 [{content, score, category}, ...]。 2026-09-23 (t_4171e2ad): agent_id 默认 None → payload 不含该字段 → - 服务端走全库跨 namespace 检索。此前固定 "hermes-a06" 导致只搜 hermes-main, - 分身写入 a06-main 的记忆(如工作笔记结论层)主脑完全搜不到。 + 服务端走全库跨 namespace 检索。此前默认 "hermes-a06" 使 memory_search / + prefetch 只覆盖 hermes-main,分身写入 a06-main 的记忆(如工作笔记结论层) + 主脑完全搜不到。 """ try: payload = {"query": query, "top_k": top_k, "use_rerank": True} @@ -176,10 +202,10 @@ class ZhiYiClient: data = r.json() return data.get("results", []) logger.warning("ZhiYi recall failed: %s %s", r.status_code, r.text[:200]) - return [] + return [{"content": f"⚠️ 织忆检索失败(HTTP {r.status_code}):这不是\"没有记忆\",是服务异常——请勿据此判断记忆为空", "score": 0.0, "category": "_error"}] except Exception as e: logger.warning("ZhiYi recall error: %s", e) - return [] + return [{"content": f"⚠️ 织忆检索异常({type(e).__name__}):这不是\"没有记忆\",是服务/超时异常——请勿据此判断记忆为空", "score": 0.0, "category": "_error"}] def stats(self) -> Dict[str, Any]: """获取 ZhiYi 统计信息。""" @@ -448,6 +474,7 @@ class HermesZhiYiMemoryProvider(MemoryProvider): return "" blocks = ["[ZhiYi Memory — relevant past context]"] + blocks.append(" (可用 memory_feedback 标记 memory_id 有用/无用)") # 语义搜索(2026-09-23 t_4171e2ad:不传 agent_id → 全库跨 namespace, # 否则分身写入 a06-main 的记忆主脑搜不到) @@ -456,8 +483,12 @@ class HermesZhiYiMemoryProvider(MemoryProvider): score = r.get("score", 0) content = r.get("content", "") or r.get("text", "") cat = r.get("category", "") + mid = r.get("id") or r.get("memory_id") or "" if content: - blocks.append(f" [{score:.2f}][{cat}] {content[:500]}") + if mid: + blocks.append(f" [id={mid}][{score:.2f}][{cat}] {content[:500]}") + else: + blocks.append(f" [{score:.2f}][{cat}] {content[:500]}") # 图谱导航 + Obsidian 笔记(从 query 提取关键词作为实体) notes = self._client.search_notes(query.strip(), max_hops=2, max_notes=3) @@ -470,7 +501,7 @@ class HermesZhiYiMemoryProvider(MemoryProvider): score = n.get("score", 0) entities = ", ".join(n.get("entities", [])) blocks.append(f" [{score:.0f}] {title} ({path})") - blocks.append(f" \"{snippet}\"") + blocks.append(f' "{snippet}"') if entities: blocks.append(f" via entities: {entities}") @@ -631,6 +662,7 @@ class HermesZhiYiMemoryProvider(MemoryProvider): for r in results: content = r.get("content", "") or r.get("text", "") formatted.append({ + "memory_id": r.get("id") or r.get("memory_id") or "", "content": content[:1000], "score": round(r.get("score", 0), 4), "category": r.get("category", ""), @@ -644,12 +676,23 @@ class HermesZhiYiMemoryProvider(MemoryProvider): return json.dumps({"success": False, "error": "ZhiYi client not initialized"}) if not _is_valid_memory_content(content): return json.dumps({"success": False, "error": "Content too short or invalid"}) + self._client._last_conflicts = [] # reset before commit commit_id = self._client.commit( content=content, category=category, agent_id=os.environ.get("ZHIYI_AGENT_ID", "hermes-a06"), ) if commit_id: - return json.dumps({"success": True, "commit_id": commit_id}) + result = {"success": True, "commit_id": commit_id} + conflicts = getattr(self._client, "_last_conflicts", []) + if conflicts: + # zhiyid 检出与现有记忆矛盾:返回给 agent 感知,不静默 + # (2026-09-03 记忆治理:冲突记忆会进 episodes→蒸馏→污染长期记忆) + result["conflicts"] = conflicts + result["warning"] = ( + "⚠️ 此内容与现有记忆冲突,仍已写入待蒸馏。" + "若是修正请更新旧条目;若是推断请标注 [推断];若写错了请用 memory_feedback 标记 not_useful" + ) + return json.dumps(result, ensure_ascii=False) return json.dumps({"success": False, "error": "Commit failed — check ZhiYi server logs"}) def _tool_memory_stats(self) -> str: @@ -671,7 +714,7 @@ class HermesZhiYiMemoryProvider(MemoryProvider): ok = self._client.mark_not_useful(memory_id, reason) if ok: return json.dumps({"success": True, "memory_id": memory_id, "useful": useful, - "message": "Feedback recorded — VProp + Dashboard updated"}) + "message": "Feedback recorded"}) return json.dumps({"success": False, "error": "ZhiYi feedback API failed"}) def _tool_memory_metrics(self) -> str: @@ -747,16 +790,20 @@ class HermesZhiYiMemoryProvider(MemoryProvider): def system_prompt_block(self) -> str: return ( - "\\n[ZhiYi Memory] You have access to ZhiYi MemoryWeave — a semantic memory system with knowledge graph.\\n" - "Your prefetch automatically retrieves: (1) relevant semantic memories, (2) Obsidian notes related via graph navigation.\\n" - "Tools available:\\n" - " memory_search — semantic search for relevant past information\\n" - " memory_write — save an important fact or preference\\n" - " memory_feedback — mark memories as useful/not-useful (drives self-optimization)\\n" - " memory_metrics — check memory system health (recall hit rate, gap closures, etc.)\\n" - " memory_stats — get memory statistics (total docs, vector dimensions)\\n" - " memory_graph_navigate — navigate the knowledge graph to understand entity relationships (N-hop network)\\n" - " memory_graph_stats — get knowledge graph statistics (nodes, edges, density)\\n" + "\n[ZhiYi Memory] You have access to ZhiYi MemoryWeave — a semantic memory system with knowledge graph.\n" + "Your prefetch automatically retrieves: (1) relevant semantic memories, (2) Obsidian notes related via graph navigation.\n" + "Memory feedback loop (IMPORTANT): injected memories carry [id=mem_xxx]. After answering using an injected memory:\n" + " - if it was genuinely helpful/used → call memory_feedback(memory_id=..., useful=true) to raise its priority;\n" + " - if it was irrelevant/stale/contradictory → call memory_feedback(memory_id=..., useful=false, reason=...) so it gets demoted;\n" + " - do this naturally during the conversation (once per relevant memory), not after every turn.\n" + "Tools available:\n" + " memory_search — semantic search for relevant past information (results include memory_id for feedback)\n" + " memory_write — save an important fact or preference\n" + " memory_feedback — mark memories as useful/not-useful (drives self-optimization)\n" + " memory_metrics — check memory system health (recall hit rate, gap closures, etc.)\n" + " memory_stats — get memory statistics (total docs, vector dimensions)\n" + " memory_graph_navigate — navigate the knowledge graph to understand entity relationships (N-hop network)\n" + " memory_graph_stats — get knowledge graph statistics (nodes, edges, density)\n" ) @@ -765,4 +812,4 @@ class HermesZhiYiMemoryProvider(MemoryProvider): def register(ctx) -> None: """Called by Hermes plugin system to register this memory provider.""" - ctx.register_memory_provider(HermesZhiYiMemoryProvider()) \ No newline at end of file + ctx.register_memory_provider(HermesZhiYiMemoryProvider())