From 8aaee7279a42269ef0ac3a836c12f4380ff0334d Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Fri, 25 Sep 2026 18:56:55 -0700 Subject: [PATCH 1/5] chore(claude): tighten quest skills, drop skills duplicated in dotfiles spawn-quests starts clear-cut quests without asking, holds agents under machine load, and stays quiet on interim notifications. plan-quests confirms the goal in one sentence and records settled decisions in the quest. merge, spawn-merge, close, and takeover are maintained in kixelated/dotfiles, whose personal copies already shadow these. Co-Authored-By: Claude Opus 5.5 --- .claude/skills/close/SKILL.md | 15 ---------- .claude/skills/close/agents/openai.yaml | 4 --- .claude/skills/merge/SKILL.md | 18 ------------ .claude/skills/merge/agents/openai.yaml | 4 --- .claude/skills/plan-quests/SKILL.md | 3 +- .claude/skills/spawn-merge/SKILL.md | 28 ------------------- .claude/skills/spawn-merge/agents/openai.yaml | 4 --- .claude/skills/spawn-quests/SKILL.md | 9 ++++-- .claude/skills/takeover/SKILL.md | 16 ----------- .claude/skills/takeover/agents/openai.yaml | 4 --- 10 files changed, 8 insertions(+), 97 deletions(-) delete mode 100644 .claude/skills/close/SKILL.md delete mode 100644 .claude/skills/close/agents/openai.yaml delete mode 100644 .claude/skills/merge/SKILL.md delete mode 100644 .claude/skills/merge/agents/openai.yaml delete mode 100644 .claude/skills/spawn-merge/SKILL.md delete mode 100644 .claude/skills/spawn-merge/agents/openai.yaml delete mode 100644 .claude/skills/takeover/SKILL.md delete mode 100644 .claude/skills/takeover/agents/openai.yaml diff --git a/.claude/skills/close/SKILL.md b/.claude/skills/close/SKILL.md deleted file mode 100644 index 24cb8a76199..00000000000 --- a/.claude/skills/close/SKILL.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -name: close -description: Close a GitHub PR. ---- - -Abandon the specified PR. - -If this PR was completing a quest, takeover the PR to delete the quest instead (without the other changes). -If this PR was not completing a quest, close the PR as-is. - -After GitHub confirms the PR is merged or closed, run `just clean` in its local -checkout if that recipe exists, once this task's checks and builds have stopped. -Enabling auto-merge is not completion. Preserve another task's active processes; -report a refused or failed cleanup without changing the PR outcome. Leave the -checkout itself for the host's worktree cleanup timer to retire after you exit. diff --git a/.claude/skills/close/agents/openai.yaml b/.claude/skills/close/agents/openai.yaml deleted file mode 100644 index 8b363520a14..00000000000 --- a/.claude/skills/close/agents/openai.yaml +++ /dev/null @@ -1,4 +0,0 @@ -interface: - display_name: "Close PR" - short_description: "Close a GitHub PR" - default_prompt: "Use $close to close this PR." diff --git a/.claude/skills/merge/SKILL.md b/.claude/skills/merge/SKILL.md deleted file mode 100644 index aab5a0dda6b..00000000000 --- a/.claude/skills/merge/SKILL.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: merge -description: Merge a GitHub PR once reviews and CI pass. ---- - -Land a pull request. -If unsure about any course of action, pause and interactively prompt the user for guidance. - -- Parse the arguments to determine the PR number, otherwise resolve it from the current context/branch. -- Fix any minor issues with the PR, such as merge conflicts and failing CI checks. -- If a draft, flip it to "Ready for Review" then wait for at least one automated review to complete. -- Fix any review feedback you agree with, and leave a comment if you disagree. - -If everything looks good, enable auto-merge and post a summary of the changes made. -You don't need to address everything. - -You may repeat any of the above steps on new CI results or review feedback. -Abort on any major issues or blockers, or if little progress is being made. diff --git a/.claude/skills/merge/agents/openai.yaml b/.claude/skills/merge/agents/openai.yaml deleted file mode 100644 index 44df0dd02dd..00000000000 --- a/.claude/skills/merge/agents/openai.yaml +++ /dev/null @@ -1,4 +0,0 @@ -interface: - display_name: "Merge" - short_description: "Land a GitHub PR once reviews and CI pass" - default_prompt: "Use $merge to review and land this pull request." diff --git a/.claude/skills/plan-quests/SKILL.md b/.claude/skills/plan-quests/SKILL.md index 887a0691c7c..0f55d0a72fc 100644 --- a/.claude/skills/plan-quests/SKILL.md +++ b/.claude/skills/plan-quests/SKILL.md @@ -26,7 +26,7 @@ When the work changes what a user sees (a wire, an API, a flag, a dashboard), as When the frontier disagrees with a settled quest/plan, challenge the user and resolve the conflict. Begin the interview by scoping the goal: the observable outcome, why it matters, and its important boundaries and non-goals. -Do not move on to implementation decisions until the goal is settled. +Restate the goal in one sentence and get it confirmed before moving on to implementation decisions. If the goal contains independently completable outcomes, split them before planning. Map the implementation plan as a design tree: every material decision branches into the decisions that hang off it. @@ -34,6 +34,7 @@ The session is done when the frontier is empty. The result may be one quest or multiple quests and questlines, split based on what can be completed independently. Prefix each quest title with `[XS]`, `[S]`, `[M]`, `[L]`, or `[XL]`, including implementation, verification, and landing work. Once complete, create, update, or delete the relevant quests and questlines. +Record each settled decision and its reason in the quest's Plan, so later sessions don't ask it again. New work joins the milestone matching its priority, at its rank; a questline groups only quests that ship together, and its README holds the work no child owns (the end-to-end test, the docs page). When done, commit and create a draft PR following `CONTRIBUTING.md`. diff --git a/.claude/skills/spawn-merge/SKILL.md b/.claude/skills/spawn-merge/SKILL.md deleted file mode 100644 index 94e4ede39b7..00000000000 --- a/.claude/skills/spawn-merge/SKILL.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -name: spawn-merge -description: Decide and merge GitHub PRs in parallel. ---- - -Read the /merge, /takeover, and /close skills before starting. - -The goal is to evaluate the open PRs in the repository and decide which ones to merge. -Each merge is performed in parallel by a sub-agent. - -Start by listing all open PRs that are ready for review (skip drafts). -An argument can be used to filter the PRs in scope. - -One at a time, for each PR, interactively prompt the user if we should /merge, skip, or /close. -Include a short summary and your recommendation. - -If the user chooses to merge the PR, run the /merge command using a sub-agent. -There can be at most N concurrent merge operations, where N is half the number of physical CPU cores. -If ordering matters, then queue the PRs in order. - -If the user chooses to close the PR, run the /close command using a sub-agent. - -Keep going until all PRs have been decided then wait for all spawned sub-agents to finish. -Before finishing, refresh the open PR list and process any newly opened PRs that match the original scope. - -Summarize the results when done. -Include all of the issues encountered and suggested follow-ups. -Repeat the process for any newly opened PRs that match the original scope. diff --git a/.claude/skills/spawn-merge/agents/openai.yaml b/.claude/skills/spawn-merge/agents/openai.yaml deleted file mode 100644 index 7ad171c3718..00000000000 --- a/.claude/skills/spawn-merge/agents/openai.yaml +++ /dev/null @@ -1,4 +0,0 @@ -interface: - display_name: "Spawn Merge" - short_description: "Land multiple GitHub PRs once reviews and CI pass" - default_prompt: "Use $spawn_merge to review and land these pull requests." diff --git a/.claude/skills/spawn-quests/SKILL.md b/.claude/skills/spawn-quests/SKILL.md index 6ade2b5d88d..d8782dd12bd 100644 --- a/.claude/skills/spawn-quests/SKILL.md +++ b/.claude/skills/spawn-quests/SKILL.md @@ -15,15 +15,18 @@ Judge readiness from each line branch's own quest directory, and treat a quest d Inspect any blocked quests, and determine if they can be unblocked. A line whose `Quests` list has emptied is a ready quest too: finishing it marks the line's PR ready. -One at a time, for each each quest, interactively prompt the user if we should /start-quest, /plan-quests, skip, or delete. -Include a short summary and your recommendation. +Recommend an action for each quest: /start-quest, /plan-quests, skip, or delete. +Start the quests you'd start with no open question right away. +Interactively prompt the user about the rest, a few per prompt, each with a short summary and your recommendation. Spawn a background sub-agent for each /start-quest. Create a fresh worktree on the base `quest branch` prints, creating that line branch first if it is missing. Agents share no writable files: each keeps its scratch files in its own worktree's `.scratch/`, and anything you hand every agent goes in its prompt, not a shared file. +Each agent blocks on its own checks and reports back only when done or blocked. Limit the concurrency to at most N agents in parallel, where N is half the number of physical CPU cores. +Other sessions share this machine: hold new agents while the load average exceeds the core count. -Monitor the sub-agents and report their final status, but do not monitor their PRs. +Report each sub-agent's final status, staying silent on interim notifications, but do not monitor their PRs. Prompt the user if they want to /plan-quests for any suggested follow-ups. Run /plan-quests for any selected quests in the foreground. diff --git a/.claude/skills/takeover/SKILL.md b/.claude/skills/takeover/SKILL.md deleted file mode 100644 index 1ad2afced69..00000000000 --- a/.claude/skills/takeover/SKILL.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -name: takeover -description: Adopt someone else's open PR and drive it to landable. ---- - -Someone else opened this PR; you are now responsible for it. -If unsure about any course of action, prompt the user for guidance. - -- Parse the arguments to determine the PR number. -- Read the PR, any linked issues, reviews/comments posted on the PR, and the surrounding code. -- Judge the approach before touching anything. Would you take a different approach? -- Fix any issues with the PR, such as merge conflicts and failing CI checks. -- Address any automated review findings (Codex/CodeRabbit) you agree with. Turn down any you disagree with with a comment. One round only; never request a review. -- Push any changes you made to the PR, updating the summary if needed. -- Summarize the changes made and any potential follow-up actions. -- Do not merge the PR; that is the `merge` skill's job, and only once the user approves. diff --git a/.claude/skills/takeover/agents/openai.yaml b/.claude/skills/takeover/agents/openai.yaml deleted file mode 100644 index 8f684a245b4..00000000000 --- a/.claude/skills/takeover/agents/openai.yaml +++ /dev/null @@ -1,4 +0,0 @@ -interface: - display_name: "Takeover" - short_description: "Adopt someone else's PR and drive it to landable" - default_prompt: "Use $takeover to adopt this pull request and make it landable." From 7d00bc11b080c259bc85d9727fc07e7bdeb037fa Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Fri, 25 Sep 2026 19:13:14 -0700 Subject: [PATCH 2/5] chore(claude): share skills through the kixelated/skills submodule The generic skills (merge, spawn-merge, close, takeover, grill, peer-review, recommended, clean, bump) live in kixelated/skills, pinned here as the .claude/shared submodule and symlinked into .claude/skills. A SessionStart hook populates it in new worktrees. Co-Authored-By: Claude Opus 5.5 --- .claude/hooks/submodule.sh | 20 ++++++++++++++++++++ .claude/settings.json | 4 ++++ .claude/shared | 1 + .claude/skills/bump | 1 + .claude/skills/clean | 1 + .claude/skills/close | 1 + .claude/skills/grill | 1 + .claude/skills/merge | 1 + .claude/skills/peer-review | 1 + .claude/skills/recommended | 1 + .claude/skills/spawn-merge | 1 + .claude/skills/takeover | 1 + .gitmodules | 3 +++ 13 files changed, 37 insertions(+) create mode 100755 .claude/hooks/submodule.sh create mode 160000 .claude/shared create mode 120000 .claude/skills/bump create mode 120000 .claude/skills/clean create mode 120000 .claude/skills/close create mode 120000 .claude/skills/grill create mode 120000 .claude/skills/merge create mode 120000 .claude/skills/peer-review create mode 120000 .claude/skills/recommended create mode 120000 .claude/skills/spawn-merge create mode 120000 .claude/skills/takeover create mode 100644 .gitmodules diff --git a/.claude/hooks/submodule.sh b/.claude/hooks/submodule.sh new file mode 100755 index 00000000000..c601a2226d5 --- /dev/null +++ b/.claude/hooks/submodule.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +# The shared skills in .claude/skills are symlinks into the .claude/shared +# submodule. git leaves submodules unpopulated in a new worktree, and a dangling +# skill symlink is silently skipped rather than reported, so populate it here. + +set -eu + +# Require an explicit project dir so we never touch a stray checkout. +[ -n "${CLAUDE_PROJECT_DIR:-}" ] || exit 0 +cd "$CLAUDE_PROJECT_DIR" || exit 0 + +# `git submodule status` prefixes an uninitialized entry with '-'. Any other +# output means it is already populated, which is every session after the first. +case "$(git submodule status .claude/shared 2>/dev/null)" in +-*) ;; +*) exit 0 ;; +esac + +echo "submodule hook: populating .claude/shared, the shared skills live there." >&2 +git submodule update --init .claude/shared >&2 diff --git a/.claude/settings.json b/.claude/settings.json index 954f580759f..29502e75533 100644 --- a/.claude/settings.json +++ b/.claude/settings.json @@ -4,6 +4,10 @@ "SessionStart": [ { "hooks": [ + { + "type": "command", + "command": "${CLAUDE_PROJECT_DIR}/.claude/hooks/submodule.sh" + }, { "type": "command", "command": "${CLAUDE_PROJECT_DIR}/.claude/hooks/direnv.sh" diff --git a/.claude/shared b/.claude/shared new file mode 160000 index 00000000000..763fb4c9865 --- /dev/null +++ b/.claude/shared @@ -0,0 +1 @@ +Subproject commit 763fb4c9865a0625716de8cde80d4af1b5edcef7 diff --git a/.claude/skills/bump b/.claude/skills/bump new file mode 120000 index 00000000000..c99bb079785 --- /dev/null +++ b/.claude/skills/bump @@ -0,0 +1 @@ +../shared/bump \ No newline at end of file diff --git a/.claude/skills/clean b/.claude/skills/clean new file mode 120000 index 00000000000..8bf0f1985ae --- /dev/null +++ b/.claude/skills/clean @@ -0,0 +1 @@ +../shared/clean \ No newline at end of file diff --git a/.claude/skills/close b/.claude/skills/close new file mode 120000 index 00000000000..31284b75087 --- /dev/null +++ b/.claude/skills/close @@ -0,0 +1 @@ +../shared/close \ No newline at end of file diff --git a/.claude/skills/grill b/.claude/skills/grill new file mode 120000 index 00000000000..a27dcd72e59 --- /dev/null +++ b/.claude/skills/grill @@ -0,0 +1 @@ +../shared/grill \ No newline at end of file diff --git a/.claude/skills/merge b/.claude/skills/merge new file mode 120000 index 00000000000..4735484baf5 --- /dev/null +++ b/.claude/skills/merge @@ -0,0 +1 @@ +../shared/merge \ No newline at end of file diff --git a/.claude/skills/peer-review b/.claude/skills/peer-review new file mode 120000 index 00000000000..7abac91d3dd --- /dev/null +++ b/.claude/skills/peer-review @@ -0,0 +1 @@ +../shared/peer-review \ No newline at end of file diff --git a/.claude/skills/recommended b/.claude/skills/recommended new file mode 120000 index 00000000000..440251611f3 --- /dev/null +++ b/.claude/skills/recommended @@ -0,0 +1 @@ +../shared/recommended \ No newline at end of file diff --git a/.claude/skills/spawn-merge b/.claude/skills/spawn-merge new file mode 120000 index 00000000000..669e016de47 --- /dev/null +++ b/.claude/skills/spawn-merge @@ -0,0 +1 @@ +../shared/spawn-merge \ No newline at end of file diff --git a/.claude/skills/takeover b/.claude/skills/takeover new file mode 120000 index 00000000000..f004a334efe --- /dev/null +++ b/.claude/skills/takeover @@ -0,0 +1 @@ +../shared/takeover \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000000..25cd0e0737d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule ".claude/shared"] + path = .claude/shared + url = https://github.com/kixelated/skills From b87d38871c84e316581fc2bead7ca744bd71b3ac Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Fri, 25 Sep 2026 19:15:23 -0700 Subject: [PATCH 3/5] chore: keep moq formatters out of the skills submodule Co-Authored-By: Claude Opus 5.5 --- .claude/hooks/submodule.sh | 4 ++-- .remarkignore | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.claude/hooks/submodule.sh b/.claude/hooks/submodule.sh index c601a2226d5..049ccbcbd1f 100755 --- a/.claude/hooks/submodule.sh +++ b/.claude/hooks/submodule.sh @@ -12,8 +12,8 @@ cd "$CLAUDE_PROJECT_DIR" || exit 0 # `git submodule status` prefixes an uninitialized entry with '-'. Any other # output means it is already populated, which is every session after the first. case "$(git submodule status .claude/shared 2>/dev/null)" in --*) ;; -*) exit 0 ;; + -*) ;; + *) exit 0 ;; esac echo "submodule hook: populating .claude/shared, the shared skills live there." >&2 diff --git a/.remarkignore b/.remarkignore index 62cd171e1f3..5716b01a44d 100644 --- a/.remarkignore +++ b/.remarkignore @@ -15,3 +15,10 @@ doc/draft/ # Quests use a constrained Markdown dialect checked by the quest validator. quest/ + +# Skills are symlinks into the kixelated/skills submodule, which formats its +# own files; remark would follow them (and .agents, Codex's link to the same +# directory) and rewrite the pinned checkout. +.claude/shared/ +.claude/skills/ +.agents/ From 428925083a072365004a806ebe5d4e41db987cd5 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Fri, 25 Sep 2026 20:32:25 -0700 Subject: [PATCH 4/5] fix(claude): update shared skills when the pin moves git submodule status marks a checkout on the wrong commit with '+', not only an uninitialized one with '-'. The session hook treated every populated checkout as current, so a later pin never landed. Co-Authored-By: Grok 4.7 --- .claude/hooks/submodule.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.claude/hooks/submodule.sh b/.claude/hooks/submodule.sh index 049ccbcbd1f..6f0b3af87e9 100755 --- a/.claude/hooks/submodule.sh +++ b/.claude/hooks/submodule.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # The shared skills in .claude/skills are symlinks into the .claude/shared -# submodule. git leaves submodules unpopulated in a new worktree, and a dangling -# skill symlink is silently skipped rather than reported, so populate it here. +# submodule. git leaves that unpopulated in a new worktree, and a dangling +# symlink is silently skipped. A checkout on the wrong commit stays stale too. set -eu @@ -9,12 +9,12 @@ set -eu [ -n "${CLAUDE_PROJECT_DIR:-}" ] || exit 0 cd "$CLAUDE_PROJECT_DIR" || exit 0 -# `git submodule status` prefixes an uninitialized entry with '-'. Any other -# output means it is already populated, which is every session after the first. +# '-' is uninitialized. '+' is populated at a commit other than the gitlink. +# A matching checkout has no prefix. case "$(git submodule status .claude/shared 2>/dev/null)" in - -*) ;; + -*|+*) ;; *) exit 0 ;; esac -echo "submodule hook: populating .claude/shared, the shared skills live there." >&2 +echo "submodule hook: updating .claude/shared to the pinned skills." >&2 git submodule update --init .claude/shared >&2 From 09c0fdc9501ec2b98d7f2b95117e2e01a09372f1 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Fri, 25 Sep 2026 20:45:13 -0700 Subject: [PATCH 5/5] fix(claude): space the submodule status case for shfmt shfmt rewrites -*|+* with spaces around the alternation. Check failed on that diff. Co-Authored-By: Grok 4.7 --- .claude/hooks/submodule.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.claude/hooks/submodule.sh b/.claude/hooks/submodule.sh index 6f0b3af87e9..cda3fd4ace2 100755 --- a/.claude/hooks/submodule.sh +++ b/.claude/hooks/submodule.sh @@ -12,7 +12,7 @@ cd "$CLAUDE_PROJECT_DIR" || exit 0 # '-' is uninitialized. '+' is populated at a commit other than the gitlink. # A matching checkout has no prefix. case "$(git submodule status .claude/shared 2>/dev/null)" in - -*|+*) ;; + -* | +*) ;; *) exit 0 ;; esac