shepherd
GitHub用于自动化监控和推进代码审查流程(PR/MR),包括轮询状态、处理CI失败、批量化修复并解决已答复的讨论线程,确保证据驱动的流程推进。
Trigger Scenarios
Install
npx skills add chrisbanes/skills --skill shepherd -g -y
SKILL.md
Frontmatter
{
"name": "shepherd",
"description": "Use when asked to shepherd, babysit, monitor, or poll open pull requests or merge requests, including triaging review feedback, CI failures, and routine follow-up."
}
Shepherd
Core principle
Keep an authorized PR or MR moving with evidence, not noise: poll, act on new actionable items, batch each target's local fixes into one push, then resolve addressed threads. Use affected local checks during repairs and required full checks on meaningful integrated candidates; use CI as confirmation. Never merge without explicit authority.
Do not start persistent polling for a one-off inspection, no open targets, or an action requiring human judgment; report the state and stop.
Procedure
- Detect the platform with
git remote get-url origin: useghfor GitHub andglabfor GitLab. If it is ambiguous or unavailable, stop and ask. When the host provides a PR monitor that wakes this session on PR events, such as Claude desktop'sccd_prtools, load those tools first if they are listed but deferred, then follow host-managed monitoring instead of polling. Project controllers and their ticket agents keep the Project waiting rules instead, because a session binds only one PR. - Establish targets and a handled-ID snapshot. Every external comment, review, or thread absent from that snapshot is new, including pre-session feedback. After each poll record feedback IDs, CI state, and this controller's comments. Resolve reporting and repair ownership per target. Reuse a supplied delivery record and retained implementation owner. For a standalone PR without a delivery record, use its existing PR/reporting context and shepherd snapshot; hydrate source scope, base/head, prior verdicts, findings and dispositions from verified PR and repository evidence, marking missing evidence unknown. When no retained workflow owner exists, the authorized controller may own in-scope repairs after verifying the target checkout/head and absence of a competing writer; record that fallback before code writes or an implementation repair handoff. A read-only audit may inspect the verified frozen candidate while ownership or writer state is unresolved; report those gaps as material uncertainty, without granting write authority or clearing publication gates. Do not infer an owner handle from commit authorship. Preserve recorded owners; an unavailable owner, uncertain existing claim or unknown writer state holds code writes until reconciled, with writers quiescent before any explicit reassignment. This fallback supplies neither missing scope nor extra grants. Reconcile applicable current-head review initiation under PR review timing on acquisition and relevant wakes, even without repairs; one-off inspections stay read-only.
- Before repeated polling, use one lowest-cost capable read-only evidence helper when available. Select and brief it using the shared selection and handoff reference when available. Give it targets and the snapshot; require new feedback IDs, body, location, review state, non-manual CI state, failed jobs, and log references. It never mutates. Keep triage, repairs, replies, pushes, resolution, retries, and merging with the authorized controller. Skip it under host-managed monitoring.
- Poll with the platform CLI using provider commands, then compare complete review, comment, and CI state with the snapshot. Inspect failed logs only when needed. Do not reprocess old feedback or post a status-only update. Under host-managed monitoring, read once per wake; never start a timer, loop, or repeated poll.
- Triage new evidence before remote mutation. Fix clear requests and narrow formatting, lint, compile, or test failures; answer clear questions in-thread. Apply Behavioral review and repair for related boundary cases, the two-round convergence audit, review coverage and browser failure evidence. Use the reporting context and repair owner resolved in step 2; the authorized controller retains remote mutations. Escalate architectural or contradictory feedback, unfamiliar failures, non-obvious fixes, and out-of-scope conflicts. GitLab manual jobs are non-blocking unless instructed otherwise.
- Handle each target in its own head checkout and batch known actionable items. Inspect failing logs and identify applicable local equivalents from actual workflow/check configuration before repairing. If evidence is missing, obtain it before guessing a fix; report checks unavailable on this host honestly. Run focused checks during repair, reusing still-valid evidence, and required full checks on the meaningful integrated candidate before pushing, except where the PR's required CI runs the same full suite and no repository or provider rule requires a local run; then CI on the pushed head supplies that evidence before delivery acceptance or merge. Obtain or renew applicable independent review under PR review timing before push. Preserve stricter repository/provider rules; renew affected checks or broaden when impact is unknown. Do not use CI as an iterative test runner or require full checks per slice commit. Hold the push while checks required before push fail or lack evidence; a CI-supplied full suite gates acceptance or merge instead. Reassess evidence after each head change under PR review timing; renew affected independent review before pushing repairs. Reply after an addressed change or answer; resolve its thread only after the reply and required push succeed. Do not combine heads, push after every comment, resolve a local-only fix, or comment when nothing changed.
- Recheck CI after the verified repair push; return to step 6 on another code-related failure. Retry a suspected flaky GitLab job once without code changes; report a second failure. Poll pending checks every 2–5 minutes, active repair every 30–60 seconds, and after three or more unchanged cycles every 10+ minutes. Two unchanged cycles remain on the normal 2–5 minute cadence. Under host-managed monitoring, end the turn after the push instead.
- Refresh the exact head; merge only when all required checks, reviews and finding dispositions pass and apply to that head, conflicts are absent, and the user granted explicit or standing merge authority. Do not infer authority from approval. Under host-managed monitoring, green CI never wakes the session, so use PR review timing's verified enforcement rule for pending remote gates, and disable auto-merge this controller enabled when escalating.
Finish or escalate
Continue until the user stops monitoring, every target is merged or closed, or an escalation is needed. Report the target, current CI/review state, actions taken, checks actually run (say none when none ran), checks unavailable or unknown, and the next required human decision. Under host-managed monitoring, also name the events that monitor does not wake on. When describing a repair cycle, give this order: inspect the failed log (if missing, request the exact check name, log, PR diff, head and check configuration, and say which local equivalents are unidentified); batch the fix with that PR's clear review requests; run affected CI-equivalent checks on the required host; reuse still-valid evidence; complete integrated-candidate checks per step 6; push once; use CI as confirmation. Do not claim unrun steps happened. Escalate immediately for ambiguous platform/target selection, an unresolved conflict, material human judgment, conflicting reviewer direction, or a failure that remains after three repair cycles.
Version History
-
2026.10.18
Current 2026-10-19 03:05
优化了PR就绪与外部审查并行的流程,引入更严格的最终头部门禁检查,支持在特定条件下启用受保护的自动合并,并完善了证据保留逻辑。
-
2026.9.25
2026-09-27 20:24
新增共享的子代理选择与交接参考文档,链接至本Skill;明确Shepherd轮询辅助工具的capability检查要求。
-
2026.9.2
2026-09-03 04:30
将高级工作流技能设为显式调用,更新元数据与SKILL.md前缀,排除自动评估中的显式技能。
-
2026.8.27
2026-08-28 05:52
增强CI失败后的本地完整验证流程,支持批量修复后单次推送,并恢复技能评估功能以对比效率指标。
-
2026.8.24
2026-08-27 17:16
简化技能指令描述,降低信息冗余度。
-
2026.8.16
2026-08-19 19:31
优化轮询工作流,将只读轮询委托给低成本子代理,精简指令并保留安全门禁。
- 2026.7.21 2026-07-24 12:25


