oh-my-codex 0.20.1 → 0.20.3

package/dist/cli/__tests__/imagegen-continuation.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"imagegen-continuation.test.js","sourceRoot":"","sources":["../../../src/cli/__tests__/imagegen-continuation.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"imagegen-continuation.test.js","sourceRoot":"","sources":["../../../src/cli/__tests__/imagegen-continuation.test.ts"],"names":[],"mappings":"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"}

package/dist/cli/__tests__/index.test.js

@@ -1,13 +1,14 @@
 import { afterEach, describe, it, mock } from "node:test";
 import assert from "node:assert/strict";
 import { existsSync, mkdirSync, readFileSync, utimesSync } from "node:fs";
-import { chmod, lstat, mkdir, mkdtemp, readFile, rm, stat, symlink, writeFile } from "node:fs/promises";
+import { chmod, lstat, mkdir, mkdtemp, readFile, readdir as fsReaddir, rm, stat, symlink, writeFile } from "node:fs/promises";
 import { delimiter, dirname, join } from "node:path";
 import { tmpdir } from "node:os";
 import { fileURLToPath } from "node:url";
 import { once } from "node:events";
 import TOML from "@iarna/toml";
-import { HELP, normalizeCodexLaunchArgs, buildTmuxShellCommand, buildTmuxPaneCommand, shouldSourceTmuxPaneShellRc, buildWindowsPromptCommand, buildTmuxSessionName, resolveCliInvocation, resolveUpdateChannelArg, commandOwnsLocalHelp, resolveCodexLaunchPolicy, resolveEffectiveLeaderLaunchPolicyOverride, resolveEnvLaunchPolicyOverride, resolveLeaderLaunchPolicyOverride, classifyCodexExecFailure, resolveSignalExitCode, parseTmuxPaneSnapshot, findHudWatchPaneIds, buildHudPaneCleanupTargets, readTopLevelTomlString, upsertTopLevelTomlString, collectInheritableTeamWorkerArgs, resolveTeamWorkerLaunchArgsEnv, injectModelInstructionsBypassArgs, resolveWorkerSparkModel, resolveSetupInstallModeArg, resolveSetupMcpModeArg, resolveSetupScopeArg, resolveSetupTeamModeArg, resolveLaunchConfigRepairOptions, readPersistedSetupPreferences, readPersistedSetupScope, resolveCodexConfigPathForLaunch, resolveCodexHomeForLaunch, resolveProjectLocalCodexHomeForLaunch, shouldAutoIsolateMadmaxLaunch, createMadmaxIsolatedRoot, buildMadmaxDetachedLaunchContextKey, withMadmaxDetachedContextLock, resolveOmxRootForLaunch, resolveDisposableWorktreeOmxRootForLaunch, prepareCodexHomeForLaunch, captureMadmaxWorktreeRuntimeContext, persistProjectLaunchRuntimeAuthState, persistProjectLaunchRuntimeProjectTrustState, cleanupRuntimeCodexHome, runtimeCodexHomePath, buildDetachedSessionBootstrapSteps, buildDetachedTmuxSessionName, buildDetachedSessionFinalizeSteps, shouldAttachDetachedTmuxSession, buildDetachedSessionRollbackSteps, detectDetachedSessionWindowIndex, resolveNotifyTempContract, buildNotifyTempStartupMessages, buildNotifyFallbackWatcherEnv, shouldEnableNotifyFallbackWatcher, reapStaleNotifyFallbackWatcher, cleanupLaunchOrphanedMcpProcesses, reapPostLaunchOrphanedMcpProcesses, cleanupPostLaunchModeStateFiles, resolveBackgroundHelperLaunchMode, shouldDetachBackgroundHelper, resolveNotifyFallbackWatcherScript, resolveHookDerivedWatcherScript, resolveNotifyHookScript, buildDetachedWindowsBootstrapScript, acquireTmuxExtendedKeysLease, resolveNativeSessionName, releaseTmuxExtendedKeysLease, withTmuxExtendedKeys, serializeDetachedSessionParentEnv, buildInsideTmuxHudHookEnv, registerInsideTmuxHudResizeHook, buildDetachedHudHookEnv, registerDetachedHudLayoutReconcileHook, ensureOmxRuntimeCommandShim, omxRuntimeCommandShimPath, prependOmxRuntimeCommandShimToEnv, CODEX_SQLITE_HOME_ENV, DETACHED_TMUX_HISTORY_LIMIT, isExistingTmuxWindowTooCrampedForLaunchHud, } from "../index.js";
+import { HELP, normalizeCodexLaunchArgs, buildTmuxShellCommand, buildTmuxPaneCommand, shouldSourceTmuxPaneShellRc, buildWindowsPromptCommand, buildTmuxSessionName, resolveCliInvocation, parseResumeCodexHomeSelection, isResumeCodexLaunch, CODEX_GLOBAL_OPTIONS_WITH_SPLIT_VALUE, isCodexVersionRequest, resolveUpdateChannelArg, commandOwnsLocalHelp, resolveCodexLaunchPolicy, resolveEffectiveLeaderLaunchPolicyOverride, resolveEnvLaunchPolicyOverride, resolveLeaderLaunchPolicyOverride, classifyCodexExecFailure, resolveSignalExitCode, parseTmuxPaneSnapshot, findHudWatchPaneIds, buildHudPaneCleanupTargets, readTopLevelTomlString, upsertTopLevelTomlString, collectInheritableTeamWorkerArgs, resolveTeamWorkerLaunchArgsEnv, injectModelInstructionsBypassArgs, resolveWorkerSparkModel, resolveSetupInstallModeArg, resolveSetupMcpModeArg, resolveSetupScopeArg, resolveSetupTeamModeArg, resolveSetupAgentsMergePolicyArg, resolveLaunchConfigRepairOptions, readPersistedSetupPreferences, readPersistedSetupScope, resolveCodexConfigPathForLaunch, resolveCodexHomeForLaunch, resolveProjectLocalCodexHomeForLaunch, shouldAutoIsolateMadmaxLaunch, createMadmaxIsolatedRoot, buildMadmaxDetachedLaunchContextKey, withMadmaxDetachedContextLock, resolveOmxRootForLaunch, resolveDisposableWorktreeOmxRootForLaunch, prepareCodexHomeForLaunch, captureMadmaxWorktreeRuntimeContext, persistProjectLaunchRuntimeAuthState, persistProjectLaunchRuntimeProjectTrustState, cleanupRuntimeCodexHome, runtimeCodexHomePath, buildDetachedSessionBootstrapSteps, buildDetachedTmuxSessionName, buildDetachedSessionFinalizeSteps, shouldAttachDetachedTmuxSession, buildDetachedSessionRollbackSteps, detectDetachedSessionWindowIndex, resolveNotifyTempContract, buildNotifyTempStartupMessages, buildNotifyFallbackWatcherEnv, shouldEnableNotifyFallbackWatcher, reapStaleNotifyFallbackWatcher, cleanupLaunchOrphanedMcpProcesses, reapPostLaunchOrphanedMcpProcesses, cleanupPostLaunchModeStateFiles, resolveBackgroundHelperLaunchMode, shouldDetachBackgroundHelper, resolveNotifyFallbackWatcherScript, resolveHookDerivedWatcherScript, resolveNotifyHookScript, buildDetachedWindowsBootstrapScript, acquireTmuxExtendedKeysLease, resolveNativeSessionName, releaseTmuxExtendedKeysLease, withTmuxExtendedKeys, serializeDetachedSessionParentEnv, buildInsideTmuxHudHookEnv, registerInsideTmuxHudResizeHook, buildDetachedHudHookEnv, registerDetachedHudLayoutReconcileHook, ensureOmxRuntimeCommandShim, omxRuntimeCommandShimPath, prependOmxRuntimeCommandShimToEnv, CODEX_SQLITE_HOME_ENV, DETACHED_TMUX_HISTORY_LIMIT, isExistingTmuxWindowTooCrampedForLaunchHud, } from "../index.js";
+import { buildResumeArgsWithPreservedFlags, stripHotswapArg } from "../../auth/hotswap.js";
 import { mergeConfig, repairConfigIfNeeded } from "../../config/generator.js";
 import { ensureReusableNodeModules } from "../../utils/repo-deps.js";
 import { readAllState } from "../../hud/state.js";
@@ -15,6 +16,7 @@ import { generateOverlay } from "../../hooks/agents-overlay.js";
 import { HUD_TMUX_HEIGHT_LINES, HUD_TMUX_MIN_LAUNCH_WINDOW_HEIGHT_LINES } from "../../hud/constants.js";
 import { createHudWatchPane as createSharedHudWatchPane, listCurrentWindowHudPaneIds } from "../../hud/tmux.js";
 import { DEFAULT_FRONTIER_MODEL, getTeamLowComplexityModel, } from "../../config/models.js";
+import { splitWorkerLaunchArgs } from "../../team/model-contract.js";
 const testDir = dirname(fileURLToPath(import.meta.url));
 const repoRoot = join(testDir, "..", "..", "..");
 function normalizeDarwinTmpPath(value) {
@@ -321,15 +323,223 @@ describe("normalizeCodexLaunchArgs", () => {
             'model_reasoning_effort="xhigh"',
         ]);
     });
+    it("adds reasoning overrides before a literal -- marker", () => {
+        assert.deepEqual(normalizeCodexLaunchArgs(["--xhigh", "--", "--max"]), [
+            "-c",
+            'model_reasoning_effort="xhigh"',
+            "--",
+            "--max",
+        ]);
+    });
+    it("adds bypass and reasoning overrides before preserving raw marker suffix args", () => {
+        assert.deepEqual(normalizeCodexLaunchArgs([
+            "--madmax",
+            "--xhigh",
+            "--",
+            "-c",
+            'model_reasoning_effort="ultra"',
+            "--max",
+        ]), [
+            "--dangerously-bypass-approvals-and-sandbox",
+            "-c",
+            'model_reasoning_effort="xhigh"',
+            "--",
+            "-c",
+            'model_reasoning_effort="ultra"',
+            "--max",
+        ]);
+    });
     it("uses the last reasoning shorthand when both are present", () => {
         assert.deepEqual(normalizeCodexLaunchArgs(["--high", "--xhigh"]), [
             "-c",
             'model_reasoning_effort="xhigh"',
         ]);
     });
-    it("rejects ambiguous max and ultra reasoning shorthands", () => {
-        assert.throws(() => normalizeCodexLaunchArgs(["--max"]), /canonical highest reasoning effort is "xhigh".*"max" and "ultra" are not accepted aliases/);
-        assert.throws(() => normalizeCodexLaunchArgs(["--ultra"]), /canonical highest reasoning effort is "xhigh".*"max" and "ultra" are not accepted aliases/);
+    it("rejects pre-marker max and ultra reasoning shorthands with approved guidance", () => {
+        const errors = [
+            [
+                "--max",
+                'Unsupported OMX launch shorthand "--max".\nNo --max shorthand exists; use agentReasoning for per-agent "max" or pass -c model_reasoning_effort=... directly to Codex.\nRun "omx help" for usage.',
+            ],
+            [
+                "--ultra",
+                'Unsupported OMX launch shorthand "--ultra".\n"ultra" is not an OMX root or per-agent reasoning value and is not an alias for "max".\nRun "omx help" for usage.',
+            ],
+        ];
+        for (const [flag, message] of errors) {
+            assert.throws(() => normalizeCodexLaunchArgs([flag]), { message });
+        }
+    });
+    it("preserves literal max and ultra after -- with raw -c arguments", () => {
+        const args = [
+            "-c",
+            "model_reasoning_effort=MAX",
+            "--",
+            "--max",
+            "--ultra",
+            "-c",
+            'model_reasoning_effort="ultra"',
+            "-c",
+            "model_reasoning_effort=future",
+        ];
+        assert.deepEqual(normalizeCodexLaunchArgs(args), args);
+    });
+    it("preserves post-marker OMX flags as literal Codex arguments", () => {
+        const args = [
+            "--",
+            "--worktree",
+            "post-marker-branch",
+            "--notify-temp",
+            "--discord",
+            "--custom",
+            "openclaw:ops",
+            "--spark",
+            "resume",
+            "--project",
+            "--codex-home",
+            "/tmp/literal-codex-home",
+            "--version",
+        ];
+        const notifyTempResult = resolveNotifyTempContract(args, {});
+        assert.equal(notifyTempResult.contract.active, false);
+        assert.deepEqual(notifyTempResult.contract.canonicalSelectors, []);
+        assert.deepEqual(notifyTempResult.passthroughArgs, args);
+        assert.equal(resolveWorkerSparkModel(notifyTempResult.passthroughArgs), undefined);
+        assert.equal(isResumeCodexLaunch(args), false);
+        assert.equal(isCodexVersionRequest(args), false);
+        assert.deepEqual(parseResumeCodexHomeSelection(args), {
+            args,
+            explicitCodexHome: undefined,
+            projectOnly: false,
+        });
+        assert.deepEqual(normalizeCodexLaunchArgs(notifyTempResult.passthroughArgs), args);
+    });
+    it("parses resume-owned selectors only before the end-of-options marker", () => {
+        assert.deepEqual(parseResumeCodexHomeSelection([
+            "resume",
+            "--codex-home",
+            "/tmp/selected-codex-home",
+            "--project",
+            "--",
+            "--codex-home",
+            "/tmp/literal-codex-home",
+            "--project",
+        ]), {
+            args: [
+                "resume",
+                "--",
+                "--codex-home",
+                "/tmp/literal-codex-home",
+                "--project",
+            ],
+            explicitCodexHome: "/tmp/selected-codex-home",
+            projectOnly: true,
+        });
+        assert.equal(isResumeCodexLaunch(["resume", "--", "literal"]), true);
+        assert.equal(isCodexVersionRequest(["--version", "--", "literal"]), true);
+    });
+    it("removes hotswap only before the end-of-options marker", () => {
+        assert.deepEqual(stripHotswapArg(["--hotswap", "--", "--hotswap", "literal"]), ["--", "--hotswap", "literal"]);
+    });
+    it("preserves Codex launch authority and the first literal suffix when building quota resume args", () => {
+        assert.deepEqual(buildResumeArgsWithPreservedFlags([
+            "--model", "gpt-review",
+            "--model=gpt-review-fast",
+            "--config", "developer_instructions=enabled",
+            "--config=developer_instructions=overridden",
+            "--add-dir", "src",
+            "--remote", "ws://127.0.0.1:4500",
+            "--remote=ws://127.0.0.1:4501",
+            "--remote-auth-token-env", "CODEX_REMOTE_TOKEN",
+            "--remote-auth-token-env=CODEX_REMOTE_TOKEN_BACKUP",
+            "-i", "one.png",
+            "--image", "two.png",
+            "-i", "three.png,four.png",
+            "--image=five.png,six.png",
+            "-iseven.png,eight.png",
+            "--image=resume", "resume",
+            "--oss",
+            "--dangerously-bypass-approvals-and-sandbox",
+            "--model", "gpt-resume",
+            "resume", "old-session",
+            "--last", "--all", "--include-non-interactive",
+            "--", "--hotswap", "--last", "--all", "--include-non-interactive", "--model", "opaque-model", "literal suffix",
+        ], "session-123"), [
+            "resume", "session-123",
+            "--model", "gpt-review",
+            "--model=gpt-review-fast",
+            "--config", "developer_instructions=enabled",
+            "--config=developer_instructions=overridden",
+            "--add-dir", "src",
+            "--remote", "ws://127.0.0.1:4500",
+            "--remote=ws://127.0.0.1:4501",
+            "--remote-auth-token-env", "CODEX_REMOTE_TOKEN",
+            "--remote-auth-token-env=CODEX_REMOTE_TOKEN_BACKUP",
+            "-i", "one.png",
+            "--image", "two.png",
+            "-i", "three.png,four.png",
+            "--image=five.png,six.png",
+            "-iseven.png,eight.png",
+            "--image=resume",
+            "--oss",
+            "--dangerously-bypass-approvals-and-sandbox",
+            "--model", "gpt-resume",
+            "--", "--hotswap", "--last", "--all", "--include-non-interactive", "--model", "opaque-model", "literal suffix",
+        ]);
+    });
+    it("removes resume selectors only when synthesizing an explicit session", () => {
+        for (const selectors of [
+            ["--last"],
+            ["--all"],
+            ["--include-non-interactive"],
+            ["--last", "--all"],
+            ["--all", "--include-non-interactive"],
+            ["--last", "--all", "--include-non-interactive"],
+        ]) {
+            assert.deepEqual(buildResumeArgsWithPreservedFlags([
+                "resume",
+                ...selectors,
+                "--model", "gpt-review",
+                "--remote", "ws://127.0.0.1:4500",
+                "--", ...selectors, "opaque suffix",
+            ], "session-123"), [
+                "resume", "session-123",
+                "--model", "gpt-review",
+                "--remote", "ws://127.0.0.1:4500",
+                "--", ...selectors, "opaque suffix",
+            ], JSON.stringify(selectors));
+        }
+    });
+    it("treats only split image values as variadic", () => {
+        assert.deepEqual([...CODEX_GLOBAL_OPTIONS_WITH_SPLIT_VALUE], [
+            ["-a", "single"], ["--ask-for-approval", "single"], ["-c", "single"],
+            ["--config", "single"], ["-C", "single"], ["--cd", "single"],
+            ["-i", "variadic"], ["--image", "variadic"], ["-m", "single"],
+            ["--model", "single"], ["-p", "single"], ["--profile", "single"],
+            ["-s", "single"], ["--sandbox", "single"], ["--add-dir", "single"],
+            ["--disable", "single"], ["--enable", "single"], ["--local-provider", "single"],
+            ["--remote", "single"], ["--remote-auth-token-env", "single"],
+        ]);
+        for (const args of [
+            ["--model", "resume"], ["--remote", "resume"],
+            ["--image", "resume"], ["-i", "resume"], ["--image=resume"], ["-iresume"], ["-i=resume"],
+            ["-i", "one.png", "resume"], ["--image", "one.png", "resume"],
+            ["-i", "one.png", "-i", "two.png", "resume"],
+            ["--image", "one.png", "--image", "two.png", "resume"],
+            ["-i", "one.png,two.png", "resume"], ["--image", "one.png,two.png", "resume"],
+            ["exec", "resume"], ["--image", "one.png", "--", "resume"],
+        ]) {
+            assert.equal(isResumeCodexLaunch(args), false, JSON.stringify(args));
+        }
+        for (const args of [
+            ["--model", "gpt-review", "resume"],
+            ["--image=one.png", "resume"], ["-ione.png", "resume"], ["-i=one.png", "resume"],
+            ["--image", "one.png", "--model", "gpt-review", "resume"],
+            ["--image=one.png", "--model=gpt-review", "resume"],
+            ["-ione.png", "--remote", "ws://127.0.0.1:4500", "resume"],
+        ]) {
+            assert.equal(isResumeCodexLaunch(args), true, JSON.stringify(args));
+        }
     });
     it("maps --xhigh --madmax to codex-native flags only", () => {
         assert.deepEqual(normalizeCodexLaunchArgs(["--xhigh", "--madmax"]), [
@@ -483,6 +693,13 @@ describe("resolveNotifyTempContract", () => {
         ]);
         assert.equal(parsed.contract.warnings.length >= 1, true);
     });
+    it("does not activate or consume selectors after --", () => {
+        const args = ["--", "--notify-temp", "--discord", "--custom", "openclaw:ops"];
+        const parsed = resolveNotifyTempContract(args, {});
+        assert.equal(parsed.contract.active, false);
+        assert.deepEqual(parsed.contract.selectors, []);
+        assert.deepEqual(parsed.passthroughArgs, args);
+    });
     it("activates from OMX_NOTIFY_TEMP=1 env parity", () => {
         const parsed = resolveNotifyTempContract(["--model", "gpt-5"], {
             OMX_NOTIFY_TEMP: "1",
@@ -1140,6 +1357,10 @@ describe("resolveWorkerSparkModel", () => {
     it("returns undefined for empty args", () => {
         assert.equal(resolveWorkerSparkModel([]), undefined);
     });
+    it("returns undefined for spark flags after --", () => {
+        assert.equal(resolveWorkerSparkModel(["--", "--spark"]), undefined);
+        assert.equal(resolveWorkerSparkModel(["--", "--madmax-spark"]), undefined);
+    });
     it("reads low-complexity team model from config when codexHomeOverride is provided", async () => {
         // Intentional legacy model fixture: verifies an explicit user override is routed to workers unchanged.
         const codexHome = await mkdtemp(join(tmpdir(), "omx-codex-home-"));
@@ -1154,13 +1375,13 @@ describe("resolveWorkerSparkModel", () => {
 });
 describe("resolveTeamWorkerLaunchArgsEnv (spark)", () => {
     it("injects spark model as worker default when no explicit env model", () => {
-        assert.equal(resolveTeamWorkerLaunchArgsEnv(undefined, [], true, expectedLowComplexityModel()), `--model ${expectedLowComplexityModel()}`);
+        assert.equal(resolveTeamWorkerLaunchArgsEnv(undefined, [], true, expectedLowComplexityModel()), `"--model" "${expectedLowComplexityModel()}"`);
     });
     it("explicit env model overrides spark default", () => {
-        assert.equal(resolveTeamWorkerLaunchArgsEnv("--model gpt-5", [], true, expectedLowComplexityModel()), "--model gpt-5");
+        assert.equal(resolveTeamWorkerLaunchArgsEnv("--model gpt-5", [], true, expectedLowComplexityModel()), '"--model" "gpt-5"');
     });
     it("inherited leader model overrides spark default", () => {
-        assert.equal(resolveTeamWorkerLaunchArgsEnv(undefined, ["--model", "gpt-4.1"], true, expectedLowComplexityModel()), "--model gpt-4.1");
+        assert.equal(resolveTeamWorkerLaunchArgsEnv(undefined, ["--model", "gpt-4.1"], true, expectedLowComplexityModel()), '"--model" "gpt-4.1"');
     });
 });
 describe("commandOwnsLocalHelp", () => {
@@ -1311,6 +1532,13 @@ describe("resolveCliInvocation", () => {
         assert.match(HELP, /omx update --stable\s+Install\/rollback to npm stable \(oh-my-codex@latest\), then refresh setup/);
         assert.match(HELP, /omx update --dev\s+Install the upstream dev branch, then refresh setup/);
     });
+    it("advertises only the four supported root reasoning modes", () => {
+        assert.match(HELP, /omx reasoning Show or set model reasoning effort \(low\|medium\|high\|xhigh\)/);
+        assert.match(HELP, /--high\s+Launch Codex with high reasoning effort/);
+        assert.match(HELP, /--xhigh\s+Launch Codex with xhigh reasoning effort/);
+        assert.doesNotMatch(HELP, /--max/);
+        assert.doesNotMatch(HELP, /--ultra/);
+    });
     it("advertises concise launch policy controls in top-level help", () => {
         assert.match(HELP, /--direct\s+Launch the interactive leader directly/);
         assert.match(HELP, /OMX_LAUNCH_POLICY=auto[\s\S]*Use the default policy/);
@@ -1375,6 +1603,29 @@ describe("resolveSetupTeamModeArg", () => {
         assert.throws(() => resolveSetupTeamModeArg(["--team-mode=enabled", "--no-team"]), /Conflicting setup Team mode flags/);
     });
 });
+describe("resolveSetupAgentsMergePolicyArg", () => {
+    it("accepts only the explicit bare set and clear selectors", () => {
+        assert.deepEqual(resolveSetupAgentsMergePolicyArg([]), undefined);
+        assert.deepEqual(resolveSetupAgentsMergePolicyArg(["--merge-agents"]), { kind: "set", value: true });
+        assert.deepEqual(resolveSetupAgentsMergePolicyArg(["--no-merge-agents"]), { kind: "set", value: false });
+        assert.deepEqual(resolveSetupAgentsMergePolicyArg(["--clear-merge-agents-policy"]), { kind: "clear" });
+        assert.deepEqual(resolveSetupAgentsMergePolicyArg(["--merge-agents", "--merge-agents"]), { kind: "set", value: true });
+        assert.deepEqual(resolveSetupAgentsMergePolicyArg(["--clear-merge-agents-policy", "--clear-merge-agents-policy"]), { kind: "clear" });
+    });
+    it("rejects values, equals spellings, and conflicting policy selectors", () => {
+        for (const argv of [
+            ["--merge-agents=true"],
+            ["--no-merge-agents=false"],
+            ["--clear-merge-agents-policy=true"],
+            ["--merge-agents", "true"],
+            ["--no-merge-agents", "false"],
+        ]) {
+            assert.throws(() => resolveSetupAgentsMergePolicyArg(argv), /merge.*policy|merge-agents/i);
+        }
+        assert.throws(() => resolveSetupAgentsMergePolicyArg(["--merge-agents", "--no-merge-agents"]), /Conflicting.*merge.*policy/i);
+        assert.throws(() => resolveSetupAgentsMergePolicyArg(["--clear-merge-agents-policy", "--merge-agents"]), /Conflicting.*merge.*policy/i);
+    });
+});
 describe("resolveSetupScopeArg", () => {
     it("returns undefined when scope is omitted", () => {
         assert.equal(resolveSetupScopeArg(["--dry-run"]), undefined);
@@ -1806,6 +2057,10 @@ describe("project launch scope helpers", () => {
                 'trusted_hash = "sha256:setup-owned"',
                 "# End OMX-owned Codex hook trust state",
                 "",
+                "# User-owned project trust source must remain external during launch repair.",
+                `[projects."${wd}"] # retained external ownership`,
+                'trust_level = "trusted"',
+                "",
                 "# OMX-synced Codex project trust state (from runtime CODEX_HOME)",
                 `[projects."${wd}"]`,
                 'trust_level = "trusted"',
@@ -1826,6 +2081,9 @@ describe("project launch scope helpers", () => {
             assert.equal(countMatches(runtimeConfig, new RegExp(`^${escapedProjectHookTrustHeader}$`, "gm")), 1);
             assert.ok(runtimeConfig.includes(`[projects."${wd}"]`));
             assert.ok(repairedProjectConfig.includes(`[projects."${wd}"]`));
+            assert.match(repairedProjectConfig, /User-owned project trust source must remain external/);
+            assert.match(repairedProjectConfig, new RegExp(`^${escapeRegExp(`[projects."${wd}"]`)} # retained external ownership$`, "m"));
+            assert.equal(countMatches(repairedProjectConfig, new RegExp(`^${escapeRegExp(`[projects."${wd}"]`)}(?:\\s|$)`, "gm")), 1, "launch repair must remove only the marker-owned duplicate before the runtime mirror is written");
         }
         finally {
             await rm(wd, { recursive: true, force: true });
@@ -1974,6 +2232,107 @@ describe("project launch scope helpers", () => {
         }
     });
 });
+describe("pointer launch aborts", () => {
+    it("does not launch, tag, or retain a runtime home when a pointer lock is held", async () => {
+        const wd = await mkdtemp(join(tmpdir(), "omx-pointer-lock-launch-"));
+        try {
+            const binDir = join(wd, "bin");
+            const codexLog = join(wd, "codex.log");
+            const tmuxLog = join(wd, "tmux.log");
+            const lockPath = join(wd, ".omx", "state", "session.json.lock");
+            const ownerPath = join(lockPath, "owner.json");
+            const ownerContents = "{malformed-held-lock\n";
+            await mkdir(binDir, { recursive: true });
+            await mkdir(lockPath, { recursive: true });
+            await writeFile(join(wd, ".omx", "setup-scope.json"), JSON.stringify({ scope: "project" }));
+            await writeFile(ownerPath, ownerContents);
+            await writeFile(join(binDir, "codex"), `#!/bin/sh\nprintf 'spawned\\n' >> ${JSON.stringify(codexLog)}\n`);
+            await writeFile(join(binDir, "tmux"), `#!/bin/sh\ncase "$1" in set-option|display-message) printf '%s\\n' "$*" >> ${JSON.stringify(tmuxLog)} ;; esac\n`);
+            await chmod(join(binDir, "codex"), 0o755);
+            await chmod(join(binDir, "tmux"), 0o755);
+            const { spawnSync } = await import("node:child_process");
+            const result = spawnSync(process.execPath, [join(repoRoot, "dist", "cli", "omx.js"), "launch", "--direct"], {
+                cwd: wd,
+                encoding: "utf-8",
+                env: {
+                    ...process.env,
+                    HOME: join(wd, "home"),
+                    PATH: `${binDir}${delimiter}/usr/bin:/bin`,
+                    CODEX_HOME: "",
+                    OMX_ROOT: "",
+                    OMX_STATE_ROOT: "",
+                    OMX_TEAM_STATE_ROOT: "",
+                    OMX_SESSION_ID: "",
+                    OMX_MCP_WORKDIR_ROOTS: "",
+                    OMX_AUTO_UPDATE: "0",
+                    OMX_HOOK_DERIVED_SIGNALS: "0",
+                    OMX_NOTIFY_FALLBACK: "0",
+                    TMUX: "test-socket,1,1",
+                    TMUX_PANE: "%1",
+                },
+            });
+            assert.equal(result.status, 1, result.stderr || result.stdout);
+            assert.match(result.stderr, /session_pointer_lock_recovery_required/);
+            assert.equal(existsSync(codexLog), false);
+            assert.equal(existsSync(tmuxLog), false);
+            assert.equal(await readFile(ownerPath, "utf-8"), ownerContents);
+            assert.equal(existsSync(join(wd, ".omx", "state", "sessions")), false);
+            const runtimeRoot = join(wd, ".omx", "runtime", "codex-home");
+            assert.deepEqual(existsSync(runtimeRoot) ? await fsReaddir(runtimeRoot) : [], []);
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it("does not exec, tag, or retain a runtime home when pointer context root resolution is rejected", async () => {
+        const allowedRoot = await mkdtemp(join(tmpdir(), "omx-pointer-allowed-root-"));
+        const wd = await mkdtemp(join(tmpdir(), "omx-pointer-root-exec-"));
+        try {
+            const binDir = join(wd, "bin");
+            const codexLog = join(wd, "codex.log");
+            const tmuxLog = join(wd, "tmux.log");
+            await mkdir(binDir, { recursive: true });
+            await mkdir(join(wd, ".omx"), { recursive: true });
+            await writeFile(join(wd, ".omx", "setup-scope.json"), JSON.stringify({ scope: "project" }));
+            await writeFile(join(binDir, "codex"), `#!/bin/sh\nprintf 'spawned\\n' >> ${JSON.stringify(codexLog)}\n`);
+            await writeFile(join(binDir, "tmux"), `#!/bin/sh\ncase "$1" in set-option|display-message) printf '%s\\n' "$*" >> ${JSON.stringify(tmuxLog)} ;; esac\n`);
+            await chmod(join(binDir, "codex"), 0o755);
+            await chmod(join(binDir, "tmux"), 0o755);
+            const { spawnSync } = await import("node:child_process");
+            const result = spawnSync(process.execPath, [join(repoRoot, "dist", "cli", "omx.js"), "exec", "echo", "blocked"], {
+                cwd: wd,
+                encoding: "utf-8",
+                env: {
+                    ...process.env,
+                    HOME: join(wd, "home"),
+                    PATH: `${binDir}${delimiter}/usr/bin:/bin`,
+                    CODEX_HOME: "",
+                    OMX_ROOT: "",
+                    OMX_STATE_ROOT: "",
+                    OMX_TEAM_STATE_ROOT: "",
+                    OMX_SESSION_ID: "",
+                    OMX_AUTO_UPDATE: "0",
+                    OMX_HOOK_DERIVED_SIGNALS: "0",
+                    OMX_NOTIFY_FALLBACK: "0",
+                    OMX_MCP_WORKDIR_ROOTS: allowedRoot,
+                    TMUX: "test-socket,1,1",
+                    TMUX_PANE: "%1",
+                },
+            });
+            assert.equal(result.status, 1, result.stderr || result.stdout);
+            assert.match(result.stderr, /session_pointer_context_failure/);
+            assert.equal(existsSync(codexLog), false);
+            assert.equal(existsSync(tmuxLog), false);
+            assert.equal(existsSync(join(wd, ".omx", "state", "sessions")), false);
+            const runtimeRoot = join(wd, ".omx", "runtime", "codex-home");
+            assert.deepEqual(existsSync(runtimeRoot) ? await fsReaddir(runtimeRoot) : [], []);
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+            await rm(allowedRoot, { recursive: true, force: true });
+        }
+    });
+});
 describe("resolveCodexLaunchPolicy", () => {
     it("uses detached tmux on macOS when outside tmux and tmux is available", () => {
         assert.equal(resolveCodexLaunchPolicy({}, "darwin", true, false, true, true), "detached-tmux");
@@ -2269,6 +2628,49 @@ describe("detached tmux new-session sequencing", () => {
         assert.match(envScript, /export IS_GAJAE_SLOP_GENERATOR='1'/);
         assert.doesNotMatch(envScript, /not-a-shell-name/);
     });
+    it("omits only tmux-owned pane metadata from the detached session env", () => {
+        const envScript = serializeDetachedSessionParentEnv({
+            CUSTOM_LLM_API_KEY: "fake-provider-key",
+            TERM: "xterm-256color",
+            TERM_PROGRAM: "",
+            TERM_PROGRAM_VERSION: undefined,
+            TERMINFO: "/tmp/outer-terminfo",
+            TERMINFO_DIRS: "/tmp/outer-terminfo-dirs",
+            TERMCAP: "outer-termcap",
+            COLORTERM: "truecolor",
+            TMUX: "",
+            TMUX_PANE: undefined,
+            COLUMNS: "200",
+            LINES: "",
+        });
+        assert.match(envScript, /export CUSTOM_LLM_API_KEY='fake-provider-key'/);
+        assert.match(envScript, /export COLORTERM='truecolor'/);
+        assert.match(envScript, /export TERMINFO='\/tmp\/outer-terminfo'/);
+        assert.match(envScript, /export TERMINFO_DIRS='\/tmp\/outer-terminfo-dirs'/);
+        assert.match(envScript, /export TERMCAP='outer-termcap'/);
+        assert.doesNotMatch(envScript, /^unset\b/m);
+        for (const key of [
+            "TERM",
+            "TERM_PROGRAM",
+            "TERM_PROGRAM_VERSION",
+            "TMUX",
+            "TMUX_PANE",
+            "COLUMNS",
+            "LINES",
+        ]) {
+            assert.doesNotMatch(envScript, new RegExp(`^export ${key}=`, "m"));
+        }
+    });
+    it("round-trips shell-sensitive detached parent env values without evaluating them", { skip: process.platform === "win32" }, async () => {
+        const shellSensitiveValue = "literal ' quote $HOME $(printf injected) `printf injected`; \\ slash\nsecond line";
+        const envScript = serializeDetachedSessionParentEnv({
+            CUSTOM_LLM_API_KEY: shellSensitiveValue,
+            EMPTY_PROVIDER_KEY: "",
+        });
+        const result = (await import("node:child_process")).spawnSync("/bin/sh", ["-c", `${envScript}printf '%s\\n<%s>\\n' "$CUSTOM_LLM_API_KEY" "$EMPTY_PROVIDER_KEY"`], { encoding: "utf-8", env: { HOME: "/should-not-expand" } });
+        assert.equal(result.status, 0, result.stderr);
+        assert.equal(result.stdout, `${shellSensitiveValue}\n<>\n`);
+    });
     it("creates a repo-local omx command shim for launched Codex sessions", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-runtime-command-shim-"));
         try {
@@ -3693,26 +4095,63 @@ describe("team worker launch arg inheritance helpers", () => {
             "--dangerously-bypass-approvals-and-sandbox",
             "--model",
             "gpt-5",
-        ], true), '--no-alt-screen --dangerously-bypass-approvals-and-sandbox -c model_reasoning_effort="xhigh" --model old-b');
+        ], true), '"--no-alt-screen" "--dangerously-bypass-approvals-and-sandbox" "-c" "model_reasoning_effort=\\"xhigh\\"" "--model" "old-b"');
     });
     it("resolveTeamWorkerLaunchArgsEnv can opt out of leader inheritance", () => {
         assert.equal(resolveTeamWorkerLaunchArgsEnv("--no-alt-screen", [
             "--dangerously-bypass-approvals-and-sandbox",
             "-c",
             'model_reasoning_effort="xhigh"',
-        ], false), "--no-alt-screen");
+        ], false), '"--no-alt-screen"');
     });
     it("resolveTeamWorkerLaunchArgsEnv uses inherited model when env model is absent", () => {
-        assert.equal(resolveTeamWorkerLaunchArgsEnv("--no-alt-screen", ["--model=gpt-5.6-terra"], true), "--no-alt-screen --model gpt-5.6-terra");
+        assert.equal(resolveTeamWorkerLaunchArgsEnv("--no-alt-screen", ["--model=gpt-5.6-terra"], true), '"--no-alt-screen" "--model" "gpt-5.6-terra"');
     });
     it("resolveTeamWorkerLaunchArgsEnv uses frontier default model when env and inherited models are absent", () => {
-        assert.equal(resolveTeamWorkerLaunchArgsEnv("--no-alt-screen", ["--dangerously-bypass-approvals-and-sandbox"], true, DEFAULT_FRONTIER_MODEL), `--no-alt-screen --dangerously-bypass-approvals-and-sandbox --model ${DEFAULT_FRONTIER_MODEL}`);
+        assert.equal(resolveTeamWorkerLaunchArgsEnv("--no-alt-screen", ["--dangerously-bypass-approvals-and-sandbox"], true, DEFAULT_FRONTIER_MODEL), `"--no-alt-screen" "--dangerously-bypass-approvals-and-sandbox" "--model" "${DEFAULT_FRONTIER_MODEL}"`);
     });
     it("resolveTeamWorkerLaunchArgsEnv keeps exactly one final model with precedence env > inherited > default", () => {
-        assert.equal(resolveTeamWorkerLaunchArgsEnv("--model env-model --model=env-model-final", ["--model", "inherited-model"], true, "fallback-model"), "--model env-model-final");
+        assert.equal(resolveTeamWorkerLaunchArgsEnv("--model env-model --model=env-model-final", ["--model", "inherited-model"], true, "fallback-model"), '"--model" "env-model-final"');
     });
     it("resolveTeamWorkerLaunchArgsEnv prefers inherited model over default when env model is absent", () => {
-        assert.equal(resolveTeamWorkerLaunchArgsEnv("--no-alt-screen", ["--model", "inherited-model"], true, "fallback-model"), "--no-alt-screen --model inherited-model");
+        assert.equal(resolveTeamWorkerLaunchArgsEnv("--no-alt-screen", ["--model", "inherited-model"], true, "fallback-model"), '"--no-alt-screen" "--model" "inherited-model"');
+    });
+});
+describe("team worker launch argument environment serialization", () => {
+    it("round-trips quoted, empty, and literal args while direct policy suppresses inherited bypass", () => {
+        const raw = resolveTeamWorkerLaunchArgsEnv('"" "two words" $VAR --sandbox=workspace-write', [
+            "--dangerously-bypass-approvals-and-sandbox",
+            "--model", "leader-model",
+        ], true);
+        assert.ok(raw);
+        assert.deepEqual(splitWorkerLaunchArgs(raw ?? undefined), [
+            '',
+            'two words',
+            '$VAR',
+            '--sandbox', 'workspace-write',
+            '--model', 'leader-model',
+        ]);
+    });
+    it("round-trips Windows paths, including terminal backslashes, through the environment", () => {
+        const path = "C:\\Users\\alice\\file.txt";
+        const terminalPath = "C:\\Users\\alice\\";
+        const raw = resolveTeamWorkerLaunchArgsEnv([
+            "--add-dir", path,
+            "--add-dir", `"${path}"`,
+            "--add-dir", `'${terminalPath}'`,
+        ].join(" "), [], false);
+        assert.deepEqual(splitWorkerLaunchArgs(raw ?? undefined), [
+            "--add-dir", path,
+            "--add-dir", path,
+            "--add-dir", terminalPath,
+        ]);
+    });
+    it("honors the inheritance gate and rejects an explicitly mixed source before transport", () => {
+        const noInheritance = resolveTeamWorkerLaunchArgsEnv('--ask-for-approval=on-request', ["--dangerously-bypass-approvals-and-sandbox", "--model", "leader-model"], false);
+        assert.deepEqual(splitWorkerLaunchArgs(noInheritance ?? undefined), [
+            '--ask-for-approval', 'on-request',
+        ]);
+        assert.throws(() => resolveTeamWorkerLaunchArgsEnv('--dangerously-bypass-approvals-and-sandbox --sandbox workspace-write', []), /Invalid OMX_TEAM_WORKER_LAUNCH_ARGS: bypass cannot be combined with direct approval or sandbox policy/);
     });
 });
 describe("readTopLevelTomlString", () => {
@@ -3735,6 +4174,26 @@ describe("injectModelInstructionsBypassArgs", () => {
             'model_instructions_file="/tmp/my-project/AGENTS.md"',
         ]);
     });
+    it("inserts model instructions before the end-of-options marker", () => {
+        const args = injectModelInstructionsBypassArgs("/tmp/my-project", ["--", "--spark", "literal"], {});
+        assert.deepEqual(args, [
+            "-c",
+            'model_instructions_file="/tmp/my-project/AGENTS.md"',
+            "--",
+            "--spark",
+            "literal",
+        ]);
+    });
+    it("does not treat a post-marker model instructions token as an OMX override", () => {
+        const args = injectModelInstructionsBypassArgs("/tmp/my-project", ["--", "-c", 'model_instructions_file="/tmp/literal.md"'], {});
+        assert.deepEqual(args, [
+            "-c",
+            'model_instructions_file="/tmp/my-project/AGENTS.md"',
+            "--",
+            "-c",
+            'model_instructions_file="/tmp/literal.md"',
+        ]);
+    });
     it("does not append when bypass is disabled via env", () => {
         const args = injectModelInstructionsBypassArgs("/tmp/my-project", ["--model", "gpt-5"], { OMX_BYPASS_DEFAULT_SYSTEM_PROMPT: "0" });
         assert.deepEqual(args, ["--model", "gpt-5"]);