Let a complete report envelope win over quoted tool-call markup

Author: TheGreatAxios

src/subagent/nudge-director.test.ts

@@ -551,6 +551,28 @@ describe("SubAgentDirector verbatim tool markup recovery", () => {
       message: "subagent-complete",
     });
   });
+
+  test("a complete envelope that quotes tool-call markup still completes", async () => {
+    const director = new SubAgentDirector("system", [], undefined, 30);
+    const caps = capabilities();
+
+    const reportQuotingMarkup = `${REPORT_ENVELOPE}\n\nThe model emitted ${verbatimToolCall} as text.`;
+    const result = actions(
+      await director.decide(
+        inferenceDoneText(reportQuotingMarkup),
+        state,
+        caps,
+      ),
+    );
+    expect(result).toContainEqual({
+      type: "checkpoint",
+      message: "subagent-complete",
+    });
+    expect(result).not.toContainEqual({
+      type: "checkpoint",
+      message: "subagent-verbatim-tool-call-nudge",
+    });
+  });
 });
 
 describe("SubAgentDirector incomplete-report wiring", () => {

src/subagent/nudge-director.ts

@@ -311,24 +311,6 @@ export class SubAgentDirector extends DefaultDirector {
         this.thrashState = nextThrashState(this.thrashState, content);
       }
 
-      if (
-        !hasToolCalls &&
-        !this.verbatimToolCallNudgeFired &&
-        hasVerbatimToolCallMarkup(content)
-      ) {
-        this.verbatimToolCallNudgeFired = true;
-        this.interventions({
-          id: "verbatim-tool-call",
-          class: "nudge",
-          state: this.interventionState(),
-          detail: "assistant emitted explicit tool-call markup as text",
-        });
-        return [
-          capabilities.checkpoint("subagent-verbatim-tool-call-nudge"),
-          inferWithSubAgentNudge(capabilities, VERBATIM_TOOL_CALL_NUDGE),
-        ];
-      }
-
       const stop = evaluateSubAgentStop({
         hasToolCalls,
         thrashState: this.thrashState,
@@ -352,6 +334,27 @@ export class SubAgentDirector extends DefaultDirector {
         if (compacted !== null) return compacted;
         return terminal;
       }
+
+      // Below the stop policy so a finished report that merely quotes
+      // tool-call markup still completes; a markup turn with no envelope
+      // gets the corrective nudge instead of the generic wrap-up one.
+      if (
+        !hasToolCalls &&
+        !this.verbatimToolCallNudgeFired &&
+        hasVerbatimToolCallMarkup(content)
+      ) {
+        this.verbatimToolCallNudgeFired = true;
+        this.interventions({
+          id: "verbatim-tool-call",
+          class: "nudge",
+          state: this.interventionState(),
+          detail: "assistant emitted explicit tool-call markup as text",
+        });
+        return [
+          capabilities.checkpoint("subagent-verbatim-tool-call-nudge"),
+          inferWithSubAgentNudge(capabilities, VERBATIM_TOOL_CALL_NUDGE),
+        ];
+      }
       if (stop === "incomplete-report") {
         // Tool-less turn after tools, no report envelope. Must not fall through
         // to super.decide — DefaultDirector completes any tool-less turn.