fix(skill-workshop): extend Codex dynamic-tool timeout for lifecycle approvals

openperf · openperf · commit dac685f9e10e · 2026-06-08T22:15:57.000+08:00
skill_workshop lifecycle approvals (apply/reject/quarantine) require up to 120s plus 10s gateway grace (130s total), but the generic Codex dynamic-tool watchdog fires at 90s. The watchdog fired first with a generic timeout error, leaving the approval pending and the proposal unmodified. Add a 150s per-tool deadline for skill_workshop in readConfiguredDynamicToolTimeoutMs, matching the pattern used for message and image tools. The approval can now complete or expire cleanly before the Codex watchdog fires; non-Codex callers keep the unchanged 120s approval window. Fixes #91266
diff --git a/extensions/codex/src/app-server/dynamic-tool-execution.test.ts b/extensions/codex/src/app-server/dynamic-tool-execution.test.ts
@@ -4,6 +4,7 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import {
   CODEX_DYNAMIC_IMAGE_TOOL_TIMEOUT_MS,
   CODEX_DYNAMIC_MESSAGE_TOOL_TIMEOUT_MS,
+  CODEX_DYNAMIC_SKILL_WORKSHOP_TOOL_TIMEOUT_MS,
   CODEX_DYNAMIC_TOOL_MAX_TIMEOUT_MS,
   CODEX_DYNAMIC_TOOL_TIMEOUT_MS,
   handleDynamicToolCallWithTimeout,
@@ -123,6 +124,24 @@ describe("dynamic tool execution helpers", () => {
     ).toBe(CODEX_DYNAMIC_MESSAGE_TOOL_TIMEOUT_MS);
   });
 
+  it("uses an extended deadline for all skill_workshop calls regardless of action", () => {
+    for (const action of ["apply", "reject", "quarantine", "list", "inspect"]) {
+      expect(
+        resolveDynamicToolCallTimeoutMs({
+          call: {
+            threadId: "thread-1",
+            turnId: "turn-1",
+            callId: `call-skill-workshop-${action}`,
+            namespace: null,
+            tool: "skill_workshop",
+            arguments: { action, proposal_id: "weather-20260530-a1b2c3d4e5" },
+          },
+          config: undefined,
+        }),
+      ).toBe(CODEX_DYNAMIC_SKILL_WORKSHOP_TOOL_TIMEOUT_MS);
+    }
+  });
+
   it("uses media image config and caps excessive dynamic tool timeouts", () => {
     expect(
       resolveDynamicToolCallTimeoutMs({
diff --git a/extensions/codex/src/app-server/dynamic-tool-execution.ts b/extensions/codex/src/app-server/dynamic-tool-execution.ts
@@ -28,6 +28,8 @@ const CODEX_DYNAMIC_IMAGE_GENERATION_TOOL_TIMEOUT_MS = 120_000;
 export const CODEX_DYNAMIC_IMAGE_TOOL_TIMEOUT_MS = 60_000;
 /** Timeout for message-delivery dynamic tool calls. */
 export const CODEX_DYNAMIC_MESSAGE_TOOL_TIMEOUT_MS = 120_000;
+// any skill_workshop action may become a lifecycle call after before_tool_call hooks; approval waits up to 130s.
+export const CODEX_DYNAMIC_SKILL_WORKSHOP_TOOL_TIMEOUT_MS = 150_000;
 const LOG_FIELD_MAX_LENGTH = 160;
 
 type DynamicToolTimeoutDetails = {
@@ -414,6 +416,10 @@ function readConfiguredDynamicToolTimeoutMs(
     return CODEX_DYNAMIC_MESSAGE_TOOL_TIMEOUT_MS;
   }
 
+  if (toolName === "skill_workshop") {
+    return CODEX_DYNAMIC_SKILL_WORKSHOP_TOOL_TIMEOUT_MS;
+  }
+
   return undefined;
 }
 
diff --git a/extensions/codex/src/app-server/side-question.test.ts b/extensions/codex/src/app-server/side-question.test.ts
@@ -1213,6 +1213,22 @@ describe("runCodexAppServerSideQuestion", () => {
     expect(timeoutMs).toBe(90_000);
   });
 
+  it("uses extended 150s for all side-thread skill_workshop calls regardless of action", () => {
+    for (const action of ["apply", "reject", "quarantine", "list", "inspect"]) {
+      const timeoutMs = testing.resolveSideDynamicToolCallTimeoutMs({
+        call: {
+          threadId: "side-thread",
+          turnId: "turn-1",
+          callId: `tool-skill-workshop-${action}`,
+          tool: "skill_workshop",
+          arguments: { action, proposal_id: "weather-20260530-a1b2c3d4e5" },
+        },
+        config: {} as never,
+      });
+      expect(timeoutMs).toBe(150_000);
+    }
+  });
+
   it("cleans up notification handlers when side tool setup fails", async () => {
     const client = createFakeClient();
     createOpenClawCodingToolsMock.mockImplementation(() => {
diff --git a/extensions/codex/src/app-server/side-question.ts b/extensions/codex/src/app-server/side-question.ts
@@ -83,6 +83,8 @@ const CODEX_SIDE_DYNAMIC_TOOL_TIMEOUT_MS = 90_000;
 const CODEX_SIDE_DYNAMIC_TOOL_MAX_TIMEOUT_MS = 600_000;
 const CODEX_SIDE_DYNAMIC_IMAGE_GENERATION_TOOL_TIMEOUT_MS = 120_000;
 const CODEX_SIDE_DYNAMIC_IMAGE_TOOL_TIMEOUT_MS = 60_000;
+// any skill_workshop action may become a lifecycle call after before_tool_call hooks; approval waits up to 130s.
+const CODEX_SIDE_DYNAMIC_SKILL_WORKSHOP_TOOL_TIMEOUT_MS = 150_000;
 const SIDE_QUESTION_COMPLETION_TIMEOUT_MS = 600_000;
 const CODEX_SIDE_NATIVE_HOOK_RELAY_MIN_TTL_MS = 30 * 60_000;
 const CODEX_SIDE_NATIVE_HOOK_RELAY_TTL_GRACE_MS = 5 * 60_000;
@@ -706,6 +708,9 @@ function resolveSideDynamicToolCallTimeoutMs(params: {
     (params.call.tool === "image"
       ? (readSideTimeoutSecondsAsMs(params.config?.tools?.media?.image?.timeoutSeconds) ??
         CODEX_SIDE_DYNAMIC_IMAGE_TOOL_TIMEOUT_MS)
+      : undefined) ??
+    (params.call.tool === "skill_workshop"
+      ? CODEX_SIDE_DYNAMIC_SKILL_WORKSHOP_TOOL_TIMEOUT_MS
       : undefined);
   return clampSideDynamicToolTimeoutMs(configured ?? CODEX_SIDE_DYNAMIC_TOOL_TIMEOUT_MS);
 }
