@sublang/playbook 0.4.2 → 0.6.0

package/reference/sdlc/code.playbook/code.fsm.js

@@ -112,8 +112,9 @@ const planAndImplementInput = (context) => ({
     ...bossReplyInputFields(context),
     prompt: [
         'Assess whether this can be completed in a single commit, following best practices.',
-        'If yes, implement and test, updating both code and specs; otherwise, decompose into tasks as a new IR under @specs/iterations.',
-        'Consult @specs/map.md or @specs/meta.md for relevant context if needed; ensure @specs/map.md reflects the changes.',
+        'If yes, implement and test, updating both code and specs; otherwise, decompose into tasks as a new IR under @specs/iterations and stop without implementing any IR task.',
+        'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+        'Ensure @specs/map.md reflects the changes.',
         'Do not commit.',
     ].join('\n'),
     result: withNeedsBossReply({
@@ -154,7 +155,7 @@ const summarizeSpecsInput = (context) => ({
         'The set should be complete and coherent.',
         'Avoid implementation specifics.',
         'Avoid redundant spec items.',
-        'Consult @specs/map.md for relevant context and update it to reflect your changes.',
+        'Ensure @specs/map.md reflects the changes.',
     ].join('\n'),
     result: withNeedsBossReply({
         specsReady: 'Coder produced uncommitted spec updates (Initial Changes).',
@@ -497,12 +498,15 @@ export const codingMachine = setup({
                         'Verify any affected spec items are:',
                         '',
                         '- Complete & coherent: sufficient for you to reimplement code.',
-                        '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+                        '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
                         '- Minimal: essential and concise; every item earns its place; also check with other items.',
+                        '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
                         '',
                         'Flag anything missing, redundant, over-specified, or under-specified.',
-                        'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+                        'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+                        'Verify @specs/map.md reflects the changes.',
                         "If the change is ready to commit or push, don't raise nitpicks.",
+                        'Do not edit files or commit; report findings only.',
                     ].join('\n'),
                     result: {
                         noFindings: 'The spec-only commit has no review findings.',
@@ -538,8 +542,10 @@ export const codingMachine = setup({
                         'Refer to the commit message.',
                         'Flag any issues or improvements (numbered; no duplication).',
                         "Think thoroughly — don't just approve or reject.",
-                        'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+                        'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+                        'Verify @specs/map.md reflects the changes.',
                         "If the change is ready to commit or push, don't raise nitpicks.",
+                        'Do not edit files or commit; report findings only.',
                     ].join('\n'),
                     result: {
                         noFindings: 'The code-only commit has no review findings.',
@@ -576,14 +582,17 @@ export const codingMachine = setup({
                         'Verify any affected spec items are:',
                         '',
                         '- Complete & coherent: sufficient for you to reimplement code.',
-                        '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+                        '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
                         '- Minimal: essential and concise; every item earns its place; also check with other items.',
+                        '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
                         '',
                         'Flag anything missing, redundant, over-specified, or under-specified.',
                         'Flag any issues or improvements (numbered; no duplication).',
                         "Think thoroughly — don't just approve or reject.",
-                        'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+                        'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+                        'Verify @specs/map.md reflects the changes.',
                         "If the change is ready to commit or push, don't raise nitpicks.",
+                        'Do not edit files or commit; report findings only.',
                     ].join('\n'),
                     result: {
                         noFindings: 'The mixed commit has no review findings.',
@@ -621,12 +630,15 @@ export const codingMachine = setup({
                         'Verify any affected spec items are:',
                         '',
                         '- Complete & coherent: sufficient for you to reimplement code.',
-                        '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+                        '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
                         '- Minimal: essential and concise; every item earns its place; also check with other items.',
+                        '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
                         '',
                         'Flag anything missing, redundant, over-specified, or under-specified.',
-                        'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+                        'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+                        'Verify @specs/map.md reflects the changes.',
                         "If the change is ready to commit or push, don't raise nitpicks.",
+                        'Do not edit files or commit; report findings only.',
                     ].join('\n'),
                     result: {
                         noFindings: 'The IR-task spec-only commit has no review findings.',
@@ -663,8 +675,10 @@ export const codingMachine = setup({
                         'Refer to the commit message.',
                         'Flag any issues or improvements (numbered; no duplication).',
                         "Think thoroughly — don't just approve or reject.",
-                        'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+                        'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+                        'Verify @specs/map.md reflects the changes.',
                         "If the change is ready to commit or push, don't raise nitpicks.",
+                        'Do not edit files or commit; report findings only.',
                     ].join('\n'),
                     result: {
                         noFindings: 'The IR-task code-only commit has no review findings.',
@@ -702,14 +716,17 @@ export const codingMachine = setup({
                         'Verify any affected spec items are:',
                         '',
                         '- Complete & coherent: sufficient for you to reimplement code.',
-                        '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+                        '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
                         '- Minimal: essential and concise; every item earns its place; also check with other items.',
+                        '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
                         '',
                         'Flag anything missing, redundant, over-specified, or under-specified.',
                         'Flag any issues or improvements (numbered; no duplication).',
                         "Think thoroughly — don't just approve or reject.",
-                        'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+                        'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+                        'Verify @specs/map.md reflects the changes.',
                         "If the change is ready to commit or push, don't raise nitpicks.",
+                        'Do not edit files or commit; report findings only.',
                     ].join('\n'),
                     result: {
                         noFindings: 'The IR-task mixed commit has no review findings.',
@@ -740,17 +757,20 @@ export const codingMachine = setup({
                     sourceItem: 'CODE-11',
                     ...bossReplyInputFields(context),
                     prompt: [
-                        'Review the unstaged/untracked changes.',
+                        'Review the unstaged and untracked changes in the context of the staged changes.',
                         'Understand the intent.',
                         'Verify any affected spec items are:',
                         '',
                         '- Complete & coherent: sufficient for you to reimplement code.',
-                        '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+                        '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
                         '- Minimal: essential and concise; every item earns its place; also check with other items.',
+                        '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
                         '',
                         'Flag anything missing, redundant, over-specified, or under-specified.',
-                        'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+                        'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+                        'Verify @specs/map.md reflects the changes.',
                         "If the change is ready to commit or push, don't raise nitpicks.",
+                        'Do not edit files or commit; report findings only.',
                     ].join('\n'),
                     result: {
                         noFindings: 'The uncommitted spec-only changes are ready to commit.',
@@ -783,12 +803,14 @@ export const codingMachine = setup({
                     sourceItem: 'CODE-12',
                     ...bossReplyInputFields(context),
                     prompt: [
-                        'Review the unstaged/untracked changes.',
+                        'Review the unstaged and untracked changes in the context of the staged changes.',
                         'Understand the intent.',
                         'Flag any issues or improvements (numbered; no duplication).',
                         "Think thoroughly — don't just approve or reject.",
-                        'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+                        'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+                        'Verify @specs/map.md reflects the changes.',
                         "If the change is ready to commit or push, don't raise nitpicks.",
+                        'Do not edit files or commit; report findings only.',
                     ].join('\n'),
                     result: {
                         noFindings: 'The uncommitted code-only changes are ready to commit.',
@@ -821,19 +843,22 @@ export const codingMachine = setup({
                     sourceItem: 'CODE-13',
                     ...bossReplyInputFields(context),
                     prompt: [
-                        'Review the unstaged/untracked changes.',
+                        'Review the unstaged and untracked changes in the context of the staged changes.',
                         'Understand the intent.',
                         'Verify any affected spec items are:',
                         '',
                         '- Complete & coherent: sufficient for you to reimplement code.',
-                        '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+                        '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
                         '- Minimal: essential and concise; every item earns its place; also check with other items.',
+                        '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
                         '',
                         'Flag anything missing, redundant, over-specified, or under-specified.',
                         'Flag any issues or improvements (numbered; no duplication).',
                         "Think thoroughly — don't just approve or reject.",
-                        'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+                        'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+                        'Verify @specs/map.md reflects the changes.',
                         "If the change is ready to commit or push, don't raise nitpicks.",
+                        'Do not edit files or commit; report findings only.',
                     ].join('\n'),
                     result: {
                         noFindings: 'The uncommitted mixed changes are ready to commit.',
@@ -868,17 +893,20 @@ export const codingMachine = setup({
                     reviews: context.reviews,
                     challenges: context.challenges,
                     prompt: [
-                        'Review the unstaged/untracked changes.',
+                        'Review the unstaged and untracked changes in the context of the staged changes.',
                         'Understand the intent.',
                         'Verify any affected spec items are:',
                         '',
                         '- Complete & coherent: sufficient for you to reimplement code.',
-                        '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+                        '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
                         '- Minimal: essential and concise; every item earns its place; also check with other items.',
+                        '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
                         '',
                         'Flag anything missing, redundant, over-specified, or under-specified.',
-                        'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+                        'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+                        'Verify @specs/map.md reflects the changes.',
                         "If the change is ready to commit or push, don't raise nitpicks.",
+                        'Do not edit files or commit; report findings only.',
                         'For each rebuttal below, challenge or accept it, with strong reasoning, solid evidence, and comprehensive thinking.',
                     ].join('\n'),
                     result: {
@@ -914,12 +942,14 @@ export const codingMachine = setup({
                     reviews: context.reviews,
                     challenges: context.challenges,
                     prompt: [
-                        'Review the unstaged/untracked changes.',
+                        'Review the unstaged and untracked changes in the context of the staged changes.',
                         'Understand the intent.',
                         'Flag any issues or improvements (numbered; no duplication).',
                         "Think thoroughly — don't just approve or reject.",
-                        'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+                        'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+                        'Verify @specs/map.md reflects the changes.',
                         "If the change is ready to commit or push, don't raise nitpicks.",
+                        'Do not edit files or commit; report findings only.',
                         'For each rebuttal below, challenge or accept it, with strong reasoning, solid evidence, and comprehensive thinking.',
                     ].join('\n'),
                     result: {
@@ -955,19 +985,22 @@ export const codingMachine = setup({
                     reviews: context.reviews,
                     challenges: context.challenges,
                     prompt: [
-                        'Review the unstaged/untracked changes.',
+                        'Review the unstaged and untracked changes in the context of the staged changes.',
                         'Understand the intent.',
                         'Verify any affected spec items are:',
                         '',
                         '- Complete & coherent: sufficient for you to reimplement code.',
-                        '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+                        '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
                         '- Minimal: essential and concise; every item earns its place; also check with other items.',
+                        '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
                         '',
                         'Flag anything missing, redundant, over-specified, or under-specified.',
                         'Flag any issues or improvements (numbered; no duplication).',
                         "Think thoroughly — don't just approve or reject.",
-                        'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+                        'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+                        'Verify @specs/map.md reflects the changes.',
                         "If the change is ready to commit or push, don't raise nitpicks.",
+                        'Do not edit files or commit; report findings only.',
                         'For each rebuttal below, challenge or accept it, with strong reasoning, solid evidence, and comprehensive thinking.',
                     ].join('\n'),
                     result: {
@@ -1004,6 +1037,7 @@ export const codingMachine = setup({
                     challenges: context.challenges,
                     prompt: [
                         'For each rebuttal below, challenge or accept it, with strong reasoning, solid evidence, and comprehensive thinking.',
+                        'Do not edit files or commit; report findings only.',
                     ].join('\n'),
                     result: {
                         challengeAccepted: 'Reviewer accepted the rebuttal — no further review edits are required.',
@@ -1063,8 +1097,10 @@ export const codingMachine = setup({
                     sourceItem: 'CODE-18',
                     ...bossReplyInputFields(context),
                     coderPlayer: context.coderPlayer,
+                    committerPlayer: context.committerPlayer,
                     prompt: [
                         'Make a commit of the changes that belong in the repo, following @specs/dev/git.md (reread if necessary).',
+                        'Write concisely.',
                         'Coder is <coder-llm>.',
                         'Format the `Co-authored-by` `<model>` token as the conventional human form of the substituted id (e.g., `claude-opus-4-7` → `Claude-Opus-4.7`, `gpt-5.5` → `GPT-5.5`).',
                     ].join('\n'),
@@ -1125,8 +1161,10 @@ export const codingMachine = setup({
                     ...bossReplyInputFields(context),
                     coderPlayer: context.coderPlayer,
                     reviewerPlayer: context.reviewerPlayer,
+                    committerPlayer: context.committerPlayer,
                     prompt: [
                         'Make a commit of the changes that belong in the repo, following @specs/dev/git.md (reread if necessary).',
+                        'Write concisely.',
                         'Coder is <coder-llm>; Reviewer is <reviewer-llm>.',
                         'Format the `Co-authored-by` `<model>` token as the conventional human form of the substituted id (e.g., `claude-opus-4-7` → `Claude-Opus-4.7`, `gpt-5.5` → `GPT-5.5`).',
                     ].join('\n'),

package/reference/sdlc/code.playbook/code.fsm.ts

@@ -66,6 +66,13 @@ export type CaptainInput = {
   challenges?: string;
   coderPlayer?: string;
   reviewerPlayer?: string;
+  // Routing-only: the configured Committer-alias player id (`coder` /
+  // `reviewer`) threaded from `captain.options.code.committer`
+  // (PBRT-8 / PBRT-30). It selects which host pane runs a `Committer`
+  // commit; it is not a prompt-placeholder source, so it never affects
+  // <coder-llm> / <reviewer-llm> substitution or any labelled block,
+  // and `input.player` stays `Committer` (PLAYBOOK-3).
+  committerPlayer?: string;
   pendingBossQuestion?: PendingBossQuestion;
   bossReply?: string;
 };
@@ -254,8 +261,9 @@ const planAndImplementInput: CaptainInputFactory = (context) => ({
   ...bossReplyInputFields(context),
   prompt: [
     'Assess whether this can be completed in a single commit, following best practices.',
-    'If yes, implement and test, updating both code and specs; otherwise, decompose into tasks as a new IR under @specs/iterations.',
-    'Consult @specs/map.md or @specs/meta.md for relevant context if needed; ensure @specs/map.md reflects the changes.',
+    'If yes, implement and test, updating both code and specs; otherwise, decompose into tasks as a new IR under @specs/iterations and stop without implementing any IR task.',
+    'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+    'Ensure @specs/map.md reflects the changes.',
     'Do not commit.',
   ].join('\n'),
   result: withNeedsBossReply({
@@ -301,7 +309,7 @@ const summarizeSpecsInput: CaptainInputFactory = (context) => ({
     'The set should be complete and coherent.',
     'Avoid implementation specifics.',
     'Avoid redundant spec items.',
-    'Consult @specs/map.md for relevant context and update it to reflect your changes.',
+    'Ensure @specs/map.md reflects the changes.',
   ].join('\n'),
   result: withNeedsBossReply({
     specsReady: 'Coder produced uncommitted spec updates (Initial Changes).',
@@ -704,12 +712,15 @@ export const codingMachine = setup({
             'Verify any affected spec items are:',
             '',
             '- Complete & coherent: sufficient for you to reimplement code.',
-            '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+            '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
             '- Minimal: essential and concise; every item earns its place; also check with other items.',
+            '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
             '',
             'Flag anything missing, redundant, over-specified, or under-specified.',
-            'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+            'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+            'Verify @specs/map.md reflects the changes.',
             "If the change is ready to commit or push, don't raise nitpicks.",
+            'Do not edit files or commit; report findings only.',
           ].join('\n'),
           result: {
             noFindings: 'The spec-only commit has no review findings.',
@@ -748,8 +759,10 @@ export const codingMachine = setup({
             'Refer to the commit message.',
             'Flag any issues or improvements (numbered; no duplication).',
             "Think thoroughly — don't just approve or reject.",
-            'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+            'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+            'Verify @specs/map.md reflects the changes.',
             "If the change is ready to commit or push, don't raise nitpicks.",
+            'Do not edit files or commit; report findings only.',
           ].join('\n'),
           result: {
             noFindings: 'The code-only commit has no review findings.',
@@ -789,14 +802,17 @@ export const codingMachine = setup({
             'Verify any affected spec items are:',
             '',
             '- Complete & coherent: sufficient for you to reimplement code.',
-            '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+            '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
             '- Minimal: essential and concise; every item earns its place; also check with other items.',
+            '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
             '',
             'Flag anything missing, redundant, over-specified, or under-specified.',
             'Flag any issues or improvements (numbered; no duplication).',
             "Think thoroughly — don't just approve or reject.",
-            'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+            'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+            'Verify @specs/map.md reflects the changes.',
             "If the change is ready to commit or push, don't raise nitpicks.",
+            'Do not edit files or commit; report findings only.',
           ].join('\n'),
           result: {
             noFindings: 'The mixed commit has no review findings.',
@@ -837,12 +853,15 @@ export const codingMachine = setup({
             'Verify any affected spec items are:',
             '',
             '- Complete & coherent: sufficient for you to reimplement code.',
-            '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+            '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
             '- Minimal: essential and concise; every item earns its place; also check with other items.',
+            '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
             '',
             'Flag anything missing, redundant, over-specified, or under-specified.',
-            'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+            'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+            'Verify @specs/map.md reflects the changes.',
             "If the change is ready to commit or push, don't raise nitpicks.",
+            'Do not edit files or commit; report findings only.',
           ].join('\n'),
           result: {
             noFindings: 'The IR-task spec-only commit has no review findings.',
@@ -882,8 +901,10 @@ export const codingMachine = setup({
             'Refer to the commit message.',
             'Flag any issues or improvements (numbered; no duplication).',
             "Think thoroughly — don't just approve or reject.",
-            'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+            'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+            'Verify @specs/map.md reflects the changes.',
             "If the change is ready to commit or push, don't raise nitpicks.",
+            'Do not edit files or commit; report findings only.',
           ].join('\n'),
           result: {
             noFindings: 'The IR-task code-only commit has no review findings.',
@@ -924,14 +945,17 @@ export const codingMachine = setup({
             'Verify any affected spec items are:',
             '',
             '- Complete & coherent: sufficient for you to reimplement code.',
-            '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+            '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
             '- Minimal: essential and concise; every item earns its place; also check with other items.',
+            '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
             '',
             'Flag anything missing, redundant, over-specified, or under-specified.',
             'Flag any issues or improvements (numbered; no duplication).',
             "Think thoroughly — don't just approve or reject.",
-            'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+            'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+            'Verify @specs/map.md reflects the changes.',
             "If the change is ready to commit or push, don't raise nitpicks.",
+            'Do not edit files or commit; report findings only.',
           ].join('\n'),
           result: {
             noFindings: 'The IR-task mixed commit has no review findings.',
@@ -965,17 +989,20 @@ export const codingMachine = setup({
           sourceItem: 'CODE-11',
           ...bossReplyInputFields(context),
           prompt: [
-            'Review the unstaged/untracked changes.',
+            'Review the unstaged and untracked changes in the context of the staged changes.',
             'Understand the intent.',
             'Verify any affected spec items are:',
             '',
             '- Complete & coherent: sufficient for you to reimplement code.',
-            '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+            '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
             '- Minimal: essential and concise; every item earns its place; also check with other items.',
+            '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
             '',
             'Flag anything missing, redundant, over-specified, or under-specified.',
-            'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+            'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+            'Verify @specs/map.md reflects the changes.',
             "If the change is ready to commit or push, don't raise nitpicks.",
+            'Do not edit files or commit; report findings only.',
           ].join('\n'),
           result: {
             noFindings: 'The uncommitted spec-only changes are ready to commit.',
@@ -1011,12 +1038,14 @@ export const codingMachine = setup({
           sourceItem: 'CODE-12',
           ...bossReplyInputFields(context),
           prompt: [
-            'Review the unstaged/untracked changes.',
+            'Review the unstaged and untracked changes in the context of the staged changes.',
             'Understand the intent.',
             'Flag any issues or improvements (numbered; no duplication).',
             "Think thoroughly — don't just approve or reject.",
-            'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+            'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+            'Verify @specs/map.md reflects the changes.',
             "If the change is ready to commit or push, don't raise nitpicks.",
+            'Do not edit files or commit; report findings only.',
           ].join('\n'),
           result: {
             noFindings: 'The uncommitted code-only changes are ready to commit.',
@@ -1052,19 +1081,22 @@ export const codingMachine = setup({
           sourceItem: 'CODE-13',
           ...bossReplyInputFields(context),
           prompt: [
-            'Review the unstaged/untracked changes.',
+            'Review the unstaged and untracked changes in the context of the staged changes.',
             'Understand the intent.',
             'Verify any affected spec items are:',
             '',
             '- Complete & coherent: sufficient for you to reimplement code.',
-            '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+            '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
             '- Minimal: essential and concise; every item earns its place; also check with other items.',
+            '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
             '',
             'Flag anything missing, redundant, over-specified, or under-specified.',
             'Flag any issues or improvements (numbered; no duplication).',
             "Think thoroughly — don't just approve or reject.",
-            'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+            'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+            'Verify @specs/map.md reflects the changes.',
             "If the change is ready to commit or push, don't raise nitpicks.",
+            'Do not edit files or commit; report findings only.',
           ].join('\n'),
           result: {
             noFindings: 'The uncommitted mixed changes are ready to commit.',
@@ -1102,17 +1134,20 @@ export const codingMachine = setup({
           reviews: context.reviews,
           challenges: context.challenges,
           prompt: [
-            'Review the unstaged/untracked changes.',
+            'Review the unstaged and untracked changes in the context of the staged changes.',
             'Understand the intent.',
             'Verify any affected spec items are:',
             '',
             '- Complete & coherent: sufficient for you to reimplement code.',
-            '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+            '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
             '- Minimal: essential and concise; every item earns its place; also check with other items.',
+            '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
             '',
             'Flag anything missing, redundant, over-specified, or under-specified.',
-            'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+            'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+            'Verify @specs/map.md reflects the changes.',
             "If the change is ready to commit or push, don't raise nitpicks.",
+            'Do not edit files or commit; report findings only.',
             'For each rebuttal below, challenge or accept it, with strong reasoning, solid evidence, and comprehensive thinking.',
           ].join('\n'),
           result: {
@@ -1152,12 +1187,14 @@ export const codingMachine = setup({
           reviews: context.reviews,
           challenges: context.challenges,
           prompt: [
-            'Review the unstaged/untracked changes.',
+            'Review the unstaged and untracked changes in the context of the staged changes.',
             'Understand the intent.',
             'Flag any issues or improvements (numbered; no duplication).',
             "Think thoroughly — don't just approve or reject.",
-            'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+            'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+            'Verify @specs/map.md reflects the changes.',
             "If the change is ready to commit or push, don't raise nitpicks.",
+            'Do not edit files or commit; report findings only.',
             'For each rebuttal below, challenge or accept it, with strong reasoning, solid evidence, and comprehensive thinking.',
           ].join('\n'),
           result: {
@@ -1197,19 +1234,22 @@ export const codingMachine = setup({
           reviews: context.reviews,
           challenges: context.challenges,
           prompt: [
-            'Review the unstaged/untracked changes.',
+            'Review the unstaged and untracked changes in the context of the staged changes.',
             'Understand the intent.',
             'Verify any affected spec items are:',
             '',
             '- Complete & coherent: sufficient for you to reimplement code.',
-            '- Right level: user requirements (in @specs/user) or behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
+            '- Right level: user requirements (in @specs/user) or system behavior (in @specs/dev), not implementation specifics; integration/system testing (in @specs/test), not unit testing.',
             '- Minimal: essential and concise; every item earns its place; also check with other items.',
+            '- Well organized: spec packages are finely scoped, with high cohesion and low coupling.',
             '',
             'Flag anything missing, redundant, over-specified, or under-specified.',
             'Flag any issues or improvements (numbered; no duplication).',
             "Think thoroughly — don't just approve or reject.",
-            'Consult @specs/map.md or @specs/meta.md for relevant context if needed; verify @specs/map.md reflects the changes.',
+            'For context discovery, @specs/map.md indexes all spec files and @specs/meta.md describes the spec format.',
+            'Verify @specs/map.md reflects the changes.',
             "If the change is ready to commit or push, don't raise nitpicks.",
+            'Do not edit files or commit; report findings only.',
             'For each rebuttal below, challenge or accept it, with strong reasoning, solid evidence, and comprehensive thinking.',
           ].join('\n'),
           result: {
@@ -1249,6 +1289,7 @@ export const codingMachine = setup({
           challenges: context.challenges,
           prompt: [
             'For each rebuttal below, challenge or accept it, with strong reasoning, solid evidence, and comprehensive thinking.',
+            'Do not edit files or commit; report findings only.',
           ].join('\n'),
           result: {
             challengeAccepted:
@@ -1316,8 +1357,10 @@ export const codingMachine = setup({
           sourceItem: 'CODE-18',
           ...bossReplyInputFields(context),
           coderPlayer: context.coderPlayer,
+          committerPlayer: context.committerPlayer,
           prompt: [
             'Make a commit of the changes that belong in the repo, following @specs/dev/git.md (reread if necessary).',
+            'Write concisely.',
             'Coder is <coder-llm>.',
             'Format the `Co-authored-by` `<model>` token as the conventional human form of the substituted id (e.g., `claude-opus-4-7` → `Claude-Opus-4.7`, `gpt-5.5` → `GPT-5.5`).',
           ].join('\n'),
@@ -1380,8 +1423,10 @@ export const codingMachine = setup({
           ...bossReplyInputFields(context),
           coderPlayer: context.coderPlayer,
           reviewerPlayer: context.reviewerPlayer,
+          committerPlayer: context.committerPlayer,
           prompt: [
             'Make a commit of the changes that belong in the repo, following @specs/dev/git.md (reread if necessary).',
+            'Write concisely.',
             'Coder is <coder-llm>; Reviewer is <reviewer-llm>.',
             'Format the `Co-authored-by` `<model>` token as the conventional human form of the substituted id (e.g., `claude-opus-4-7` → `Claude-Opus-4.7`, `gpt-5.5` → `GPT-5.5`).',
           ].join('\n'),