oh-my-codex 0.20.3 → 0.21.0

package/dist/cli/package-manager-ownership.js

@@ -0,0 +1,338 @@
+import { lstatSync, realpathSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
+import { basename, dirname, isAbsolute, join, posix, win32 } from 'node:path';
+import { spawnSync } from 'node:child_process';
+/** Reject incomplete or malformed serialized ownership before any package-manager spawn. */
+export function isCompletePackageManagerOwnership(ownership) {
+    if (!ownership || typeof ownership !== 'object' || Array.isArray(ownership))
+        return false;
+    const candidate = ownership;
+    if (typeof candidate.npmPrefix !== 'string' || !candidate.npmPrefix
+        || typeof candidate.globalInstallRoot !== 'string' || !candidate.globalInstallRoot
+        || typeof candidate.packageRoot !== 'string' || !candidate.packageRoot
+        || !candidate.environment || typeof candidate.environment !== 'object' || Array.isArray(candidate.environment))
+        return false;
+    if (candidate.manager === 'npm') {
+        const command = candidate.npmCommand;
+        if (!command || typeof command !== 'object' || Array.isArray(command))
+            return false;
+        const npmCommand = command;
+        const commandArgs = npmCommand.commandArgs;
+        return npmCommand.kind === 'node-script'
+            && typeof npmCommand.command === 'string'
+            && Boolean(npmCommand.command)
+            && Array.isArray(commandArgs)
+            && commandArgs.length > 0
+            && commandArgs.every((arg) => typeof arg === 'string' && Boolean(arg));
+    }
+    if (candidate.manager === 'bun') {
+        const environment = candidate.environment;
+        return typeof candidate.bunCommand === 'string'
+            && Boolean(candidate.bunCommand)
+            && typeof candidate.bunGlobalBin === 'string'
+            && Boolean(candidate.bunGlobalBin)
+            && typeof candidate.bunShim === 'string'
+            && Boolean(candidate.bunShim)
+            && typeof candidate.bunInstallRoot === 'string'
+            && Boolean(candidate.bunInstallRoot)
+            && environment.BUN_INSTALL === candidate.bunInstallRoot;
+    }
+    return false;
+}
+/** Revalidate the frozen manager, root, package, and bin before transaction advancement. */
+export async function validatePackageManagerOwnership(ownership) {
+    if (!isCompletePackageManagerOwnership(ownership))
+        return null;
+    try {
+        const globalInstallRoot = realpathSync(ownership.globalInstallRoot);
+        const packageRoot = realpathSync(ownership.packageRoot);
+        if (pathsEqual(globalInstallRoot, packageRoot)
+            || !pathsEqual(realpathSync(join(globalInstallRoot, 'oh-my-codex')), packageRoot)
+            || !isPathWithin(packageRoot, globalInstallRoot))
+            return null;
+        if (ownership.manager === 'npm') {
+            const root = commandResult(ownership.npmCommand, ['root', '-g'], spawnSync, { ...rootOptions, env: ownership.environment });
+            const prefix = commandResult(ownership.npmCommand, ['prefix', '-g'], spawnSync, { ...rootOptions, env: ownership.environment });
+            if (!root || !prefix
+                || !pathsEqual(realpathSync(root), globalInstallRoot)
+                || !pathsEqual(realpathSync(prefix), ownership.npmPrefix)
+                || !isPathWithin(globalInstallRoot, realpathSync(prefix)))
+                return null;
+        }
+        else {
+            if (!ownership.bunInstallRoot || ownership.environment.BUN_INSTALL !== ownership.bunInstallRoot)
+                return null;
+            const result = spawnSync(ownership.bunCommand, ['pm', 'bin', '-g'], { ...rootOptions, env: ownership.environment });
+            const bin = result.error || result.status !== 0 ? null : String(result.stdout || '').trim() || null;
+            if (!bin
+                || !pathsEqual(realpathSync(bin), ownership.bunGlobalBin)
+                || !pathsEqual(realpathSync(ownership.bunInstallRoot), ownership.bunInstallRoot))
+                return null;
+        }
+        const manifest = JSON.parse(await readFile(join(packageRoot, 'package.json'), 'utf-8'));
+        const bin = typeof manifest.bin === 'string' ? manifest.bin : manifest.bin?.omx;
+        if (manifest.name !== 'oh-my-codex' || typeof bin !== 'string' || !bin.trim() || isAbsolute(bin))
+            return null;
+        const entry = realpathSync(join(packageRoot, bin));
+        if (ownership.manager === 'bun' && (!pathsEqual(realpathSync(dirname(ownership.bunShim)), ownership.bunGlobalBin)
+            || (basename(ownership.bunShim).toLowerCase().endsWith('.cmd')
+                ? (!lstatSync(ownership.bunShim).isFile() || !isPathWithin(realpathSync(ownership.bunShim), ownership.bunGlobalBin))
+                : !pathsEqual(realpathSync(ownership.bunShim), entry))))
+            return null;
+        return lstatSync(entry).isFile() && isPathWithin(entry, packageRoot) ? entry : null;
+    }
+    catch {
+        return null;
+    }
+}
+const rootOptions = {
+    encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'], timeout: 15000, windowsHide: true,
+};
+/** Never resolve a manager through PATH after ownership has been established. */
+export function runNpmCommand(npmCommand, args, options, spawnProcess = spawnSync) {
+    return spawnProcess(npmCommand.command, [...npmCommand.commandArgs, ...args], options);
+}
+function commandResult(command, args, spawnProcess, options = rootOptions) {
+    const result = runNpmCommand(command, args, options, spawnProcess);
+    return result.error || result.status !== 0 ? null : String(result.stdout || '').trim() || null;
+}
+/** npm's lifecycle script is executed by this Node binary, not an ambient npm on PATH. */
+export function resolveNpmCommand() {
+    const npmExecPath = process.env.npm_execpath;
+    if (!npmExecPath || !isAbsolute(npmExecPath))
+        return null;
+    try {
+        const script = realpathSync(npmExecPath);
+        return { kind: 'node-script', command: realpathSync(process.execPath), commandArgs: [script] };
+    }
+    catch {
+        return null;
+    }
+}
+export function resolveNpmGlobalInstallRoot(spawnProcess = spawnSync, _platform = process.platform, command = resolveNpmCommand()) {
+    return command ? commandResult(command, ['root', '-g'], spawnProcess) : null;
+}
+export function resolveNpmPrefix(spawnProcess = spawnSync, _platform = process.platform, command = resolveNpmCommand()) {
+    return command ? commandResult(command, ['prefix', '-g'], spawnProcess) : null;
+}
+/** Bun's configured global bin must be queried through its validated executable and frozen environment. */
+export function resolveBunGlobalBin(command, environment = process.env, spawnProcess = spawnSync) {
+    const result = spawnProcess(command, ['pm', 'bin', '-g'], { ...rootOptions, env: environment });
+    return result.error || result.status !== 0 ? null : String(result.stdout || '').trim() || null;
+}
+/** Only accept Bun provenance from the current runtime, lifecycle launcher, or configured install root, never PATH. */
+export function resolveBunCommand() {
+    const candidates = [process.execPath, process.env.npm_execpath, process.env.BUN_INSTALL && join(process.env.BUN_INSTALL, 'bin', process.platform === 'win32' ? 'bun.exe' : 'bun')]
+        .filter((value) => Boolean(value));
+    for (const candidate of candidates) {
+        try {
+            const resolved = realpathSync(candidate);
+            if (/^bun(?:\.exe)?$/i.test(basename(resolved)))
+                return resolved;
+        }
+        catch {
+            // A provenance hint must be a real Bun executable to be trusted.
+        }
+    }
+    return null;
+}
+function resolveInstalledNpmCommand(dependencies, globalInstallRoot) {
+    try {
+        const path = platformPath(dependencies.platform);
+        const node = dependencies.realpath(dependencies.currentNodeExecutable);
+        const candidates = [
+            path.join(globalInstallRoot, 'npm', 'bin', 'npm-cli.js'),
+            ...(dependencies.platform === 'win32'
+                ? [path.join(path.dirname(node), 'node_modules', 'npm', 'bin', 'npm-cli.js')]
+                : []),
+        ];
+        for (const candidate of candidates) {
+            try {
+                return { kind: 'node-script', command: node, commandArgs: [dependencies.realpath(candidate)] };
+            }
+            catch {
+                // Try the runtime's supported npm layout only after the selected global root.
+            }
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+function platformPath(platform) {
+    return platform === 'win32' ? win32 : posix;
+}
+function resolveInstalledBunCommand(dependencies) {
+    if (!dependencies.bunInstallRoot)
+        return null;
+    try {
+        const path = platformPath(dependencies.platform);
+        const installRoot = dependencies.realpath(dependencies.bunInstallRoot);
+        const packageRoot = dependencies.realpath(dependencies.currentPackageRoot);
+        if (!pathsEqual(packageRoot, path.join(installRoot, 'install', 'global', 'node_modules', 'oh-my-codex'), dependencies.platform))
+            return null;
+        const command = dependencies.realpath(path.join(installRoot, 'bin', dependencies.platform === 'win32' ? 'bun.exe' : 'bun'));
+        return /^bun(?:\.exe)?$/i.test(path.basename(command)) ? command : null;
+    }
+    catch {
+        return null;
+    }
+}
+function transactionEnvironment(source) {
+    const environment = {};
+    for (const key of ['CODEX_HOME', 'HOME', 'PATH', 'TMPDIR', 'TEMP', 'TMP', 'SystemRoot', 'USERPROFILE', 'BUN_INSTALL']) {
+        if (source?.[key])
+            environment[key] = source[key];
+    }
+    return environment;
+}
+function pathsEqual(left, right, platform = process.platform) {
+    if (platform !== 'win32')
+        return left === right;
+    return win32.normalize(left).toLowerCase() === win32.normalize(right).toLowerCase();
+}
+function isPathWithin(path, root, platform = process.platform) {
+    const platformPaths = platformPath(platform);
+    const relation = platformPaths.relative(platformPaths.normalize(root), platformPaths.normalize(path));
+    return relation === '' || (!relation.startsWith('..') && !platformPaths.isAbsolute(relation));
+}
+function matchesCurrentInstall(root, dependencies) {
+    try {
+        const path = platformPath(dependencies.platform);
+        const packageRoot = dependencies.realpath(path.join(root, 'oh-my-codex'));
+        const currentPackageRoot = dependencies.realpath(dependencies.currentPackageRoot);
+        const executable = dependencies.realpath(dependencies.currentExecutable);
+        return pathsEqual(packageRoot, currentPackageRoot, dependencies.platform) && isPathWithin(executable, packageRoot, dependencies.platform) ? packageRoot : null;
+    }
+    catch {
+        return null;
+    }
+}
+function resolveBunOwnership(dependencies) {
+    try {
+        if (!dependencies.bunInstallRoot)
+            return null;
+        const path = platformPath(dependencies.platform);
+        const bunInstallRoot = dependencies.realpath(dependencies.bunInstallRoot);
+        const globalInstallRoot = dependencies.realpath(path.join(bunInstallRoot, 'install', 'global', 'node_modules'));
+        const packageRoot = matchesCurrentInstall(globalInstallRoot, dependencies);
+        if (!packageRoot)
+            return null;
+        const expectedCommand = dependencies.realpath(path.join(bunInstallRoot, 'bin', dependencies.platform === 'win32' ? 'bun.exe' : 'bun'));
+        if (!/^bun(?:\.exe)?$/i.test(path.basename(expectedCommand)))
+            return null;
+        const resolvedCommand = dependencies.resolveBunCommand();
+        const bunCommand = resolvedCommand ? dependencies.realpath(resolvedCommand) : resolveInstalledBunCommand(dependencies);
+        if (!bunCommand || !pathsEqual(bunCommand, expectedCommand, dependencies.platform))
+            return null;
+        const environment = { ...transactionEnvironment(dependencies.environment), BUN_INSTALL: bunInstallRoot };
+        const configuredBin = dependencies.resolveBunGlobalBin(bunCommand, environment);
+        if (!configuredBin)
+            return null;
+        const bunGlobalBin = dependencies.realpath(configuredBin);
+        const bunShim = path.join(bunGlobalBin, dependencies.platform === 'win32' ? 'omx.cmd' : 'omx');
+        const shim = dependencies.realpath(bunShim);
+        const executable = dependencies.realpath(dependencies.currentExecutable);
+        if (!isPathWithin(executable, packageRoot, dependencies.platform))
+            return null;
+        if (dependencies.platform === 'win32') {
+            if (!isPathWithin(shim, bunGlobalBin, dependencies.platform))
+                return null;
+        }
+        else if (!pathsEqual(shim, executable, dependencies.platform)) {
+            return null;
+        }
+        return {
+            manager: 'bun', bunCommand, bunGlobalBin, bunShim, bunInstallRoot,
+            npmPrefix: globalInstallRoot, globalInstallRoot, packageRoot, environment,
+        };
+    }
+    catch {
+        return null;
+    }
+}
+function inferBunInstallRoot(command, platform) {
+    if (!command)
+        return undefined;
+    const path = platformPath(platform);
+    try {
+        const binDirectory = path.dirname(command);
+        return path.basename(binDirectory).toLowerCase() === 'bin'
+            && /^bun(?:\.exe)?$/i.test(path.basename(command))
+            ? path.dirname(binDirectory)
+            : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+export async function resolvePackageManagerOwnership(dependencies = {}) {
+    const resolved = {
+        currentExecutable: process.argv[1] ?? '', currentPackageRoot: process.cwd(), currentNodeExecutable: process.execPath,
+        bunInstallRoot: process.env.BUN_INSTALL,
+        readInstallStamp: async () => null, realpath: (path) => realpathSync(path), resolveBunGlobalBin, resolveBunCommand,
+        resolveNpmGlobalInstallRoot: (command) => resolveNpmGlobalInstallRoot(spawnSync, process.platform, command),
+        resolveNpmPrefix: (command) => resolveNpmPrefix(spawnSync, process.platform, command),
+        platform: process.platform, environment: process.env, ...dependencies,
+        resolveNpmCommand: dependencies.resolveNpmCommand ?? resolveNpmCommand,
+    };
+    if (!resolved.bunInstallRoot) {
+        resolved.bunInstallRoot = inferBunInstallRoot(resolved.resolveBunCommand(), resolved.platform);
+    }
+    if (!resolved.currentExecutable)
+        return null;
+    const stamp = await resolved.readInstallStamp();
+    // The stamp only prioritizes a probe; each candidate requires live ownership proof.
+    const managers = stamp?.package_manager === 'bun' ? ['bun', 'npm'] : ['npm', 'bun'];
+    const candidates = [];
+    for (const manager of managers) {
+        if (manager === 'bun') {
+            const ownership = resolveBunOwnership(resolved);
+            if (ownership)
+                candidates.push(ownership);
+            continue;
+        }
+        const lifecycleNpmCommand = resolved.resolveNpmCommand();
+        const selectedGlobalInstallRoot = resolved.realpath(platformPath(resolved.platform).dirname(resolved.currentPackageRoot));
+        const selectedPackageRoot = matchesCurrentInstall(selectedGlobalInstallRoot, resolved);
+        const npmCommand = lifecycleNpmCommand ?? (selectedPackageRoot
+            ? resolveInstalledNpmCommand(resolved, selectedGlobalInstallRoot)
+            : null);
+        if (!npmCommand)
+            continue;
+        try {
+            const globalInstallRoot = resolved.realpath(resolved.resolveNpmGlobalInstallRoot(npmCommand) ?? '');
+            const npmPrefix = resolved.realpath(resolved.resolveNpmPrefix(npmCommand) ?? '');
+            const packageRoot = matchesCurrentInstall(globalInstallRoot, resolved);
+            if (packageRoot && isPathWithin(globalInstallRoot, npmPrefix, resolved.platform))
+                candidates.push({ manager: 'npm', npmCommand, npmPrefix, globalInstallRoot, packageRoot, environment: transactionEnvironment(resolved.environment) });
+        }
+        catch {
+            // Manager output must canonicalize before it can authorize a transaction.
+        }
+    }
+    return candidates.length === 1 ? candidates[0] : null;
+}
+/**
+ * A package root outside any `node_modules` directory is a working-tree build — a checkout run
+ * directly, or linked into a global root with `npm link` — so no package manager owns it and a
+ * self-update transaction would overwrite the developer's tree.
+ */
+export function isWorkingTreeInstall(currentPackageRoot, platform = process.platform, realpath = realpathSync) {
+    try {
+        const path = platformPath(platform);
+        const packageRoot = realpath(currentPackageRoot);
+        return path.basename(path.dirname(packageRoot)).toLowerCase() !== 'node_modules';
+    }
+    catch {
+        return false;
+    }
+}
+export function packageManagerOwnershipError() {
+    const launcher = basename(process.env.npm_execpath ?? '').toLowerCase();
+    if (launcher.includes('pnpm') || launcher.includes('yarn'))
+        return '[omx] pnpm and Yarn global ownership layouts are not supported for self-update. Reinstall OMX with npm or Bun, then retry.';
+    return '[omx] Unable to determine whether this global install is owned by npm or Bun. Reinstall OMX globally with one supported package manager, then retry.';
+}
+//# sourceMappingURL=package-manager-ownership.js.map

package/dist/cli/package-manager-ownership.js.map

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

package/dist/cli/plugin-marketplace.d.ts

@@ -37,6 +37,7 @@ export interface OmxPluginCacheMaterializeResult {
     status: "unavailable" | "unchanged" | "materialized";
     cacheDir?: string;
     version?: string;
+    retiredDirs?: string[];
 }
 export declare function materializePackagedOmxPluginCache(codexHomeDir: string, packagedMarketplace: PackagedOmxMarketplace | null, options?: {
     dryRun?: boolean;

package/dist/cli/plugin-marketplace.d.ts.map

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

package/dist/cli/plugin-marketplace.js

@@ -1,6 +1,7 @@
 import { existsSync } from "fs";
-import { cp, lstat, mkdir, readdir, readFile, rename, rm, writeFile } from "fs/promises";
-import { join, resolve } from "path";
+import { cp, lstat, mkdir, mkdtemp, readdir, readFile, realpath, rename, rm, writeFile } from "fs/promises";
+import { isAbsolute, join, relative, resolve, sep } from "path";
+import { tmpdir } from "node:os";
 import { OMX_FIRST_PARTY_MCP_SERVER_NAMES } from "../config/omx-first-party-mcp.js";
 import { teamModeEnabled } from "../config/team-mode.js";
 export const OMX_LOCAL_MARKETPLACE_NAME = "oh-my-codex-local";
@@ -77,6 +78,72 @@ export async function expectedPackagedOmxSkillNames(packagedMarketplace, options
 export function omxPluginCacheBase(codexHomeDir) {
     return join(codexHomeDir, "plugins", "cache", OMX_LOCAL_MARKETPLACE_NAME, OMX_PLUGIN_NAME);
 }
+function isMissingPathError(error) {
+    return error.code === "ENOENT";
+}
+/**
+ * Only the namespace OMX owns below the Codex home is required to be free of symlinks; a symlinked
+ * `plugins/` (or any component under the home) can redirect writes and is refused. Everything above
+ * the home belongs to the platform or the user — macOS resolves TMPDIR through `/var -> /private/var`,
+ * and symlinked home directories are ordinary — so those components are canonicalized, not rejected.
+ */
+async function ensureManagedCacheNamespace(cacheBase, codexHomeDir) {
+    const managedNamespace = relative(resolve(codexHomeDir), resolve(cacheBase));
+    if (!managedNamespace || managedNamespace.startsWith("..") || isAbsolute(managedNamespace)) {
+        throw new Error(`Refusing to mutate an OMX plugin cache outside the Codex home: ${resolve(cacheBase)}`);
+    }
+    await mkdir(codexHomeDir, { recursive: true });
+    let current = await realpath(codexHomeDir);
+    for (const component of managedNamespace.split(sep).filter(Boolean)) {
+        current = join(current, component);
+        try {
+            const stats = await lstat(current);
+            if (!stats.isDirectory() || stats.isSymbolicLink()) {
+                throw new Error(`Refusing to mutate OMX plugin cache through a non-directory namespace component: ${current}`);
+            }
+        }
+        catch (error) {
+            if (!isMissingPathError(error))
+                throw error;
+            await mkdir(current);
+            const stats = await lstat(current);
+            if (!stats.isDirectory() || stats.isSymbolicLink()) {
+                throw new Error(`Refusing to mutate OMX plugin cache through a non-directory namespace component: ${current}`);
+            }
+        }
+    }
+}
+async function inspectCacheRoot(cacheDir) {
+    try {
+        const stats = await lstat(cacheDir);
+        if (!stats.isDirectory() || stats.isSymbolicLink()) {
+            throw new Error(`Refusing to mutate non-directory OMX plugin cache root: ${cacheDir}`);
+        }
+        const manifest = await readPluginManifest(join(cacheDir, ".codex-plugin", "plugin.json"));
+        return manifest?.name === OMX_PLUGIN_NAME ? "directory" : "foreign";
+    }
+    catch (error) {
+        if (isMissingPathError(error))
+            return "missing";
+        throw error;
+    }
+}
+async function stageCompletePluginSnapshot(stagingParent, packagedMarketplace, version, teamMode) {
+    const snapshotDir = join(stagingParent, "snapshot");
+    await cp(packagedMarketplace.pluginRoot, snapshotDir, { recursive: true });
+    await applyTeamModeToPluginCache(snapshotDir, teamMode);
+    await writePinnedHookLauncher(snapshotDir, packagedMarketplace);
+    const manifest = await readPluginManifest(join(snapshotDir, ".codex-plugin", "plugin.json"));
+    if (manifest?.name !== OMX_PLUGIN_NAME ||
+        manifest.version !== version ||
+        manifest.skills !== "./skills/" ||
+        manifest.hooks !== "./hooks/hooks.json" ||
+        !(await pathIsDirectory(join(snapshotDir, "hooks"))) ||
+        !(await pathIsDirectory(join(snapshotDir, "skills")))) {
+        throw new Error(`Packaged OMX plugin snapshot is incomplete or has invalid provenance: ${snapshotDir}`);
+    }
+    return snapshotDir;
+}
 export async function discoverOmxPluginCacheDirs(codexHomeDir) {
     const cacheRoot = join(codexHomeDir, "plugins", "cache");
     if (!existsSync(cacheRoot))
@@ -197,55 +264,41 @@ async function pathIsDirectory(path) {
         return false;
     }
 }
-async function copyFileAtomically(sourcePath, destinationPath) {
-    const tempPath = `${destinationPath}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
-    try {
-        await cp(sourcePath, tempPath, { force: true });
-        if (await pathIsDirectory(destinationPath)) {
-            await rm(destinationPath, { recursive: true, force: true });
-        }
-        await rename(tempPath, destinationPath);
-    }
-    catch (error) {
-        await rm(tempPath, { recursive: true, force: true });
-        throw error;
+async function applyTeamModeToPluginCache(cacheDir, teamMode) {
+    if (teamModeEnabled(teamMode))
+        return;
+    for (const skillName of TEAM_MODE_PLUGIN_SKILL_NAMES) {
+        await rm(join(cacheDir, "skills", skillName), { recursive: true, force: true });
     }
 }
-async function overlayDirectoryKeepingRootPresent(sourceDir, destinationDir, options = {}) {
-    await mkdir(destinationDir, { recursive: true });
-    await options.onDestinationRootReady?.(destinationDir);
-    const sourceEntries = await readdir(sourceDir, { withFileTypes: true });
-    const sourceNames = new Set(sourceEntries.map((entry) => entry.name));
-    for (const entry of sourceEntries) {
-        const sourcePath = join(sourceDir, entry.name);
-        const destinationPath = join(destinationDir, entry.name);
-        if (entry.isDirectory()) {
-            if (existsSync(destinationPath) && !(await pathIsDirectory(destinationPath))) {
-                await rm(destinationPath, { recursive: true, force: true });
-            }
-            await overlayDirectoryKeepingRootPresent(sourcePath, destinationPath);
-        }
-        else if (entry.isFile()) {
-            await copyFileAtomically(sourcePath, destinationPath);
-        }
-    }
-    let destinationEntries;
+async function retireUnpinnedManagedSnapshots(cacheBase, currentVersion) {
+    let entries;
     try {
-        destinationEntries = await readdir(destinationDir, { withFileTypes: true });
+        entries = await readdir(cacheBase, { withFileTypes: true });
     }
     catch {
-        return;
+        return [];
     }
-    await Promise.all(destinationEntries
-        .filter((entry) => !sourceNames.has(entry.name))
-        .map((entry) => rm(join(destinationDir, entry.name), { recursive: true, force: true })));
-}
-async function applyTeamModeToPluginCache(cacheDir, teamMode) {
-    if (teamModeEnabled(teamMode))
-        return;
-    for (const skillName of TEAM_MODE_PLUGIN_SKILL_NAMES) {
-        await rm(join(cacheDir, "skills", skillName), { recursive: true, force: true });
+    const managed = [];
+    for (const entry of entries) {
+        if (!entry.isDirectory() || entry.name === currentVersion)
+            continue;
+        const path = join(cacheBase, entry.name);
+        const state = await readOmxPluginCacheState(path);
+        if (state?.manifestVersion !== entry.name)
+            continue;
+        if (existsSync(join(path, ".omx-live-pin")))
+            continue;
+        managed.push({ path, version: entry.name, mtimeMs: (await lstat(path)).mtimeMs });
     }
+    managed.sort((left, right) => right.version.localeCompare(left.version, undefined, { numeric: true }) ||
+        right.mtimeMs - left.mtimeMs);
+    const retired = [];
+    for (const candidate of managed.slice(1)) {
+        await rm(candidate.path, { recursive: true, force: true });
+        retired.push(candidate.path);
+    }
+    return retired;
 }
 export async function materializePackagedOmxPluginCache(codexHomeDir, packagedMarketplace, options = {}) {
     if (!packagedMarketplace)
@@ -255,26 +308,41 @@ export async function materializePackagedOmxPluginCache(codexHomeDir, packagedMa
         return { status: "unavailable" };
     const cacheDir = join(omxPluginCacheBase(codexHomeDir), version);
     if (await hasExpectedOmxPluginCache(codexHomeDir, packagedMarketplace, options)) {
-        return { status: "unchanged", cacheDir, version };
+        return {
+            status: "unchanged",
+            cacheDir,
+            version,
+            retiredDirs: options.dryRun
+                ? []
+                : await retireUnpinnedManagedSnapshots(omxPluginCacheBase(codexHomeDir), version),
+        };
     }
     if (!options.dryRun) {
         const cacheBase = omxPluginCacheBase(codexHomeDir);
-        await mkdir(cacheBase, { recursive: true });
-        const tempDir = join(cacheBase, `.materializing-${version}-${process.pid}-${Date.now()}`);
-        await rm(tempDir, { recursive: true, force: true });
-        await cp(packagedMarketplace.pluginRoot, tempDir, { recursive: true });
-        await applyTeamModeToPluginCache(tempDir, options.teamMode);
-        await writePinnedHookLauncher(tempDir, packagedMarketplace);
+        await ensureManagedCacheNamespace(cacheBase, codexHomeDir);
+        const rootState = await inspectCacheRoot(cacheDir);
+        if (rootState === "foreign") {
+            return { status: "unavailable", cacheDir, version };
+        }
+        const tempDir = await mkdtemp(join(tmpdir(), `omx-plugin-${version}-`));
         try {
-            await overlayDirectoryKeepingRootPresent(tempDir, cacheDir, {
-                onDestinationRootReady: options.onCacheDirPrepared,
-            });
+            const snapshotDir = await stageCompletePluginSnapshot(tempDir, packagedMarketplace, version, options.teamMode);
+            if (rootState === "directory")
+                return { status: "unchanged", cacheDir, version };
+            await rename(snapshotDir, cacheDir);
         }
         finally {
             await rm(tempDir, { recursive: true, force: true });
         }
     }
-    return { status: "materialized", cacheDir, version };
+    return {
+        status: "materialized",
+        cacheDir,
+        version,
+        retiredDirs: options.dryRun
+            ? []
+            : await retireUnpinnedManagedSnapshots(omxPluginCacheBase(codexHomeDir), version),
+    };
 }
 function marketplaceTableHeaderPattern() {
     return new RegExp(`^\\s*\\[marketplaces\\.${OMX_LOCAL_MARKETPLACE_NAME.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\]\\s*$`);