oh-my-opencode 4.16.2 → 4.17.0

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.2) Checking Ultrawork Trigger",
+						"statusMessage": "(OmO 4.17.0) 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.2) Checking Ulw-Loop Steering",
+						"statusMessage": "(OmO 4.17.0) 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.2) Loading Project Rules",
+						"statusMessage": "(OmO 4.17.0) 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/model-catalog.json

@@ -1,28 +1,37 @@
 {
-	"version": "2026-06-04.gpt-5.5-400k-reviewer-high",
+	"version": "2026-07-11.gpt-5.6-sol-372k-high",
 	"current": {
-		"model": "gpt-5.5",
-		"model_context_window": 400000,
+		"model": "gpt-5.6-sol",
+		"model_context_window": 372000,
 		"model_reasoning_effort": "high",
 		"plan_mode_reasoning_effort": "xhigh"
 	},
 	"roles": {
 		"default": {
-			"model": "gpt-5.5",
-			"model_context_window": 400000,
+			"model": "gpt-5.6-sol",
+			"model_context_window": 372000,
 			"model_reasoning_effort": "high",
 			"plan_mode_reasoning_effort": "xhigh"
 		},
 		"verifier": {
-			"model": "gpt-5.5",
+			"model": "gpt-5.6-sol",
 			"model_reasoning_effort": "high"
 		},
 		"worker": {
-			"model": "gpt-5.5",
+			"model": "gpt-5.6-sol",
 			"model_reasoning_effort": "high"
 		}
 	},
 	"managedProfiles": [
+		{
+			"version": "legacy.gpt-5.5-400k-reviewer-high",
+			"match": {
+				"model": "gpt-5.5",
+				"model_context_window": 400000,
+				"model_reasoning_effort": "high",
+				"plan_mode_reasoning_effort": "xhigh"
+			}
+		},
 		{
 			"version": "legacy.gpt-5.5-1m",
 			"match": {

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

@@ -1,12 +1,12 @@
 {
 	"name": "@sisyphuslabs/omo-codex-plugin",
-	"version": "4.16.1",
+	"version": "4.16.3",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@sisyphuslabs/omo-codex-plugin",
-			"version": "4.16.1",
+			"version": "4.16.3",
 			"workspaces": [
 				"components/codegraph",
 				"components/comment-checker",
@@ -93,7 +93,7 @@
 		},
 		"components/codegraph": {
 			"name": "@sisyphuslabs/codex-codegraph",
-			"version": "4.16.1",
+			"version": "4.16.3",
 			"bin": {
 				"omo-codegraph": "dist/cli.js"
 			},
@@ -112,7 +112,7 @@
 		},
 		"components/comment-checker": {
 			"name": "@code-yeongyu/codex-comment-checker",
-			"version": "4.16.1",
+			"version": "4.16.3",
 			"license": "MIT",
 			"bin": {
 				"omo-comment-checker": "dist/cli.js"
@@ -133,7 +133,7 @@
 		},
 		"components/git-bash": {
 			"name": "@sisyphuslabs/codex-git-bash-hook",
-			"version": "4.16.1",
+			"version": "4.16.3",
 			"bin": {
 				"omo-git-bash-hook": "dist/cli.js"
 			},
@@ -148,7 +148,7 @@
 		},
 		"components/lazycodex-executor-verify": {
 			"name": "@code-yeongyu/codex-lazycodex-executor-verify",
-			"version": "4.16.1",
+			"version": "4.16.3",
 			"license": "MIT",
 			"bin": {
 				"lazycodex-executor-verify": "dist/cli.js"
@@ -165,7 +165,7 @@
 		},
 		"components/lsp": {
 			"name": "@code-yeongyu/codex-lsp",
-			"version": "4.16.1",
+			"version": "4.16.3",
 			"license": "MIT",
 			"dependencies": {
 				"@code-yeongyu/lsp-daemon": "file:../../../../lsp-daemon"
@@ -185,7 +185,7 @@
 		},
 		"components/rules": {
 			"name": "@code-yeongyu/codex-rules",
-			"version": "4.16.1",
+			"version": "4.16.3",
 			"license": "MIT",
 			"dependencies": {
 				"picomatch": "^4.0.3"
@@ -207,7 +207,7 @@
 		},
 		"components/start-work-continuation": {
 			"name": "@code-yeongyu/codex-start-work-continuation",
-			"version": "4.16.1",
+			"version": "4.16.3",
 			"license": "MIT",
 			"bin": {
 				"omo-start-work-continuation": "dist/cli.js"
@@ -224,7 +224,7 @@
 		},
 		"components/teammode": {
 			"name": "@sisyphuslabs/codex-teammode",
-			"version": "4.16.1",
+			"version": "4.16.3",
 			"devDependencies": {
 				"@types/node": "^25.9.3",
 				"bun-types": "^1.3.1",
@@ -237,7 +237,7 @@
 		},
 		"components/telemetry": {
 			"name": "@code-yeongyu/codex-telemetry",
-			"version": "4.16.1",
+			"version": "4.16.3",
 			"license": "MIT",
 			"bin": {
 				"omo-telemetry": "dist/cli.js"
@@ -255,7 +255,7 @@
 		},
 		"components/ultrawork": {
 			"name": "@code-yeongyu/codex-ultrawork",
-			"version": "4.16.1",
+			"version": "4.16.3",
 			"license": "MIT",
 			"bin": {
 				"omo-ultrawork": "dist/cli.js"
@@ -273,7 +273,7 @@
 		},
 		"components/ulw-loop": {
 			"name": "@code-yeongyu/codex-ulw-loop",
-			"version": "4.16.1",
+			"version": "4.16.3",
 			"license": "MIT",
 			"bin": {
 				"omo-ulw-loop": "dist/cli.js",

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

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

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { spawn, spawnSync } from "node:child_process";
-import { pathToFileURL } from "node:url";
+import { isCliEntry } from "./entry-guard.mjs";
 import {
 	DEFAULT_LOCK_STALE_MS,
 	acquireLock,
@@ -296,8 +296,15 @@ function resolveUpdateContext({ env }) {
 
 async function runConfigMigration({ env, sessionModel = null, requireSessionModel = false }) {
 	if (env.LAZYCODEX_CONFIG_MIGRATION_DISABLED === "1" || env.OMO_CODEX_CONFIG_MIGRATION_DISABLED === "1") return [];
+	// The two migrations are independent; a SoT seeding failure must never
+	// block the config.toml repair (which can be the difference between a
+	// working and a fully broken GPT-5.6 session).
 	try {
 		await migrateOmoSotConfig({ env, seed: true });
+	} catch (error) {
+		if (!(error instanceof Error)) throw error;
+	}
+	try {
 		const result = await migrateCodexConfig({ env, sessionModel, requireSessionModel });
 		if (result.modeChanged.length === 0) return [];
 		return [
@@ -309,7 +316,7 @@ async function runConfigMigration({ env, sessionModel = null, requireSessionMode
 	}
 }
 
-if (process.argv[1] !== undefined && import.meta.url === pathToFileURL(process.argv[1]).href) {
+if (isCliEntry(import.meta.url)) {
 	(async () => {
 		const sessionModel = await readSessionModelFromStdin(process.stdin);
 		const { notices } = await runAutoUpdateCheck({

package/packages/omo-codex/plugin/scripts/entry-guard.mjs

@@ -0,0 +1,26 @@
+import { realpathSync } from "node:fs";
+import { pathToFileURL } from "node:url";
+
+/**
+ * True when the module identified by `importMetaUrl` is the process CLI
+ * entrypoint (`node <script>`).
+ *
+ * A plain `import.meta.url === pathToFileURL(process.argv[1]).href` check
+ * breaks when the script is reached through a symlink: Node resolves
+ * `import.meta.url` to the real path by default, while `process.argv[1]`
+ * keeps the symlinked spelling, so the two never match and the CLI body is
+ * silently skipped (exit 0, no output). Seen in the wild with a symlinked
+ * plugin cache dir, which turned every SessionStart hook into a no-op.
+ *
+ * @param {string} importMetaUrl the caller's `import.meta.url`
+ */
+export function isCliEntry(importMetaUrl) {
+	const argv1 = process.argv[1];
+	if (argv1 === undefined) return false;
+	if (importMetaUrl === pathToFileURL(argv1).href) return true;
+	try {
+		return importMetaUrl === pathToFileURL(realpathSync(argv1)).href;
+	} catch {
+		return false;
+	}
+}

package/packages/omo-codex/plugin/scripts/materialize-shared-upstreams.mjs

@@ -2,6 +2,8 @@ import { execFileSync } from "node:child_process";
 import { dirname, join } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
+import { isCliEntry } from "./entry-guard.mjs";
+
 const pluginScriptsDir = dirname(fileURLToPath(import.meta.url));
 const repoRoot = join(pluginScriptsDir, "..", "..", "..", "..");
 const sharedSkillsScripts = join(repoRoot, "packages", "shared-skills", "scripts");
@@ -35,7 +37,7 @@ export async function materializeSharedUpstreams({ strict }) {
 	return materializeFrontendRefs({ strict });
 }
 
-if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+if (isCliEntry(import.meta.url)) {
 	// The root build materializes once up front and sets this so downstream codex-plugin
 	// builds in the same run do not re-run it; concurrent runs would contend on git's
 	// submodule index.lock and race writes into packages/shared-skills/skills.

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

@@ -3,24 +3,33 @@ import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
 export const FALLBACK_CATALOG = {
-	version: "fallback.gpt-5.5-400k-reviewer-high",
+	version: "fallback.gpt-5.6-sol-372k-high",
 	current: {
-		model: "gpt-5.5",
-		model_context_window: 400_000,
+		model: "gpt-5.6-sol",
+		model_context_window: 372_000,
 		model_reasoning_effort: "high",
 		plan_mode_reasoning_effort: "xhigh",
 	},
 	roles: {
 		default: {
-			model: "gpt-5.5",
-			model_context_window: 400_000,
+			model: "gpt-5.6-sol",
+			model_context_window: 372_000,
 			model_reasoning_effort: "high",
 			plan_mode_reasoning_effort: "xhigh",
 		},
-		verifier: { model: "gpt-5.5", model_reasoning_effort: "high" },
-		worker: { model: "gpt-5.5", model_reasoning_effort: "high" },
+		verifier: { model: "gpt-5.6-sol", model_reasoning_effort: "high" },
+		worker: { model: "gpt-5.6-sol", model_reasoning_effort: "high" },
 	},
 	managedProfiles: [
+		{
+			version: "legacy.gpt-5.5-400k-reviewer-high",
+			match: {
+				model: "gpt-5.5",
+				model_context_window: 400_000,
+				model_reasoning_effort: "high",
+				plan_mode_reasoning_effort: "xhigh",
+			},
+		},
 		{
 			version: "legacy.gpt-5.5-1m",
 			match: {

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

@@ -24,7 +24,7 @@
  */
 import { readFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { dirname, isAbsolute, join } from "node:path";
 
 const MANAGED_COMMENT_MARKER = "openai/codex#26753";
 const MANAGED_DISABLE_COMMENT = [
@@ -42,6 +42,7 @@ const MANAGED_DISABLE_COMMENT = [
  *   requireSessionModel?: boolean,
  *   env?: NodeJS.ProcessEnv,
  *   modelsCachePath?: string,
+ *   configPath?: string,
  * }} [options]
  */
 export function forceDisableMultiAgentV2(config, options = {}) {
@@ -55,8 +56,9 @@ export function forceDisableMultiAgentV2(config, options = {}) {
 		options.multiAgentVersion !== undefined
 			? options.multiAgentVersion
 			: resolveMultiAgentVersionFromConfig(normalized, options);
+	const effectiveModel = sessionModel || readRootModel(normalized);
 
-	if (prefersMultiAgentV2(multiAgentVersion, sessionModel)) {
+	if (prefersMultiAgentV2(multiAgentVersion, effectiveModel)) {
 		return clearMultiAgentV2DisableForReservedSchema(normalized);
 	}
 
@@ -68,6 +70,15 @@ export function forceDisableMultiAgentV2(config, options = {}) {
 		return normalized;
 	}
 
+	// No model evidence at all (no session model AND no root `model` in
+	// config.toml — Codex Desktop selects the model in the UI): config alone
+	// cannot prove the session is not a GPT-5.6 reserved-schema model, and
+	// writing `enabled = false` would 400 every turn on those sessions
+	// (#6002). Leave the enable state untouched.
+	if (multiAgentVersion == null && !sessionModel && !readRootModel(normalized)) {
+		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) {
@@ -92,13 +103,17 @@ export function prefersMultiAgentV2(multiAgentVersion, 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]
+ * @param {{ sessionModel?: string | null, env?: NodeJS.ProcessEnv, modelsCachePath?: string, configPath?: 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);
+	const version = resolveMultiAgentVersionForModel(model, {
+		...options,
+		modelsCachePath: options.modelsCachePath?.trim() || resolveModelCatalogPath(readRootModelCatalogPath(config), options) || undefined,
+	});
+	return version ?? (isGpt56Family(model) ? "v2" : null);
 }
 
 /**
@@ -130,6 +145,26 @@ export function readRootModel(config) {
 	return single?.[1] ?? null;
 }
 
+// Codex documents `model_catalog_json` as a COMPLETE replacement for the
+// fetched models_cache.json (codex-rs/core/src/config/mod.rs load_model_catalog
+// -> load_catalog_json -> ModelsResponse). When set, Codex resolves the model
+// only from that file, so the guard must too — otherwise Codex and the guard
+// disagree on the multi-agent version (lazycodex#120).
+export function readRootModelCatalogPath(config) {
+	const double = config.match(/^\s*model_catalog_json\s*=\s*"([^"]+)"/m);
+	if (double) return double[1];
+	const single = config.match(/^\s*model_catalog_json\s*=\s*'([^']+)'/m);
+	return single?.[1] ?? null;
+}
+
+function resolveModelCatalogPath(configuredPath, options) {
+	const trimmed = normalizeModel(configuredPath);
+	if (!trimmed) return null;
+	if (isAbsolute(trimmed)) return trimmed;
+	const baseDir = options.configPath ? dirname(options.configPath) : options.env?.CODEX_HOME?.trim() || join(homedir(), ".codex");
+	return join(baseDir, trimmed);
+}
+
 function normalizeModel(value) {
 	if (typeof value !== "string") return null;
 	const trimmed = value.trim();

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

@@ -1,4 +1,4 @@
-import { prefersMultiAgentV2, resolveMultiAgentVersionFromConfig } from "./multi-agent-v2-guard.mjs";
+import { prefersMultiAgentV2, readRootModel, resolveMultiAgentVersionFromConfig } from "./multi-agent-v2-guard.mjs";
 
 const CODEX_AGENTS_HEADER = "[agents]";
 const CODEX_MULTI_AGENT_V2_HEADER = "[features.multi_agent_v2]";
@@ -11,6 +11,12 @@ const CODEX_SUBAGENT_THREAD_LIMIT = "1000";
  * enabled in config, skip `agents.max_threads` because Codex rejects that key
  * while features.multi_agent_v2 is enabled.
  *
+ * When no model is resolvable at all (no session model and no root `model`
+ * in config.toml — Codex Desktop selects the model in the UI), never
+ * introduce `agents.max_threads`: it hard-fails thread/start on
+ * MultiAgentV2 sessions. An existing cap is still raised in place so the
+ * legacy low-cap repair keeps working and a hand-removed key stays removed.
+ *
  * @param {string} config
  * @param {{ multiAgentVersion?: string | null, sessionModel?: string | null, env?: NodeJS.ProcessEnv, modelsCachePath?: string }} [options]
  */
@@ -22,20 +28,34 @@ export function ensureSubagentConcurrencyLimit(config, options = {}) {
 	const v2Preferred = prefersMultiAgentV2(multiAgentVersion, options.sessionModel) || isMultiAgentV2Enabled(config);
 
 	let result = config;
-	if (!v2Preferred) {
-		result = ensureAgentsMaxThreads(result);
-	} else {
+	if (v2Preferred) {
 		result = removeAgentsMaxThreads(result);
+	} else if (multiAgentVersion == null && !hasModelEvidence(config, options)) {
+		result = raiseExistingAgentsMaxThreads(result);
+	} else {
+		result = ensureAgentsMaxThreads(result);
 	}
 	return ensureMultiAgentV2ThreadLimit(result);
 }
 
+function hasModelEvidence(config, options) {
+	const sessionModel = typeof options.sessionModel === "string" ? options.sessionModel.trim() : "";
+	return sessionModel.length > 0 || readRootModel(config) !== null;
+}
+
 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 raiseExistingAgentsMaxThreads(config) {
+	const section = findSection(config, CODEX_AGENTS_HEADER);
+	if (!section) return config;
+	if (!/^\s*max_threads\s*=/m.test(section.text)) return config;
+	return replaceOrInsertSetting(config, section, "max_threads", CODEX_SUBAGENT_THREAD_LIMIT);
+}
+
 function ensureAgentsMaxThreads(config) {
 	const section = findSection(config, CODEX_AGENTS_HEADER);
 	if (!section) return appendBlock(config, `${CODEX_AGENTS_HEADER}\nmax_threads = ${CODEX_SUBAGENT_THREAD_LIMIT}\n`);

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

@@ -2,8 +2,8 @@
 
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { dirname } from "node:path";
-import { pathToFileURL } from "node:url";
 
+import { isCliEntry } from "./entry-guard.mjs";
 import { FALLBACK_CATALOG, readModelCatalog } from "./migrate-codex-config/catalog.mjs";
 import { configPaths } from "./migrate-codex-config/config-paths.mjs";
 import { removeStaleContext7PlaceholderMcpServer } from "./migrate-codex-config/context7-placeholder-guard.mjs";
@@ -76,7 +76,7 @@ export async function migrateConfigFile(
 		reasoningApplied = config !== before;
 	}
 
-	const multiAgentOptions = { env, sessionModel, requireSessionModel };
+	const multiAgentOptions = { env, sessionModel, requireSessionModel, configPath };
 	const multiAgentVersion = resolveMultiAgentVersionFromConfig(config, multiAgentOptions);
 	const afterMultiAgentGuard = forceDisableMultiAgentV2(config, {
 		...multiAgentOptions,
@@ -145,7 +145,7 @@ async function readConfig(configPath) {
 	}
 }
 
-if (process.argv[1] !== undefined && import.meta.url === pathToFileURL(process.argv[1]).href) {
+if (isCliEntry(import.meta.url)) {
 	migrateCodexConfig().catch((error) => {
 		if (!(error instanceof Error)) throw error;
 		process.exit(0);

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

@@ -3,8 +3,8 @@
 import { access, mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
-import { pathToFileURL } from "node:url";
 
+import { isCliEntry } from "./entry-guard.mjs";
 import { addCodexCodegraphValues, hasOwn, isRecord, recordAt } from "./migrate-omo-sot/editor.mjs";
 import { parseJsonc } from "./migrate-omo-sot/jsonc.mjs";
 import { SCAFFOLD } from "./migrate-omo-sot/scaffold.mjs";
@@ -109,7 +109,7 @@ function isValidCodegraphValue(key, value) {
 	return typeof value === "boolean";
 }
 
-if (process.argv[1] !== undefined && import.meta.url === pathToFileURL(process.argv[1]).href) {
+if (isCliEntry(import.meta.url)) {
 	migrateOmoSotConfig({ seed: process.argv.includes("--seed") })
 		.then((result) => {
 			for (const warning of result.warnings) process.stderr.write(`${warning}\n`);

package/packages/omo-codex/plugin/scripts/sync-hook-status-messages.mjs

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import { access, readdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
-import { pathToFileURL } from "node:url";
 import { fileURLToPath } from "node:url";
 
+import { isCliEntry } from "./entry-guard.mjs";
 import { formatLazyCodexHookStatusMessage, normalizeLazyCodexHookStatusLabel } from "./hook-status-message.mjs";
 
 const defaultRoot = dirname(dirname(fileURLToPath(import.meta.url)));
@@ -102,6 +102,6 @@ export async function syncHookStatusMessages(root = defaultRoot, options = {}) {
 	}
 }
 
-if (process.argv[1] !== undefined && import.meta.url === pathToFileURL(process.argv[1]).href) {
+if (isCliEntry(import.meta.url)) {
 	await syncHookStatusMessages();
 }

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

@@ -1,7 +1,9 @@
 #!/usr/bin/env node
 import { cp, mkdir, readdir, readFile, rm, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { fileURLToPath } from "node:url";
+
+import { isCliEntry } from "./entry-guard.mjs";
 import { sharedSkillsRootPath } from "@oh-my-opencode/shared-skills";
 
 const root = dirname(dirname(fileURLToPath(import.meta.url)));
@@ -36,7 +38,7 @@ function shouldCopySkillSource(source) {
 
 const opencodeOnlyOrchestrationPattern = /\b(?:call_omo_agent|background_output|team_[a-z_]+|task)\s*\(/;
 
-const codexHarnessToolCompatibility = `## Codex Harness Tool Compatibility
+export const codexHarnessToolCompatibility = `## Codex Harness Tool Compatibility
 
 This skill may include examples copied from the OpenCode harness. In Codex, do not call OpenCode-only tools such as \`call_omo_agent(...)\`, \`task(...)\`, \`background_output(...)\`, or \`team_*(...)\` literally. Translate those examples to Codex native tools:
 
@@ -48,15 +50,15 @@ This skill may include examples copied from the OpenCode harness. In Codex, do n
 | \`task(subagent_type="oracle", ...)\` for final verification | \`multi_agent_v1.spawn_agent({"message":"TASK: act as a rigorous reviewer. ...","agent_type":"lazycodex-gate-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\` |
+| \`team_*(...)\` | Use Codex native subagents via \`multi_agent_v1.spawn_agent\` and \`multi_agent_v1.wait_agent\`; use \`multi_agent_v1.send_input\` and \`multi_agent_v1.close_agent\` only when exposed in the active tools list |
 
 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\`, \`lazycodex-code-reviewer\`, \`lazycodex-qa-executor\`, and \`lazycodex-gate-reviewer\` - pass the matching name as \`agent_type\` so the child gets that role's model and instructions. 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.
 
-Codex exposes ONE of two subagent tool surfaces per session; check your own tool list and route accordingly. If \`multi_agent_v1.*\` tools exist, use the table above as written. If instead a flat \`spawn_agent\` with a required \`task_name\` exists (\`multi_agent_v2\`), rewrite every \`multi_agent_v1.*\` example: \`multi_agent_v1.spawn_agent({...,"fork_context":false})\` becomes \`spawn_agent({"task_name":"<lowercase_digits_underscores>","message":...,"agent_type":...,"fork_turns":"none"})\` (\`"all"\` only when full parent history is truly required); \`send_input\` becomes \`send_message\`; do not call \`close_agent\`/\`resume_agent\` (finished agents end on their own; \`followup_task\` re-tasks one, \`interrupt_agent\` stops one); \`wait_agent\` takes only \`timeout_ms\` and returns on any child mailbox activity. \`agent_type\` works the same on both surfaces. If a code block below conflicts with this section, this section wins.
+Codex exposes ONE of two subagent tool surfaces per session; check your own tool list and route accordingly. If \`multi_agent_v1.*\` tools exist, use the table above as written. If instead a flat \`spawn_agent\` with a required \`task_name\` exists (\`multi_agent_v2\`), rewrite every \`multi_agent_v1.*\` example: \`multi_agent_v1.spawn_agent({...,"fork_context":false})\` becomes \`spawn_agent({"task_name":"<lowercase_digits_underscores>","message":...,"agent_type":...,"fork_turns":"none"})\` (\`"all"\` only when full parent history is truly required); \`send_input\` becomes \`send_message\`; do not call \`close_agent\`/\`resume_agent\` (finished agents end on their own; \`followup_task\` re-tasks one, \`interrupt_agent\` stops one); \`wait_agent\` takes only \`timeout_ms\` and returns on any child mailbox activity. On the v2 surface \`agent_type\` may be ABSENT from the spawn schema (verified 2026-07-11: only \`fork_turns\`/\`message\`/\`task_name\`) — when absent, omit it and describe the role inside \`message\`; installed role TOMLs cannot be selected on that surface. If a code block below conflicts with this section, this section wins.
 
 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.
 
-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.
+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; back off between waits (double the timeout up to ~5 minutes) instead of spinning short cycles. 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.
 
 `;
 
@@ -154,6 +156,12 @@ failed, investigate the underlying uncertainty with the \`debugging\` skill when
 runtime behavior may be wrong, fix with evidence, and rerun the affected lane
 before claiming completion, creating or handing off a PR, or merging.
 
+A rejecting lane must name its blockers inline in its final message — each
+blocker cites the violated goal criterion or requirement plus an evidence
+pointer. A bare REJECT/FAIL token without findings is not a verdict; treat it
+as an inconclusive lane (one bounded respawn, then record it inconclusive with
+that reason).
+
 When reviewing a PR or branch, collect diff, file contents, and verification
 results from a dedicated review worktree attached to that branch. Never
 checkout, test, or edit the review branch in the main worktree.
@@ -263,6 +271,6 @@ async function syncSkills() {
 	}
 }
 
-if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+if (isCliEntry(import.meta.url)) {
 	await syncSkills();
 }

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

@@ -1,7 +1,9 @@
 #!/usr/bin/env node
 import { readdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { fileURLToPath } from "node:url";
+
+import { isCliEntry } from "./entry-guard.mjs";
 
 const scriptDir = dirname(fileURLToPath(import.meta.url));
 const defaultPluginRoot = dirname(scriptDir);
@@ -88,7 +90,7 @@ export async function syncVersion(options = {}) {
 	return { version, targets, changed };
 }
 
-if (process.argv[1] !== undefined && import.meta.url === pathToFileURL(process.argv[1]).href) {
+if (isCliEntry(import.meta.url)) {
 	const result = await syncVersion();
 	console.log(`Synced OMO Codex manifests to version ${result.version} (${result.changed.length} updated)`);
 }

package/packages/omo-codex/plugin/skills/init-deep/SKILL.md

@@ -14,15 +14,15 @@ This skill may include examples copied from the OpenCode harness. In Codex, do n
 | `task(subagent_type="oracle", ...)` for final verification | `multi_agent_v1.spawn_agent({"message":"TASK: act as a rigorous reviewer. ...","agent_type":"lazycodex-gate-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` |
+| `team_*(...)` | Use Codex native subagents via `multi_agent_v1.spawn_agent` and `multi_agent_v1.wait_agent`; use `multi_agent_v1.send_input` and `multi_agent_v1.close_agent` only when exposed in the active tools list |
 
 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`, `lazycodex-code-reviewer`, `lazycodex-qa-executor`, and `lazycodex-gate-reviewer` - pass the matching name as `agent_type` so the child gets that role's model and instructions. 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.
 
-Codex exposes ONE of two subagent tool surfaces per session; check your own tool list and route accordingly. If `multi_agent_v1.*` tools exist, use the table above as written. If instead a flat `spawn_agent` with a required `task_name` exists (`multi_agent_v2`), rewrite every `multi_agent_v1.*` example: `multi_agent_v1.spawn_agent({...,"fork_context":false})` becomes `spawn_agent({"task_name":"<lowercase_digits_underscores>","message":...,"agent_type":...,"fork_turns":"none"})` (`"all"` only when full parent history is truly required); `send_input` becomes `send_message`; do not call `close_agent`/`resume_agent` (finished agents end on their own; `followup_task` re-tasks one, `interrupt_agent` stops one); `wait_agent` takes only `timeout_ms` and returns on any child mailbox activity. `agent_type` works the same on both surfaces. If a code block below conflicts with this section, this section wins.
+Codex exposes ONE of two subagent tool surfaces per session; check your own tool list and route accordingly. If `multi_agent_v1.*` tools exist, use the table above as written. If instead a flat `spawn_agent` with a required `task_name` exists (`multi_agent_v2`), rewrite every `multi_agent_v1.*` example: `multi_agent_v1.spawn_agent({...,"fork_context":false})` becomes `spawn_agent({"task_name":"<lowercase_digits_underscores>","message":...,"agent_type":...,"fork_turns":"none"})` (`"all"` only when full parent history is truly required); `send_input` becomes `send_message`; do not call `close_agent`/`resume_agent` (finished agents end on their own; `followup_task` re-tasks one, `interrupt_agent` stops one); `wait_agent` takes only `timeout_ms` and returns on any child mailbox activity. On the v2 surface `agent_type` may be ABSENT from the spawn schema (verified 2026-07-11: only `fork_turns`/`message`/`task_name`) — when absent, omit it and describe the role inside `message`; installed role TOMLs cannot be selected on that surface. If a code block below conflicts with this section, this section wins.
 
 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.
 
-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.
+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; back off between waits (double the timeout up to ~5 minutes) instead of spinning short cycles. 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.
 
 # /init-deep