Skip to content

Restore upstream-owned file layouts in stable sync merges #142

Open

Description

@chrisohearn

The stable-sync merge introduced fork-only rewrites in upstream-owned paths: .claude/skills changed from a directory symlink to seven fixed per-file links with an exact-list test and a check-changed.ts edit, and two upstream patch files plus their lockfile hashes were re-laid out without content changes. A future upstream skill will be omitted and fail the exact-list gate; future patch updates will conflict on the rewritten context.

Restore the directory symlink and remove the hard-coded skill-tree mirror/gate edits. Restore upstream patch layout and matching lock hashes unless a deliberate fork patch is needed.

Acceptance:

  • A new upstream skill becomes visible through .claude/skills without editing a list.
  • The sync check does not fail merely because upstream adds a skill.
  • The two patch files and hashes match upstream formatting/content when the fork has no deliberate patch delta.

Reported as P3 in PR #140 review.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions