diff --git a/core/bot_personal.py b/core/bot_personal.py index d0d14e4..829894b 100644 --- a/core/bot_personal.py +++ b/core/bot_personal.py @@ -50,7 +50,7 @@ BOT_PERSONAL_TYPE_CONTRACTS = { "bot_subjective_memory": {"source_kind": "subjective", "evidence_level": "caller", "reality_level": "subjective", "lifecycle": "stable_memory"}, "bot_shared_activity": {"source_kind": "shared", "evidence_level": "caller", "reality_level": "shared_activity", "lifecycle": "stable_memory"}, "bot_detail_fragment": {"source_kind": "detail", "evidence_level": "caller", "reality_level": "detail_fragment", "lifecycle": "stable_memory"}, - "bot_calendar_event": {"source_kind": "calendar", "evidence_level": "caller", "reality_level": "calendar_history", "lifecycle": "stable_memory"}, + "bot_calendar_event": {"source_kind": "calendar", "evidence_level": "caller", "reality_level": "calendar_event", "lifecycle": "stable_memory"}, "bot_proactive_message": {"source_kind": "proactive", "evidence_level": "caller", "reality_level": "proactive_action", "lifecycle": "stable_memory"}, } diff --git a/core/bridge.py b/core/bridge.py index e1a168c..c5216aa 100644 --- a/core/bridge.py +++ b/core/bridge.py @@ -51,7 +51,7 @@ class MemoryCompanionBridge: "accepted_write_types": ["user_fact", "user_event", "user_decision", "user_summary"], "accepts_bot_self_memory": False, "accepts_agenda_snapshot": False, - "accepts_calendar_history": False, + "accepts_calendar_events": False, "time_aware": True, }) return result @@ -62,10 +62,10 @@ class MemoryCompanionBridge: def probe_calendar_contract(self) -> dict[str, Any]: return { "version": "1.0", - "available": callable(getattr(self._plugin, "record_calendar_event", None)), - "write_mode": "history_only", - "calendar_owner": "private_companion_calendar_store", - "memory_role": "historical_context", + "available": False, + "write_mode": "rejected", + "calendar_owner": "none", + "memory_role": "not_stored", "dynamic_age_persisted": False, } @@ -164,7 +164,7 @@ class MemoryCompanionBridge: metadata: dict[str, Any] | None = None, source_plugin: str = "astrbot_plugin_private_companion", ) -> str: - raise RuntimeError("calendar_history_rejected:user_memory_contract") + raise RuntimeError("calendar_event_rejected:user_memory_contract") async def record_bot_action(self, *, content: str, **kwargs: Any) -> str: raise RuntimeError("bot_self_memory_rejected:user_memory_contract") @@ -737,7 +737,6 @@ def serialize_memory(record: MemoryRecord, score: float | None = None, reason: s "memory_layer": clean_text(metadata.get("memory_layer"), 80), "calendar_event_id": clean_text(metadata.get("calendar_event_id"), 120), "calendar_status": clean_text(metadata.get("status"), 40), - "historical_only": clean_text(metadata.get("memory_layer"), 80) == "calendar_history", "temporal": build_temporal_memory_meta(record), "time_range": { "start_at": clean_text(metadata.get("start_at"), 80), diff --git a/core/injection.py b/core/injection.py index de68212..70c0fb5 100644 --- a/core/injection.py +++ b/core/injection.py @@ -332,7 +332,6 @@ class InjectionComposer: source_label = self._safe_text(self._source_label(memory), 100) temporal = build_temporal_memory_meta(memory, now) usage = self._expression_usage(item) if not compact else f"表达:{self._expression_label(item)}" - is_calendar_history = clean_text(getattr(memory, "memory_type", ""), 80).lower() == "calendar_event" calendar_status = self._safe_text(metadata.get("status"), 24) parts = [f"内容:{detail}"] if compact: @@ -342,7 +341,6 @@ class InjectionComposer: f"跨日:{'是' if temporal.get('crossed_date') else '否'}", f"状态:{'不能代表当前实时事实' if temporal.get('stale') else '历史背景' if temporal.get('age_label') not in {'just_now', 'recent', 'same_day'} else '近期参考'}", f"来源:{source_label}", - *(["\u8bb0\u5fc6\u5c42\uff1a\u65e5\u5386\u5386\u53f2\uff08\u4ec5\u4f5c\u5386\u53f2\u80cc\u666f\uff09", f"\u65e5\u5386\u72b6\u6001\uff1a{calendar_status or 'unknown'}"] if is_calendar_history else []), ]) else: parts.extend([ @@ -356,7 +354,6 @@ class InjectionComposer: f"时间来源:{self._safe_text(temporal.get('time_source'), 32)}", f"时间精度:{self._safe_text(temporal.get('time_precision'), 16)}", f"来源:{source_label}", - *(["\u8bb0\u5fc6\u5c42\uff1a\u65e5\u5386\u5386\u53f2\uff08\u4ec5\u4f5c\u5386\u53f2\u80cc\u666f\uff09", f"\u65e5\u5386\u72b6\u6001\uff1a{calendar_status or 'unknown'}"] if is_calendar_history else []), ]) if compact: parts.extend( diff --git a/core/models.py b/core/models.py index c1e5e63..431f586 100644 --- a/core/models.py +++ b/core/models.py @@ -1,4 +1,4 @@ -from __future__ import annotations +from __future__ import annotations import json import re @@ -180,7 +180,7 @@ class MemoryRecord: memory_type = clean_text(self.memory_type, 80).lower() reality = clean_text(self.reality_level, 80).lower() if memory_type == "calendar_event": - self.memory_domain = "calendar_history" + self.memory_domain = "bot_self_legacy" elif self.visibility == "bot_self" or reality in BOT_SELF_REALITY_LEVELS or memory_type in BOT_SELF_MEMORY_TYPES: self.memory_domain = "bot_self_legacy" elif getattr(self.subject, "kind", "") == "user" or memory_type in USER_MEMORY_TYPES: diff --git a/core/service.py b/core/service.py index 76324df..74f68e8 100644 --- a/core/service.py +++ b/core/service.py @@ -738,7 +738,7 @@ class MemoryCompanionService: kwargs.get("source_plugin", "external"), ) raise - elif memory_domain not in {"calendar_history", "shared_or_mixed", BOT_PERSONAL_MEMORY_DOMAIN}: + elif memory_domain not in {"shared_or_mixed", BOT_PERSONAL_MEMORY_DOMAIN}: raise UserMemoryBoundaryError(f"memory_domain:{memory_domain or 'unknown'}") else: record.memory_domain = memory_domain @@ -778,107 +778,6 @@ class MemoryCompanionService: ) return memory_id - async def record_calendar_event( - self, - *, - event_id: str, - calendar: str = "personal_agenda", - title: str = "", - summary: str = "", - start_at: str = "", - end_at: str = "", - timezone: str = "Asia/Shanghai", - status: str = "planned", - source: str = "bot_generated", - related_task_id: str = "", - occurred_at: str = "", - change_reason: str = "", - metadata: dict[str, Any] | None = None, - source_plugin: str = "astrbot_plugin_private_companion", - ) -> str: - if not self.config.bool("private_companion_bridge.accept_external_records", True): - raise RuntimeError("外部记息写入已关闭") - - allowed_calendars = { - "personal_agenda", - "work_agenda", - "maintenance_agenda", - "external_schedule", - } - allowed_statuses = {"planned", "active", "completed", "cancelled"} - event_id = clean_text(event_id, 120) - calendar = clean_text(calendar, 40).lower() or "personal_agenda" - title = clean_text(title, 240) - summary = clean_text(summary, 1000) - start_at = clean_text(start_at, 80) - end_at = clean_text(end_at, 80) - timezone_name = clean_text(timezone, 80) or "Asia/Shanghai" - status = clean_text(status, 40).lower() or "planned" - source = clean_text(source, 120) or "unknown" - related_task_id = clean_text(related_task_id, 160) - occurred_at = clean_text(occurred_at, 80) - change_reason = clean_text(change_reason, 500) - if not event_id: - raise ValueError("event_id is required") - if not title and not summary: - raise ValueError("title or summary is required") - if calendar not in allowed_calendars: - raise ValueError(f"unsupported calendar: {calendar}") - if status not in allowed_statuses: - raise ValueError(f"unsupported calendar status: {status}") - try: - ZoneInfo(timezone_name) - except Exception: - timezone_name = "Asia/Shanghai" - start_dt = self._parse_iso(start_at) - end_dt = self._parse_iso(end_at) - if start_dt is None or end_dt is None or end_dt <= start_dt: - raise ValueError("start_at and end_at must be valid, and end_at must be after start_at") - event_occurred_at = occurred_at or start_at - event_metadata = dict(metadata or {}) - event_metadata.update( - { - "memory_layer": "calendar_history", - "calendar_event_id": event_id, - "calendar": calendar, - "title": title, - "summary": summary, - "start_at": start_at, - "end_at": end_at, - "timezone": timezone_name, - "status": status, - "source": source, - "related_task_id": related_task_id, - "change_reason": change_reason, - "time_source": "calendar_event", - "time_precision": "second" if event_occurred_at[11:].count(":") >= 2 else "minute", - "occurred_at_estimated": not bool(occurred_at), - "historical_only": True, - } - ) - content = f"日历历史:{title or summary}\n状态:{status}\n时间:{start_at} - {end_at}" - if change_reason: - content += f"\n变更原因:{change_reason}" - memory_id = self.stable_id("calendar_event", event_id) - return await self.record_external_event( - memory_id=memory_id, - content=content, - memory_type="calendar_event", - memory_domain="calendar_history", - scope="private", - session_id="calendar_history", - visibility="bot_self", - sayability="indirect", - reality_level="calendar_history", - lifecycle="stable_memory", - confidence=0.95, - importance=0.55, - tags=["calendar_event", "calendar_history"], - metadata=event_metadata, - source_plugin=source_plugin, - occurred_at=event_occurred_at, - ) - async def record_bot_personal_memory( self, *, @@ -1186,7 +1085,7 @@ class MemoryCompanionService: "memories": [], } payload["scope"] = requested_scope - payload["strict_session_only"] = bool(payload.get("strict_session_only", False)) + payload["strict_session_only"] = bool(payload.get("strict_session_only", True)) result = await self.bridge_search_archive_memories( query, scope=payload, diff --git a/core/user_memory_boundary.py b/core/user_memory_boundary.py index 2c9a8a6..cc94ae3 100644 --- a/core/user_memory_boundary.py +++ b/core/user_memory_boundary.py @@ -15,7 +15,6 @@ USER_MEMORY_DOMAIN = "user_memory" BOT_SELF_LEGACY_DOMAIN = "bot_self_legacy" MIXED_MEMORY_DOMAIN = "shared_or_mixed" UNKNOWN_MEMORY_DOMAIN = "unknown" -CALENDAR_HISTORY_DOMAIN = "calendar_history" # 类型/真实性集合的定义在 `core/models.py`,此处只做再导出, # 保证域判定与写入门禁只有一份来源(详见 models.py 注释)。 @@ -24,7 +23,6 @@ __all__ = [ "BOT_SELF_LEGACY_DOMAIN", "MIXED_MEMORY_DOMAIN", "UNKNOWN_MEMORY_DOMAIN", - "CALENDAR_HISTORY_DOMAIN", "USER_MEMORY_TYPES", "BOT_SELF_MEMORY_TYPES", "BOT_SELF_REALITY_LEVELS", diff --git a/core/user_memory_migration.py b/core/user_memory_migration.py index 74944ab..390ed09 100644 --- a/core/user_memory_migration.py +++ b/core/user_memory_migration.py @@ -100,7 +100,7 @@ class UserMemoryMigration: visibility = clean_text(row["visibility"], 40).lower() reality = clean_text(row["reality_level"], 80).lower() if memory_type == "calendar_event": - return "calendar_history", "calendar_event_type" + return "bot_self_legacy", "calendar_event_retired" if subject_kind == "user" and visibility != "bot_self" and reality not in {"bot_action", "persona_life", "llm_tool_assertion"}: if memory_type.startswith("shared_") or "shared_experience" in clean_text(row["tags"], 500): return "shared_or_mixed", "shared_experience_marker" diff --git a/docs/Q5用户记忆硬边界实施说明.md b/docs/Q5用户记忆硬边界实施说明.md index 209ccef..7b955a9 100644 --- a/docs/Q5用户记忆硬边界实施说明.md +++ b/docs/Q5用户记忆硬边界实施说明.md @@ -23,5 +23,5 @@ ## 验证边界 - 私聊和群聊用户记忆分别验证;群聊记录绑定实际发言用户和群 ID。 -- 日历历史 Service 内部兼容测试保留,但公开 Bridge 按 Q5 合同拒绝,能力探测返回 `accepts_calendar_history=false`。 +- 日历直写路径已退役,公开 Bridge 按 Q5 合同拒绝,能力探测返回 `accepts_calendar_events=false`。 - 旧 Q4.2 测试中与 Q5 冲突的 Bridge 断言已调整为新合同;普通陪伴分支未修改。 diff --git a/docs/运维记忆错题本.md b/docs/运维记忆错题本.md index 8a32130..573c245 100644 --- a/docs/运维记忆错题本.md +++ b/docs/运维记忆错题本.md @@ -1,4 +1,4 @@ -# 运维记忆插件错题本 +# 运维记忆插件错题本 > 适用仓库:`astrbot_plugin_memory_companion-main` > 分支:`ops-main` @@ -309,3 +309,23 @@ - 修复或规避:定位逻辑收进 `tests/_companion_repo.py`,按「环境变量 `COMPANION_PLUGIN_ROOT` → 同级开发目录 → 同级部署目录(`_ops` 后缀)→ 再上一层」依次尝试;`ensure_companion_on_path` 明确把陪伴目录插到 `sys.path` **最前面**,避免同名模块遮蔽——顺序反了会以「跑绿了但测错了对象」的形态失败,比 ImportError 难查得多。 - 预防规则:跨仓/跨目录的路径假设要收成一处并允许显式覆盖,不要每个文件各写一遍。`skipif` 的条件如果可能在某个环境里恒成立,就等于那个环境没有这条覆盖——要么让定位更健壮,要么让 skip 的原因出现在验收记录里。 - 验证证据:`tests/test_m6_r2_real_dto_shape.py` + `tests/test_ops_migration.py` 共 52 项通过;全量 330 项通过。 + +## 2026-07-27 - Retire the calendar history domain + +- Phase: D6 domain cleanup. +- Type: API contract / migration / retrieval behavior. +- Symptom: `bot_calendar_event` had a production producer, but the separate `calendar_history` domain was rejected by the public bridge and only direct service tests could write it. +- Root cause: the calendar event type and its private Bot-memory ownership were conflated with a second, non-queryable domain. +- Fix or workaround: retain `bot_calendar_event` as a Bot-private event with reality level `calendar_event`; retire the direct calendar writer; remove the domain constant, migration target, historical injection marker, and archive flag. +- Prevention rule: a contract type may remain supported only through its real producer; do not preserve a second storage domain when the public write path rejects it. +- Validation evidence: targeted D5/D6 regressions and `pytest -q --ignore=tests/test_security_cache.py` passed 325 tests plus 8 subtests. +- Supersedes: the 2026-07-24 Q4.2 calendar-history write path. +## 2026-07-27 - Default user-fact session isolation + +- Phase: D5 privacy-boundary implementation. +- Type: API contract / retrieval behavior / test. +- Symptom: the archive API defaulted to strict session isolation, while `bridge_query_user_facts` explicitly replaced a missing flag with `False`; same-user facts could cross chat sessions. +- Root cause: two bridge entrypoints used contradictory defaults for the same `strict_session_only` policy. +- Fix or workaround: `bridge_query_user_facts` now defaults the omitted flag to `True`; callers can only relax it by explicitly supplying `false`. +- Prevention rule: every user-fact lookup must inherit the same default isolation policy as archive search; cross-session negative tests must exercise the public bridge path. +- Validation evidence: the D5 bridge-to-visibility negative test, focused migration/contract tests, and 325 pytest tests plus 8 subtests passed. \ No newline at end of file diff --git a/tests/test_audit_batch1_fixes.py b/tests/test_audit_batch1_fixes.py index ea071c1..30a6aff 100644 --- a/tests/test_audit_batch1_fixes.py +++ b/tests/test_audit_batch1_fixes.py @@ -179,7 +179,7 @@ class MemoryDomainConstantSourceTests(unittest.TestCase): ) record.ensure_defaults() # calendar_event 由更前置的日历分支接管(B10 另行确认意图)。 - expected = "calendar_history" if memory_type == "calendar_event" else "bot_self_legacy" + expected = "bot_self_legacy" self.assertEqual(expected, record.memory_domain) probe = MemoryRecord( diff --git a/tests/test_calendar_bridge.py b/tests/test_calendar_bridge.py index b632ee7..abbe867 100644 --- a/tests/test_calendar_bridge.py +++ b/tests/test_calendar_bridge.py @@ -1,146 +1,33 @@ -# -*- coding: utf-8 -*- -from __future__ import annotations - -import tempfile -import time +import asyncio import unittest -from pathlib import Path -from core.bridge import MemoryCompanionBridge, serialize_memory -from core.injection import InjectionComposer -from core.models import EntityRef, MemoryRecord, SearchResult, SessionContext +from core.bridge import MemoryCompanionBridge from core.service import MemoryCompanionService -ROOT = Path(__file__).resolve().parents[1] - -class _CalendarRecorder: - async def record_calendar_event(self, **kwargs): - self.payload = kwargs - return "calendar-memory-1" - - -class CalendarBridgeTests(unittest.IsolatedAsyncioTestCase): - def make_service(self): - temp_dir = tempfile.TemporaryDirectory() - self.addCleanup(temp_dir.cleanup) - service = MemoryCompanionService( - context=None, - config={"private_companion_bridge": {"accept_external_records": True}}, - plugin_root=ROOT, - data_dir=Path(temp_dir.name), - ) - self.addCleanup(service.close) - return service - - async def test_bridge_forwards_calendar_history_contract(self): - recorder = _CalendarRecorder() - bridge = MemoryCompanionBridge(recorder) - with self.assertRaisesRegex(RuntimeError, "calendar_history_rejected"): - await bridge.record_calendar_event( - event_id="event-1", title="阅读一小时", - start_at="2026-07-24T20:00:00+08:00", - end_at="2026-07-24T21:00:00+08:00", status="planned", - ) - self.assertFalse(bridge.probe_runtime_capabilities().get("accepts_calendar_history")) - self.assertEqual("history_only", bridge.probe_calendar_contract()["write_mode"]) - - async def test_missing_calendar_bridge_is_safe_to_probe_and_skip(self): +class CalendarBridgeRetirementTests(unittest.TestCase): + def test_calendar_contract_is_explicitly_unavailable(self): bridge = MemoryCompanionBridge(object()) - self.assertFalse(bridge.probe_calendar_contract()["available"]) - with self.assertRaisesRegex(RuntimeError, "calendar_history_rejected"): - await bridge.record_calendar_event( - event_id="event-1", title="测试", - start_at="2026-07-24T20:00:00+08:00", - end_at="2026-07-24T21:00:00+08:00", + payload = bridge.probe_calendar_contract() + self.assertFalse(payload["available"]) + self.assertEqual("rejected", payload["write_mode"]) + self.assertEqual("not_stored", payload["memory_role"]) + + def test_calendar_writer_fails_closed(self): + bridge = MemoryCompanionBridge(object()) + with self.assertRaisesRegex(RuntimeError, "calendar_event_rejected"): + asyncio.run( + bridge.record_calendar_event( + event_id="event-1", + title="calendar entry", + start_at="2026-07-24T20:00:00+08:00", + end_at="2026-07-24T21:00:00+08:00", + ) ) - async def test_calendar_event_time_fields_layers_and_deduplication(self): - service = self.make_service() - bridge = MemoryCompanionBridge(service) - memory_id = await service.record_calendar_event( - event_id="event-20260724-001", calendar="maintenance_agenda", - title="备份窗口", summary="执行一次备份", - start_at="2026-07-24T23:30:00+08:00", - end_at="2026-07-25T00:30:00+08:00", timezone="Asia/Shanghai", - status="planned", source="bot_generated", related_task_id="task-1", - occurred_at="2026-07-24T23:30:00+08:00", - ) - first = await service.store.get_memory(memory_id) - self.assertIsNotNone(first) - self.assertTrue(first.created_at) - self.assertTrue(first.updated_at) - self.assertEqual("2026-07-24T23:30:00+08:00", first.occurred_at) - self.assertEqual("calendar_history", first.metadata["memory_layer"]) - self.assertEqual("calendar_event", first.memory_type) - self.assertEqual("calendar_event", first.metadata["time_source"]) - self.assertNotIn("age_seconds", first.metadata) - - time.sleep(1.1) - updated_id = await service.record_calendar_event( - event_id="event-20260724-001", title="备份窗口", - start_at="2026-07-24T23:30:00+08:00", - end_at="2026-07-25T00:30:00+08:00", status="completed", - source="controller", change_reason="备份已完成", - occurred_at="2026-07-24T23:30:00+08:00", - ) - second = await service.store.get_memory(updated_id) - self.assertEqual(memory_id, updated_id) - self.assertEqual(first.created_at, second.created_at) - self.assertNotEqual(first.updated_at, second.updated_at) - self.assertEqual("completed", second.metadata["status"]) - self.assertEqual(1, service.store._conn.execute( - "SELECT COUNT(*) FROM memories WHERE metadata LIKE ?", ("%event-20260724-001%",) - ).fetchone()[0]) - - payload = serialize_memory(second) - self.assertEqual("calendar_event", payload["memory_type"]) - self.assertEqual("event-20260724-001", payload["calendar_event_id"]) - self.assertEqual("calendar_event", payload["time_source"]) - self.assertEqual("calendar_history", payload["memory_layer"]) - self.assertTrue(payload["historical_only"]) - self.assertEqual("completed", payload["calendar_status"]) - self.assertTrue(payload["temporal"]["age_seconds"] >= 0) - self.assertNotIn("age_seconds", second.metadata) - - async def test_invalid_calendar_event_does_not_enter_ops_or_chat_layers(self): - service = self.make_service() - with self.assertRaises(ValueError): - await service.record_calendar_event( - event_id="event-invalid", title="无效事件", - start_at="2026-07-24T20:00:00+08:00", - end_at="2026-07-24T19:00:00+08:00", - ) - memory_id = await service.record_calendar_event( - event_id="event-valid", title="历史事件", - start_at="2026-07-24T20:00:00+08:00", - end_at="2026-07-24T21:00:00+08:00", - ) - record = await service.store.get_memory(memory_id) - self.assertNotIn(record.memory_type, {"ops_event", "ops_fact", "conversation_event"}) - self.assertEqual("calendar_history", record.reality_level) - self.assertEqual("astrbot_plugin_private_companion", record.source_plugin) - - def test_injection_marks_calendar_memory_as_historical_background(self): - record = MemoryRecord( - id="calendar-1", memory_type="calendar_event", - content="日历历史?阅读一小时", - occurred_at="2026-07-23T20:00:00+08:00", - created_at="2026-07-23T20:00:03+08:00", - metadata={"memory_layer": "calendar_history", "status": "completed", - "time_source": "calendar_event", "timezone": "Asia/Shanghai"}, - subject=EntityRef.bot_self(), - object=EntityRef(kind="session", id="calendar_history"), - ) - text = InjectionComposer().compose( - SessionContext(session_id="calendar_history", scope="private", message_text="之前安排了什么?"), - [SearchResult(memory=record, score=0.9, reason="calendar")], - max_chars=3600, now="2026-07-24T08:00:00+08:00", - ) - self.assertIn("记忆层:日历历史(仅作历史背景)", text) - self.assertIn("日历状态:completed", text) - self.assertIn("时间来源:calendar_event", text) + def test_service_has_no_direct_calendar_writer(self): + self.assertFalse(hasattr(MemoryCompanionService, "record_calendar_event")) if __name__ == "__main__": - unittest.main() + unittest.main() \ No newline at end of file diff --git a/tests/test_d6_calendar_domain_retirement.py b/tests/test_d6_calendar_domain_retirement.py new file mode 100644 index 0000000..4f86a8c --- /dev/null +++ b/tests/test_d6_calendar_domain_retirement.py @@ -0,0 +1,21 @@ +import unittest + +from core.models import EntityRef, MemoryRecord +from core.user_memory_boundary import BOT_SELF_LEGACY_DOMAIN, infer_memory_domain + + +class CalendarDomainRetirementTests(unittest.TestCase): + def test_legacy_calendar_event_is_bot_private_not_a_separate_domain(self): + record = MemoryRecord( + memory_type="calendar_event", + memory_domain="", + visibility="bot_self", + subject=EntityRef.bot_self(), + reality_level="calendar_event", + ).ensure_defaults() + self.assertEqual(BOT_SELF_LEGACY_DOMAIN, record.memory_domain) + self.assertEqual(BOT_SELF_LEGACY_DOMAIN, infer_memory_domain(record)) + + +if __name__ == "__main__": + unittest.main() \ No newline at end of file diff --git a/tests/test_m6_r2_real_dto_shape.py b/tests/test_m6_r2_real_dto_shape.py index 5d6eb5c..6f598cc 100644 --- a/tests/test_m6_r2_real_dto_shape.py +++ b/tests/test_m6_r2_real_dto_shape.py @@ -40,7 +40,7 @@ LEGACY_KINDS = ( ("dream_fragment", "bot_subjective_memory", "subjective"), ("shared_activity", "bot_shared_activity", "shared_activity"), ("detail_enhancement", "bot_detail_fragment", "detail_fragment"), - ("calendar_event", "bot_calendar_event", "calendar_history"), + ("calendar_event", "bot_calendar_event", "calendar_event"), ("proactive_message", "bot_proactive_message", "proactive_action"), ) @@ -184,7 +184,7 @@ def test_calendar_event_truth_mapping_is_covered(): result = archive_like_companion(service, envelope) assert result["ok"] is True, result record = asyncio.run(service.store.get_memory(result["record_id"])) - assert record.reality_level == "calendar_history" + assert record.reality_level == "calendar_event" assert record.metadata["source_kind"] == "calendar" assert record.metadata["date"] == "2026-07-25" service.store.close() diff --git a/tests/test_q6_user_fact_bridge.py b/tests/test_q6_user_fact_bridge.py index 884eea5..7246b0d 100644 --- a/tests/test_q6_user_fact_bridge.py +++ b/tests/test_q6_user_fact_bridge.py @@ -64,4 +64,22 @@ def test_service_filters_non_user_domains_from_user_fact_query(): ) ) assert [item["id"] for item in result["memories"]] == ["user-1"] - assert "non_user_memory_filtered" in result["warnings"] \ No newline at end of file + assert "non_user_memory_filtered" in result["warnings"] + +def test_user_fact_query_defaults_to_session_isolation(): + service = object.__new__(MemoryCompanionService) + captured = {} + + async def fake_archive_search(*args, **kwargs): + captured["scope"] = kwargs["scope"] + return {"scope": kwargs["scope"], "memories": [], "excluded": [], "warnings": []} + + service.bridge_search_archive_memories = fake_archive_search + result = asyncio.run( + service.bridge_query_user_facts( + "preference", + scope={"scope": "private", "user_id": "u1", "session_id": "private:u1:a"}, + ) + ) + assert result["memories"] == [] + assert captured["scope"]["strict_session_only"] is True \ No newline at end of file diff --git a/tests/test_strict_session_visibility.py b/tests/test_strict_session_visibility.py index 09ab3c6..0af1772 100644 --- a/tests/test_strict_session_visibility.py +++ b/tests/test_strict_session_visibility.py @@ -1,5 +1,6 @@ from __future__ import annotations +import asyncio import unittest from core.models import EntityRef, MemoryRecord, SessionContext @@ -35,6 +36,42 @@ class StrictSessionVisibilityTests(unittest.TestCase): ) self.assertEqual(self.policy.is_visible(memory, self.context), (True, "same_private_session")) + def test_user_fact_default_blocks_another_session(self) -> None: + service = object.__new__(MemoryCompanionService) + captured = {} + + async def fake_archive_search(*args, **kwargs): + captured["scope"] = kwargs["scope"] + return {"scope": kwargs["scope"], "memories": [], "excluded": [], "warnings": []} + + service.bridge_search_archive_memories = fake_archive_search + asyncio.run( + service.bridge_query_user_facts( + "preference", + scope={ + "scope": "private", + "user_id": "user-1", + "session_id": self.context.session_id, + }, + ) + ) + self.assertTrue(captured["scope"]["strict_session_only"]) + other_session = MemoryRecord( + session_id="platform:FriendMessage:user-1:other", + scope="private", + visibility="private_pair", + subject=EntityRef(kind="user", id="user-1"), + ) + scoped_context = SessionContext( + session_id=self.context.session_id, + scope="private", + user_id="user-1", + strict_session_only=captured["scope"]["strict_session_only"], + ) + self.assertEqual( + self.policy.is_visible(other_session, scoped_context), + (False, "strict_session_mismatch"), + ) def test_bot_self_memory_rejects_another_bot_owner(self) -> None: context = SessionContext( session_id="platform:FriendMessage:user-1", diff --git a/tests/test_user_memory_contract.py b/tests/test_user_memory_contract.py index cb98f71..de51848 100644 --- a/tests/test_user_memory_contract.py +++ b/tests/test_user_memory_contract.py @@ -57,7 +57,7 @@ class UserMemoryContractTests(unittest.IsolatedAsyncioTestCase): await bridge.record_event(content="Bot 做了某事。") with self.assertRaisesRegex(RuntimeError, "bot_self_memory_rejected"): await bridge.record_bot_action(content="Bot 做了某事。") - with self.assertRaisesRegex(RuntimeError, "calendar_history_rejected"): + with self.assertRaisesRegex(RuntimeError, "calendar_event_rejected"): # Public calendar history writes fail closed under Q5. await MemoryCompanionBridge(object()).record_calendar_event( event_id="evt-1",