@tianhai/pi-workflow-kit 0.6.0 → 0.7.1

package/README.md

@@ -31,7 +31,7 @@ You control each phase explicitly by invoking the skill:
 |-------|---------|--------------|
 | **Brainstorm** | `/skill:brainstorming` | Refine your idea into a design doc via collaborative dialogue |
 | **Plan** | `/skill:writing-plans` | Break the design into bite-sized TDD tasks with exact file paths and code |
-| **Execute** | `/skill:executing-tasks` | Implement the plan task-by-task with TDD discipline |
+| **Execute** | `/skill:executing-tasks` | Implement the plan task-by-task with TDD discipline and optional checkpoint review gates |
 | **Finalize** | `/skill:finalizing` | Archive plan docs, update README/CHANGELOG, create PR |
 
 During brainstorm and plan, the extension blocks `write`/`edit` outside `docs/plans/`. During execute and finalize, all tools are available.
@@ -42,7 +42,7 @@ During brainstorm and plan, the extension blocks `write`/`edit` outside `docs/pl
 |-------|------:|-------------|
 | `brainstorming` | ~30 | Explore the idea, propose approaches, write design doc |
 | `writing-plans` | ~35 | Break design into tasks with TDD scenarios, set up branch/worktree |
-| `executing-tasks` | ~40 | Implement tasks with TDD discipline, handle code review |
+| `executing-tasks` | ~50 | Implement tasks with TDD discipline, checkpoint review gates, handle code review |
 | `finalizing` | ~20 | Archive docs, update changelog, create PR, clean up |
 
 ### TDD Three-Scenario Model
@@ -55,6 +55,16 @@ The plan labels each task with its TDD scenario:
 | Modifying tested code | Changing existing behavior | Run existing tests first → modify → verify |
 | Trivial | Config, docs, naming | Use judgment |
 
+### Checkpoint Review Gates
+
+Optionally label tasks with a `checkpoint` to pause for human review:
+
+| Checkpoint | When to use | What happens |
+|---|---|---|
+| *(none)* | Trivial tasks, well-understood changes | Auto-advance, no pause |
+| `checkpoint: test` | Test design matters | Pause after failing test, before implementing |
+| `checkpoint: done` | Implementation review matters | Pause after implementation passes tests, before committing |
+
 ## Architecture
 
 ```

package/docs/plans/2026-04-11-finalizing-merge-options-design.md

@@ -0,0 +1,33 @@
+# Finalizing: Merge Strategy Options
+
+## Problem
+
+The finalizing skill hard-codes "Create PR" as the only shipping option. In practice, small features often don't need a PR — they can be merged directly back to the parent branch.
+
+## Design
+
+Add a merge strategy step after updating documentation. The human chooses one of four options:
+
+1. **Create PR** — push and open a PR for external review via `gh pr create`
+2. **Rebase & merge** (recommended) — rebase onto parent, fast-forward merge, push parent, delete feature branch. Preserves per-task commit history linearly.
+3. **Squash & merge** — squash all commits into one on parent, push parent, delete feature branch. Clean single-commit history.
+4. **Merge commit** — merge with `--no-ff`, push parent, delete feature branch. Preserves all commits and branch topology.
+
+### Flow for options 2–4 (local merge)
+
+1. Detect parent branch (compare `main` vs `master`, fall back to `git show-branch`)
+2. Switch to parent branch and pull latest
+3. Execute the chosen merge strategy:
+   - Rebase: `git rebase <parent>` on feature branch, then `git merge --ff-only <feature>` on parent
+   - Squash: `git merge --squash <feature>` on parent, then `git commit`
+   - Merge commit: `git merge --no-ff <feature>` on parent
+4. Push parent to origin
+5. Delete feature branch locally and remotely
+
+### Prompting
+
+The skill should ask the human which option they prefer, presenting rebase & merge as the default recommendation.
+
+## Changes
+
+- Update `skills/finalizing/SKILL.md` to replace the hard-coded PR step with the 4-option choice.

package/docs/plans/completed/2026-04-11-checkpoint-review-gates-design.md

@@ -0,0 +1,50 @@
+# Checkpoint Review Gates for Task Execution
+
+## Problem
+
+Executing-tasks runs through tasks without pausing. There's no way for the human to review tests before implementation, or review implementation before committing. The TDD labels in plans are advisory, not enforceable. There's no configuration for review gates.
+
+## Design
+
+Add optional `checkpoint` labels to individual tasks in the implementation plan. Executing-tasks pauses at checkpoint boundaries for human review.
+
+## Checkpoint labels
+
+Each task can optionally include a `checkpoint` label:
+
+- **`checkpoint: test`** — pause after writing the failing test, before implementing
+- **`checkpoint: done`** — pause after implementation + tests pass, before committing
+- **No label** — auto-advance, no pause
+
+The label is orthogonal to the TDD scenario. A "new feature" task with `checkpoint: test` means: write failing test → pause → implement → run tests → commit. Without a checkpoint, the same task flows straight through.
+
+## Who sets checkpoints
+
+The agent decides which tasks get checkpoints during plan writing, based on complexity and risk. The user reviews the plan before execution and can add, remove, or change checkpoints.
+
+## Changes
+
+### writing-plans/SKILL.md
+
+Add `checkpoint` as an optional field in the task format section, with the two values and the "no label means auto-advance" rule. Update the TDD table to show how checkpoints interact with each scenario. Add guidance for the agent on when to use each checkpoint value.
+
+### executing-tasks/SKILL.md
+
+Update the per-task lifecycle to handle checkpoints:
+
+- **No checkpoint** — existing flow unchanged
+- **`checkpoint: test`** — write failing test → show diff → pause for review → proceed based on human input → implement → run tests → fix if needed → commit
+- **`checkpoint: done`** — implement → run tests → fix if needed → show diff → pause for review → proceed based on human input → commit
+
+The pause is a simple conversation stop — the agent shows what was done and the diff, then waits. The human can say anything: change the test, tweak the implementation, approve, revert, adjust the plan. No rigid menu.
+
+Pause message format:
+
+```
+⏸ Paused at checkpoint: [test|done] for task [N]
+
+**What was done:** [brief summary]
+**Diff:** [show relevant diff]
+
+Review and let me know how to proceed.
+```

package/docs/plans/completed/2026-04-11-checkpoint-review-gates-implementation.md

@@ -0,0 +1,98 @@
+# Checkpoint Review Gates: Implementation Plan
+
+## Tasks
+
+### Task 1: Update writing-plans/SKILL.md — add checkpoint field and agent guidance
+
+**Scenario:** Trivial (docs)
+
+**File:** `skills/writing-plans/SKILL.md`
+
+Add a "Checkpoint labels" section after "TDD in the plan" with the optional `checkpoint` field, values, and agent guidance. Also update the TDD table to show how checkpoints interact with each scenario.
+
+After the "TDD in the plan" section, add:
+
+```
+## Checkpoint labels
+
+Optionally label each task with a `checkpoint` to require human review before proceeding:
+
+| Checkpoint | When to use | What happens during execution |
+|---|---|---|
+| *(none)* | Trivial tasks, well-understood changes | Auto-advance, no pause |
+| **`checkpoint: test`** | Test design matters (API contracts, edge cases, complex behavior) | Pause after writing the failing test, before implementing |
+| **`checkpoint: done`** | Implementation review matters (complex logic, security, performance) | Pause after implementation + tests pass, before committing |
+
+Use judgment when assigning checkpoints. Prefer `checkpoint: test` for new features with non-obvious test design. Prefer `checkpoint: done` for tasks where the implementation approach is debatable. Most tasks should not need a checkpoint. The user can adjust checkpoints when reviewing the plan.
+```
+
+Also update the "Task format" section — after the `git commit` bullet, add:
+
+```
+- Optional `checkpoint: test` or `checkpoint: done` label
+```
+
+**Commit:** `feat(writing-plans): add checkpoint labels for review gates`
+
+### Task 2: Update executing-tasks/SKILL.md — handle checkpoints in per-task lifecycle
+
+**Scenario:** Trivial (docs)
+
+**File:** `skills/executing-tasks/SKILL.md`
+
+Replace the "Per-task lifecycle" section with checkpoint-aware flows. Add a "Checkpoint review" section.
+
+Replace the existing "Per-task lifecycle" section with:
+
+```
+## Per-task lifecycle
+
+Check each task for a `checkpoint` label and follow the appropriate flow:
+
+### No checkpoint (auto-advance)
+
+1. **Implement** — write the code as described in the plan
+2. **Run tests** — verify the changes work
+3. **Fix if needed** — if tests fail, debug and fix before moving on
+4. **Commit** — `git add` the relevant files and commit with a clear message
+
+### checkpoint: test
+
+1. **Write the test** — follow the TDD scenario for the task
+2. **Pause for review** — show what was done and the diff, then wait for human input
+3. **Continue** — implement, run tests, fix if needed
+4. **Commit** — `git add` the relevant files and commit with a clear message
+
+### checkpoint: done
+
+1. **Implement** — write the code as described in the plan
+2. **Run tests** — verify the changes work
+3. **Fix if needed** — if tests fail, debug and fix before moving on
+4. **Pause for review** — show what was done and the diff, then wait for human input
+5. **Commit** — `git add` the relevant files and commit with a clear message
+```
+
+After the "TDD discipline" section, add:
+
+```
+## Checkpoint review
+
+When pausing at a checkpoint, present:
+
+```
+⏸ Paused at checkpoint: [test|done] for task [N]
+
+**What was done:** [brief summary]
+**Diff:** [show relevant diff]
+
+Review and let me know how to proceed.
+```
+
+Wait for the human to respond. They may:
+- Approve and continue
+- Request changes to the test or implementation
+- Ask to revert the task
+- Adjust the remaining plan
+```
+
+**Commit:** `feat(executing-tasks): add checkpoint review gates`

package/docs/plans/completed/2026-04-11-finalizing-merge-options-design.md

@@ -0,0 +1,33 @@
+# Finalizing: Merge Strategy Options
+
+## Problem
+
+The finalizing skill hard-codes "Create PR" as the only shipping option. In practice, small features often don't need a PR — they can be merged directly back to the parent branch.
+
+## Design
+
+Add a merge strategy step after updating documentation. The human chooses one of four options:
+
+1. **Create PR** — push and open a PR for external review via `gh pr create`
+2. **Rebase & merge** (recommended) — rebase onto parent, fast-forward merge, push parent, delete feature branch. Preserves per-task commit history linearly.
+3. **Squash & merge** — squash all commits into one on parent, push parent, delete feature branch. Clean single-commit history.
+4. **Merge commit** — merge with `--no-ff`, push parent, delete feature branch. Preserves all commits and branch topology.
+
+### Flow for options 2–4 (local merge)
+
+1. Detect parent branch (compare `main` vs `master`, fall back to `git show-branch`)
+2. Switch to parent branch and pull latest
+3. Execute the chosen merge strategy:
+   - Rebase: `git rebase <parent>` on feature branch, then `git merge --ff-only <feature>` on parent
+   - Squash: `git merge --squash <feature>` on parent, then `git commit`
+   - Merge commit: `git merge --no-ff <feature>` on parent
+4. Push parent to origin
+5. Delete feature branch locally and remotely
+
+### Prompting
+
+The skill should ask the human which option they prefer, presenting rebase & merge as the default recommendation.
+
+## Changes
+
+- Update `skills/finalizing/SKILL.md` to replace the hard-coded PR step with the 4-option choice.

package/docs/plans/completed/2026-04-11-finalizing-merge-options-implementation.md

@@ -0,0 +1,75 @@
+# Finalizing: Merge Strategy Options — Implementation Plan
+
+## Context
+
+Replace the hard-coded "Create PR" step in the finalizing skill with a 4-option merge strategy prompt (Create PR, Rebase & merge, Squash & merge, Merge commit).
+
+Design doc: `docs/plans/2026-04-11-finalizing-merge-options-design.md`
+
+---
+
+## Task 1 — Replace the PR step with a merge strategy prompt
+
+**TDD scenario:** Trivial (skill docs, no code to test)
+
+**File:** `skills/finalizing/SKILL.md`
+
+Replace step 3 ("Create PR") and step 4 ("Clean up") with the new merge strategy section. Keep steps 1 and 2 unchanged.
+
+**New content for step 3 onwards:**
+
+```markdown
+3. **Choose a merge strategy** — ask the human which option they prefer:
+
+   1. **Create PR** — push and open a PR for external review:
+      ```
+      git push origin <branch>
+      gh pr create --title "feat: <summary>" --body "<task summary>"
+      ```
+
+   2. **Rebase & merge** *(recommended)* — rebase onto parent, fast-forward merge, push parent, delete branch:
+      ```
+      parent=$(git show-branch -a 2>/dev/null | grep '\*' | grep -v "$(git branch --show-current)" | head -1 | sed 's/.*\[\(.*\)\].*/\1/' | sed 's/[\^~].*//')
+      git checkout "$parent" && git pull
+      git checkout - && git rebase "$parent"
+      git checkout "$parent" && git merge --ff-only -
+      git push origin "$parent"
+      git branch -d - && git push origin --delete -
+      ```
+
+   3. **Squash & merge** — squash all commits into one on parent, push parent, delete branch:
+      ```
+      parent=$(git show-branch -a 2>/dev/null | grep '\*' | grep -v "$(git branch --show-current)" | head -1 | sed 's/.*\[\(.*\)\].*/\1/' | sed 's/[\^~].*//')
+      git checkout "$parent" && git pull
+      git merge --squash -
+      git commit -m "feat: <summary>"
+      git push origin "$parent"
+      git branch -d - && git push origin --delete -
+      ```
+
+   4. **Merge commit** — merge with `--no-ff`, push parent, delete branch:
+      ```
+      parent=$(git show-branch -a 2>/dev/null | grep '\*' | grep -v "$(git branch --show-current)" | head -1 | sed 's/.*\[\(.*\)\].*/\1/' | sed 's/[\^~].*//')
+      git checkout "$parent" && git pull
+      git merge --no-ff -m "Merge branch '<branch>'" -
+      git push origin "$parent"
+      git branch -d - && git push origin --delete -
+      ```
+
+   For options 2–4, confirm the detected parent branch with the human before proceeding.
+
+4. **Clean up** — if a worktree was used, remove it:
+   ```
+   git worktree remove ../<repo>-<feature-name>
+   ```
+```
+
+**Commit:** `feat: add merge strategy options to finalizing skill`
+
+---
+
+## Done
+
+The finalizing skill now offers four merge strategies instead of only "Create PR". No code files changed — this is a skill-documentation update only.
+
+To verify: read `skills/finalizing/SKILL.md` and confirm it contains all four options with correct commands.

package/docs/plans/completed/2026-04-11-workspace-setup-design.md

@@ -0,0 +1,28 @@
+# Workspace Setup: Move Branch Creation to Brainstorming
+
+## Problem
+
+Brainstorming commits the design doc to whatever branch you're on (usually `main`), polluting it. If the idea is scrapped, you have to revert the commit. The implementation branch created later by writing-plans starts from a point after the design commit, which is messy.
+
+## Design
+
+Move branch/worktree creation from writing-plans into brainstorming. The design doc lands on the feature branch from the start, keeping `main` clean.
+
+## Changes
+
+### brainstorming/SKILL.md
+
+Step 5 changes from writing + committing the design doc on the current branch to:
+
+1. Create a feature branch (`git checkout -b <feature-name>`) or worktree (`git worktree add ../<repo>-<feature-name> -b <feature-name>`) for larger features
+2. Write the design doc to `docs/plans/YYYY-MM-DD-<topic>-design.md`
+3. Single commit on the new branch with the design doc
+
+Feature name is derived from the topic slug in the design doc filename.
+
+### writing-plans/SKILL.md
+
+- Remove step 2 ("Set up workspace") entirely
+- Step 1 expands to verify the feature branch/worktree context created by brainstorming
+- Steps renumber: 1→2→3 becomes 1→2
+- Fallback path (no design doc, brainstorming was skipped) still creates a branch itself so writing-plans works standalone

package/docs/plans/completed/2026-04-11-workspace-setup-implementation.md

@@ -0,0 +1,57 @@
+# Workspace Setup: Implementation Plan
+
+## Tasks
+
+### Task 1: Update brainstorming/SKILL.md — add workspace setup to step 5
+
+**Scenario:** Trivial (docs)
+
+Replace step 5 with workspace creation + design doc commit.
+
+**File:** `skills/brainstorming/SKILL.md`
+
+Replace:
+
+```
+5. **Write the design doc** — save to `docs/plans/YYYY-MM-DD-<topic>-design.md` and commit.
+```
+
+With:
+
+```
+5. **Set up workspace & write the design doc** — create a branch for this work. For larger features, use a git worktree for isolation:
+   ```
+   git worktree add ../<repo>-<feature-name> -b <feature-name>
+   ```
+   Save the design doc to `docs/plans/YYYY-MM-DD-<topic>-design.md` and commit on the new branch.
+```
+
+**Commit:** `refactor(brainstorming): move workspace setup into step 5`
+
+### Task 2: Update writing-plans/SKILL.md — remove step 2, expand step 1
+
+**Scenario:** Trivial (docs)
+
+Remove step 2 ("Set up workspace") entirely. Expand step 1 to verify the feature branch context. Renumber step 3 → 2.
+
+**File:** `skills/writing-plans/SKILL.md`
+
+Replace:
+
+```
+1. **Check for a design doc** — look for `docs/plans/*-design.md`. If one exists, use it as the basis for the plan. If none exists, ask the user to describe what they want to build, read relevant code, and create the plan directly.
+2. **Set up workspace** — create a branch for this work. For larger features, use a git worktree for isolation:
+   ```
+   git worktree add ../<repo>-<feature-name> -b <feature-name>
+   ```
+3. **Write the implementation plan** — break the design into tasks. Save to `docs/plans/YYYY-MM-DD-<topic>-implementation.md`.
+```
+
+With:
+
+```
+1. **Check for a design doc & workspace** — look for `docs/plans/*-design.md`. If one exists, use it as the basis for the plan. Verify you're on the feature branch (or in its worktree) created during brainstorming. If no design doc exists, ask the user to describe what they want to build, read relevant code, create a branch, and create the plan directly.
+2. **Write the implementation plan** — break the design into tasks. Save to `docs/plans/YYYY-MM-DD-<topic>-implementation.md`.
+```
+
+**Commit:** `refactor(writing-plans): remove workspace setup, verify branch context`

package/extensions/workflow-guard.ts

@@ -1,3 +1,4 @@
+import { resolve } from "node:path";
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 
 /**
@@ -28,15 +29,17 @@ export default function (pi: ExtensionAPI) {
 
 	pi.on("input", (event) => {
 		const text = event.text ?? "";
-		for (const [skill, p] of Object.entries(SKILL_TO_PHASE)) {
-			if (text.includes(skill)) {
-				phase = p;
+		const match = text.match(/^\/skill:([\w-]+)/);
+		if (match) {
+			const skill = match[1];
+			if (skill in SKILL_TO_PHASE) {
+				phase = SKILL_TO_PHASE[skill];
 				return;
 			}
 		}
 		if (
-			text.includes("executing-tasks") ||
-			text.includes("finalizing")
+			text.startsWith("/skill:executing-tasks") ||
+			text.startsWith("/skill:finalizing")
 		) {
 			phase = null;
 		}
@@ -50,7 +53,9 @@ export default function (pi: ExtensionAPI) {
 		const filePath = (event.input as { path?: string }).path ?? "";
 		if (!filePath) return;
 
-		if (filePath.startsWith("docs/plans/")) return;
+		const absolute = resolve(ctx.cwd, filePath);
+		const plansDir = resolve(ctx.cwd, "docs/plans");
+		if (absolute.startsWith(plansDir + "/")) return;
 
 		if (ctx.hasUI) {
 			ctx.ui.notify(
@@ -60,7 +65,7 @@ export default function (pi: ExtensionAPI) {
 		}
 
 		return {
-			blocked: true,
+			block: true,
 			reason: `⚠️ ${phase.toUpperCase()} PHASE: Cannot ${event.toolName} to ${filePath}. Only docs/plans/ is writable during brainstorming and planning.`,
 		};
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tianhai/pi-workflow-kit",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "Workflow skills and enforcement extensions for pi",
   "keywords": [
     "pi-package"

package/skills/brainstorming/SKILL.md

@@ -13,7 +13,11 @@ Read-only exploration. You may **not** edit or create any files except under `do
 2. **Understand the idea** — read existing code, docs, and recent commits. Ask questions one at a time to refine the idea. Prefer multiple choice when possible.
 3. **Explore approaches** — propose 2-3 approaches with trade-offs. Lead with your recommendation.
 4. **Present the design** — break it into sections of 200-300 words. Check after each section whether it looks right. Cover: architecture, components, data flow, error handling, testing.
-5. **Write the design doc** — save to `docs/plans/YYYY-MM-DD-<topic>-design.md` and commit.
+5. **Set up workspace & write the design doc** — create a branch for this work. For larger features, use a git worktree for isolation:
+   ```
+   git worktree add ../<repo>-<feature-name> -b <feature-name>
+   ```
+   Save the design doc to `docs/plans/YYYY-MM-DD-<topic>-design.md` and commit on the new branch.
 
 ## Principles
 

package/skills/executing-tasks/SKILL.md

@@ -9,13 +9,30 @@ Implement the plan from `docs/plans/*-implementation.md` task by task.
 
 ## Per-task lifecycle
 
-For each task:
+Check each task for a `checkpoint` label and follow the appropriate flow:
+
+### No checkpoint (auto-advance)
 
 1. **Implement** — write the code as described in the plan
 2. **Run tests** — verify the changes work
 3. **Fix if needed** — if tests fail, debug and fix before moving on
 4. **Commit** — `git add` the relevant files and commit with a clear message
 
+### checkpoint: test
+
+1. **Write the test** — follow the TDD scenario for the task
+2. **Pause for review** — show what was done and the diff, then wait for human input
+3. **Continue** — implement, run tests, fix if needed
+4. **Commit** — `git add` the relevant files and commit with a clear message
+
+### checkpoint: done
+
+1. **Implement** — write the code as described in the plan
+2. **Run tests** — verify the changes work
+3. **Fix if needed** — if tests fail, debug and fix before moving on
+4. **Pause for review** — show what was done and the diff, then wait for human input
+5. **Commit** — `git add` the relevant files and commit with a clear message
+
 ## TDD discipline
 
 Follow the TDD scenario from the plan:
@@ -26,6 +43,25 @@ Follow the TDD scenario from the plan:
 
 Don't skip tests because "it's obvious." The test is the contract.
 
+## Checkpoint review
+
+When pausing at a checkpoint, present:
+
+```
+⏸ Paused at checkpoint: [test|done] for task [N]
+
+**What was done:** [brief summary]
+**Diff:** [show relevant diff]
+
+Review and let me know how to proceed.
+```
+
+Wait for the human to respond. They may:
+- Approve and continue
+- Request changes to the test or implementation
+- Ask to revert the task
+- Adjust the remaining plan
+
 ## Receiving code review
 
 When the user shares code review feedback:

package/skills/finalizing/SKILL.md

@@ -9,11 +9,12 @@ Ship the completed work.
 
 ## Process
 
-1. **Move planning docs** — archive the design and implementation docs:
+1. **Move planning docs** — archive the design and implementation docs, then commit:
    ```
    mkdir -p docs/plans/completed
    mv docs/plans/*-design.md docs/plans/completed/
    mv docs/plans/*-implementation.md docs/plans/completed/
+   git add docs/plans/completed/ && git commit -m "chore: archive planning docs"
    ```
 
 2. **Update documentation** — if the API or surface changed:
@@ -21,13 +22,46 @@ Ship the completed work.
    - Update CHANGELOG.md
    - Update any inline docs
 
-3. **Create PR**:
-   ```
-   git push origin <branch>
-   gh pr create --title "feat: <summary>" --body "<task summary>"
-   ```
+3. **Choose a merge strategy** — ask the human which option they prefer:
+
+   1. **Create PR** — push and open a PR for external review:
+      ```
+      git push origin <branch>
+      gh pr create --title "feat: <summary>" --body "<task summary>"
+      ```
+
+   2. **Rebase & merge** *(recommended)* — rebase onto parent, fast-forward merge, push parent, delete branch:
+      ```
+      parent=$(git show-branch -a 2>/dev/null | grep '\*' | grep -v "$(git branch --show-current)" | head -1 | sed 's/.*\[\(.*\)\].*/\1/' | sed 's/[\^~].*//')
+      git checkout "$parent" && git pull
+      git checkout - && git rebase "$parent"
+      git checkout "$parent" && git merge --ff-only -
+      git push origin "$parent"
+      git branch -d - && git push origin --delete -
+      ```
+
+   3. **Squash & merge** — squash all commits into one on parent, push parent, delete branch:
+      ```
+      parent=$(git show-branch -a 2>/dev/null | grep '\*' | grep -v "$(git branch --show-current)" | head -1 | sed 's/.*\[\(.*\)\].*/\1/' | sed 's/[\^~].*//')
+      git checkout "$parent" && git pull
+      git merge --squash -
+      git commit -m "feat: <summary>"
+      git push origin "$parent"
+      git branch -d - && git push origin --delete -
+      ```
+
+   4. **Merge commit** — merge with `--no-ff`, push parent, delete branch:
+      ```
+      parent=$(git show-branch -a 2>/dev/null | grep '\*' | grep -v "$(git branch --show-current)" | head -1 | sed 's/.*\[\(.*\)\].*/\1/' | sed 's/[\^~].*//')
+      git checkout "$parent" && git pull
+      git merge --no-ff -m "Merge branch '<branch>'" -
+      git push origin "$parent"
+      git branch -d - && git push origin --delete -
+      ```
+
+   For options 2–4, confirm the detected parent branch with the human before proceeding.
 
-4. **Clean up** — if a worktree was used, remove it after the PR is merged:
+4. **Clean up** — if a worktree was used, remove it:
    ```
    git worktree remove ../<repo>-<feature-name>
    ```

package/skills/writing-plans/SKILL.md

@@ -9,12 +9,8 @@ Read-only exploration. You may **not** edit or create any files except under `do
 
 ## Process
 
-1. **Check for a design doc** — look for `docs/plans/*-design.md`. If one exists, use it as the basis for the plan. If none exists, ask the user to describe what they want to build, read relevant code, and create the plan directly.
-2. **Set up workspace** — create a branch for this work. For larger features, use a git worktree for isolation:
-   ```
-   git worktree add ../<repo>-<feature-name> -b <feature-name>
-   ```
-3. **Write the implementation plan** — break the design into tasks. Save to `docs/plans/YYYY-MM-DD-<topic>-implementation.md`.
+1. **Check for a design doc & workspace** — look for `docs/plans/*-design.md`. If one exists, use it as the basis for the plan. Verify you're on the feature branch (or in its worktree) created during brainstorming. If no design doc exists, ask the user to describe what they want to build, read relevant code, create a branch, and create the plan directly.
+2. **Write the implementation plan** — break the design into tasks. Save to `docs/plans/YYYY-MM-DD-<topic>-implementation.md`.
 
 ## Task format
 
@@ -24,6 +20,7 @@ Each task should be 2-5 minutes of work:
 - Complete code (not "add validation")
 - Exact commands with expected output
 - `git commit` after each task
+- Optional `checkpoint: test` or `checkpoint: done` label
 
 ## TDD in the plan
 
@@ -35,6 +32,18 @@ Label each task with its TDD scenario:
 | **Modifying tested code** | Changing existing behavior | Run existing tests first → modify → verify they pass → commit |
 | **Trivial** | Config, docs, naming | Use judgment, commit when done |
 
+## Checkpoint labels
+
+Optionally label each task with a `checkpoint` to require human review before proceeding:
+
+| Checkpoint | When to use | What happens during execution |
+|---|---|---|
+| *(none)* | Trivial tasks, well-understood changes | Auto-advance, no pause |
+| **`checkpoint: test`** | Test design matters (API contracts, edge cases, complex behavior) | Pause after writing the failing test, before implementing |
+| **`checkpoint: done`** | Implementation review matters (complex logic, security, performance) | Pause after implementation + tests pass, before committing |
+
+Use judgment when assigning checkpoints. Prefer `checkpoint: test` for new features with non-obvious test design. Prefer `checkpoint: done` for tasks where the implementation approach is debatable. Most tasks should not need a checkpoint. The user can adjust checkpoints when reviewing the plan.
+
 ## After the plan
 
 Ask: "Ready to execute? Run `/skill:executing-tasks`"