@martinffx/atelier 1.4.0 → 2.0.0

package/dist/atelier.js

@@ -31996,10 +31996,13 @@ var coerce = {
 };
 var NEVER = INVALID;
 // src/constants.ts
-var HARNESS_NAMES = ["claude", "opencode", "codex"];
-var AGENT_NAMES = ["recon", "oracle", "architect"];
+var Harness = ["claude", "opencode", "codex", "cursor"];
+var AGENT_NAMES = ["sentinel", "oracle", "architect"];
+var LEGACY_AGENT_NAME = "recon";
 
 // src/utils/errors.ts
+var harnessChoices = `${Harness.slice(0, -1).join(", ")}, or ${Harness.at(-1)}`;
+
 class AtelierError extends Error {
   code;
   exitCode;
@@ -32013,19 +32016,19 @@ class AtelierError extends Error {
 
 class ConfigNotFoundError extends AtelierError {
   constructor(command) {
-    super(`.atelier/config.json not found. Run \`atelier ${command} --harness <claude|opencode|codex>\` first.`, "CONFIG_NOT_FOUND", 1);
+    super(`.atelier/config.json not found. Run \`atelier ${command} --harness <${Harness.join("|")}>\` first.`, "CONFIG_NOT_FOUND", 1);
   }
 }
 
 class HarnessRequiredError extends AtelierError {
   constructor() {
-    super("`--yes` requires `--harness` (claude, opencode, or codex).", "HARNESS_REQUIRED", 1);
+    super(`\`--yes\` requires \`--harness\` (${harnessChoices}).`, "HARNESS_REQUIRED", 1);
   }
 }
 
 class InvalidHarnessError extends AtelierError {
   constructor(value) {
-    super(`Invalid harness "${value}". Must be claude, opencode, or codex.`, "INVALID_HARNESS", 1);
+    super(`Invalid harness "${value}". Must be ${harnessChoices}.`, "INVALID_HARNESS", 1);
   }
 }
 class FileWriteError extends AtelierError {
@@ -32041,7 +32044,7 @@ class HarnessConfigError extends AtelierError {
 }
 class InvalidConfigError extends AtelierError {
   constructor(cause, { suggestReinit = false } = {}) {
-    const suffix = suggestReinit ? " Run `atelier init --harness <claude|opencode|codex>` to reconfigure." : "";
+    const suffix = suggestReinit ? ` Run \`atelier init --harness <${Harness.join("|")}>\` to reconfigure.` : "";
     super(`Invalid configuration: ${cause}.${suffix}`, "INVALID_CONFIG", 1);
   }
 }
@@ -32131,18 +32134,46 @@ function readConfig(path2 = CONFIG_PATH) {
     });
   }
   try {
-    return ok(validateConfig(parsed));
+    return ok(validateConfig(migrateLegacyAgentName(parsed)));
   } catch (validationErr) {
     const message = validationErr instanceof Error ? validationErr.message : String(validationErr);
     return err({ type: "invalid", message });
   }
 }
+function migrateLegacyAgentName(config) {
+  if (typeof config !== "object" || config === null) {
+    return config;
+  }
+  const migrated = { ...config };
+  for (const harness of Harness) {
+    const section = migrated[harness];
+    if (typeof section !== "object" || section === null || !Array.isArray(section.agents)) {
+      continue;
+    }
+    const agents = section.agents;
+    migrated[harness] = {
+      ...section,
+      agents: agents.map((agent) => {
+        if (typeof agent !== "object" || agent === null) {
+          return agent;
+        }
+        const entry = agent;
+        return {
+          ...entry,
+          template: entry.template === LEGACY_AGENT_NAME ? "sentinel" : entry.template,
+          name: entry.name === LEGACY_AGENT_NAME ? "sentinel" : entry.name
+        };
+      })
+    };
+  }
+  return migrated;
+}
 function isOldFlatConfig(config) {
   if (typeof config !== "object" || config === null) {
     return false;
   }
   const record = config;
-  return typeof record.harness === "string" && record.claude == null && record.codex == null && record.opencode == null;
+  return typeof record.harness === "string" && Harness.every((harness) => record[harness] == null);
 }
 function writeConfig(config, path2 = CONFIG_PATH) {
   const dir = dirname(path2);
@@ -32153,7 +32184,7 @@ function writeConfig(config, path2 = CONFIG_PATH) {
 `);
 }
 function getConfiguredHarnesses(config) {
-  return HARNESS_NAMES.filter((harness) => config[harness] !== undefined);
+  return Harness.filter((harness) => config[harness] !== undefined);
 }
 function removeConfigDir(path2 = CONFIG_PATH) {
   const dir = dirname(path2);
@@ -32292,7 +32323,7 @@ async function init(options2) {
   }
   let harness;
   if (harnessOption) {
-    if (!HARNESS_NAMES.includes(harnessOption)) {
+    if (!Harness.includes(harnessOption)) {
       throw new InvalidHarnessError(harnessOption);
     }
     harness = harnessOption;
@@ -32302,7 +32333,7 @@ async function init(options2) {
         type: "list",
         name: "harness",
         message: "Which harness are you using?",
-        choices: HARNESS_NAMES
+        choices: Harness
       }
     ]);
     harness = answer.harness;
@@ -32348,7 +32379,7 @@ Files to write:`);
 Atelier initialized for ${harness}.`);
   console.log(`
 Next step:`);
-  if (harness === "opencode" && section.provider === "openai") {
+  if (harness === "opencode" && "provider" in section && section.provider === "openai") {
     console.log("  opencode auth login --provider openai  # connect your OpenAI account");
   }
   console.log("  npx skills add martinffx/atelier  # install skills");
@@ -32361,7 +32392,7 @@ import { homedir as homedir4 } from "os";
 // src/commands/utils.ts
 async function resolveHarness(config, harnessOption, command) {
   if (harnessOption) {
-    if (!HARNESS_NAMES.includes(harnessOption)) {
+    if (!Harness.includes(harnessOption)) {
       throw new InvalidHarnessError(harnessOption);
     }
     const configured2 = getConfiguredHarnesses(config);
@@ -32493,6 +32524,9 @@ var SimpleConfigSchema = exports_external.object({
   default_model: exports_external.string().min(1),
   agents: exports_external.array(AgentSchema).min(1)
 });
+var CursorConfigSchema = exports_external.object({
+  agents: exports_external.array(AgentSchema).min(1)
+}).strict();
 var OPENCODE_PROVIDERS = ["opencode-zen", "opencode-go", "amazon-bedrock", "openai"];
 var OpenCodeConfigSchema = exports_external.object({
   provider: exports_external.enum(OPENCODE_PROVIDERS),
@@ -32505,7 +32539,7 @@ var OpenCodeConfigSchema = exports_external.object({
 var ANTHROPIC_MODELS = ["haiku", "sonnet", "opus", "opusplan"];
 var DEFAULT_MODELS = {
   default_model: "opusplan",
-  recon: "haiku",
+  sentinel: "haiku",
   oracle: "opus",
   architect: "opus"
 };
@@ -32545,6 +32579,7 @@ function installAgents(section, basePath) {
   } catch (err2) {
     throw new FileWriteError(agentsDir, err2 instanceof Error ? err2.message : String(err2));
   }
+  rmSync2(join7(agentsDir, `${LEGACY_AGENT_NAME}.md`), { force: true });
   for (const agent of config.agents) {
     const template = readTemplate(agent.template);
     const frontmatter = `---
@@ -32599,6 +32634,7 @@ function remove2(section, basePath) {
       rmSync2(file, { force: true });
     }
   }
+  rmSync2(join7(agentsDir, `${LEGACY_AGENT_NAME}.md`), { force: true });
   removeDirIfEmpty(agentsDir);
   removeAtelierSettings(claudeDir);
 }
@@ -32717,28 +32753,28 @@ var PROVIDER_MODELS = {
 };
 var DEFAULT_MODELS2 = {
   "opencode-zen": {
-    recon: "opencode/minimax-m2.7",
+    sentinel: "opencode/minimax-m2.7",
     oracle: "opencode/kimi-k2.6",
     architect: "opencode/deepseek-v4-pro",
     build: "opencode/deepseek-v4-flash",
     plan: "opencode/deepseek-v4-pro"
   },
   "opencode-go": {
-    recon: "opencode-go/minimax-m2.7",
+    sentinel: "opencode-go/minimax-m2.7",
     oracle: "opencode-go/kimi-k2.6",
     architect: "opencode-go/deepseek-v4-pro",
     build: "opencode-go/deepseek-v4-flash",
     plan: "opencode-go/deepseek-v4-pro"
   },
   "amazon-bedrock": {
-    recon: "amazon-bedrock/anthropic-claude-haiku-4-5",
+    sentinel: "amazon-bedrock/anthropic-claude-haiku-4-5",
     oracle: "amazon-bedrock/anthropic-claude-opus-4-7",
     architect: "amazon-bedrock/anthropic-claude-opus-4-7",
     build: "amazon-bedrock/anthropic-claude-sonnet-4-5",
     plan: "amazon-bedrock/anthropic-claude-haiku-4-5"
   },
   openai: {
-    recon: "openai/gpt-5.6-luna",
+    sentinel: "openai/gpt-5.6-luna",
     oracle: "openai/gpt-5.6-sol",
     architect: "openai/gpt-5.6-sol",
     build: "openai/gpt-5.6-terra",
@@ -32790,6 +32826,7 @@ function installAgents2(section, basePath) {
   } catch (err2) {
     throw new FileWriteError(agentsDir, err2 instanceof Error ? err2.message : String(err2));
   }
+  rmSync3(join8(agentsDir, `${LEGACY_AGENT_NAME}.md`), { force: true });
   for (const agent of config.agents) {
     const template = readTemplate(agent.template);
     const frontmatter = `---
@@ -32816,13 +32853,13 @@ function mergeHarnessConfig2(section, basePath) {
   } catch (err2) {
     throw new FileWriteError(basePath, err2 instanceof Error ? err2.message : String(err2));
   }
-  const recon = config.agents.find((a) => a.name === "recon");
+  const sentinel = config.agents.find((a) => a.name === "sentinel");
   const architect = config.agents.find((a) => a.name === "architect");
   const atelierFields = {
     agent: {
       build: {
         mode: "primary",
-        model: config.build_model || recon?.model || DEFAULT_MODELS2[config.provider].build
+        model: config.build_model || sentinel?.model || DEFAULT_MODELS2[config.provider].build
       },
       plan: {
         mode: "primary",
@@ -32874,6 +32911,7 @@ function removeAgentFiles(opencodeRoot, config) {
       rmSync3(file, { force: true });
     }
   }
+  rmSync3(join8(agentsDir, `${LEGACY_AGENT_NAME}.md`), { force: true });
   removeDirIfEmpty2(agentsDir);
 }
 function removeDirIfEmpty2(dir) {
@@ -34045,7 +34083,7 @@ var OPENAI_MODELS = [
 ];
 var DEFAULT_MODELS3 = {
   default_model: "gpt-5.6-terra",
-  recon: "gpt-5.6-luna",
+  sentinel: "gpt-5.6-luna",
   oracle: "gpt-5.6-sol",
   architect: "gpt-5.6-sol"
 };
@@ -34098,6 +34136,7 @@ function installAgents3(section, basePath) {
   } catch (err2) {
     throw new FileWriteError(agentsDir, err2 instanceof Error ? err2.message : String(err2));
   }
+  rmSync4(join9(agentsDir, `${LEGACY_AGENT_NAME}.toml`), { force: true });
   for (const agent of config.agents) {
     const template = readTemplate(agent.template);
     const content = {
@@ -34167,6 +34206,7 @@ function remove4(section, basePath) {
       rmSync4(file, { force: true });
     }
   }
+  rmSync4(join9(agentsDir, `${LEGACY_AGENT_NAME}.toml`), { force: true });
   removeDirIfEmpty3(agentsDir);
   cleanCodexConfig(codexDir);
   removeEmptyCodexDir(codexDir);
@@ -34246,22 +34286,123 @@ function isObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// src/adapters/cursor.ts
+import { existsSync as existsSync6, mkdirSync as mkdirSync5, readdirSync as readdirSync4, rmSync as rmSync5, rmdirSync as rmdirSync4, writeFileSync as writeFileSync6 } from "fs";
+import { join as join10 } from "path";
+var CURSOR_MODELS = [
+  "composer-2.5",
+  "cursor-grok-4.5-high",
+  "gpt-5.6-luna-medium",
+  "gpt-5.6-terra-medium",
+  "gpt-5.6-sol-medium",
+  "claude-opus-4-8-high",
+  "claude-sonnet-5-high",
+  "kimi-k2.7-code",
+  "glm-5.2-high"
+];
+var DEFAULT_MODELS4 = {
+  sentinel: "composer-2.5",
+  oracle: "claude-opus-4-8-high",
+  architect: "gpt-5.6-sol-medium"
+};
+var cursorAdapter = {
+  name: "cursor",
+  configSchema: CursorConfigSchema,
+  defaultSection: defaultSection4,
+  modelsForProvider: modelsForProvider4,
+  promptSection: promptSection4,
+  installAgents: installAgents4,
+  mergeHarnessConfig: mergeHarnessConfig4,
+  fileList: fileList4,
+  remove: remove5
+};
+function defaultSection4() {
+  return {
+    agents: AGENT_NAMES.map((name) => ({ template: name, name, model: DEFAULT_MODELS4[name] }))
+  };
+}
+function modelsForProvider4(_provider) {
+  return CURSOR_MODELS;
+}
+async function promptSection4(prompt2, section) {
+  const config = section;
+  const answers = await prompt2.prompt(AGENT_NAMES.map((name) => ({
+    type: "list",
+    name,
+    message: `Select model for ${name}`,
+    choices: CURSOR_MODELS,
+    default: config.agents.find((agent) => agent.name === name)?.model ?? DEFAULT_MODELS4[name]
+  })));
+  return {
+    agents: AGENT_NAMES.map((name) => ({
+      template: name,
+      name,
+      model: answers[name] ?? DEFAULT_MODELS4[name]
+    }))
+  };
+}
+function installAgents4(section, basePath) {
+  const config = section;
+  const agentsDir = join10(basePath, ".cursor", "agents");
+  try {
+    mkdirSync5(agentsDir, { recursive: true });
+  } catch (err2) {
+    throw new FileWriteError(agentsDir, err2 instanceof Error ? err2.message : String(err2));
+  }
+  rmSync5(join10(agentsDir, `${LEGACY_AGENT_NAME}.md`), { force: true });
+  for (const agent of config.agents) {
+    const template = readTemplate(agent.template);
+    const content = `---
+name: ${agent.name}
+description: ${template.description}
+model: ${agent.model}
+---
+${template.body}`;
+    const agentPath = join10(agentsDir, `${agent.name}.md`);
+    writeFileSync6(agentPath, content);
+    console.log(`Created ${shortPath(agentPath)}`);
+  }
+}
+function mergeHarnessConfig4(_section, _basePath) {}
+function fileList4(basePath) {
+  return AGENT_NAMES.map((name) => {
+    const path2 = join10(basePath, ".cursor", "agents", `${name}.md`);
+    return { path: path2, exists: existsSync6(path2) };
+  });
+}
+function remove5(section, basePath) {
+  const config = section;
+  const agentsDir = join10(basePath, ".cursor", "agents");
+  try {
+    for (const agent of config.agents) {
+      rmSync5(join10(agentsDir, `${agent.name}.md`), { force: true });
+    }
+    rmSync5(join10(agentsDir, `${LEGACY_AGENT_NAME}.md`), { force: true });
+    if (existsSync6(agentsDir) && readdirSync4(agentsDir).length === 0) {
+      rmdirSync4(agentsDir);
+    }
+  } catch (err2) {
+    throw new FileWriteError(agentsDir, err2 instanceof Error ? err2.message : String(err2));
+  }
+}
+
 // src/adapters/index.ts
 registerAdapter(claudeAdapter);
 registerAdapter(opencodeAdapter);
 registerAdapter(codexAdapter);
+registerAdapter(cursorAdapter);
 
 // src/atelier.ts
-var harnessChoices = HARNESS_NAMES.join(", ");
+var harnessChoices2 = Harness.join(", ");
 var program2 = new Command;
-program2.name("atelier").description("Atelier CLI - configure Claude Code, OpenCode, and Codex for spec-driven development").version("0.1.0");
-program2.command("init", { isDefault: true }).description("Initialize atelier globally").option(`--harness <type>`, `Harness type (${harnessChoices})`).option("--yes", "Non-interactive mode with defaults").action((options2) => {
+program2.name("atelier").description("Atelier CLI - configure Claude Code, OpenCode, Codex, and Cursor for spec-driven development").version("0.1.0");
+program2.command("init", { isDefault: true }).description("Initialize atelier globally").option(`--harness <type>`, `Harness type (${harnessChoices2})`).option("--yes", "Non-interactive mode with defaults").action((options2) => {
   init(options2).catch(handleError);
 });
-program2.command("update").description("Update atelier agents").option(`--harness <type>`, `Harness type (${harnessChoices})`).action((options2) => {
+program2.command("update").description("Update atelier agents").option(`--harness <type>`, `Harness type (${harnessChoices2})`).action((options2) => {
   update(options2).catch(handleError);
 });
-program2.command("remove").description("Remove a configured harness from atelier").option(`--harness <type>`, `Harness type (${harnessChoices})`).action((options2) => {
+program2.command("remove").description("Remove a configured harness from atelier").option(`--harness <type>`, `Harness type (${harnessChoices2})`).action((options2) => {
   remove(options2).catch(handleError);
 });
 program2.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@martinffx/atelier",
-  "version": "1.4.0",
+  "version": "2.0.0",
   "description": "Personal development toolkit - spec-driven development, code quality, deep thinking, and ecosystem patterns",
   "type": "module",
   "bin": {
@@ -12,6 +12,7 @@
     "claude-code",
     "opencode",
     "codex",
+    "cursor",
     "ai-agents",
     "spec-driven-development"
   ],

package/skills/code-review/SKILL.md

@@ -34,7 +34,7 @@ Use these concrete harness subagent types. If an exact match is unavailable, use
 
 | `subagent_type` | Purpose |
 |-----------------|---------|
-| `recon` | Triage only: changed-file analysis, context retrieval, reviewer selection |
+| `sentinel` | Triage only: changed-file analysis, context retrieval, reviewer selection |
 | `oracle` | Parallel reviewer personas, evidence-based critique, failure-mode analysis, challenge validation |
 | `architect` | Architecture, design-boundary, data-model, and API-contract review |
 
@@ -67,7 +67,7 @@ Follows [code-subagents](../code-subagents/SKILL.md) patterns:
 
 | Agent | Used In Step |
 |-------|--------------|
-| `recon` | Triage only (context retrieval, file analysis) |
+| `sentinel` | Triage only (context retrieval, file analysis) |
 | `oracle` | Reviewers and challenge validation |
 | `architect` | Architect (architecture review) |
 

package/skills/code-review/references/rq.md

@@ -34,12 +34,12 @@ Capture the list of changed files and the full diff.
 
 **Purpose:** Analyze diff to determine context, select reviewers, identify relevant skills to look for.
 
-**Uses:** `recon` agent.
+**Uses:** `sentinel` agent.
 
 ### Subagent Invocation
 
 ```yaml
-subagent_type: recon
+subagent_type: sentinel
 description: "Triage diff for code review"
 prompt: |
   Analyze this code diff to determine review needs.
@@ -364,7 +364,7 @@ Display findings in terminal per [output.md](./output.md).
 | Step | Subagent | Uses | Parallel? | Purpose |
 |------|----------|------|----------|---------|
 | 1 | Get Diff | inline | — | `git diff <branch>` |
-| 2 | Triage | `recon` agent | No | Detect context, select reviewers, identify relevant skills to look for |
+| 2 | Triage | `sentinel` agent | No | Detect context, select reviewers, identify relevant skills to look for |
 | 3 | Reviewers | `oracle` agent | Yes (per reviewer) | Specialty analysis |
 | 4 | Synthesis | inline | No | Deduplicate and group |
 | 5 | Architect | `architect` agent | No | Architecture review |

package/skills/code-subagents/SKILL.md

@@ -1,25 +1,23 @@
 ---
 name: code-subagents
 description: >
-  Subagent dispatch patterns for implementation tasks. Use when spec-implement has multiple
-  tasks to execute and subagents are available. Covers parallel dispatch for independent work,
-  the two-stage review cycle (spec compliance then code quality), focused prompt construction,
-  and integration of results. Trigger when executing plan tasks with subagent support, when
-  facing 2+ independent problems, or when the user asks to use subagents for implementation.
+  Implementation subagent dispatch patterns. Use when independent implementation work is
+  available and subagents can execute it. Covers parallel dispatch, shared-tree patch
+  snapshots, one combined review per completed batch, and serial integration.
 user-invocable: false
 ---
 
-# Spec Subagents
+# Implementation Subagents
 
-Fresh subagent per task. Two-stage review after each. Parallel when independent, sequential
-when dependent.
+Fresh subagent per task. One combined review per completed batch. Parallel when independent,
+sequential when dependent.
 
 ## When to Use Subagents
 
 **Use when:**
-- Executing tasks from plan.json with subagent support available
-- 2+ independent tasks that don't share state or files
-- Each problem can be understood without context from others
+- 2+ independent work items do not share state or files
+- Each work item has explicit requirements, constraints, files, and validation
+- Each problem can be understood without context from the other work items
 
 **Don't use when:**
 - Tasks are tightly coupled (editing the same files)
@@ -53,6 +51,13 @@ Task C (notification tests) ──→ review → complete
 **Independence check:** Would fixing Task A affect Task B? Would they edit the same files?
 If no to both, dispatch in parallel.
 
+For shared-tree parallel work:
+
+1. Assign each task an exclusive file list before dispatch
+2. Do not let implementers stage or commit changes
+3. Capture a path-scoped `git diff` for each task when it reports completion
+4. Run tasks sequentially if their file ownership overlaps or cannot be isolated
+
 ---
 
 ## Prompt Templates
@@ -60,15 +65,14 @@ If no to both, dispatch in parallel.
 Use these templates when dispatching subagents. Each template is battle-tested — don't
 improvise, use them as-is and fill in the variables.
 
-- **[references/implementer-prompt.md](references/implementer-prompt.md)** — Dispatch an implementer. Includes self-review checklist.
-- **[references/spec-reviewer-prompt.md](references/spec-reviewer-prompt.md)** — Spec compliance review. "Do not trust the report."
-- **[references/code-quality-reviewer-prompt.md](references/code-quality-reviewer-prompt.md)** — Code quality review. Critical/Important/Minor severity.
+- **[references/implementor-prompt.md](references/implementor-prompt.md)** — Dispatch an implementer. Includes self-review checklist.
+- **[references/batch-reviewer-prompt.md](references/batch-reviewer-prompt.md)** — Combined plan and code-quality review for one completed batch.
 
 ### Prompt quality rules
 
 - **Focused** — one task, one problem domain
-- **Self-contained** — all context needed is in the prompt. Don't make the subagent
-  read the plan file; provide the full task text
+- **Self-contained** — all context needed is in the prompt. Provide the complete work-item
+  requirements; do not make the subagent recover context
 - **Specific about files** — exact paths, not "the relevant files"
 - **Specific about output** — what should the subagent return?
 - **Constrained** — what should they NOT touch?
@@ -84,63 +88,30 @@ improvise, use them as-is and fill in the variables.
 
 ---
 
-## Two-Stage Review
-
-Every completed task gets two reviews in order. Do not skip either. Do not reverse the order.
-
-### Stage 1: Spec Compliance
-
-Does the implementation match what was specified?
+## Batch Review
 
-```markdown
-## Spec Review
+Run one combined review after every completed batch, not separate reviews for each task.
 
-Review the implementation against the task specification:
-
-**Task spec:** [paste task from plan.json]
-
-**Files changed:** [list from subagent output]
-
-Check:
-1. Are all requirements from the task spec implemented?
-2. Is anything implemented that wasn't specified? (over-building)
-3. Do tests cover the specified acceptance criteria?
-4. Does the implementation match the design in design.md?
-
-Report: List any gaps or extras. Mark ✅ if compliant, ❌ if not.
-```
+Give one fresh reviewer:
 
-If the spec reviewer finds issues → the implementer subagent fixes them → spec reviewer
-reviews again. Repeat until ✅.
+- The complete requirements for work items in the batch
+- The relevant constraints
+- The path-scoped patch captured for each task
+- The implementers' reports and validation results
 
-### Stage 2: Code Quality
+The reviewer checks both requirements compliance and code quality:
 
-Is the implementation well-built?
+1. Every requirement and acceptance criterion is implemented
+2. The batch follows the supplied constraints
+3. No unrequested work or out-of-scope files are included
+4. Tests are meaningful and cover the right boundaries
+5. The code follows existing patterns without unnecessary complexity
 
-```markdown
-## Code Quality Review
+Use [references/batch-reviewer-prompt.md](references/batch-reviewer-prompt.md) as written.
 
-Review the implementation for code quality:
-
-**Files changed:** [list]
-
-Check:
-1. Does the code follow existing patterns and conventions?
-2. Are tests meaningful (not just asserting true)?
-3. Is there unnecessary complexity?
-4. Are edge cases handled?
-5. Is the code clean (no dead code, no unnecessary comments)?
-
-Rate issues as Critical (blocks merge), Important (should fix), or Minor (nice to have).
-```
-
-If the quality reviewer finds Critical or Important issues → implementer fixes → reviewer
-reviews again. Minor issues can be noted and moved past.
-
-### Why this order matters
-
-Spec compliance first because there's no point polishing code that doesn't meet the spec.
-Quality second because compliant code still needs to be well-built.
+If the reviewer finds Critical or Important issues, send each issue back to the relevant
+implementer, refresh its path-scoped patch, and review the batch again. Minor issues may be
+noted and moved past.
 
 ---
 
@@ -161,9 +132,11 @@ they're thinking rather than guessing.
 After subagents complete (especially parallel dispatch):
 
 1. **Read each summary** — understand what changed
-2. **Check for conflicts** — did any agents edit the same code?
-3. **Run full test suite** — verify all changes work together
-4. **Update task tracking** — mark tasks complete: beads `bd close <id>`, or harness todo list
+2. **Capture task patches** — use each task's exclusive file list
+3. **Review the batch** — one combined requirements and quality review
+4. **Run full test suite** — verify all changes work together
+5. **Commit** — the coordinator commits the reviewed batch serially
+6. **Update progress tracking** — when the caller uses it
 
 If there are conflicts between parallel results, resolve them manually. Don't dispatch
 another subagent to merge — that requires too much context.
@@ -176,9 +149,5 @@ If a subagent fails a task:
 
 - **Don't fix it manually** — that pollutes your context
 - **Dispatch a fix subagent** with specific instructions about what went wrong
-- **If it fails twice**, stop and escalate to the human. The plan may need revision.
-
-If failure reveals a design problem:
-
-> "This task is failing because [reason]. The design in design.md may need to change.
-> Want me to go back to spec-brainstorm?"
+- **If it fails twice**, stop and escalate to the human. The requirements or constraints may
+  need revision.

package/skills/code-subagents/references/batch-reviewer-prompt.md

@@ -0,0 +1,44 @@
+# Batch Reviewer Prompt Template
+
+Use this template after all tasks in an implementation batch report completion. Review the
+captured task patches, not a commit range.
+
+## Template
+
+```
+You are reviewing one completed implementation batch for requirements compliance and code quality.
+
+## Batch Requirements
+
+{BATCH_REQUIREMENTS}
+
+## Constraints
+
+{CONSTRAINTS}
+
+## Task Patches
+
+{BATCH_PATCHES}
+
+## Implementer Reports and Validation
+
+{IMPLEMENTER_REPORTS}
+
+## CRITICAL: Verify the Patches
+
+Do not trust the implementer reports. Review the captured patches and relevant code directly.
+
+Check:
+1. Every requirement and acceptance criterion is implemented
+2. The implementation follows the supplied constraints
+3. No unrequested work or out-of-scope files are included
+4. Tests are meaningful and cover the right boundaries
+5. The code follows existing patterns without unnecessary complexity
+6. Error cases and edge conditions are handled
+
+## Report
+
+- **Strengths:** What was done well
+- **Issues:** Critical, Important, or Minor findings with file:line references and fixes
+- **Assessment:** Approved, Approved with minor issues, or Changes requested
+```