codebyplan 1.13.49 → 1.13.51

package/templates/skills/cbp-git-worktree-remove/SKILL.md

@@ -1,144 +0,0 @@
----
-name: cbp-git-worktree-remove
-description: Remove git worktree and deregister from CodeByPlan
-argument-hint: <name> e.g. codebyplan-app
-effort: low
----
-
-# Git Worktree Remove
-
-Remove a git worktree folder, deregister it from CodeByPlan, and optionally delete its branch.
-
-## Arguments
-
-`$ARGUMENTS`: worktree name or path to remove.
-
-## Prerequisites
-
-- Must run from the **main repo** (not from the worktree being removed)
-
-## Instructions
-
-### Step 1: Verify Main Repo
-
-```bash
-MAIN_REPO="$(git rev-parse --show-toplevel)"
-```
-
-Verify not in a worktree (`.git` should be a directory, not a file).
-
-### Step 2: List Worktrees
-
-```bash
-git worktree list
-```
-
-If `$ARGUMENTS` is empty, show the list and ask which to remove.
-
-### Step 3: Resolve Worktree
-
-Find matching worktree from the list. Match by:
-1. Exact path
-2. Folder name (e.g. `codebyplan-app`)
-3. Branch name
-
-If no match found, show available worktrees and stop.
-
-Set:
-- `WORKTREE_PATH` = resolved path
-- `BRANCH_NAME` = branch checked out in that worktree
-
-### Step 4: Look Up and Deregister Worktree in CodeByPlan
-
-Run `codebyplan worktree remove "$BRANCH_NAME"` and parse the JSON output (`{ mcp_deregistered: boolean, warn? }`):
-
-- If `warn` is present: surface it as a non-blocking warning. The worktree was not found in CodeByPlan or deregistration failed, but local removal will proceed.
-- If `mcp_deregistered === true`: worktree was successfully deregistered.
-- If `mcp_deregistered === false`: worktree was not registered or deregistration failed; continue with local removal.
-
-### Step 5: Check for Assigned Checkpoints
-
-If the worktree was successfully deregistered in Step 4 (`mcp_deregistered === true`), any checkpoints that were assigned to it will become unassigned. This is expected behavior and requires no additional action.
-
-### Step 6: Confirm with User
-
-```
-## Remove Worktree
-
-**Path**: [worktree-path]
-**Branch**: [branch-name]
-**CodeByPlan**: [registered | not registered]
-
-Remove worktree and delete the branch? (The main repo is not affected)
-```
-
-Ask:
-1. Remove worktree only (keep branch)
-2. Remove worktree and delete branch
-3. Cancel
-
-### Step 7: Remove Git Worktree
-
-```bash
-git worktree remove "$WORKTREE_PATH"
-```
-
-If force needed (uncommitted changes):
-```bash
-git worktree remove --force "$WORKTREE_PATH"
-```
-
-Only use `--force` if the user confirms.
-
-### Step 8: Delete Branch (if requested)
-
-**Protected branch check:** Read the protected set from `.codebyplan/git.json`:
-```bash
-PRODUCTION=$(jq -r '.branch_config.production // "main"' .codebyplan/git.json)
-PROTECTED=$(jq -r '.branch_config.protected[]? // empty' .codebyplan/git.json)
-```
-If `$BRANCH_NAME` equals `$PRODUCTION` or appears in `$PROTECTED` — refuse deletion and stop.
-
-**Checkpoint verification:** Before deleting a feat branch, verify that the associated checkpoint has completed via `/cbp-checkpoint-end`. If the checkpoint is still active, warn the user that unshipped work may be lost.
-
-```bash
-git branch -d "$BRANCH_NAME" && git push origin --delete "$BRANCH_NAME"
-```
-
-Use `-d` (not `-D`) to prevent deleting unmerged work. If it fails because the branch is not fully merged, inform the user and ask if they want to force delete with `-D`.
-
-After the git branch delete succeeds, run a conditional Supabase preview-branch teardown for `$BRANCH_NAME`:
-
-> Lifecycle contract: see [[supabase-branch-lifecycle]].
-
-- Resolve the parent project ref and apply the lifecycle guard in one deterministic call:
-
-  ```bash
-  codebyplan supabase teardown-preview "$BRANCH_NAME"
-  ```
-
-  Parse its JSON `{ status, parent_ref, project_ref, reason }`. The command never deletes anything — it reads the parent ref from `.codebyplan/shipment.json` (`.shipment.surfaces.supabase.project_ref`) and applies the protected / production / parent-ref guard from [[supabase-branch-lifecycle]].
-- If `status === "rejected"`: STOP the teardown and surface `reason` — never delete a production / protected / integration branch or one whose preview ref equals the parent.
-- Otherwise (`allowed` or `not_found`), use `parent_ref` for the live existence check — `mcp__supabase__list_branches` with `project_id: <parent_ref>`, then scan for an entry whose `name` exactly equals `$BRANCH_NAME`:
-  - If found: call `mcp__supabase__delete_branch` with its `branch_id`. Report "Supabase preview branch deleted: `$BRANCH_NAME`".
-  - If not found: no-op silently — the GitHub integration may have already removed it on PR close; not-found is success, NOT an error.
-  - If the `list_branches` call itself fails (network, auth, or a non-success response — distinct from a successful lookup that returns no match): emit a non-blocking warning that the Supabase preview branch for `$BRANCH_NAME` may still exist and should be verified in the dashboard. Do not treat an API failure as a not-found success.
-- Never delete the parent project (`parent_ref` from `codebyplan supabase teardown-preview`) itself or any persistent/production branch — the `teardown-preview` guard enforces this.
-
-### Step 9: Show Result
-
-```
-## Worktree Removed
-
-**Removed**: [worktree-path]
-**Branch**: [deleted | kept]
-**CodeByPlan**: [deregistered | was not registered]
-
-### Remaining Worktrees
-[output of git worktree list]
-```
-
-## Integration
-
-- **Related**: `/cbp-git-worktree-create` (create and register)
-- **CLI**: `codebyplan worktree remove <name>` (Step 4 — deregister from CodeByPlan)