fix(agents): apply acp fast mode runtime override

jai · jai · commit 11de5c7ed750 · 2026-06-06T11:17:35.000+07:00
diff --git a/packages/acp-core/src/types.ts b/packages/acp-core/src/types.ts
@@ -77,6 +77,8 @@ export type AcpSessionRuntimeOptions = {
   permissionProfile?: string;
   /** ACP runtime config option: per-turn timeout in seconds. */
   timeoutSeconds?: number;
+  /** ACP runtime config option: fast-mode toggle. */
+  fastMode?: boolean;
   /** Backend-specific option bag mapped through session/set_config_option. */
   backendExtras?: Record<string, string>;
 };
diff --git a/src/acp/control-plane/manager.runtime-config.test.ts b/src/acp/control-plane/manager.runtime-config.test.ts
@@ -403,6 +403,7 @@ describe("AcpSessionManager runtime config", () => {
           thinking: "high",
           permissionProfile: "strict",
           timeoutSeconds: 120,
+          fastMode: false,
         },
       },
     });
@@ -435,6 +436,10 @@ describe("AcpSessionManager runtime config", () => {
       key: "timeout",
       value: "120",
     });
+    expectMockCallFields(runtimeState.setConfigOption, {
+      key: "fast_mode",
+      value: "false",
+    });
   });
 
   it("continues turns when adapters reject optional timeout config", async () => {
@@ -606,7 +611,7 @@ describe("AcpSessionManager runtime config", () => {
     const runtimeState = createRuntime();
     runtimeState.getCapabilities.mockResolvedValue({
       controls: ["session/set_config_option", "session/status"],
-      configOptionKeys: ["model", "thought_level", "permissions", "timeout_seconds"],
+      configOptionKeys: ["model", "thought_level", "permissions", "timeout_seconds", "fast-mode"],
     });
     hoisted.requireAcpRuntimeBackendMock.mockReturnValue({
       id: "acpx",
@@ -622,6 +627,7 @@ describe("AcpSessionManager runtime config", () => {
           thinking: "high",
           permissionProfile: "strict",
           timeoutSeconds: 120,
+          fastMode: true,
         },
       },
     });
@@ -647,6 +653,10 @@ describe("AcpSessionManager runtime config", () => {
       key: "timeout_seconds",
       value: "120",
     });
+    expectMockCallFields(runtimeState.setConfigOption, {
+      key: "fast-mode",
+      value: "true",
+    });
     expectNoMockCallFields(runtimeState.setConfigOption, {
       key: "thinking",
     });
diff --git a/src/acp/control-plane/runtime-options.test.ts b/src/acp/control-plane/runtime-options.test.ts
@@ -40,4 +40,11 @@ describe("buildRuntimeConfigOptionPairs timeout advertisement", () => {
       ["thinking", "high"],
     ]);
   });
+
+  it("maps fast mode to backend-advertised aliases", () => {
+    expect(buildRuntimeConfigOptionPairs({ fastMode: false })).toEqual([["fast_mode", "false"]]);
+    expect(buildRuntimeConfigOptionPairs({ fastMode: true }, ["fast-mode"])).toEqual([
+      ["fast-mode", "true"],
+    ]);
+  });
 });
diff --git a/src/acp/control-plane/runtime-options.ts b/src/acp/control-plane/runtime-options.ts
@@ -26,6 +26,7 @@ const RUNTIME_CONFIG_OPTION_ALIASES = {
   thinking: ["thinking", "effort", "reasoning_effort", "thought_level"],
   permissionProfile: ["approval_policy", "permission_profile", "permissions", "permission_mode"],
   timeoutSeconds: ["timeout", "timeout_seconds"],
+  fastMode: ["fast_mode", "fast-mode", "fastMode"],
 } as const;
 
 function failInvalidOption(message: string): never {
@@ -167,6 +168,7 @@ export function validateRuntimeOptionPatch(
     "cwd",
     "permissionProfile",
     "timeoutSeconds",
+    "fastMode",
     "backendExtras",
   ]);
   for (const key of Object.keys(rawPatch)) {
@@ -218,6 +220,15 @@ export function validateRuntimeOptionPatch(
       next.timeoutSeconds = validateRuntimeTimeoutSecondsInput(rawPatch.timeoutSeconds);
     }
   }
+  if (Object.hasOwn(rawPatch, "fastMode")) {
+    if (rawPatch.fastMode === undefined) {
+      next.fastMode = undefined;
+    } else if (typeof rawPatch.fastMode === "boolean") {
+      next.fastMode = rawPatch.fastMode;
+    } else {
+      failInvalidOption("Fast mode must be a boolean.");
+    }
+  }
   if (Object.hasOwn(rawPatch, "backendExtras")) {
     const rawExtras = rawPatch.backendExtras;
     if (rawExtras === undefined) {
@@ -268,6 +279,7 @@ export function normalizeRuntimeOptions(
     ...(cwd ? { cwd } : {}),
     ...(permissionProfile ? { permissionProfile } : {}),
     ...(typeof timeoutSeconds === "number" ? { timeoutSeconds } : {}),
+    ...(typeof options?.fastMode === "boolean" ? { fastMode: options.fastMode } : {}),
     ...(backendExtras ? { backendExtras } : {}),
   };
 }
@@ -318,6 +330,7 @@ export function buildRuntimeControlSignature(options: AcpSessionRuntimeOptions):
     thinking: normalized.thinking ?? null,
     permissionProfile: normalized.permissionProfile ?? null,
     timeoutSeconds: normalized.timeoutSeconds ?? null,
+    fastMode: normalized.fastMode ?? null,
     backendExtras: extras,
   });
 }
@@ -352,6 +365,12 @@ export function buildRuntimeConfigOptionPairs(
       String(normalized.timeoutSeconds),
     );
   }
+  if (typeof normalized.fastMode === "boolean") {
+    pairs.set(
+      resolveRuntimeConfigOptionKey("fast_mode", advertisedConfigOptionKeys),
+      String(normalized.fastMode),
+    );
+  }
   for (const [key, value] of Object.entries(normalized.backendExtras ?? {})) {
     const wireKey = resolveRuntimeConfigOptionKey(key, advertisedConfigOptionKeys);
     if (!pairs.has(wireKey)) {
@@ -446,6 +465,13 @@ export function inferRuntimeOptionPatchFromConfigOption(
   if (normalizedKey === "timeout" || normalizedKey === "timeout_seconds") {
     return { timeoutSeconds: parseRuntimeTimeoutSecondsInput(validated.value) };
   }
+  if (
+    normalizedKey === "fast_mode" ||
+    normalizedKey === "fast-mode" ||
+    normalizedKey === "fastmode"
+  ) {
+    return { fastMode: normalizeLowercaseStringOrEmpty(validated.value) === "true" };
+  }
   if (normalizedKey === "cwd") {
     return { cwd: validateRuntimeCwdInput(validated.value) };
   }
diff --git a/src/agents/acp-spawn.test.ts b/src/agents/acp-spawn.test.ts
@@ -951,6 +951,28 @@ describe("spawnAcpDirect", () => {
     expect(initInput.sessionKey).toMatch(/^agent:codex:acp:/);
   });
 
+  it("passes fast mode overrides into ACP session initialization", async () => {
+    const result = await spawnAcpDirect(
+      {
+        task: "Investigate flaky tests",
+        agentId: "codex",
+        fastMode: false,
+      },
+      {
+        agentSessionKey: "agent:main:main",
+      },
+    );
+
+    expectAcceptedSpawn(result);
+    const initInput = expectInitializeSessionFields({
+      agent: "codex",
+      runtimeOptions: {
+        fastMode: false,
+      },
+    });
+    expect(initInput.sessionKey).toMatch(/^agent:codex:acp:/);
+  });
+
   it("applies existing subagent model and model-profile thinking defaults to ACP runtime options", async () => {
     replaceSpawnConfig({
       ...createDefaultSpawnConfig(),
diff --git a/src/agents/acp-spawn.ts b/src/agents/acp-spawn.ts
@@ -45,7 +45,11 @@ import { getRuntimeConfig } from "../config/config.js";
 import { resolveStorePath } from "../config/sessions/paths.js";
 import { loadSessionStore } from "../config/sessions/store.js";
 import { resolveSessionTranscriptFile } from "../config/sessions/transcript.js";
-import type { SessionAcpMeta, SessionEntry } from "../config/sessions/types.js";
+import type {
+  AcpSessionRuntimeOptions,
+  SessionAcpMeta,
+  SessionEntry,
+} from "../config/sessions/types.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
 import { callGateway } from "../gateway/call.js";
 import { formatErrorMessage } from "../infra/errors.js";
@@ -997,11 +1001,10 @@ function validateAcpResumeSessionOwnership(params: {
   };
 }
 
-type AcpSpawnRuntimeOptions = {
-  model?: string;
-  thinking?: string;
-  timeoutSeconds?: number;
-};
+type AcpSpawnRuntimeOptions = Pick<
+  AcpSessionRuntimeOptions,
+  "model" | "thinking" | "timeoutSeconds" | "fastMode"
+>;
 
 function resolveAcpRuntimeTimeoutSeconds(runTimeoutSeconds?: number): number | undefined {
   if (!runTimeoutSeconds) {
@@ -1017,6 +1020,7 @@ function resolveAcpSpawnRuntimeOptions(params: {
   model?: string;
   thinking?: string;
   runTimeoutSeconds?: number;
+  fastMode?: boolean;
 }): { ok: true; runtimeOptions?: AcpSpawnRuntimeOptions } | { ok: false; error: string } {
   const policyAgentId = params.configAgentId ?? params.targetAgentId;
   const model = resolveConfiguredSubagentSpawnModelSelection({
@@ -1052,11 +1056,12 @@ function resolveAcpSpawnRuntimeOptions(params: {
 
   const timeoutSeconds = resolveAcpRuntimeTimeoutSeconds(params.runTimeoutSeconds);
   const runtimeOptions =
-    model || thinking || timeoutSeconds
+    model || thinking || timeoutSeconds || typeof params.fastMode === "boolean"
       ? {
           ...(model ? { model } : {}),
           ...(thinking ? { thinking } : {}),
           ...(timeoutSeconds ? { timeoutSeconds } : {}),
+          ...(typeof params.fastMode === "boolean" ? { fastMode: params.fastMode } : {}),
         }
       : undefined;
   return { ok: true, runtimeOptions };
@@ -1409,6 +1414,7 @@ export async function spawnAcpDirect(
     model: params.model,
     thinking: params.thinking,
     runTimeoutSeconds,
+    fastMode: params.fastMode,
   });
   if (!runtimeOptionsResult.ok) {
     return createAcpSpawnFailure({
diff --git a/src/auto-reply/reply/commands-acp/shared.ts b/src/auto-reply/reply/commands-acp/shared.ts
@@ -475,6 +475,7 @@ export function formatRuntimeOptionsText(options: AcpSessionRuntimeOptions): str
     options.cwd ? `cwd=${options.cwd}` : null,
     options.permissionProfile ? `permissionProfile=${options.permissionProfile}` : null,
     typeof options.timeoutSeconds === "number" ? `timeoutSeconds=${options.timeoutSeconds}` : null,
+    typeof options.fastMode === "boolean" ? `fastMode=${options.fastMode}` : null,
     extras ? `extras={${extras}}` : null,
   ].filter(Boolean) as string[];
   if (parts.length === 0) {
