oh-my-codex 0.16.4 → 0.17.1

package/dist/cli/setup.d.ts.map

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

package/dist/cli/setup.js

@@ -9,8 +9,8 @@ import { spawnSync } from "child_process";
 import { createInterface } from "readline/promises";
 import { homedir } from "os";
 import { codexHome, codexConfigPath, codexPromptsDir, codexAgentsDir, userSkillsDir, omxStateDir, detectLegacySkillRootOverlap, omxPlansDir, omxLogsDir, } from "../utils/paths.js";
-import { buildMergedConfig, getRootModelName, getRootTomlArray, hasLegacyOmxTeamRunTable, isOmxManagedNotifyCommand, sanitizePreviousNotifyCommand, stripExistingOmxBlocks, stripExistingSharedMcpRegistryBlock, mergeSharedMcpRegistryBlock, stripOmxEnvSettings, stripOmxFeatureFlags, stripOmxSeededBehavioralDefaults, upsertPluginModeRuntimeFeatureFlags, upsertManagedCodexHookTrustState, stripManagedCodexHookTrustState, OMX_PLUGIN_DEVELOPER_INSTRUCTIONS, } from "../config/generator.js";
-import { mergeManagedCodexHooksConfig } from "../config/codex-hooks.js";
+import { buildMergedConfig, getRootModelName, getRootTomlArray, hasLegacyOmxTeamRunTable, isOmxManagedNotifyCommand, sanitizePreviousNotifyCommand, stripExistingOmxBlocks, stripExistingSharedMcpRegistryBlock, mergeSharedMcpRegistryBlock, stripOmxEnvSettings, stripOmxFeatureFlags, stripOmxSeededBehavioralDefaults, upsertPluginModeRuntimeFeatureFlags, upsertManagedCodexHookTrustState, stripManagedCodexHookTrustState, OMX_PLUGIN_DEVELOPER_INSTRUCTIONS, hasFirstPartyOmxMcpRegistrations, extractFirstPartyOmxMcpSections, stripFirstPartyOmxMcpSections, } from "../config/generator.js";
+import { buildManagedCodexNativeHookWindowsShimContent, buildManagedCodexNativeHookWindowsShimPath, mergeManagedCodexHooksConfig, } from "../config/codex-hooks.js";
 import { getLegacyUnifiedMcpRegistryCandidate, getUnifiedMcpRegistryCandidates, loadUnifiedMcpRegistry, planClaudeCodeMcpSettingsSync, } from "../config/mcp-registry.js";
 import { generateAgentToml } from "../agents/native-config.js";
 import { AGENT_DEFINITIONS } from "../agents/definitions.js";
@@ -23,7 +23,7 @@ import { DEFAULT_FRONTIER_MODEL } from "../config/models.js";
 import { addGeneratedAgentsMarker, hasOmxManagedAgentsSections, isOmxGeneratedAgentsMd, upsertManagedAgentsBlock, } from "../utils/agents-md.js";
 import { DEFAULT_HUD_CONFIG } from "../hud/types.js";
 import { SETUP_INSTALL_MODES, SETUP_MCP_MODES, SETUP_SCOPES, getSetupScopeFilePath, readPersistedSetupPreferences, } from "./setup-preferences.js";
-import { OMX_LOCAL_MARKETPLACE_NAME, resolvePackagedOmxMarketplace, upsertLocalOmxMarketplaceRegistration, upsertLocalOmxPluginEnablement, upsertLocalOmxPluginMcpServerEnablement, } from "./plugin-marketplace.js";
+import { OMX_LOCAL_MARKETPLACE_NAME, OMX_PLUGIN_NAME, materializePackagedOmxPluginCache, resolvePackagedOmxMarketplace, upsertLocalOmxMarketplaceRegistration, upsertLocalOmxPluginEnablement, upsertLocalOmxPluginMcpServerEnablement, hasLocalOmxPluginMcpServerRegistrations, } from "./plugin-marketplace.js";
 import { resolveCodexHookFeatureFlagForCli } from "./codex-feature-probe.js";
 async function resolveStatusLinePresetForSetup(projectRoot, options) {
     if (options.force) {
@@ -349,6 +349,28 @@ async function promptForSetupInstallMode(defaultMode) {
         rl.close();
     }
 }
+async function promptForFirstPartyMcpRemoval(configPath, registrationKinds) {
+    if (!process.stdin.isTTY || !process.stdout.isTTY) {
+        return false;
+    }
+    const rl = createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    try {
+        console.log("Deprecated first-party OMX MCP registration detected:");
+        console.log(`  ${configPath}`);
+        console.log(`  ${registrationKinds.join(", ")}`);
+        console.log("  OMX is CLI-first by default now; first-party MCP compatibility is legacy/explicit.");
+        const answer = (await rl.question("Remove first-party OMX MCP registrations now? [y/N]: "))
+            .trim()
+            .toLowerCase();
+        return answer === "y" || answer === "yes";
+    }
+    finally {
+        rl.close();
+    }
+}
 function hasPersistedSetupPreferences(preferences) {
     return Boolean(preferences?.scope || preferences?.installMode);
 }
@@ -585,7 +607,7 @@ async function discoverOmxPluginCacheDirs(cacheRoot = join(codexHome(), "plugins
 async function discoverOmxPluginCacheDir(cacheRoot = join(codexHome(), "plugins", "cache")) {
     return (await discoverOmxPluginCacheDirs(cacheRoot))[0] ?? null;
 }
-async function refreshOmxPluginDiscoveryCache(pkgRoot, options) {
+async function refreshOmxPluginDiscoveryCache(pkgRoot, options, codexHomeDir = codexHome()) {
     const packagedMarketplace = await resolvePackagedOmxMarketplace(pkgRoot);
     if (!packagedMarketplace) {
         return { status: "unavailable", staleDirs: [] };
@@ -593,7 +615,7 @@ async function refreshOmxPluginDiscoveryCache(pkgRoot, options) {
     const [pkg, expectedSkillNames, cachedDirs] = await Promise.all([
         readFile(join(pkgRoot, "package.json"), "utf-8").then((raw) => JSON.parse(raw)),
         listChildDirectoryNames(join(packagedMarketplace.pluginRoot, "skills")),
-        discoverOmxPluginCacheDirs(),
+        discoverOmxPluginCacheDirs(join(codexHomeDir, "plugins", "cache")),
     ]);
     const expectedVersion = typeof pkg.version === "string" ? pkg.version : null;
     const staleDirs = [];
@@ -902,7 +924,7 @@ function insertRootTomlKey(config, line) {
     const after = lines.slice(firstTableIndex);
     return [...before, line, "", ...after].join("\n") + "\n";
 }
-async function ensurePluginMarketplaceRegistration(configPath, pkgRoot, mcpMode, backupContext, summary, options) {
+async function ensurePluginMarketplaceRegistration(configPath, pkgRoot, mcpMode, removeFirstPartyMcp, backupContext, summary, options) {
     const packagedMarketplace = await resolvePackagedOmxMarketplace(pkgRoot);
     if (!packagedMarketplace) {
         summary.skipped += 1;
@@ -911,7 +933,7 @@ async function ensurePluginMarketplaceRegistration(configPath, pkgRoot, mcpMode,
     const existingConfig = existsSync(configPath)
         ? await readFile(configPath, "utf-8")
         : "";
-    const nextConfig = upsertLocalOmxMarketplaceRegistration(upsertLocalOmxPluginMcpServerEnablement(upsertLocalOmxPluginEnablement(existingConfig), mcpMode === "compat"), pkgRoot);
+    const nextConfig = upsertLocalOmxMarketplaceRegistration(upsertLocalOmxPluginMcpServerEnablement(upsertLocalOmxPluginEnablement(existingConfig), mcpMode === "compat", { removeWhenDisabled: removeFirstPartyMcp }), pkgRoot);
     const destinationExists = existsSync(configPath);
     if (nextConfig === existingConfig) {
         summary.unchanged += 1;
@@ -930,11 +952,11 @@ async function ensurePluginMarketplaceRegistration(configPath, pkgRoot, mcpMode,
     }
     return "updated";
 }
-async function applyPluginModeHooksConfig(configPath, hooksPath, pkgRoot, backupContext, summary, options) {
+async function applyPluginModeHooksConfig(configPath, hooksPath, pkgRoot, codexHomeDir, backupContext, summary, options) {
     const existingConfig = existsSync(configPath)
         ? await readFile(configPath, "utf-8")
         : "";
-    const nextConfig = upsertManagedCodexHookTrustState(upsertPluginModeRuntimeFeatureFlags(stripManagedCodexHookTrustState(existingConfig), options.codexHookFeatureFlag), pkgRoot, hooksPath);
+    const nextConfig = upsertManagedCodexHookTrustState(upsertPluginModeRuntimeFeatureFlags(stripManagedCodexHookTrustState(existingConfig), options.codexHookFeatureFlag), pkgRoot, hooksPath, { platform: process.platform, codexHomeDir });
     if (nextConfig !== existingConfig) {
         if (await ensureBackup(configPath, existsSync(configPath), backupContext, options)) {
             summary.backedUp += 1;
@@ -951,8 +973,9 @@ async function applyPluginModeHooksConfig(configPath, hooksPath, pkgRoot, backup
     const existingHooksContent = existsSync(hooksPath)
         ? await readFile(hooksPath, "utf-8")
         : null;
-    const hooksConfig = mergeManagedCodexHooksConfig(existingHooksContent, pkgRoot, hooksPath);
+    const hooksConfig = mergeManagedCodexHooksConfig(existingHooksContent, pkgRoot, hooksPath, { platform: process.platform, codexHomeDir });
     await syncManagedContent(hooksConfig, hooksPath, summary, backupContext, options, `native hooks ${hooksPath}`);
+    await syncManagedWindowsNativeHookShim(codexHomeDir, pkgRoot, summary, backupContext, options);
     if (options.verbose) {
         console.log(`  ${options.dryRun ? "would configure" : "configured"} plugin-mode native hooks and runtime feature flags at ${hooksPath}`);
     }
@@ -996,7 +1019,11 @@ async function cleanupPluginModeLegacyConfig(configPath, backupContext, options)
     if (!existsSync(configPath))
         return false;
     const original = await readFile(configPath, "utf-8");
+    const preservedFirstPartyMcp = options.preserveFirstPartyMcp
+        ? extractFirstPartyOmxMcpSections(original)
+        : "";
     let config = original;
+    config = stripFirstPartyOmxMcpSections(config);
     config = stripExistingOmxBlocks(config).cleaned;
     config = stripExistingSharedMcpRegistryBlock(config).cleaned;
     config = stripPluginModeLegacyRootDefaults(config);
@@ -1004,6 +1031,9 @@ async function cleanupPluginModeLegacyConfig(configPath, backupContext, options)
     config = stripOmxFeatureFlags(config);
     config = stripManagedCodexHookTrustState(config);
     config = stripOmxEnvSettings(config);
+    if (preservedFirstPartyMcp) {
+        config = `${config.trimEnd()}\n\n${preservedFirstPartyMcp}\n`;
+    }
     config = config.trim();
     const nextConfig = config.length > 0 ? `${config}\n` : "";
     if (nextConfig === original)
@@ -1042,7 +1072,7 @@ async function cleanupPluginModeLegacyAgentsMd(agentsMdPath, backupContext, opti
     return true;
 }
 export async function setup(options = {}) {
-    const { force = false, dryRun = false, installMode: requestedInstallMode, mcpMode: requestedMcpMode, scope: requestedScope, verbose = false, setupScopePrompt, persistedSetupReviewPrompt, installModePrompt, modelUpgradePrompt, pluginAgentsMdPrompt, pluginDeveloperInstructionsPrompt, pluginDeveloperInstructionsOverwritePrompt, } = options;
+    const { force = false, dryRun = false, installMode: requestedInstallMode, mcpMode: requestedMcpMode, scope: requestedScope, verbose = false, setupScopePrompt, persistedSetupReviewPrompt, installModePrompt, modelUpgradePrompt, pluginAgentsMdPrompt, pluginDeveloperInstructionsPrompt, pluginDeveloperInstructionsOverwritePrompt, firstPartyMcpRemovalPrompt, } = options;
     const pkgRoot = getPackageRoot();
     const projectRoot = process.cwd();
     const persistedPreferences = await readPersistedSetupPreferences(projectRoot, { warnOnLegacyScope: true });
@@ -1071,6 +1101,29 @@ export async function setup(options = {}) {
     const resolvedInstallMode = await resolveSetupInstallMode(projectRoot, resolvedScope.scope, requestedInstallMode, installModePrompt, persistedReviewDecision, persistedPreferences);
     const resolvedMcpMode = resolveSetupMcpMode(resolvedScope.scope, requestedMcpMode, persistedReviewDecision, persistedPreferences);
     const scopeDirs = resolveScopeDirectories(resolvedScope.scope, projectRoot);
+    const existingConfigForMcpMigration = existsSync(scopeDirs.codexConfigFile)
+        ? await readFile(scopeDirs.codexConfigFile, "utf-8")
+        : "";
+    const firstPartyMcpRegistrationKinds = [
+        hasFirstPartyOmxMcpRegistrations(existingConfigForMcpMigration)
+            ? "config.toml [mcp_servers.omx_*]"
+            : null,
+        hasLocalOmxPluginMcpServerRegistrations(existingConfigForMcpMigration)
+            ? "plugin mcp_servers overrides"
+            : null,
+    ].filter((kind) => typeof kind === "string");
+    let removeFirstPartyMcpRegistrations = false;
+    const shouldOfferFirstPartyMcpRemoval = resolvedMcpMode.mcpMode !== "compat" &&
+        firstPartyMcpRegistrationKinds.length > 0;
+    if (shouldOfferFirstPartyMcpRemoval) {
+        const canPrompt = typeof firstPartyMcpRemovalPrompt === "function" ||
+            (process.stdin.isTTY && process.stdout.isTTY);
+        if (canPrompt) {
+            removeFirstPartyMcpRegistrations = firstPartyMcpRemovalPrompt
+                ? await firstPartyMcpRemovalPrompt(scopeDirs.codexConfigFile, firstPartyMcpRegistrationKinds)
+                : await promptForFirstPartyMcpRemoval(scopeDirs.codexConfigFile, firstPartyMcpRegistrationKinds);
+        }
+    }
     const scopeSourceMessage = resolvedScope.source === "persisted" ? " (from .omx/setup-scope.json)" : "";
     const backupContext = getBackupContext(resolvedScope.scope, projectRoot);
     const isPluginInstallMode = resolvedInstallMode?.installMode === "plugin";
@@ -1100,6 +1153,14 @@ export async function setup(options = {}) {
         ? " (from .omx/setup-scope.json)"
         : "";
     console.log(`Using setup MCP mode: ${resolvedMcpMode.mcpMode}${mcpModeSourceMessage}\n`);
+    if (shouldOfferFirstPartyMcpRemoval) {
+        if (removeFirstPartyMcpRegistrations) {
+            console.log("Deprecated first-party OMX MCP registrations will be removed from config.toml during this setup run.\n");
+        }
+        else {
+            console.log("warning: deprecated first-party OMX MCP registrations were detected but preserved. OMX supports CLI-first setup by default; rerun interactively and answer yes to remove them, or use --mcp compat only when explicit MCP compatibility is required.\n");
+        }
+    }
     // Step 1: Ensure directories exist
     console.log("[1/8] Creating directories...");
     const dirs = isPluginInstallMode
@@ -1269,14 +1330,19 @@ export async function setup(options = {}) {
         console.log(`  warning: ${warning}`);
     }
     if (isPluginInstallMode) {
-        const configCleaned = await cleanupPluginModeLegacyConfig(scopeDirs.codexConfigFile, backupContext, { dryRun, verbose });
+        const configCleaned = await cleanupPluginModeLegacyConfig(scopeDirs.codexConfigFile, backupContext, {
+            dryRun,
+            verbose,
+            preserveFirstPartyMcp: shouldOfferFirstPartyMcpRemoval &&
+                !removeFirstPartyMcpRegistrations,
+        });
         if (configCleaned)
             summary.config.removed += 1;
         console.log(configCleaned
             ? `  ${dryRun ? "Would clean" : "Cleaned"} legacy OMX config entries for plugin mode.\n`
             : "  Config refresh skipped; no legacy OMX config entries found.\n");
-        await applyPluginModeHooksConfig(scopeDirs.codexConfigFile, scopeDirs.codexHooksFile, pkgRoot, backupContext, summary.config, { dryRun, verbose, codexHookFeatureFlag });
-        const pluginMarketplaceResult = await ensurePluginMarketplaceRegistration(scopeDirs.codexConfigFile, pkgRoot, resolvedMcpMode.mcpMode, backupContext, summary.config, { dryRun, verbose });
+        await applyPluginModeHooksConfig(scopeDirs.codexConfigFile, scopeDirs.codexHooksFile, pkgRoot, scopeDirs.codexHomeDir, backupContext, summary.config, { dryRun, verbose, codexHookFeatureFlag });
+        const pluginMarketplaceResult = await ensurePluginMarketplaceRegistration(scopeDirs.codexConfigFile, pkgRoot, resolvedMcpMode.mcpMode, removeFirstPartyMcpRegistrations, backupContext, summary.config, { dryRun, verbose });
         if (pluginMarketplaceResult === "unavailable") {
             console.log(`  warning: packaged ${OMX_LOCAL_MARKETPLACE_NAME} Codex plugin marketplace metadata not found; /skills plugin discovery was not registered.`);
         }
@@ -1286,16 +1352,24 @@ export async function setup(options = {}) {
         else {
             console.log(`  Local Codex plugin marketplace ${OMX_LOCAL_MARKETPLACE_NAME} already registered (${pkgRoot}).`);
         }
+        const packagedMarketplace = await resolvePackagedOmxMarketplace(pkgRoot);
         const pluginCacheRefresh = await refreshOmxPluginDiscoveryCache(pkgRoot, {
             dryRun,
             verbose,
-        });
+        }, scopeDirs.codexHomeDir);
         if (pluginCacheRefresh.status === "refreshed") {
             console.log(`  ${dryRun ? "Would invalidate" : "Invalidated"} ${pluginCacheRefresh.staleDirs.length} stale Codex plugin discovery cache entr${pluginCacheRefresh.staleDirs.length === 1 ? "y" : "ies"} so plugin skills refresh from the packaged manifest.`);
         }
         else if (pluginCacheRefresh.status === "unchanged") {
             console.log("  Codex plugin discovery cache already matches packaged plugin metadata.");
         }
+        const pluginCacheMaterialize = await materializePackagedOmxPluginCache(scopeDirs.codexHomeDir, packagedMarketplace, { dryRun });
+        if (pluginCacheMaterialize.status === "materialized") {
+            console.log(`  ${dryRun ? "Would install" : "Installed"} local Codex plugin cache for ${OMX_LOCAL_MARKETPLACE_NAME}/${OMX_PLUGIN_NAME} at ${pluginCacheMaterialize.cacheDir}.`);
+        }
+        else if (pluginCacheMaterialize.status === "unchanged") {
+            console.log("  Local Codex plugin cache already exposes packaged OMX skills.");
+        }
         if (shouldSyncSharedMcpRegistry) {
             resolvedConfig = await syncSharedMcpRegistryIntoConfig(scopeDirs.codexConfigFile, sharedMcpRegistry, summary.config, backupContext, { dryRun, verbose });
             if (resolvedScope.scope === "user") {
@@ -1328,7 +1402,7 @@ export async function setup(options = {}) {
     }
     else {
         const statusLinePreset = await resolveStatusLinePresetForSetup(projectRoot, { force });
-        const managedConfig = await updateManagedConfig(scopeDirs.codexConfigFile, scopeDirs.codexHooksFile, pkgRoot, sharedMcpRegistry, resolvedMcpMode.mcpMode, resolvedScope.scope, scopeDirs.codexHomeDir, summary.config, backupContext, {
+        const managedConfig = await updateManagedConfig(scopeDirs.codexConfigFile, scopeDirs.codexHooksFile, pkgRoot, sharedMcpRegistry, resolvedMcpMode.mcpMode, shouldOfferFirstPartyMcpRemoval && !removeFirstPartyMcpRegistrations, resolvedScope.scope, scopeDirs.codexHomeDir, summary.config, backupContext, {
             dryRun,
             modelUpgradePrompt,
             verbose,
@@ -1348,8 +1422,9 @@ export async function setup(options = {}) {
         const existingHooksContent = existsSync(scopeDirs.codexHooksFile)
             ? await readFile(scopeDirs.codexHooksFile, "utf-8")
             : null;
-        const hooksConfig = mergeManagedCodexHooksConfig(existingHooksContent, pkgRoot);
+        const hooksConfig = mergeManagedCodexHooksConfig(existingHooksContent, pkgRoot, scopeDirs.codexHooksFile, { platform: process.platform, codexHomeDir: scopeDirs.codexHomeDir });
         await syncManagedContent(hooksConfig, scopeDirs.codexHooksFile, summary.config, backupContext, { dryRun, verbose }, `native hooks ${scopeDirs.codexHooksFile}`);
+        await syncManagedWindowsNativeHookShim(scopeDirs.codexHomeDir, pkgRoot, summary.config, backupContext, { dryRun, verbose });
         console.log(`  Native Codex hooks refresh complete (${scopeDirs.codexHooksFile}).\n`);
     }
     // Step 5.5: Verify team CLI interop surface is available.
@@ -1656,6 +1731,13 @@ async function syncManagedContent(content, dstPath, summary, backupContext, opti
         console.log(`  ${options.dryRun ? "would update" : "updated"} ${verboseLabel}`);
     }
 }
+async function syncManagedWindowsNativeHookShim(codexHomeDir, pkgRoot, summary, backupContext, options) {
+    if (process.platform !== "win32")
+        return;
+    const shimPath = buildManagedCodexNativeHookWindowsShimPath(codexHomeDir);
+    const shimContent = buildManagedCodexNativeHookWindowsShimContent(pkgRoot);
+    await syncManagedContent(shimContent, shimPath, summary, backupContext, options, `native hook Windows shim ${shimPath}`);
+}
 async function syncManagedAgentsContent(content, dstPath, summary, backupContext, options) {
     const destinationExists = existsSync(dstPath);
     let existing = "";
@@ -2133,7 +2215,7 @@ async function buildNotifyMergePlan(existingConfig, pkgRoot, codexHomeDir, scope
         },
     };
 }
-async function updateManagedConfig(configPath, hooksPath, pkgRoot, sharedMcpRegistry, mcpMode, scope, codexHomeDir, summary, backupContext, options) {
+async function updateManagedConfig(configPath, hooksPath, pkgRoot, sharedMcpRegistry, mcpMode, preserveExistingFirstPartyMcp, scope, codexHomeDir, summary, backupContext, options) {
     const existing = existsSync(configPath)
         ? await readFile(configPath, "utf-8")
         : "";
@@ -2157,6 +2239,8 @@ async function updateManagedConfig(configPath, hooksPath, pkgRoot, sharedMcpRegi
     const finalConfig = buildMergedConfig(existing, pkgRoot, {
         includeTui: omxManagesTui,
         codexHooksFile: hooksPath,
+        codexHomeDir,
+        hookCommandPlatform: process.platform,
         codexHookFeatureFlag: options.codexHookFeatureFlag,
         modelOverride,
         sharedMcpServers: sharedMcpRegistry.servers,
@@ -2166,6 +2250,7 @@ async function updateManagedConfig(configPath, hooksPath, pkgRoot, sharedMcpRegi
         forceStatusLinePreset: options.forceStatusLinePreset,
         notifyCommand: notifyPlan.notifyCommand,
         includeFirstPartyMcp: mcpMode === "compat",
+        preserveExistingFirstPartyMcp,
     });
     const changed = existing !== finalConfig;
     if (!changed) {