oh-my-opencode 4.8.1 → 4.9.1

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

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/rules/dist/cli.js\" hook session-start",
 						"timeout": 10,
-						"statusMessage": "LazyCodex(0.1.0): Loading Project Rules"
+						"statusMessage": "LazyCodex(4.9.1): Loading Project Rules"
 					}
 				]
 			},
@@ -17,7 +17,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/telemetry/dist/cli.js\" hook session-start",
 						"timeout": 5,
-						"statusMessage": "LazyCodex(0.1.0): Recording Session Telemetry"
+						"statusMessage": "LazyCodex(4.9.1): Recording Session Telemetry"
 					}
 				]
 			},
@@ -28,7 +28,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/scripts/auto-update.mjs\" hook session-start",
 						"timeout": 5,
-						"statusMessage": "LazyCodex(0.1.0): Checking Auto Update"
+						"statusMessage": "LazyCodex(4.9.1): Checking Auto Update"
 					}
 				]
 			}
@@ -40,7 +40,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/rules/dist/cli.js\" hook user-prompt-submit",
 						"timeout": 10,
-						"statusMessage": "LazyCodex(0.1.0): Loading Project Rules"
+						"statusMessage": "LazyCodex(4.9.1): Loading Project Rules"
 					}
 				]
 			},
@@ -50,7 +50,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/ultrawork/dist/cli.js\" hook user-prompt-submit",
 						"timeout": 5,
-						"statusMessage": "LazyCodex(0.1.0): Checking Ultrawork Trigger"
+						"statusMessage": "LazyCodex(4.9.1): Checking Ultrawork Trigger"
 					}
 				]
 			},
@@ -60,7 +60,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/ulw-loop/dist/cli.js\" hook user-prompt-submit",
 						"timeout": 10,
-						"statusMessage": "LazyCodex(0.1.0): Checking Ulw-Loop Steering"
+						"statusMessage": "LazyCodex(4.9.1): Checking Ulw-Loop Steering"
 					}
 				]
 			}
@@ -73,7 +73,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/git-bash/dist/cli.js\" hook pre-tool-use",
 						"timeout": 5,
-						"statusMessage": "LazyCodex(0.1.0): Recommending Git Bash Mcp"
+						"statusMessage": "LazyCodex(4.9.1): Recommending Git Bash Mcp"
 					}
 				]
 			},
@@ -84,7 +84,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/ulw-loop/dist/cli.js\" hook pre-tool-use",
 						"timeout": 5,
-						"statusMessage": "LazyCodex(0.1.0): Enforcing Unlimited Goal Budget"
+						"statusMessage": "LazyCodex(4.9.1): Enforcing Unlimited Goal Budget"
 					}
 				]
 			}
@@ -97,13 +97,13 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/comment-checker/dist/cli.js\" hook post-tool-use",
 						"timeout": 30,
-						"statusMessage": "LazyCodex(0.1.0): Checking Comments"
+						"statusMessage": "LazyCodex(4.9.1): Checking Comments"
 					},
 					{
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/lsp/dist/cli.js\" hook post-tool-use",
 						"timeout": 60,
-						"statusMessage": "LazyCodex(0.1.0): Checking LSP Diagnostics"
+						"statusMessage": "LazyCodex(4.9.1): Checking LSP Diagnostics"
 					}
 				]
 			},
@@ -114,7 +114,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/rules/dist/cli.js\" hook post-tool-use",
 						"timeout": 10,
-						"statusMessage": "LazyCodex(0.1.0): Matching Project Rules"
+						"statusMessage": "LazyCodex(4.9.1): Matching Project Rules"
 					}
 				]
 			}
@@ -127,7 +127,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/git-bash/dist/cli.js\" hook post-compact",
 						"timeout": 5,
-						"statusMessage": "LazyCodex(0.1.0): Resetting Git Bash Mcp Reminder"
+						"statusMessage": "LazyCodex(4.9.1): Resetting Git Bash Mcp Reminder"
 					}
 				]
 			},
@@ -138,7 +138,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/rules/dist/cli.js\" hook post-compact",
 						"timeout": 10,
-						"statusMessage": "LazyCodex(0.1.0): Resetting Project Rule Cache"
+						"statusMessage": "LazyCodex(4.9.1): Resetting Project Rule Cache"
 					}
 				]
 			},
@@ -149,7 +149,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/lsp/dist/cli.js\" hook post-compact",
 						"timeout": 5,
-						"statusMessage": "LazyCodex(0.1.0): Resetting LSP Diagnostics Cache"
+						"statusMessage": "LazyCodex(4.9.1): Resetting LSP Diagnostics Cache"
 					}
 				]
 			}
@@ -161,7 +161,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/start-work-continuation/dist/cli.js\" hook stop",
 						"timeout": 10,
-						"statusMessage": "LazyCodex(0.1.0): Checking Start-Work Continuation"
+						"statusMessage": "LazyCodex(4.9.1): Checking Start-Work Continuation"
 					}
 				]
 			}
@@ -173,7 +173,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/start-work-continuation/dist/cli.js\" hook subagent-stop",
 						"timeout": 10,
-						"statusMessage": "LazyCodex(0.1.0): Checking Start-Work Continuation"
+						"statusMessage": "LazyCodex(4.9.1): Checking Start-Work Continuation"
 					}
 				]
 			}

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

@@ -21,18 +21,19 @@
 				"@oh-my-opencode/shared-skills": "file:../../shared-skills"
 			}
 		},
-		"../../lsp-tools-mcp": {
-			"name": "@code-yeongyu/lsp-tools-mcp",
+		"../../lsp-daemon": {
+			"name": "@code-yeongyu/lsp-daemon",
 			"version": "0.1.0",
 			"license": "MIT",
 			"bin": {
-				"omo-lsp": "dist/cli.js"
+				"omo-lsp-daemon": "dist/cli.js"
 			},
 			"devDependencies": {
-				"@biomejs/biome": "2.4.15",
-				"@types/node": "^25.7.0",
+				"@biomejs/biome": "2.4.16",
+				"@code-yeongyu/lsp-tools-mcp": "file:../lsp-tools-mcp",
+				"@types/node": "^25.9.2",
 				"typescript": "^6.0.3",
-				"vitest": "^4.1.5"
+				"vitest": "^4.1.8"
 			},
 			"engines": {
 				"node": ">=20.0.0"
@@ -81,7 +82,7 @@
 			"version": "0.2.0",
 			"license": "MIT",
 			"dependencies": {
-				"@code-yeongyu/lsp-tools-mcp": "file:../../../../lsp-tools-mcp"
+				"@code-yeongyu/lsp-daemon": "file:../../../../lsp-daemon"
 			},
 			"bin": {
 				"omo-lsp": "dist/cli.js"
@@ -405,8 +406,8 @@
 				"node": ">=18"
 			}
 		},
-		"node_modules/@code-yeongyu/lsp-tools-mcp": {
-			"resolved": "../../lsp-tools-mcp",
+		"node_modules/@code-yeongyu/lsp-daemon": {
+			"resolved": "../../lsp-daemon",
 			"link": true
 		},
 		"node_modules/@emnapi/core": {

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

@@ -1,28 +1,29 @@
 {
-	"name": "@sisyphuslabs/omo-codex-plugin",
-	"version": "0.1.0",
-	"description": "Aggregate Codex plugin root for OMO components.",
-	"type": "module",
-	"packageManager": "npm@11.12.1",
-	"private": true,
-	"workspaces": [
-		"components/comment-checker",
-		"components/git-bash",
-		"components/rules",
-		"components/lsp",
-		"components/telemetry",
-		"components/start-work-continuation",
-		"components/ulw-loop",
-		"components/ultrawork"
-	],
-	"dependencies": {
-		"@oh-my-opencode/shared-skills": "file:../../shared-skills"
-	},
-	"scripts": {
-		"build": "node scripts/sync-hook-status-messages.mjs && node scripts/build-bundled-mcp-runtimes.mjs && node scripts/sync-skills.mjs && node ../scripts/sync-telemetry-component.mjs && node scripts/build-components.mjs",
-		"check": "npm run build && npm test",
-		"sync:hooks": "node scripts/sync-hook-status-messages.mjs",
-		"sync:skills": "node scripts/sync-skills.mjs",
-		"test": "node --test test/*.test.mjs"
-	}
+  "name": "@sisyphuslabs/omo-codex-plugin",
+  "version": "4.9.1",
+  "description": "Aggregate Codex plugin root for OMO components.",
+  "type": "module",
+  "packageManager": "npm@11.12.1",
+  "private": true,
+  "workspaces": [
+    "components/comment-checker",
+    "components/git-bash",
+    "components/rules",
+    "components/lsp",
+    "components/telemetry",
+    "components/start-work-continuation",
+    "components/ulw-loop",
+    "components/ultrawork"
+  ],
+  "dependencies": {
+    "@oh-my-opencode/shared-skills": "file:../../shared-skills"
+  },
+  "scripts": {
+    "build": "node scripts/sync-version.mjs && node scripts/sync-hook-status-messages.mjs && node scripts/build-bundled-mcp-runtimes.mjs && node scripts/sync-skills.mjs && node ../scripts/sync-telemetry-component.mjs && node scripts/build-components.mjs",
+    "sync:version": "node scripts/sync-version.mjs",
+    "check": "npm run build && npm test",
+    "sync:hooks": "node scripts/sync-hook-status-messages.mjs",
+    "sync:skills": "node scripts/sync-skills.mjs",
+    "test": "node --test test/*.test.mjs"
+  }
 }

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

@@ -37,9 +37,11 @@ export function resolveAutoUpdatePlan({ env = process.env, now = Date.now(), las
 		return { shouldRun: false, reason: "retry-throttled" };
 	}
 
+	const currentVersion = resolveCurrentVersion(env);
+	const latestVersion = resolveLatestVersion(env);
 	const updatePlan = resolveLazyCodexUpdatePlan({
-		currentVersion: resolveCurrentVersion(env),
-		latestVersion: resolveLatestVersion(env),
+		currentVersion,
+		latestVersion,
 		command: resolveCommand(env),
 		args: resolveArgs(env),
 	});
@@ -49,6 +51,8 @@ export function resolveAutoUpdatePlan({ env = process.env, now = Date.now(), las
 		shouldRun: true,
 		command: updatePlan.command,
 		args: updatePlan.args,
+		currentVersion,
+		latestVersion,
 		env: {
 			...env,
 			LAZYCODEX_AUTO_UPDATE_DISABLED: "1",
@@ -94,7 +98,8 @@ export async function runLazyCodexManualUpdate({ env = process.env, dryRun = fal
 export async function runAutoUpdateCheck({ env = process.env, now = Date.now() } = {}) {
 	await runConfigMigration({ env });
 	const statePath = resolveStatePath(env);
-	const state = await readState(statePath);
+	const notices = [];
+	const state = await settlePendingNotice({ env, now, statePath, state: await readState(statePath), notices });
 	const plan = resolveAutoUpdatePlan({
 		env,
 		now,
@@ -107,17 +112,18 @@ export async function runAutoUpdateCheck({ env = process.env, now = Date.now() }
 		if (plan.reason === "up-to-date") {
 			await writeState(statePath, { ...state, lastCheckedAt: now, lastStatus: "success" });
 		}
-		return { started: false, reason: plan.reason };
+		return { started: false, reason: plan.reason, notices };
 	}
 
 	const lockStaleMs = parsePositiveInteger(env.LAZYCODEX_AUTO_UPDATE_LOCK_STALE_MS, DEFAULT_LOCK_STALE_MS);
 	const lock = await acquireLock(resolveLockPath(env, statePath), now, lockStaleMs);
 	if (lock === null) {
 		await appendUpdateLog(env, now, "locked");
-		return { started: false, reason: "locked" };
+		return { started: false, reason: "locked", notices };
 	}
 	try {
 		await appendUpdateLog(env, now, "started", { command: plan.command, args: plan.args });
+		const pendingNotice = { fromVersion: plan.currentVersion, toVersion: plan.latestVersion, startedAt: now };
 		if (env.LAZYCODEX_AUTO_UPDATE_WAIT === "1") {
 			const invocation = resolveSpawnInvocation(plan.command, plan.args);
 			const result = spawnSync(invocation.command, invocation.args, {
@@ -126,10 +132,13 @@ export async function runAutoUpdateCheck({ env = process.env, now = Date.now() }
 			});
 			const status = result.status ?? (result.error === undefined ? 0 : 1);
 			await appendUpdateLog(env, now, "finished", { status });
-			await writeState(statePath, status === 0
-				? { lastCheckedAt: now, lastAttemptedAt: now, lastStatus: "success" }
-				: { lastAttemptedAt: now, lastStatus: "failed" });
-			return { started: true, status };
+			if (status === 0) {
+				await writeState(statePath, { lastCheckedAt: now, lastAttemptedAt: now, lastStatus: "success", pendingNotice });
+				await recordUpdateStartedNotice({ env, now, notices, pendingNotice });
+			} else {
+				await writeState(statePath, { lastAttemptedAt: now, lastStatus: "failed" });
+			}
+			return { started: true, status, notices };
 		}
 
 		const invocation = resolveSpawnInvocation(plan.command, plan.args);
@@ -138,14 +147,44 @@ export async function runAutoUpdateCheck({ env = process.env, now = Date.now() }
 			stdio: "ignore",
 			detached: true,
 		});
-		await writeState(statePath, { lastAttemptedAt: now, lastStatus: "started" });
+		await writeState(statePath, { lastAttemptedAt: now, lastStatus: "started", pendingNotice });
+		await recordUpdateStartedNotice({ env, now, notices, pendingNotice });
 		child.unref();
-		return { started: true };
+		return { started: true, notices };
 	} finally {
 		await lock.release();
 	}
 }
 
+async function settlePendingNotice({ env, now, statePath, state, notices }) {
+	const pendingNotice = state.pendingNotice;
+	if (pendingNotice === undefined) return state;
+	const current = parseVersion(resolveCurrentVersion(env));
+	const target = parseVersion(pendingNotice.toVersion);
+	if (current !== null && target !== null && compareVersions(current, target) < 0) return state;
+	const nextState = { ...state };
+	delete nextState.pendingNotice;
+	await writeState(statePath, nextState);
+	if (current !== null && target !== null) {
+		notices.push(`[LazyCodex] Auto-update completed: v${pendingNotice.fromVersion} -> v${pendingNotice.toVersion}. This session is already running the new version. Tell the user the auto-update was applied.`);
+		await appendUpdateLog(env, now, "notified", {
+			kind: "update-completed",
+			fromVersion: pendingNotice.fromVersion,
+			toVersion: pendingNotice.toVersion,
+		});
+	}
+	return nextState;
+}
+
+async function recordUpdateStartedNotice({ env, now, notices, pendingNotice }) {
+	notices.push(`[LazyCodex] Auto-update started in the background: v${pendingNotice.fromVersion} -> v${pendingNotice.toVersion}. Tell the user a new LazyCodex version is installing and that they should start a new Codex session after it completes to apply it.`);
+	await appendUpdateLog(env, now, "notified", {
+		kind: "update-started",
+		fromVersion: pendingNotice.fromVersion,
+		toVersion: pendingNotice.toVersion,
+	});
+}
+
 async function runConfigMigration({ env }) {
 	if (env.LAZYCODEX_CONFIG_MIGRATION_DISABLED === "1" || env.OMO_CODEX_CONFIG_MIGRATION_DISABLED === "1") return;
 	try {
@@ -264,8 +303,18 @@ function parsePositiveInteger(value, fallback) {
 }
 
 if (process.argv[1] !== undefined && import.meta.url === pathToFileURL(process.argv[1]).href) {
-	runAutoUpdateCheck().catch((error) => {
-		console.error(error instanceof Error ? error.message : String(error));
-		process.exit(0);
-	});
+	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);
+		});
 }

package/packages/omo-codex/plugin/scripts/build-bundled-mcp-runtimes.mjs

@@ -13,6 +13,12 @@ const runtimes = [
 		packageRoot: join(repoPackagesRoot, "lsp-tools-mcp"),
 		requiredOutputs: ["dist/cli.js", "dist/tools.js"],
 	},
+	{
+		label: "lsp-daemon",
+		packageRoot: join(repoPackagesRoot, "lsp-daemon"),
+		requiredOutputs: ["dist/cli.js", "dist/index.js", "dist/index.d.ts"],
+		install: true,
+	},
 	{
 		label: "ast-grep-mcp",
 		packageRoot: join(repoPackagesRoot, "ast-grep-mcp"),
@@ -41,6 +47,16 @@ function buildRuntime(runtime) {
 		return;
 	}
 
+	if (runtime.install === true && !existsSync(join(runtime.packageRoot, "node_modules"))) {
+		const install = spawnSync("npm", ["ci"], {
+			cwd: runtime.packageRoot,
+			shell: process.platform === "win32",
+			stdio: "inherit",
+		});
+		if (install.error !== undefined) throw install.error;
+		if (install.status !== 0) process.exit(install.status ?? 1);
+	}
+
 	const result = spawnSync("npm", ["run", "build"], {
 		cwd: runtime.packageRoot,
 		shell: process.platform === "win32",

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

@@ -1,27 +1,88 @@
 /**
- * Runtime migration: undo the installer-forced `enabled = true` on
- * `[features.multi_agent_v2]`.
+ * Runtime migration: force `[features.multi_agent_v2]` to `enabled = false`.
  *
- * Whether V2 is active should be determined at runtime by the model's
- * server-side catalog entry (`ModelInfo.multi_agent_version`).  Previous
- * installer versions unconditionally set `enabled = true`, which forces
- * V2 for ALL models --- including those whose API does not support
- * encrypted tool parameters (spawn_agent).  This guard removes the
- * forced flag so the Codex runtime can make the right decision per model.
+ * 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).
+ *
+ * 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).
  */
-export function disableMultiAgentV2IfForced(config) {
-	const section = findMultiAgentV2Section(config);
+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",
+	`# because enabling it fails every turn with HTTP 400 (${MANAGED_COMMENT_MARKER}).`,
+	"# Opt out: LAZYCODEX_CONFIG_MIGRATION_DISABLED=1 (or OMO_CODEX_CONFIG_MIGRATION_DISABLED=1).",
+	"",
+].join("\n");
+
+export function forceDisableMultiAgentV2(config) {
+	let result = removeEnabledFeaturesShorthand(config);
+	const section = findSection(result, "[features.multi_agent_v2]");
+
+	if (!section) {
+		if (hasDisabledFeaturesShorthand(result)) return result;
+		return ensureManagedComment(appendDisabledSection(result));
+	}
+
+	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));
+	}
+
+	if (/^\s*enabled\s*=\s*false[ \t]*(?:#[^\n]*)?$/m.test(section.text)) return result;
+
+	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));
+}
+
+function ensureManagedComment(config) {
+	if (config.includes(MANAGED_COMMENT_MARKER)) return config;
+	const section = findSection(config, "[features.multi_agent_v2]");
+	if (!section) return config;
+	return config.slice(0, section.start) + MANAGED_DISABLE_COMMENT + config.slice(section.start);
+}
+
+function removeEnabledFeaturesShorthand(config) {
+	const section = findSection(config, "[features]");
 	if (!section) return config;
 
-	const enabledPattern = /^(\s*)enabled\s*=\s*true\s*$/m;
-	if (!enabledPattern.test(section.text)) return config;
+	const shorthandPattern = /^\s*multi_agent_v2\s*=\s*true[ \t]*(?:#[^\n]*)?[ \t]*\n?/m;
+	if (!shorthandPattern.test(section.text)) return config;
 
-	const patched = section.text.replace(enabledPattern, "$1enabled = false");
+	const patched = section.text.replace(shorthandPattern, "");
 	return config.slice(0, section.start) + patched + config.slice(section.end);
 }
 
-function findMultiAgentV2Section(config) {
-	const headerLine = "[features.multi_agent_v2]";
+function hasDisabledFeaturesShorthand(config) {
+	const section = findSection(config, "[features]");
+	if (!section) return false;
+	return /^\s*multi_agent_v2\s*=\s*false[ \t]*(?:#[^\n]*)?$/m.test(section.text);
+}
+
+function appendDisabledSection(config) {
+	const trimmed = config.trimEnd();
+	const prefix = trimmed.length === 0 ? "" : `${trimmed}\n\n`;
+	return `${prefix}[features.multi_agent_v2]\nenabled = false\n`;
+}
+
+// Strips a trailing # comment from a TOML line fragment (best-effort; quoted keys containing # are out of scope).
+function stripTrailingComment(line) {
+	const idx = line.indexOf("#");
+	return idx === -1 ? line : line.slice(0, idx).trim();
+}
+
+function findSection(config, headerLine) {
 	const lines = config.match(/[^\n]*\n?|$/g) ?? [];
 	let offset = 0;
 	let start = -1;
@@ -29,9 +90,12 @@ function findMultiAgentV2Section(config) {
 		if (line.length === 0) break;
 		const trimmed = line.trim();
 		if (start === -1) {
-			if (trimmed === headerLine) start = offset;
-		} else if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
-			return { start, end: offset, text: config.slice(start, offset) };
+			if (stripTrailingComment(trimmed) === headerLine) start = offset;
+		} else {
+			const bare = stripTrailingComment(trimmed);
+			if (bare.startsWith("[") && bare.endsWith("]")) {
+				return { start, end: offset, text: config.slice(start, offset) };
+			}
 		}
 		offset += line.length;
 	}

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

@@ -6,7 +6,7 @@ import { pathToFileURL } from "node:url";
 
 import { FALLBACK_CATALOG, readModelCatalog } from "./migrate-codex-config/catalog.mjs";
 import { configPaths } from "./migrate-codex-config/config-paths.mjs";
-import { disableMultiAgentV2IfForced } from "./migrate-codex-config/multi-agent-v2-guard.mjs";
+import { forceDisableMultiAgentV2 } 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";
 
@@ -51,7 +51,7 @@ export async function migrateConfigFile(configPath, { catalog = FALLBACK_CATALOG
 		reasoningApplied = config !== before;
 	}
 
-	const afterMultiAgentGuard = disableMultiAgentV2IfForced(config);
+	const afterMultiAgentGuard = forceDisableMultiAgentV2(config);
 	const multiAgentChanged = afterMultiAgentGuard !== config;
 	if (multiAgentChanged) config = afterMultiAgentGuard;
 

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

@@ -24,21 +24,23 @@ This skill may include examples copied from the OpenCode harness. In Codex, do n
 
 | OpenCode example | Codex tool to use |
 | --- | --- |
-| \`call_omo_agent(subagent_type="explore", ...)\` | \`spawn_agent({"task_name":"...","message":"TASK: act as an explorer. ...","fork_turns":"none"})\` |
-| \`call_omo_agent(subagent_type="librarian", ...)\` | \`spawn_agent({"task_name":"...","message":"TASK: act as a librarian. ...","fork_turns":"none"})\` |
-| \`task(subagent_type="plan", ...)\` | \`spawn_agent({"task_name":"...","message":"TASK: act as a planning agent. ...","fork_turns":"none"})\` |
-| \`task(subagent_type="oracle", ...)\` for final verification | \`spawn_agent({"task_name":"...","message":"TASK: act as a rigorous reviewer. ...","fork_turns":"none"})\` |
-| \`task(category="...", ...)\` for implementation or QA | \`spawn_agent({"task_name":"...","message":"TASK: act as an implementation or QA worker. ...","fork_turns":"none"})\` |
-| \`background_output(task_id="...")\` | \`wait_agent(...)\` for mailbox signals; after a timeout, run one \`list_agents\` check for the named child if reassurance is needed |
-| \`team_*(...)\` | Use Codex native subagents plus \`send_message\`, \`followup_task\`, \`wait_agent\`, and \`close_agent\` |
+| \`call_omo_agent(subagent_type="explore", ...)\` | \`multi_agent_v1.spawn_agent({"message":"TASK: act as an explorer. ...","agent_type":"explorer","fork_context":false})\` |
+| \`call_omo_agent(subagent_type="librarian", ...)\` | \`multi_agent_v1.spawn_agent({"message":"TASK: act as a librarian. ...","agent_type":"librarian","fork_context":false})\` |
+| \`task(subagent_type="plan", ...)\` | \`multi_agent_v1.spawn_agent({"message":"TASK: act as a planning agent. ...","agent_type":"plan","fork_context":false})\` |
+| \`task(subagent_type="oracle", ...)\` for final verification | \`multi_agent_v1.spawn_agent({"message":"TASK: act as a rigorous reviewer. ...","agent_type":"codex-ultrawork-reviewer","fork_context":false})\` |
+| \`task(category="...", ...)\` for implementation or QA | \`multi_agent_v1.spawn_agent({"message":"TASK: act as an implementation or QA worker. ...","fork_context":false})\` |
+| \`background_output(task_id="...")\` | \`multi_agent_v1.wait_agent(...)\` for mailbox signals |
+| \`team_*(...)\` | Use Codex native subagents via \`multi_agent_v1.spawn_agent\`, \`multi_agent_v1.send_input\`, \`multi_agent_v1.wait_agent\`, and \`multi_agent_v1.close_agent\` |
 
-Codex full-history forks inherit parent context, so role-specific behavior must be described in a self-contained \`message\` and usually should use a non-full-history fork mode such as \`fork_turns="none"\`. Include any required conversation context, files, diffs, constraints, and requested skill names directly in the spawned agent's \`message\`. If a code block below conflicts with this section, this section wins.
+Role-specific behavior must be described in a self-contained \`message\`. Use \`fork_context: false\` to start the child with only the initial prompt (no parent history); use \`fork_context: true\` only when full parent history is truly required. Include any required conversation context, files, diffs, constraints, and requested skill names directly in the spawned agent's \`message\`. OMO installs these selectable agent roles into \`~/.codex/agents/\`: \`explorer\`, \`librarian\`, \`plan\`, \`momus\`, \`metis\`, and \`codex-ultrawork-reviewer\` — pass the matching name as \`agent_type\` so the child gets that role's model and instructions. On \`multi_agent_v2\` sessions the same \`agent_type\` applies (the OMO installer exposes it) with \`fork_turns\` instead of \`fork_context\`. If the spawn tool exposes no \`agent_type\` parameter, omit it and describe the role inside \`message\`. If a code block below conflicts with this section, this section wins.
 
-For work likely to exceed one wait cycle, require the child to send \`WORKING: <task> - <current phase>\` before long passes and \`BLOCKED: <reason>\` only when progress stops. A \`wait_agent\` timeout only means no new mailbox update arrived. Treat a running child or latest \`WORKING:\` message as alive. Do not use \`list_agents\` as a polling loop. Fallback only when the child is completed without the deliverable, ack-only after followup, explicitly \`BLOCKED:\`, or no longer running.
+For work likely to exceed one wait cycle, require the child to send \`WORKING: <task> - <current phase>\` before long passes and \`BLOCKED: <reason>\` only when progress stops. A \`multi_agent_v1.wait_agent\` timeout only means no new mailbox update arrived. Treat a running child as alive. Fallback only when the child is completed without the deliverable, ack-only after followup, explicitly \`BLOCKED:\`, or no longer running.
 
 `;
 
 const codexCompatibilityEndMarkers = [
+	"For work likely to exceed one wait cycle, require the child to send `WORKING: <task> - <current phase>` before long passes and `BLOCKED: <reason>` only when progress stops. A `multi_agent_v1.wait_agent` timeout only means no new mailbox update arrived. Treat a running child as alive. Fallback only when the child is completed without the deliverable, ack-only after followup, explicitly `BLOCKED:`, or no longer running.\n\n",
+	"Role-specific behavior must be described in a self-contained `message`. Use `fork_context: false` to start the child with only the initial prompt (no parent history); use `fork_context: true` only when full parent history is truly required. Include any required conversation context, files, diffs, constraints, and requested skill names directly in the spawned agent's `message`. If a code block below conflicts with this section, this section wins.\n\n",
 	"For work likely to exceed one wait cycle, require the child to send `WORKING: <task> - <current phase>` before long passes and `BLOCKED: <reason>` only when progress stops. A `wait_agent` timeout only means no new mailbox update arrived. Treat a running child or latest `WORKING:` message as alive. Do not use `list_agents` as a polling loop. Fallback only when the child is completed without the deliverable, ack-only after followup, explicitly `BLOCKED:`, or no longer running.\n\n",
 	"Codex full-history forks inherit parent context, so role-specific behavior must be described in a self-contained `message` and usually should use a non-full-history fork mode such as `fork_turns=\"none\"`. Include any required conversation context, files, diffs, constraints, and requested skill names directly in the spawned agent's `message`. If a code block below conflicts with this section, this section wins.\n\n",
 	"When translating `load_skills=[...]`, include the requested skill names in the spawned agent's `message`. If a code block below conflicts with this section, this section wins.\n\n",
@@ -46,7 +48,7 @@ const codexCompatibilityEndMarkers = [
 ];
 
 function findCodexCompatibilitySectionEnd(content, searchStart) {
-	const structuralEndPattern = /\n(?:---|#{1,6}\s)/g;
+	const structuralEndPattern = /\n(?:---|export\s+const\s+|#{1,6}\s)/g;
 	structuralEndPattern.lastIndex = searchStart;
 	const structuralEnd = structuralEndPattern.exec(content);
 	if (structuralEnd) return structuralEnd.index + 1;
@@ -71,11 +73,21 @@ function removeCodexCompatibilityGuidance(content) {
 	}
 }
 
+function hasKnownGeneratedCodexCompatibilityGuidance(content, compatibilityIndex) {
+	return codexCompatibilityEndMarkers.some((marker) => content.indexOf(marker, compatibilityIndex) !== -1);
+}
+
 export function insertCodexCompatibilityGuidance(content) {
 	if (!opencodeOnlyOrchestrationPattern.test(content)) return content;
 	const firstExampleIndex = content.search(opencodeOnlyOrchestrationPattern);
 	const compatibilityIndex = content.indexOf("## Codex Harness Tool Compatibility");
-	if (compatibilityIndex !== -1 && compatibilityIndex < firstExampleIndex) return content;
+	if (
+		compatibilityIndex !== -1 &&
+		compatibilityIndex < firstExampleIndex &&
+		!hasKnownGeneratedCodexCompatibilityGuidance(content, compatibilityIndex)
+	) {
+		return content;
+	}
 
 	const contentWithoutGuidance = removeCodexCompatibilityGuidance(content);