fix(codex-cli): preserve explicit sandbox selection

Author: reoring

src/worker/adapters/codex-cli-adapter.ts

@@ -57,45 +57,22 @@ function buildCodexMcpOverrides(servers: McpServerConfig[]): string[] {
 }
 
 function normalizeLegacyCodexArgs(args: string[]): string[] {
-  let needsBypass = false;
   const preserved: string[] = [];
 
   for (let i = 0; i < args.length; i++) {
     const arg = args[i]!;
     if (arg === "--dangerously-bypass-approvals-and-sandbox") {
-      needsBypass = true;
+      preserved.push(arg);
       continue;
     }
     if (arg === "--ask-for-approval") {
       const value = args[i + 1];
-      if (value === "never") {
-        needsBypass = true;
-        i++;
-        continue;
-      }
-    }
-    preserved.push(arg);
-  }
-
-  if (!needsBypass) {
-    return preserved;
-  }
-
-  const normalized: string[] = [];
-  for (let i = 0; i < preserved.length; i++) {
-    const arg = preserved[i]!;
-    if (arg === "--full-auto") {
-      continue;
-    }
-    if (arg === "--sandbox") {
-      i++; // drop the sandbox value as well; bypass supersedes sandbox selection
+      if (typeof value === "string") i++;
       continue;
     }
-    normalized.push(arg);
+    preserved.push(arg);
   }
-
-  normalized.push("--dangerously-bypass-approvals-and-sandbox");
-  return normalized;
+  return preserved;
 }
 
 export class CodexCliAdapter extends BaseProcessAdapter {
@@ -163,17 +140,18 @@ export class CodexCliAdapter extends BaseProcessAdapter {
       task.capabilities.includes(WorkerCapability.RUN_COMMANDS) ||
       task.capabilities.includes(WorkerCapability.RUN_TESTS);
     const hasBypass = args.includes("--dangerously-bypass-approvals-and-sandbox");
+    const hasSandbox = args.includes("--sandbox") || args.includes("-s");
+    const hasFullAuto = args.includes("--full-auto");
 
     if (hasBypass) {
       // Current Codex CLI bypass mode already implies no sandbox / no approvals.
     } else if (hasWrite && hasRunCommands) {
       // Low-friction sandboxed auto execution.
-      if (!args.includes("--full-auto")) {
+      if (!hasFullAuto && !hasSandbox) {
         args.push("--full-auto");
       }
     } else {
       // Stay sandboxed and align with capability intent.
-      const hasSandbox = args.includes("--sandbox") || args.includes("-s");
       if (!hasSandbox) {
         args.push("--sandbox", hasWrite ? "workspace-write" : "read-only");
       }

test/unit/worker/codex-cli-adapter.test.ts

@@ -152,7 +152,7 @@ describe("CodexCliAdapter", () => {
       ]);
     });
 
-    test("should include task default args from workflow-resolved profiles", () => {
+    test("should drop unsupported approval flags while preserving explicit sandbox mode", () => {
       const task = createTask({
         capabilities: [WorkerCapability.READ],
         defaultArgs: ["--sandbox", "danger-full-access", "--ask-for-approval", "never"],
@@ -161,7 +161,8 @@ describe("CodexCliAdapter", () => {
       expect(command).toEqual([
         "codex",
         "exec",
-        "--dangerously-bypass-approvals-and-sandbox",
+        "--sandbox",
+        "danger-full-access",
         "--json",
         "--cd",
         "/tmp/test-workspace",
@@ -251,6 +252,30 @@ describe("CodexCliAdapter", () => {
       expect(command).toContain("--full-auto");
     });
 
+    test("should not append full-auto when an explicit sandbox mode is already provided", () => {
+      const task = createTask({
+        capabilities: [
+          WorkerCapability.READ,
+          WorkerCapability.EDIT,
+          WorkerCapability.RUN_COMMANDS,
+        ],
+        defaultArgs: ["--sandbox", "danger-full-access"],
+      });
+      const command = adapter.buildCommand(task);
+
+      expect(command).toEqual([
+        "codex",
+        "exec",
+        "--sandbox",
+        "danger-full-access",
+        "--json",
+        "--cd",
+        "/tmp/test-workspace",
+        "Fix the bug in main.ts",
+      ]);
+      expect(command).not.toContain("--full-auto");
+    });
+
     test("should set auto-edit approval mode for EDIT without RUN_COMMANDS", () => {
       const task = createTask({
         capabilities: [WorkerCapability.READ, WorkerCapability.EDIT],