oh-my-codex 0.15.0 → 0.15.2

package/dist/cli/setup.js

@@ -14,25 +14,37 @@ import { 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";
-import { getCatalogAgentStatusByName, getInstallableNativeAgentNames, isNativeAgentInstallableStatus, } from "../agents/policy.js";
+import { getCatalogAgentStatusByName, getInstallableNativeAgentNames, isNativeAgentInstallableStatus, isSetupPromptAssetName, } from "../agents/policy.js";
 import { getPackageRoot } from "../utils/package.js";
 import { readSessionState, isSessionStale } from "../hooks/session.js";
 import { getCatalogHeadlineCounts } from "./catalog-contract.js";
 import { tryReadCatalogManifest } from "../catalog/reader.js";
 import { DEFAULT_FRONTIER_MODEL } from "../config/models.js";
-import { addGeneratedAgentsMarker, hasOmxManagedAgentsSections, isOmxGeneratedAgentsMd, } from "../utils/agents-md.js";
+import { addGeneratedAgentsMarker, hasOmxManagedAgentsSections, isOmxGeneratedAgentsMd, upsertManagedAgentsBlock, } from "../utils/agents-md.js";
+import { DEFAULT_HUD_CONFIG } from "../hud/types.js";
+import { SETUP_INSTALL_MODES, SETUP_SCOPES, getSetupScopeFilePath, readPersistedSetupPreferences, } from "./setup-preferences.js";
+import { OMX_LOCAL_MARKETPLACE_NAME, resolvePackagedOmxMarketplace, upsertLocalOmxMarketplaceRegistration, } from "./plugin-marketplace.js";
+async function resolveStatusLinePresetForSetup(projectRoot, options) {
+    if (options.force) {
+        return DEFAULT_HUD_CONFIG.statusLine.preset;
+    }
+    const path = join(projectRoot, ".omx", "hud-config.json");
+    if (!existsSync(path))
+        return undefined;
+    try {
+        const raw = JSON.parse(await readFile(path, "utf-8"));
+        const preset = raw?.statusLine?.preset;
+        if (preset === "minimal" || preset === "focused" || preset === "full") {
+            return preset;
+        }
+    }
+    catch {
+        // Malformed hud-config.json — fall through to default.
+    }
+    return undefined;
+}
 import { resolveAgentsModelTableContext, upsertAgentsModelTable, } from "../utils/agents-model-table.js";
-import { spawnPlatformCommandSync } from "../utils/platform-command.js";
-/**
- * Legacy scope values that may appear in persisted setup-scope.json files.
- * Both 'project-local' (renamed) and old 'project' (minimal, removed) are
- * migrated to the current 'project' scope on read.
- */
-const LEGACY_SCOPE_MIGRATION = {
-    "project-local": "project",
-};
-export const SETUP_SCOPES = ["user", "project"];
-export const SETUP_INSTALL_MODES = ["legacy", "plugin"];
+export { SETUP_INSTALL_MODES, SETUP_SCOPES };
 const PROJECT_GITIGNORE_ENTRIES = [
     ".omx/",
     ".codex/*",
@@ -74,7 +86,6 @@ const DEFAULT_SETUP_INSTALL_MODE = "legacy";
 const LEGACY_SETUP_MODEL = "gpt-5.3-codex";
 const DEFAULT_SETUP_MODEL = DEFAULT_FRONTIER_MODEL;
 const OBSOLETE_NATIVE_AGENT_FIELD = ["skill", "ref"].join("_");
-const TUI_OWNED_BY_CODEX_VERSION = [0, 107, 0];
 function createEmptyCategorySummary() {
     return {
         updated: 0,
@@ -250,19 +261,6 @@ async function buildLegacySkillOverlapNotice(scope) {
         message: `Detected ${overlap.overlappingSkillNames.length} overlapping skill names between canonical ${overlap.canonicalDir} and legacy ${overlap.legacyDir}.${mismatchSuffix} Remove or archive ~/.agents/skills after confirming ${overlap.canonicalDir} is the version you want Codex to load.`,
     };
 }
-function logCategorySummary(name, summary) {
-    console.log(`  ${name}: updated=${summary.updated}, unchanged=${summary.unchanged}, ` +
-        `backed_up=${summary.backedUp}, skipped=${summary.skipped}, removed=${summary.removed}`);
-}
-function isSetupScope(value) {
-    return SETUP_SCOPES.includes(value);
-}
-function getScopeFilePath(projectRoot) {
-    return join(projectRoot, ".omx", "setup-scope.json");
-}
-function isSetupInstallMode(value) {
-    return SETUP_INSTALL_MODES.includes(value);
-}
 export function resolveScopeDirectories(scope, projectRoot) {
     if (scope === "project") {
         const codexHomeDir = join(projectRoot, ".codex");
@@ -284,38 +282,9 @@ export function resolveScopeDirectories(scope, projectRoot) {
         skillsDir: userSkillsDir(),
     };
 }
-async function readPersistedSetupPreferences(projectRoot) {
-    const scopePath = getScopeFilePath(projectRoot);
-    if (!existsSync(scopePath))
-        return undefined;
-    try {
-        const raw = await readFile(scopePath, "utf-8");
-        const parsed = JSON.parse(raw);
-        const persisted = {};
-        if (parsed && typeof parsed.scope === "string") {
-            // Direct match to current scopes
-            if (isSetupScope(parsed.scope)) {
-                persisted.scope = parsed.scope;
-            }
-            // Migrate legacy scope values (project-local → project)
-            const migrated = LEGACY_SCOPE_MIGRATION[parsed.scope];
-            if (migrated) {
-                console.warn(`[omx] Migrating persisted setup scope "${parsed.scope}" → "${migrated}" ` +
-                    `(see issue #243: simplified to user/project).`);
-                persisted.scope = migrated;
-            }
-        }
-        if (parsed && typeof parsed.installMode === "string") {
-            if (isSetupInstallMode(parsed.installMode)) {
-                persisted.installMode = parsed.installMode;
-            }
-        }
-        return Object.keys(persisted).length > 0 ? persisted : undefined;
-    }
-    catch {
-        // ignore invalid persisted scope and fall back to prompt/default
-    }
-    return undefined;
+function logCategorySummary(name, summary) {
+    console.log(`  ${name}: updated=${summary.updated}, unchanged=${summary.unchanged}, ` +
+        `backed_up=${summary.backedUp}, skipped=${summary.skipped}, removed=${summary.removed}`);
 }
 async function promptForSetupScope(defaultScope) {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
@@ -326,14 +295,19 @@ async function promptForSetupScope(defaultScope) {
         output: process.stdout,
     });
     try {
+        const userDefaultMarker = defaultScope === "user" ? " (default)" : "";
+        const projectDefaultMarker = defaultScope === "project" ? " (default)" : "";
+        const defaultChoice = defaultScope === "project" ? "2" : "1";
         console.log("Select setup scope:");
-        console.log(`  1) user (default) — installs to ${codexHome()} (skills default to ${userSkillsDir()})`);
-        console.log("  2) project — installs to ./.codex (local to project)");
-        const answer = (await rl.question("Scope [1-2] (default: 1): "))
+        console.log(`  1) user${userDefaultMarker} — installs to ${codexHome()} (skills default to ${userSkillsDir()})`);
+        console.log(`  2) project${projectDefaultMarker} — installs to ./.codex (local to project)`);
+        const answer = (await rl.question(`Scope [1-2] (default: ${defaultChoice}): `))
             .trim()
             .toLowerCase();
         if (answer === "2" || answer === "project")
             return "project";
+        if (answer === "1" || answer === "user")
+            return "user";
         return defaultScope;
     }
     finally {
@@ -366,6 +340,44 @@ async function promptForSetupInstallMode(defaultMode) {
         rl.close();
     }
 }
+function hasPersistedSetupPreferences(preferences) {
+    return Boolean(preferences?.scope || preferences?.installMode);
+}
+function formatPersistedSetupPreferenceSummary(preferences) {
+    return [
+        `scope=${preferences.scope ?? "not recorded"}`,
+        `installMode=${preferences.installMode ?? "not recorded"}`,
+    ].join(", ");
+}
+async function promptForPersistedSetupReview(preferences) {
+    if (!process.stdin.isTTY || !process.stdout.isTTY) {
+        return "keep";
+    }
+    const rl = createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    try {
+        console.log("Existing OMX setup preferences detected:");
+        console.log(`  ${formatPersistedSetupPreferenceSummary(preferences)}`);
+        console.log("  1) keep   — reuse these choices for this setup run");
+        console.log("  2) review — review/change choices, using these values as defaults");
+        console.log("  3) reset  — ignore saved choices and run setup as if fresh");
+        const answer = (await rl.question("Setup preferences [1-3] (default: 1 keep): "))
+            .trim()
+            .toLowerCase();
+        if (answer === "2" || answer === "review" || answer === "change") {
+            return "review";
+        }
+        if (answer === "3" || answer === "reset" || answer === "fresh") {
+            return "reset";
+        }
+        return "keep";
+    }
+    finally {
+        rl.close();
+    }
+}
 async function promptForModelUpgrade(currentModel, targetModel) {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
         return false;
@@ -384,37 +396,6 @@ async function promptForModelUpgrade(currentModel, targetModel) {
         rl.close();
     }
 }
-function parseSemverTriplet(version) {
-    const match = version.match(/(\d+)\.(\d+)\.(\d+)/);
-    if (!match)
-        return null;
-    return [Number(match[1]), Number(match[2]), Number(match[3])];
-}
-function semverGte(version, minimum) {
-    if (version[0] !== minimum[0])
-        return version[0] > minimum[0];
-    if (version[1] !== minimum[1])
-        return version[1] > minimum[1];
-    return version[2] >= minimum[2];
-}
-function probeInstalledCodexVersion() {
-    const { result } = spawnPlatformCommandSync("codex", ["--version"], {
-        encoding: "utf-8",
-        stdio: ["pipe", "pipe", "pipe"],
-    });
-    if (result.error || result.status !== 0)
-        return null;
-    const stdout = (result.stdout || "").trim();
-    return stdout === "" ? null : stdout;
-}
-function shouldOmxManageTuiFromCodexVersion(versionOutput) {
-    if (!versionOutput)
-        return true;
-    const parsed = parseSemverTriplet(versionOutput);
-    if (!parsed)
-        return true;
-    return !semverGte(parsed, TUI_OWNED_BY_CODEX_VERSION);
-}
 async function promptForAgentsOverwrite(destinationPath) {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
         return false;
@@ -487,16 +468,22 @@ async function promptForPluginDeveloperInstructionsOverwrite(configPath) {
         rl.close();
     }
 }
-async function resolveSetupScope(projectRoot, requestedScope) {
+async function resolveSetupScope(projectRoot, requestedScope, persistedReviewDecision = "keep", persistedPreferences, setupScopePrompt) {
     if (requestedScope) {
         return { scope: requestedScope, source: "cli" };
     }
-    const persisted = await readPersistedSetupPreferences(projectRoot);
-    if (persisted?.scope) {
+    const persisted = persistedPreferences ?? (await readPersistedSetupPreferences(projectRoot));
+    if (persisted?.scope && persistedReviewDecision === "keep") {
         return { scope: persisted.scope, source: "persisted" };
     }
-    if (process.stdin.isTTY && process.stdout.isTTY) {
-        const scope = await promptForSetupScope(DEFAULT_SETUP_SCOPE);
+    if (typeof setupScopePrompt === "function" ||
+        (process.stdin.isTTY && process.stdout.isTTY)) {
+        const defaultScope = persistedReviewDecision === "review" && persisted?.scope
+            ? persisted.scope
+            : DEFAULT_SETUP_SCOPE;
+        const scope = setupScopePrompt
+            ? await setupScopePrompt(defaultScope)
+            : await promptForSetupScope(defaultScope);
         return { scope, source: "prompt" };
     }
     return { scope: DEFAULT_SETUP_SCOPE, source: "default" };
@@ -555,21 +542,26 @@ async function discoverOmxPluginCacheDir(cacheRoot = join(codexHome(), "plugins"
     }
     return null;
 }
-async function resolveSetupInstallMode(projectRoot, scope, requestedInstallMode, installModePrompt) {
+async function resolveSetupInstallMode(projectRoot, scope, requestedInstallMode, installModePrompt, persistedReviewDecision = "keep", persistedPreferences) {
     if (requestedInstallMode) {
         return { installMode: requestedInstallMode, source: "cli" };
     }
-    const persisted = await readPersistedSetupPreferences(projectRoot);
-    if (persisted?.installMode && persisted.scope === scope) {
+    const persisted = persistedPreferences ?? (await readPersistedSetupPreferences(projectRoot));
+    if (persisted?.installMode &&
+        persistedReviewDecision === "keep" &&
+        persisted.scope === scope) {
         return { installMode: persisted.installMode, source: "persisted" };
     }
     if (scope !== "user")
         return null;
     const discoveredPluginCacheDir = await discoverOmxPluginCacheDir();
-    const defaultMode = discoveredPluginCacheDir
-        ? "plugin"
-        : DEFAULT_SETUP_INSTALL_MODE;
-    if (process.stdin.isTTY && process.stdout.isTTY) {
+    const defaultMode = persistedReviewDecision === "review" && persisted?.installMode
+        ? persisted.installMode
+        : discoveredPluginCacheDir
+            ? "plugin"
+            : DEFAULT_SETUP_INSTALL_MODE;
+    if (typeof installModePrompt === "function" ||
+        (process.stdin.isTTY && process.stdout.isTTY)) {
         if (discoveredPluginCacheDir) {
             console.log(`Detected installed oh-my-codex Codex plugin cache at ${discoveredPluginCacheDir}.`);
         }
@@ -644,7 +636,7 @@ async function ensureProjectGitignore(projectRoot, backupContext, options) {
     return destinationExists ? "updated" : "created";
 }
 async function persistSetupPreferences(projectRoot, preferences, options) {
-    const scopePath = getScopeFilePath(projectRoot);
+    const scopePath = getSetupScopeFilePath(projectRoot);
     if (options.dryRun) {
         if (options.verbose)
             console.log(`  dry-run: skip persisting ${scopePath}`);
@@ -675,31 +667,15 @@ async function cleanupPluginModeLegacyPrompts(srcDir, dstDir, backupContext, opt
     if (!existsSync(srcDir) || !existsSync(dstDir))
         return summary;
     const manifest = tryReadCatalogManifest();
-    const agentStatusByName = manifest
-        ? getCatalogAgentStatusByName(manifest)
-        : null;
     for (const file of await readdir(srcDir)) {
         if (!file.endsWith(".md"))
             continue;
         const promptName = file.slice(0, -3);
-        const status = agentStatusByName?.get(promptName);
-        if (agentStatusByName && !isNativeAgentInstallableStatus(status))
+        if (manifest && !isSetupPromptAssetName(promptName, manifest))
             continue;
-        const src = join(srcDir, file);
         const dst = join(dstDir, file);
         if (!existsSync(dst))
             continue;
-        const [srcContent, dstContent] = await Promise.all([
-            readFile(src, "utf-8"),
-            readFile(dst, "utf-8"),
-        ]);
-        if (srcContent !== dstContent) {
-            summary.skipped += 1;
-            if (options.verbose) {
-                console.log(`  skipped legacy prompt cleanup for ${file}: installed content differs from OMX-managed content`);
-            }
-            continue;
-        }
         if (await ensureBackup(dst, true, backupContext, options)) {
             summary.backedUp += 1;
         }
@@ -708,7 +684,7 @@ async function cleanupPluginModeLegacyPrompts(srcDir, dstDir, backupContext, opt
         }
         summary.removed += 1;
         if (options.verbose) {
-            console.log(`  ${options.dryRun ? "would remove" : "removed"} legacy prompt ${file}`);
+            console.log(`  ${options.dryRun ? "would archive and remove" : "archived and removed"} legacy prompt ${file}`);
         }
     }
     await removeEmptyDirectoryIfPresent(dstDir, options);
@@ -735,10 +711,11 @@ async function cleanupPluginModeLegacyNativeAgents(pkgRoot, agentsDir, backupCon
             codexHomeOverride: join(agentsDir, ".."),
         });
         const installedToml = await readFile(dst, "utf-8");
-        if (installedToml !== expectedToml) {
+        if (installedToml !== expectedToml &&
+            !isGeneratedOmxNativeAgentToml(installedToml, name)) {
             summary.skipped += 1;
             if (options.verbose) {
-                console.log(`  skipped legacy native agent cleanup for ${name}.toml: installed content differs from OMX-managed content`);
+                console.log(`  skipped legacy native agent cleanup for ${name}.toml: installed content is not an OMX-generated native agent`);
             }
             continue;
         }
@@ -750,9 +727,14 @@ async function cleanupPluginModeLegacyNativeAgents(pkgRoot, agentsDir, backupCon
         }
         summary.removed += 1;
         if (options.verbose) {
-            console.log(`  ${options.dryRun ? "would remove" : "removed"} legacy native agent ${name}.toml`);
+            console.log(`  ${options.dryRun ? "would archive and remove" : "archived and removed"} legacy native agent ${name}.toml`);
         }
     }
+    if (manifest) {
+        const generatedCleanup = await cleanupGeneratedNonInstallableNativeAgents(agentsDir, manifest, backupContext, options);
+        summary.backedUp += generatedCleanup.backedUp;
+        summary.removed += generatedCleanup.removed;
+    }
     await removeEmptyDirectoryIfPresent(agentsDir, options);
     return summary;
 }
@@ -820,6 +802,34 @@ function insertRootTomlKey(config, line) {
     const after = lines.slice(firstTableIndex);
     return [...before, line, "", ...after].join("\n") + "\n";
 }
+async function ensurePluginMarketplaceRegistration(configPath, pkgRoot, backupContext, summary, options) {
+    const packagedMarketplace = await resolvePackagedOmxMarketplace(pkgRoot);
+    if (!packagedMarketplace) {
+        summary.skipped += 1;
+        return "unavailable";
+    }
+    const existingConfig = existsSync(configPath)
+        ? await readFile(configPath, "utf-8")
+        : "";
+    const nextConfig = upsertLocalOmxMarketplaceRegistration(existingConfig, pkgRoot);
+    const destinationExists = existsSync(configPath);
+    if (nextConfig === existingConfig) {
+        summary.unchanged += 1;
+        return "unchanged";
+    }
+    if (await ensureBackup(configPath, destinationExists, backupContext, options)) {
+        summary.backedUp += 1;
+    }
+    if (!options.dryRun) {
+        await mkdir(dirname(configPath), { recursive: true });
+        await writeFile(configPath, nextConfig);
+    }
+    summary.updated += 1;
+    if (options.verbose) {
+        console.log(`  ${options.dryRun ? "would register" : "registered"} local Codex plugin marketplace ${OMX_LOCAL_MARKETPLACE_NAME} from ${pkgRoot}`);
+    }
+    return "updated";
+}
 async function applyPluginModeHooksConfig(configPath, hooksPath, pkgRoot, backupContext, summary, options) {
     const existingConfig = existsSync(configPath)
         ? await readFile(configPath, "utf-8")
@@ -931,11 +941,29 @@ async function cleanupPluginModeLegacyAgentsMd(agentsMdPath, backupContext, opti
     return true;
 }
 export async function setup(options = {}) {
-    const { force = false, dryRun = false, installMode: requestedInstallMode, scope: requestedScope, verbose = false, installModePrompt, modelUpgradePrompt, pluginAgentsMdPrompt, pluginDeveloperInstructionsPrompt, pluginDeveloperInstructionsOverwritePrompt, } = options;
+    const { force = false, dryRun = false, installMode: requestedInstallMode, scope: requestedScope, verbose = false, setupScopePrompt, persistedSetupReviewPrompt, installModePrompt, modelUpgradePrompt, pluginAgentsMdPrompt, pluginDeveloperInstructionsPrompt, pluginDeveloperInstructionsOverwritePrompt, } = options;
     const pkgRoot = getPackageRoot();
     const projectRoot = process.cwd();
-    const resolvedScope = await resolveSetupScope(projectRoot, requestedScope);
-    const resolvedInstallMode = await resolveSetupInstallMode(projectRoot, resolvedScope.scope, requestedInstallMode, installModePrompt);
+    const persistedPreferences = await readPersistedSetupPreferences(projectRoot, { warnOnLegacyScope: true });
+    let persistedReviewDecision = "keep";
+    const effectiveScopeForInstallMode = requestedScope ?? persistedPreferences?.scope ?? DEFAULT_SETUP_SCOPE;
+    const wouldUsePersistedScope = !requestedScope && Boolean(persistedPreferences?.scope);
+    const wouldUsePersistedInstallMode = !requestedInstallMode &&
+        Boolean(persistedPreferences?.installMode) &&
+        (!persistedPreferences?.scope ||
+            persistedPreferences.scope === effectiveScopeForInstallMode);
+    const shouldReviewPersistedSetup = hasPersistedSetupPreferences(persistedPreferences) &&
+        (wouldUsePersistedScope || wouldUsePersistedInstallMode) &&
+        (typeof persistedSetupReviewPrompt === "function" ||
+            (process.stdin.isTTY && process.stdout.isTTY));
+    if (shouldReviewPersistedSetup) {
+        persistedReviewDecision = persistedSetupReviewPrompt
+            ? await persistedSetupReviewPrompt(persistedPreferences)
+            : await promptForPersistedSetupReview(persistedPreferences);
+        console.log(`Setup preference review: ${persistedReviewDecision} (${formatPersistedSetupPreferenceSummary(persistedPreferences)})\n`);
+    }
+    const resolvedScope = await resolveSetupScope(projectRoot, requestedScope, persistedReviewDecision, persistedPreferences, setupScopePrompt);
+    const resolvedInstallMode = await resolveSetupInstallMode(projectRoot, resolvedScope.scope, requestedInstallMode, installModePrompt, persistedReviewDecision, persistedPreferences);
     const scopeDirs = resolveScopeDirectories(resolvedScope.scope, projectRoot);
     const scopeSourceMessage = resolvedScope.source === "persisted" ? " (from .omx/setup-scope.json)" : "";
     const backupContext = getBackupContext(resolvedScope.scope, projectRoot);
@@ -987,14 +1015,17 @@ export async function setup(options = {}) {
         if (verbose)
             console.log(`  mkdir ${dir}`);
     }
-    await persistSetupPreferences(projectRoot, resolvedInstallMode
+    const setupPreferencesToPersist = resolvedInstallMode &&
+        (resolvedScope.scope === "user" ||
+            resolvedInstallMode.installMode === "plugin")
         ? {
             scope: resolvedScope.scope,
             installMode: resolvedInstallMode.installMode,
         }
         : {
             scope: resolvedScope.scope,
-        }, {
+        };
+    await persistSetupPreferences(projectRoot, setupPreferencesToPersist, {
         dryRun,
         verbose,
     });
@@ -1018,7 +1049,7 @@ export async function setup(options = {}) {
         if (isPluginInstallMode) {
             summary.prompts = await cleanupPluginModeLegacyPrompts(promptsSrc, promptsDst, backupContext, { dryRun, verbose });
             console.log(summary.prompts.removed > 0
-                ? `  ${dryRun ? "Would remove" : "Removed"} ${summary.prompts.removed} legacy OMX-managed prompt file(s).\n`
+                ? `  ${dryRun ? "Would archive and remove" : "Archived and removed"} ${summary.prompts.removed} legacy OMX-managed prompt file(s).\n`
                 : "  Prompt refresh skipped; no legacy OMX-managed prompt files found.\n");
         }
         else {
@@ -1084,7 +1115,7 @@ export async function setup(options = {}) {
     if (isPluginInstallMode) {
         summary.nativeAgents = await cleanupPluginModeLegacyNativeAgents(pkgRoot, scopeDirs.nativeAgentsDir, backupContext, { dryRun, verbose });
         console.log(summary.nativeAgents.removed > 0
-            ? `  ${dryRun ? "Would remove" : "Removed"} ${summary.nativeAgents.removed} legacy OMX-managed native agent config(s).\n`
+            ? `  ${dryRun ? "Would archive and remove" : "Archived and removed"} ${summary.nativeAgents.removed} legacy OMX-managed native agent config(s).\n`
             : "  Native agent refresh skipped; no legacy OMX-managed native agent configs found.\n");
     }
     else {
@@ -1107,6 +1138,16 @@ export async function setup(options = {}) {
             ? `  ${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 });
+        const pluginMarketplaceResult = await ensurePluginMarketplaceRegistration(scopeDirs.codexConfigFile, pkgRoot, 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.`);
+        }
+        else if (pluginMarketplaceResult === "updated") {
+            console.log(`  ${dryRun ? "Would register" : "Registered"} local Codex plugin marketplace ${OMX_LOCAL_MARKETPLACE_NAME} (${pkgRoot}).`);
+        }
+        else {
+            console.log(`  Local Codex plugin marketplace ${OMX_LOCAL_MARKETPLACE_NAME} already registered (${pkgRoot}).`);
+        }
         resolvedConfig = existsSync(scopeDirs.codexConfigFile)
             ? await readFile(scopeDirs.codexConfigFile, "utf-8")
             : "";
@@ -1150,11 +1191,13 @@ export async function setup(options = {}) {
         for (const warning of sharedMcpRegistry.warnings) {
             console.log(`  warning: ${warning}`);
         }
+        const statusLinePreset = await resolveStatusLinePresetForSetup(projectRoot, { force });
         const managedConfig = await updateManagedConfig(scopeDirs.codexConfigFile, pkgRoot, sharedMcpRegistry, summary.config, backupContext, {
-            codexVersionProbe: options.codexVersionProbe,
             dryRun,
             modelUpgradePrompt,
             verbose,
+            statusLinePreset,
+            forceStatusLinePreset: force,
         });
         resolvedConfig = managedConfig.finalConfig;
         omxManagesTui = managedConfig.omxManagesTui;
@@ -1251,18 +1294,26 @@ export async function setup(options = {}) {
             let changed = true;
             let canApplyManagedModelRefresh = false;
             let managedRefreshContent = "";
+            let canApplyManagedAgentsMerge = false;
+            let mergedAgentsContent = "";
             if (agentsMdExists) {
                 const existing = await readFile(agentsMdDst, "utf-8");
                 changed = existing !== rewritten;
-                if (hasOmxManagedAgentsSections(existing)) {
-                    managedRefreshContent = upsertAgentsModelTable(existing, modelTableContext);
-                    canApplyManagedModelRefresh = managedRefreshContent !== existing;
+                if (options.mergeAgents) {
+                    mergedAgentsContent = upsertManagedAgentsBlock(existing, rewritten);
+                    canApplyManagedAgentsMerge = mergedAgentsContent !== existing;
+                }
+                else {
+                    if (hasOmxManagedAgentsSections(existing)) {
+                        managedRefreshContent = upsertAgentsModelTable(existing, modelTableContext);
+                        canApplyManagedModelRefresh = managedRefreshContent !== existing;
+                    }
                 }
             }
             if (resolvedScope.scope === "project" &&
                 sessionIsActive &&
                 agentsMdExists &&
-                changed) {
+                (changed || canApplyManagedAgentsMerge || canApplyManagedModelRefresh)) {
                 summary.agentsMd.skipped += 1;
                 console.log("  WARNING: Active omx session detected (pid " +
                     activeSession?.pid +
@@ -1270,6 +1321,20 @@ export async function setup(options = {}) {
                 console.log("  Skipping AGENTS.md overwrite to avoid corrupting runtime overlay.");
                 console.log("  Stop the active session first, then re-run setup.");
             }
+            else if (options.mergeAgents &&
+                agentsMdExists &&
+                !canApplyManagedAgentsMerge) {
+                summary.agentsMd.unchanged += 1;
+                console.log(resolvedScope.scope === "project"
+                    ? "  AGENTS.md already up to date in project root."
+                    : `  AGENTS.md already up to date in ${scopeDirs.codexHomeDir}.`);
+            }
+            else if (canApplyManagedAgentsMerge) {
+                await syncManagedContent(mergedAgentsContent, agentsMdDst, summary.agentsMd, backupContext, { dryRun, verbose }, `merged AGENTS ${agentsMdDst}`);
+                console.log(resolvedScope.scope === "project"
+                    ? "  Merged OMX-managed AGENTS.md sections into project root."
+                    : `  Merged OMX-managed AGENTS.md sections into ${scopeDirs.codexHomeDir}.`);
+            }
             else if (canApplyManagedModelRefresh) {
                 await syncManagedContent(managedRefreshContent, agentsMdDst, summary.agentsMd, backupContext, { dryRun, verbose }, `AGENTS model table ${agentsMdDst}`);
                 console.log(resolvedScope.scope === "project"
@@ -1334,9 +1399,6 @@ export async function setup(options = {}) {
     if (omxManagesTui) {
         console.log("  StatusLine configured in config.toml via [tui] section.");
     }
-    else {
-        console.log("  Codex CLI >= 0.107.0 manages [tui]; OMX left that section untouched.");
-    }
     console.log();
     console.log("Setup refresh summary:");
     logCategorySummary("prompts", summary.prompts);
@@ -1358,7 +1420,7 @@ export async function setup(options = {}) {
     console.log("\nNext steps:");
     console.log("  1. Start Codex CLI in your project directory");
     if (isPluginInstallMode) {
-        console.log("  2. Codex plugin discovery supplies OMX skills and workflow surfaces");
+        console.log(`  2. Registered Codex marketplace ${OMX_LOCAL_MARKETPLACE_NAME} supplies OMX skills and workflow surfaces`);
         console.log("  3. Browse plugin-provided skills with /skills");
         console.log("  4. Optional AGENTS.md and developer_instructions defaults are only installed when selected during plugin-mode setup");
         console.log("  5. Legacy native-agent TOML defaults remain uninstalled in plugin mode");
@@ -1519,17 +1581,15 @@ async function installPrompts(srcDir, dstDir, backupContext, options) {
         ? getCatalogAgentStatusByName(manifest)
         : null;
     const files = await readdir(srcDir);
-    const staleCandidatePromptNames = new Set(manifest?.agents.map((agent) => agent.name) ?? []);
     for (const file of files) {
         if (!file.endsWith(".md"))
             continue;
         const promptName = file.slice(0, -3);
-        staleCandidatePromptNames.add(promptName);
         const status = agentStatusByName?.get(promptName);
-        if (agentStatusByName && !isNativeAgentInstallableStatus(status)) {
+        if (manifest && !isSetupPromptAssetName(promptName, manifest)) {
             summary.skipped += 1;
             if (options.verbose) {
-                const label = status ?? "unlisted";
+                const label = status ?? "unclassified";
                 console.log(`  skipped ${file} (status: ${label})`);
             }
             continue;
@@ -1548,13 +1608,14 @@ async function installPrompts(srcDir, dstDir, backupContext, options) {
                 continue;
             const promptName = file.slice(0, -3);
             const status = agentStatusByName?.get(promptName);
-            if (isNativeAgentInstallableStatus(status))
-                continue;
-            if (!staleCandidatePromptNames.has(promptName) && status === undefined)
+            if (isSetupPromptAssetName(promptName, manifest))
                 continue;
             const stalePromptPath = join(dstDir, file);
             if (!existsSync(stalePromptPath))
                 continue;
+            if (await ensureBackup(stalePromptPath, true, backupContext, options)) {
+                summary.backedUp += 1;
+            }
             if (!options.dryRun) {
                 await rm(stalePromptPath, { force: true });
             }
@@ -1570,6 +1631,55 @@ async function installPrompts(srcDir, dstDir, backupContext, options) {
     }
     return summary;
 }
+function isGeneratedOmxNativeAgentToml(content, agentName) {
+    const firstLine = content.split(/\r?\n/, 1)[0]?.trim();
+    return firstLine === `# oh-my-codex agent: ${agentName}`;
+}
+async function cleanupGeneratedNonInstallableNativeAgents(agentsDir, manifest, backupContext, options) {
+    const summary = createEmptyCategorySummary();
+    if (!existsSync(agentsDir))
+        return summary;
+    const agentStatusByName = getCatalogAgentStatusByName(manifest);
+    const installedFiles = await readdir(agentsDir);
+    for (const file of installedFiles) {
+        if (!file.endsWith(".toml"))
+            continue;
+        const agentName = file.slice(0, -5);
+        const agentStatus = agentStatusByName.get(agentName);
+        if (agentStatus === undefined ||
+            isNativeAgentInstallableStatus(agentStatus)) {
+            continue;
+        }
+        const staleAgentPath = join(agentsDir, file);
+        let content = "";
+        try {
+            content = await readFile(staleAgentPath, "utf-8");
+        }
+        catch {
+            continue;
+        }
+        if (!isGeneratedOmxNativeAgentToml(content, agentName)) {
+            if (options.verbose) {
+                console.log(`  skipped stale native agent ${file}: not an OMX-generated native agent`);
+            }
+            continue;
+        }
+        if (await ensureBackup(staleAgentPath, true, backupContext, options)) {
+            summary.backedUp += 1;
+        }
+        if (!options.dryRun) {
+            await rm(staleAgentPath, { force: true });
+        }
+        summary.removed += 1;
+        if (options.verbose) {
+            const prefix = options.dryRun
+                ? "would remove stale generated native agent"
+                : "removed stale generated native agent";
+            console.log(`  ${prefix} ${file} (status: ${agentStatus})`);
+        }
+    }
+    return summary;
+}
 async function refreshNativeAgentConfigs(pkgRoot, agentsDir, backupContext, options) {
     const summary = createEmptyCategorySummary();
     if (!options.dryRun) {
@@ -1605,6 +1715,11 @@ async function refreshNativeAgentConfigs(pkgRoot, agentsDir, backupContext, opti
         await syncManagedContent(toml, dst, summary, backupContext, options, `native agent ${name}.toml`);
     }
     summary.removed += await cleanupObsoleteNativeAgents(agentsDir, backupContext, options);
+    if (manifest) {
+        const generatedCleanup = await cleanupGeneratedNonInstallableNativeAgents(agentsDir, manifest, backupContext, options);
+        summary.backedUp += generatedCleanup.backedUp;
+        summary.removed += generatedCleanup.removed;
+    }
     if (options.force && manifest && existsSync(agentsDir)) {
         const installedFiles = await readdir(agentsDir);
         for (const file of installedFiles) {
@@ -1620,6 +1735,9 @@ async function refreshNativeAgentConfigs(pkgRoot, agentsDir, backupContext, opti
             const staleAgentPath = join(agentsDir, file);
             if (!existsSync(staleAgentPath))
                 continue;
+            if (await ensureBackup(staleAgentPath, true, backupContext, options)) {
+                summary.backedUp += 1;
+            }
             if (!options.dryRun) {
                 await rm(staleAgentPath, { force: true });
             }
@@ -1823,8 +1941,7 @@ async function updateManagedConfig(configPath, pkgRoot, sharedMcpRegistry, summa
     const hadLegacyTeamRunTable = hasLegacyOmxTeamRunTable(existing);
     const currentModel = getRootModelName(existing);
     let modelOverride;
-    const codexVersion = options.codexVersionProbe?.() ?? probeInstalledCodexVersion();
-    const omxManagesTui = shouldOmxManageTuiFromCodexVersion(codexVersion);
+    const omxManagesTui = true;
     if (currentModel === LEGACY_SETUP_MODEL) {
         const shouldPrompt = typeof options.modelUpgradePrompt === "function" ||
             (process.stdin.isTTY && process.stdout.isTTY);
@@ -1843,6 +1960,8 @@ async function updateManagedConfig(configPath, pkgRoot, sharedMcpRegistry, summa
         sharedMcpServers: sharedMcpRegistry.servers,
         sharedMcpRegistrySource: sharedMcpRegistry.sourcePath,
         verbose: options.verbose,
+        statusLinePreset: options.statusLinePreset,
+        forceStatusLinePreset: options.forceStatusLinePreset,
     });
     const changed = existing !== finalConfig;
     if (!changed) {