fix(agents): consume per-agent verboseDefault and elevatedDefault in directive resolution

lonexreb · lonexreb · commit 423b32190f95 · 2026-04-30T16:02:54.000-05:00
Codex review on PR #74643 found that schema/types/docs accept `verboseDefault` and `elevatedDefault` per-agent (under `agents.list[]`), but the runtime resolver still falls back to global `agentCfg` defaults — `getReply` passes `cfg.agents?.defaults` as `agentCfg`, so per-agent values were stored but never read on actual replies. The reasoning/fastMode paths already consult `agentEntry` first; verbose and elevated did not. Wire the same agentEntry-first precedence for verbose and elevated: - `src/auto-reply/reply/directive-handling.levels.ts`: extend the `agentEntry` parameter type with `verboseDefault`/`elevatedDefault`, and check `agentEntry?.verboseDefault` and `agentEntry?.elevatedDefault` before falling back to `agentCfg?.*`. - `src/auto-reply/reply/get-reply-directives.ts`: same agentEntry-first fallback for `resolvedVerboseLevel` and `resolvedElevatedLevel`. Session and explicit-directive precedence preserved. Add 6 regression tests in `directive-handling.levels.test.ts`: - per-agent verboseDefault wins over agentCfg verboseDefault - agentCfg verboseDefault still applies when agentEntry is absent - session verboseLevel wins over per-agent verboseDefault - per-agent elevatedDefault wins over agentCfg elevatedDefault - agentCfg elevatedDefault still applies when agentEntry is absent - session elevatedLevel wins over per-agent elevatedDefault Refs #73680
diff --git a/src/auto-reply/reply/directive-handling.levels.test.ts b/src/auto-reply/reply/directive-handling.levels.test.ts
@@ -164,4 +164,108 @@ describe("resolveCurrentDirectiveLevels", () => {
 
     expect(result.currentReasoningLevel).toBe("off");
   });
+
+  // Regression for #73680 / PR #74643 P2: verbose and elevated defaults must
+  // honor per-agent values from agentEntry before falling back to the global
+  // agentCfg defaults; otherwise saving a per-agent value has no runtime effect.
+
+  it("prefers per-agent verboseDefault over agentCfg verboseDefault", async () => {
+    const resolveDefaultThinkingLevel = vi.fn().mockResolvedValue("off");
+
+    const result = await resolveCurrentDirectiveLevels({
+      sessionEntry: {},
+      agentEntry: {
+        verboseDefault: "high",
+      },
+      agentCfg: {
+        verboseDefault: "low",
+      },
+      resolveDefaultThinkingLevel,
+    });
+
+    expect(result.currentVerboseLevel).toBe("high");
+  });
+
+  it("falls back to agentCfg verboseDefault when agent entry is absent", async () => {
+    const resolveDefaultThinkingLevel = vi.fn().mockResolvedValue("off");
+
+    const result = await resolveCurrentDirectiveLevels({
+      sessionEntry: {},
+      agentCfg: {
+        verboseDefault: "low",
+      },
+      resolveDefaultThinkingLevel,
+    });
+
+    expect(result.currentVerboseLevel).toBe("low");
+  });
+
+  it("prefers session verboseLevel over per-agent verboseDefault", async () => {
+    const resolveDefaultThinkingLevel = vi.fn().mockResolvedValue("off");
+
+    const result = await resolveCurrentDirectiveLevels({
+      sessionEntry: {
+        verboseLevel: "low",
+      },
+      agentEntry: {
+        verboseDefault: "high",
+      },
+      agentCfg: {
+        verboseDefault: "off",
+      },
+      resolveDefaultThinkingLevel,
+    });
+
+    expect(result.currentVerboseLevel).toBe("low");
+  });
+
+  it("prefers per-agent elevatedDefault over agentCfg elevatedDefault", async () => {
+    const resolveDefaultThinkingLevel = vi.fn().mockResolvedValue("off");
+
+    const result = await resolveCurrentDirectiveLevels({
+      sessionEntry: {},
+      agentEntry: {
+        elevatedDefault: "on",
+      },
+      agentCfg: {
+        elevatedDefault: "off",
+      },
+      resolveDefaultThinkingLevel,
+    });
+
+    expect(result.currentElevatedLevel).toBe("on");
+  });
+
+  it("falls back to agentCfg elevatedDefault when agent entry is absent", async () => {
+    const resolveDefaultThinkingLevel = vi.fn().mockResolvedValue("off");
+
+    const result = await resolveCurrentDirectiveLevels({
+      sessionEntry: {},
+      agentCfg: {
+        elevatedDefault: "off",
+      },
+      resolveDefaultThinkingLevel,
+    });
+
+    expect(result.currentElevatedLevel).toBe("off");
+  });
+
+  it("prefers session elevatedLevel over per-agent elevatedDefault", async () => {
+    const resolveDefaultThinkingLevel = vi.fn().mockResolvedValue("off");
+
+    const result = await resolveCurrentDirectiveLevels({
+      sessionEntry: {
+        elevatedLevel: "off",
+      },
+      agentEntry: {
+        elevatedDefault: "on",
+      },
+      agentCfg: {
+        elevatedDefault: "on",
+      },
+      resolveDefaultThinkingLevel,
+    });
+
+    expect(result.currentElevatedLevel).toBe("off");
+  });
 });
diff --git a/src/auto-reply/reply/directive-handling.levels.ts b/src/auto-reply/reply/directive-handling.levels.ts
@@ -11,6 +11,8 @@ export async function resolveCurrentDirectiveLevels(params: {
   agentEntry?: {
     fastModeDefault?: unknown;
     reasoningDefault?: unknown;
+    verboseDefault?: unknown;
+    elevatedDefault?: unknown;
   };
   agentCfg?: {
     thinkingDefault?: unknown;
@@ -39,6 +41,7 @@ export async function resolveCurrentDirectiveLevels(params: {
         : undefined;
   const currentVerboseLevel =
     (params.sessionEntry?.verboseLevel as VerboseLevel | undefined) ??
+    (params.agentEntry?.verboseDefault as VerboseLevel | undefined) ??
     (params.agentCfg?.verboseDefault as VerboseLevel | undefined);
   const currentReasoningLevel =
     (params.sessionEntry?.reasoningLevel as ReasoningLevel | undefined) ??
@@ -47,6 +50,7 @@ export async function resolveCurrentDirectiveLevels(params: {
     "off";
   const currentElevatedLevel =
     (params.sessionEntry?.elevatedLevel as ElevatedLevel | undefined) ??
+    (params.agentEntry?.elevatedDefault as ElevatedLevel | undefined) ??
     (params.agentCfg?.elevatedDefault as ElevatedLevel | undefined);
   return {
     currentThinkLevel,
diff --git a/src/auto-reply/reply/get-reply-directives.ts b/src/auto-reply/reply/get-reply-directives.ts
@@ -431,6 +431,7 @@ export async function resolveReplyDirectives(params: {
   const resolvedVerboseLevel =
     directives.verboseLevel ??
     (targetSessionEntry?.verboseLevel as VerboseLevel | undefined) ??
+    (agentEntry?.verboseDefault as VerboseLevel | undefined) ??
     (agentCfg?.verboseDefault as VerboseLevel | undefined);
   const configuredReasoningDefault =
     (agentEntry?.reasoningDefault as ReasoningLevel | undefined) ??
@@ -460,6 +461,7 @@ export async function resolveReplyDirectives(params: {
   const resolvedElevatedLevel = elevatedAllowed
     ? (directives.elevatedLevel ??
       (targetSessionEntry?.elevatedLevel as ElevatedLevel | undefined) ??
+      (agentEntry?.elevatedDefault as ElevatedLevel | undefined) ??
       (agentCfg?.elevatedDefault as ElevatedLevel | undefined) ??
       "on")
     : "off";
