skills: resolve planning-to-implementation handoff coherence#76
skills: resolve planning-to-implementation handoff coherence#76davidahmann merged 1 commit intomainfrom
Conversation
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: bc12814df4
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| - If working tree is dirty before step 1: | ||
| - Allow only the plan-handoff case where all modified files are planning outputs and include selected `plan_path`. | ||
| - Planning-output allowlist: `./product/PLAN_NEXT.md`, `./product/PLAN_v1.0.md`, and selected `plan_path`. | ||
| - In the allowlist case, require current branch is already `main`, run step 1, skip steps 2-3, and run step 4 to branch with plan edits preserved. |
There was a problem hiding this comment.
Base handoff branches on updated main
In the plan-handoff path this rule skips step 3 and immediately runs git checkout -b, which means the new branch is created from whatever commit local main already has. git fetch does not advance the current branch by default (see git fetch -h, where --update-head-ok is an explicit opt-in), and git checkout -h states -b <branch> only “create and checkout a new branch.” If origin/main moved after the local checkout, implementation starts from a stale base and can miss upstream fixes or produce avoidable merge/test churn.
Useful? React with 👍 / 👎.
Problem
Planning skills intentionally modify plan files, but implementation skills required a clean working tree and immediately blocked. This created a catch-22 between plan generation and execution.
Changes
backlog-implementandadhoc-implementgit bootstrap rules to allow a narrow plan-handoff dirty-tree case.backlog-planadhoc-planinitial-planinitial-planreference-path guidance and added missingdisable-model-invocation: truefrontmatter for parity with other skills.Validation
make prepush-full