Merge pull request #1132 from corbitsdev/cl-8296-0330-merge-grok-ceremony-lines-into-the-one-residual

feat(agent): merge grok ceremony lines into the one residual

Author: TheGreatAxios

src/agent/grok-residual.test.ts

@@ -0,0 +1,78 @@
+import { describe, expect, it } from "bun:test";
+import { GROK_PROMPT_RESIDUAL } from "./model-family-policy.js";
+import {
+  buildGrokLeafAntiThrashNote,
+  buildSubAgentSystemPrompt,
+} from "./prompts.js";
+import { shouldApplyGrokAntiThrash } from "../subagent/provider-family.js";
+
+// The three Grok ceremony lines (CL-7768 Design, merged by CL-8296): no git,
+// no pre-plan, verify once.
+const CEREMONY_LINES = [
+  "- Never run git add, git commit, git stash, or any other state-changing git command unless the user asks.",
+  "- Do not narrate a plan before acting on a small task; act, then report.",
+  "- Verify with the test command once at the end, not after every edit.",
+] as const;
+
+function countOccurrences(haystack: string, needle: string): number {
+  return haystack.split(needle).length - 1;
+}
+
+describe("grok ceremony merge (CL-8296)", () => {
+  it("exposes a single grok residual with each ceremony line exactly once", () => {
+    expect(GROK_PROMPT_RESIDUAL).toContain("Finish bias (xAI / Grok worker):");
+    for (const line of CEREMONY_LINES) {
+      expect(countOccurrences(GROK_PROMPT_RESIDUAL, line)).toBe(1);
+    }
+  });
+
+  it("keeps the don't re-read line exactly once — no duplicate", () => {
+    expect(
+      countOccurrences(GROK_PROMPT_RESIDUAL, "re-open paths you already read"),
+    ).toBe(1);
+  });
+
+  it("is grok-only: the finish-bias gate fires for grok leaves alone", () => {
+    expect(
+      shouldApplyGrokAntiThrash({
+        providerName: "xai/default",
+        model: "grok-4.6",
+        orchestrator: false,
+      }),
+    ).toBe(true);
+    for (const input of [
+      { providerName: "anthropic", model: "claude-sonnet-4" },
+      { providerName: "moonshot", model: "kimi-k2" },
+      { providerName: "opencode-go", model: "muse-spark-1.3-contributor" },
+      { providerName: "openai", model: "gpt-4.1" },
+    ] as const) {
+      expect(shouldApplyGrokAntiThrash({ ...input, orchestrator: false })).toBe(
+        false,
+      );
+    }
+    expect(
+      shouldApplyGrokAntiThrash({
+        providerName: "xai/default",
+        model: "grok-4.6",
+        orchestrator: true,
+      }),
+    ).toBe(false);
+  });
+
+  it("buildGrokLeafAntiThrashNote is the same single residual (one source of truth)", () => {
+    expect(buildGrokLeafAntiThrashNote()).toBe(GROK_PROMPT_RESIDUAL);
+  });
+
+  it("the assembled grok worker prompt carries the merged residual exactly once", () => {
+    const prompt = buildSubAgentSystemPrompt(undefined, undefined, undefined, {
+      orchestrator: false,
+      grokAntiThrash: true,
+    });
+    expect(countOccurrences(prompt, "Finish bias (xAI / Grok worker):")).toBe(
+      1,
+    );
+    for (const line of CEREMONY_LINES) {
+      expect(countOccurrences(prompt, line)).toBe(1);
+    }
+  });
+});

src/agent/model-family-policy.ts

@@ -129,6 +129,27 @@ const MUSE_POLICY: Omit<ModelFamilyPolicy, "family"> = {
   toolDisciplineRules: MUSE_TOOL_DISCIPLINE_RULES,
 };
 
+// Single grok finish-bias + ceremony residual (CL-8296): the finish-bias
+// bullets plus the three ceremony lines from the CL-7768 design (no git, no
+// pre-plan, verify once), merged into one block with no line twice. The don't
+// re-read idea appears exactly once (the "re-open paths" bullet) — it is not
+// repeated. Grok-only: detectModelFamily has no glm family, so per the <30min
+// rule no GLM row ships here. The text lives here once; exported for
+// buildGrokLeafAntiThrashNote (prompts.ts), which returns it verbatim, so the
+// prompt carries exactly one copy. This is a different block from the CL-8297
+// tool-budget hook (GROK_TOOL_BUDGET_RESIDUAL, surfaced via the
+// ModelFamilyPolicy.promptResidual field): grok leaves carry both, each once.
+export const GROK_PROMPT_RESIDUAL = [
+  "Finish bias (xAI / Grok worker):",
+  "- Once you can answer the dispatch brief, prefer the structured report over another speculative tool call.",
+  "- If the next call would only re-open paths you already read, write the report instead.",
+  "- When the dispatch brief's done-definition is met, write the report envelope instead of making one more search or micro-edit.",
+  "- Route file and web work through the dedicated tools, never run_shell — mining showed grok reaching for shell first when a typed tool already covered the job.",
+  "- Never run git add, git commit, git stash, or any other state-changing git command unless the user asks.",
+  "- Do not narrate a plan before acting on a small task; act, then report.",
+  "- Verify with the test command once at the end, not after every edit.",
+].join("\n");
+
 export function resolveModelFamilyPolicy(input: {
   providerName: string;
   model?: string;

src/agent/prompts.ts

@@ -11,6 +11,7 @@ import {
   buildWorkerContract,
   buildWorkerToolNames,
 } from "./worker-contract.js";
+import { GROK_PROMPT_RESIDUAL } from "./model-family-policy.js";
 
 // Advertise every gated core tool when the caller has no session-start facts
 // (tests, ad-hoc prompt previews) — except wait_agents, which is mount-gated:
@@ -511,14 +512,12 @@ export function buildSubAgentReportContract(
 // Tiny residual for Grok/xAI workers: mining showed higher tools-only thrash
 // than Codex on the same harness. Shared thrash harness + spawn contracts do
 // the structural work; this is only a finish-bias nudge, not a full rewrite.
+// Single source of truth is the GROK_PROMPT_RESIDUAL block in
+// model-family-policy.ts (CL-8296 merged the three ceremony lines into it);
+// this returns that block verbatim so the prompt carries one grok residual
+// with no line twice.
 export function buildGrokLeafAntiThrashNote(): string {
-  return [
-    "Finish bias (xAI / Grok worker):",
-    "- Once you can answer the dispatch brief, prefer the structured report over another speculative tool call.",
-    "- If the next call would only re-open paths you already read, write the report instead.",
-    "- When the dispatch brief's done-definition is met, write the report envelope instead of making one more search or micro-edit.",
-    "- Route file and web work through the dedicated tools, never run_shell — mining showed grok reaching for shell first when a typed tool already covered the job.",
-  ].join("\n");
+  return GROK_PROMPT_RESIDUAL;
 }
 
 export function buildSubAgentSystemPrompt(