cclaw-cli 0.51.16 → 0.51.18

package/dist/artifact-linter.js

@@ -654,18 +654,38 @@ function validateApproachesTaxonomy(sectionBody) {
     };
 }
 function validateCalibratedSelfReview(sectionBody) {
-    const hasStatus = /^\s*-\s*Status:\s*(?:Approved|Issues Found)\s*$/imu.test(sectionBody);
-    const hasPatches = /^\s*-\s*Patches applied:\s*$/imu.test(sectionBody);
-    const hasConcerns = /^\s*-\s*Remaining concerns:\s*$/imu.test(sectionBody);
-    if (!hasStatus || !hasPatches || !hasConcerns) {
+    const statusLineMatch = /^\s*-\s*Status:\s*(.*)$/imu.exec(sectionBody);
+    const statusValue = statusLineMatch ? statusLineMatch[1].trim() : "";
+    const mentionsApproved = /\bApproved\b/iu.test(statusValue);
+    const mentionsIssuesFound = /\bIssues Found\b/iu.test(statusValue);
+    const statusPickedExactlyOne = statusLineMatch !== null && (mentionsApproved !== mentionsIssuesFound);
+    const hasPatchesHeader = /^\s*-\s*Patches applied:/imu.test(sectionBody);
+    const hasConcernsHeader = /^\s*-\s*Remaining concerns:/imu.test(sectionBody);
+    if (statusPickedExactlyOne && hasPatchesHeader && hasConcernsHeader) {
         return {
-            ok: false,
-            details: "Self-Review Notes must use the calibrated review prompt format: `- Status: Approved | Issues Found`, `- Patches applied:`, and `- Remaining concerns:`."
+            ok: true,
+            details: "Self-Review Notes use the calibrated review prompt format."
         };
     }
+    const problems = [];
+    if (!statusLineMatch) {
+        problems.push("missing `- Status:` line");
+    }
+    else if (!mentionsApproved && !mentionsIssuesFound) {
+        problems.push("`- Status:` must include `Approved` or `Issues Found`");
+    }
+    else if (mentionsApproved && mentionsIssuesFound) {
+        problems.push("`- Status:` must pick exactly one of `Approved` or `Issues Found` (the placeholder `Approved | Issues Found` is not a decision)");
+    }
+    if (!hasPatchesHeader)
+        problems.push("missing `- Patches applied:` line");
+    if (!hasConcernsHeader)
+        problems.push("missing `- Remaining concerns:` line");
     return {
-        ok: true,
-        details: "Self-Review Notes use the calibrated review prompt format."
+        ok: false,
+        details: "Self-Review Notes must use the calibrated review prompt format: `- Status: Approved` (or `Issues Found`), `- Patches applied:` (inline note or sub-bullets), and `- Remaining concerns:` (inline note or sub-bullets). Issues: " +
+            problems.join("; ") +
+            "."
     };
 }
 function validateRequirementsTaxonomy(sectionBody) {

package/dist/content/skills.d.ts

@@ -1,3 +1,3 @@
-import type { FlowStage, FlowTrack } from "../types.js";
+import { type FlowStage, type FlowTrack } from "../types.js";
 export declare function stageSkillFolder(stage: FlowStage): string;
 export declare function stageSkillMarkdown(stage: FlowStage, track?: FlowTrack): string;

package/dist/content/skills.js

@@ -1,5 +1,6 @@
 import { RUNTIME_ROOT, STAGE_TO_SKILL_FOLDER } from "../constants.js";
 import { nextStage as nextStageForTrack } from "../flow-state.js";
+import { FLOW_STAGES } from "../types.js";
 import { stageExamples } from "./examples.js";
 import { reviewStackAwareRoutes, reviewStackAwareRoutingSummary, stageAutoSubagentDispatch, stageSchema, stageTrackRenderContext } from "./stage-schema.js";
 import { conversationLanguagePolicyMarkdown } from "./language-policy.js";
@@ -13,7 +14,12 @@ ${items.map((item) => `- ${item}`).join("\n")}
 
 `;
 }
-function contextLoadingBlock(trace, executionModel) {
+function artifactTemplatePathForStage(stage) {
+    const stageIndex = FLOW_STAGES.indexOf(stage) + 1;
+    const stageNumber = String(stageIndex).padStart(2, "0");
+    return `${RUNTIME_ROOT}/templates/${stageNumber}-${stage}.md`;
+}
+function contextLoadingBlock(stage, trace, executionModel) {
     const readLines = trace.readsFrom.length > 0
         ? trace.readsFrom.map((value) => `- \`${value}\``).join("\n")
         : "- (first stage — no upstream artifacts)";
@@ -23,6 +29,7 @@ function contextLoadingBlock(trace, executionModel) {
     const requiredContext = executionModel.requiredContext.length > 0
         ? executionModel.requiredContext.map((item) => `- ${item}`).join("\n")
         : "- None beyond this skill";
+    const artifactTemplatePath = artifactTemplatePathForStage(stage);
     return `## Context Loading
 
 Before execution:
@@ -34,16 +41,19 @@ ${readLines}
    Treat it as the machine-readable skeleton: required top-level fields,
    closed taxonomies, and the derived markdown path. Do not validate natural-language
    prose by regex; put semantic quality checks in the review prompts.
-5. Extract upstream decisions, constraints, and open questions into the current
+5. Read the canonical artifact template at \`${artifactTemplatePath}\` and reuse its
+   exact section layout — per-row tables with stable column order, calibrated review block;
+   do not invent layouts for sections the template already defines.
+6. Extract upstream decisions, constraints, and open questions into the current
    artifact's \`Upstream Handoff\` section when that section exists.
-6. Before doing stage work, give a compact user-facing drift preamble: "Carrying forward: <1-3 bullets>. Drift since upstream: None / <specific drift>. Recommendation: continue / re-scope."
-7. If you change an upstream decision, record an explicit drift reason in the
+7. Before doing stage work, give a compact user-facing drift preamble: "Carrying forward: <1-3 bullets>. Drift since upstream: None / <specific drift>. Recommendation: continue / re-scope."
+8. If you change an upstream decision, record an explicit drift reason in the
    current artifact before continuing.
-8. Confirm stage inputs:
+9. Confirm stage inputs:
 ${inputs}
-9. Confirm required context:
+10. Confirm required context:
 ${requiredContext}
-10. Use the injected knowledge digest from session-start; only fall back to full
+11. Use the injected knowledge digest from session-start; only fall back to full
    \`.cclaw/knowledge.jsonl\` when the digest is insufficient.
 `;
 }
@@ -395,7 +405,7 @@ This is the stage **state machine** — the canonical ordered flow. For every de
 
 ${processFlowMermaid.length > 0 ? processFlowMermaid : "```mermaid\nflowchart TD\n  S1[\"Execute Checklist\"] --> S2[\"Satisfy required gates\"] --> S3[\"Verify before closeout\"]\n```"}
 
-${platformNotesBlock}${contextLoadingBlock(artifactRules.crossStageTrace, executionModel)}
+${platformNotesBlock}${contextLoadingBlock(stage, artifactRules.crossStageTrace, executionModel)}
 ${autoSubagentDispatchBlock(stage, track)}
 ${stackAwareReviewRoutingBlock(stage)}
 ${researchPlaybooksBlock(executionModel.researchPlaybooks ?? [])}

package/dist/content/stages/brainstorm.js

@@ -47,7 +47,7 @@ export const BRAINSTORM = {
             "**Compare 2-3 distinct approaches with stable Role/Upside columns** — Role values are `baseline` | `challenger` | `wild-card`; Upside is `low` | `modest` | `high` | `higher`; include real trade-offs and reuse notes; include exactly one challenger with explicit `high` or `higher` upside.",
             "**Collect reaction before recommending** — ask which option feels closest and what concern remains, then recommend based on that reaction.",
             "**Write the `Not Doing` list** — name 3-5 things this brainstorm explicitly is not committing to (vs. deferred). This protects scope from silent enlargement and the next stage from rework.",
-            "**Self-review before user approval** — re-read the artifact and patch contradictions, weak trade-offs, placeholders, ambiguity, and weak handoff language; record the patch list in `Self-Review Notes` (or `- None.`).",
+            "**Self-review before user approval** — re-read the artifact and patch contradictions, weak trade-offs, placeholders, ambiguity, and weak handoff language. Record the result in `Self-Review Notes` using the calibrated review format: `- Status: Approved` (or `Issues Found`), `- Patches applied:` with inline note or sub-bullets, `- Remaining concerns:` with inline note or sub-bullets. Use `Patches applied: None` and `Remaining concerns: None` when there is nothing to record.",
             "**Request explicit approval** — state exactly what direction is being approved; do not advance without approval and artifact review.",
             "**Handoff** — only after approval, complete the stage and point to `/cc-next`."
         ],
@@ -137,7 +137,7 @@ export const BRAINSTORM = {
             { section: "Not Doing", required: false, validationRule: "Recommended: 3-5 explicitly non-committed items (distinct from deferred). Protects scope from silent enlargement and the next stage from rework." },
             { section: "Design", required: false, validationRule: "Must cover architecture, key components, and data flow scaled to complexity." },
             { section: "Visual Companion", required: false, validationRule: "If architecture/data-flow complexity is medium+, include compact ASCII/Mermaid diagram or explicitly justify omission." },
-            { section: "Self-Review Notes", required: false, validationRule: "Recommended: list of patches applied during self-review (or `- None.`) — done before requesting user approval." },
+            { section: "Self-Review Notes", required: false, validationRule: "Recommended: use the calibrated review format — `- Status: Approved` (or `Issues Found`), `- Patches applied:` (inline note or sub-bullets, use `None` if nothing changed), `- Remaining concerns:` (inline note or sub-bullets, use `None` if nothing remains). Done before requesting user approval." },
             { section: "Assumptions and Open Questions", required: false, validationRule: "Must capture unresolved assumptions/open questions, or explicitly state none." }
         ],
         trivialOverrideSections: [

package/dist/content/templates.js

@@ -96,7 +96,7 @@ ${SEED_SHELF_SECTION}
 - (compact ASCII/Mermaid diagram for medium+ complexity, or one-line justification for omission.)
 
 ## Self-Review Notes
-- Status: Approved | Issues Found
+- Status: Approved
 - Patches applied:
   - None
 - Remaining concerns:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cclaw-cli",
-  "version": "0.51.16",
+  "version": "0.51.18",
   "description": "Installer-first flow toolkit for coding agents",
   "type": "module",
   "bin": {