From 7c9050ba9f91a8db5f83c53dd423f65d41cfe61b Mon Sep 17 00:00:00 2001
From: Eyejoker <phj1081@gmail.com>
Date: Wed, 1 Apr 2026 05:18:10 +0900
Subject: [PATCH] fix: only inject matching model env vars for container agent
 type

When codex runs in container, skip CLAUDE_MODEL/EFFORT to prevent
'claude-opus-4-6 not supported with ChatGPT account' errors.
---
 src/container-runner.ts | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/container-runner.ts b/src/container-runner.ts
index 5884e68..d0ae9a5 100644
--- a/src/container-runner.ts
+++ b/src/container-runner.ts
@@ -322,7 +322,8 @@ export function buildReviewerMounts(
   });
 
   // Codex OAuth: mount host's ~/.codex (read-only) so codex-runner can authenticate
-  const hostCodexHome = process.env.CODEX_HOME || path.join(os.homedir(), '.codex');
+  const hostCodexHome =
+    process.env.CODEX_HOME || path.join(os.homedir(), '.codex');
   if (fs.existsSync(hostCodexHome)) {
     mounts.push({
       hostPath: hostCodexHome,
@@ -479,14 +480,11 @@ export async function runReviewerContainer(args: {
       '';
     execArgs.push('-e', `CLAUDE_CODE_OAUTH_TOKEN=${oauthToken}`);
   }
-  // Inject model/effort overrides at exec-time so per-role config
-  // takes effect even with persistent containers.
-  const modelEnvKeys = [
-    'CLAUDE_MODEL',
-    'CLAUDE_EFFORT',
-    'CODEX_MODEL',
-    'CODEX_EFFORT',
-  ];
+  const isCodexAgent = (group.agentType || 'claude-code') === 'codex';
+  // Inject model/effort overrides matching the active agent type.
+  const modelEnvKeys = isCodexAgent
+    ? ['CODEX_MODEL', 'CODEX_EFFORT']
+    : ['CLAUDE_MODEL', 'CLAUDE_EFFORT', 'CODEX_MODEL', 'CODEX_EFFORT'];
   if (envOverrides) {
     for (const key of modelEnvKeys) {
       if (envOverrides[key]) {
@@ -494,7 +492,6 @@ export async function runReviewerContainer(args: {
       }
     }
   }
-  const isCodexAgent = (group.agentType || 'claude-code') === 'codex';
   if (isCodexAgent) {
     execArgs.push('-e', 'CODEX_HOME=/home/node/.codex');
   }