oh-my-opencode 5.0.0-beta.8 → 5.0.0-beta.80

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

@@ -54,8 +54,8 @@ test("#given stale root reasoning config #when ensuring config #then replaces st
 	assert.equal(result.match(/^model_context_window\s*=/gm)?.length, 1);
 	assert.equal(result.match(/^model_reasoning_effort\s*=/gm)?.length, 1);
 	assert.equal(result.match(/^plan_mode_reasoning_effort\s*=/gm)?.length, 1);
-	assert.match(result, /model = "gpt-5\.6-sol"/);
-	assert.match(result, /model_context_window = 372000/);
+	assert.match(result, /model = "gpt-6-astra"/);
+	assert.match(result, /model_context_window = 600000/);
 	assert.match(result, /model_reasoning_effort = "high"/);
 	assert.match(result, /plan_mode_reasoning_effort = "xhigh"/);
 	assert.doesNotMatch(result, /gpt-5\.2/);
@@ -79,8 +79,8 @@ test("#given section settings reuse managed root keys #when ensuring config #the
 		].join("\n"),
 	);
 
-	assert.match(result, /^model = "gpt-5\.6-sol"$/m);
-	assert.match(result, /^model_context_window = 372000$/m);
+	assert.match(result, /^model = "gpt-6-astra"$/m);
+	assert.match(result, /^model_context_window = 600000$/m);
 	assert.match(result, /\[model_providers\.openai\]\nmodel = "provider-scoped-value"\nmodel_context_window = 123456/);
 	assert.match(result, /\[profiles\.review\]\nmodel_reasoning_effort = "medium"\nplan_mode_reasoning_effort = "medium"/);
 });
@@ -161,8 +161,8 @@ test("#given global and project-local stale Codex configs #when migrating #then
 	});
 
 	assert.deepEqual(result.changed.sort(), [join(codexHome, "config.toml"), projectConfig].sort());
-	assert.match(await readFile(join(codexHome, "config.toml"), "utf8"), /model = "gpt-5\.6-sol"/);
-	assert.match(await readFile(projectConfig, "utf8"), /model_context_window = 372000/);
+	assert.match(await readFile(join(codexHome, "config.toml"), "utf8"), /model = "gpt-6-astra"/);
+	assert.match(await readFile(projectConfig, "utf8"), /model_context_window = 600000/);
 });
 
 test("#given model catalog is unavailable and stale 272k config #when migrating #then fallback catalog still upgrades it", async () => {
@@ -183,8 +183,8 @@ test("#given model catalog is unavailable and stale 272k config #when migrating
 
 	const content = await readFile(join(codexHome, "config.toml"), "utf8");
 	assert.deepEqual(result.changed, [join(codexHome, "config.toml")]);
-	assert.match(content, /model = "gpt-5\.6-sol"/);
-	assert.match(content, /model_context_window = 372000/);
+	assert.match(content, /model = "gpt-6-astra"/);
+	assert.match(content, /model_context_window = 600000/);
 });
 
 test("#given model catalog is malformed and stale config #when migrating #then fallback catalog still upgrades it", async () => {
@@ -206,8 +206,8 @@ test("#given model catalog is malformed and stale config #when migrating #then f
 
 	const content = await readFile(join(codexHome, "config.toml"), "utf8");
 	assert.deepEqual(result.changed, [join(codexHome, "config.toml")]);
-	assert.match(content, /model = "gpt-5\.6-sol"/);
-	assert.match(content, /model_context_window = 372000/);
+	assert.match(content, /model = "gpt-6-astra"/);
+	assert.match(content, /model_context_window = 600000/);
 });
 
 test("#given user-customized Codex model config #when migrating #then user values are preserved without root multi-agent mode", async () => {
@@ -234,16 +234,16 @@ test("#given user-customized Codex model config #when migrating #then user value
 	});
 
 	const content = await readFile(join(codexHome, "config.toml"), "utf8");
-	assert.deepEqual(result.changed, [join(codexHome, "config.toml")]);
+	assert.deepEqual(result.changed, []);
 	assert.deepEqual(result.modeChanged, []);
 	assert.match(content, /model = "gpt-5\.4"/);
 	assert.match(content, /model_context_window = 123456/);
 	assert.match(content, /model_reasoning_effort = "medium"/);
 	assert.match(content, /plan_mode_reasoning_effort = "medium"/);
 	assert.doesNotMatch(content, /^\s*multi_agent_mode\s*=/m);
-	assert.match(content, /\[agents\][\s\S]*?max_threads = 1000/);
+	assert.doesNotMatch(content, /^\s*max_threads\s*=/m);
 	assert.match(content, /\[features\.multi_agent_v2\][\s\S]*?enabled = false/);
-	assert.match(content, /max_concurrent_threads_per_session = 16/);
+	assert.doesNotMatch(content, /max_concurrent_threads_per_session\s*=/);
 });
 
 test("#given managed config state is malformed #when migrating #then migration ignores stale state safely", async () => {
@@ -262,7 +262,7 @@ test("#given managed config state is malformed #when migrating #then migration i
 	const content = await readFile(join(codexHome, "config.toml"), "utf8");
 	const state = JSON.parse(await readFile(statePath, "utf8"));
 	assert.deepEqual(result.changed, [join(codexHome, "config.toml")]);
-	assert.match(content, /model_context_window = 372000/);
+	assert.match(content, /model_context_window = 600000/);
 	assert.equal(state.files[join(codexHome, "config.toml")].managed, true);
 });
 
@@ -404,8 +404,8 @@ test("#given config already matches current catalog #when catalog version advanc
 	assert.equal(state.files[configPath].catalogVersion, "test.role-only");
 	const content = await readFile(configPath, "utf8");
 	assert.doesNotMatch(content, /^\s*multi_agent_mode\s*=/m);
-	assert.match(content, /\[agents\][\s\S]*?max_threads = 1000/);
-	assert.match(content, /max_concurrent_threads_per_session = 16/);
+	assert.doesNotMatch(content, /^\s*max_threads\s*=/m);
+	assert.doesNotMatch(content, /max_concurrent_threads_per_session\s*=/);
 });
 
 test("#given stale Context7 placeholder MCP config #when migrating #then removes it and keeps plugin policy", async () => {
@@ -642,8 +642,8 @@ test("#given global config without multi_agent_v2 section #when full migration r
 	assert.deepEqual(result.modeChanged, []);
 	const content = await readFile(configPath, "utf8");
 	assert.match(content, /\[features\.multi_agent_v2\][\s\S]*?enabled = false/);
-	assert.match(content, /max_concurrent_threads_per_session = 16/);
-	assert.match(content, /\[agents\][\s\S]*?max_threads = 1000/);
+	assert.doesNotMatch(content, /max_concurrent_threads_per_session\s*=/);
+	assert.doesNotMatch(content, /^\s*max_threads\s*=/m);
 	assert.doesNotMatch(content, /^\s*multi_agent_mode\s*=/m);
 });
 
@@ -670,15 +670,15 @@ test("#given global config starts with inline-comment features table #when full
 	const content = await readFile(configPath, "utf8");
 	const parsed = parseTomlWithPython(content);
 	assert.equal("multi_agent_mode" in parsed, false);
-	assert.equal(parsed.model, "gpt-5.6-sol");
-	assert.equal(parsed.model_context_window, 372000);
+	assert.equal(parsed.model, "gpt-6-astra");
+	assert.equal(parsed.model_context_window, 600000);
 	assert.equal(parsed.model_reasoning_effort, "high");
 	assert.equal(parsed.plan_mode_reasoning_effort, "xhigh");
 	assert.equal(parsed.features.plugins, true);
 	assert.equal("multi_agent_mode" in parsed.features, false);
 	assert.equal("model" in parsed.features, false);
 	assert.equal("model_context_window" in parsed.features, false);
-	assert.match(content, /^model = "gpt-5\.6-sol"\nmodel_context_window = 372000/m);
+	assert.match(content, /^model = "gpt-6-astra"\nmodel_context_window = 600000/m);
 	assert.doesNotMatch(content, /^\s*multi_agent_mode\s*=/m);
 	assert.match(content, /\[features\] # keep comment\nplugins = true/);
 });
@@ -750,7 +750,7 @@ test("#given global config with forced multi_agent_v2 #when full migration runs
 	assert.match(content, /enabled = false/);
 	assert.doesNotMatch(content, /enabled = true/);
 	assert.match(content, /max_concurrent_threads_per_session = 10000/);
-	assert.match(content, /\[agents\][\s\S]*?max_threads = 1000/);
+	assert.doesNotMatch(content, /^\s*max_threads\s*=/m);
 });
 
 test("#given enabled = true with an inline comment #when forcing disable #then flips to false and preserves the comment", () => {
@@ -832,7 +832,7 @@ test("#given gpt-5.6-terra with managed disable #when model catalog prefers v2 #
 		"",
 		"[features.multi_agent_v2]",
 		"enabled = false",
-		"max_concurrent_threads_per_session = 1000",
+		"max_concurrent_threads_per_session = 7",
 		"",
 	].join("\n");
 
@@ -842,7 +842,7 @@ test("#given gpt-5.6-terra with managed disable #when model catalog prefers v2 #
 	assert.doesNotMatch(result, /openai\/codex#26753/);
 	assert.doesNotMatch(result, /Managed by LazyCodex: multi_agent_v2/);
 	assert.match(result, /\[features\.multi_agent_v2\]/);
-	assert.match(result, /max_concurrent_threads_per_session = 1000/);
+	assert.match(result, /max_concurrent_threads_per_session = 7/);
 });
 
 test("#given gpt-5.6 v2 model with hide_spawn_agent_metadata=false #when clearing #then removes the stale metadata override", () => {
@@ -852,7 +852,7 @@ test("#given gpt-5.6 v2 model with hide_spawn_agent_metadata=false #when clearin
 		"[features.multi_agent_v2]",
 		"enabled = false",
 		"hide_spawn_agent_metadata = false",
-		"max_concurrent_threads_per_session = 1000",
+		"max_concurrent_threads_per_session = 7",
 		"",
 	].join("\n");
 
@@ -860,7 +860,7 @@ test("#given gpt-5.6 v2 model with hide_spawn_agent_metadata=false #when clearin
 
 	assert.doesNotMatch(result, /^\s*enabled\s*=\s*false/m);
 	assert.doesNotMatch(result, /^\s*hide_spawn_agent_metadata\s*=/m);
-	assert.match(result, /max_concurrent_threads_per_session = 1000/);
+	assert.match(result, /max_concurrent_threads_per_session = 7/);
 });
 
 test("#given gpt-5.6 v2 model with hide_spawn_agent_metadata=true #when clearing #then leaves the default-matching value alone", () => {
@@ -948,7 +948,7 @@ test("#given gpt-5.6-terra managed disable #when full migration sees models_cach
 	assert.doesNotMatch(content, /openai\/codex#26753/);
 	assert.doesNotMatch(content, /^\s*max_threads\s*=/m);
 	assert.match(content, /max_depth = 2/);
-	assert.match(content, /max_concurrent_threads_per_session = 1000/);
+	assert.doesNotMatch(content, /max_concurrent_threads_per_session\s*=/);
 });
 
 test("#given config default gpt-5.5 #when SessionStart model is gpt-5.6-terra #then prefers session model and clears disable", () => {
@@ -957,7 +957,7 @@ test("#given config default gpt-5.5 #when SessionStart model is gpt-5.6-terra #t
 		"",
 		"[features.multi_agent_v2]",
 		"enabled = false",
-		"max_concurrent_threads_per_session = 1000",
+		"max_concurrent_threads_per_session = 7",
 		"",
 	].join("\n");
 
@@ -967,7 +967,7 @@ test("#given config default gpt-5.5 #when SessionStart model is gpt-5.6-terra #t
 	});
 
 	assert.doesNotMatch(result, /^\s*enabled\s*=\s*false/m);
-	assert.match(result, /max_concurrent_threads_per_session = 1000/);
+	assert.match(result, /max_concurrent_threads_per_session = 7/);
 });
 
 test("#given SessionStart without model #when requireSessionModel is set #then skips legacy force-disable", () => {
@@ -1030,8 +1030,8 @@ test("#given legacy shorthand and no session model on hook path #when full migra
 	const parsed = parseTomlWithPython(content);
 	assert.doesNotMatch(content, /^\s*multi_agent_v2\s*=\s*(?:true|false)/m);
 	assert.equal(parsed.features.plugins, true);
-	assert.equal(parsed.features.multi_agent_v2.max_concurrent_threads_per_session, 16);
-	assert.equal("enabled" in parsed.features.multi_agent_v2, false);
+	assert.equal(parsed.features.multi_agent_v2?.max_concurrent_threads_per_session, undefined);
+	assert.equal(parsed.features.multi_agent_v2?.enabled, undefined);
 });
 
 test("#given SoT migration failure #when hook migration runs #then config.toml repair still happens", async () => {
@@ -1110,7 +1110,7 @@ test("#given config default gpt-5.5 #when full migration gets SessionStart gpt-5
 	const content = await readFile(configPath, "utf8");
 	assert.doesNotMatch(content, /^\s*enabled\s*=\s*false/m);
 	assert.doesNotMatch(content, /^\s*max_threads\s*=/m);
-	assert.match(content, /max_concurrent_threads_per_session = 1000/);
+	assert.doesNotMatch(content, /max_concurrent_threads_per_session\s*=/);
 });
 
 test("#given no session model and no root model #when forcing disable #then leaves the enable state untouched", () => {
@@ -1151,7 +1151,7 @@ test("#given user-modified config without root model #when full non-hook migrati
 	assert.doesNotMatch(content, /^\s*enabled\s*=\s*false/m);
 	assert.doesNotMatch(content, /openai\/codex#26753/);
 	assert.doesNotMatch(content, /^\s*max_threads\s*=/m);
-	assert.match(content, /max_concurrent_threads_per_session = 16/);
+	assert.doesNotMatch(content, /max_concurrent_threads_per_session\s*=/);
 });
 
 async function canCreateSymlink(type) {
@@ -1211,8 +1211,8 @@ test("#given model_catalog_json declares a v2 model as v1 #when full migration r
 
 	const content = await readFile(configPath, "utf8");
 	assert.match(content, /enabled = false/, "explicit v1 catalog must keep the managed disable");
-	assert.match(content, /max_threads = 1000/, "explicit v1 catalog must keep agents.max_threads");
-	assert.match(content, /max_concurrent_threads_per_session = 1000/);
+	assert.doesNotMatch(content, /^\s*max_threads\s*=/m, "managed agents.max_threads must be removed");
+	assert.doesNotMatch(content, /max_concurrent_threads_per_session\s*=/);
 	assert.match(content, /max_depth = 2/);
 });
 

package/packages/omo-codex/plugin/test/multi-agent-v2-regression.test.mjs

@@ -36,7 +36,7 @@ test("#given relative model_catalog_json declares gpt-5.6 model as v1 #when migr
 
 	const content = await readFile(configPath, "utf8");
 	assert.match(content, /enabled = false/);
-	assert.match(content, /max_threads = 1000/);
+	assert.doesNotMatch(content, /^\s*max_threads\s*=/m);
 });
 
 test("#given no SessionStart model and root gpt-5.6 model without catalog #when migrating #then clears stale V2 disable", async () => {

package/packages/omo-codex/plugin/test/scaffold-plan.test.mjs

@@ -8,42 +8,6 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 const root = dirname(dirname(fileURLToPath(import.meta.url)));
 const scriptPath = join(root, "skills", "ulw-plan", "scripts", "scaffold-plan.mjs");
 const scriptUrl = pathToFileURL(scriptPath).href;
-const workflowPath = join(root, "skills", "ulw-plan", "references", "full-workflow.md");
-
-test("#given the scaffold script and the workflow reference #when compared #then every plan header the script emits is documented in full-workflow.md (no drift)", async () => {
-	// given
-	const { PLAN_SECTION_HEADERS } = await import(scriptUrl);
-	const workflow = await readFile(workflowPath, "utf8");
-
-	// then --- the script is the single source of the plan shape; the reference must document the same headers
-	assert.ok(PLAN_SECTION_HEADERS.length >= 6);
-	for (const header of PLAN_SECTION_HEADERS) {
-		assert.ok(workflow.includes(header), `full-workflow.md is missing plan header: ${header}`);
-	}
-});
-
-test("#given buildPlanSkeleton #when intent is unclear #then the human TL;DR leads the plan and surfaces the decisions veto block", async () => {
-	// given
-	const { buildPlanSkeleton, PLAN_SECTION_HEADERS } = await import(scriptUrl);
-	const plan = buildPlanSkeleton("demo", "unclear");
-
-	// then --- the human-readable summary is on top, above the AI detail
-	assert.ok(plan.indexOf("## TL;DR (For humans)") < plan.indexOf("## Scope"));
-	assert.match(plan, /Decisions I made for you/);
-	for (const header of PLAN_SECTION_HEADERS) {
-		assert.ok(plan.includes(header), `plan skeleton missing header: ${header}`);
-	}
-});
-
-test("#given buildPlanSkeleton #when intent is clear #then it surfaces a decisions-to-sanity-check block instead", async () => {
-	// given
-	const { buildPlanSkeleton } = await import(scriptUrl);
-	const plan = buildPlanSkeleton("demo", "clear");
-
-	// then
-	assert.match(plan, /Decisions to sanity-check/);
-	assert.doesNotMatch(plan, /Decisions I made for you/);
-});
 
 test("#given resolveSafeOmoPath #when the target escapes .omo or the workspace #then it is refused (the script never escapes .omo)", async () => {
 	// given

package/packages/omo-codex/plugin/test/subagent-limit-migration.test.mjs

@@ -6,6 +6,60 @@ import { join } from "node:path";
 import test from "node:test";
 
 import { migrateConfigFile } from "../scripts/migrate-codex-config.mjs";
+import { ensureSubagentConcurrencyLimit } from "../scripts/migrate-codex-config/subagent-limit-guard.mjs";
+
+for (const fixture of [
+	{ name: "bare", key: "max_threads", v2Key: "max_concurrent_threads_per_session", before: "", equals: "=" },
+	{ name: "double-quoted", key: '"max_threads"', v2Key: '"max_concurrent_threads_per_session"', before: "", equals: " = " },
+	{ name: "single-quoted", key: "'max_threads'", v2Key: "'max_concurrent_threads_per_session'", before: " \t", equals: "\t=  " },
+	{ name: "escaped-quoted", key: '"max_thread\\u0073"', v2Key: '"max_concurrent_threads_per_sessio\\u006e"', before: "\t ", equals: "  =\t" },
+]) {
+	test(`#given ${fixture.name} thread-cap keys with varied spacing #when migrating #then removes managed values and retains user values`, () => {
+		for (const value of [1000, 16, 6, 8, 10000]) {
+			const config = [
+				"[agents]",
+				`${fixture.before}${fixture.key}${fixture.equals}${value} # cap`,
+				"max_depth = 4",
+				"[agents.explorer]",
+				'config_file = "./agents/explorer.toml"',
+				"[features.multi_agent_v2]",
+				"enabled = false",
+				`${fixture.before}${fixture.v2Key}${fixture.equals}${value} # cap`,
+				"usage_hint_enabled = false",
+				"",
+			].join("\n");
+			const result = ensureSubagentConcurrencyLimit(config, { multiAgentVersion: "v1" });
+			const expected = config
+				.replace(value === 1000 ? `${fixture.before}${fixture.key}${fixture.equals}${value} # cap\n` : "", "")
+				.replace(value === 1000 || value === 16 ? `${fixture.before}${fixture.v2Key}${fixture.equals}${value} # cap\n` : "", "");
+			assert.equal(result, expected);
+			assert.deepEqual(parseTomlWithPython(result), parseTomlWithPython(expected));
+			assert.equal(ensureSubagentConcurrencyLimit(result, { multiAgentVersion: "v1" }), result);
+		}
+	});
+
+	test(`#given V2 and an incompatible ${fixture.name} agents cap #when migrating #then removes only the cap assignment`, () => {
+		for (const value of [1000, 6]) {
+			const config = `[agents]\n${fixture.before}${fixture.key}${fixture.equals}${value}\nmax_depth = 4\n`;
+			const result = ensureSubagentConcurrencyLimit(config, { multiAgentVersion: "v2" });
+			assert.equal(result, "[agents]\nmax_depth = 4\n");
+			assert.deepEqual(parseTomlWithPython(result), { agents: { max_depth: 4 } });
+			assert.equal(ensureSubagentConcurrencyLimit(result, { multiAgentVersion: "v2" }), result);
+		}
+	});
+}
+
+test('#given verify-a4 quoted agents.max_threads=1000 #when SessionStart migrates under V2 #then removes the cap idempotently', async () => {
+	const root = await mkdtemp(join(tmpdir(), "lazycodex-verify-a4-quoted-cap-"));
+	const configPath = join(root, "config.toml");
+	await writeFile(configPath, '[agents]\n"max_threads" = 1000\n');
+	const options = { sessionModel: "gpt-6-astra", env: { CODEX_HOME: root } };
+	assert.equal((await migrateConfigFile(configPath, options)).changed, true);
+	const firstPass = await readFile(configPath, "utf8");
+	assert.deepEqual(parseTomlWithPython(firstPass).agents, {});
+	assert.equal((await migrateConfigFile(configPath, options)).changed, false);
+	assert.equal(await readFile(configPath, "utf8"), firstPass);
+});
 
 function parseTomlWithPython(config) {
 	const python = resolvePython();
@@ -58,18 +112,18 @@ test("#given SessionStart migration sees an inline-commented V2 cap #when migrat
 	const secondResult = await migrateConfigFile(configPath);
 
 	const secondPass = await readFile(configPath, "utf8");
-	assert.equal(firstResult.changed, true);
+	assert.equal(firstResult.changed, false);
 	assert.equal(secondResult.changed, false);
 	assert.equal(secondPass, firstPass);
 	assert.match(
 		secondPass,
 		/usage_hint_enabled = false\nmax_concurrent_threads_per_session = 7 # user cap\nshow_tool_use = false/,
 	);
-	assert.match(secondPass, /\[agents\][\s\S]*?max_threads = 1000/);
+	assert.match(secondPass, /^\s*max_threads\s*=\s*6$/m);
 	assert.match(secondPass, /max_depth = 4/);
 	assert.match(secondPass, /\[agents\.explorer\]\nconfig_file = "\.\/agents\/explorer\.toml"/);
 	assert.match(secondPass, /\[features\.multi_agent_v2\][\s\S]*?enabled = false/);
-	assert.doesNotMatch(secondPass, /^max_threads\s*=\s*6$/m);
+	assert.match(secondPass, /^max_threads\s*=\s*6$/m);
 });
 
 for (const header of [
@@ -164,7 +218,7 @@ for (const fixture of [
 	});
 }
 
-test("#given multiline string contains V2 cap lookalikes #when SessionStart migrates #then writes the absent semantic default", async () => {
+test("#given multiline string contains V2 cap lookalikes #when SessionStart migrates #then leaves the semantic cap absent", async () => {
 	const root = await mkdtemp(join(tmpdir(), "lazycodex-subagent-limit-multiline-lookalike-"));
 	const configPath = join(root, "config.toml");
 	await writeFile(
@@ -184,10 +238,10 @@ test("#given multiline string contains V2 cap lookalikes #when SessionStart migr
 	const parsed = parseTomlWithPython(content);
 
 	assert.match(parsed.notes, /max_concurrent_threads_per_session = 7/);
-	assert.equal(parsed.features.multi_agent_v2.max_concurrent_threads_per_session, 16);
+	assert.equal(parsed.features.multi_agent_v2.max_concurrent_threads_per_session, undefined);
 });
 
-test("#given V2 section multiline value contains a cap lookalike #when SessionStart migrates #then writes the absent default", async () => {
+test("#given V2 section multiline value contains a cap lookalike #when SessionStart migrates #then leaves the cap absent", async () => {
 	const root = await mkdtemp(join(tmpdir(), "lazycodex-subagent-limit-section-multiline-lookalike-"));
 	const configPath = join(root, "config.toml");
 	await writeFile(
@@ -196,7 +250,7 @@ test("#given V2 section multiline value contains a cap lookalike #when SessionSt
 			'model = "gpt-5.4"',
 			"[features.multi_agent_v2]",
 			'notes = """',
-			"max_concurrent_threads_per_session = 7",
+			"max_concurrent_threads_per_session = 16",
 			'"""',
 			"",
 		].join("\n"),
@@ -205,7 +259,8 @@ test("#given V2 section multiline value contains a cap lookalike #when SessionSt
 	await migrateConfigFile(configPath);
 	const parsed = parseTomlWithPython(await readFile(configPath, "utf8"));
 
-	assert.equal(parsed.features.multi_agent_v2.max_concurrent_threads_per_session, 16);
+	assert.equal(parsed.features.multi_agent_v2.max_concurrent_threads_per_session, undefined);
+	assert.equal(parsed.features.multi_agent_v2.notes, "max_concurrent_threads_per_session = 16\n");
 });
 
 test("#given V2 root-dotted disable and cap #when gpt-5.6 SessionStart migrates #then removes disable and V1 agents cap", async () => {
@@ -230,7 +285,7 @@ test("#given V2 root-dotted disable and cap #when gpt-5.6 SessionStart migrates
 
 	assert.equal(parsed.features.multi_agent_v2.max_concurrent_threads_per_session, 7);
 	assert.equal(parsed.features.multi_agent_v2.enabled, undefined);
-	assert.equal(parsed.agents, undefined);
+	assert.equal(parsed.agents?.max_threads, undefined);
 });
 
 test("#given quoted dotted V1 keys under features #when SessionStart migrates #then replaces enabled without a duplicate", async () => {
@@ -312,7 +367,7 @@ test("#given gpt-5.6 session model with no models_cache and an explicit V2 cap #
 	assert.match(content, /max_concurrent_threads_per_session = 6/);
 });
 
-test("#given SessionStart config migration has no V2 cap #when migrating #then writes the conservative managed default", async () => {
+test("#given SessionStart config migration has no V2 cap #when migrating #then leaves the cap unset", async () => {
 	const root = await mkdtemp(join(tmpdir(), "lazycodex-subagent-limit-missing-cap-"));
 	const configPath = join(root, "config.toml");
 	await writeFile(
@@ -329,7 +384,7 @@ test("#given SessionStart config migration has no V2 cap #when migrating #then w
 	await migrateConfigFile(configPath);
 
 	const content = await readFile(configPath, "utf8");
-	assert.match(content, /max_concurrent_threads_per_session = 16/);
+	assert.doesNotMatch(content, /max_concurrent_threads_per_session\s*=/);
 	assert.doesNotMatch(content, /max_concurrent_threads_per_session = 1000/);
 });
 
@@ -346,10 +401,47 @@ test("#given config without any model #when migrating #then does not introduce a
 	const content = await readFile(configPath, "utf8");
 	assert.doesNotMatch(content, /^\s*max_threads\s*=/m);
 	assert.match(content, /max_depth = 4/);
-	assert.match(content, /max_concurrent_threads_per_session = 16/);
+	assert.doesNotMatch(content, /max_concurrent_threads_per_session\s*=/);
+});
+
+test("#given todo 4 cap cases #when migrating #then removes managed caps, preserves user caps, and detects gpt-6 V2", async () => {
+	const cases = [
+		{
+			name: "no limits",
+			config: 'model = "gpt-6-astra"\n',
+			assertResult(content) {
+				assert.doesNotMatch(content, /^\s*max_threads\s*=/m);
+				assert.doesNotMatch(content, /^\s*max_concurrent_threads_per_session\s*=/m);
+			},
+		},
+		{
+			name: "managed limits",
+			config: ['model = "gpt-6-astra"', 'model_reasoning_effort = "medium"', "", "[features.multi_agent_v2]", "max_concurrent_threads_per_session = 1000", "", "[agents]", "max_threads = 1000", ""].join("\n"),
+			assertResult(content) {
+				assert.doesNotMatch(content, /^\s*max_threads\s*=/m);
+				assert.doesNotMatch(content, /^\s*max_concurrent_threads_per_session\s*=/m);
+			},
+		},
+		{
+			name: "user limits",
+			config: ['model = "gpt-6-astra"', 'model_reasoning_effort = "medium"', "", "[features.multi_agent_v2]", "max_concurrent_threads_per_session = 8", "", "[agents]", "max_threads = 6", ""].join("\n"),
+			assertResult(content) {
+				assert.doesNotMatch(content, /^\s*max_threads\s*=/m);
+				assert.match(content, /^\s*max_concurrent_threads_per_session\s*=\s*8/m);
+			},
+		},
+	];
+
+	for (const fixture of cases) {
+		const root = await mkdtemp(join(tmpdir(), `lazycodex-subagent-limit-todo4-${fixture.name}-`));
+		const configPath = join(root, "config.toml");
+		await writeFile(configPath, fixture.config);
+		await migrateConfigFile(configPath, { env: { CODEX_HOME: root }, sessionModel: "gpt-6-astra" });
+		fixture.assertResult(await readFile(configPath, "utf8"));
+	}
 });
 
-test("#given config without any model but an existing low cap #when migrating #then still raises the existing cap", async () => {
+test("#given config without any model but an existing low cap #when migrating #then preserves the existing cap", async () => {
 	const root = await mkdtemp(join(tmpdir(), "lazycodex-subagent-limit-no-model-raise-"));
 	const configPath = join(root, "config.toml");
 	await writeFile(
@@ -360,7 +452,7 @@ test("#given config without any model but an existing low cap #when migrating #t
 	await migrateConfigFile(configPath, { env: { CODEX_HOME: root } });
 
 	const content = await readFile(configPath, "utf8");
-	assert.match(content, /max_threads = 1000/);
-	assert.doesNotMatch(content, /max_threads = 6/);
+	assert.match(content, /max_threads = 6/);
+	assert.doesNotMatch(content, /max_threads = 1000/);
 	assert.match(content, /max_depth = 4/);
 });