Ship keepstyle guideline split and dedupe worker report envelopes

Author: TheGreatAxios

src/agent/directors/bruckheimer/package.test.ts

@@ -80,12 +80,13 @@ describe("bruckheimerPackage", () => {
     expect(p).not.toMatch(/maySpawn:\s*true/);
   });
 
-  test("systemPrompt teaches worker report shape Summary/Findings/Blockers/Paths", () => {
+  test("systemPrompt points at the scaffold-owned worker report envelope (no re-spec)", () => {
     const p = bruckheimerPackage.systemPrompt;
-    expect(p).toContain("## Summary");
-    expect(p).toContain("## Findings");
-    expect(p).toContain("## Blockers");
-    expect(p).toContain("## Paths");
+    expect(p).toMatch(/Corbits report envelope/);
+    expect(p).not.toContain("## Summary");
+    expect(p).not.toContain("## Findings");
+    expect(p).not.toContain("## Blockers");
+    expect(p).not.toContain("## Paths");
     expect(p).toMatch(/brief file you wrote/i);
     expect(p).toContain("DONE GATE");
   });

src/agent/directors/bruckheimer/package.ts

@@ -129,19 +129,7 @@ Use \`read_file\`, \`write_file\`, and \`edit_file\` to manage the brief. Use \`
 
 # Report (when dispatched as a worker)
 
-When you finish a discovery brief for a parent session, stop tooling and reply with ONLY:
-
-## Summary
-One or two sentences: what you accomplished or concluded.
-
-## Findings
-Audience, hook, win, scope cuts, glossary highlights, and anything the parent needs from the brief.
-
-## Blockers
-Open questions, assumptions, or blockers. Write "None." if clear. Name Builder / Counsel / Greybeard / Shakespeare when the ask belongs to them.
-
-## Paths
-The brief file you wrote (one path). Write "None." if you refused a brief because the bar was not met.
+When you finish a discovery brief for a parent session, stop tooling and reply with ONLY the Corbits report envelope — the shared scaffold owns its shape (Summary / Findings / Blockers / Paths, in that order), so this package does not re-specify it. Findings for this lane: audience, hook, win, scope cuts, glossary highlights, and anything the parent needs from the brief. Blockers: name Builder / Counsel / Greybeard / Shakespeare when the ask belongs to them. Paths: the brief file you wrote (one path); "None." if you refused a brief because the bar was not met.
 
 DONE GATE: Stop when audience, hook, and win are nailed and the brief is written (or you refused because the idea is not real), OR when Blockers need the parent. Do not invent architecture, ship code, author eng step-plans, or expand past discovery.
 

src/agent/directors/intern/package.test.ts

@@ -18,9 +18,11 @@ describe("internPackage", () => {
     expect(p).toMatch(/execute clear (mechanical )?instructions/i);
     expect(p).toMatch(/STOP/i);
     expect(p).toMatch(/Blockers/i);
-    expect(p).toMatch(/## Summary/);
-    expect(p).toMatch(/## Findings/);
-    expect(p).toMatch(/## Paths/);
+    // Envelope shape is scaffold-owned: point at it, do not re-specify it.
+    expect(p).toMatch(/Corbits report envelope/);
+    expect(p).not.toMatch(/## Summary/);
+    expect(p).not.toMatch(/## Findings/);
+    expect(p).not.toMatch(/## Paths/);
     expect(p).toMatch(/run_shell/);
     // Role forbids debugging; body states the ban explicitly
     expect(p).toMatch(/You do NOT:[\s\S]*Debug failures/);

src/agent/directors/intern/package.ts

@@ -119,17 +119,5 @@ STOP. You are outside your role. Report Blockers for the parent (Skywalker) inst
 
 # Report Contract
 
-When done (or blocked), stop calling tools and reply with ONLY this markdown envelope:
-
-## Summary
-One or two sentences: what you ran or why you stopped.
-
-## Findings
-Commands run and their outputs (verbatim where useful). Observable facts only.
-
-## Blockers
-Ambiguity, failures, missing inputs, or decisions needed. Write "None." if clear. Do not invent fixes.
-
-## Paths
-Key file paths you read or changed (one per line). Write "None." if none.`,
+When done (or blocked), stop calling tools and reply with ONLY the Corbits report envelope (Summary / Findings / Blockers / Paths) — the shared scaffold owns its shape, so this package does not re-specify it. See How to Report Back for what goes under Findings / Blockers.`,
 };

src/agent/directors/neckbeard/package.test.ts

@@ -48,15 +48,16 @@ describe("neckbeardPackage", () => {
     expect(p).toMatch(/code \(when the brief asks\)|code review/i);
   });
 
-  test("systemPrompt bakes style/philosophy and reports to parent", () => {
+  test("systemPrompt bakes style/philosophy and points at the shared envelope", () => {
     const p = neckbeardPackage.systemPrompt;
     expect(p).toMatch(/use_skill.*not mounted|not mounted.*use_skill/i);
     expect(p).toMatch(/violently disagree/);
     expect(p).toMatch(/report to the parent/i);
-    expect(p).toMatch(/## Summary/);
-    expect(p).toMatch(/## Findings/);
-    expect(p).toMatch(/## Blockers/);
-    expect(p).toMatch(/## Paths/);
+    expect(p).toMatch(/Corbits report envelope/);
+    expect(p).not.toMatch(/## Summary/);
+    expect(p).not.toMatch(/## Findings/);
+    expect(p).not.toMatch(/## Blockers/);
+    expect(p).not.toMatch(/## Paths/);
     expect(p).toMatch(/ranked nits with evidence|evidence paths/i);
   });
 

src/agent/directors/neckbeard/package.ts

@@ -569,17 +569,5 @@ Do not apply fixes. Do not become Builder, Critic, or Greybeard as your primary
 
 # Reporting back
 
-When done, stop calling tools and reply with ONLY this markdown envelope:
-
-## Summary
-One or two sentences: condescending overall take (Rust optional but encouraged).
-
-## Findings
-Ranked nits with evidence paths — Peak Neckbeard / Unbearable / Maddening / Insufferable. Each item cites a path (and line/symbol when available). Comic voice allowed ("Actually,", "Well technically,"); no emoji glyphs.
-
-## Blockers
-Open questions, missing docs/code, or out-of-lane routing. Write "None." if clear. If blocked, ask_director; after the cap, report remaining questions here.
-
-## Paths
-Key file paths you read (one per line). Write "None." if none.`,
+When done, stop calling tools and reply with ONLY the Corbits report envelope — the shared scaffold owns its shape (Summary / Findings / Blockers / Paths, in that order), so this package does not re-specify it. Findings for this lane: ranked nits with evidence paths — Peak Neckbeard / Unbearable / Maddening / Insufferable, each citing a path (and line/symbol when available). Comic voice allowed ("Actually,", "Well technically,"); no emoji glyphs. Blockers: ... ask_director; after the cap, report remaining questions here. Paths: key file paths you read (one per line).`,
 };

src/agent/directors/testsmith/package.test.ts

@@ -48,13 +48,15 @@ describe("testsmithPackage", () => {
     expect(p).toMatch(/Hand off/i);
   });
 
-  test("systemPrompt states Corbits report shape", () => {
+  test("systemPrompt points at the scaffold-owned report envelope (no re-spec)", () => {
     const p = testsmithPackage.systemPrompt;
-    expect(p).toContain("## Summary");
-    expect(p).toContain("## Findings");
-    expect(p).toContain("## Blockers");
-    expect(p).toContain("## Paths");
     expect(p).toMatch(/Corbits report shape/i);
+    expect(p).toMatch(/Corbits report envelope/);
+    expect(p).toMatch(/coverage map/);
+    expect(p).not.toContain("## Summary");
+    expect(p).not.toContain("## Findings");
+    expect(p).not.toContain("## Blockers");
+    expect(p).not.toContain("## Paths");
   });
 
   test("systemPrompt has no tool-schema restatement or fake caps", () => {

src/agent/directors/testsmith/package.ts

@@ -61,19 +61,7 @@ Defer or omit:
 
 # Corbits report shape
 
-When done, stop tooling and reply with ONLY this envelope:
-
-## Summary
-One or two sentences: strategy and coverage scope designed.
-
-## Findings
-Permanent cases (name + boundary + setup/action/expect + risk), coverage map of each success_criteria item → cases (or blocked), and what not to test with why.
-
-## Blockers
-Open questions, missing acceptance criteria, or assumptions. Write "None." if clear.
-
-## Paths
-Files/suites you read to ground the design (one per line). Write "None." if none.
+When done, stop tooling and reply with ONLY the Corbits report envelope — the shared scaffold owns its shape (Summary / Findings / Blockers / Paths, in that order), so this package does not re-specify it. Findings for this lane: permanent cases (name + boundary + setup/action/expect + risk), coverage map of each success_criteria item → cases (or blocked), and what not to test with why.
 
 DONE GATE: Stop when every success_criteria item has permanent cases (or Blockers). Do not invent architecture or expand the brief after criteria are covered. If the brief is ambiguous, report Blockers — do not become Counsel or Greybeard.
 

src/agent/prompts.test.ts

@@ -2,8 +2,11 @@ import { describe, expect, it } from "bun:test";
 import {
   buildChatSystemPrompt,
   buildGrokLeafAntiThrashNote,
+  buildGuidelines,
   buildPromptDisciplineBlock,
   buildSubAgentSystemPrompt,
+  GUIDELINE_SUB_BLOCK_IDS,
+  KEEPSTYLE_PROMPT_SECTION_OMIT,
 } from "./prompts.js";
 import { CORE_TOOL_NAMES, CATALOG_TOOL_NAMES } from "./tool-search.js";
 
@@ -138,6 +141,91 @@ describe("sub-agent report contract", () => {
     expect(prompt).toMatch(/emit all four headings/);
     expect(prompt).toContain('"None."');
   });
+
+  it("emits the four-heading envelope exactly once (scaffold owns the shape)", () => {
+    const prompt = buildSubAgentSystemPrompt(undefined, undefined, undefined, {
+      orchestrator: false,
+      grokAntiThrash: false,
+    });
+    for (const heading of [
+      "## Summary",
+      "## Findings",
+      "## Blockers",
+      "## Paths",
+    ]) {
+      expect(countOccurrences(prompt, heading)).toBe(1);
+    }
+  });
+});
+
+describe("guideline sub-block omit policy (CL-7654)", () => {
+  it("exposes the keepstyle set as ids", () => {
+    expect([...GUIDELINE_SUB_BLOCK_IDS]).toEqual([
+      "responseStyle",
+      "toolChoice",
+      "askVsProceed",
+      "scopeConventions",
+      "orchestration",
+    ]);
+  });
+
+  it("keeps the full guidelines by default", () => {
+    const guidelines = buildGuidelines({});
+    for (const marker of [
+      "Response style:",
+      "Tool choice:",
+      "Ask vs proceed:",
+      "Scope and conventions:",
+      "Orchestration:",
+    ]) {
+      expect(guidelines).toContain(marker);
+    }
+  });
+
+  it("keepstyle omit keeps response style, drops tool-choice / ask-vs-proceed / orchestration", () => {
+    expect([...KEEPSTYLE_PROMPT_SECTION_OMIT].sort()).toEqual([
+      "askVsProceed",
+      "orchestration",
+      "toolChoice",
+    ]);
+    const guidelines = buildGuidelines({ omit: KEEPSTYLE_PROMPT_SECTION_OMIT });
+    expect(guidelines).toContain("Response style:");
+    expect(guidelines).toContain("Scope and conventions:");
+    expect(guidelines).not.toContain("Tool choice:");
+    expect(guidelines).not.toContain("Ask vs proceed:");
+    expect(guidelines).not.toContain("Orchestration:");
+  });
+
+  it("ignores unknown omit ids", () => {
+    const guidelines = buildGuidelines({ omit: ["no-such-block"] });
+    expect(guidelines).toContain("Response style:");
+    expect(guidelines).toContain("Tool choice:");
+    expect(guidelines).toContain("Orchestration:");
+  });
+
+  it("threads guidelineConfig through the chat system prompt", () => {
+    const full = buildChatSystemPrompt(
+      undefined,
+      undefined,
+      undefined,
+      [],
+      "orchestrator",
+    );
+    expect(full).toContain("Tool choice:");
+    expect(full).toContain("Orchestration:");
+    const keepstyle = buildChatSystemPrompt(
+      undefined,
+      undefined,
+      undefined,
+      [],
+      "orchestrator",
+      undefined,
+      { omit: KEEPSTYLE_PROMPT_SECTION_OMIT },
+    );
+    expect(keepstyle).toContain("Response style:");
+    expect(keepstyle).not.toContain("Tool choice:");
+    expect(keepstyle).not.toContain("Orchestration:");
+  });
 });
 
 describe("wait_agents mount-gated prompt copy (CL-7678)", () => {