From 83221b575e3172416d9526b9c70c65b17ce3f1a4 Mon Sep 17 00:00:00 2001 From: os-steve Date: Sat, 5 Sep 2026 10:48:29 +0000 Subject: [PATCH] docs(skills): end the dogfood delivery checklist at the draft PR The delivery checklist told its executor to `gh pr merge --squash --auto --delete-branch` and to force-remove the worktree. Two standing rules for that same executor say the opposite (never merge anything; never `--force` first), and the governed endgame lets no seat arm auto-merge on a governed PR at all. `gh` is also absent from dev containers, so the step was not merely forbidden but unexecutable as written. The checklist now ends at the draft PR: commit, push, open a DRAFT PR (the REST endpoint in a dev container, `gh pr create --draft` on a human's machine), report the PR to the dispatching seat; ready, queue and human merge belong to that seat. The worktree line drops `--force` and says what the dev-agent rule says: a refusal means uncommitted work, so read `git status` first. Net 0 lines (148 before and after), so the line-ratchet ceiling of 157 is untouched. Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_019RfFHiRCSs3JXLK4cwcfox --- .claude/skills/dogfood-verification/SKILL.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.claude/skills/dogfood-verification/SKILL.md b/.claude/skills/dogfood-verification/SKILL.md index 5083aa42e3..eb950d97b3 100644 --- a/.claude/skills/dogfood-verification/SKILL.md +++ b/.claude/skills/dogfood-verification/SKILL.md @@ -132,9 +132,9 @@ dev 工作树、dev-server 端口、preview 浏览器全是**共享的**:并行 → `git -C /tmp/pr apply /tmp/fix.patch` → 确认 `git -C /tmp/pr status` *只*列你的文件。 - [ ] 加 **changeset**(`.changeset/.md`,`"@objectstack/": patch`)—— 发布包的改动过不了 CI 的「Check Changeset」门。 -- [ ] 提交(信息末尾带 `Co-Authored-By:` trailer)、推送、`gh pr create`,然后 - `gh pr merge --squash --auto --delete-branch`(先移除 worktree,本地分支才不被 - 锁:`git worktree remove /tmp/pr --force`)。 +- [ ] 提交(信息末尾带 `Co-Authored-By:` trailer)、推送、开 **draft** PR(dev 容器走 REST 端点; + 人手上 `gh pr create --draft`),PR 报给派发你的席位;ready / 入队 / 人工合并归该席位。 +- [ ] `git worktree remove /tmp/pr`:⛔ 不带 `--force`,被拒说明有东西没提交,先读 `git status`。 ## 6. Shell 卫生