Summary
Replace the org-skills reconcile's two-way compare with a three-way baseline so platform updates flow to clean copies while org edits become tracked overrides — never clobbered.
Spec: docs/superpowers/specs/2026-07-21-skills-experience-design.md §3.
Scope (Workstream A — org-level syncing)
Out of scope
Project skill copies (Workstream B), console UI for the new /updates states (separate issue), aep skills sync CLI.
Acceptance
- An org-edited platform skill survives reconcile and is reported as an override.
- A clean copy picks up a platform update with its manifest entry advanced.
- Go and TS hash implementations agree on all shared fixtures.
Part of #292.
Summary
Replace the org-skills reconcile's two-way compare with a three-way baseline so platform updates flow to clean copies while org edits become tracked overrides — never clobbered.
Spec:
docs/superpowers/specs/2026-07-21-skills-experience-design.md§3.Scope (Workstream A — org-level syncing)
skills-manifest.json— platform-managed sidecar at org repo root:{ name: { kind, source?, baseHash } }. Read/write helpers; manifest + skill files always written in the same atomic commit.ensureSkillsRepo) writes each embedded skill'sbaseHashentry in the seed commit.reconcileEmbedded: org clean + platform moved → refresh + update entry; org moved → skip (override); both moved → conflict, surface for review. Replaces the kind-basedisUserKindskip.kind: imported,source,baseHash) atomically with the imported files./updatesreports three-way states (update-available / overridden / conflict) instead of raw drift.Out of scope
Project skill copies (Workstream B), console UI for the new
/updatesstates (separate issue),aep skills syncCLI.Acceptance
Part of #292.