codebyplan 1.13.9 → 1.13.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codebyplan",
-  "version": "1.13.9",
+  "version": "1.13.11",
   "description": "CLI for CodeByPlan — AI-powered development planning and tracking",
   "type": "module",
   "bin": {

package/templates/hooks/cbp-mcp-round-sync.sh

@@ -12,6 +12,14 @@
 #   - Web-UI flag (app_file_approval_by_user) consumption + reset
 #   - Writes both PATCH /api/rounds/${ROUND_ID} and PATCH /api/tasks/${TASK_ID}
 #
+# Caller worktree identity:
+#   The CLI auto-resolves caller_worktree_id (override flag → cache →
+#   in-process tuple API) and hard-fails with exit 1 if it cannot resolve
+#   on the write path. This hook resolves the worktree id before invoking the
+#   CLI and passes it via --caller-worktree-id so the server can honor the
+#   feat-worktree lock. The hook itself stays non-fatal (exits 0) and surfaces
+#   the CLI's stderr output to the user.
+#
 # Flags:
 #   --dry-run  Pass through to CLI (prints merged payload, no API writes).
 #              Used by fixture-based smoke tests.
@@ -67,11 +75,19 @@ if [ -z "$TASK_ID" ]; then
   exit 0
 fi
 
+# Resolve worktree id before invoking the CLI so the server can honor the
+# feat-worktree lock. On miss (unregistered worktree) the CLI falls back to
+# its in-process resolve and hard-fails with guidance if still unresolved.
+WORKTREE_ID=$(npx codebyplan resolve-worktree 2>/dev/null)
+
 # Delegate to the codebyplan CLI (single source of truth for merge semantics)
 CMD_ARGS=("round" "sync-approvals" "--round-id" "$ROUND_ID" "--task-id" "$TASK_ID")
+if [ -n "$WORKTREE_ID" ]; then
+  CMD_ARGS+=("--caller-worktree-id" "$WORKTREE_ID")
+fi
 [ "$DRY_RUN" = "true" ] && CMD_ARGS+=("--dry-run")
 
-if npx codebyplan "${CMD_ARGS[@]}" 2>&1; then
+if npx codebyplan "${CMD_ARGS[@]}"; then
   echo "cbp-mcp-round-sync: synced via CLI for round ${ROUND_ID}" >&2
 else
   echo "cbp-mcp-round-sync: CLI sync failed for round ${ROUND_ID} (non-fatal)" >&2

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

@@ -196,7 +196,7 @@ echo '{}' > "$WORKTREE_PATH/.codebyplan/shipment.json"
 echo '{}' > "$WORKTREE_PATH/.codebyplan/vendor.json"
 ```
 
-The `.codebyplan/device.local.json` file is created by `npx codebyplan setup` on the device (gitignored). The `worktree_id` is never persisted in any of these files — it is resolved at runtime via `npx codebyplan resolve-worktree` based on the device_id, filesystem path, and current git branch.
+The `.codebyplan/device.local.json` file is created by `npx codebyplan setup` on the device (gitignored). The `worktree_id` is never COMMITTED; it may be cached per-device in the gitignored `.codebyplan/worktree.local.json` (branch-keyed, re-derivable via `codebyplan resolve-worktree --cache`), otherwise resolved at runtime from the `(device_id, repo path, branch)` tuple via `npx codebyplan resolve-worktree`.
 
 No need to mark as `skip-worktree` — the committed files are merge-safe per CHK-108 and CHK-120.
 

package/templates/skills/cbp-round-update/SKILL.md

@@ -69,7 +69,20 @@ Run:
 npx codebyplan round sync-approvals --round-id <round_id> --task-id <task_id>
 ```
 
-The CLI auto-resolves the worktree id, parses `git status --short`, merges drift + staging + web-UI flag, and writes both round and task.
+The CLI auto-resolves the caller worktree id with the following precedence:
+1. `--caller-worktree-id <uuid>` override (if passed — skips all resolution)
+2. Per-device branch-keyed cache (`.codebyplan/worktree.local.json`)
+3. In-process tuple API call: `POST /worktrees/resolve` using `(device_id, repo_path, branch)`
+
+On the write path (non `--dry-run`), if the worktree id cannot be resolved the CLI **hard-fails with exit 1** and prints an actionable message. To pre-populate the cache:
+
+```
+npx codebyplan resolve-worktree --cache
+```
+
+If this worktree is not yet registered, run `npx codebyplan setup` first, then re-run `/cbp-round-update`.
+
+The CLI parses `git status --short`, merges drift + staging + web-UI flag, and writes both round and task (forwarding `caller_worktree_id` on both writes so the server honors the feat-worktree lock).
 
 Read the stdout JSON: `{ added, stale_marked, reactivated, total_files }`.