codebyplan 1.13.12 → 1.13.14

package/templates/skills/cbp-standalone-task-testing/SKILL.md

@@ -0,0 +1,210 @@
+---
+scope: repo-only:codebyplan
+name: cbp-standalone-task-testing
+description: Run comprehensive task-level testing after /cbp-standalone-task-check passes
+argument-hint: [task]  # e.g. `45` (standalone TASK-45)
+triggers: [cbp-standalone-task-complete]
+effort: xhigh
+---
+
+# Standalone Task Testing Command
+
+Comprehensive task-level testing for standalone tasks — runs all automated tests and walks the user through manual testing one-by-one. Tests the entire delivered feature holistically after all rounds are complete. Runs inline — no sub-agent.
+
+## When Used
+
+- After `/cbp-standalone-task-check` passes with READY verdict
+- Before `/cbp-standalone-task-complete`
+- Never skippable
+
+## Scope vs Round-Level Validation
+
+Per-wave `testing-qa-agent` runs inside `/cbp-round-execute` Step 5. This skill adds the cross-cutting layer visible only across the full task diff: full-repo lint, workspace tsc, full test suite, `pnpm audit`, and full-diff security scan.
+
+## Instructions
+
+### Step 1: Parse `$ARGUMENTS`
+
+| Shape | Regex | Resolves to |
+|-------|-------|-------------|
+| `{task}` (e.g. `45`) | `^[0-9]+$` | Standalone TASK-{task} |
+| _(empty)_ | — | Use MCP `get_current_standalone_task` to find the active in-progress task |
+
+Any multi-segment input is an error:
+
+```
+standalone-task-testing: argument `{value}` looks like a checkpoint-task pair.
+Use /cbp-task-testing {chk}-{task} for checkpoint-bound tasks.
+Standalone tasks use a bare number, e.g. /cbp-standalone-task-testing 45.
+```
+
+Error cases: any multi-segment input, `abc`, `108-`, `-1`, anything with whitespace or non-numeric characters.
+
+### Step 1.5: Get Current Task
+
+| Parse | Resolution path |
+|-------|-----------------|
+| `{task}` | MCP `get_standalone_tasks(repo_id)` → filter `number === {task}`. |
+| _(empty)_ | MCP `get_current_standalone_task(repo_id)` — finds the active in-progress task. |
+
+If no in-progress task, show error and stop.
+
+### Step 2: Verify All Rounds Complete
+
+Use MCP `get_standalone_rounds(standalone_task_id)`. Verify all rounds are `completed`. If any still `in_progress`:
+
+```
+## Cannot Run Standalone Task Testing
+
+Standalone TASK-[N] has an active round (Round [N]). Complete it first:
+- Run `/cbp-round-update` to finish the round
+```
+
+Stop.
+
+### Step 3: Verify `/cbp-standalone-task-check` Passed
+
+Check `task.context.check_verdict`: must exist and have `verdict = "READY"`. Otherwise:
+
+```
+## Cannot Run Standalone Task Testing
+
+`/cbp-standalone-task-check` has not passed yet. Run `/cbp-standalone-task-check` first.
+```
+
+Stop.
+
+### Step 4: Aggregate Files Changed
+
+Collect all `files_changed` from all rounds via `get_standalone_rounds`. Deduplicate (latest action per path wins). Skip deleted files for file-reading in Step 5.
+
+### Step 5: Read ALL Final Changed Files
+
+Read every non-deleted file in the aggregated list. Build a mental model of the complete delivered work.
+
+### Step 6: Run Comprehensive Automated Testing
+
+Capture stdout and stderr for each check.
+
+**Hard-fail tests** (block completion):
+
+| Category | Command | Condition |
+|----------|---------|-----------|
+| Full-repo lint | `pnpm -w lint` | Always |
+| Full-repo types | `pnpm exec tsc --noEmit` | Source files changed |
+| Full-repo unit tests | `pnpm test --run` | Source files in aggregated_files |
+| Full-repo audit | `pnpm audit` | Always |
+| Per-package E2E | `pnpm --filter <pkg> e2e:test` | UI files in aggregated_files |
+| Full-diff security scan | inline grep or `security-agent` | Always |
+
+**Soft tests** (report, don't block):
+
+| Category | Method | Condition |
+|----------|--------|-----------|
+| Visual | Screenshot compare via `e2e:visual-check` | UI work + dev server running |
+| API Health | `curl` health endpoint | API routes changed |
+
+For each test, record: `category, status (pass|fail|skipped), details, stdout, stderr`.
+
+### Step 6.5: Cross-Round Code Review
+
+Inline review (no sub-agent) across the aggregated files read in Step 5. Check:
+
+| Concern | What to Look For |
+|---------|-----------------|
+| Leftover debug | `console.log`, `debugger`, commented-out blocks, `TODO`/`FIXME` added during this task |
+| Cross-round duplication | Same helper/logic written independently in 2+ rounds |
+| Convention drift | Pattern from one round contradicts a pattern from an earlier round |
+| Incomplete follow-through | A type/field/column added that later rounds never consume |
+| Orphaned additions | Exports or utilities added with no callers after later rounds |
+
+For each finding, record: `{category, file, description, severity: 'low'|'medium'|'high', suggested_fix}`.
+
+Findings with severity `medium` or `high` feed the Step 9 problem classification.
+
+### Step 7: Separate Claude-Testable vs User-Testable
+
+**Claude handles automatically** (Step 6): build, types, unit tests, E2E tests, visual, API health.
+
+**User must verify**:
+- Visual appearance quality
+- UX flow
+- Business logic correctness
+- Edge cases
+- Cross-browser / real-device behavior
+- Content accuracy
+
+### Step 8: User Testing Walkthrough
+
+Present all user-testable items as a **single checklist in one `AskUserQuestion` prompt**. Provide description, how-to-test steps, and expected result per item. Record the aggregate response and any per-item notes.
+
+### Step 9: Classify Problems
+
+Collect failures from automated tests (Step 6), cross-round code review (Step 6.5, medium+), and user tests (Step 8):
+
+- **Minor** (round-fixable): styling, small bugs, missing edge cases, localized duplication
+- **Major** (new-task-worthy): architectural issues, missing features, fundamental design problems
+
+### Step 10: Save Results
+
+```ts
+update_standalone_task(task_id, {
+  context: {
+    ...existing,
+    task_testing_output: {
+      claude_tests: [...],
+      cross_round_code_findings: [...],
+      user_tests: [...],
+      problems_found: [...],
+      all_passed: boolean,
+      summary: { total, passed, failed, pending }
+    }
+  }
+})
+```
+
+### Step 11: Route Based on Results
+
+**ALL PASS:**
+
+All tests passed for standalone TASK-[N].
+
+Next: /cbp-standalone-task-complete {N}
+
+**Minor problems found:**
+
+---
+
+**Next:**
+Run `/cbp-round-input` to address the minor issues found during testing.
+
+---
+
+Waiting for user to run `/cbp-round-input`.
+
+**Major problems found:**
+
+---
+
+**Next:**
+Run `/cbp-standalone-task-create` to create a new standalone task for the identified issues.
+
+---
+
+Waiting for user to run `/cbp-standalone-task-create`.
+
+## Key Rules
+
+- **Never skippable** — mandatory before `/cbp-standalone-task-complete`
+- **Must loop until everything passes** — problems must be addressed
+- **No file changes** — testing only, never edit
+- **Batch user tests** — present all user-testable items in a single `AskUserQuestion` checklist
+- **Read actual files** — do not rely on metadata alone
+- **Run actual commands** — capture real stdout/stderr
+
+## Integration
+
+- **Reads**: MCP `get_current_standalone_task`, `get_standalone_tasks`, `get_standalone_rounds`, all aggregated files
+- **Writes**: MCP `update_standalone_task` (context.task_testing_output)
+- **Triggers**: emits directive `Next: /cbp-standalone-task-complete {N}` when ALL PASS
+- **Triggered by**: user runs `/cbp-standalone-task-testing {task}` per directive from `/cbp-standalone-task-check`

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

@@ -2,7 +2,7 @@
 scope: org-shared
 name: cbp-task-check
 description: AI production review for the current task
-argument-hint: [chk-task | task]
+argument-hint: [chk-task]
 triggers: [cbp-task-testing, cbp-round-input]
 effort: high
 ---
@@ -40,17 +40,17 @@ Parse the argument using the canonical chk-task-round notation (see `.claude/rul
 | Shape | Regex | Resolves to |
 |-------|-------|-------------|
 | `{chk}-{task}` (e.g. `108-1`) | `^[0-9]+-[0-9]+$` | Checkpoint-bound: CHK-{chk} TASK-{task} |
-| `{task}` (e.g. `45`) | `^[0-9]+$` | Standalone: standalone TASK-{task} **only** |
 | _(empty)_ | — | Use MCP `get_current_task` to find the active in-progress task |
+| `{task}` (bare number) | — | **Error**: "Use /cbp-standalone-task-check {N} instead — bare numbers no longer route to standalone tasks." |
 
 Anything else is malformed — surface this error and stop:
 
 ```
 task-check: invalid argument `{value}`. Expected:
   108-1  → CHK-108 TASK-1 (checkpoint-bound)
-  45     → standalone TASK-45
   (empty) → active in-progress task
 
+For standalone tasks, use `/cbp-standalone-task-check {N}`.
 For a specific round, use `/cbp-round-update 108-1-2`.
 ```
 
@@ -59,8 +59,8 @@ Error cases: `108-1-2` (that is round-update's shape), `abc`, `108-`, `-1`, `108
 #### Worked examples
 
 - `task-check 108-1` → CHK-108 TASK-1
-- `task-check 45` → standalone TASK-45
 - `task-check` (no arg) → active in-progress task via `get_current_task`
+- `task-check 45` → error: "Use /cbp-standalone-task-check 45 instead — bare numbers no longer route to standalone tasks."
 - `task-check 108-1-2` → error: "use `/cbp-round-update 108-1-2`"
 - `task-check abc` → error: malformed
 
@@ -71,7 +71,6 @@ Given the parse from Step 1:
 | Parse | Resolution path |
 |-------|-----------------|
 | `{chk}-{task}` | MCP `get_checkpoints(repo_id)` → filter `number === {chk}`. MCP `get_tasks(checkpoint_id)` → filter `number === {task}`. |
-| `{task}` | MCP `get_tasks(repo_id, standalone: true)` → filter `number === {task}`. |
 | _(empty)_ | MCP `get_current_task(repo_id)` — finds the active in-progress task. |
 
 If no in-progress task, show error and stop.
@@ -157,6 +156,7 @@ Suggest: Approve files, then re-run `/cbp-task-check`. **STOP HERE** — wait fo
 - **This is AI review + user satisfaction** — not automated testing
 - **Read all changed files** — agent does the heavy lifting
 - **No file changes** — review only, never edit
+- **Checkpoint-bound only** — for standalone tasks use `/cbp-standalone-task-check`
 
 ## Integration
 

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

@@ -2,7 +2,7 @@
 scope: org-shared
 name: cbp-task-complete
 description: Complete current task
-argument-hint: [chk-task | task]
+argument-hint: [chk-task]
 effort: xhigh
 ---
 
@@ -19,17 +19,17 @@ Parse the argument using the canonical chk-task-round notation (see `.claude/rul
 | Shape | Regex | Resolves to |
 |-------|-------|-------------|
 | `{chk}-{task}` (e.g. `108-1`) | `^[0-9]+-[0-9]+$` | Checkpoint-bound: CHK-{chk} TASK-{task} |
-| `{task}` (e.g. `45`) | `^[0-9]+$` | Standalone: standalone TASK-{task} **only** |
 | _(empty)_ | — | Use MCP `get_current_task` to find the active in-progress task |
+| `{task}` (bare number) | — | **Error**: "Use /cbp-standalone-task-complete {N} instead — bare numbers no longer route to standalone tasks." |
 
 Anything else is malformed — surface this error and stop:
 
 ```
 task-complete: invalid argument `{value}`. Expected:
   108-1  → CHK-108 TASK-1 (checkpoint-bound)
-  45     → standalone TASK-45
   (empty) → active in-progress task
 
+For standalone tasks, use `/cbp-standalone-task-complete {N}`.
 For a specific round, use `/cbp-round-update 108-1-2`.
 ```
 
@@ -38,8 +38,8 @@ Error cases: `108-1-2` (that is round-update's shape), `abc`, `108-`, `-1`, `108
 #### Worked examples
 
 - `task-complete 108-1` → CHK-108 TASK-1
-- `task-complete 45` → standalone TASK-45
 - `task-complete` (no arg) → active in-progress task via `get_current_task`
+- `task-complete 45` → error: "Use /cbp-standalone-task-complete 45 instead — bare numbers no longer route to standalone tasks."
 - `task-complete 108-1-2` → error: "use `/cbp-round-update 108-1-2`"
 - `task-complete abc` → error: malformed
 
@@ -50,7 +50,6 @@ Given the parse from Step 1:
 | Parse | Resolution path |
 |-------|-----------------|
 | `{chk}-{task}` | MCP `get_checkpoints(repo_id)` → filter `number === {chk}`. MCP `get_tasks(checkpoint_id)` → filter `number === {task}`. |
-| `{task}` | MCP `get_tasks(repo_id, standalone: true)` → filter `number === {task}`. |
 | _(empty)_ | MCP `get_current_task(repo_id)` — finds the active in-progress task. |
 
 If no in-progress task, show error and stop.
@@ -139,19 +138,6 @@ Skip the push only when nothing was committed in Step 5 AND `/cbp-merge-main` re
 
 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
-
-**Standalone tasks only** (no checkpoint). Checkpoint tasks ship via `/cbp-checkpoint-end`.
-
-If `checkpoint_id === null` AND current branch is `feat/*`:
-
-1. Read `.codebyplan/git.json` `branch_config.production` (default `main`).
-2. Merge: `git checkout {production} && git merge {feat-branch} --no-ff -m "Merge {feat-branch}: {task title}"`
-3. Push: `git push origin {production}`
-4. Delete feat branch (local + remote).
-
-If merge has conflicts, stop and ask the user. If current branch is not `feat/*`, skip.
-
 ### Step 8: Run Cleanup + Migration (inline)
 
 Apply the `cleanup` skill inline to remove orphan references to deleted/modified files. Then apply `migration` to propagate renames/moves to consumers. Both run without sub-agent spawns. Skip cleanup if no deletions/modifications; skip migration if cleanup handled everything.
@@ -175,7 +161,7 @@ Then route. Same-context transitions (next task in this checkpoint) auto-trigger
 
 ```
 checkpoint_id := current_task.checkpoint_id
-if checkpoint_id is null  → STANDALONE; go to 9b
+if checkpoint_id is null  → error (should never happen — standalone tasks use /cbp-standalone-task-complete)
 else
   siblings := get_tasks(checkpoint_id) minus current_task
   all_done := every sibling has status === 'completed'
@@ -183,11 +169,11 @@ else
   else                       → MORE-TASKS-IN-CHECKPOINT; go to 9b
 ```
 
-#### 9b — Next-task routing (more tasks pending OR standalone fall-through)
+#### 9b — Next-task routing (more tasks pending)
 
-Identify the next pending task: the lowest-numbered pending task in the same checkpoint, or — for standalone fall-through — the next standalone or in-progress-checkpoint task. Use `{N}` as the chk-task-round identifier form of that task (e.g. `111-5` for CHK-111 TASK-5, or `45` for standalone TASK-45).
+Identify the next pending task: the lowest-numbered pending task in the same checkpoint. Use `{N}` as the chk-task-round identifier form of that task (e.g. `111-5` for CHK-111 TASK-5).
 
-Use the Skill tool with `skill: cbp-task-start` and `args: "{NEXT_CHK}-{NEXT_TASK}"` (or `args: "{NEXT_TASK}"` for standalone) to auto-trigger the next task. Same-context transition; no `/clear` needed.
+Use the Skill tool with `skill: cbp-task-start` and `args: "{NEXT_CHK}-{NEXT_TASK}"` to auto-trigger the next task. Same-context transition; no `/clear` needed.
 
 If no next task is found (no pending work anywhere in the repo), emit directive and stop: `Next: Run /clear, then /cbp-session-end.`
 
@@ -210,3 +196,4 @@ Do NOT use AskUserQuestion here — this is a directive, not a menu. The user ru
 - **Writes**: MCP `update_task`, `complete_task`
 - **Uses skills (inline, no sub-agent)**: `cleanup` (if deletions), `migration` (if exports renamed)
 - **Triggers**: Same-context transitions auto-trigger via the Skill tool (next task in checkpoint → `/cbp-task-start {N}`). Cross-context transitions emit a directive `Next: /clear, then /cbp-X` for the user to invoke.
+- **Checkpoint-bound only** — for standalone tasks use `/cbp-standalone-task-complete`

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

@@ -17,7 +17,16 @@ Create a new task within the active checkpoint. Gathers user context, analyzes e
 
 ## Identifier Notation
 
-This skill operates on the **active** checkpoint resolved via MCP `get_current_task` and does not accept a positional identifier argument. The task it creates gets its `number` from the next-available slot within the active checkpoint (checkpoint-bound) or repo-wide standalone numbering (standalone). Canonical chk-task-round notation — used in prose, error messages, and cross-references — follows `.claude/rules/notation-consistency.md` "CHK / TASK / ROUND Identifier Notation": `108-1` (CHK-108 TASK-1), `45` (standalone TASK-45), `108-1-2` (round 2 of CHK-108 TASK-1), `45-2` (round 2 of standalone TASK-45).
+This skill operates on the **active** checkpoint resolved via MCP `get_current_task` and does not accept a positional identifier argument. The task it creates gets its `number` from the next-available slot within the active checkpoint (checkpoint-bound). Canonical chk-task-round notation — used in prose, error messages, and cross-references — follows `.claude/rules/notation-consistency.md` "CHK / TASK / ROUND Identifier Notation": `108-1` (CHK-108 TASK-1), `108-1-2` (round 2 of CHK-108 TASK-1).
+
+**Bare-number argument**: if a bare number (e.g. `42`) is provided with no checkpoint context, this skill cannot resolve it to a checkpoint-bound task:
+
+```
+task-create: bare number `{N}` is no longer valid here.
+Use /cbp-standalone-task-create instead — bare numbers no longer route to standalone tasks.
+```
+
+Stop and redirect to `/cbp-standalone-task-create`.
 
 ## Instructions
 
@@ -52,32 +61,6 @@ Use MCP `get_tasks` for the checkpoint. Review:
 - Task statuses (completed, in_progress, pending)
 - Dependencies between tasks
 
-### Step 3.5: Dedup Against Pending Standalone Tasks (MANDATORY)
-
-Per `rules/immediate-issue-capture.md` "Consolidation Before Creation", before creating ANY new task, also check pending standalone tasks for overlap:
-
-```
-mcp__codebyplan__get_tasks(repo_id, standalone=true, status="pending")
-```
-
-Compare the proposed task to each pending standalone task on these match dimensions:
-
-| Match dimension | Action if matched |
-|-----------------|-------------------|
-| Same target file(s) | STOP — `update_task` to append, do not create new |
-| Same feature / module | STOP — `update_task` to append, do not create new |
-| Same root cause (e.g. "prettier drift", "router bug") | STOP — `update_task` to append, do not create new |
-| Same dependency / advisory | STOP — `update_task` to append, do not create new |
-
-If a match is found, surface it to the user before appending:
-
-```
-Found existing pending task TASK-[N]: [title]
-This finding overlaps on [dimension]. Append to TASK-[N] instead of creating new? (yes / no — create separately)
-```
-
-Default to append. Only create a separate task if the user explicitly says no, OR if the existing task is in_progress / completed (in which case use `context.related_task_ids[]` on the new task to cross-reference).
-
 ### Step 4: Analyze Codebase Context
 
 Brief inline analysis:
@@ -113,10 +96,6 @@ Use MCP `create_task` with:
 - **requirements**: Numbered requirements list
 - **context**: Include decisions from Q&A, dependencies, source findings
 
-**For standalone tasks** (no `checkpoint_id` parameter): resolve worktree_id via `npx codebyplan resolve-worktree 2>/dev/null` and, if non-empty, pass as `assigned_worktree_id`. The `chk_assignment_pair` CHECK constraint permits `assigned_user_id` to be NULL when `assigned_worktree_id` is set — `create_task` does not expose an `assigned_user_id` parameter and none is required. This engages the CHK-104 TASK-2 hard-lock from creation.
-
-**If `worktree_id` is empty AND the task is standalone**: warn the user that the task will be unassigned (no hard-lock from creation) and offer to run `npx codebyplan setup` first from the current directory to register the worktree. After setup, re-resolve the worktree_id and proceed. If the user declines, create the task without `assigned_worktree_id`.
-
 **For checkpoint-bound tasks**, an empty `worktree_id` is fine — no caller-worktree stamping is needed because the parent checkpoint's `worktree_id` governs.
 
 ```
@@ -158,6 +137,7 @@ Waiting for user to decide next step.
 - **Consider existing tasks** — avoid duplication
 - **Respect checkpoint goal** — new task must contribute to checkpoint goal
 - **Does NOT auto-trigger** — user decides when to start
+- **Checkpoint-bound only** — for standalone tasks use `/cbp-standalone-task-create`
 
 ## Integration
 

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

@@ -3,7 +3,7 @@ scope: org-shared
 name: cbp-task-start
 description: Start a task, load context from DB
 triggers: [cbp-round-start]
-argument-hint: [chk-task | task]  # e.g. `108-1` (CHK-108 TASK-1) or `45` (standalone TASK-45)
+argument-hint: [chk-task]  # e.g. `108-1` (CHK-108 TASK-1)
 effort: xhigh
 ---
 
@@ -20,29 +20,27 @@ Parse the argument using the canonical chk-task-round notation (see `.claude/rul
 | Shape | Regex | Resolves to |
 |-------|-------|-------------|
 | `{chk}-{task}` (e.g. `108-1`) | `^[0-9]+-[0-9]+$` | Checkpoint-bound: CHK-{chk} TASK-{task} |
-| `{task}` (e.g. `45`) | `^[0-9]+$` | Standalone: standalone TASK-{task} **only** (bare number = standalone discriminator) |
 | _(empty)_ | — | Use MCP `get_current_task` to find the next pending task |
+| `{task}` (bare number) | — | **Error**: "Use /cbp-standalone-task-start {N} instead — bare numbers no longer route to standalone tasks." |
 
 Anything else is malformed — surface this error and stop:
 
 ```
 task-start: invalid argument `{value}`. Expected:
   108-1  → CHK-108 TASK-1 (checkpoint-bound)
-  45     → standalone TASK-45
   (empty) → next pending task
 
+For standalone tasks, use `/cbp-standalone-task-start {N}`.
 For a specific round, use `/cbp-round-start 108-1-2`.
 ```
 
 Error cases: `108-1-2` (that is round-start's shape), `abc`, `108-`, `-1`, `108--1`, anything with whitespace or non-numeric characters.
 
-**BREAKING from prior behaviour**: bare-number now resolves to **standalone only**. Previously `task-start 45` would match the first TASK-45 it found anywhere; that heuristic is removed. To target a checkpoint-bound TASK-45, use `{chk}-45`.
-
 #### Worked examples
 
 - `task-start 108-1` → CHK-108 TASK-1
-- `task-start 45` → standalone TASK-45 (errors if no standalone TASK-45 exists)
 - `task-start` (no arg) → next pending via `get_current_task`
+- `task-start 45` → error: "Use /cbp-standalone-task-start 45 instead — bare numbers no longer route to standalone tasks."
 - `task-start 108-1-2` → error: "use `/cbp-round-start 108-1-2`"
 - `task-start abc` → error: malformed
 - `task-start 108-` → error: malformed
@@ -54,7 +52,6 @@ Given the parse from Step 1:
 | Parse | Resolution path |
 |-------|-----------------|
 | `{chk}-{task}` | MCP `get_checkpoints(repo_id)` → filter `number === {chk}` (must exist). MCP `get_tasks(checkpoint_id)` → filter `number === {task}` (must exist). |
-| `{task}` | MCP `get_tasks(repo_id, standalone: true)` → filter `number === {task}` (must exist). Checkpoint context is null for the rest of the skill. |
 | _(empty)_ | MCP `get_current_task(repo_id)` — output gives both checkpoint (if any) and task. When multiple checkpoints are active and the result is ambiguous, surface the disambiguation prompt and stop. |
 
 If any required row is missing, surface this and stop:
@@ -62,7 +59,6 @@ If any required row is missing, surface this and stop:
 ```
 task-start: no task found for `{ARG}`.
   - For `108-1`: CHK-108 may not exist, or TASK-1 may not exist within it.
-  - For `45`: no standalone TASK-45 exists. If a checkpoint-bound TASK-45 exists, invoke as `{chk}-45`.
 ```
 
 ### Step 2.5: Permission Gate
@@ -98,7 +94,6 @@ Compute `TARGET`:
 |-----------|--------|
 | Checkpoint-bound, `checkpoint.branch_name` set | `checkpoint.branch_name` (e.g. `feat/CHK-095-pricing-page`) |
 | Checkpoint-bound, `branch_name` null (legacy) | `feat/CHK-{NNN}-{kebab-slug-from-checkpoint-title}` |
-| Standalone | `feat/standalone-TASK-{N}-{kebab-slug-from-task-title}` |
 
 Slug rules: lowercase, words joined by `-`, drop punctuation, truncate to 40 chars.
 
@@ -140,7 +135,6 @@ After successful switch:
 
 1. Re-run `git branch --show-current` to confirm `current == TARGET`. If not, fail loudly — something raced.
 2. **Persist for next time**:
-   - Standalone task → `update_task(task_id, context: { ...task.context, branch_name: TARGET })`
    - Checkpoint with `branch_name: null` → `update_checkpoint(checkpoint_id, branch_name: TARGET)`
    - Checkpoint with existing `branch_name` → no write (already canonical)
 3. One-line confirmation in output: `Branch: [TARGET] (switched from [previous])`. No prompt, no waiting.
@@ -182,7 +176,6 @@ Before activating the task, verify the caller's worktree matches the assigned wo
 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`.
 3. If `TARGET_WT IS NOT NULL AND TARGET_WT != CALLER_WT`, surface this error and abort:
 
    ```
@@ -249,11 +242,11 @@ The Step 2.5 permission gate already covered this hand-off (the user approved ru
 Starting first round...
 ```
 
-Trigger `/cbp-round-start` (which will use task.requirements for round 1).
+Trigger `/cbp-round-start` with **no argument**. Do NOT pass the task identifier (`{chk}-{task}`) — round-start's 2-segment form is interpreted as standalone TASK-`{chk}` round `{task}`, not CHK-`{chk}` TASK-`{task}`. Passing no argument causes round-start to derive the active task/round from state, which is the correct path here.
 
 ## Integration
 
 - **Gates**: Step 2.5 permission gate — asks the user to confirm before any side effect; **Cancel** aborts cleanly with no writes. Fires on every invocation (manual, auto-trigger, auto-loop).
 - **Reads**: MCP `get_current_task`, `get_tasks`, `get_rounds`
 - **Writes**: MCP `update_task`
-- **Triggers**: `/cbp-round-start` (auto, round 1)
+- **Triggers**: `/cbp-round-start` (auto, round 1, no argument)

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

@@ -2,7 +2,7 @@
 scope: org-shared
 name: cbp-task-testing
 description: Run comprehensive task-level testing after /cbp-task-check passes
-argument-hint: [chk-task | task]
+argument-hint: [chk-task]
 triggers: [cbp-task-complete]
 effort: xhigh
 ---
@@ -30,17 +30,17 @@ Parse the argument using the canonical chk-task-round notation (see `.claude/rul
 | Shape | Regex | Resolves to |
 |-------|-------|-------------|
 | `{chk}-{task}` (e.g. `108-1`) | `^[0-9]+-[0-9]+$` | Checkpoint-bound: CHK-{chk} TASK-{task} |
-| `{task}` (e.g. `45`) | `^[0-9]+$` | Standalone: standalone TASK-{task} **only** |
 | _(empty)_ | — | Use MCP `get_current_task` to find the active in-progress task |
+| `{task}` (bare number) | — | **Error**: "Use /cbp-standalone-task-testing {N} instead — bare numbers no longer route to standalone tasks." |
 
 Anything else is malformed — surface this error and stop:
 
 ```
 task-testing: invalid argument `{value}`. Expected:
   108-1  → CHK-108 TASK-1 (checkpoint-bound)
-  45     → standalone TASK-45
   (empty) → active in-progress task
 
+For standalone tasks, use `/cbp-standalone-task-testing {N}`.
 For a specific round, use `/cbp-round-update 108-1-2`.
 ```
 
@@ -49,8 +49,8 @@ Error cases: `108-1-2` (that is round-update's shape), `abc`, `108-`, `-1`, `108
 #### Worked examples
 
 - `task-testing 108-1` → CHK-108 TASK-1
-- `task-testing 45` → standalone TASK-45
 - `task-testing` (no arg) → active in-progress task via `get_current_task`
+- `task-testing 45` → error: "Use /cbp-standalone-task-testing 45 instead — bare numbers no longer route to standalone tasks."
 - `task-testing 108-1-2` → error: "use `/cbp-round-update 108-1-2`"
 - `task-testing abc` → error: malformed
 
@@ -61,7 +61,6 @@ Given the parse from Step 1:
 | Parse | Resolution path |
 |-------|-----------------|
 | `{chk}-{task}` | MCP `get_checkpoints(repo_id)` → filter `number === {chk}`. MCP `get_tasks(checkpoint_id)` → filter `number === {task}`. |
-| `{task}` | MCP `get_tasks(repo_id, standalone: true)` → filter `number === {task}`. |
 | _(empty)_ | MCP `get_current_task(repo_id)` — finds the active in-progress task. |
 
 If no in-progress task, show error and stop.
@@ -268,6 +267,7 @@ Waiting for user to run `/cbp-task-create`.
 - **Batch user tests** — present all user-testable items in a single `AskUserQuestion` checklist; never one-per-question
 - **Read actual files** — do not rely on metadata alone
 - **Run actual commands** — capture real stdout/stderr
+- **Checkpoint-bound only** — for standalone tasks use `/cbp-standalone-task-testing`
 
 ## Integration