oh-my-codex 0.18.2 → 0.18.4

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

@@ -1,11 +1,12 @@
 import { afterEach, describe, it, mock } from "node:test";
 import assert from "node:assert/strict";
-import { existsSync, mkdirSync, utimesSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, utimesSync } from "node:fs";
 import { chmod, mkdir, mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
 import { 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, commandOwnsLocalHelp, resolveCodexLaunchPolicy, resolveEffectiveLeaderLaunchPolicyOverride, resolveEnvLaunchPolicyOverride, resolveLeaderLaunchPolicyOverride, classifyCodexExecFailure, resolveSignalExitCode, parseTmuxPaneSnapshot, findHudWatchPaneIds, buildHudPaneCleanupTargets, readTopLevelTomlString, upsertTopLevelTomlString, collectInheritableTeamWorkerArgs, resolveTeamWorkerLaunchArgsEnv, injectModelInstructionsBypassArgs, resolveWorkerSparkModel, resolveSetupInstallModeArg, resolveSetupMcpModeArg, resolveSetupScopeArg, resolveLaunchConfigRepairOptions, readPersistedSetupPreferences, readPersistedSetupScope, resolveCodexConfigPathForLaunch, resolveCodexHomeForLaunch, resolveProjectLocalCodexHomeForLaunch, shouldAutoIsolateMadmaxLaunch, createMadmaxIsolatedRoot, buildMadmaxDetachedLaunchContextKey, withMadmaxDetachedContextLock, resolveOmxRootForLaunch, resolveDisposableWorktreeOmxRootForLaunch, prepareCodexHomeForLaunch, persistProjectLaunchRuntimeAuthState, persistProjectLaunchRuntimeProjectTrustState, runtimeCodexHomePath, buildDetachedSessionBootstrapSteps, buildDetachedTmuxSessionName, buildDetachedSessionFinalizeSteps, buildDetachedSessionRollbackSteps, detectDetachedSessionWindowIndex, resolveNotifyTempContract, buildNotifyTempStartupMessages, buildNotifyFallbackWatcherEnv, shouldEnableNotifyFallbackWatcher, reapStaleNotifyFallbackWatcher, cleanupLaunchOrphanedMcpProcesses, reapPostLaunchOrphanedMcpProcesses, cleanupPostLaunchModeStateFiles, resolveBackgroundHelperLaunchMode, shouldDetachBackgroundHelper, resolveNotifyFallbackWatcherScript, resolveHookDerivedWatcherScript, resolveNotifyHookScript, buildDetachedWindowsBootstrapScript, acquireTmuxExtendedKeysLease, resolveNativeSessionName, releaseTmuxExtendedKeysLease, withTmuxExtendedKeys, serializeDetachedSessionParentEnv, CODEX_SQLITE_HOME_ENV, } from "../index.js";
 import { mergeConfig, repairConfigIfNeeded } from "../../config/generator.js";
 import { ensureReusableNodeModules } from "../../utils/repo-deps.js";
@@ -22,6 +23,9 @@ function normalizeDarwinTmpPath(value) {
 function escapeRegExp(value) {
     return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
+function countMatches(text, pattern) {
+    return text.match(pattern)?.length ?? 0;
+}
 function expectedLowComplexityModel(codexHomeOverride) {
     return getTeamLowComplexityModel(codexHomeOverride);
 }
@@ -1052,6 +1056,7 @@ describe("commandOwnsLocalHelp", () => {
             "question",
             "autoresearch",
             "deepinit",
+            "explore",
             "hooks",
             "hud",
             "ralph",
@@ -1515,7 +1520,10 @@ describe("project launch scope helpers", () => {
             assert.ok(persistedProjectConfig.includes(`[projects."${wd}"]`), "expected workspace trust entry to be persisted to project config.toml");
             assert.ok(persistedProjectConfig.includes('trust_level = "trusted"'), "expected trust_level to be persisted to project config.toml");
             assert.doesNotMatch(persistedProjectConfig, /model_availability_nux/, "NUX counters must not leak into durable project config.toml");
-            assert.ok(persistedProjectConfig.includes(`[hooks.state."${join(projectCodexHome, "hooks.json")}:pre_tool_use:0:0"]`), "setup-owned project hook trust state must remain intact");
+            const projectHookTrustHeader = `[hooks.state."${join(projectCodexHome, "hooks.json")}:pre_tool_use:0:0"]`;
+            assert.ok(persistedProjectConfig.includes(projectHookTrustHeader), "setup-owned project hook trust state must remain intact");
+            assert.equal(countMatches(persistedProjectConfig, new RegExp(`^${escapeRegExp(projectHookTrustHeader)}$`, "gm")), 1, "runtime trust sync must not duplicate setup-owned hook trust state");
+            assert.doesNotThrow(() => TOML.parse(persistedProjectConfig));
             // 3. On a subsequent launch, the runtime mirror carries the persisted
             //    project trust state forward — so Codex finds the workspace as
             //    already-trusted and never re-prompts.
@@ -1524,12 +1532,63 @@ describe("project launch scope helpers", () => {
             const nextRuntimeCodexHome = runtimeCodexHomePath(wd, "session-2470-repeat");
             const nextRuntimeConfig = await readFile(join(nextRuntimeCodexHome, "config.toml"), "utf-8");
             assert.ok(nextRuntimeConfig.includes(`[projects."${wd}"]`), "next launch must inherit the persisted workspace trust entry");
+            assert.equal(countMatches(nextRuntimeConfig, new RegExp(`^${escapeRegExp(projectHookTrustHeader)}$`, "gm")), 1, "next runtime config must remain parseable without duplicate hook trust tables");
+            assert.doesNotThrow(() => TOML.parse(nextRuntimeConfig));
             assert.equal(existsSync(join(nextRuntimeCodexHome, "hooks.json")), false);
         }
         finally {
             await rm(wd, { recursive: true, force: true });
         }
     });
+    it("repairs duplicate project hook trust state before relaunching project-scope Codex home (GH #2401)", async () => {
+        const wd = await mkdtemp(join(tmpdir(), "omx-issue-2401-relaunch-"));
+        try {
+            const projectCodexHome = join(wd, ".codex");
+            const projectConfigPath = join(projectCodexHome, "config.toml");
+            const projectHooksPath = join(projectCodexHome, "hooks.json");
+            const projectHookTrustHeader = `[hooks.state."${projectHooksPath}:post_compact:0:0"]`;
+            const escapedProjectHookTrustHeader = escapeRegExp(projectHookTrustHeader);
+            await mkdir(join(wd, ".omx"), { recursive: true });
+            await mkdir(projectCodexHome, { recursive: true });
+            await writeFile(join(wd, ".omx", "setup-scope.json"), JSON.stringify({ scope: "project" }));
+            await writeFile(projectHooksPath, '{"hooks":{}}\n');
+            await writeFile(projectConfigPath, [
+                'model = "gpt-5.5"',
+                "",
+                "[features]",
+                "hooks = true",
+                "",
+                "# OMX-owned Codex hook trust state",
+                "# Trusts only setup-managed native hook wrappers.",
+                projectHookTrustHeader,
+                'trusted_hash = "sha256:setup-owned"',
+                "# End OMX-owned Codex hook trust state",
+                "",
+                "# OMX-synced Codex project trust state (from runtime CODEX_HOME)",
+                `[projects."${wd}"]`,
+                'trust_level = "trusted"',
+                "",
+                projectHookTrustHeader,
+                'trusted_hash = "sha256:setup-owned"',
+                "",
+                "# End OMX-synced Codex project trust state",
+                "",
+            ].join("\n"));
+            assert.throws(() => TOML.parse(readFileSync(projectConfigPath, "utf-8")));
+            await prepareCodexHomeForLaunch(wd, "session-relaunch", {});
+            const repairedProjectConfig = await readFile(projectConfigPath, "utf-8");
+            const runtimeConfig = await readFile(join(runtimeCodexHomePath(wd, "session-relaunch"), "config.toml"), "utf-8");
+            assert.doesNotThrow(() => TOML.parse(repairedProjectConfig));
+            assert.doesNotThrow(() => TOML.parse(runtimeConfig));
+            assert.equal(countMatches(repairedProjectConfig, new RegExp(`^${escapedProjectHookTrustHeader}$`, "gm")), 1);
+            assert.equal(countMatches(runtimeConfig, new RegExp(`^${escapedProjectHookTrustHeader}$`, "gm")), 1);
+            assert.ok(runtimeConfig.includes(`[projects."${wd}"]`));
+            assert.ok(repairedProjectConfig.includes(`[projects."${wd}"]`));
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
     it("keeps setup-owned hook trust state targeted at the project hooks path (GH #2470)", async () => {
         const wd = await mkdtemp(join(tmpdir(), "omx-launch-runtime-hook-trust-"));
         try {
@@ -1935,6 +1994,15 @@ describe("detached tmux new-session sequencing", () => {
         assert.doesNotMatch(argsText, /CUSTOM_LLM_API_KEY/);
         assert.doesNotMatch(argsText, /fake-provider-key/);
     });
+    it("runCodex coalesces stale same-leader HUD panes across session ids", async () => {
+        const source = await readFile(join(repoRoot, "src", "cli", "index.ts"), "utf8");
+        assert.match(source, /const staleHudPaneIds = currentPaneId\s*\? listHudWatchPaneIdsInCurrentWindow\(currentPaneId, \{ sessionId, leaderPaneId: currentPaneId \}\)\s*: \[\];/);
+        assert.doesNotMatch(source, /const staleHudPaneIds = listHudWatchPaneIdsInCurrentWindow\(currentPaneId, \{ leaderPaneId: currentPaneId \}\);/);
+    });
+    it("runCodex skips launch-time HUD cleanup when TMUX_PANE is unavailable", async () => {
+        const source = await readFile(join(repoRoot, "src", "cli", "index.ts"), "utf8");
+        assert.match(source, /const staleHudPaneIds = currentPaneId\s*\? listHudWatchPaneIdsInCurrentWindow\(currentPaneId, \{ sessionId, leaderPaneId: currentPaneId \}\)\s*: \[\];/);
+    });
     it("runCodex builds inside-tmux HUD command with OMX_SESSION_ID and OMX_ROOT when set", async () => {
         const source = await readFile(join(repoRoot, 'src', 'cli', 'index.ts'), 'utf-8');
         assert.match(source, /const hudEnvArgs = \[\s*`OMX_SESSION_ID=\$\{sessionId\}`,\s*`\$\{OMX_TMUX_HUD_OWNER_ENV\}=1`,\s*\.\.\.\(currentPaneId \? \[`\$\{OMX_TMUX_HUD_LEADER_PANE_ENV\}=\$\{currentPaneId\}`\] : \[\]\),\s*\.\.\.\(omxRootOverride \? \[`OMX_ROOT=\$\{omxRootOverride\}`\] : \[\]\),\s*\]/);