fix(system-prompt): suppress relocated exec-approval line under tool_call_style override

headbouyJB · claude · headbouyJB · commit 45c52b2a5632 · 2026-06-30T21:55:20.000+01:00
Addresses review (clawsweeper): the exec-approval guidance lived inside the `tool_call_style` fallback, so a provider override of that section previously replaced it. Relocating it below the boundary emitted it unconditionally, which changed behaviour for providers/plugins that override `tool_call_style`. Gate the relocated line on the absence of a `tool_call_style` override, restoring the original "override replaces the whole section" contract. Extends the provider-override test to assert the default approval line is suppressed when the section is overridden. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01H6Hz9UEpxQ4W3d8XecvupH
diff --git a/src/agents/system-prompt.test.ts b/src/agents/system-prompt.test.ts
@@ -976,6 +976,9 @@ describe("buildAgentSystemPrompt", () => {
     expect(prompt).toContain("## Provider Dynamic\n\nDynamic guidance.");
     expect(prompt).toContain("## Tool Call Style\nProvider-specific tool call guidance.");
     expect(prompt).not.toContain("Default: do not narrate routine, low-risk tool calls");
+    // The relocated exec-approval guidance stays suppressed when tool_call_style is
+    // provider-overridden, preserving the "override replaces the whole section" contract.
+    expect(prompt).not.toContain("If exec returns approval-pending");
   });
 
   it("includes inline button style guidance when runtime supports inline buttons", () => {
diff --git a/src/agents/system-prompt.ts b/src/agents/system-prompt.ts
@@ -1288,11 +1288,17 @@ export function buildAgentSystemPrompt(params: {
     // Exec-approval guidance varies by channel (CLI /approve vs native approval UI)
     // and Authorized Senders varies by owner/identity (and is dropped when minimal),
     // so both must sit below the boundary to keep the static prefix byte-identical.
-    buildExecApprovalPromptGuidance({
-      runtimeChannel: params.runtimeInfo?.channel,
-      inlineButtonsEnabled,
-      runtimeCapabilities,
-    }),
+    // Still suppressed when `tool_call_style` is provider-overridden, preserving the
+    // original contract where that override replaces the whole section (incl. this line).
+    ...(providerSectionOverrides.tool_call_style
+      ? []
+      : [
+          buildExecApprovalPromptGuidance({
+            runtimeChannel: params.runtimeInfo?.channel,
+            inlineButtonsEnabled,
+            runtimeCapabilities,
+          }),
+        ]),
     ...buildUserIdentitySection(ownerLine, isMinimal),
     ...buildWebchatCanvasSection({
       isMinimal,
