oh-my-opencode 4.16.2 → 4.17.0

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\.5"/);
-	assert.match(result, /model_context_window = 400000/);
+	assert.match(result, /model = "gpt-5\.6-sol"/);
+	assert.match(result, /model_context_window = 372000/);
 	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\.5"$/m);
-	assert.match(result, /^model_context_window = 400000$/m);
+	assert.match(result, /^model = "gpt-5\.6-sol"$/m);
+	assert.match(result, /^model_context_window = 372000$/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\.5"/);
-	assert.match(await readFile(projectConfig, "utf8"), /model_context_window = 400000/);
+	assert.match(await readFile(join(codexHome, "config.toml"), "utf8"), /model = "gpt-5\.6-sol"/);
+	assert.match(await readFile(projectConfig, "utf8"), /model_context_window = 372000/);
 });
 
 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\.5"/);
-	assert.match(content, /model_context_window = 400000/);
+	assert.match(content, /model = "gpt-5\.6-sol"/);
+	assert.match(content, /model_context_window = 372000/);
 });
 
 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\.5"/);
-	assert.match(content, /model_context_window = 400000/);
+	assert.match(content, /model = "gpt-5\.6-sol"/);
+	assert.match(content, /model_context_window = 372000/);
 });
 
 test("#given user-customized Codex model config #when migrating #then user values are preserved without root multi-agent mode", 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 = 400000/);
+	assert.match(content, /model_context_window = 372000/);
 	assert.equal(state.files[join(codexHome, "config.toml")].managed, true);
 });
 
@@ -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.5");
-	assert.equal(parsed.model_context_window, 400000);
+	assert.equal(parsed.model, "gpt-5.6-sol");
+	assert.equal(parsed.model_context_window, 372000);
 	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\.5"\nmodel_context_window = 400000/m);
+	assert.match(content, /^model = "gpt-5\.6-sol"\nmodel_context_window = 372000/m);
 	assert.doesNotMatch(content, /^\s*multi_agent_mode\s*=/m);
 	assert.match(content, /\[features\] # keep comment\nplugins = true/);
 });
@@ -756,7 +756,7 @@ test("#given global config with forced multi_agent_v2 #when full migration runs
 test("#given enabled = true with an inline comment #when forcing disable #then flips to false and preserves the comment", () => {
 	const config = ["[features.multi_agent_v2]", "enabled = true # tuned by me", ""].join("\n");
 
-	const result = forceDisableMultiAgentV2(config, { multiAgentVersion: null });
+	const result = forceDisableMultiAgentV2(config, { multiAgentVersion: "v1" });
 
 	assert.match(result, /^enabled = false # tuned by me$/m);
 	assert.doesNotMatch(result, /enabled = true/);
@@ -767,7 +767,7 @@ test("#given enabled = true with an inline comment #when forcing disable #then f
 test("#given a section header with an inline comment #when forcing disable #then patches in place without duplicating the table", () => {
 	const config = ["[features.multi_agent_v2] # pinned by me", "enabled = true", ""].join("\n");
 
-	const result = forceDisableMultiAgentV2(config, { multiAgentVersion: null });
+	const result = forceDisableMultiAgentV2(config, { multiAgentVersion: "v1" });
 
 	assert.equal((result.match(/\[features\.multi_agent_v2\]/g) ?? []).length, 1);
 	assert.match(result, /enabled = false/);
@@ -779,19 +779,19 @@ test("#given an already-guarded commented config #when re-running #then output i
 	const configA = ["[features.multi_agent_v2]", "enabled = true # tuned by me", ""].join("\n");
 	const configB = ["[features.multi_agent_v2] # pinned by me", "enabled = true", ""].join("\n");
 
-	const firstA = forceDisableMultiAgentV2(configA, { multiAgentVersion: null });
-	const rerunA = forceDisableMultiAgentV2(firstA, { multiAgentVersion: null });
+	const firstA = forceDisableMultiAgentV2(configA, { multiAgentVersion: "v1" });
+	const rerunA = forceDisableMultiAgentV2(firstA, { multiAgentVersion: "v1" });
 	assert.equal(rerunA, firstA);
 
-	const firstB = forceDisableMultiAgentV2(configB, { multiAgentVersion: null });
-	const rerunB = forceDisableMultiAgentV2(firstB, { multiAgentVersion: null });
+	const firstB = forceDisableMultiAgentV2(configB, { multiAgentVersion: "v1" });
+	const rerunB = forceDisableMultiAgentV2(firstB, { multiAgentVersion: "v1" });
 	assert.equal(rerunB, firstB);
 });
 
 test("#given user-disabled with an inline comment #when forcing disable #then returns config unchanged", () => {
 	const config = ["[features.multi_agent_v2]", "enabled = false # I turned this off myself", ""].join("\n");
 
-	const result = forceDisableMultiAgentV2(config, { multiAgentVersion: null });
+	const result = forceDisableMultiAgentV2(config, { multiAgentVersion: "v1" });
 
 	assert.equal(result, config);
 });
@@ -799,7 +799,7 @@ test("#given user-disabled with an inline comment #when forcing disable #then re
 test("#given [features] shorthand true with an inline comment #when forcing disable #then removes the shorthand and appends one disabled table", () => {
 	const config = ["[features]", "plugins = true", "multi_agent_v2 = true # legacy", ""].join("\n");
 
-	const result = forceDisableMultiAgentV2(config, { multiAgentVersion: null });
+	const result = forceDisableMultiAgentV2(config, { multiAgentVersion: "v1" });
 
 	assert.doesNotMatch(result, /^\s*multi_agent_v2\s*=/m);
 	assert.equal((result.match(/\[features\.multi_agent_v2\]/g) ?? []).length, 1);
@@ -816,7 +816,7 @@ test("#given a following section header with an inline comment #when inserting e
 		"",
 	].join("\n");
 
-	const result = forceDisableMultiAgentV2(config, { multiAgentVersion: null });
+	const result = forceDisableMultiAgentV2(config, { multiAgentVersion: "v1" });
 
 	assert.match(result, /\[features\.multi_agent_v2\]\nenabled = false\n/);
 	assert.match(result, /\[mcp_servers\.x\][^\n]*\nenabled = true/);
@@ -1034,6 +1034,41 @@ test("#given legacy shorthand and no session model on hook path #when full migra
 	assert.equal("enabled" in parsed.features.multi_agent_v2, false);
 });
 
+test("#given SoT migration failure #when hook migration runs #then config.toml repair still happens", async () => {
+	const { runAutoUpdateCheck } = await import("../scripts/auto-update.mjs");
+	const root = await mkdtemp(join(tmpdir(), "lazycodex-sot-isolation-"));
+	const codexHome = join(root, "codex-home");
+	await mkdir(codexHome, { recursive: true });
+	const configPath = join(codexHome, "config.toml");
+	await writeFile(
+		configPath,
+		['model = "gpt-5.6-sol"', "", "[features.multi_agent_v2]", "enabled = false", ""].join("\n"),
+	);
+	await writeFile(
+		join(codexHome, "models_cache.json"),
+		JSON.stringify({ models: [{ slug: "gpt-5.6-sol", multi_agent_version: "v2" }] }),
+	);
+	// HOME pointing at a FILE makes migrateOmoSotConfig's mkdir(~/.omo) throw.
+	const brokenHome = join(root, "not-a-dir");
+	await writeFile(brokenHome, "");
+
+	await runAutoUpdateCheck({
+		env: {
+			CODEX_HOME: codexHome,
+			HOME: brokenHome,
+			USERPROFILE: brokenHome,
+			LAZYCODEX_AUTO_UPDATE_DISABLED: "1",
+			LAZYCODEX_MODEL_CATALOG_STATE_PATH: join(root, "model-state.json"),
+			LAZYCODEX_AUTO_UPDATE_STATE_PATH: join(root, "state.json"),
+		},
+		sessionModel: "gpt-5.6-sol",
+		requireSessionModel: true,
+	});
+
+	const content = await readFile(configPath, "utf8");
+	assert.doesNotMatch(content, /^\s*enabled\s*=\s*false/m);
+});
+
 test("#given config default gpt-5.5 #when full migration gets SessionStart gpt-5.6-terra #then clears disable using session model", async () => {
 	const root = await mkdtemp(join(tmpdir(), "lazycodex-multi-agent-v2-session-model-"));
 	const codexHome = join(root, "codex-home");
@@ -1078,6 +1113,47 @@ test("#given config default gpt-5.5 #when full migration gets SessionStart gpt-5
 	assert.match(content, /max_concurrent_threads_per_session = 1000/);
 });
 
+test("#given no session model and no root model #when forcing disable #then leaves the enable state untouched", () => {
+	const config = ["[features]", "plugins = true", "", "[features.multi_agent_v2]", "enabled = true", ""].join("\n");
+
+	const result = forceDisableMultiAgentV2(config, { multiAgentVersion: null, sessionModel: null });
+
+	assert.match(result, /enabled = true/);
+	assert.doesNotMatch(result, /enabled = false/);
+	assert.doesNotMatch(result, /openai\/codex#26753/);
+});
+
+test("#given no session model and no root model #when config has no multi_agent_v2 section #then does not append a disable", () => {
+	const config = ["[features]", "plugins = true", ""].join("\n");
+
+	const result = forceDisableMultiAgentV2(config, { multiAgentVersion: null, sessionModel: null });
+
+	assert.equal(result, config);
+	assert.doesNotMatch(result, /\[features\.multi_agent_v2\]/);
+});
+
+test("#given user-modified config without root model #when full non-hook migration runs #then writes no disable and no new agents.max_threads", async () => {
+	const root = await mkdtemp(join(tmpdir(), "lazycodex-multi-agent-v2-desktop-no-model-"));
+	const codexHome = join(root, "codex-home");
+	await mkdir(codexHome, { recursive: true });
+	const configPath = join(codexHome, "config.toml");
+	// Codex Desktop sessions select the model in the UI; config.toml has no root
+	// `model`, so migration cannot prove the session is not a GPT-5.6
+	// reserved-schema model (#6002).
+	await writeFile(configPath, ['model_reasoning_effort = "high"', "", "[features]", "plugins = true", ""].join("\n"));
+
+	await migrateCodexConfig({
+		env: { CODEX_HOME: codexHome, LAZYCODEX_MODEL_CATALOG_STATE_PATH: join(root, "model-state.json") },
+		cwd: root,
+	});
+
+	const content = await readFile(configPath, "utf8");
+	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 = 1000/);
+});
+
 async function canCreateSymlink(type) {
 	const root = await mkdtemp(join(tmpdir(), "lazycodex-symlink-capability-"));
 	const target = join(root, "target");
@@ -1103,3 +1179,64 @@ async function canCreateSymlink(type) {
 		return false;
 	}
 }
+
+test("#given model_catalog_json declares a v2 model as v1 #when full migration runs #then keeps the managed disable and max_threads", async () => {
+	const root = await mkdtemp(join(tmpdir(), "lazycodex-multi-agent-v2-catalog-override-"));
+	const codexHome = join(root, "codex-home");
+	await mkdir(codexHome, { recursive: true });
+	const configPath = join(codexHome, "config.toml");
+	const catalogPath = join(root, "custom-catalog.json");
+	// Codex Desktop user forces gpt-5.6-sol to v1 via an explicit replacement catalog.
+	await writeFile(configPath, [
+		'model = "gpt-5.6-sol"',
+		`model_catalog_json = "${catalogPath}"`,
+		"",
+		"[agents]",
+		"max_threads = 1000",
+		"max_depth = 2",
+		"",
+		"[features.multi_agent_v2]",
+		"enabled = false",
+		"max_concurrent_threads_per_session = 1000",
+		"",
+	].join("\n"));
+	// models_cache.json STILL says v2 (stale), but the explicit catalog wins and says v1.
+	await writeFile(join(codexHome, "models_cache.json"), JSON.stringify({ models: [{ slug: "gpt-5.6-sol", multi_agent_version: "v2" }] }));
+	await writeFile(catalogPath, JSON.stringify({ models: [{ slug: "gpt-5.6-sol", multi_agent_version: "v1" }] }));
+
+	await migrateCodexConfig({
+		env: { CODEX_HOME: codexHome, LAZYCODEX_MODEL_CATALOG_STATE_PATH: join(root, "model-state.json") },
+		cwd: root,
+	});
+
+	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.match(content, /max_depth = 2/);
+});
+
+test("#given model_catalog_json declares a model as v2 #when full migration runs #then clears the managed disable", async () => {
+	const root = await mkdtemp(join(tmpdir(), "lazycodex-multi-agent-v2-catalog-v2-"));
+	const codexHome = join(root, "codex-home");
+	await mkdir(codexHome, { recursive: true });
+	const configPath = join(codexHome, "config.toml");
+	const catalogPath = join(root, "custom-catalog.json");
+	await writeFile(configPath, [
+		'model = "custom-model"',
+		`model_catalog_json = "${catalogPath}"`,
+		"",
+		"[features.multi_agent_v2]",
+		"enabled = false",
+		"",
+	].join("\n"));
+	await writeFile(catalogPath, JSON.stringify({ models: [{ slug: "custom-model", multi_agent_version: "v2" }] }));
+
+	await migrateCodexConfig({
+		env: { CODEX_HOME: codexHome, LAZYCODEX_MODEL_CATALOG_STATE_PATH: join(root, "model-state.json") },
+		cwd: root,
+	});
+
+	const content = await readFile(configPath, "utf8");
+	assert.doesNotMatch(content, /^\s*enabled\s*=\s*false/m, "explicit v2 catalog must clear the disable");
+});

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

@@ -0,0 +1,71 @@
+import assert from "node:assert/strict";
+import { mkdir, mkdtemp, readFile, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import test from "node:test";
+
+import { migrateCodexConfig } from "../scripts/migrate-codex-config.mjs";
+
+test("#given relative model_catalog_json declares gpt-5.6 model as v1 #when migrating #then resolves catalog from config directory", async () => {
+	const root = await mkdtemp(join(tmpdir(), "lazycodex-v2-relative-catalog-"));
+	const codexHome = join(root, "codex-home");
+	await mkdir(codexHome, { recursive: true });
+	const configPath = join(codexHome, "config.toml");
+	await writeFile(
+		configPath,
+		[
+			'model = "gpt-5.6-sol"',
+			'model_catalog_json = "custom-catalog.json"',
+			"",
+			"[agents]",
+			"max_threads = 1000",
+			"",
+			"[features.multi_agent_v2]",
+			"enabled = false",
+			"max_concurrent_threads_per_session = 1000",
+			"",
+		].join("\n"),
+	);
+	await writeFile(join(codexHome, "models_cache.json"), JSON.stringify({ models: [{ slug: "gpt-5.6-sol", multi_agent_version: "v2" }] }));
+	await writeFile(join(codexHome, "custom-catalog.json"), JSON.stringify({ models: [{ slug: "gpt-5.6-sol", multi_agent_version: "v1" }] }));
+
+	await migrateCodexConfig({
+		env: { CODEX_HOME: codexHome, LAZYCODEX_MODEL_CATALOG_STATE_PATH: join(root, "model-state.json") },
+		cwd: root,
+	});
+
+	const content = await readFile(configPath, "utf8");
+	assert.match(content, /enabled = false/);
+	assert.match(content, /max_threads = 1000/);
+});
+
+test("#given no SessionStart model and root gpt-5.6 model without catalog #when migrating #then clears stale V2 disable", async () => {
+	const root = await mkdtemp(join(tmpdir(), "lazycodex-v2-root-gpt56-nocache-"));
+	const codexHome = join(root, "codex-home");
+	await mkdir(codexHome, { recursive: true });
+	const configPath = join(codexHome, "config.toml");
+	await writeFile(
+		configPath,
+		[
+			'model = "gpt-5.6-terra"',
+			"",
+			"[agents]",
+			"max_threads = 1000",
+			"",
+			"[features.multi_agent_v2]",
+			"enabled = false",
+			"max_concurrent_threads_per_session = 1000",
+			"",
+		].join("\n"),
+	);
+
+	await migrateCodexConfig({
+		env: { CODEX_HOME: codexHome, LAZYCODEX_MODEL_CATALOG_STATE_PATH: join(root, "model-state.json") },
+		cwd: root,
+	});
+
+	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/);
+});

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

@@ -75,3 +75,35 @@ test("#given gpt-5.6 session model with no models_cache #when migrating #then do
 	assert.match(content, /max_depth = 4/);
 	assert.match(content, /max_concurrent_threads_per_session = 1000/);
 });
+
+test("#given config without any model #when migrating #then does not introduce agents.max_threads", async () => {
+	const root = await mkdtemp(join(tmpdir(), "lazycodex-subagent-limit-no-model-"));
+	const configPath = join(root, "config.toml");
+	await writeFile(
+		configPath,
+		['model_reasoning_effort = "high"', "", "[agents]", "max_depth = 4", ""].join("\n"),
+	);
+
+	await migrateConfigFile(configPath, { env: { CODEX_HOME: root } });
+
+	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 = 1000/);
+});
+
+test("#given config without any model but an existing low cap #when migrating #then still raises the existing cap", async () => {
+	const root = await mkdtemp(join(tmpdir(), "lazycodex-subagent-limit-no-model-raise-"));
+	const configPath = join(root, "config.toml");
+	await writeFile(
+		configPath,
+		['model_reasoning_effort = "high"', "", "[agents]", "max_threads = 6", "max_depth = 4", ""].join("\n"),
+	);
+
+	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_depth = 4/);
+});

package/packages/omo-codex/plugin/test/sync-skills-orchestration.test.mjs

@@ -3,7 +3,7 @@ import { readdir, readFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import test from "node:test";
 import { fileURLToPath } from "node:url";
-import { insertCodexCompatibilityGuidance } from "../scripts/sync-skills.mjs";
+import { codexHarnessToolCompatibility, insertCodexCompatibilityGuidance } from "../scripts/sync-skills.mjs";
 
 const root = dirname(dirname(fileURLToPath(import.meta.url)));
 
@@ -207,7 +207,8 @@ test("#given synced aggregate Codex skills #when they describe background orches
 		["working progress message", /WORKING:/],
 		["blocked progress message", /BLOCKED:/],
 		["mailbox timeout framing", /timeout only means no new mailbox update arrived/],
-		["multi_agent_v1.wait_agent ref", /multi_agent_v1\.wait_agent/],
+		// Skills route by session tool surface: the namespaced V1 tool or the flat V2 tool both count.
+		["wait-agent tool ref", /multi_agent_v1\.wait_agent|`wait_agent`/],
 		["explicit fallback conditions", /Fallback only when|Mark a file for retry only when/],
 	];
 	const bannedPatterns = [
@@ -234,6 +235,15 @@ test("#given synced aggregate Codex skills #when they describe background orches
 	}
 });
 
+test("#given start-work skill #when synced for Codex #then the difficulty-tier delegation guidance survives the overlay", async () => {
+	const content = await readSkill("start-work");
+
+	assert.match(content, /lazycodex-worker-medium/);
+	assert.match(content, /Delegation by difficulty/);
+	assert.match(content, /Global Review and Debugging Gate/);
+	assert.doesNotMatch(content, /works the same on both surfaces/);
+});
+
 test("#given review-work skill #when some lanes do not finish #then aggregate result remains bounded", async () => {
 	const content = await readSkill("review-work");
 
@@ -244,6 +254,8 @@ test("#given review-work skill #when some lanes do not finish #then aggregate re
 	assert.match(content, /Overall Verdict: PASSED \/ FAILED \/ INCONCLUSIVE/);
 	assert.match(content, /PASS\/FAIL\/INCONCLUSIVE \| HIGH\/MED\/LOW/);
 	assert.match(content, /Do not spin in repeated/);
+	assert.match(content, /bare REJECT\/FAIL token without findings is not a verdict/);
+	assert.match(content, /cites the violated goal criterion/);
 	assert.match(content, /Do not use `multi_agent_v1\.send_input` as an interrupt/);
 });
 
@@ -265,3 +277,9 @@ test("#given PR and review skills #when synced for Codex #then worktree lifecycl
 	assert.match(reviewWork, /dedicated review worktree attached to that branch/);
 	assert.match(reviewWork, /Never\s+checkout, test, or edit the review branch in the main worktree/);
 });
+
+test("#given generated Codex compatibility guidance #when multi-agent lifecycle tools are mentioned #then optional tools are guarded by the active tools list", () => {
+	assert.match(codexHarnessToolCompatibility, /when exposed in the active tools list/, "send_input/close_agent must be marked optional (lazycodex#116)");
+	assert.match(codexHarnessToolCompatibility, /multi_agent_v1\.spawn_agent/);
+	assert.match(codexHarnessToolCompatibility, /multi_agent_v1\.wait_agent/);
+});

package/packages/omo-codex/plugin/test/sync-skills-test-support.mjs

@@ -92,7 +92,7 @@ const startWorkOriginalHardRule = "- No completion claim while an applicable ult
 const startWorkCodexHardRule = "- No completion claim while an applicable ultraqa adversarial class was never probed. Each applicable class needs a captured observable result; each skipped class needs a one-line not-applicable reason in the ledger.\n- No `ORCHESTRATION COMPLETE`, final response, PR creation, PR handoff, or merge before the Global Review and Debugging Gate passes with recorded evidence.\n- No PR/branch implementation or review in the main worktree; create or use a task-owned git worktree first.\n- No unprefixed session ids in Boulder state. Codex sessions are always `codex:<session_id>`.";
 
 const reviewWorkCodexGatePattern =
-	/\nWhen `review-work` is used as a final implementation, PR, or `\$start-work`\ngate, it is blocking\. A timeout, missing deliverable, ack-only response,\nexplicit `BLOCKED:`, or inconclusive lane is not a pass\. Treat that lane as\nfailed, investigate the underlying uncertainty with the `debugging` skill when\nruntime behavior may be wrong, fix with evidence, and rerun the affected lane\nbefore claiming completion, creating or handing off a PR, or merging\.\n\nWhen reviewing a PR or branch, collect diff, file contents, and verification\nresults from a dedicated review worktree attached to that branch\. Never\ncheckout, test, or edit the review branch in the main worktree\.\n\nReview evidence must be safe to share\. Redact or mask secrets and sensitive\nuser data before including evidence in logs, PR bodies, or handoffs\. Never\ninclude raw tokens, credentials, auth headers, cookies, API keys, env dumps,\nprivate logs, or PII; summarize with lengths, hashes, and short non-sensitive\nprefixes when identity is needed\.\n/;
+	/\nWhen `review-work` is used as a final implementation, PR, or `\$start-work`\ngate, it is blocking\. A timeout, missing deliverable, ack-only response,\nexplicit `BLOCKED:`, or inconclusive lane is not a pass\. Treat that lane as\nfailed, investigate the underlying uncertainty with the `debugging` skill when\nruntime behavior may be wrong, fix with evidence, and rerun the affected lane\nbefore claiming completion, creating or handing off a PR, or merging\.\n\nA rejecting lane must name its blockers inline in its final message — each\nblocker cites the violated goal criterion or requirement plus an evidence\npointer\. A bare REJECT\/FAIL token without findings is not a verdict; treat it\nas an inconclusive lane \(one bounded respawn, then record it inconclusive with\nthat reason\)\.\n\nWhen reviewing a PR or branch, collect diff, file contents, and verification\nresults from a dedicated review worktree attached to that branch\. Never\ncheckout, test, or edit the review branch in the main worktree\.\n\nReview evidence must be safe to share\. Redact or mask secrets and sensitive\nuser data before including evidence in logs, PR bodies, or handoffs\. Never\ninclude raw tokens, credentials, auth headers, cookies, API keys, env dumps,\nprivate logs, or PII; summarize with lengths, hashes, and short non-sensitive\nprefixes when identity is needed\.\n/;
 
 export function removeCodexSkillOverlays(skillName, content) {
 	if (skillName === "ulw-research") {

package/packages/omo-codex/plugin/test/sync-skills.test.mjs

@@ -252,13 +252,15 @@ test("#given synced ulw-loop skill #when worker guidance is inspected #then cont
 	);
 	const syncedSkill = await readFile(join(root, "skills", "ulw-loop", "SKILL.md"), "utf8");
 	const syncedWorkflow = await readFile(join(root, "skills", "ulw-loop", "references", "full-workflow.md"), "utf8");
+	// ulw-loop is V2-primary (gpt-5.6 sol/terra use the flat `wait_agent`); the `multi_agent_v1.*`
+	// namespace is documented only as the v1 fallback, so the wait_agent refs accept the bare token.
 	const requiredPatterns = [
-		["multi_agent_v1.wait_agent ref", /multi_agent_v1\.wait_agent/],
+		["wait_agent ref", /\bwait_agent\b/],
 		["local spawned-name tracking", /Track spawned agent names locally/],
 		["wait_agent mailbox path", /wait_agent.*mailbox signals/],
 		["progress status contract", /WORKING:/],
 		["long-running plan/reviewer background guidance", /Plan and reviewer agents may run for a long time/],
-		["bounded plan/reviewer polling", /multi_agent_v1\.wait_agent.*cycles/],
+		["bounded plan/reviewer polling", /wait_agent.*cycles/],
 		["single long wait guard", /single long blocking wait/],
 		["git-master checkpointing", /git-master/],
 		["touched-path commit-style probe", /touched-path commit history/],