cclaw-cli 0.51.30 → 1.0.0

package/dist/content/core-agents.d.ts

@@ -15,6 +15,8 @@ export interface AgentReturnSchema {
     requiredFields: string[];
     /** Fields that must cite artifact anchors, commands, or code locations when applicable. */
     evidenceFields: string[];
+    /** Additional optional fields allowed for specific agent contracts. */
+    optionalFields?: string[];
 }
 export interface AgentDefinition {
     /** Kebab-case identifier, e.g. `"reviewer"`. */
@@ -62,8 +64,17 @@ export declare const CCLAW_AGENTS: readonly [{
     readonly returnSchema: AgentReturnSchema;
     readonly body: string;
 }, {
-    readonly name: "product-manager";
-    readonly description: "PROACTIVE during brainstorm/scope when product value, persona/JTBD, success metric, or why-now framing is unclear. Use for product discovery, not implementation.";
+    readonly name: "product-discovery";
+    readonly description: "MANDATORY during brainstorm and PROACTIVE during scope when value framing or expansion strategy needs product-level discovery pressure.";
+    readonly tools: ["Read", "Grep", "Glob", "WebSearch"];
+    readonly model: "deep";
+    readonly activation: "mandatory";
+    readonly relatedStages: ["brainstorm", "scope"];
+    readonly returnSchema: AgentReturnSchema;
+    readonly body: string;
+}, {
+    readonly name: "divergent-thinker";
+    readonly description: "PROACTIVE before planner/critic convergence when brainstorm or scope needs option-space expansion and alternative framings.";
     readonly tools: ["Read", "Grep", "Glob", "WebSearch"];
     readonly model: "balanced";
     readonly activation: "proactive";
@@ -81,11 +92,11 @@ export declare const CCLAW_AGENTS: readonly [{
     readonly body: string;
 }, {
     readonly name: "architect";
-    readonly description: "MANDATORY during design. MUST BE USED to validate architecture boundaries, alternatives, failure modes, rollout, and spec handoff before implementation.";
+    readonly description: "MANDATORY during design and final ship verification. MUST BE USED to validate architecture boundaries, alternatives, failure modes, rollout, and cross-stage cohesion before release.";
     readonly tools: ["Read", "Grep", "Glob", "WebSearch"];
     readonly model: "deep";
     readonly activation: "mandatory";
-    readonly relatedStages: ["design"];
+    readonly relatedStages: ["design", "ship"];
     readonly returnSchema: AgentReturnSchema;
     readonly body: string;
 }, {
@@ -98,39 +109,48 @@ export declare const CCLAW_AGENTS: readonly [{
     readonly returnSchema: AgentReturnSchema;
     readonly body: string;
 }, {
-    readonly name: "reviewer";
-    readonly description: "MANDATORY during review. MUST BE USED to run a two-pass audit: spec compliance first, then correctness/maintainability/performance/architecture.";
+    readonly name: "spec-document-reviewer";
+    readonly description: "PROACTIVE during spec when self-review surfaces issues, subsystem boundaries feel broad, or the artifact needs a final plan-readiness pass.";
     readonly tools: ["Read", "Grep", "Glob"];
     readonly model: "balanced";
-    readonly activation: "mandatory";
-    readonly relatedStages: ["spec", "review", "ship"];
+    readonly activation: "proactive";
+    readonly relatedStages: ["spec"];
     readonly returnSchema: AgentReturnSchema;
     readonly body: string;
 }, {
-    readonly name: "performance-reviewer";
-    readonly description: "PROACTIVE during review for hot paths, IO, data volume, caching, rendering, or algorithmic cost changes. Produces no-impact rationale when clean.";
+    readonly name: "coherence-reviewer";
+    readonly description: "PROACTIVE during spec/plan/design when internal consistency must be validated across sections, terminology, references, and dependency narratives.";
     readonly tools: ["Read", "Grep", "Glob"];
     readonly model: "balanced";
     readonly activation: "proactive";
-    readonly relatedStages: ["review"];
+    readonly relatedStages: ["spec", "plan", "design"];
     readonly returnSchema: AgentReturnSchema;
     readonly body: string;
 }, {
-    readonly name: "compatibility-reviewer";
-    readonly description: "PROACTIVE during design/review when public APIs, config, persisted data, CLI behavior, generated clients, or dependency versions may change.";
+    readonly name: "scope-guardian-reviewer";
+    readonly description: "PROACTIVE during scope/plan/design when complexity growth, scope drift, or unnecessary abstraction risk needs a dedicated challenge pass.";
     readonly tools: ["Read", "Grep", "Glob"];
     readonly model: "balanced";
     readonly activation: "proactive";
-    readonly relatedStages: ["design", "review"];
+    readonly relatedStages: ["scope", "plan", "design"];
     readonly returnSchema: AgentReturnSchema;
     readonly body: string;
 }, {
-    readonly name: "observability-reviewer";
-    readonly description: "PROACTIVE during design/review when diagnosis, telemetry, rollout visibility, or supportability could affect safe operation.";
+    readonly name: "feasibility-reviewer";
+    readonly description: "PROACTIVE during plan/design when resource, runtime, environment, dependency, or rollout assumptions can make the solution non-viable.";
     readonly tools: ["Read", "Grep", "Glob"];
     readonly model: "balanced";
     readonly activation: "proactive";
-    readonly relatedStages: ["design", "review"];
+    readonly relatedStages: ["plan", "design"];
+    readonly returnSchema: AgentReturnSchema;
+    readonly body: string;
+}, {
+    readonly name: "reviewer";
+    readonly description: "MANDATORY during review. MUST BE USED to run a two-pass audit with explicit inline lens coverage for performance, compatibility, and observability.";
+    readonly tools: ["Read", "Grep", "Glob"];
+    readonly model: "balanced";
+    readonly activation: "mandatory";
+    readonly relatedStages: ["spec", "review", "ship"];
     readonly returnSchema: AgentReturnSchema;
     readonly body: string;
 }, {
@@ -142,6 +162,15 @@ export declare const CCLAW_AGENTS: readonly [{
     readonly relatedStages: ["design", "review", "ship"];
     readonly returnSchema: AgentReturnSchema;
     readonly body: string;
+}, {
+    readonly name: "integration-overseer";
+    readonly description: "ON-DEMAND after TDD fan-out to verify cross-slice cohesion contract integrity, integration surfaces, and shared invariants before review handoff.";
+    readonly tools: ["Read", "Grep", "Glob"];
+    readonly model: "balanced";
+    readonly activation: "on-demand";
+    readonly relatedStages: ["tdd", "review"];
+    readonly returnSchema: AgentReturnSchema;
+    readonly body: string;
 }, {
     readonly name: "test-author";
     readonly description: "MANDATORY in TDD stage. MUST BE USED for RED -> GREEN -> REFACTOR with evidence-first discipline.";
@@ -178,15 +207,6 @@ export declare const CCLAW_AGENTS: readonly [{
     readonly relatedStages: ["tdd"];
     readonly returnSchema: AgentReturnSchema;
     readonly body: string;
-}, {
-    readonly name: "implementer";
-    readonly description: "ON-DEMAND worker for one scoped implementation slice. Use only with self-contained task text, explicit file boundaries, and verification expectations.";
-    readonly tools: ["Read", "Write", "Edit", "Grep", "Glob", "Bash"];
-    readonly model: "balanced";
-    readonly activation: "on-demand";
-    readonly relatedStages: ["tdd"];
-    readonly returnSchema: AgentReturnSchema;
-    readonly body: string;
 }, {
     readonly name: "fixer";
     readonly description: "ON-DEMAND fresh worker after review FAIL/PARTIAL evidence. Must fix only the cited criterion within explicit allowed files.";
@@ -203,9 +223,6 @@ export declare const CCLAW_AGENTS: readonly [{
  * and typos instead of letting them slip into generated artifacts.
  */
 export type AgentName = (typeof CCLAW_AGENTS)[number]["name"];
-/**
- * Render a complete cclaw agent markdown file (YAML frontmatter + body).
- */
 export declare function agentMarkdown(agent: AgentDefinition): string;
 /**
  * Markdown table mapping cclaw stage entry points to specialist agents.

package/dist/content/core-agents.js

@@ -24,6 +24,10 @@ const ADVISORY_RETURN_SCHEMA = {
     requiredFields: ["status", "summary", "recommendations", "evidenceRefs", "unknowns"],
     evidenceFields: ["evidenceRefs", "recommendations"]
 };
+const CRITIC_ADVISORY_RETURN_SCHEMA = {
+    ...ADVISORY_RETURN_SCHEMA,
+    optionalFields: ["predictions", "predictionsValidated", "openQuestions", "realistCheckResults"]
+};
 const DOC_RETURN_SCHEMA = {
     statusField: "status",
     allowedStatuses: ["DONE", "DONE_WITH_CONCERNS", "NEEDS_CONTEXT", "BLOCKED"],
@@ -49,12 +53,16 @@ Before doing substantive work, return an ACK object that the parent can record:
 Finish with the required return schema plus the same \`spanId\` and \`dispatchId\`. The parent must not claim isolated completion unless ACK/result proof matches the ledger/event span.`;
 }
 function formatReturnSchema(schema) {
-    return [
+    const lines = [
         `- Status field: \`${schema.statusField}\``,
         `- Allowed statuses: ${schema.allowedStatuses.map((status) => `\`${status}\``).join(", ")}`,
         `- Required fields: ${schema.requiredFields.map((field) => `\`${field}\``).join(", ")}`,
         `- Evidence fields: ${schema.evidenceFields.map((field) => `\`${field}\``).join(", ")}`
-    ].join("\n");
+    ];
+    if (schema.optionalFields && schema.optionalFields.length > 0) {
+        lines.push(`- Optional fields: ${schema.optionalFields.map((field) => `\`${field}\``).join(", ")}`);
+    }
+    return lines.join("\n");
 }
 function formattedAgentsForStages(stages) {
     const summary = stageDelegationSummary("standard");
@@ -140,26 +148,58 @@ export const CCLAW_AGENTS = [
         ].join("\n")
     },
     {
-        name: "product-manager",
-        description: "PROACTIVE during brainstorm/scope when product value, persona/JTBD, success metric, or why-now framing is unclear. Use for product discovery, not implementation.",
+        name: "product-discovery",
+        description: "MANDATORY during brainstorm and PROACTIVE during scope when value framing or expansion strategy needs product-level discovery pressure.",
         tools: ["Read", "Grep", "Glob", "WebSearch"],
-        model: "balanced",
-        activation: "proactive",
+        model: "deep",
+        activation: "mandatory",
         relatedStages: ["brainstorm", "scope"],
         returnSchema: ADVISORY_RETURN_SCHEMA,
         body: [
             "You are a **product discovery specialist**.",
             "",
-            "Produce concise evidence for:",
+            "**Mode: discovery** (default)",
             "- persona / user and job to be done",
             "- pain or trigger",
             "- value hypothesis and success metric",
             "- evidence or signal strength",
             "- why now, do-nothing consequence, and non-goals",
             "",
-            "For technical-maintenance work, translate this to operator/developer, failure mode, operational improvement, verification signal, do-nothing cost, and non-goals.",
+            "**Mode: strategist** (trigger when scope mode is SCOPE EXPANSION or SELECTIVE EXPANSION)",
+            "- 10x vision and ideal outcome versus baseline scope",
+            "- concrete expansion proposals (not cosmetic variants)",
+            "- expected upside, reversibility, and trajectory impact",
+            "- explicit add/defer/skip recommendation per proposal",
+            "",
+            "For technical-maintenance work, translate these modes to operator/developer outcomes, failure-mode reduction, verification signal quality, and trajectory impact.",
+            "",
+            "**Role boundary:** frame value and trajectory fit. Do NOT choose implementation architecture."
+        ].join("\n")
+    },
+    {
+        name: "divergent-thinker",
+        description: "PROACTIVE before planner/critic convergence when brainstorm or scope needs option-space expansion and alternative framings.",
+        tools: ["Read", "Grep", "Glob", "WebSearch"],
+        model: "balanced",
+        activation: "proactive",
+        relatedStages: ["brainstorm", "scope"],
+        returnSchema: ADVISORY_RETURN_SCHEMA,
+        body: [
+            "You are a **creative divergent-thinker** dispatched BEFORE planner/critic converge on a single path.",
             "",
-            "**Role boundary:** frame value and problem fit. Do NOT choose implementation architecture."
+            "Your job:",
+            "1. Generate 3-5 alternative framings of the problem.",
+            "2. Generate 3-5 alternative approaches per framing where reasonable.",
+            "3. For each option, include one-line pro/con plus reversibility flag.",
+            "4. Highlight option-space the user might not have considered.",
+            "5. Return concise structured output in `recommendations[]` for planner/critic consumption.",
+            "",
+            "Role boundary: divergence only.",
+            "- Do NOT recommend a single approach.",
+            "- Do NOT validate feasibility (feasibility-reviewer owns that).",
+            "- Do NOT critique premise validity (critic owns that).",
+            "",
+            "You are an explicit amplifier of option-space; convergence happens after you."
         ].join("\n")
     },
     {
@@ -169,32 +209,52 @@ export const CCLAW_AGENTS = [
         model: "balanced",
         activation: "proactive",
         relatedStages: ["brainstorm", "scope", "design"],
-        returnSchema: ADVISORY_RETURN_SCHEMA,
+        returnSchema: CRITIC_ADVISORY_RETURN_SCHEMA,
         body: [
             "You are an **adversarial critic** for product and engineering decisions.",
             "",
-            "Your job:",
-            "1. Attack the premise and name what could make the current direction wrong.",
-            "2. Identify cheaper, smaller, or more reversible alternatives.",
-            "3. Surface hidden assumptions, do-nothing viability, and scope creep.",
-            "4. In design, require a shadow alternative, switch trigger, failure/rescue path, and verification evidence.",
+            "## Why this matters",
+            "False approval is expensive: a missed flaw early can cost 10-100x more to unwind after implementation.",
+            "Anchor every concern in evidence and avoid inventing hypothetical blockers without proof.",
+            "",
+            "## Pre-commitment predictions",
+            "Before deep investigation, list your hypotheses in `predictions[]` (what you expect to find and why).",
+            "",
+            "## Multi-perspective angles",
+            "Pick context-aware angles before analysis:",
+            "- plan/spec/scope: `executor`, `stakeholder`, `skeptic`",
+            "- design/code: `security`, `operator`, `new-hire`",
             "",
-            "Return confirmed risks, disproven concerns, and the smallest decision-changing recommendation."
+            "## Gap analysis",
+            "Name what is missing (evidence gaps, undefined contracts, absent safeguards), not just what looks wrong.",
+            "",
+            "## Self-audit",
+            "Low-confidence concerns (confidence <=4/10) must move into `openQuestions[]` and should not block stage transition by themselves.",
+            "",
+            "## Realist check",
+            "For each Critical/Major concern, test if it would realistically ship; downgrade or suppress concerns that are not plausible in this context.",
+            "Record the result in `realistCheckResults[]`.",
+            "",
+            "## ADVERSARIAL mode escalation",
+            "Escalate to ADVERSARIAL mode when reviewers disagree, your confidence is low, or trust/security boundaries are involved.",
+            "",
+            "Return validated risks, disproven predictions in `predictionsValidated[]`, and the smallest decision-changing recommendation."
         ].join("\n")
     },
     {
         name: "architect",
-        description: "MANDATORY during design. MUST BE USED to validate architecture boundaries, alternatives, failure modes, rollout, and spec handoff before implementation.",
+        description: "MANDATORY during design and final ship verification. MUST BE USED to validate architecture boundaries, alternatives, failure modes, rollout, and cross-stage cohesion before release.",
         tools: ["Read", "Grep", "Glob", "WebSearch"],
         model: "deep",
         activation: "mandatory",
-        relatedStages: ["design"],
+        relatedStages: ["design", "ship"],
         returnSchema: ADVISORY_RETURN_SCHEMA,
         body: [
             "You are an **architecture validation specialist**.",
             "",
             "Check architecture boundaries, existing-system fit, critical paths, data/state flow, alternatives, rescue paths, and verification hooks.",
             "Return chosen path risks, rejected alternatives, switch triggers, and required evidence before spec handoff.",
+            "At ship, perform cross-stage verification across scope/design/spec/plan/review/code and flag DRIFT_DETECTED when shipped behavior diverges from locked decisions.",
             "",
             "**Role boundary:** design validation only. Do NOT write implementation code."
         ].join("\n")
@@ -217,81 +277,131 @@ export const CCLAW_AGENTS = [
         ].join("\n")
     },
     {
-        name: "reviewer",
-        description: "MANDATORY during review. MUST BE USED to run a two-pass audit: spec compliance first, then correctness/maintainability/performance/architecture.",
+        name: "spec-document-reviewer",
+        description: "PROACTIVE during spec when self-review surfaces issues, subsystem boundaries feel broad, or the artifact needs a final plan-readiness pass.",
         tools: ["Read", "Grep", "Glob"],
         model: "balanced",
-        activation: "mandatory",
-        relatedStages: ["spec", "review", "ship"],
+        activation: "proactive",
+        relatedStages: ["spec"],
         returnSchema: REVIEW_RETURN_SCHEMA,
         body: [
-            "You are a **combined spec + code reviewer**.",
+            "You are a **spec document reviewer** focused on plan-readiness.",
             "",
-            "Run two explicit passes:",
+            "Run a concise pass over:",
+            "- completeness of required spec sections",
+            "- consistency across acceptance criteria, assumptions, and mapping",
+            "- clarity / ambiguity / placeholder drift",
+            "- single-subsystem scope fit and YAGNI pressure",
             "",
-            "1. **Spec pass**",
-            "   - For each acceptance criterion: PASS / PARTIAL / FAIL.",
-            "   - Cite evidence as `file:line`.",
+            "Return `PASS`, `PASS_WITH_GAPS`, `FAIL`, or `BLOCKED` with concrete evidence refs and minimal corrective actions.",
             "",
-            "2. **Code-quality pass**",
-            "   - Correctness: logic, boundaries, state transitions.",
-            "   - Maintainability: naming, structure, complexity, debt risks.",
-            "   - Performance: avoid obvious hot-path regressions.",
-            "   - Architecture fit: layering and contract stability.",
+            "**Role boundary:** review the spec artifact only; do NOT write plan tasks or implementation."
+        ].join("\n")
+    },
+    {
+        name: "coherence-reviewer",
+        description: "PROACTIVE during spec/plan/design when internal consistency must be validated across sections, terminology, references, and dependency narratives.",
+        tools: ["Read", "Grep", "Glob"],
+        model: "balanced",
+        activation: "proactive",
+        relatedStages: ["spec", "plan", "design"],
+        returnSchema: REVIEW_RETURN_SCHEMA,
+        body: [
+            "You are a **document coherence reviewer** focused on consistency, not quality scoring.",
             "",
-            "For each finding include:",
-            "- Severity: `Critical` | `Important` | `Suggestion`",
-            "- Location: `file:line`; if no line is possible, state the no-line reason",
-            "- Problem and concrete recommendation",
+            "Check for:",
+            "- contradictions between sections",
+            "- terminology drift (same concept named differently)",
+            "- broken internal references and forward-reference mismatches",
+            "- dependency/storyline conflicts between architecture, scope, and execution notes",
             "",
-            "Also report files inspected, changed-file coverage, diagnostics run, dependency/version audit when relevant, and a no-finding attestation when no issues are found.",
+            "Return `PASS`, `PASS_WITH_GAPS`, `FAIL`, or `BLOCKED` with calibrated, evidence-anchored findings.",
             "",
-            "**Trust model:** never rely on implementer claims; verify by reading code."
+            "**Role boundary:** consistency checks only. Do NOT rewrite the document or propose architecture alternatives."
         ].join("\n")
     },
     {
-        name: "performance-reviewer",
-        description: "PROACTIVE during review for hot paths, IO, data volume, caching, rendering, or algorithmic cost changes. Produces no-impact rationale when clean.",
+        name: "scope-guardian-reviewer",
+        description: "PROACTIVE during scope/plan/design when complexity growth, scope drift, or unnecessary abstraction risk needs a dedicated challenge pass.",
         tools: ["Read", "Grep", "Glob"],
         model: "balanced",
         activation: "proactive",
-        relatedStages: ["review"],
+        relatedStages: ["scope", "plan", "design"],
         returnSchema: REVIEW_RETURN_SCHEMA,
         body: [
-            "You are a **performance review specialist**.",
+            "You are a **scope guard reviewer** focused on minimum viable change and complexity discipline.",
             "",
-            "Check hot paths, algorithmic complexity, IO/network calls, caching behavior, bundle/runtime costs, and accidental N+1 or repeated work.",
-            "Every finding needs a concrete code citation and a measurement or measurement plan."
+            "Check for:",
+            "- whether the document reuses existing solutions before adding abstractions",
+            "- scope-goal alignment and minimum useful slice",
+            "- complexity smell tests (generic utilities, framework-ahead-of-need patterns, speculative layers)",
+            "- dependency ordering that can accidentally widen scope",
+            "",
+            "Return `PASS`, `PASS_WITH_GAPS`, `FAIL`, or `BLOCKED` with concrete evidence refs and smallest corrective action.",
+            "",
+            "**Role boundary:** challenge over-scope and unnecessary complexity; do NOT replace planner/architect ownership."
         ].join("\n")
     },
     {
-        name: "compatibility-reviewer",
-        description: "PROACTIVE during design/review when public APIs, config, persisted data, CLI behavior, generated clients, or dependency versions may change.",
+        name: "feasibility-reviewer",
+        description: "PROACTIVE during plan/design when resource, runtime, environment, dependency, or rollout assumptions can make the solution non-viable.",
         tools: ["Read", "Grep", "Glob"],
         model: "balanced",
         activation: "proactive",
-        relatedStages: ["design", "review"],
+        relatedStages: ["plan", "design"],
         returnSchema: REVIEW_RETURN_SCHEMA,
         body: [
-            "You are a **compatibility review specialist**.",
+            "You are a **feasibility reviewer** focused on execution realism.",
+            "",
+            "Check for:",
+            "- resource/time assumptions versus current constraints",
+            "- runtime and environment assumptions (infrastructure, limits, deployment shape)",
+            "- availability/reliability assumptions for external dependencies",
+            "- rollout and operational risk under real-world conditions",
             "",
-            "Check API compatibility, config/schema stability, persisted data migrations, CLI/user-facing behavior, generated clients, and rollout fallback paths.",
-            "Distinguish shipped compatibility obligations from in-branch implementation churn."
+            "Return `PASS`, `PASS_WITH_GAPS`, `FAIL`, or `BLOCKED` with evidence and explicit risk-to-ship mapping.",
+            "",
+            "**Role boundary:** feasibility realism only; do NOT redesign architecture unless feasibility is blocked."
         ].join("\n")
     },
     {
-        name: "observability-reviewer",
-        description: "PROACTIVE during design/review when diagnosis, telemetry, rollout visibility, or supportability could affect safe operation.",
+        name: "reviewer",
+        description: "MANDATORY during review. MUST BE USED to run a two-pass audit with explicit inline lens coverage for performance, compatibility, and observability.",
         tools: ["Read", "Grep", "Glob"],
         model: "balanced",
-        activation: "proactive",
-        relatedStages: ["design", "review"],
+        activation: "mandatory",
+        relatedStages: ["spec", "review", "ship"],
         returnSchema: REVIEW_RETURN_SCHEMA,
         body: [
-            "You are an **observability review specialist**.",
+            "You are a **combined spec + code reviewer**.",
+            "",
+            "Run two explicit passes:",
             "",
-            "Check logs, metrics, traces, alerts, debug handles, failure detection, and support handoff evidence for the changed paths.",
-            "Report missing visibility as a ship risk only when it affects diagnosis or rollback."
+            "1. **Spec pass**",
+            "   - For each acceptance criterion: PASS / PARTIAL / FAIL.",
+            "   - Cite evidence as `file:line`.",
+            "",
+            "2. **Code-quality pass**",
+            "   - Correctness: logic, boundaries, state transitions.",
+            "   - Maintainability: naming, structure, complexity, debt risks.",
+            "   - Performance: avoid obvious hot-path regressions.",
+            "   - Architecture fit: layering and contract stability.",
+            "",
+            "## Lens Coverage",
+            "Performance: NO_IMPACT / FOUND_<n>",
+            "Compatibility: NO_IMPACT / FOUND_<n>",
+            "Observability: NO_IMPACT / FOUND_<n>",
+            "Security: routed to security-reviewer (always separate)",
+            "For unusually large/high-risk diffs, optional deep-dive context skills may be loaded: `review-perf-lens`, `review-compat-lens`, `review-observability-lens`.",
+            "",
+            "For each finding include:",
+            "- Severity: `Critical` | `Important` | `Suggestion`",
+            "- Location: `file:line`; if no line is possible, state the no-line reason",
+            "- Problem and concrete recommendation",
+            "",
+            "Also report files inspected, changed-file coverage, diagnostics run, dependency/version audit when relevant, and a no-finding attestation when no issues are found.",
+            "",
+            "**Trust model:** never rely on implementer claims; verify by reading code."
         ].join("\n")
     },
     {
@@ -320,6 +430,31 @@ export const CCLAW_AGENTS = [
             "- `NO_CHANGE_ATTESTATION` or `NO_SECURITY_IMPACT` with inspected surfaces when no security finding exists"
         ].join("\n")
     },
+    {
+        name: "integration-overseer",
+        description: "ON-DEMAND after TDD fan-out to verify cross-slice cohesion contract integrity, integration surfaces, and shared invariants before review handoff.",
+        tools: ["Read", "Grep", "Glob"],
+        model: "balanced",
+        activation: "on-demand",
+        relatedStages: ["tdd", "review"],
+        returnSchema: REVIEW_RETURN_SCHEMA,
+        body: [
+            "You are an **integration overseer** for TDD fan-out runs.",
+            "",
+            "You are dispatched after parallel `slice-implementer` lanes complete.",
+            "",
+            "Checks:",
+            "- every integration test named in `cohesion-contract.md` passes (or has explicit gap rationale)",
+            "- naming conventions remain consistent across slices",
+            "- shared invariants stay true after fan-in",
+            "- boundary types at touchpoints match the contract",
+            "- integration between slices is executable and regression-safe",
+            "",
+            "Return `PASS`, `PASS_WITH_GAPS`, `FAIL`, or `BLOCKED` with evidence refs and explicit integration risks.",
+            "",
+            "**Role boundary:** integration and cohesion oversight only; do NOT implement production code."
+        ].join("\n")
+    },
     {
         name: "test-author",
         description: "MANDATORY in TDD stage. MUST BE USED for RED -> GREEN -> REFACTOR with evidence-first discipline.",
@@ -387,6 +522,14 @@ export const CCLAW_AGENTS = [
         body: [
             "You are a **vertical-slice implementation worker**.",
             "",
+            "**Mode: TDD-bound** (default)",
+            "- Requires RED evidence before production edits.",
+            "- Requires explicit file boundaries and acceptance mapping from the slice contract.",
+            "",
+            "**Mode: Generic** (only when withTDD=false on quick-track)",
+            "- Allows bounded implementation without full RED/GREEN loop.",
+            "- Still requires explicit scope boundaries and verification evidence.",
+            "",
             "Rules:",
             "1. Start only from the assigned RED failure and acceptance mapping.",
             "2. Edit only the allowed files for the slice.",
@@ -396,26 +539,6 @@ export const CCLAW_AGENTS = [
             "**Role boundary:** do not broaden scope, do not review your own work as final approval, and do not spawn subagents."
         ].join("\n")
     },
-    {
-        name: "implementer",
-        description: "ON-DEMAND worker for one scoped implementation slice. Use only with self-contained task text, explicit file boundaries, and verification expectations.",
-        tools: ["Read", "Write", "Edit", "Grep", "Glob", "Bash"],
-        model: "balanced",
-        activation: "on-demand",
-        relatedStages: ["tdd"],
-        returnSchema: WORKER_RETURN_SCHEMA,
-        body: [
-            "You are an **implementation worker** for one bounded cclaw task.",
-            "",
-            "Rules:",
-            "1. Treat the parent prompt as the full task boundary; do not infer hidden scope from plan files.",
-            "2. Make the smallest coherent code change that satisfies the pasted acceptance criteria.",
-            "3. Run the requested verification commands when feasible and report representative evidence.",
-            "4. Return the strict worker JSON schema before prose.",
-            "",
-            "**Role boundary:** do not review your own work as final approval and do not spawn subagents."
-        ].join("\n")
-    },
     {
         name: "fixer",
         description: "ON-DEMAND fresh worker after review FAIL/PARTIAL evidence. Must fix only the cited criterion within explicit allowed files.",
@@ -438,10 +561,21 @@ export const CCLAW_AGENTS = [
     }
 ];
 import { stageDelegationSummary } from "./stage-schema.js";
-import { enhancedAgentBody } from "./subagents.js";
 /**
  * Render a complete cclaw agent markdown file (YAML frontmatter + body).
  */
+function defaultTaskDelegationSection(agentName) {
+    return `
+
+## Task Tool Delegation
+
+Use native Task/subagent delegation only when this agent's role requires isolated context or strict lifecycle evidence. Keep the delegation prompt self-contained and bounded to this agent's role.
+
+${agentName === "reviewer"
+        ? "- For large/high-risk diffs, load optional deep lens skills (`review-perf-lens`, `review-compat-lens`, `review-observability-lens`) before final verdict."
+        : "_No extra agent-specific delegation template is required._"}
+`;
+}
 export function agentMarkdown(agent) {
     const frontmatter = [
         "---",
@@ -452,7 +586,7 @@ export function agentMarkdown(agent) {
         "---"
     ].join("\n");
     const relatedStages = agent.relatedStages.length > 0 ? agent.relatedStages.join(", ") : "(none)";
-    const taskDelegation = enhancedAgentBody(agent.name);
+    const taskDelegation = defaultTaskDelegationSection(agent.name);
     return `${frontmatter}
 
 # ${agent.name}
@@ -511,8 +645,8 @@ export function agentRoutingTable() {
 export function agentCostTierTable() {
     return `| Tier | Use for | Example agents |
 |---|---|---|
-| \`deep\` | one heavy planning pass per stage | planner |
-| \`balanced\` | discovery, criticism, review, TDD, and bounded worker execution | product-manager, critic, reviewer, security-reviewer, test-author, implementer, fixer |
+| \`deep\` | one heavy planning/strategy pass per stage | planner, product-discovery |
+| \`balanced\` | discovery, criticism, review, TDD, and bounded worker execution | critic, spec-document-reviewer, coherence-reviewer, scope-guardian-reviewer, feasibility-reviewer, reviewer, security-reviewer, test-author, slice-implementer, fixer |
 | \`fast\` | bounded maintenance updates with limited blast radius | doc-updater |
 `;
 }
@@ -555,7 +689,7 @@ ${(() => {
         const mode = activationModeSummary();
         return `- **Mandatory:** ${mode.mandatory}.
 - **Proactive:** ${mode.proactive}.
-- **On-demand:** slice-implementer, implementer, fixer. Research playbooks are in-thread procedures.`;
+- **On-demand:** slice-implementer, fixer. Research playbooks are in-thread procedures.`;
     })()}
 
 ### Cost-aware routing

package/dist/content/decision-protocol.d.ts

@@ -9,4 +9,4 @@ export declare const STRUCTURED_ASK_TOOL_LIST_IDEATE = "`AskUserQuestion` on Cla
 export declare function structuredAskFallbackSentence(toolList?: string): string;
 export declare function decisionProtocolInstruction(subject: string, optionsClause: string, recommendationClause: string, toolList?: string): string;
 export declare function structuredAskSingleChoiceInstruction(subject: string, choicesClause: string, toolList?: string): string;
-export declare function ideateStructuredAskToolsWithFallback(): string;
+export declare function ideaStructuredAskToolsWithFallback(): string;

package/dist/content/decision-protocol.js

@@ -15,6 +15,6 @@ export function decisionProtocolInstruction(subject, optionsClause, recommendati
 export function structuredAskSingleChoiceInstruction(subject, choicesClause, toolList = STRUCTURED_ASK_TOOL_LIST_GENERIC) {
     return `For ${subject}: use the native structured-ask tool (${toolList}) only if runtime schema is confirmed; otherwise collect ${choicesClause} with a plain-text single-choice prompt.`;
 }
-export function ideateStructuredAskToolsWithFallback() {
+export function ideaStructuredAskToolsWithFallback() {
     return `${STRUCTURED_ASK_TOOL_LIST_IDEATE}; fall back to a plain-text lettered list when the tool is hidden or errors`;
 }

package/dist/content/diff-command.js

@@ -37,7 +37,7 @@ Never mutate state from \`/cc-view diff\`. It is a read-only inspection command.
 - The command must not create or update any \`.cclaw/state/*.snapshot*\` file.
 - Do not suppress removed values; removals are first-class evidence.
 - Closeout diff lines must use the same \`shipSubstate\` vocabulary as the
-  state machine (\`idle\` / \`retro_review\` / \`compound_review\` /
+  state machine (\`idle\` / \`post_ship_review\` /
   \`ready_to_archive\` / \`archived\`).
 `;
 }