--- name: kill-this description: Per-task PR + session-log update. Build check, commit code, push the task branch, run code review, open a PR, and append a `## Task ` block to the running session file on the orphan `sessions` branch. May run multiple times in one Claude window — one per task. Pair with `/its-dead` once at the end of the window. Time math + version bump moved to `/retro` (DEC-013). tools: Read, Edit, Write, Bash, Glob, Grep, Agent --- You are shipping one task. Under DEC-013, `/kill-this` runs **per task**, not per session — there may be N invocations between `/its-alive` and `/its-dead`. Each one opens its own PR and appends one `## Task ` block to the session file (which lives on the orphan `sessions` branch via `.sessions-worktree/`, per DEC-014). ## Step 0 — Capture branch + locate session file `BRANCH=$(git branch --show-current)`. Find the open session file on the sessions worktree: ``` SESSION_FILE=$(grep -l "^status: open" .sessions-worktree/sessions/*.md 2>/dev/null | head -1) ``` If none found: STOP. The user must run `/its-alive` first. (If `.sessions-worktree/` doesn't exist, that's also a sign `/its-alive` hasn't run — `/its-alive` Step 0.6 creates the worktree.) Read the file's frontmatter to get session number `N` and the current `pr_numbers:` list. Determine the next task index: ``` TASK_NUM=$(($(grep -c "^## Task " "$SESSION_FILE") + 1)) ``` ## Step 1 — Build check Look up the project's build check in `CLAUDE.md §Commands` (e.g. `npm run build`, `cargo build`, `make`). Run it. Fix errors before proceeding. Do not commit broken code. If no build step is defined (markdown-only / domain project), skip silently. ## Step 2 — Commit code on the task branch Stage all uncommitted code changes on the **task branch** (the current `$BRANCH` — NOT the sessions worktree). The session-file update happens later in Step 5 and goes to the sessions branch, not here. ``` git add -A git commit -m " Co-Authored-By: Claude Sonnet 4.6 " ``` If there is nothing to commit, surface that and stop here — no PR for no code. **Push the branch — do not open a PR yet:** - **On `main` (DEC-005 solo flow, unprotected main):** `git push origin main`. Skip Steps 3+4 — no PR. Go to Step 5. - **On a `task/*`, `claude/`, or feature branch:** `git push -u origin $BRANCH`. Continue. Capture `SUBJECT=$(git log -1 --format=%s)` for the PR title. ## Step 3 — Code review Run `@code-review` against `git diff HEAD~1`. Capture the findings — needed for the PR body and the task block. When addressing review findings before opening the PR: Read every file before editing it (parallel writes fail silently without a prior Read). ## Step 4 — Open the PR Resolve base branch: ``` git show-ref --verify --quiet refs/remotes/origin/staging && BASE=staging || BASE=main ``` **Merge-order check:** `git diff --name-only $BASE..HEAD` for changed files. `gh pr list --state open --base "$BASE" --json number,title,headRefName`. For each other open PR's branch, run `gh pr diff --name-only` and warn on any file overlap. Advisory; don't block. ### Step 4.0 — Resolve existing PR state for this branch Set `EXISTING_PR_STATE` to one of `OPEN`, `MERGED`, `CLOSED`, `NONE`. Method 1 = `gh pr view "$BRANCH" --json url,state 2>/dev/null`. Method 2 = `mcp__github__list_pull_requests` (head: `:$BRANCH`, state: all). Method 3 = STOP and ask the user. - **OPEN**: capture `PR_URL` and `PR_NUMBER`, skip Step 4.2 (no duplicate). Note in the task block. - **MERGED / CLOSED**: unusual — this branch was already shipped. Ask the user: "Existing PR is `$EXISTING_PR_STATE`. Open a new PR on top? (y/n)" — if no, surface and stop; if yes, proceed to Step 4.2. - **NONE**: proceed to Step 4.2. ### Step 4.2 — Create the PR Compose `BODY`: **## Summary** One-line description. **## Files changed** Bulleted list from `git diff --name-only $BASE..HEAD`. **## Code review** Findings from Step 3 (or "Clean bill of health."). **## Test plan** Step-by-step scenarios you generated yourself from `git diff --name-only $BASE..HEAD`. Specific URL → action → expected result. Migration files → `supabase db push` verification. RLS / pgTAP touches → `supabase test db`. UI paths → per-screen scenario. Never empty, never generic. Try in order: 1. `gh pr create --base "$BASE" --head "$BRANCH" --title "$SUBJECT" --body "$BODY"` 2. MCP `mcp__github__create_pull_request` fallback. 3. STOP: print body for the user to paste manually; note "PR not opened" in the task block. Capture `PR_NUMBER` and `PR_URL`. ## Step 5 — Append the task block to the session file (sessions branch) The session file lives on the orphan `sessions` branch at `.sessions-worktree/sessions/.md`. Read it first. Compose the task block: ``` ## Task : **Completed:** - **Code review:** **PR:** [#]() **Points:** **Blocked:** **Branch:** **Opened at:** ``` Use the **Edit** tool on `$SESSION_FILE` (the worktree path) to: 1. Append the `## Task :` block before the `**Next Steps:**` section near the bottom. 2. Update the frontmatter `pr_numbers:` list to append ``. Example: `pr_numbers: [42, 43]`. Then commit + push using `git -C` to target the worktree directory (no `cd` — shell state doesn't persist between Bash calls, and a stray `cd` that fails leaves the next command running in the wrong tree): ``` git -C .sessions-worktree add sessions/$(basename "$SESSION_FILE") git -C .sessions-worktree commit -m "Session — log Task (PR #)" git -C .sessions-worktree push origin sessions git -C .sessions-worktree checkout sessions 2>/dev/null || true ``` The final `checkout sessions` re-pins the worktree HEAD to the `sessions` branch — guards against a detached-HEAD state if anything upstream rewrote history. The user's main checkout never moves; the task branch stays clean (no session-file pollution). ## Step 6 — Surface to the user ``` Task shipped. PR: Code review: Next: keep working in this session (cut another branch + `/kill-this` again), or run `/its-dead` to close the session. ``` If `EXISTING_PR_STATE` was `OPEN` and Step 4.2 was skipped, surface the existing PR URL and note that the task block now references the pre-existing PR. ## Notes - **No time math, no version bump, no CHANGELOG.** All deferred to `/retro` per DEC-013. This skill ships a task and logs it; that's it. - **Branch ownership.** Code commits go to the current task branch. Session-file commits go to the sessions branch via the worktree. Two completely separate timelines. - **Multiple PRs per session is normal.** Each `/kill-this` appends a `## Task ` block; the `pr_numbers:` list grows. `/retro` reads this list to enumerate the PRs to query for merge timestamps. - **Merge ordering is free.** The user can merge each PR whenever — before the next `/kill-this`, after `/its-dead`, days later. Retro reads GitHub at retro time and gets the merge timestamps regardless. - **Atomicity at `/its-dead`.** Once `/its-dead` writes `status: closed`, the session file is never modified again. `/retro` reads it but only writes to `RETROSPECTIVES.md` and (on dev projects) to `package.json` / `CHANGELOG.md` / git tags.