100%

Section 03 — base-layer-readonly-and-overlay

Goal

Replace 3-way merge with base-layer overwrite for universal/adapted and formalize the overlay/local-scaffold split (completes fixes C; makes the file-bug-upstream loop clean).

Implementation Sketch

Universal/adapted land read-only with a banner ‘SYNCED FROM ori_lang — DO NOT EDIT, file a bug upstream’; the consumer never hand-edits them, so sync is a pure mirror (copy + propagate deletions) with zero conflict markers. local-scaffold is write-once-if-absent plus a drift-reference sidecar for the genuinely-customized few (impl-hygiene.md class).

Spec References

missions.md §Skills & Commands system (SSOT, no drift); CLAUDE.md §Git Safety (no clobber).

Work Items

  • Emit the read-only ‘SYNCED FROM ori_lang — DO NOT EDIT, file a bug upstream’ banner on universal + adapted output.
  • Replace 3-way git merge-file with base-layer overwrite for universal + adapted; propagate canonical deletions (target base-layer mirrors the manifest).
  • local-scaffold: write-once-if-absent + drift-reference sidecar; never overwrite an existing local-scaffold file.
  • pytest: universal overwrites, local-scaffold is preserved, a canonical deletion propagates, and a sync produces zero conflict markers.

Fresh intel (regenerated)

{ “schema_version”: 1, “target”: { “kind”: “plan-section”, “ref”: “harness-distribution/s-ec477a80” }, “generated_at”: “2026-06-22T15:35:47.151947+00:00”, “graph_state”: { “head_sha”: “6809a0f2”, “last_code_import_at”: “2026-06-22T14:30:10.18Z”, “embedding_stale”: true, “insights_stale”: false, “cpg_stale”: false }, “surfaces”: {}, “summary”: “intel-package[plan-section:harness-distribution/s-ec477a80] agent-authored dossier”, “degraded”: false, “dossier”: { “objective_symbols”: [], “tiers”: {}, “agent_authored”: true, “difficulty”: { “class”: “routine”, “research_online”: false, “research_mode”: “auto”, “signals”: [], “plan_dir”: “/home/eric/projects/ori_lang/plans/harness-distribution” } } }

(full dossier: base-layer-readonly-and-overlay—s-ec477a80.intel.json)