codebyplan 1.11.2 → 1.13.0

package/templates/skills/cbp-supabase-setup/reference/branching-setup.md

@@ -26,7 +26,7 @@ Verify: the integration tile now shows the connected repository name.
 Protect both `main` AND the integration branch (e.g., `development`) so PRs cannot be merged
 until the Supabase Preview environment passes.
 
-For each branch (`main`, then the integration branch from `.codebyplan.json`
+For each branch (`main`, then the integration branch from `.codebyplan/git.json`
 `branch_config.integration`):
 
 1. **GitHub → Repository → Settings → Branches → Add branch protection rule**.
@@ -94,7 +94,7 @@ migration push.
 
 ## 5. Idempotency Marker
 
-After setup completes, `/cbp-supabase-setup` writes to `.codebyplan.json`:
+After setup completes, `/cbp-supabase-setup` writes to `.codebyplan/shipment.json`:
 
 ```json
 {

package/templates/skills/cbp-task-complete/SKILL.md

@@ -137,9 +137,7 @@ Skip the push only when nothing was committed in Step 5 AND `/cbp-merge-main` re
 
 ### Step 7: Complete Task
 
-If `CALLER_WT` is non-empty, call `complete_task(task_id, caller_worktree_id: CALLER_WT)`. Otherwise call `complete_task(task_id)` with no worktree id — the pre-guard is skipped (backwards-compat).
-
-**When calling `complete_task`**: pass `caller_worktree_id` resolved from `npx codebyplan resolve-worktree`. The MCP server's pre-guard rejects mutations from non-matching worktrees; supplying `caller_worktree_id` ensures legitimate completion succeeds. The server auto-clears `assigned_user_id` + `assigned_worktree_id` on the task; if this was the last sibling task, it also clears the parent checkpoint's assignment. (Per CHK-104 TASK-2 hard-lock.)
+Call `complete_task(task_id)`. The server resolves the caller's worktree identity from the JWT/ctx and enforces the mutate-lock (CHK-140 TASK-3 — `caller_worktree_id` input field removed). The server auto-clears `assigned_user_id` + `assigned_worktree_id` on the task; if this was the last sibling task, it also clears the parent checkpoint's assignment. (Per CHK-104 hard-lock.)
 
 ### Step 7.5: Standalone Task Branch Merge
 

package/templates/skills/cbp-task-start/SKILL.md

@@ -115,6 +115,8 @@ fi
 
 **If `git checkout` exits non-zero** (typically "would clobber" because a tracked file has unstaged changes that conflict with target's version): surface the raw git error verbatim, stop, do NOT attempt recovery. The user resolves and re-invokes. This is the only case where `/cbp-task-start` halts on branch state.
 
+**Note — Supabase preview branch**: no Supabase branch is created at this point. Creation is lazy — it happens on the first DB change when `/cbp-supabase-migrate` runs on the feat branch, which provisions a Supabase branch named identically to the git branch. See `cbp-supabase-migrate` Step 2.3 for the creation protocol.
+
 #### 3.4 — Persist + verify
 
 After successful switch:
@@ -158,9 +160,9 @@ See `dependency-vulnerability-fixes.md` "Audit Sweep at Task Start" for the sour
 
 ### Step 3.5: Worktree-Match Verification
 
-Before activating the task, verify the caller's worktree matches the assigned worktree on the target row. (Per CHK-104 TASK-2 — DB-level hard-lock prevents cross-worktree mutations.)
+Before activating the task, verify the caller's worktree matches the assigned worktree on the target row. (Per CHK-104 — DB-level hard-lock prevents cross-worktree mutations; the server resolves caller identity from the JWT/ctx.)
 
-1. Read caller worktree: `CALLER_WT=$(npx codebyplan resolve-worktree 2>/dev/null)`. If empty, the `caller_worktree_id` parameter is omitted from the MCP call entirely — the pre-guard is skipped and the update proceeds without a worktree check (backwards-compat).
+1. Read caller worktree: `CALLER_WT=$(npx codebyplan resolve-worktree 2>/dev/null)`.
 2. Determine target worktree:
    - **Checkpoint-bound tasks**: `TARGET_WT = checkpoint.worktree_id` (read from MCP `get_checkpoints`). Note: checkpoint-bound tasks may have a NULL `task.assigned_worktree_id` because the lock lives on the parent checkpoint — fall through to `checkpoint.worktree_id`.
    - **Standalone tasks**: `TARGET_WT = task.assigned_worktree_id`.
@@ -220,7 +222,7 @@ Display context summary:
 
 Use MCP `update_task(task_id, status: "in_progress")`.
 
-If worktree_id present, include `claim_worktree_id` to auto-claim the checkpoint AND `caller_worktree_id: CALLER_WT` so the MCP server's pre-guard accepts the call (CHK-104 TASK-2 hard-lock).
+If worktree_id present, include `claim_worktree_id` to auto-claim the checkpoint. The server resolves the caller's worktree identity from the JWT/ctx (CHK-140 TASK-3 — `caller_worktree_id` input field removed).
 
 ### Step 6: Auto-trigger Round Start
 

package/templates/hooks/cbp-mcp-worktree-inject.sh

@@ -1,76 +0,0 @@
-#!/bin/bash
-# @scope: org-shared
-# Hook: PreToolUse mcp__codebyplan__(update_task|complete_task|complete_round|update_checkpoint)
-# Purpose: Auto-inject caller_worktree_id into MCP mutation calls when not already
-#          present. Uses the PreToolUse hookSpecificOutput.updatedInput contract
-#          (Claude Code v2.1 — see hooks.md "PreToolUse decision control"):
-#            - Output JSON with hookSpecificOutput.permissionDecision="allow" and
-#              hookSpecificOutput.updatedInput containing the full modified tool_input.
-#          This hook NEVER exits non-zero — it is a no-op on all failure paths.
-#
-# Fallback chain:
-#   1. caller_worktree_id already present in tool_input → passthrough (no-op)
-#   2. Primary: npx codebyplan resolve-worktree → UUID found → inject
-#   3. Secondary: npx codebyplan resolve-worktree --fallback-from-branch → UUID found → inject
-#   4. Both empty → passthrough (server pre-guard skips when absent)
-#
-# NEVER exit non-zero — backwards-compat passthrough when resolver is broken.
-
-INPUT=$(cat)
-
-TOOL_NAME=$(echo "$INPUT" | jq -r '.tool_name // empty' 2>/dev/null)
-
-# Only intercept matching MCP mutation tools
-case "$TOOL_NAME" in
-  mcp__codebyplan__update_task|\
-  mcp__codebyplan__complete_task|\
-  mcp__codebyplan__complete_round|\
-  mcp__codebyplan__update_checkpoint) ;;
-  *) exit 0 ;;
-esac
-
-# If caller_worktree_id is already present, pass through unchanged
-EXISTING=$(echo "$INPUT" | jq -r '.tool_input.caller_worktree_id // empty' 2>/dev/null)
-if [ -n "$EXISTING" ]; then
-  exit 0
-fi
-
-# Try primary resolver
-UUID=$(npx --yes codebyplan resolve-worktree 2>/dev/null)
-
-# Try fallback if primary returned empty
-if [ -z "$UUID" ]; then
-  UUID=$(npx --yes codebyplan resolve-worktree --fallback-from-branch 2>/dev/null)
-fi
-
-# If no UUID resolved, passthrough unchanged
-if [ -z "$UUID" ]; then
-  exit 0
-fi
-
-# Extract tool_input and guard against null before merging
-TOOL_INPUT=$(echo "$INPUT" | jq -c '.tool_input' 2>/dev/null)
-if [ -z "$TOOL_INPUT" ] || [ "$TOOL_INPUT" = "null" ]; then
-  # No tool_input to mutate — output original input unchanged
-  echo "$INPUT"
-  exit 0
-fi
-
-MERGED_TOOL_INPUT=$(echo "$TOOL_INPUT" | jq -c --arg uuid "$UUID" '. + {caller_worktree_id: $uuid}' 2>/dev/null)
-if [ -z "$MERGED_TOOL_INPUT" ] || [ "$MERGED_TOOL_INPUT" = "null" ]; then
-  echo "$INPUT"
-  exit 0
-fi
-
-# Output PreToolUse hookSpecificOutput with updatedInput
-jq -n \
-  --argjson updated "$MERGED_TOOL_INPUT" \
-  '{
-    hookSpecificOutput: {
-      hookEventName: "PreToolUse",
-      permissionDecision: "allow",
-      updatedInput: $updated
-    }
-  }'
-
-exit 0