memleaf 0.2.4__tar.gz → 0.2.6__tar.gz

{memleaf-0.2.4 → memleaf-0.2.6}/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All notable changes to memleaf are documented here.
 
+## 0.2.6 — 2026-09-01
+
+- Reject one worthy memory that spans multiple independent project scopes and
+  retry with an explicit instruction to split actionable project topics while
+  discarding temporary mailbox-sweep status items.
+- Tighten automatic admission so aggregate mailbox/daily-report snapshots,
+  one-off meetings without durable outcomes, pending PM acceptance, and
+  awaiting-feedback states do not become a cross-project permanent memory;
+  keep independent risks and actionable todos eligible.
+- Prefer `UPDATE` or `NO_CHANGE` for an existing future-use topic, preserve
+  unimplemented customer requests as proposed or pending, and recognize the
+  Chinese relative-date forms `今日`, `明日`, and `昨日` in strict retries.
+
+## 0.2.5 — 2026-09-01
+
+- Detect multiple gate candidates that target the same active memory before
+  batch writing, then retry with an explicit instruction to merge the
+  candidates while preserving all supporting evidence.
+- Keep gate-selected update targets and active-memory types stable through
+  summarization, with bounded corrective retries for target or type drift.
+- Preserve `duplicate_update_target` and aggregate preflight diagnostics across
+  Core, MCP, and Hermes while retaining the inbox and zero-write transaction
+  boundary after repeated failure.
+
 ## 0.2.4 — 2026-09-01
 
 - Give `relative_time` retries explicit, actionable correction instructions so

{memleaf-0.2.4/src/memleaf.egg-info → memleaf-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: memleaf
-Version: 0.2.4
+Version: 0.2.6
 Summary: A local-first Markdown memory core for AI agents
 Author: memleaf contributors
 License-Expression: MIT
@@ -23,8 +23,8 @@ Dynamic: license-file
 
 [English](README.en.md) · [PyPI](https://pypi.org/project/memleaf/) · [GitHub](https://github.com/miffyblueboo/memleaf)
 
-> **当前版本：0.2.4。**
-> 核心库、Vault、stdio MCP Server、初始化 CLI、模型路由、提炼流程、受控检索协议和宿主适配器已经实现。memleaf 0.2.4 通过 PyPI 分发。
+> **当前版本：0.2.6。**
+> 核心库、Vault、stdio MCP Server、初始化 CLI、模型路由、提炼流程、受控检索协议和宿主适配器已经实现。memleaf 0.2.6 通过 PyPI 分发。
 > **当前版本支持 Hermes 和 Codex。** Antigravity（反重力）不检测、不安装、不配置。
 
 ## 项目定位

{memleaf-0.2.4 → memleaf-0.2.6}/README.md

@@ -4,8 +4,8 @@
 
 [English](README.en.md) · [PyPI](https://pypi.org/project/memleaf/) · [GitHub](https://github.com/miffyblueboo/memleaf)
 
-> **当前版本：0.2.4。**
-> 核心库、Vault、stdio MCP Server、初始化 CLI、模型路由、提炼流程、受控检索协议和宿主适配器已经实现。memleaf 0.2.4 通过 PyPI 分发。
+> **当前版本：0.2.6。**
+> 核心库、Vault、stdio MCP Server、初始化 CLI、模型路由、提炼流程、受控检索协议和宿主适配器已经实现。memleaf 0.2.6 通过 PyPI 分发。
 > **当前版本支持 Hermes 和 Codex。** Antigravity（反重力）不检测、不安装、不配置。
 
 ## 项目定位

{memleaf-0.2.4 → memleaf-0.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "memleaf"
-version = "0.2.4"
+version = "0.2.6"
 description = "A local-first Markdown memory core for AI agents"
 readme = "README.md"
 requires-python = ">=3.11"

{memleaf-0.2.4 → memleaf-0.2.6}/src/memleaf/__init__.py

@@ -1,6 +1,6 @@
 """Local-first Markdown memory core for AI agents."""
 
-__version__ = "0.2.4"
+__version__ = "0.2.6"
 
 from .config import DEFAULT_CONFIG, default_config, load_config, save_config
 from .frontmatter import FrontmatterError, dump_frontmatter, dump_yaml, load_yaml, parse_frontmatter

{memleaf-0.2.4 → memleaf-0.2.6}/src/memleaf/hermes_provider/__init__.py

@@ -75,6 +75,8 @@ _MODEL_VALIDATION_DETAILS = frozenset(
         "unknown_fields",
         "candidate_shape",
         "duplicate_candidate_id",
+        "duplicate_update_target",
+        "mixed_project_scopes",
         "invalid_evidence",
         "invalid_flags",
         "invalid_type",

{memleaf-0.2.4 → memleaf-0.2.6}/src/memleaf/hermes_provider/plugin.yaml

@@ -1,5 +1,5 @@
 name: memleaf
-version: 0.2.4
+version: 0.2.6
 description: "Hermes-native external MemoryProvider for local-first Markdown memory shared with the memleaf MCP server."
 hooks:
   - prefetch

{memleaf-0.2.4 → memleaf-0.2.6}/src/memleaf/memory_writer.py

@@ -133,6 +133,25 @@ class MemoryWriter:
         }
         return request_keys.issubset(applied_keys)
 
+    @staticmethod
+    def _preflight_error(
+        message: str,
+        *,
+        validation_detail: str = "other_schema_violation",
+    ) -> ModelOutputError:
+        """Return a safe, stage-labelled batch-consistency failure."""
+
+        error = ModelOutputError(
+            message,
+            validation_reason="schema_violation",
+            validation_detail=validation_detail,
+        )
+        # The model outputs that form this batch have already passed their
+        # individual summaries. Keep the public stage vocabulary bounded
+        # while making a defensive aggregate failure diagnosable.
+        error.stage = "summarize"
+        return error
+
     def _preflight(self, requests: list[Mapping[str, Any]]) -> None:
         active = self._active_records()
         target_ids: set[str] = set()
@@ -144,11 +163,14 @@ class MemoryWriter:
             duplicate_id = request.get("duplicate_memory_id")
             if duplicate_id is not None:
                 if not isinstance(duplicate_id, str) or duplicate_id not in active:
-                    raise ModelOutputError("duplicate target is not an active memory")
+                    raise self._preflight_error("duplicate target is not an active memory")
                 if duplicate_id in duplicate_ids:
-                    raise ModelOutputError("batch contains duplicate metadata merge target")
+                    raise self._preflight_error(
+                        "batch contains duplicate metadata merge target",
+                        validation_detail="duplicate_update_target",
+                    )
                 if summary.get("update_memory_id") is not None:
-                    raise ModelOutputError("duplicate target conflicts with update target")
+                    raise self._preflight_error("duplicate target conflicts with update target")
                 duplicate_ids.add(duplicate_id)
                 continue
             target_id = summary.get("update_memory_id")
@@ -161,12 +183,15 @@ class MemoryWriter:
                 )
                 seen_turns = target_turns.setdefault(target_id, set())
                 if turn_identity in seen_turns:
-                    raise ModelOutputError("batch contains duplicate update target")
+                    raise self._preflight_error(
+                        "batch contains duplicate update target",
+                        validation_detail="duplicate_update_target",
+                    )
                 seen_turns.add(turn_identity)
                 target_ids.add(target_id)
                 target = active.get(target_id)
                 if target is None:
-                    raise ModelOutputError("update target is not an active memory")
+                    raise self._preflight_error("update target is not an active memory")
                 target_memory = getattr(target, "memory", target)
                 target_type = (
                     target_memory.type
@@ -176,19 +201,22 @@ class MemoryWriter:
                     else None
                 )
                 if target_type != summary.get("type"):
-                    raise ModelOutputError("update target type does not match summary")
+                    raise self._preflight_error(
+                        "update target type does not match summary",
+                        validation_detail="invalid_type",
+                    )
             deterministic_id = request["memory_id"]
             if deterministic_id in memory_ids:
-                raise ModelOutputError("batch contains duplicate deterministic memory id")
+                raise self._preflight_error("batch contains duplicate deterministic memory id")
             if deterministic_id in duplicate_ids:
-                raise ModelOutputError("batch memory id collides with metadata merge target")
+                raise self._preflight_error("batch memory id collides with metadata merge target")
             if deterministic_id in target_ids:
-                raise ModelOutputError("batch memory id collides with update target")
+                raise self._preflight_error("batch memory id collides with update target")
             if target_id is not None and target_id.casefold() == deterministic_id.casefold():
-                raise ModelOutputError("batch memory id collides with update target")
+                raise self._preflight_error("batch memory id collides with update target")
             memory_ids.add(deterministic_id)
             if "/" in deterministic_id or "\\" in deterministic_id or deterministic_id in (".", ".."):
-                raise ModelOutputError("invalid deterministic memory id")
+                raise self._preflight_error("invalid deterministic memory id")
             # Make the request visible to the rest of this same commit batch.
             # This is needed when a later pending turn updates a memory that
             # an earlier pending turn has just created; the real filesystem
@@ -198,9 +226,9 @@ class MemoryWriter:
             else:
                 active[deterministic_id] = summary
         if target_ids.intersection(duplicate_ids):
-            raise ModelOutputError("batch update target collides with metadata merge target")
+            raise self._preflight_error("batch update target collides with metadata merge target")
         if memory_ids.intersection(duplicate_ids):
-            raise ModelOutputError("batch memory id collides with metadata merge target")
+            raise self._preflight_error("batch memory id collides with metadata merge target")
 
     def _core_sources(self, request: Mapping[str, Any]) -> list[dict[str, Any]]:
         turn = request["turn"]

{memleaf-0.2.4 → memleaf-0.2.6}/src/memleaf/processing.py

@@ -31,9 +31,13 @@ from .memory_writer import MemoryWriter
 from .models import Memory, utc_now
 from .native_index import NativeIndexer
 from .prompts import (
+    DUPLICATE_TARGET_CORRECTION,
     JSON_CORRECTION,
+    MIXED_PROJECT_SCOPES_CORRECTION,
     RELATIVE_TIME_CORRECTION,
     GATE_SYSTEM,
+    SUMMARY_TARGET_CORRECTION,
+    SUMMARY_TYPE_CORRECTION,
     SUMMARIZE_SYSTEM,
     gate_prompt,
     summarize_prompt,
@@ -473,8 +477,17 @@ class Processor:
     @staticmethod
     def _correction_instruction(error: BaseException) -> Optional[str]:
         hint = Processor._safe_correction_hint(error)
+        stage = getattr(error, "stage", None)
+        if hint == "duplicate_update_target":
+            return DUPLICATE_TARGET_CORRECTION
+        if hint == "mixed_project_scopes":
+            return MIXED_PROJECT_SCOPES_CORRECTION
         if hint == "relative_time":
             return RELATIVE_TIME_CORRECTION
+        if stage == "summarize" and hint == "invalid_update_target":
+            return SUMMARY_TARGET_CORRECTION
+        if stage == "summarize" and hint == "invalid_type":
+            return SUMMARY_TYPE_CORRECTION
         if hint is not None:
             return f"Previous output violated: {hint}."
         return None
@@ -1548,6 +1561,13 @@ class Processor:
             if item.get("native") is not True and isinstance(item.get("memory_id"), str)
         ]
         gate_related_memory_ids = list(related_memory_ids)
+        gate_related_memory_types = {
+            item["memory_id"].casefold(): item["type"]
+            for item in gate_related
+            if isinstance(item, Mapping)
+            and isinstance(item.get("memory_id"), str)
+            and isinstance(item.get("type"), str)
+        }
         if scope_fallback is not None:
             scoped_records, scope_ambiguous = scope_fallback
             if scope_ambiguous and self._single_specific_scope(scope_background):
@@ -1559,6 +1579,11 @@ class Processor:
                         value.casefold() for value in gate_related_memory_ids
                     }:
                         gate_related_memory_ids.append(memory_id)
+                    if (
+                        isinstance(memory_id, str)
+                        and isinstance(entry.get("type"), str)
+                    ):
+                        gate_related_memory_types[memory_id.casefold()] = entry["type"]
         scope_registry = self._scope_registry_projection()
         with self.service.vault.lock():
             validation_scope_registry = self.service.vault.config().get("scopes", {})
@@ -1620,6 +1645,7 @@ class Processor:
                 raw,
                 current_event_keys=turn.event_keys,
                 related_memory_ids=gate_related_memory_ids,
+                related_memory_types=gate_related_memory_types,
             ),
             diagnostic_context={
                 "source": turn.source,
@@ -1728,6 +1754,22 @@ class Processor:
                     )
                 continue
 
+            gate_update_target = candidate.get("update_memory_id")
+            gate_target_type = None
+            if isinstance(gate_update_target, str):
+                gate_target_key = gate_update_target.casefold()
+                gate_target_type = next(
+                    (
+                        item.get("type")
+                        for item in candidate_related
+                        if isinstance(item, Mapping)
+                        and isinstance(item.get("memory_id"), str)
+                        and item["memory_id"].casefold() == gate_target_key
+                        and isinstance(item.get("type"), str)
+                    ),
+                    None,
+                )
+
             summary = self._complete_json_stage(
                 backend,
                 summarize_prompt(
@@ -1745,6 +1787,20 @@ class Processor:
                     related_native_ids=candidate_native_ids,
                     related_memory_ids=candidate_memory_ids,
                     scope_registry=validation_scope_registry,
+                    expected_type=(
+                        candidate.get("type")
+                        if (
+                            gate_update_target is not None
+                            and gate_target_type == candidate.get("type")
+                        )
+                        else None
+                    ),
+                    expected_update_memory_id=gate_update_target,
+                    expected_target_type=(
+                        gate_target_type
+                        if gate_target_type == candidate.get("type")
+                        else None
+                    ),
                 ),
                 diagnostic_context={
                     "source": turn.source,
@@ -1752,7 +1808,6 @@ class Processor:
                     "turn_index": turn.turn_index,
                 },
             )
-            gate_update_target = candidate.get("update_memory_id")
             if gate_update_target is not None:
                 summary_update_target = summary.get("update_memory_id")
                 if summary_update_target is None:
@@ -1766,6 +1821,9 @@ class Processor:
                         "summary update target differs from gate target",
                         validation_detail="invalid_update_target",
                     )
+                else:
+                    summary = dict(summary)
+                    summary["update_memory_id"] = gate_update_target
             if summary["scopes"] == ["unscoped"] or summary.get("scope_source") == "insufficient_context":
                 self._defer_candidate(
                     turn_ref,

{memleaf-0.2.4 → memleaf-0.2.6}/src/memleaf/prompts.py

@@ -34,6 +34,11 @@ useful. Related active memories only identify a complete duplicate or valid
 state-update target; they are not current evidence and cannot make a non-worthy
 operational/test result worthy. Their item, body, and serialized-character
 context is bounded; ellipses and omissions do not prove a fact is absent.
+Within one gate response, each active memory target may appear at most once
+across all candidates, whether it is named by duplicate_memory_id or
+update_memory_id. If multiple facts share one future-use/update target, merge
+them into one candidate and include all supporting evidence IDs; never emit
+separate candidates for the same target.
 Resolve an indirect reference only to one supplied active memory; otherwise
 return no candidate or leave it unscoped for retry. Never copy a related
 diagnostic/tool failure without a separate user-confirmed business fact, project
@@ -42,7 +47,7 @@ Calendar dates are strict. Each event may include an ISO-8601 UTC timestamp.
 For a one-off relative date in a candidate or its later summary, use the
 timestamp of the evidence event that supports it as the calendar anchor and
 emit an absolute YYYY-MM-DD date. Resolve today/tomorrow/yesterday,
-今天/明天/昨天, 本周X/这周X/下周X/上周X, and this/next/last weekday;
+今天/明天/昨天/今日/明日/昨日, 本周X/这周X/下周X/上周X, and this/next/last weekday;
 use Monday-Sunday calendar weeks for week expressions. Do not leave these
 strong relative forms in a worthy memory, and never guess without a timestamp:
 defer or omit a date-dependent candidate if its supporting event has no
@@ -87,6 +92,13 @@ be independently retrieved and updated. Prefer one coherent current-state memory
 over adjacent overlapping snapshots; do not use a score or fixed category rule.
 Most ordinary turns should produce zero or one candidate; multiple require
 genuinely independent future questions or actions.
+Never persist an aggregate mailbox sweep, daily report, or "items to watch"
+digest as one cross-project memory. Inspect each item and split genuinely
+independent project risks or actionable todo items; if an item has no
+independent future use, set worth=false. A one-off meeting with no durable
+decision or commitment, a request awaiting PM acceptance, and pending feedback
+or another intermediate status normally have worth=false. Keep an independent
+project risk or concrete future action even when it came from a digest.
 An intermediate state such as a draft awaiting confirmation, preparation/
 processing status, temporary error, repeated confirmation, or unconfirmed
 suggestion normally has no independent future use and is worth=false. Keep one
@@ -108,6 +120,11 @@ operational incident spans stats/search/remember calls; this default remains.
 Retain only a separate, user-confirmed future-use fact, preference, identity, constraint, commitment,
 project risk, or durable lesson that prevents repeating the investigation, not
 the execution transcript.
+If a related active memory already covers the same future question/action and
+the current turn adds no confirmed change, use worth=false and do not create a
+sibling. If a customer or user proposes a new change without confirmation of
+implementation, preserve it as requested/proposed/pending and never state that
+it is already implemented.
 Return no prose, markdown fences, comments, or trailing text."""
 
 
@@ -130,14 +147,22 @@ evidence; they cannot make a rejected operational or test result worthy. Their
 item/body/serialized context is bounded; ellipses and omissions do not prove
 absence. Resolve indirect references only from supplied scope and one related
 active memory; otherwise return no candidate or leave it unscoped for retry.
+When the gate candidate supplies update_memory_id, that target is immutable:
+omit update_memory_id or copy that exact active ID, never replace it with a
+different, guessed, native, or historical ID. Keep the summary type identical
+to the gate candidate type and to the active update target type.
 For the same use, preserve still-valid facts, add confirmed progress, replace
 contradictions, and never reduce the memory to the latest operation or create a
 sibling with a new label.
+Never turn an email sweep, daily report, or watchlist into one cross-project
+summary. Keep only one future-use topic in the summary; split unrelated
+projects at the gate, and omit temporary meeting/awaiting-acceptance/pending-
+feedback states unless they have an independent future action.
 Calendar dates are strict. Each event may include an ISO-8601 UTC timestamp.
 For a one-off relative date in the summary title or body, use the timestamp of
 the supporting evidence event as the calendar anchor and emit an absolute
 YYYY-MM-DD date. Resolve today/tomorrow/yesterday,
-今天/明天/昨天, 本周X/这周X/下周X/上周X, and this/next/last weekday;
+今天/明天/昨天/今日/明日/昨日, 本周X/这周X/下周X/上周X, and this/next/last weekday;
 use Monday-Sunday calendar weeks for week expressions. Never leave these
 strong relative forms in the summary, and never guess without a timestamp.
 Recurring schedules such as 每天、每周三, or every Wednesday are not one-off
@@ -146,7 +171,12 @@ In automatic capture/process mode, a pure read-only query whose answer only
 restates a related active memory is not a new candidate. It must have been
 rejected by the gate; do not use duplicate_memory_id or update_memory_id to
 append the query as a source. Only a newly confirmed fact or state change in
-the current evidence may update an existing memory.
+the current evidence may update an existing memory. If a related active memory
+already covers the same future question/action and the current evidence adds no
+confirmed change, retain the existing memory unchanged (the gate should emit
+worth=false) rather than creating a sibling. When the current evidence is a
+customer/user request that is not confirmed implemented, state it as
+requested/proposed/pending and never as completed or deployed.
 fields and JSON types are title (string), body (string), tags (string list),
 type (one of preference, fact, project, todo, event, identity, other), scopes
 (non-empty string list), and sources (non-empty object list). scope_source, if
@@ -201,7 +231,7 @@ RELATIVE_TIME_CORRECTION = (
     "each one-off relative date from that timestamp and the stated weekday "
     "semantics. In the summary title and body, every one-off calendar date must "
     "be written only as YYYY-MM-DD: remove forms such as today/tomorrow/yesterday, "
-    "今天/明天/昨天, 本周三/这周三/下周三/上周三, and this/next/last Wednesday. "
+    "今天/明天/昨天/今日/明日/昨日, 本周三/这周三/下周三/上周三, and this/next/last Wednesday. "
     "If a relative weekday is followed by a parenthesized numeric date and they "
     "conflict, trust the event timestamp plus the weekday meaning, replace the "
     "numeric date with the computed YYYY-MM-DD, and remove the relative wording "
@@ -211,6 +241,45 @@ RELATIVE_TIME_CORRECTION = (
 )
 
 
+MIXED_PROJECT_SCOPES_CORRECTION = (
+    "Previous output violated: mixed_project_scopes. Keep each worthy "
+    "candidate and summary atomic: it may contain at most one distinct "
+    "project:<name> scope. At the gate, split genuinely independent projects "
+    "into separate candidates, preserving their own evidence, or mark purely "
+    "temporary meeting/awaiting-acceptance/pending-feedback items worth=false. "
+    "In a summary, keep only one future-use project topic and its matching "
+    "details. global plus one project and valid domain/portfolio parent scopes "
+    "are allowed; do not remove those parent scopes merely to pass validation. "
+    "Return only the strict JSON object."
+)
+
+
+DUPLICATE_TARGET_CORRECTION = (
+    "Previous output violated: duplicate_update_target. Merge every candidate "
+    "that refers to the same active memory target into one candidate for one "
+    "future-use topic. A target may appear only once across duplicate_memory_id "
+    "and update_memory_id; preserve all supporting current evidence_event_ids "
+    "in that single candidate. Keep update_memory_id only when it is the exact "
+    "related active ID, and return no separate sibling candidate for that target. "
+    "Return only the strict gate JSON object."
+)
+
+
+SUMMARY_TARGET_CORRECTION = (
+    "Previous output violated: invalid_update_target. The gate selected the "
+    "update target and it is immutable. In the summary, omit update_memory_id "
+    "or copy the gate-selected active memory_id exactly; never substitute a "
+    "different, guessed, native, or historical ID. Return only the strict JSON object."
+)
+
+
+SUMMARY_TYPE_CORRECTION = (
+    "Previous output violated: invalid_type. Keep the summary type exactly equal "
+    "to the gate candidate type and to the active update target type. Do not "
+    "change the target or invent a new type. Return only the strict JSON object."
+)
+
+
 COMPACT_SYSTEM = """You are memleaf's memory compactor. Return JSON only.
 Merge only the supplied low-priority memories when they express compatible
 information. Return an object with a memories array; [] is a safe no-op.

{memleaf-0.2.4 → memleaf-0.2.6}/src/memleaf/validation.py

@@ -51,6 +51,8 @@ MODEL_VALIDATION_DETAILS = frozenset(
         "unknown_fields",
         "candidate_shape",
         "duplicate_candidate_id",
+        "duplicate_update_target",
+        "mixed_project_scopes",
         "invalid_evidence",
         "invalid_flags",
         "invalid_type",
@@ -71,7 +73,7 @@ _RELATIVE_CALENDAR_EXPRESSION = re.compile(
     r"(?<![A-Za-z])(?:today|tomorrow|yesterday)(?![A-Za-z])"
     r"|(?<![A-Za-z])(?:this|next|last)\s+(?:monday|tuesday|wednesday|thursday|friday|saturday|sunday)(?![A-Za-z])"
     r"|(?:本|这|下|上)(?:个)?(?:周|星期|礼拜)\s*(?:一|二|三|四|五|六|日|天|末|[1-7])"
-    r"|(?:今天|明天|昨天)"
+    r"|(?:今天|明天|昨天|今日|明日|昨日)"
     r")",
     re.IGNORECASE,
 )
@@ -227,6 +229,25 @@ def _scopes(value: Any, scope_source: Any) -> list[str]:
     return result
 
 
+def _reject_mixed_project_scopes(scopes: Iterable[str]) -> None:
+    """Keep one worthy memory atomic across independent project scopes.
+
+    Parent scopes (global/domain/portfolio) may accompany one project scope;
+    only two or more distinct project scopes represent an ambiguous aggregate.
+    """
+
+    project_scopes = {
+        scope.casefold()
+        for scope in scopes
+        if isinstance(scope, str) and scope.partition(":")[0] == "project"
+    }
+    if len(project_scopes) > 1:
+        raise ModelOutputError(
+            "one memory cannot cover multiple project scopes",
+            validation_detail="mixed_project_scopes",
+        )
+
+
 def _memory_id(value: Any, field: str) -> str:
     result = _string(value, field)
     if "/" in result or "\\" in result or result in (".", ".."):
@@ -397,6 +418,7 @@ def validate_gate_output(
     *,
     current_event_keys: Iterable[Any] | None = None,
     related_memory_ids: Iterable[Any] | None = None,
+    related_memory_types: Mapping[str, Any] | None = None,
 ) -> dict[str, Any]:
     """Validate and return a normalized gate object without writing anything."""
 
@@ -426,6 +448,7 @@ def validate_gate_output(
     }
     normalized: list[dict[str, Any]] = []
     candidate_ids: set[str] = set()
+    target_ids: set[str] = set()
     for candidate in candidates:
         if not isinstance(candidate, Mapping):
             raise ModelOutputError("each gate candidate must be an object", validation_detail="candidate_shape")
@@ -504,10 +527,37 @@ def validate_gate_output(
                     "update_memory_id is not a related active memory",
                     validation_detail="invalid_update_target",
                 )
+            target_type = None
+            if isinstance(related_memory_types, Mapping):
+                target_type = next(
+                    (
+                        value
+                        for key, value in related_memory_types.items()
+                        if isinstance(key, str) and key.casefold() == update_id.casefold()
+                    ),
+                    None,
+                )
+            if target_type is not None and candidate_type != target_type:
+                raise ModelOutputError(
+                    "candidate type does not match update target",
+                    validation_detail="invalid_type",
+                )
             item["update_memory_id"] = update_id
+        for target_field in ("duplicate_memory_id", "update_memory_id"):
+            target = item.get(target_field)
+            if isinstance(target, str):
+                target_key = target.casefold()
+                if target_key in target_ids:
+                    raise ModelOutputError(
+                        "multiple gate candidates reference the same memory target; merge them into one candidate",
+                        validation_detail="duplicate_update_target",
+                    )
+                target_ids.add(target_key)
         if not isinstance(item["scope_source"], str) or item["scope_source"] not in SCOPE_SOURCES:
             raise ModelOutputError("invalid scope_source", validation_detail="invalid_scope_source")
-        _scopes(item["scopes"], item["scope_source"])
+        item["scopes"] = _scopes(item["scopes"], item["scope_source"])
+        if item["worth"]:
+            _reject_mixed_project_scopes(item["scopes"])
         if "reason" in item:
             _string(item["reason"], "reason", nonempty=False)
             if len(item["reason"]) > 30:
@@ -523,6 +573,7 @@ def parse_gate_output(
     *,
     current_event_keys: Iterable[Any] | None = None,
     related_memory_ids: Iterable[Any] | None = None,
+    related_memory_types: Mapping[str, Any] | None = None,
 ) -> dict[str, Any]:
     try:
         parsed = parse_strict_json(raw)
@@ -536,6 +587,7 @@ def parse_gate_output(
             event_keys,
             current_event_keys=current_event_keys,
             related_memory_ids=related_memory_ids,
+            related_memory_types=related_memory_types,
         )
     except ModelOutputError as error:
         if error.validation_reason is None:
@@ -581,6 +633,9 @@ def validate_summarize_output(
     related_native_ids: Iterable[Any] | None = None,
     related_memory_ids: Iterable[Any] | None = None,
     scope_registry: Mapping[str, Any] | None = None,
+    expected_type: str | None = None,
+    expected_update_memory_id: str | None = None,
+    expected_target_type: str | None = None,
 ) -> dict[str, Any]:
     """Validate one atomic memory summary; this function has no filesystem effects."""
 
@@ -615,7 +670,18 @@ def validate_summarize_output(
     candidate_type = item["type"]
     if not isinstance(candidate_type, str) or candidate_type not in MEMORY_TYPES:
         raise ModelOutputError("invalid memory type", validation_detail="invalid_type")
+    if expected_type is not None and candidate_type != expected_type:
+        raise ModelOutputError(
+            "summary type differs from gate candidate",
+            validation_detail="invalid_type",
+        )
+    if expected_target_type is not None and candidate_type != expected_target_type:
+        raise ModelOutputError(
+            "summary type does not match update target",
+            validation_detail="invalid_type",
+        )
     item["scopes"] = _scopes(item["scopes"], item.get("scope_source"))
+    _reject_mixed_project_scopes(item["scopes"])
     item["scope_operations"] = _scope_operations(
         item.get("scope_operations"),
         summary_scopes=item["scopes"],
@@ -635,6 +701,17 @@ def validate_summarize_output(
         item["memory_id"] = _memory_id(item["memory_id"], "memory_id")
     if "update_memory_id" in item:
         item["update_memory_id"] = _memory_id(item["update_memory_id"], "update_memory_id")
+        if (
+            expected_update_memory_id is not None
+            and (
+                not isinstance(expected_update_memory_id, str)
+                or item["update_memory_id"].casefold() != expected_update_memory_id.casefold()
+            )
+        ):
+            raise ModelOutputError(
+                "summary update target differs from gate target",
+                validation_detail="invalid_update_target",
+            )
         if related_memory_ids is not None:
             related_ids = {
                 memory_id.casefold()
@@ -689,6 +766,9 @@ def parse_summarize_output(
     related_native_ids: Iterable[Any] | None = None,
     related_memory_ids: Iterable[Any] | None = None,
     scope_registry: Mapping[str, Any] | None = None,
+    expected_type: str | None = None,
+    expected_update_memory_id: str | None = None,
+    expected_target_type: str | None = None,
 ) -> dict[str, Any]:
     try:
         parsed = parse_strict_json(raw)
@@ -703,6 +783,9 @@ def parse_summarize_output(
             related_native_ids=related_native_ids,
             related_memory_ids=related_memory_ids,
             scope_registry=scope_registry,
+            expected_type=expected_type,
+            expected_update_memory_id=expected_update_memory_id,
+            expected_target_type=expected_target_type,
         )
     except ModelOutputError as error:
         if error.validation_reason is None: