@topmindspace/topmind-handoff 0.5.2 → 0.6.3

package/topmind_handoff/package.py

@@ -1,17 +1,26 @@
-"""Render a handoff package and apply a legacy 1.1 import. Same compiler, no network."""
+"""Render one handoff package and replay its ledger. Same compiler, no network."""
 
 from __future__ import annotations
 
 import re
 from copy import deepcopy
 from dataclasses import dataclass, field
+from datetime import date
 from pathlib import Path
 
-from topmind_handoff.compile import compile_repo
-from topmind_handoff.model import ROOT, compiler_version, origin_markdown, parse_outbox, safe_origin, scenario_filename
+from topmind_handoff.compile import append_outbox, compile_repo, projection_body
+from topmind_handoff.model import (
+    REVIEW_MARK,
+    ROOT,
+    compiler_version,
+    origin_markdown,
+    parse_outbox,
+    safe_origin,
+)
 
 APPENDIX_MARK = "本附录是操作账本，不是新事实。按 op_id 去重重放；不要把这些条目再导入为新的事实或记忆。"
 ANCHOR_FIELDS = ("对本智能体的称呼", "称呼", "语言", "时区")
+PACKAGE_VERSION = "2"
 
 
 def receiver_guide() -> str:
@@ -37,20 +46,12 @@ def _front(text: str) -> dict[str, str]:
     return found
 
 
-def render_package(repo: Path, origin: str) -> str:
-    """Compile, then render an offline 1.1 package from the views and this origin's outbox."""
+def render_package(repo: Path, origin: str, today: date | None = None) -> str:
+    """Compile, then render the same origin projection startup prints, plus the ledger."""
     repo = Path(repo)
     origin = safe_origin(origin)
-    compile_repo(repo)
-    shared = (repo / "views" / "shared.md").read_text(encoding="utf-8")
-    card_path = origin_markdown(repo / "environments", origin)
-    card = card_path.read_text(encoding="utf-8") if card_path.is_file() else "（无）\n"
-    role = _front(card).get("role", "")
-    filename = scenario_filename(role) if role else None
-    scenario_path = repo / "views" / filename if filename else None
-    if scenario_path is not None and scenario_path.resolve().parent != (repo / "views").resolve():
-        scenario_path = None
-    scenario = scenario_path.read_text(encoding="utf-8") if scenario_path and scenario_path.is_file() else "（无）\n"
+    compile_repo(repo, today=today)
+    body = projection_body(repo, origin, today=today).rstrip("\n")
     outbox_path = origin_markdown(repo / "outbox", origin)
     ops_text = outbox_path.read_text(encoding="utf-8") if outbox_path.is_file() else ""
     op_blocks = [op.raw.rstrip("\n") for op in parse_outbox(ops_text, origin)]
@@ -58,7 +59,7 @@ def render_package(repo: Path, origin: str) -> str:
     version = compiler_version()
     lines = [
         "---",
-        'handoff_version: "1.1"',
+        f'handoff_version: "{PACKAGE_VERSION}"',
         "language: zh-CN",
         "scope: private",
         f"origin_id: {origin}",
@@ -69,15 +70,7 @@ def render_package(repo: Path, origin: str) -> str:
         "",
         "# 交接包",
         "",
-        "## 视图",
-        "",
-        shared.rstrip("\n"),
-        "",
-        scenario.rstrip("\n"),
-        "",
-        "## 环境卡片",
-        "",
-        card.rstrip("\n"),
+        body,
         "",
         "## 10. 操作附录（已反映在上文视图中）",
         "",
@@ -92,39 +85,16 @@ def render_package(repo: Path, origin: str) -> str:
     return "\n".join(lines)
 
 
-def render_legacy_package(claims: list[dict[str, str]], *, mode: str = "migration") -> str:
-    """A 1.1 package with no operation appendix. `mode` is recorded and does not change import."""
-    grouped: dict[str, list[str]] = {}
-    for claim in claims:
-        section = claim.get("section") or "5. 事实与记忆（Facts & memories）"
-        text = claim["text"]
-        claim_id = claim.get("id")
-        line = f"- {text}" + (f" {{id:{claim_id}}}" if claim_id else "")
-        grouped.setdefault(section, []).append(line)
-    version = compiler_version()
-    lines = [
-        "---",
-        'handoff_version: "1.1"',
-        "language: zh-CN",
-        "scope: private",
-        f"mode: {mode}",
-        f'generator: "topmind-handoff {version}"',
-        "---",
-        "",
-        receiver_guide(),
-        "",
-        "# 交接包",
-        "",
-    ]
-    for section, items in grouped.items():
-        lines.append(f"## {section}")
-        lines.extend(items)
-        lines.append("")
-    return "\n".join(lines)
+def _ops_fence(package: str) -> re.Match[str] | None:
+    return re.search(r"```ops\n(.*?)```", package, re.S)
+
+
+def _has_ops_appendix(package: str) -> bool:
+    return _ops_fence(package) is not None
 
 
 def _appendix_ops(package: str, origin: str):
-    match = re.search(r"```ops\n(.*?)```", package, re.S)
+    match = _ops_fence(package)
     if not match:
         return []
     return parse_outbox(match.group(1), origin)
@@ -149,10 +119,11 @@ def replay_package(repo: Path, package: str, *, confirmed: bool = False) -> list
     repo = Path(repo)
     front = _front(package)
     version = front.get("handoff_version", "")
-    if version.startswith("2"):
-        raise ValueError(f"不支持的交接包大版本 {version}")
+    if version != PACKAGE_VERSION:
+        raise ValueError(f"不支持的交接包版本 {version or '（空）'}")
+    if not _has_ops_appendix(package):
+        raise ValueError("交接包没有操作附录")
     origin = safe_origin(front.get("origin_id") or "unknown")
-    dest = origin_markdown(repo / "outbox", origin)
     incoming = _appendix_ops(package, origin)
     known = _known_ids(repo)
     added: list[str] = []
@@ -165,11 +136,7 @@ def replay_package(repo: Path, package: str, *, confirmed: bool = False) -> list
         blocks.append(op.raw.rstrip("\n"))
     if not blocks or not confirmed:
         return added
-    dest.parent.mkdir(parents=True, exist_ok=True)
-    existing = dest.read_text(encoding="utf-8") if dest.is_file() else f"# outbox {origin}\n"
-    if not existing.endswith("\n"):
-        existing += "\n"
-    dest.write_text(existing + "\n".join(blocks) + "\n", encoding="utf-8")
+    append_outbox(repo, origin, origin, blocks)
     compile_repo(repo)
     return added
 
@@ -183,17 +150,23 @@ class LegacyPlan:
     unkeyed: list[str] = field(default_factory=list)
     suggested_deletions: list[str] = field(default_factory=list)
     omitted_local_ids: list[str] = field(default_factory=list)
-    mode: str = "migration"
 
 
 _SECTION_6 = re.compile(r"^##\s*6(?:\.|\s|$)")
 
 
+def _skip_heading(stripped: str) -> bool:
+    """Boundaries are behavior, not facts. The rendered slice heading is ## 边界."""
+    if _SECTION_6.match(stripped):
+        return True
+    return stripped.lstrip("#").strip() == "边界"
+
+
 def _claim_items(package: str) -> list[tuple[str | None, str]]:
-    """List items outside legacy section 6 and outside fenced blocks.
+    """List items outside boundary sections and outside fenced blocks.
 
-    Section 6 is a behavior constraint, not memory. Fenced blocks hold the
-    operations appendix, which is a ledger and not a new claim.
+    Section 6 and the rendered ## 边界 slice are behavior, not memory.
+    Fenced blocks hold the operations appendix, which is a ledger and not a new claim.
     """
     items: list[tuple[str | None, str]] = []
     skip = False
@@ -206,11 +179,11 @@ def _claim_items(package: str) -> list[tuple[str | None, str]]:
         if fenced:
             continue
         if stripped.startswith("##"):
-            skip = _SECTION_6.match(stripped) is not None
+            skip = _skip_heading(stripped)
             continue
         if skip or not stripped.startswith("- "):
             continue
-        body = stripped[2:].strip()
+        body = _without_review_mark(stripped[2:].strip())
         match = re.search(r"\{id:([^}]+)\}\s*$", body)
         claim_id = match.group(1) if match else None
         if match:
@@ -219,6 +192,13 @@ def _claim_items(package: str) -> list[tuple[str | None, str]]:
     return items
 
 
+def _without_review_mark(body: str) -> str:
+    """A due line ends with the review label after `{id:…}`. The label is not claim text."""
+    if body.endswith(REVIEW_MARK):
+        return body[: -len(REVIEW_MARK)].rstrip()
+    return body
+
+
 def _anchor_of(text: str) -> tuple[str, str] | None:
     """An anchor line starts with the field name. A later mention is not an anchor."""
     stripped = text.strip()
@@ -236,15 +216,17 @@ def _is_tombstone(text: str) -> bool:
 
 
 def legacy_import_plan(package: str, local: dict) -> LegacyPlan:
-    """One import plan for every 1.1 package. `mode` does not select an algorithm."""
+    """Diff view lines into host memory. Existing text and anchors are not replaced."""
     front = _front(package)
-    version = front.get("handoff_version", "1.1")
-    if version.startswith("2"):
-        raise ValueError(f"不支持的交接包大版本 {version}")
-    mode = front.get("mode") or "migration"
+    version = front.get("handoff_version", "")
+    if package.startswith("---"):
+        if version != PACKAGE_VERSION:
+            raise ValueError(f"不支持的交接包版本 {version or '（空）'}")
+        if not _has_ops_appendix(package):
+            raise ValueError("交接包没有操作附录")
     local_anchors = dict(local.get("anchors") or {})
     local_claims = dict(local.get("claims") or {})
-    plan = LegacyPlan(mode=mode)
+    plan = LegacyPlan()
     seen: set[str] = set()
     local_texts = {value for value in local_claims.values() if value}
     for claim_id, text in _claim_items(package):