Merge worktree-fix-python-drifts-2026-05-26 — Python FR5a envelope drifts (3 fixtures reconciled, ledgers empty)

Author: dmealing

server/python/src/metaobjects/parser.py

@@ -159,8 +159,11 @@ def _build(
             attr_name = key[len(ATTR_PREFIX):]
             # ADR-0007: @-prefixing a reserved structural body key is invalid.
             # Detected inline as each @-attr key is processed (matches TS parser-core).
+            # FR5a: emit the envelope at the PARENT body level (do NOT push the
+            # offending @-key onto the path) — matches TS parser-core which calls
+            # errSource() without descending into the @-key. Pushing would emit
+            # a deeper jsonPath than the reference port.
             if attr_name in _RESERVED_STRUCTURAL_KEYS:
-                builder.push_key(key)
                 result.errors.append(
                     MetaError(
                         f"node '{wrapper}' uses reserved structural key '{attr_name}' "
@@ -170,7 +173,6 @@ def _build(
                         envelope=_current_envelope(source, builder),
                     )
                 )
-                builder.pop()
                 continue
             schema = registry.attr_schema(type_, sub_type, attr_name)
             node.set_attr(attr_name, value, sub_type=schema.value_type if schema else None)

server/python/src/metaobjects/super_resolve.py

@@ -35,11 +35,15 @@ def _walk(
         effective_pkg = node.package or ctx_pkg or None
         target = _resolve(node.super_ref, effective_pkg, index)
         if target is None:
+            # FR5a / ADR-0009: attach the referrer node's source envelope so the
+            # error carries provenance (files[]/jsonPath). Without this, the
+            # envelope defaults to an empty/code source — divergent from TS.
             errors.append(MetaError(
                 f"the SuperClass '{node.super_ref}' does not exist "
                 f"(referenced by {node.fqn()})",
                 ErrorCode.ERR_UNRESOLVED_SUPER,
                 path=node.fqn(),
+                envelope=node.source,
             ))
         else:
             node.super_data = target

server/python/tests/conformance/conformance-expected-failures.json

@@ -1,7 +1,4 @@
 {
-  "_comment": "FR5a envelope-shape gates: TS is the reference port for source.format / source.files / source.jsonPath. Python drifts on two fixtures (parser source-threading differences): error-extends-nonexistent (the Python super-resolve error path returns empty files[] + jsonPath '$'; TS captures the referrer node's full envelope), and error-reserved-word-as-attr (Python threads source one level deeper, to the offending @attr; TS stops at the parent field.object). Track until the Python loader's error-construction sites are reconciled to TS's source-emission sites.",
-  "fixtures": [
-    "error-extends-nonexistent",
-    "error-reserved-word-as-attr"
-  ]
+  "_comment": "FR5a envelope-shape gates: TS is the reference port for source.format / source.files / source.jsonPath. Ledger empty — Python's parser ERR_RESERVED_ATTR site and super-resolve ERR_UNRESOLVED_SUPER site now emit the same canonical jsonPath TS does (reconciled 2026-05-26).",
+  "fixtures": []
 }

server/python/tests/conformance/yaml-conformance-expected-failures.json

@@ -1,10 +1,5 @@
 {
   "language": "python",
-  "_comment": "FR5a envelope-shape gate: Python's emitted source field differs from TS (the FR5a reference port) for these YAML fixtures. The code-set check still runs; only the full-envelope assertion is skipped. Each entry MUST be accompanied by the drift summary below. Reconcile per the FR5a follow-up — make Python's error-construction sites emit the same canonical jsonPath TS does.",
-  "fixtures": [
-    "error-yaml-reserved-as-attr"
-  ],
-  "_drifts": {
-    "error-yaml-reserved-as-attr": "Python threads source one level deeper, to the offending @attr; TS stops at the parent object.entity."
-  }
+  "_comment": "FR5a envelope-shape gate: ledger empty — Python's parser ERR_RESERVED_ATTR site (shared with the JSON path; the YAML desugar lowers to canonical JSON before the parser walks it) now emits the same canonical jsonPath TS does (reconciled 2026-05-26).",
+  "fixtures": []
 }