lazycodex-ai 4.16.1 → 4.16.2

package/packages/omo-codex/plugin/hooks/pre-tool-use-enforcing-unlimited-goal-budget.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/ulw-loop/dist/cli.js\" hook pre-tool-use",
 						"timeout": 5,
-						"statusMessage": "(OmO 4.16.1) Enforcing Unlimited Goal Budget",
+						"statusMessage": "(OmO 4.16.2) Enforcing Unlimited Goal Budget",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\ulw-loop\\dist\\cli.js\" hook pre-tool-use"
 					}
 				],

package/packages/omo-codex/plugin/hooks/pre-tool-use-recommending-git-bash-mcp.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/git-bash/dist/cli.js\" hook pre-tool-use",
 						"timeout": 5,
-						"statusMessage": "(OmO 4.16.1) Recommending Git Bash MCP",
+						"statusMessage": "(OmO 4.16.2) Recommending Git Bash MCP",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\git-bash\\dist\\cli.js\" hook pre-tool-use"
 					}
 				],

package/packages/omo-codex/plugin/hooks/session-start-checking-auto-update.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/scripts/auto-update.mjs\" hook session-start",
 						"timeout": 5,
-						"statusMessage": "(OmO 4.16.1) Checking Auto Update",
+						"statusMessage": "(OmO 4.16.2) Checking Auto Update",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\scripts\\auto-update.mjs\" hook session-start"
 					}
 				],

package/packages/omo-codex/plugin/hooks/session-start-checking-bootstrap-provisioning.json

@@ -8,7 +8,7 @@
 						"command": "node \"${PLUGIN_ROOT}/components/bootstrap/dist/cli.js\" hook session-start",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\bootstrap.ps1\"",
 						"timeout": 30,
-						"statusMessage": "(OmO 4.16.1) Checking Bootstrap Provisioning"
+						"statusMessage": "(OmO 4.16.2) Checking Bootstrap Provisioning"
 					}
 				]
 			}

package/packages/omo-codex/plugin/hooks/session-start-checking-codegraph-bootstrap.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/codegraph/dist/cli.js\" hook session-start",
 						"timeout": 5,
-						"statusMessage": "(OmO 4.16.1) Checking CodeGraph Bootstrap",
+						"statusMessage": "(OmO 4.16.2) Checking CodeGraph Bootstrap",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\codegraph\\dist\\cli.js\" hook session-start"
 					}
 				]

package/packages/omo-codex/plugin/hooks/session-start-loading-project-rules.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/rules/dist/cli.js\" hook session-start",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.16.1) Loading Project Rules",
+						"statusMessage": "(OmO 4.16.2) Loading Project Rules",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\rules\\dist\\cli.js\" hook session-start"
 					}
 				]

package/packages/omo-codex/plugin/hooks/session-start-recording-session-telemetry.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/telemetry/dist/cli.js\" hook session-start",
 						"timeout": 5,
-						"statusMessage": "(OmO 4.16.1) Recording Session Telemetry",
+						"statusMessage": "(OmO 4.16.2) Recording Session Telemetry",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\telemetry\\dist\\cli.js\" hook session-start"
 					}
 				]

package/packages/omo-codex/plugin/hooks/stop-checking-start-work-continuation.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/start-work-continuation/dist/cli.js\" hook stop",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.16.1) Checking Start-Work Continuation",
+						"statusMessage": "(OmO 4.16.2) Checking Start-Work Continuation",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\start-work-continuation\\dist\\cli.js\" hook stop"
 					}
 				]

package/packages/omo-codex/plugin/hooks/subagent-stop-checking-start-work-continuation.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/start-work-continuation/dist/cli.js\" hook subagent-stop",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.16.1) Checking Start-Work Continuation",
+						"statusMessage": "(OmO 4.16.2) Checking Start-Work Continuation",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\start-work-continuation\\dist\\cli.js\" hook subagent-stop"
 					}
 				]

package/packages/omo-codex/plugin/hooks/subagent-stop-verifying-lazycodex-executor-evidence.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/lazycodex-executor-verify/dist/cli.js\" hook subagent-stop",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.16.1) Verifying LazyCodex Executor Evidence",
+						"statusMessage": "(OmO 4.16.2) Verifying LazyCodex Executor Evidence",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\lazycodex-executor-verify\\dist\\cli.js\" hook subagent-stop"
 					}
 				],

package/packages/omo-codex/plugin/hooks/user-prompt-submit-checking-ultrawork-trigger.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/ultrawork/dist/cli.js\" hook user-prompt-submit",
 						"timeout": 5,
-						"statusMessage": "(OmO 4.16.1) Checking Ultrawork Trigger",
+						"statusMessage": "(OmO 4.16.2) Checking Ultrawork Trigger",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\ultrawork\\dist\\cli.js\" hook user-prompt-submit"
 					}
 				]

package/packages/omo-codex/plugin/hooks/user-prompt-submit-checking-ulw-loop-steering.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/ulw-loop/dist/cli.js\" hook user-prompt-submit",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.16.1) Checking Ulw-Loop Steering",
+						"statusMessage": "(OmO 4.16.2) Checking Ulw-Loop Steering",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\ulw-loop\\dist\\cli.js\" hook user-prompt-submit"
 					}
 				]

package/packages/omo-codex/plugin/hooks/user-prompt-submit-loading-project-rules.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/rules/dist/cli.js\" hook user-prompt-submit",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.16.1) Loading Project Rules",
+						"statusMessage": "(OmO 4.16.2) Loading Project Rules",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\rules\\dist\\cli.js\" hook user-prompt-submit"
 					}
 				]

package/packages/omo-codex/plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sisyphuslabs/omo-codex-plugin",
-  "version": "4.16.1",
+  "version": "4.16.2",
   "description": "Aggregate Codex plugin root for OMO components.",
   "type": "module",
   "packageManager": "npm@11.12.1",

package/packages/omo-codex/plugin/scripts/auto-update.mjs

@@ -39,6 +39,44 @@ const DEFAULT_RETRY_INTERVAL_MS = 30 * 60 * 1_000;
 
 export { resolveLazyCodexUpdatePlan };
 
+/**
+ * Read Codex SessionStart stdin JSON and extract the effective session model.
+ * @param {NodeJS.ReadableStream | null | undefined} stdin
+ * @returns {Promise<string | null>}
+ */
+export async function readSessionModelFromStdin(stdin = process.stdin) {
+	if (!stdin || typeof stdin.on !== "function") return null;
+	if (stdin.isTTY) return null;
+
+	const raw = await new Promise((resolve) => {
+		let data = "";
+		let settled = false;
+		const finish = () => {
+			if (settled) return;
+			settled = true;
+			resolve(data);
+		};
+		stdin.setEncoding("utf8");
+		stdin.on("data", (chunk) => {
+			data += chunk;
+		});
+		stdin.once("end", finish);
+		stdin.once("error", finish);
+		// Hooks normally close stdin quickly; avoid hanging migration forever.
+		setTimeout(finish, 250).unref?.();
+	});
+
+	const trimmed = raw.trim();
+	if (!trimmed) return null;
+	try {
+		const payload = JSON.parse(trimmed);
+		if (typeof payload?.model === "string" && payload.model.trim()) return payload.model.trim();
+		return null;
+	} catch {
+		return null;
+	}
+}
+
 export function resolveAutoUpdatePlan({ env = process.env, now = Date.now(), lastCheckedAt, lastAttemptedAt, lastStatus, installFlow } = {}) {
 	if (env.LAZYCODEX_AUTO_UPDATE_DISABLED === "1" || env.OMO_CODEX_AUTO_UPDATE_DISABLED === "1") {
 		return { shouldRun: false, reason: "disabled" };
@@ -126,8 +164,13 @@ export async function runLazyCodexManualUpdate({ env = process.env, dryRun = fal
 	return 0;
 }
 
-export async function runAutoUpdateCheck({ env = process.env, now = Date.now() } = {}) {
-	const migrationNotices = await runConfigMigration({ env });
+export async function runAutoUpdateCheck({
+	env = process.env,
+	now = Date.now(),
+	sessionModel = null,
+	requireSessionModel = false,
+} = {}) {
+	const migrationNotices = await runConfigMigration({ env, sessionModel, requireSessionModel });
 	const statePath = resolveStatePath(env);
 	const notices = [...migrationNotices];
 	const state = await settlePendingNotice({ env, now, statePath, state: await readState(statePath), notices });
@@ -251,11 +294,11 @@ function resolveUpdateContext({ env }) {
 	return { currentVersion, latestVersion, shouldUpdate: plan.shouldUpdate };
 }
 
-async function runConfigMigration({ env }) {
+async function runConfigMigration({ env, sessionModel = null, requireSessionModel = false }) {
 	if (env.LAZYCODEX_CONFIG_MIGRATION_DISABLED === "1" || env.OMO_CODEX_CONFIG_MIGRATION_DISABLED === "1") return [];
 	try {
 		await migrateOmoSotConfig({ env, seed: true });
-		const result = await migrateCodexConfig({ env });
+		const result = await migrateCodexConfig({ env, sessionModel, requireSessionModel });
 		if (result.modeChanged.length === 0) return [];
 		return [
 			"[LazyCodex] Removed unsupported Codex root multi_agent_mode from config.toml. Tell the user LazyCodex cleaned up a stale OMO-managed setting so Codex uses its supported per-turn multiAgentMode API.",
@@ -267,18 +310,22 @@ async function runConfigMigration({ env }) {
 }
 
 if (process.argv[1] !== undefined && import.meta.url === pathToFileURL(process.argv[1]).href) {
-	runAutoUpdateCheck()
-		.then(({ notices }) => {
-			if (notices.length === 0) return;
-			console.log(JSON.stringify({
-				hookSpecificOutput: {
-					hookEventName: "SessionStart",
-					additionalContext: notices.join("\n\n"),
-				},
-			}));
-		})
-		.catch((error) => {
-			console.error(error instanceof Error ? error.message : String(error));
-			process.exit(0);
+	(async () => {
+		const sessionModel = await readSessionModelFromStdin(process.stdin);
+		const { notices } = await runAutoUpdateCheck({
+			sessionModel,
+			// Hook CLI path: only force-disable when SessionStart provided the active model.
+			requireSessionModel: true,
 		});
+		if (notices.length === 0) return;
+		console.log(JSON.stringify({
+			hookSpecificOutput: {
+				hookEventName: "SessionStart",
+				additionalContext: notices.join("\n\n"),
+			},
+		}));
+	})().catch((error) => {
+		console.error(error instanceof Error ? error.message : String(error));
+		process.exit(0);
+	});
 }

package/packages/omo-codex/plugin/scripts/migrate-codex-config/multi-agent-v2-guard.mjs

@@ -1,20 +1,31 @@
 /**
- * Runtime migration: force `[features.multi_agent_v2]` to `enabled = false`.
+ * Runtime migration for `[features.multi_agent_v2]`.
  *
- * Runs on every Codex SessionStart (via auto-update's config migration) so
- * multi-agent V2 stays off regardless of how it was turned on: an
- * installer-forced `enabled = true`, a missing `enabled` key the runtime
- * would resolve per model, or the `[features]` boolean shorthand
- * `multi_agent_v2 = true` (removed here because a boolean key and a
- * `[features.multi_agent_v2]` table for the same name are conflicting TOML).
+ * Historical behavior (openai/codex#26753): force `enabled = false` on every
+ * SessionStart because enabling V2 made every turn 400 with encrypted
+ * spawn_agent parameters on models that were not configured for encrypted
+ * tool use. OpenAI closed that as NOT_PLANNED (V2 under development).
  *
- * Upstream basis: openai/codex#26753 — with the flag on, EVERY turn fails
- * with a 400 ("spawn_agent declares encrypted parameters but is not
- * configured for encrypted tool use by this model"), even on prompts that
- * never touch subagents. OpenAI closed it NOT_PLANNED stating V2 is under
- * development, not recommended, and bug reports are not accepted. Same
- * failure class still being reported (openai/codex#27205).
+ * GPT-5.6 models that declare `multi_agent_version: "v2"` in the Codex model
+ * catalog invert that failure mode: forcing `enabled = false` makes every
+ * turn 400 with a reserved `collaboration.spawn_agent` schema mismatch
+ * (lazycodex#118 / oh-my-openagent#6002 / openai/codex#31097), and
+ * `hide_spawn_agent_metadata = false` (written by OMO installers <= 4.15.x)
+ * mismatches the same reserved schema by re-adding agent_type/model
+ * properties to spawn_agent. For those models this guard clears the managed
+ * disable and the stale metadata override, leaving V2 unset so Codex can
+ * follow model metadata.
+ *
+ * When the selected model is unknown or declares V1, keep the #26753
+ * force-disable path.
+ *
+ * Opt out of the whole migration with LAZYCODEX_CONFIG_MIGRATION_DISABLED=1
+ * (or OMO_CODEX_CONFIG_MIGRATION_DISABLED=1).
  */
+import { readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+
 const MANAGED_COMMENT_MARKER = "openai/codex#26753";
 const MANAGED_DISABLE_COMMENT = [
 	"# Managed by LazyCodex: multi_agent_v2 is re-disabled on every Codex session start",
@@ -23,26 +34,157 @@ const MANAGED_DISABLE_COMMENT = [
 	"",
 ].join("\n");
 
-export function forceDisableMultiAgentV2(config) {
-	let result = removeFeaturesShorthand(config);
+/**
+ * @param {string} config
+ * @param {{
+ *   multiAgentVersion?: string | null,
+ *   sessionModel?: string | null,
+ *   requireSessionModel?: boolean,
+ *   env?: NodeJS.ProcessEnv,
+ *   modelsCachePath?: string,
+ * }} [options]
+ */
+export function forceDisableMultiAgentV2(config, options = {}) {
+	// Always normalize the legacy `[features]` boolean shorthand first: leaving
+	// `multi_agent_v2 = true|false` in place while a later guard appends the
+	// `[features.multi_agent_v2]` table would define the same name as both a
+	// scalar and a table, which Codex rejects as invalid TOML.
+	const normalized = removeFeaturesShorthand(config);
+	const sessionModel = normalizeModel(options.sessionModel);
+	const multiAgentVersion =
+		options.multiAgentVersion !== undefined
+			? options.multiAgentVersion
+			: resolveMultiAgentVersionFromConfig(normalized, options);
+
+	if (prefersMultiAgentV2(multiAgentVersion, sessionModel)) {
+		return clearMultiAgentV2DisableForReservedSchema(normalized);
+	}
+
+	// SessionStart can run with an override model (`codex -m gpt-5.6-terra`) while
+	// config.toml still lists a different default. If we cannot see the effective
+	// session model, do not force-disable — writing enabled=false would break a
+	// GPT-5.6 reserved collaboration.spawn_agent session.
+	if (options.requireSessionModel === true && !sessionModel) {
+		return normalized;
+	}
+
+	// Unknown catalog entry for an explicit session model: skip force-disable
+	// rather than assume the legacy encrypted-V2 failure mode.
+	if (sessionModel && multiAgentVersion == null) {
+		return normalized;
+	}
+
+	return forceDisableLegacyEncryptedV2(normalized);
+}
+
+/**
+ * True when the effective model should run MultiAgentV2: the catalog says
+ * "v2", or the catalog is unavailable but the model is a GPT-5.6 family
+ * model (which reserves the collaboration.spawn_agent schema).
+ * @param {"v1" | "v2" | null | undefined} multiAgentVersion
+ * @param {string | null | undefined} sessionModel
+ */
+export function prefersMultiAgentV2(multiAgentVersion, sessionModel) {
+	return multiAgentVersion === "v2" || (multiAgentVersion == null && isGpt56Family(normalizeModel(sessionModel)));
+}
+
+/**
+ * Resolve the effective model against Codex `models_cache.json`.
+ * Prefers SessionStart `model` over the root `model` in config.toml.
+ * @param {string} config
+ * @param {{ sessionModel?: string | null, env?: NodeJS.ProcessEnv, modelsCachePath?: string }} [options]
+ * @returns {"v1" | "v2" | null}
+ */
+export function resolveMultiAgentVersionFromConfig(config, options = {}) {
+	const model = normalizeModel(options.sessionModel) || readRootModel(config);
+	if (!model) return null;
+	return resolveMultiAgentVersionForModel(model, options);
+}
+
+/**
+ * @param {string} model
+ * @param {{ env?: NodeJS.ProcessEnv, modelsCachePath?: string }} [options]
+ * @returns {"v1" | "v2" | null}
+ */
+export function resolveMultiAgentVersionForModel(model, options = {}) {
+	const cachePath =
+		options.modelsCachePath?.trim() ||
+		join(options.env?.CODEX_HOME?.trim() || join(homedir(), ".codex"), "models_cache.json");
+
+	try {
+		const cache = JSON.parse(readFileSync(cachePath, "utf8"));
+		const models = Array.isArray(cache?.models) ? cache.models : [];
+		const entry = models.find((item) => item?.slug === model || item?.id === model);
+		const version = entry?.multi_agent_version;
+		if (version === "v1" || version === "v2") return version;
+		return null;
+	} catch {
+		return null;
+	}
+}
+
+export function readRootModel(config) {
+	const double = config.match(/^\s*model\s*=\s*"([^"]+)"/m);
+	if (double) return double[1];
+	const single = config.match(/^\s*model\s*=\s*'([^']+)'/m);
+	return single?.[1] ?? null;
+}
+
+function normalizeModel(value) {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+}
+
+function isGpt56Family(model) {
+	return typeof model === "string" && /^gpt-5\.6\b/i.test(model);
+}
+
+function clearMultiAgentV2DisableForReservedSchema(config) {
+	// `config` arrives shorthand-normalized from forceDisableMultiAgentV2.
+	const result = removeManagedDisableComments(config);
+
 	const section = findSection(result, "[features.multi_agent_v2]");
+	if (!section) return result;
+
+	// Two settings poison the reserved collaboration.spawn_agent schema on V2
+	// models (verified against codex-cli 0.144.1 + gpt-5.6-sol):
+	// - `enabled = false` forces the legacy V1 tool surface on some Codex
+	//   versions (#6002's failure shape);
+	// - `hide_spawn_agent_metadata = false` (written by OMO installers
+	//   <= 4.15.x to expose agent_type) re-adds agent_type/model/... to
+	//   spawn_agent, mismatching the reserved schema -> HTTP 400 every turn.
+	// Remove both; `hide_spawn_agent_metadata = true` matches the Codex
+	// default and is left alone.
+	const cleared = section.text
+		.replace(/^\s*enabled\s*=\s*false[ \t]*(?:#[^\n]*)?\n?/gm, "")
+		.replace(/^\s*hide_spawn_agent_metadata\s*=\s*false[ \t]*(?:#[^\n]*)?\n?/gm, "");
+	if (cleared === section.text) return result;
+	return result.slice(0, section.start) + cleared + result.slice(section.end);
+}
+
+// `config` arrives shorthand-normalized from forceDisableMultiAgentV2.
+function forceDisableLegacyEncryptedV2(config) {
+	const section = findSection(config, "[features.multi_agent_v2]");
 
 	if (!section) {
-		return ensureManagedComment(appendDisabledSection(result));
+		return ensureManagedComment(appendDisabledSection(config));
 	}
 
 	const enabledTruePattern = /^(\s*)enabled\s*=\s*true[ \t]*(#[^\n]*)?$/m;
 	if (enabledTruePattern.test(section.text)) {
-		const patched = section.text.replace(enabledTruePattern, (_match, indent, comment) => comment ? `${indent}enabled = false ${comment}` : `${indent}enabled = false`);
-		return ensureManagedComment(result.slice(0, section.start) + patched + result.slice(section.end));
+		const patched = section.text.replace(enabledTruePattern, (_match, indent, comment) =>
+			comment ? `${indent}enabled = false ${comment}` : `${indent}enabled = false`,
+		);
+		return ensureManagedComment(config.slice(0, section.start) + patched + config.slice(section.end));
 	}
 
-	if (/^\s*enabled\s*=\s*false[ \t]*(?:#[^\n]*)?$/m.test(section.text)) return result;
+	if (/^\s*enabled\s*=\s*false[ \t]*(?:#[^\n]*)?$/m.test(section.text)) return config;
 
 	const headerEnd = section.text.indexOf("\n");
 	const insertAt = headerEnd === -1 ? section.text.length : headerEnd + 1;
 	const patched = `${section.text.slice(0, insertAt)}${headerEnd === -1 ? "\n" : ""}enabled = false\n${section.text.slice(insertAt)}`;
-	return ensureManagedComment(result.slice(0, section.start) + patched + result.slice(section.end));
+	return ensureManagedComment(config.slice(0, section.start) + patched + config.slice(section.end));
 }
 
 function ensureManagedComment(config) {
@@ -52,6 +194,30 @@ function ensureManagedComment(config) {
 	return config.slice(0, section.start) + MANAGED_DISABLE_COMMENT + config.slice(section.start);
 }
 
+function removeManagedDisableComments(config) {
+	if (!config.includes(MANAGED_COMMENT_MARKER) && !config.includes("Managed by LazyCodex: multi_agent_v2")) {
+		return config;
+	}
+
+	const lines = config.split("\n");
+	const kept = [];
+	for (const line of lines) {
+		const trimmed = line.trim();
+		if (
+			trimmed.startsWith("#") &&
+			(trimmed.includes(MANAGED_COMMENT_MARKER) ||
+				trimmed.includes("Managed by LazyCodex: multi_agent_v2") ||
+				trimmed.includes("because enabling it fails every turn with HTTP 400") ||
+				trimmed.includes("LAZYCODEX_CONFIG_MIGRATION_DISABLED=1") ||
+				trimmed.includes("OMO_CODEX_CONFIG_MIGRATION_DISABLED=1"))
+		) {
+			continue;
+		}
+		kept.push(line);
+	}
+	return kept.join("\n").replace(/\n{3,}/g, "\n\n");
+}
+
 function removeFeaturesShorthand(config) {
 	const section = findSection(config, "[features]");
 	if (!section) return config;

package/packages/omo-codex/plugin/scripts/migrate-codex-config/subagent-limit-guard.mjs

@@ -1,9 +1,39 @@
+import { prefersMultiAgentV2, resolveMultiAgentVersionFromConfig } from "./multi-agent-v2-guard.mjs";
+
 const CODEX_AGENTS_HEADER = "[agents]";
 const CODEX_MULTI_AGENT_V2_HEADER = "[features.multi_agent_v2]";
 const CODEX_SUBAGENT_THREAD_LIMIT = "1000";
 
-export function ensureSubagentConcurrencyLimit(config) {
-	return ensureMultiAgentV2ThreadLimit(ensureAgentsMaxThreads(config));
+/**
+ * Ensure subagent concurrency limits without writing settings that conflict
+ * with MultiAgentV2. When the selected model prefers V2 (catalog `v2`, or a
+ * GPT-5.6 family session model with the catalog unavailable) or V2 is already
+ * enabled in config, skip `agents.max_threads` because Codex rejects that key
+ * while features.multi_agent_v2 is enabled.
+ *
+ * @param {string} config
+ * @param {{ multiAgentVersion?: string | null, sessionModel?: string | null, env?: NodeJS.ProcessEnv, modelsCachePath?: string }} [options]
+ */
+export function ensureSubagentConcurrencyLimit(config, options = {}) {
+	const multiAgentVersion =
+		options.multiAgentVersion !== undefined
+			? options.multiAgentVersion
+			: resolveMultiAgentVersionFromConfig(config, options);
+	const v2Preferred = prefersMultiAgentV2(multiAgentVersion, options.sessionModel) || isMultiAgentV2Enabled(config);
+
+	let result = config;
+	if (!v2Preferred) {
+		result = ensureAgentsMaxThreads(result);
+	} else {
+		result = removeAgentsMaxThreads(result);
+	}
+	return ensureMultiAgentV2ThreadLimit(result);
+}
+
+function isMultiAgentV2Enabled(config) {
+	const section = findSection(config, CODEX_MULTI_AGENT_V2_HEADER);
+	if (!section) return false;
+	return /^\s*enabled\s*=\s*true[ \t]*(?:#[^\n]*)?$/m.test(section.text);
 }
 
 function ensureAgentsMaxThreads(config) {
@@ -12,6 +42,22 @@ function ensureAgentsMaxThreads(config) {
 	return replaceOrInsertSetting(config, section, "max_threads", CODEX_SUBAGENT_THREAD_LIMIT);
 }
 
+function removeAgentsMaxThreads(config) {
+	const section = findSection(config, CODEX_AGENTS_HEADER);
+	if (!section) return config;
+	if (!/^\s*max_threads\s*=/m.test(section.text)) return config;
+
+	const patched = section.text.replace(/^\s*max_threads\s*=\s*[^\n]*\n?/m, "");
+	const bodyLines = patched
+		.split("\n")
+		.slice(1)
+		.filter((line) => line.trim() !== "");
+	if (bodyLines.length === 0) {
+		return config.slice(0, section.start) + config.slice(section.end).replace(/^\n+/, "");
+	}
+	return config.slice(0, section.start) + patched + config.slice(section.end);
+}
+
 function ensureMultiAgentV2ThreadLimit(config) {
 	const section = findSection(config, CODEX_MULTI_AGENT_V2_HEADER);
 	if (!section) {
@@ -26,7 +72,9 @@ function ensureMultiAgentV2ThreadLimit(config) {
 function replaceOrInsertSetting(config, section, key, value) {
 	const pattern = new RegExp(`^(\\s*)${escapeRegExp(key)}\\s*=\\s*[^\\n#]*(#[^\\n]*)?$`, "m");
 	if (pattern.test(section.text)) {
-		const patched = section.text.replace(pattern, (_match, indent, comment) => comment ? `${indent}${key} = ${value} ${comment}` : `${indent}${key} = ${value}`);
+		const patched = section.text.replace(pattern, (_match, indent, comment) =>
+			comment ? `${indent}${key} = ${value} ${comment}` : `${indent}${key} = ${value}`,
+		);
 		return config.slice(0, section.start) + patched + config.slice(section.end);
 	}
 

package/packages/omo-codex/plugin/scripts/migrate-codex-config.mjs

@@ -8,7 +8,10 @@ import { FALLBACK_CATALOG, readModelCatalog } from "./migrate-codex-config/catal
 import { configPaths } from "./migrate-codex-config/config-paths.mjs";
 import { removeStaleContext7PlaceholderMcpServer } from "./migrate-codex-config/context7-placeholder-guard.mjs";
 import { removeUnsupportedRootMultiAgentMode } from "./migrate-codex-config/multi-agent-mode-guard.mjs";
-import { forceDisableMultiAgentV2 } from "./migrate-codex-config/multi-agent-v2-guard.mjs";
+import {
+	forceDisableMultiAgentV2,
+	resolveMultiAgentVersionFromConfig,
+} from "./migrate-codex-config/multi-agent-v2-guard.mjs";
 import { ensureCodexReasoningConfig as applyReasoningProfile, readRootSettings } from "./migrate-codex-config/root-settings.mjs";
 import { readState, resolveStatePath, writeState } from "./migrate-codex-config/state.mjs";
 import { ensureSubagentConcurrencyLimit } from "./migrate-codex-config/subagent-limit-guard.mjs";
@@ -19,7 +22,12 @@ export function ensureCodexReasoningConfig(config, profile = FALLBACK_CATALOG.cu
 	return applyReasoningProfile(config, profile);
 }
 
-export async function migrateCodexConfig({ env = process.env, cwd = process.cwd() } = {}) {
+export async function migrateCodexConfig({
+	env = process.env,
+	cwd = process.cwd(),
+	sessionModel = null,
+	requireSessionModel = false,
+} = {}) {
 	const catalog = await readModelCatalog(env);
 	const statePath = resolveStatePath(env);
 	const state = await readState(statePath);
@@ -31,6 +39,9 @@ export async function migrateCodexConfig({ env = process.env, cwd = process.cwd(
 		const result = await migrateConfigFile(configPath, {
 			catalog,
 			previousState: state.files?.[configPath],
+			env,
+			sessionModel,
+			requireSessionModel,
 		});
 		if (result.changed) changed.push(configPath);
 		if (result.multiAgentModeChanged) modeChanged.push(configPath);
@@ -44,7 +55,16 @@ export async function migrateCodexConfig({ env = process.env, cwd = process.cwd(
 	return { changed, modeChanged };
 }
 
-export async function migrateConfigFile(configPath, { catalog = FALLBACK_CATALOG, previousState } = {}) {
+export async function migrateConfigFile(
+	configPath,
+	{
+		catalog = FALLBACK_CATALOG,
+		previousState,
+		env = process.env,
+		sessionModel = null,
+		requireSessionModel = false,
+	} = {},
+) {
 	const before = await readConfig(configPath);
 	const decision = shouldApplyCatalog(before, catalog, previousState);
 
@@ -56,7 +76,12 @@ export async function migrateConfigFile(configPath, { catalog = FALLBACK_CATALOG
 		reasoningApplied = config !== before;
 	}
 
-	const afterMultiAgentGuard = forceDisableMultiAgentV2(config);
+	const multiAgentOptions = { env, sessionModel, requireSessionModel };
+	const multiAgentVersion = resolveMultiAgentVersionFromConfig(config, multiAgentOptions);
+	const afterMultiAgentGuard = forceDisableMultiAgentV2(config, {
+		...multiAgentOptions,
+		multiAgentVersion,
+	});
 	const multiAgentChanged = afterMultiAgentGuard !== config;
 	if (multiAgentChanged) config = afterMultiAgentGuard;
 
@@ -68,7 +93,10 @@ export async function migrateConfigFile(configPath, { catalog = FALLBACK_CATALOG
 	const context7PlaceholderChanged = afterContext7PlaceholderGuard !== config;
 	if (context7PlaceholderChanged) config = afterContext7PlaceholderGuard;
 
-	const afterSubagentLimit = ensureSubagentConcurrencyLimit(config);
+	const afterSubagentLimit = ensureSubagentConcurrencyLimit(config, {
+		...multiAgentOptions,
+		multiAgentVersion,
+	});
 	const subagentLimitChanged = afterSubagentLimit !== config;
 	if (subagentLimitChanged) config = afterSubagentLimit;