Skip to content

Rename Three Skills and State Which Skill Wins Each Shared Trigger - #1807

Merged
ptr727 merged 3 commits into
developfrom
feature/skill-names-and-triggers
Sep 25, 2026
Merged

ptr727 merged 3 commits into
developfrom
feature/skill-names-and-triggers

Conversation

@ptr727

@ptr727 ptr727 commented Sep 25, 2026

Copy link
Copy Markdown
Owner

Summary

A review of all fleet skills for naming consistency and invocation overlap.

Renames (directory, frontmatter, and every reference, scripts/pr_review.py and its test included):

  • code-review -> fleet-code-review: it collided with Claude Code's built-in code-review and engineering:code-review, so "review this PR" could route to the wrong one.
  • operational-vs-release-workflow -> branching-and-release-model: "workflow" meant the branching model here, but GitHub Actions in workflow-ci-contract and a process in upstream-contribution-workflow.
  • fleet-conformance-check -> check-this-repo: to match standup-a-repo, resync-a-repo, and audit-a-repo.

Descriptions (the only part an agent reads before loading a skill):

  • Added "which skill wins" sentences where triggers overlapped with no stated precedence:
    • merge-and-release / branching-and-release-model
    • backlog-burndown / unattended-handoff
    • fleet-code-review / pr-review-conduct / local-strict-review
    • pr-review-conduct / drive-pr
    • unattended-handoff scope / merge-and-release
    • the carried-file guards / audit-a-repo / resync-a-repo
  • Trimmed session-handoff, workflow-ci-contract, and agent-conduct under the skill listing's ~1536-character cutoff.
  • Narrowed agent-conduct's completion trigger to a claim of done, verified, green, or fixed.

RESYNC.md: a renamed .github/skills path must land together with the .github/copilot-instructions.md line that names it. Otherwise a downstream Copilot review loads a pruned skill and posts no coverage marker.

Downstream impact

.github/skills is carried verbatim with prune, and .github/copilot-instructions.md is carried too. Each fleet repo picks up the renames on its next resync, which the new RESYNC.md paragraph keeps in step. The old names' reports/canonical-review.json entries become orphans, which the engine reports by design. The renamed units re-enter the unread sweep backlog.

Verification

  • build_dist.py --check, prose_lint.py --diff origin/develop, docker_lint.py (7 linters), repo_gate.py --check eol, and spec/validate.py pass.
  • The test_build_dist, test_pr_review, test_skills_install, and test_canonical_review suites pass.
  • The local strict review ran two recorded passes. The second pass's 2 findings are addressed in this PR's first fix commit.

🤖 Generated with Claude Code

ptr727 and others added 2 commits September 25, 2026 06:41
Renames code-review to fleet-code-review (it collided with two other
skills of the same name), operational-vs-release-workflow to
branching-and-release-model (its "workflow" meant something different
from its siblings'), and fleet-conformance-check to check-this-repo (to
match the *-a-repo family), sweeping every reference.

Adds the missing precedence sentences to the descriptions whose
triggers overlap (merge-and-release and branching-and-release-model,
backlog-burndown and unattended-handoff, fleet-code-review and
pr-review-conduct, the carried-file guards and audit-a-repo), trims the
three descriptions past the skill listing's length cap, and narrows
agent-conduct's completion trigger to a claim of done, verified, green,
or fixed.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Answers the strict review: copilot-instructions-keeper keeps its drift
trigger and states the audit checks only presence and headings, the
carried-file guard keeps its conformance-sweep trigger and names
check-this-repo, two trimmed trigger examples come back, and RESYNC.md
requires a renamed .github/skills path to land with the
copilot-instructions.md line naming it.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Copilot AI lite review requested due to automatic review settings September 25, 2026 13:47
@coderabbitai

coderabbitai Bot commented Sep 25, 2026 •

Copy link
Copy Markdown

Important

  • 🔍 Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

⚙️ Run configuration

Configuration used: Repository: ptr727/ProjectTemplate/.coderabbit.yaml

Review profile: CHILL

Plan: Advanced

Run ID: 0965d388-ac07-4e5b-a0e8-a79b17558467


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

Answers the second strict review pass: the carried-file guard states
check-this-repo never writes the four files, the keeper names the
audit's staleness hint, and the three renamed skills' H1 headings
match their new names.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot review overview

🔵 Needs a closer look

Two renamed source skills still use the old skill names in their top-level document titles, which undermines the naming-consistency goal and can confuse readers.

Review effort: Lite
Findings: None

What changed in this PR

This pull request standardizes fleet skill naming to avoid collisions, updates documentation and tooling references to the new skill names, and clarifies precedence where multiple skills could match the same trigger phrase.

Changes:

  • Renamed three skills (code-review -> fleet-code-review, operational-vs-release-workflow -> branching-and-release-model, fleet-conformance-check -> check-this-repo) and updated references across scripts, docs, and skill distributions.
  • Tightened/trimmed skill descriptions and added explicit “which skill wins” guidance for overlapping triggers.
  • Added new reference docs under branching-and-release-model/references/ and regenerated .github/skills/ and .claude-plugin/fleet-skills/ outputs (including source digests).
File Description
scripts/​tests/​test_pr_review.py Updates test fixtures to point at fleet-code-review runbook/skill paths.
scripts/​pr_review.py Updates review-digest messaging to reference fleet-code-review.
RESYNC.md Adds guidance to keep .github/skills path changes in sync with .github/copilot-instructions.md.
GOVERNANCE.md Renames the packaged skill reference to branching-and-release-model.
docs/​token-efficiency-plan.md Updates skill-name references in the plan/progress checklist.
docs/​reusable-workflows.md Updates the referenced branching-model skill name.
docs/​pr-reviewer-reference.md Updates Copilot bootstrap skill name to fleet-code-review.
docs/​host-setup.md Updates skill name reference to check-this-repo.
docs/​fleet-map.md Updates map references from old skill names to renamed ones.
docs/​eol-lf-rollout.md Updates link label/target to branching-and-release-model.
AGENTS.md Updates routed skill names (fleet-code-review, branching-and-release-model, check-this-repo).
.github/​skills/​workflow-ci-contract/​SKILL.md Regenerated distribution copy reflecting renamed sibling skill reference.
.github/​skills/​upstream-contribution-workflow/​SKILL.md Regenerated distribution copy reflecting renamed branching-model skill reference.
.github/​skills/​unattended-handoff/​SKILL.md Regenerated distribution copy with clarified overlap text.
.github/​skills/​standup-a-repo/​SKILL.md Regenerated distribution copy reflecting check-this-repo rename.
.github/​skills/​skill-lifecycle/​SKILL.md Regenerated distribution copy reflecting check-this-repo rename in guidance.
.github/​skills/​session-handoff/​SKILL.md Regenerated distribution copy with trimmed description.
.github/​skills/​resync-a-repo/​SKILL.md Regenerated distribution copy reflecting check-this-repo rename and co-fire guidance.
.github/​skills/​pr-review-conduct/​SKILL.md Regenerated distribution copy with updated precedence/overlap wording.
.github/​skills/​merge-and-release/​SKILL.md Regenerated distribution copy reflecting branching-and-release-model rename and precedence guidance.
.github/​skills/​local-strict-review/​SKILL.md Regenerated distribution copy reflecting fleet-code-review rename.
.github/​skills/​fleet-code-review/​SKILL.md Regenerated distribution copy for renamed review skill.
.github/​skills/​drive-pr/​SKILL.md Regenerated distribution copy reflecting branching-and-release-model rename.
.github/​skills/​copilot-instructions-keeper/​SKILL.md Regenerated distribution copy with clarified overlap responsibilities.
.github/​skills/​check-this-repo/​SKILL.md Regenerated distribution copy for renamed conformance/self-check skill.
.github/​skills/​carried-instruction-file-guard/​SKILL.md Regenerated distribution copy with clarified co-fire/ownership boundaries.
.github/​skills/​branching-and-release-model/​SKILL.md Regenerated distribution copy for renamed branching/release model skill.
.github/​skills/​branching-and-release-model/​references/​release-publish-mechanics.md Regenerated distribution reference doc for publishing mechanics.
.github/​skills/​branching-and-release-model/​references/​branch-protection-and-promotion.md Regenerated distribution reference doc for promotion/protection mechanics.
.github/​skills/​backlog-burndown/​SKILL.md Regenerated distribution copy with clarified unattended precedence and renamed branching-model references.
.github/​skills/​audit-a-repo/​SKILL.md Regenerated distribution copy reflecting check-this-repo rename.
.github/​skills/​agent-conduct/​SKILL.md Regenerated distribution copy reflecting check-this-repo rename and trimmed description.
.github/​copilot-instructions.md Bootstraps Copilot review via fleet-code-review path and marker naming.
.claude-plugin/​fleet-skills/​skills/​workflow-ci-contract/​SKILL.md Regenerated plugin skill copy reflecting renamed branching-model skill reference.
.claude-plugin/​fleet-skills/​skills/​upstream-contribution-workflow/​SKILL.md Regenerated plugin skill copy reflecting renamed branching-model skill reference.
.claude-plugin/​fleet-skills/​skills/​unattended-handoff/​SKILL.md Regenerated plugin skill copy with clarified overlap text.
.claude-plugin/​fleet-skills/​skills/​standup-a-repo/​SKILL.md Regenerated plugin skill copy reflecting check-this-repo rename.
.claude-plugin/​fleet-skills/​skills/​skill-lifecycle/​SKILL.md Regenerated plugin skill copy reflecting check-this-repo rename in guidance.
.claude-plugin/​fleet-skills/​skills/​session-handoff/​SKILL.md Regenerated plugin skill copy with trimmed description.
.claude-plugin/​fleet-skills/​skills/​resync-a-repo/​SKILL.md Regenerated plugin skill copy reflecting check-this-repo rename and co-fire guidance.
.claude-plugin/​fleet-skills/​skills/​pr-review-conduct/​SKILL.md Regenerated plugin skill copy with updated precedence/overlap wording.
.claude-plugin/​fleet-skills/​skills/​merge-and-release/​SKILL.md Regenerated plugin skill copy reflecting branching-and-release-model rename and precedence guidance.
.claude-plugin/​fleet-skills/​skills/​local-strict-review/​SKILL.md Regenerated plugin skill copy reflecting fleet-code-review rename.
.claude-plugin/​fleet-skills/​skills/​fleet-code-review/​SKILL.md Regenerated plugin skill copy for renamed review skill.
.claude-plugin/​fleet-skills/​skills/​drive-pr/​SKILL.md Regenerated plugin skill copy reflecting branching-and-release-model rename.
.claude-plugin/​fleet-skills/​skills/​copilot-instructions-keeper/​SKILL.md Regenerated plugin skill copy with clarified overlap responsibilities.
.claude-plugin/​fleet-skills/​skills/​check-this-repo/​SKILL.md Regenerated plugin skill copy for renamed conformance/self-check skill.
.claude-plugin/​fleet-skills/​skills/​carried-instruction-file-guard/​SKILL.md Regenerated plugin skill copy with clarified co-fire/ownership boundaries.
.claude-plugin/​fleet-skills/​skills/​branching-and-release-model/​SKILL.md Regenerated plugin skill copy for renamed branching/release model skill.
.claude-plugin/​fleet-skills/​skills/​branching-and-release-model/​references/​release-publish-mechanics.md Regenerated plugin reference doc for publishing mechanics.
.claude-plugin/​fleet-skills/​skills/​branching-and-release-model/​references/​branch-protection-and-promotion.md Regenerated plugin reference doc for promotion/protection mechanics.
.claude-plugin/​fleet-skills/​skills/​backlog-burndown/​SKILL.md Regenerated plugin skill copy with clarified unattended precedence and renamed branching-model references.
.claude-plugin/​fleet-skills/​skills/​audit-a-repo/​SKILL.md Regenerated plugin skill copy reflecting check-this-repo rename.
.claude-plugin/​fleet-skills/​skills/​agent-conduct/​SKILL.md Regenerated plugin skill copy reflecting check-this-repo rename and trimmed description.
.claude-plugin/​fleet-skills/​.source-digests/​workflow-ci-contract Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​upstream-contribution-workflow Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​unattended-handoff Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​standup-a-repo Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​skill-lifecycle Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​session-handoff Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​resync-a-repo Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​pr-review-conduct Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​operational-vs-release-workflow Removes digest entry for the renamed/removed skill.
.claude-plugin/​fleet-skills/​.source-digests/​merge-and-release Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​local-strict-review Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​fleet-conformance-check Removes digest entry for the renamed/removed skill.
.claude-plugin/​fleet-skills/​.source-digests/​fleet-code-review Adds digest entry for the new renamed skill.
.claude-plugin/​fleet-skills/​.source-digests/​drive-pr Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​copilot-instructions-keeper Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​code-review Removes digest entry for the renamed/removed skill.
.claude-plugin/​fleet-skills/​.source-digests/​check-this-repo Adds digest entry for the new renamed skill.
.claude-plugin/​fleet-skills/​.source-digests/​carried-instruction-file-guard Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​branching-and-release-model Adds digest entry for the new renamed skill.
.claude-plugin/​fleet-skills/​.source-digests/​backlog-burndown Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​audit-a-repo Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.source-digests/​agent-conduct Updates digest for regenerated plugin skill content.
.claude-plugin/​fleet-skills/​.claude-plugin/​plugin.json Updates plugin skill registry to include renamed skills and drop old names.
.agents/​skills/​workflow-ci-contract/​SKILL.md Source skill update reflecting renamed branching-model skill reference.
.agents/​skills/​upstream-contribution-workflow/​SKILL.md Source skill update reflecting renamed branching-model skill reference.
.agents/​skills/​unattended-handoff/​SKILL.md Source skill update with clarified overlap text.
.agents/​skills/​standup-a-repo/​SKILL.md Source skill update reflecting check-this-repo rename.
.agents/​skills/​skill-lifecycle/​SKILL.md Source skill update reflecting check-this-repo rename in guidance.
.agents/​skills/​session-handoff/​SKILL.md Source skill update with trimmed description.
.agents/​skills/​resync-a-repo/​SKILL.md Source skill update reflecting check-this-repo rename and co-fire guidance.
.agents/​skills/​pr-review-conduct/​SKILL.md Source skill update with updated precedence/overlap wording.
.agents/​skills/​merge-and-release/​SKILL.md Source skill update reflecting branching-and-release-model rename and precedence guidance.
.agents/​skills/​local-strict-review/​SKILL.md Source skill update reflecting fleet-code-review rename.
.agents/​skills/​fleet-code-review/​SKILL.md Source skill update for renamed review skill.
.agents/​skills/​drive-pr/​SKILL.md Source skill update reflecting branching-and-release-model rename.
.agents/​skills/​copilot-instructions-keeper/​SKILL.md Source skill update with clarified overlap responsibilities.
.agents/​skills/​check-this-repo/​SKILL.md Source skill update for renamed conformance/self-check skill.
.agents/​skills/​carried-instruction-file-guard/​SKILL.md Source skill update with clarified co-fire/ownership boundaries.
.agents/​skills/​branching-and-release-model/​SKILL.md Source skill update for renamed branching/release model skill.
.agents/​skills/​branching-and-release-model/​references/​release-publish-mechanics.md Adds source reference doc for publishing mechanics.
.agents/​skills/​branching-and-release-model/​references/​branch-protection-and-promotion.md Adds source reference doc for promotion/protection mechanics.
.agents/​skills/​backlog-burndown/​SKILL.md Source skill update with clarified unattended precedence and renamed branching-model references.
.agents/​skills/​audit-a-repo/​SKILL.md Source skill update reflecting check-this-repo rename.
.agents/​skills/​agent-conduct/​SKILL.md Source skill update reflecting check-this-repo rename and trimmed description.

💡 Configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Copilot AI review requested due to automatic review settings September 25, 2026 13:53

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot review overview

🟢 Approval recommended

The renames and precedence clarifications are applied consistently across canonical sources and regenerated distributions, with no remaining references to the retired skill names found in the tree.

Review effort: Lite
Findings: None

@ptr727
ptr727 merged commit 6e6a35f into develop Sep 25, 2026
9 checks passed
@ptr727
ptr727 deleted the feature/skill-names-and-triggers branch September 25, 2026 13:59
ptr727 added a commit that referenced this pull request Sep 25, 2026
…rship to Main (#1827)

Promotes `develop` to `main`.

## Carried

- #1806: adds the unattended handoff loop and the attended resume
procedure.
- #1807: renames three skills and states which skill wins each shared
trigger.
- #1809: names a pin by its mechanism rather than its value, and audits
for copies.
- #1808: leads every choice with a recommendation and closes every
session in order.
- #1813: bans every version literal in the four instruction documents
and catches abbreviated SHAs, following #1809.
- #1820: refuses a coverage marker indented into a code block, per
#1725.
- #1823: states that the hub commits audit reports and that a downstream
session resyncs itself. This covers the Fleet Bootstrap section, the
host fleet block, `RESYNC.md`, `AUDIT.md`, `check-this-repo`, and
`resync-a-repo`, and settles #1822. The Fleet Bootstrap section is
byte-locked, so every carrier reports drift on it until its next resync.
- #1825: strips a tilde or unclosed fence before reading review
coverage, per #1821.

Closes #1725
Closes #1821
Closes #1822

🤖 Generated with [Claude Code](https://claude.com/claude-code)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants