Sync mattpocock skills and stop formatting vendored skills - #2019
Merged
Merged
Conversation
`.agents/skills/` holds skills vendored verbatim from upstream repos, and `.claude/skills/` `.codex/skills/` `.kiro/skills/` link to them. Formatting them rewrites content we don't own, so every skill sync diff fills with our own reformatting — emphasis markers, list spacing, code-fence normalization — burying the real upstream changes. Scope the ignore to the vendored `skills/` subtree rather than the whole harness directory, so first-party agent config (e.g. `.kiro/settings/`) is still formatted.
Refresh the 21 vendored skills via `pnpx skills update -p`. Content is now byte-identical to upstream, since the formatter no longer rewrites it. Substantive upstream changes: - wayfinder — "investigation tickets" become decision tickets; research tickets resolve via parallel /research subagents on throwaway branches, and are exempt from the one-ticket-per-session rule - prototype — prototypes are captured as a primary source on a throwaway branch rather than deleted; main keeps only the validated decision - to-tickets — local output is one file per ticket under .scratch/<feature>/issues/ instead of a single root tickets.md - setup-matt-pocock-skills — leads with recommended answers, skips the triage-label and monorepo sections when they don't apply - grilling — broadened from plans to any decision or idea; facts come from the environment, not just the codebase - improve-codebase-architecture — scope the scan to git-log hot spots first - ask-matt — routing text follows the above Also vendors the new per-skill agents/openai.yaml files (Codex UI metadata and the implicit-invocation policy mirroring disable-model-invocation). Leaves docs/agents/issue-tracker.md alone: upstream now defaults the PR-as-request-surface flag off, but ours is deliberately on.
A short procedure for working an in-progress merge or rebase: read the primary sources behind each conflicting change before resolving a hunk, preserve both intents where they're compatible, run the project's checks, and always finish the merge rather than aborting. Vendored verbatim from upstream, symlinked into .claude/ and .kiro/ like the rest.
kmcginnes
force-pushed
the
worktree-sync-mattpocock-skills
branch
from
July 30, 2026 22:00
0627911 to
df7afe1
Compare
kmcginnes
marked this pull request as ready for review
July 30, 2026 22:05
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Updates the vendored mattpocock/skills to upstream HEAD — the first sync since #1913 — and fixes the formatter churn that was making these syncs hard to review.
.agents/skills/holds skills vendored verbatim from upstream;.claude/skills/.codex/skills/.kiro/skills/link to them. Formatting them rewrote content we don't own, so every sync diff filled with our own reformatting (emphasis markers, list spacing, code-fence normalization) burying the real changes. The ignore is scoped to the vendoredskills/subtree rather than the whole harness directory, so first-party agent config (e.g..kiro/settings/) is still formatted. Doing this first means the sync commit is purely upstream — 11 of the 22 initially-touched files turned out to be pure formatter churn with zero upstream change.pnpx skills update -p. Content is now byte-identical to upstream. Substantive changes:wayfinder— "investigation tickets" become decision tickets; research tickets resolve via parallel `/research` subagents on throwaway branches, and are exempt from the one-ticket-per-session ruleprototype— prototypes are captured as a primary source on a throwaway branch rather than deleted; main keeps only the validated decisionto-tickets— local output is one file per ticket under `.scratch//issues/` instead of a single root `tickets.md`setup-matt-pocock-skills— leads with recommended answers; skips the triage-label and monorepo sections when they don't applygrilling— broadened from plans to any decision or idea; facts come from the environment, not just the codebaseimprove-codebase-architecture— scope the scan to git-log hot spots first (YAGNI)ask-matt— routing text follows the aboveagents/openai.yamlfiles (Codex UI metadata plus the implicit-invocation policy mirroringdisable-model-invocation)resolving-merge-conflictsskill, new upstream since the last sync.Note for reviewers
docs/agents/issue-tracker.mdis deliberately left alone. Upstream now defaults its PR-as-request-surface flag off, but ours is on — a deliberate choice from #1863 with a documented `gh pr` triage workflow. That's an upstream default change for fresh setups, not a correction to us.On the formatter ignore: scoping to
skills/rather than the whole harness dir follows the vendored-code principle (ignore the subtree you didn't author). There's no documented recommendation from oxc or Anthropic either way; the trade-off is that a harness later vendoring content outsideskills/would silently start getting reformatted.Validation
mattpocock/skillsHEADDocs-only change — no runtime code touched.
Related Issues
Check List