cclaw-cli 0.15.1 → 0.21.0

package/dist/content/learnings.d.ts

@@ -2,6 +2,6 @@
  * Canonical JSONL field order (matches the reference spec).
  * Exported for tests and any programmatic writer that wants the exact shape.
  */
-export declare const KNOWLEDGE_JSONL_FIELDS: readonly ["type", "trigger", "action", "confidence", "domain", "stage", "created", "project"];
+export declare const KNOWLEDGE_JSONL_FIELDS: readonly ["type", "trigger", "action", "confidence", "domain", "stage", "origin_stage", "origin_feature", "frequency", "universality", "maturity", "created", "first_seen_ts", "last_seen_ts", "project"];
 export declare function learnSkillMarkdown(): string;
 export declare function learnCommandContract(): string;

package/dist/content/learnings.js

@@ -20,7 +20,14 @@ export const KNOWLEDGE_JSONL_FIELDS = [
     "confidence",
     "domain",
     "stage",
+    "origin_stage",
+    "origin_feature",
+    "frequency",
+    "universality",
+    "maturity",
     "created",
+    "first_seen_ts",
+    "last_seen_ts",
     "project"
 ];
 export function learnSkillMarkdown() {
@@ -51,10 +58,10 @@ Do not invent alternate stores (no markdown mirror, no SQLite, no per-stage file
 ## Entry format — strict JSONL schema
 
 Exactly one JSON object per line. Fields must appear in the order:
-\`type, trigger, action, confidence, domain, stage, created, project\`.
+\`type, trigger, action, confidence, domain, stage, origin_stage, origin_feature, frequency, universality, maturity, created, first_seen_ts, last_seen_ts, project\`.
 
 \`\`\`json
-{"type":"pattern","trigger":"when reviewing external payloads","action":"parse through zod before touching service layer","confidence":"high","domain":"api","stage":"review","created":"2026-04-14T12:00:00Z","project":"cclaw"}
+{"type":"pattern","trigger":"when reviewing external payloads","action":"parse through zod before touching service layer","confidence":"high","domain":"api","stage":"review","origin_stage":"review","origin_feature":"payload-hardening","frequency":1,"universality":"project","maturity":"raw","created":"2026-04-14T12:00:00Z","first_seen_ts":"2026-04-14T12:00:00Z","last_seen_ts":"2026-04-14T12:00:00Z","project":"cclaw"}
 \`\`\`
 
 | field | type | required | notes |
@@ -65,7 +72,14 @@ Exactly one JSON object per line. Fields must appear in the order:
 | \`confidence\` | \`"high" \\| "medium" \\| "low"\` | yes | Write \`medium\` when unsure; do not omit. |
 | \`domain\` | string \\| null | yes | Free-form taxonomy (\`api\`, \`infra\`, \`ui\`, \`security\`, \`testing\`, …). Use \`null\` when cross-cutting. |
 | \`stage\` | \`FlowStage\` \\| null | yes | One of brainstorm / scope / design / spec / plan / tdd / review / ship, or \`null\` when cross-stage. |
+| \`origin_stage\` | \`FlowStage\` \\| null | yes | Stage where this learning was first observed. |
+| \`origin_feature\` | string \\| null | yes | Feature/worktree label where it was observed first. |
+| \`frequency\` | integer >= 1 | yes | Number of times this same trigger/action pair has been observed. |
+| \`universality\` | \`"project" \\| "personal" \\| "universal"\` | yes | Scope of applicability. |
+| \`maturity\` | \`"raw" \\| "lifted-to-rule" \\| "lifted-to-enforcement"\` | yes | Lifecycle state of the learning. |
 | \`created\` | ISO 8601 UTC string | yes | \`date -u +%Y-%m-%dT%H:%M:%SZ\`. |
+| \`first_seen_ts\` | ISO 8601 UTC string | yes | First observed timestamp (usually equals \`created\`). |
+| \`last_seen_ts\` | ISO 8601 UTC string | yes | Last re-confirmed timestamp. |
 | \`project\` | string \\| null | yes | Repo or scope name. Use \`null\` when the entry crosses projects. |
 
 Rules:
@@ -96,10 +110,13 @@ Rules:
 - Return the matched lines pretty-printed (do not mutate the file).
 
 ### \`/cc-learn add\`
-- Ask for required fields in order: \`type\`, \`trigger\`, \`action\`, \`confidence\`, \`domain\`, \`stage\`, \`project\`.
+- Ask for required user-facing fields in order: \`type\`, \`trigger\`, \`action\`, \`confidence\`, \`domain\`, \`stage\`, \`universality\`, \`project\`.
 - \`confidence\` must be one of \`high\`, \`medium\`, \`low\`. Default to \`medium\` if the user declines to set it.
 - \`domain\`, \`stage\`, and \`project\` may be explicitly \`null\`.
-- \`created\` is set automatically to the current UTC ISO timestamp.
+- \`origin_stage\` defaults to \`stage\`; \`origin_feature\` defaults to active feature (or \`null\` if unknown).
+- \`frequency\` starts at \`1\`.
+- \`maturity\` starts at \`raw\`.
+- \`created\`, \`first_seen_ts\`, and \`last_seen_ts\` are set automatically to current UTC ISO timestamp.
 - Append exactly one JSON line to \`${KNOWLEDGE_PATH}\` with the field order from the schema table above.
 - Re-read the file tail to confirm the new line is valid JSON and parses back to the same object.
 
@@ -130,7 +147,7 @@ Do not edit source code from this command. Only operate on \`${KNOWLEDGE_PATH}\`
 |---|---|---|
 | (default) | — | Show recent knowledge entries (tail of JSONL, pretty-printed). |
 | \`search\` | \`<query>\` | Stream-filter the JSONL for matching \`trigger\`, \`action\`, \`domain\`, \`project\`. |
-| \`add\` | — | Append one JSON line (\`rule\` / \`pattern\` / \`lesson\` / \`compound\`) with the strict 8-field schema. |
+| \`add\` | — | Append one JSON line (\`rule\` / \`pattern\` / \`lesson\` / \`compound\`) with the strict 15-field schema. |
 | \`curate\` | — | Hand off to the **knowledge-curation** skill: read-only audit + soft-archive plan when the file exceeds the curation threshold. |
 `;
 }

package/dist/content/meta-skill.js

@@ -3,7 +3,7 @@ export const META_SKILL_NAME = "using-cclaw";
 export function usingCclawSkillMarkdown() {
     return `---
 name: using-cclaw
-description: "Routing brain for cclaw. Decide whether to start/resume a stage, answer directly, or use utility commands like /cc-learn, /cc-view, and /cc-ops."
+description: "Routing brain for cclaw. Decide whether to start/resume a stage, answer directly, or use utility commands like /cc-learn, /cc-ideate, /cc-view, and /cc-ops."
 ---
 
 # Using Cclaw
@@ -25,10 +25,11 @@ Task arrives
   ├─ Running as spawned subagent? -> obey parent prompt only; do not run cclaw routing
   ├─ Pure question / non-software ask? -> answer directly (no stage)
   ├─ New software work? -> /cc <idea>
+  ├─ Repo-improvement discovery? -> /cc-ideate
   ├─ Resume existing flow? -> /cc or /cc-next
   ├─ Knowledge operation? -> /cc-learn
   ├─ Read-only workspace view? -> /cc-view [status|tree|diff]
-  └─ Workspace operation? -> /cc-ops [feature|tdd-log|retro|archive|rewind|rewind-ack]
+  └─ Workspace operation? -> /cc-ops [feature|tdd-log|retro|compound|archive|rewind]
 \`\`\`
 
 ## Task classification
@@ -60,6 +61,8 @@ Tracks may skip stages via \`flow-state.track\` + \`skippedStages\`.
 Load utility skills only when triggered by the current task:
 
 - security, performance, debugging, docs, ci-cd
+- verification-before-completion before completion claims
+- finishing-a-development-branch during ship/finalization
 - document-review and execution context skills
 - language rule packs from \`.cclaw/config.yaml\` when enabled
 
@@ -72,7 +75,7 @@ Do not inline these protocols in stage skills; cite by path:
 
 - Decision protocol: \`${DECISION_PROTOCOL_REL_PATH}\`
 - Completion/resume protocol: \`${COMPLETION_PROTOCOL_REL_PATH}\`
-- Engineering ethos + preamble rules: \`${ETHOS_PROTOCOL_REL_PATH}\`
+- Engineering ethos + announce discipline: \`${ETHOS_PROTOCOL_REL_PATH}\`
 
 ## Knowledge guidance
 

package/dist/content/next-command.js

@@ -33,13 +33,13 @@ This is the only progression command the user needs to drive the entire flow. St
 
 - **Do not** invent gate completion: use only \`${flowPath}\` plus observable evidence in repo artifacts.
 - **Do not** skip stages: advance only from \`currentStage\` to its configured successor.
-- If the flow reaches terminal ship completion, route closeout in order: **/cc-ops retro -> /cc-ops archive**.
+- If the flow reaches terminal ship completion, route closeout in order: **/cc-ops retro -> /cc-ops compound (optional) -> /cc-ops archive**.
 
 ## Algorithm (mandatory)
 
 1. Read **\`${flowPath}\`**. If missing → **BLOCKED** (state missing).
 2. Parse JSON. Capture \`currentStage\` and \`stageGateCatalog[currentStage]\`.
-3. If \`staleStages[currentStage]\` exists, do not advance automatically. Re-run the stage artifact work, then clear the marker with \`/cc-ops rewind-ack <currentStage>\`.
+3. If \`staleStages[currentStage]\` exists, do not advance automatically. Re-run the stage artifact work, then clear the marker with \`/cc-ops rewind --ack <currentStage>\`.
 4. Let \`G\` = \`requiredGates\` for **\`currentStage\`** from the stage schema.
 5. Let \`catalog\` = \`stageGateCatalog[currentStage]\` from flow state.
 6. **Satisfied** for gate id \`g\`: \`g\` in \`catalog.passed\` and \`g\` not in \`catalog.blocked\`.
@@ -56,7 +56,7 @@ This is the only progression command the user needs to drive the entire flow. St
 
 → If current stage's \`next\` is **\`done\`**:
   - if \`currentStage === "ship"\` and \`retro.completedAt\` is missing -> route to \`/cc-ops retro\`,
-  - if \`currentStage === "ship"\` and \`retro.completedAt\` is present -> route to \`/cc-ops archive\`,
+  - if \`currentStage === "ship"\` and \`retro.completedAt\` is present -> suggest \`/cc-ops compound\` then route to \`/cc-ops archive\`,
   - otherwise report **"Flow complete. All stages finished."** and stop.
 → Otherwise: load **\`${RUNTIME_ROOT}/skills/<skillFolder>/SKILL.md\`** and **\`${RUNTIME_ROOT}/commands/<nextStage>.md\`** for the successor stage. Execute that stage's protocol.
 
@@ -124,7 +124,7 @@ Do **not** mark gates satisfied from memory alone. Cite **artifact evidence** (p
 
 1. Open **\`${flowPath}\`**.
 2. Record \`currentStage\` and \`stageGateCatalog[currentStage]\`.
-3. If \`staleStages[currentStage]\` exists, re-run the stage and clear marker via \`/cc-ops rewind-ack <currentStage>\` before advancing.
+3. If \`staleStages[currentStage]\` exists, re-run the stage and clear marker via \`/cc-ops rewind --ack <currentStage>\` before advancing.
 4. If the file is missing or invalid JSON → **BLOCKED** (report and stop).
 
 ### Step 2: Evaluate gates
@@ -150,7 +150,7 @@ Execute the stage protocol. The stage skill handles interaction, STOP points, ga
 If \`next\` is \`done\`:
 
 - If \`currentStage\` is \`ship\` and \`retro.completedAt\` is missing -> route to \`/cc-ops retro\`.
-- If \`currentStage\` is \`ship\` and \`retro.completedAt\` exists -> route to \`/cc-ops archive\`.
+- If \`currentStage\` is \`ship\` and \`retro.completedAt\` exists -> suggest \`/cc-ops compound\`, then route to \`/cc-ops archive\`.
 - Otherwise report **"Flow complete. All stages finished."** and stop.
 
 Otherwise load the next stage's skill and command contract, begin execution.

package/dist/content/observe.js

@@ -819,7 +819,8 @@ if command -v jq >/dev/null 2>&1; then
     --arg phase "$PHASE" \\
     --arg stage "$STAGE" \\
     --arg runId "$ACTIVE_RUN" \\
-    '{ts:$ts,event:$event,tool:$tool,phase:$phase,stage:$stage,runId:$runId}' 2>/dev/null || echo "")
+    --arg schemaVersion "1" \\
+    '{ts:$ts,event:$event,tool:$tool,phase:$phase,stage:$stage,runId:$runId,schemaVersion:($schemaVersion|tonumber)}' 2>/dev/null || echo "")
 else
   EVENT_JSON=$(printf '{"ts":"%s","event":"%s","tool":"%s","phase":"%s","stage":"%s","runId":"%s","data":"%s"}' \\
     "$(escape_json "$TS")" \\
@@ -829,7 +830,7 @@ else
     "$(escape_json "$STAGE")" \\
     "$(escape_json "$ACTIVE_RUN")" \\
     "$(escape_json "$PAYLOAD")")
-  ACTIVITY_JSON=$(printf '{"ts":"%s","event":"%s","tool":"%s","phase":"%s","stage":"%s","runId":"%s"}' \\
+  ACTIVITY_JSON=$(printf '{"ts":"%s","event":"%s","tool":"%s","phase":"%s","stage":"%s","runId":"%s","schemaVersion":1}' \\
     "$(escape_json "$TS")" \\
     "$(escape_json "$EVENT")" \\
     "$(escape_json "$TOOL")" \\

package/dist/content/ops-command.js

@@ -12,9 +12,9 @@ Subcommands:
 - \`feature\` -> \`/cc-ops feature\`
 - \`tdd-log\` -> \`/cc-ops tdd-log\`
 - \`retro\` -> \`/cc-ops retro\`
+- \`compound\` -> \`/cc-ops compound\`
 - \`archive\` -> \`/cc-ops archive\`
 - \`rewind\` -> \`/cc-ops rewind\`
-- \`rewind-ack\` -> \`/cc-ops rewind-ack\`
 
 ## HARD-GATE
 
@@ -28,9 +28,9 @@ Subcommands:
    - \`feature\` -> \`${RUNTIME_ROOT}/commands/feature.md\`
    - \`tdd-log\` -> \`${RUNTIME_ROOT}/commands/tdd-log.md\`
    - \`retro\` -> \`${RUNTIME_ROOT}/commands/retro.md\`
+   - \`compound\` -> \`${RUNTIME_ROOT}/commands/compound.md\`
    - \`archive\` -> \`${RUNTIME_ROOT}/commands/archive.md\`
    - \`rewind\` -> \`${RUNTIME_ROOT}/commands/rewind.md\`
-   - \`rewind-ack\` -> \`${RUNTIME_ROOT}/commands/rewind-ack.md\`
 3. Unknown subcommand -> print supported values and stop.
 
 ## Primary skill
@@ -41,7 +41,7 @@ Subcommands:
 export function opsCommandSkillMarkdown() {
     return `---
 name: ${OPS_SKILL_NAME}
-description: "Unified operational router for feature/tdd-log/retro/archive/rewind commands."
+description: "Unified operational router for feature/tdd-log/retro/compound/archive/rewind commands."
 ---
 
 # /cc-ops
@@ -52,7 +52,7 @@ This wrapper only dispatches. It must not apply state mutations itself.
 
 ## Protocol
 
-1. Require a subcommand (\`feature|tdd-log|retro|archive|rewind|rewind-ack\`).
+1. Require a subcommand (\`feature|tdd-log|retro|compound|archive|rewind\`).
 2. Route to the matching command contract + skill pair.
 3. Preserve pass-through args after the subcommand (e.g. \`/cc-ops rewind design\`).
 4. Echo which subcommand was dispatched for auditability.

package/dist/content/protocols.js

@@ -75,7 +75,12 @@ export function ethosProtocolMarkdown() {
 
 Shared operating principles across all stages.
 
-## Search before building
+## 1) Boil the Lake
+
+When the "complete version" costs only slightly more than a shortcut, prefer the
+complete version. Do not leave obvious quality gaps for hypothetical follow-ups.
+
+## 2) Search Before Building
 
 Before adding new code/templates/rules:
 
@@ -84,52 +89,36 @@ Before adding new code/templates/rules:
 3. Search codebase for reusable implementations.
 4. Prefer built-in/library primitives over custom helpers.
 
-## Do less, prove more
-
-- Prefer minimal, verifiable changes.
-- Evidence beats volume.
-- Keep stage output concrete and testable.
-
-## Preamble budget
+## 3) User Sovereignty
 
-This section is the single source of truth for preamble behavior.
-Do not duplicate preamble rules in AGENTS.md, harness adapters, or stage-local docs.
+AI recommends. User decides. If your recommendation changes the user's stated
+direction, ask first and wait for explicit approval.
 
-### Emit when
+## 4) Iron-Law Discipline
 
-| Trigger | Machine-verifiable condition |
-|---|---|
-| Stage transition | \`flow-state.currentStage\` changes in this turn |
-| Non-trivial implementation turn | agent is about to run source-editing tools outside \`.cclaw/\` |
-| Multi-step risky operation | planned sequence contains 2+ commands with rollback/risk potential |
+Every stage has a non-negotiable Iron Law. If a proposed action violates it,
+stop and escalate via Decision Protocol instead of rationalizing exceptions.
 
-### Skip when
+## 5) Complete Before Ship
 
-| Skip reason | Condition |
-|---|---|
-| Pure Q&A | no filesystem or runtime mutation planned |
-| Trivial change | single low-risk edit with no stage or plan drift |
-| Subagent dispatch payload | prompt is for spawned agent/tool call only |
-| Cooldown hit | same stage + same trigger emitted within cooldown window |
+No release shortcuts:
+- review verdict must be explicit,
+- preflight evidence must be fresh,
+- rollback must be written before finalization.
 
-### Form contract (max 4 lines)
+## 6) Compound, Don't Repeat
 
-1. \`Stage:\` current stage id  
-2. \`Goal:\` concrete objective for this turn  
-3. \`Plan:\` next 1-3 actions  
-4. \`Guardrails:\` key constraints / non-goals
-
-### Cooldown
+When a reusable lesson appears, add one strict-schema JSONL entry via
+\`/cc-learn add\`. Repeated lessons should be lifted into stable rules/skills so
+the same class of mistake gets harder to repeat.
 
-- Record each emitted preamble in \`.cclaw/state/preamble-log.jsonl\` as JSON line:
-  \`{"ts","stage","runId","trigger","hash"}\`.
-- Default cooldown: 15 minutes for identical \`stage + trigger + hash\`.
-- TDD wave mode uses stricter dedupe: one preamble per wave unless scope changes.
-- If the plan changes materially, a new preamble is allowed inside cooldown.
+## Turn Announce Discipline
 
-## Operational learning
+Keep orchestration visible without maintaining a dedicated preamble runtime log.
 
-When a reusable lesson appears, add one strict-schema JSONL entry via
-\`/cc-learn add\`. Keep the knowledge store append-only.
+- Start substantial turns with a 1-2 sentence announce: current stage, intent, next action.
+- Skip announce for trivial single-command actions.
+- Never repeat boilerplate announces when the intent did not change.
+- If plan or risk changes materially, post a fresh announce before executing.
 `;
 }

package/dist/content/retro-command.js

@@ -36,7 +36,7 @@ Mandatory retrospective gate before archive once ship is complete.
    - \`required: true\`
    - \`completedAt: <ISO>\`
    - \`compoundEntries: <count>\`
-5. Report completion summary and remind user that \`/cc-ops archive\` is now unblocked.
+5. Report completion summary and remind user that \`/cc-ops compound\` (optional) can lift repeated learnings before \`/cc-ops archive\`.
 
 ## Primary skill
 
@@ -67,6 +67,7 @@ Archive must remain blocked until retro artifact exists and compound knowledge w
 5. Print explicit completion line:
    - \`retro gate: complete\`
    - \`compound entries added: <N>\`
+   - \`next: /cc-ops compound (optional) -> /cc-ops archive\`
 
 ## Validation
 

package/dist/content/rewind-command.d.ts

@@ -1,3 +1,2 @@
 export declare function rewindCommandContract(): string;
-export declare function rewindAcknowledgeCommandContract(): string;
 export declare function rewindCommandSkillMarkdown(): string;

package/dist/content/rewind-command.js

@@ -15,7 +15,8 @@ export function rewindCommandContract() {
 
 ## Purpose
 
-Rewind active flow to an earlier stage and atomically invalidate downstream work.
+Rewind active flow to an earlier stage, or acknowledge stale markers after
+intentional rework.
 
 ## HARD-GATE
 
@@ -26,9 +27,12 @@ Rewind active flow to an earlier stage and atomically invalidate downstream work
 ## Inputs
 
 \`/cc-ops rewind <target-stage> [reason]\`
+or
+\`/cc-ops rewind --ack <stage>\`
 
 ## Algorithm
 
+### rewind mode
 1. Read \`${flowStatePath()}\` and current track.
 2. Validate \`target-stage\` belongs to the active track and is not ahead of current stage.
 3. Compute downstream stages to invalidate (all stages after target that were completed or current).
@@ -42,42 +46,24 @@ Rewind active flow to an earlier stage and atomically invalidate downstream work
    - append \`rewinds[]\` record
 7. Append JSON line to \`${rewindLogPath()}\`.
 
-## Output
-
-- Rewind id
-- from -> to stage
-- Invalidated stages list
-- Number of stale artifacts
-
-## Primary skill
-
-**${RUNTIME_ROOT}/skills/${REWIND_SKILL_FOLDER}/SKILL.md**
-`;
-}
-export function rewindAcknowledgeCommandContract() {
-    return `# /cc-ops rewind-ack
-
-## Purpose
-
-Acknowledge and clear stale-stage markers after downstream work is intentionally redone.
-
-## Input
-
-\`/cc-ops rewind-ack <stage>\`
-
-## HARD-GATE
-
-- Only clear stale marker for the requested stage.
-- Never modify completedStages from this command.
-
-## Algorithm
-
+### acknowledge mode (\`--ack\`)
 1. Read \`${flowStatePath()}\`.
 2. If \`staleStages.<stage>\` is missing, report no-op.
 3. Remove \`staleStages.<stage>\`.
 4. Write updated flow-state.
 5. Print remaining stale stages (if any).
 
+## Output
+
+- In rewind mode:
+  - rewind id
+  - from -> to stage
+  - invalidated stages list
+  - number of stale artifacts
+- In acknowledge mode:
+  - acknowledged stage
+  - remaining stale stages
+
 ## Primary skill
 
 **${RUNTIME_ROOT}/skills/${REWIND_SKILL_FOLDER}/SKILL.md**
@@ -89,7 +75,7 @@ name: ${REWIND_SKILL_NAME}
 description: "Rewind active flow stage safely and acknowledge stale invalidations."
 ---
 
-# /cc-ops rewind + /cc-ops rewind-ack
+# /cc-ops rewind
 
 ## HARD-GATE
 
@@ -105,7 +91,7 @@ Rewind is an atomic state transition. Never leave flow-state half-updated (for e
 5. Record \`rewinds[]\` and \`staleStages\` in flow-state.
 6. Append rewind entry into \`${rewindLogPath()}\`.
 
-### rewind-ack
+### rewind --ack <stage>
 1. Load flow-state stale map.
 2. Remove exactly one stale stage marker.
 3. Report remaining stale stages.

package/dist/content/skills.js

@@ -98,6 +98,9 @@ Provide fresh, stage-local verification evidence from this turn:
 1. Run verification commands (tests/build/lint/type-check) for the changed scope.
 2. Confirm output, do not infer success from prior runs.
 3. If this is a bug fix, capture RED -> GREEN evidence for the regression path.
+
+Reference utility skill:
+\`.cclaw/skills/verification-before-completion/SKILL.md\`
 `;
 }
 function waveExecutionModeBlock(stage) {
@@ -108,9 +111,8 @@ function waveExecutionModeBlock(stage) {
 
 Execute the current dependency wave task-by-task (RED -> GREEN -> REFACTOR).
 Stop on BLOCKED status or when user input is required.
-Apply preamble budget discipline: one preamble per wave, then continue without
-repeating it for each task. Re-emit only when the wave boundary changes or the
-plan changes materially.
+Apply concise turn announces: one announce per wave boundary (or when risk/plan
+changes materially), then execute tasks without repetitive boilerplate.
 
 Detailed walkthrough:
 \`.cclaw/${STAGE_EXAMPLES_REFERENCE_DIR}/tdd-wave-walkthrough.md\`
@@ -192,11 +194,14 @@ function stageSpecificSeeAlso(stage) {
         ],
         review: [
             `- \`${RUNTIME_ROOT}/skills/security/SKILL.md\``,
-            `- \`${RUNTIME_ROOT}/skills/parallel-dispatch/SKILL.md\``
+            `- \`${RUNTIME_ROOT}/skills/parallel-dispatch/SKILL.md\``,
+            `- \`${RUNTIME_ROOT}/skills/verification-before-completion/SKILL.md\``
         ],
         ship: [
             `- \`${RUNTIME_ROOT}/skills/ci-cd/SKILL.md\``,
-            `- \`${RUNTIME_ROOT}/skills/docs/SKILL.md\``
+            `- \`${RUNTIME_ROOT}/skills/docs/SKILL.md\``,
+            `- \`${RUNTIME_ROOT}/skills/verification-before-completion/SKILL.md\``,
+            `- \`${RUNTIME_ROOT}/skills/finishing-a-development-branch/SKILL.md\``
         ]
     };
     return refs[stage];
@@ -227,9 +232,10 @@ function quickStartBlock(stage) {
     const gatePreview = schema.requiredGates.slice(0, 3).map((g) => `\`${g.id}\``).join(", ");
     return `## Quick Start
 
-1. Obey HARD-GATE and Iron Law.
-2. Execute checklist in order and persist \`${RUNTIME_ROOT}/artifacts/${schema.artifactFile}\`.
-3. Satisfy gates (${gatePreview}${schema.requiredGates.length > 3 ? ` +${schema.requiredGates.length - 3}` : ""}).
+1. Announce at start: "Using \`${schema.skillName}\` to ${schema.purpose}".
+2. Obey HARD-GATE and Iron Law.
+3. Execute checklist in order and persist \`${RUNTIME_ROOT}/artifacts/${schema.artifactFile}\`.
+4. Satisfy gates (${gatePreview}${schema.requiredGates.length > 3 ? ` +${schema.requiredGates.length - 3}` : ""}).
 `;
 }
 /**

package/dist/content/stage-schema.js

@@ -59,14 +59,6 @@ const REQUIRED_GATE_IDS = {
         "ship_finalization_executed"
     ]
 };
-const CONDITIONAL_GATE_RULES = {
-    review: {
-        review_security_audit_swept: "diff_lines_gt:100||files_touched_gt:10||trust_boundary_changed"
-    },
-    ship: {
-        ship_post_merge_tests: "files_touched_gt:10||release_blast_radius_high"
-    }
-};
 const REQUIRED_ARTIFACT_SECTIONS = {
     brainstorm: ["Context", "Problem", "Approaches", "Selected Direction"],
     scope: ["Scope Mode", "In Scope / Out of Scope", "Completion Dashboard", "Scope Summary"],
@@ -77,26 +69,9 @@ const REQUIRED_ARTIFACT_SECTIONS = {
     review: ["Layer 1 Verdict", "Review Army Contract", "Severity Summary", "Final Verdict"],
     ship: ["Preflight Results", "Release Notes", "Rollback Plan", "Finalization"]
 };
-const CONDITIONAL_ARTIFACT_RULES = {
-    review: {
-        "Review Readiness Dashboard": "diff_lines_gt:100||files_touched_gt:10||trust_boundary_changed"
-    },
-    ship: {
-        Monitoring: "release_blast_radius_high"
-    }
-};
 function tieredStageGates(stage, gates) {
     const requiredSet = new Set(REQUIRED_GATE_IDS[stage]);
-    const conditional = CONDITIONAL_GATE_RULES[stage] ?? {};
     return gates.map((gate) => {
-        const condition = conditional[gate.id];
-        if (condition) {
-            return {
-                ...gate,
-                tier: "conditional",
-                condition
-            };
-        }
         return {
             ...gate,
             tier: requiredSet.has(gate.id) ? "required" : "recommended"
@@ -105,17 +80,7 @@ function tieredStageGates(stage, gates) {
 }
 function tieredArtifactValidation(stage, rows) {
     const requiredSections = new Set(REQUIRED_ARTIFACT_SECTIONS[stage]);
-    const conditional = CONDITIONAL_ARTIFACT_RULES[stage] ?? {};
     return rows.map((row) => {
-        const condition = conditional[row.section];
-        if (condition) {
-            return {
-                ...row,
-                tier: "conditional",
-                condition,
-                required: false
-            };
-        }
         const required = requiredSections.has(row.section);
         return {
             ...row,
@@ -291,9 +256,9 @@ export function stageRecommendedGateIds(stage) {
         .map((gate) => gate.id);
 }
 export function stageConditionalGateIds(stage) {
-    return stageSchema(stage).requiredGates
-        .filter((gate) => gate.tier === "conditional")
-        .map((gate) => gate.id);
+    // Conditional gate DSL removed in favor of explicit required/recommended tiers.
+    void stage;
+    return [];
 }
 export function nextCclawCommand(stage) {
     const next = stageSchema(stage).next;

package/dist/content/stages/plan.js

@@ -25,6 +25,8 @@ export const PLAN = {
         "Group tasks into dependency waves — wave N+1 cannot start until wave N has verification evidence.",
         "Slice into vertical tasks — each task targets 2-5 minutes, produces one testable outcome, and touches one coherent area.",
         "Attach verification — every task has an acceptance criterion mapping and a concrete verification command.",
+        "Map scope Locked Decisions — every D-XX from scope is referenced by at least one plan task (or explicitly marked deferred with reason).",
+        "Run anti-placeholder + anti-scope-reduction scans — block `TODO/TBD/...` and phrasing like `v1`, `for now`, `later` for locked boundaries.",
         "Define checkpoints — mark points where progress should be validated before continuing.",
         "WAIT_FOR_CONFIRM — write plan artifact and explicitly pause. **STOP.** Do NOT proceed until user confirms. Then update `flow-state.json` and tell user to run `/cc-next`."
     ],
@@ -33,6 +35,7 @@ export const PLAN = {
         "Split work into small vertical slices (target 2-5 minute tasks).",
         "Publish explicit dependency waves with entry and exit checks for each wave.",
         "Attach verification step to every task.",
+        "Preserve locked scope boundaries: no silent scope reduction language in task rows.",
         "Enforce WAIT_FOR_CONFIRM: present the plan summary with options (A) Approve / (B) Revise / (C) Reject.",
         "**STOP.** Do NOT proceed until user explicitly approves. Then update `flow-state.json` and tell user to run `/cc-next`."
     ],
@@ -40,6 +43,7 @@ export const PLAN = {
         "Build dependency graph and ordered slices.",
         "Group slices into execution waves and define gate criteria per wave.",
         "Define each task with acceptance mapping and verification commands.",
+        "Trace every locked decision (D-XX) to plan tasks or explicit defer rationale.",
         "Record checkpoints and blockers.",
         "Write plan artifact and pause at WAIT_FOR_CONFIRM."
     ],
@@ -54,6 +58,7 @@ export const PLAN = {
     requiredEvidence: [
         "Artifact written to `.cclaw/artifacts/05-plan.md`.",
         "Task list includes acceptance mapping.",
+        "Locked decision coverage table present with D-XX trace links.",
         "Dependency graph documented.",
         "Dependency waves documented with wave-by-wave verification gates.",
         "WAIT_FOR_CONFIRM status recorded."
@@ -69,6 +74,7 @@ export const PLAN = {
         "tasks too broad",
         "dependency uncertainty unresolved",
         "wave boundaries are unclear",
+        "locked decisions from scope are not mapped to tasks",
         "no explicit confirmation"
     ],
     exitCriteria: [
@@ -81,16 +87,19 @@ export const PLAN = {
         "Horizontal decomposition without end-to-end slices",
         "Tasks without verification steps",
         "Starting execution before approval",
-        "Tasks that touch multiple unrelated areas"
+        "Tasks that touch multiple unrelated areas",
+        "Using placeholder tokens or scope-reduction phrases (`v1`, `for now`, `later`) in task definitions"
     ],
     redFlags: [
         "No dependency graph",
         "No WAIT_FOR_CONFIRM marker",
         "No explicit dependency waves",
         "Tasks exceed one coherent outcome",
-        "No acceptance mapping"
+        "No acceptance mapping",
+        "Locked decisions are missing or not mapped",
+        "Scope-reduction language appears without explicit approved defer decision"
     ],
-    policyNeedles: ["WAIT_FOR_CONFIRM", "Task Graph", "Dependency Waves", "Acceptance Mapping", "verification steps"],
+    policyNeedles: ["WAIT_FOR_CONFIRM", "Task Graph", "Dependency Waves", "Acceptance Mapping", "verification steps", "Locked Decision Coverage"],
     artifactFile: "05-plan.md",
     next: "tdd",
     reviewSections: [
@@ -131,16 +140,18 @@ export const PLAN = {
     crossStageTrace: {
         readsFrom: [".cclaw/artifacts/04-spec.md", ".cclaw/artifacts/03-design.md", ".cclaw/artifacts/02-scope.md"],
         writesTo: [".cclaw/artifacts/05-plan.md"],
-        traceabilityRule: "Every task must trace to a spec acceptance criterion. Every downstream RED test must trace to a plan task."
+        traceabilityRule: "Every task must trace to a spec acceptance criterion. Every locked scope decision (D-XX) must trace to at least one plan task or explicit defer rationale. Every downstream RED test must trace to a plan task."
     },
     artifactValidation: [
         { section: "Dependency Graph", required: true, validationRule: "Ordering and parallel opportunities explicit. No circular dependencies." },
         { section: "Dependency Waves", required: true, validationRule: "Every task belongs to a wave. Each wave has an exit gate and dependency statement." },
         { section: "Task List", required: true, validationRule: "Each task row includes ID, description, acceptance criterion, verification command, and effort estimate (S/M/L). Every task must also carry a minutes estimate within the 2-5 minute budget." },
         { section: "Acceptance Mapping", required: true, validationRule: "Every spec criterion is covered by at least one task." },
+        { section: "Locked Decision Coverage", required: false, validationRule: "Every locked decision ID (D-XX) from scope is listed with linked task IDs or explicit defer rationale." },
         { section: "Risk Assessment", required: false, validationRule: "If present: per-task or per-wave risk identification with likelihood, impact, and mitigation strategy." },
         { section: "Boundary Map", required: false, validationRule: "If present: per-wave or per-task interface contracts listing what each task produces (exports) and consumes (imports) from other tasks." },
         { section: "WAIT_FOR_CONFIRM", required: true, validationRule: "Explicit marker present. Status: pending until user approves." },
-        { section: "No-Placeholder Scan", required: false, validationRule: "If present: confirmation that a text scan for `TODO`, `TBD`, `FIXME`, `<fill-in>`, `<your-*-here>`, `xxx`, or bare ellipses has zero hits in the task list. A placeholder is a deferred decision masquerading as a plan." }
+        { section: "No-Placeholder Scan", required: false, validationRule: "Confirmation that a text scan for `TODO`, `TBD`, `FIXME`, `<fill-in>`, `<your-*-here>`, `xxx`, or bare ellipses has zero hits in the task list. A placeholder is a deferred decision masquerading as a plan." },
+        { section: "No Scope Reduction Language Scan", required: false, validationRule: "Confirmation that scope-reduction phrases (`v1`, `for now`, `later`, `temporary`, `placeholder`) are absent from task rows when locked decisions exist." }
     ]
 };