oh-my-opencode 4.15.0 → 4.16.0

package/packages/omo-codex/plugin/components/bootstrap/dist/cli.js

@@ -146,8 +146,8 @@ async function downloadFromManifest(options) {
 }
 
 // components/bootstrap/src/hook.ts
-import { spawn as spawn2 } from "node:child_process";
-import { stat as stat5 } from "node:fs/promises";
+import { spawn } from "node:child_process";
+import { stat as stat6 } from "node:fs/promises";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 
 // scripts/auto-update-state.mjs
@@ -438,9 +438,9 @@ async function readOptionalFile(path) {
 }
 
 // components/bootstrap/src/worker.ts
-import { appendFile as appendFile2, mkdir as mkdir8, readFile as readFile12 } from "node:fs/promises";
+import { appendFile as appendFile2, mkdir as mkdir8, readFile as readFile13 } from "node:fs/promises";
 import { homedir as homedir4 } from "node:os";
-import { dirname as dirname7, join as join19, resolve as resolve6 } from "node:path";
+import { dirname as dirname8, join as join20, resolve as resolve7 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // components/bootstrap/src/provision.ts
@@ -493,6 +493,7 @@ function runtimeSlug(platform = process.platform, arch = process.arch) {
 function sgBinaryName(platform = process.platform) {
   return normalizeRuntimePlatform(platform) === "win32" ? "sg.exe" : "sg";
 }
+
 // ../../utils/src/ast-grep/sg-provisioner.ts
 import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
 import { chmod, mkdir as mkdir3, rename as rename2, rm as rm3, writeFile as writeFile2 } from "node:fs/promises";
@@ -644,6 +645,7 @@ async function provisionSgBinary(options) {
     throw new SgProvisionError("write_failed", `failed to provision ast-grep ${SG_PINNED_VERSION} into ${targetDir}: ${describeFailure2(error)}`, { cause: error });
   }
 }
+
 // ../../utils/src/ast-grep/sg-resolver.ts
 import { execFileSync } from "node:child_process";
 import { existsSync, statSync } from "node:fs";
@@ -781,6 +783,7 @@ function findSgBinarySync(options = {}) {
     return null;
   }
 }
+
 // components/bootstrap/src/provision.ts
 var SG_PROVISION_COMPONENT = "ast_grep";
 var SG_FORCE_PROVISION_ENV_KEY = "OMO_BOOTSTRAP_FORCE_PROVISION";
@@ -861,8 +864,8 @@ async function defaultVersionProbe2(binaryPath) {
 }
 
 // components/bootstrap/src/setup.ts
-import { copyFile as copyFile2, mkdir as mkdir7, readdir as readdir3, rm as rm9, stat as stat4 } from "node:fs/promises";
-import { join as join18 } from "node:path";
+import { copyFile as copyFile2, mkdir as mkdir7, readdir as readdir4, rm as rm10, stat as stat5 } from "node:fs/promises";
+import { join as join19 } from "node:path";
 
 // ../src/install/link-cached-plugin-agents.ts
 import { copyFile, lstat as lstat2, mkdir as mkdir4, readFile as readFile5, readdir, rm as rm6, writeFile as writeFile3 } from "node:fs/promises";
@@ -1167,8 +1170,8 @@ function nodeErrorCode2(error) {
 }
 
 // ../src/install/codex-cache-bins.ts
-import { chmod as chmod2, lstat as lstat5, mkdir as mkdir5, readFile as readFile7, readdir as readdir2, readlink as readlink2, rm as rm8, stat as stat3, symlink, writeFile as writeFile4 } from "node:fs/promises";
-import { basename as basename4, isAbsolute as isAbsolute2, join as join12, relative as relative2, resolve as resolve3, sep } from "node:path";
+import { chmod as chmod2, lstat as lstat6, mkdir as mkdir5, readFile as readFile8, readdir as readdir3, readlink as readlink3, rm as rm9, stat as stat4, symlink, writeFile as writeFile4 } from "node:fs/promises";
+import { basename as basename4, isAbsolute as isAbsolute3, join as join13, relative as relative2, resolve as resolve4, sep } from "node:path";
 
 // ../src/install/codex-cache-command-shim.ts
 var COMMAND_SHIM_MARKER = ":: generated by oh-my-openagent Codex installer";
@@ -1211,6 +1214,10 @@ function windowsCommandShim(targetPath) {
 `);
 }
 
+// ../src/install/codex-cache-dangling-bins.ts
+import { lstat as lstat4, readFile as readFile6, readdir as readdir2, readlink, rm as rm7, stat as stat3 } from "node:fs/promises";
+import { dirname as dirname5, isAbsolute as isAbsolute2, join as join10, resolve as resolve3 } from "node:path";
+
 // ../src/install/codex-cache-fs.ts
 import { lstat as lstat3 } from "node:fs/promises";
 async function fileExistsStrict(path) {
@@ -1230,9 +1237,96 @@ function isNodeErrorWithCode(error) {
   return typeof error === "object" && error !== null && "code" in error;
 }
 
+// ../src/install/codex-cache-dangling-bins.ts
+async function removeDanglingManagedComponentBins(binDir, platform, managedBinNames) {
+  const entries = await readdir2(binDir, { withFileTypes: true });
+  for (const entry of entries) {
+    const binName = managedBinNameForEntry(entry.name, platform);
+    if (binName === null || !managedBinNames.has(binName))
+      continue;
+    const linkPath = join10(binDir, entry.name);
+    if (platform === "win32") {
+      await removeDanglingGeneratedCommandShim(linkPath);
+      continue;
+    }
+    await removeDanglingManagedSymlink(linkPath);
+  }
+}
+function managedBinNameForEntry(name, platform) {
+  if (platform === "win32")
+    return name.endsWith(".cmd") ? name.slice(0, -4) : null;
+  return name;
+}
+async function removeDanglingManagedSymlink(linkPath) {
+  try {
+    const linkStat = await lstat4(linkPath);
+    if (!linkStat.isSymbolicLink())
+      return;
+    const linkTarget = await readlink(linkPath);
+    const target = isAbsolute2(linkTarget) ? linkTarget : resolve3(dirname5(linkPath), linkTarget);
+    if (!await isFileSystemEntry(target) && isManagedComponentBinTarget(target))
+      await rm7(linkPath, { force: true });
+  } catch (error) {
+    if (isNodeErrorWithCode(error) && error.code === "ENOENT")
+      return;
+    throw error;
+  }
+}
+async function removeDanglingGeneratedCommandShim(linkPath) {
+  try {
+    const linkStat = await lstat4(linkPath);
+    if (!linkStat.isFile())
+      return;
+    const content = await readFile6(linkPath, "utf8");
+    if (!content.includes(COMMAND_SHIM_MARKER))
+      return;
+    const target = extractCommandShimTarget(content);
+    if (target !== null && !await isFileSystemEntry(target) && isManagedComponentBinTarget(target))
+      await rm7(linkPath, { force: true });
+  } catch (error) {
+    if (isNodeErrorWithCode(error) && error.code === "ENOENT")
+      return;
+    throw error;
+  }
+}
+async function isFileSystemEntry(path) {
+  try {
+    await stat3(path);
+    return true;
+  } catch (error) {
+    if (isNodeErrorWithCode(error) && error.code === "ENOENT")
+      return false;
+    throw error;
+  }
+}
+function extractCommandShimTarget(content) {
+  const match = /"([^"\r\n]+components[\\/][^"\r\n]+[\\/]dist[\\/]cli\.js)" %\*/.exec(content);
+  return match?.[1] ?? null;
+}
+function isManagedComponentBinTarget(target) {
+  const parts = target.split(/[\\/]+/);
+  const suffix = parts.slice(-4);
+  return suffix[0] === "components" && suffix[2] === "dist" && suffix[3] === "cli.js" && (hasOmoPluginCachePrefix(parts, parts.length - 4) || hasOmoCodexPluginPrefix(parts, parts.length - 4));
+}
+function hasOmoPluginCachePrefix(parts, endExclusive) {
+  for (let index = 0;index < endExclusive - 4; index += 1) {
+    if (parts[index] === "plugins" && parts[index + 1] === "cache" && parts[index + 2] === "sisyphuslabs" && parts[index + 3] === "omo") {
+      return index + 4 < endExclusive;
+    }
+  }
+  return false;
+}
+function hasOmoCodexPluginPrefix(parts, endExclusive) {
+  for (let index = 0;index <= endExclusive - 3; index += 1) {
+    if (parts[index] === "packages" && parts[index + 1] === "omo-codex" && parts[index + 2] === "plugin")
+      return true;
+  }
+  return false;
+}
+
 // ../src/install/codex-cache-legacy-bins.ts
-import { lstat as lstat4, readFile as readFile6, readlink, rm as rm7 } from "node:fs/promises";
-import { join as join10 } from "node:path";
+import { lstat as lstat5, readFile as readFile7, readlink as readlink2, rm as rm8 } from "node:fs/promises";
+import { join as join11 } from "node:path";
 var LEGACY_CODEX_COMPONENT_BINS = [
   { name: "omo", component: "ulw-loop" },
   { name: "codex-comment-checker", component: "comment-checker" },
@@ -1244,26 +1338,26 @@ var LEGACY_CODEX_COMPONENT_BINS = [
 ];
 async function removeLegacyCodexComponentBins(binDir, platform) {
   for (const entry of LEGACY_CODEX_COMPONENT_BINS) {
-    const linkPath = join10(binDir, platform === "win32" ? `${entry.name}.cmd` : entry.name);
+    const linkPath = join11(binDir, platform === "win32" ? `${entry.name}.cmd` : entry.name);
     await removeLegacyCodexComponentBin(linkPath, entry.component, platform);
   }
 }
 async function removeLegacyCodexComponentBin(linkPath, component, platform) {
   try {
-    const stat3 = await lstat4(linkPath);
+    const stat4 = await lstat5(linkPath);
     if (platform !== "win32") {
-      if (!stat3.isSymbolicLink())
+      if (!stat4.isSymbolicLink())
         return;
-      const target = await readlink(linkPath);
+      const target = await readlink2(linkPath);
       if (isManagedLegacyComponentTarget(target, component))
-        await rm7(linkPath, { force: true });
+        await rm8(linkPath, { force: true });
       return;
     }
-    if (!stat3.isFile())
+    if (!stat4.isFile())
       return;
-    const content = await readFile6(linkPath, "utf8");
+    const content = await readFile7(linkPath, "utf8");
     if (content.includes(COMMAND_SHIM_MARKER))
-      await rm7(linkPath, { force: true });
+      await rm8(linkPath, { force: true });
   } catch (error) {
     if (isNodeErrorWithCode2(error) && error.code === "ENOENT")
       return;
@@ -1274,7 +1368,7 @@ function isManagedLegacyComponentTarget(target, component) {
   const parts = target.split(/[\\/]+/);
   const suffixStart = parts.length - 4;
   const suffix = parts.slice(-4);
-  return suffix[0] === "components" && suffix[1] === component && suffix[2] === "dist" && suffix[3] === "cli.js" && (hasPluginCachePrefix(parts, suffixStart) || hasOmoCodexPluginPrefix(parts, suffixStart));
+  return suffix[0] === "components" && suffix[1] === component && suffix[2] === "dist" && suffix[3] === "cli.js" && (hasPluginCachePrefix(parts, suffixStart) || hasOmoCodexPluginPrefix2(parts, suffixStart));
 }
 function hasPluginCachePrefix(parts, endExclusive) {
   for (let index = 0;index < endExclusive - 1; index += 1) {
@@ -1283,7 +1377,7 @@ function hasPluginCachePrefix(parts, endExclusive) {
   }
   return false;
 }
-function hasOmoCodexPluginPrefix(parts, endExclusive) {
+function hasOmoCodexPluginPrefix2(parts, endExclusive) {
   for (let index = 0;index <= endExclusive - 3; index += 1) {
     if (parts[index] === "packages" && parts[index + 1] === "omo-codex" && parts[index + 2] === "plugin")
       return true;
@@ -1295,10 +1389,10 @@ function isNodeErrorWithCode2(error) {
 }
 
 // ../src/install/codex-cache-runtime-wrapper.ts
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 var RUNTIME_WRAPPER_MARKER = "OMO_GENERATED_RUNTIME_WRAPPER";
 function posixRuntimeWrapper(cliPath, codexHome, binDir, nodeCliPath) {
-  const ulwLoopBin = toPosixPath(join11(binDir, "omo-ulw-loop"));
+  const ulwLoopBin = toPosixPath(join12(binDir, "omo-ulw-loop"));
   const nodeCli = escapePosixDoubleQuoted(toPosixPath(nodeCliPath));
   const escapedCliPath = escapePosixDoubleQuoted(toPosixPath(cliPath));
   const escapedCodexHome = escapePosixDoubleQuoted(toPosixPath(codexHome));
@@ -1343,7 +1437,7 @@ function posixRuntimeWrapper(cliPath, codexHome, binDir, nodeCliPath) {
 `);
 }
 function windowsRuntimeWrapper(cliPath, codexHome, binDir, nodeCliPath) {
-  const ulwLoopBin = join11(binDir, "omo-ulw-loop.cmd");
+  const ulwLoopBin = join12(binDir, "omo-ulw-loop.cmd");
   return [
     "@echo off",
     `rem ${RUNTIME_WRAPPER_MARKER}`,
@@ -1391,6 +1485,7 @@ async function linkCachedPluginBins(input) {
   const platform = input.platform ?? process.platform;
   await mkdir5(input.binDir, { recursive: true });
   await removeLegacyCodexComponentBins(input.binDir, platform);
+  await removeDanglingManagedComponentBins(input.binDir, platform, new Set(binLinks.map((link) => link.name)));
   const linked = [];
   for (const link of binLinks) {
     const linkPath = await linkCachedPluginBin(input.binDir, link, platform);
@@ -1399,35 +1494,35 @@ async function linkCachedPluginBins(input) {
   return linked;
 }
 async function linkRootRuntimeBin(input) {
-  const cliPath = join12(input.repoRoot, "dist", "cli", "index.js");
+  const cliPath = join13(input.repoRoot, "dist", "cli", "index.js");
   if (!await isFile2(cliPath))
     return null;
-  const nodeCliPath = join12(input.repoRoot, "dist", "cli-node", "index.js");
+  const nodeCliPath = join13(input.repoRoot, "dist", "cli-node", "index.js");
   const platform = input.platform ?? process.platform;
   await mkdir5(input.binDir, { recursive: true });
   if (platform === "win32") {
-    const linkPath2 = join12(input.binDir, "omo.cmd");
+    const linkPath2 = join13(input.binDir, "omo.cmd");
     await replaceRuntimeWrapper(linkPath2, windowsRuntimeWrapper(cliPath, input.codexHome, input.binDir, nodeCliPath));
     return { name: "omo", path: linkPath2, target: cliPath };
   }
-  const linkPath = join12(input.binDir, "omo");
+  const linkPath = join13(input.binDir, "omo");
   await replaceRuntimeWrapper(linkPath, posixRuntimeWrapper(cliPath, input.codexHome, input.binDir, nodeCliPath));
   await chmod2(linkPath, 493);
   return { name: "omo", path: linkPath, target: cliPath };
 }
 async function linkCachedPluginBin(binDir, link, platform) {
   if (platform === "win32") {
-    const linkPath2 = join12(binDir, `${link.name}.cmd`);
+    const linkPath2 = join13(binDir, `${link.name}.cmd`);
     await replaceCommandShim(linkPath2, link.target);
     return linkPath2;
   }
-  const linkPath = join12(binDir, link.name);
+  const linkPath = join13(binDir, link.name);
   await replaceSymlink(linkPath, link.target);
   return linkPath;
 }
 async function isFile2(path) {
   try {
-    return (await stat3(path)).isFile();
+    return (await stat4(path)).isFile();
   } catch (error) {
     if (isNodeErrorWithCode(error) && error.code === "ENOENT")
       return false;
@@ -1440,23 +1535,23 @@ async function discoverPackageBins(root) {
   return links;
 }
 async function collectPackageBins(directory, root, links) {
-  const entries = await readdir2(directory, { withFileTypes: true });
+  const entries = await readdir3(directory, { withFileTypes: true });
   if (entries.some((entry) => entry.isFile() && entry.name === "package.json")) {
-    await appendPackageBinLinks(join12(directory, "package.json"), directory, root, links);
+    await appendPackageBinLinks(join13(directory, "package.json"), directory, root, links);
   }
   for (const entry of entries) {
     if (!entry.isDirectory())
       continue;
     if (entry.name === "node_modules" || entry.name === ".git" || entry.name === "dist")
       continue;
-    const childPath = join12(directory, entry.name);
+    const childPath = join13(directory, entry.name);
     if (!childPath.startsWith(root))
       continue;
     await collectPackageBins(childPath, root, links);
   }
 }
 async function appendPackageBinLinks(packageJsonPath, packageRoot, root, links) {
-  const packageJson = JSON.parse(await readFile7(packageJsonPath, "utf8"));
+  const packageJson = JSON.parse(await readFile8(packageJsonPath, "utf8"));
   if (!isPlainRecord(packageJson))
     return;
   const packageName = packageJson.name;
@@ -1491,10 +1586,10 @@ function isReservedNestedBinName(name, packageRoot, root) {
 function resolvePackageBinTarget(packageRoot, target) {
   if (target.includes("\x00"))
     throw new Error("Package bin target must stay inside package root");
-  const root = resolve3(packageRoot);
-  const resolvedTarget = resolve3(root, target);
+  const root = resolve4(packageRoot);
+  const resolvedTarget = resolve4(root, target);
   const relativeTarget = relative2(root, resolvedTarget);
-  if (relativeTarget === "" || relativeTarget !== ".." && !relativeTarget.startsWith(`..${sep}`) && !isAbsolute2(relativeTarget)) {
+  if (relativeTarget === "" || relativeTarget !== ".." && !relativeTarget.startsWith(`..${sep}`) && !isAbsolute3(relativeTarget)) {
     return resolvedTarget;
   }
   throw new Error("Package bin target must stay inside package root");
@@ -1502,7 +1597,7 @@ function resolvePackageBinTarget(packageRoot, target) {
 async function replaceSymlink(linkPath, targetPath) {
   if (await existingNonSymlink(linkPath))
     throw new Error(`${linkPath} already exists and is not a symlink`);
-  await rm8(linkPath, { force: true });
+  await rm9(linkPath, { force: true });
   await symlink(targetPath, linkPath);
 }
 async function replaceCommandShim(linkPath, targetPath) {
@@ -1513,17 +1608,17 @@ async function replaceCommandShim(linkPath, targetPath) {
 async function replaceRuntimeWrapper(linkPath, content) {
   if (await existingNonRuntimeWrapper(linkPath))
     throw new Error(`${linkPath} already exists and is not a generated OMO runtime wrapper`);
-  await rm8(linkPath, { force: true });
+  await rm9(linkPath, { force: true });
   await writeFile4(linkPath, content);
 }
 async function existingNonRuntimeWrapper(path) {
   try {
-    const stat4 = await lstat5(path);
-    if (stat4.isSymbolicLink())
+    const stat5 = await lstat6(path);
+    if (stat5.isSymbolicLink())
       return false;
-    if (!stat4.isFile())
+    if (!stat5.isFile())
       return true;
-    const content = await readFile7(path, "utf8");
+    const content = await readFile8(path, "utf8");
     return !content.includes(RUNTIME_WRAPPER_MARKER);
   } catch (error) {
     if (isNodeErrorWithCode(error) && error.code === "ENOENT")
@@ -1533,10 +1628,10 @@ async function existingNonRuntimeWrapper(path) {
 }
 async function existingNonShim(path) {
   try {
-    const stat4 = await lstat5(path);
-    if (!stat4.isFile())
+    const stat5 = await lstat6(path);
+    if (!stat5.isFile())
       return true;
-    const content = await readFile7(path, "utf8");
+    const content = await readFile8(path, "utf8");
     if (content.includes(COMMAND_SHIM_MARKER))
       return false;
     throw new Error(`${path} already exists and is not a generated command shim`);
@@ -1548,10 +1643,10 @@ async function existingNonShim(path) {
 }
 async function existingNonSymlink(path) {
   try {
-    const stat4 = await lstat5(path);
-    if (!stat4.isSymbolicLink())
+    const stat5 = await lstat6(path);
+    if (!stat5.isSymbolicLink())
       return true;
-    await readlink2(path);
+    await readlink3(path);
     return false;
   } catch (error) {
     if (isNodeErrorWithCode(error) && error.code === "ENOENT")
@@ -1561,8 +1656,8 @@ async function existingNonSymlink(path) {
 }
 
 // ../src/install/codex-config-toml.ts
-import { mkdir as mkdir6, readFile as readFile9 } from "node:fs/promises";
-import { dirname as dirname6 } from "node:path";
+import { mkdir as mkdir6, readFile as readFile10 } from "node:fs/promises";
+import { dirname as dirname7 } from "node:path";
 
 // ../src/install/toml-section-editor.ts
 function findTomlSection(config, header) {
@@ -1920,13 +2015,13 @@ function tomlKeySegment(value) {
 }
 
 // ../src/install/codex-config-atomic-write.ts
-import { lstat as lstat6, readlink as readlink3, realpath, rename as rename3, unlink, writeFile as writeFile5 } from "node:fs/promises";
-import { basename as basename5, dirname as dirname5, isAbsolute as isAbsolute3, join as join13, resolve as resolve4 } from "node:path";
+import { lstat as lstat7, readlink as readlink4, realpath, rename as rename3, unlink, writeFile as writeFile5 } from "node:fs/promises";
+import { basename as basename5, dirname as dirname6, isAbsolute as isAbsolute4, join as join14, resolve as resolve5 } from "node:path";
 var RENAME_RETRY_DELAYS_MS = [10, 25, 50];
 var RETRIABLE_RENAME_CODES = new Set(["EPERM", "EBUSY"]);
 async function writeFileAtomic(targetPath, data) {
   const writeTarget = await resolveSymlinkTarget(targetPath);
-  const temporaryPath = join13(dirname5(writeTarget), `.tmp-${basename5(writeTarget)}-${process.pid}-${Date.now()}`);
+  const temporaryPath = join14(dirname6(writeTarget), `.tmp-${basename5(writeTarget)}-${process.pid}-${Date.now()}`);
   await writeFile5(temporaryPath, data);
   try {
     await renameWithRetry(temporaryPath, writeTarget);
@@ -1941,7 +2036,7 @@ async function writeFileAtomic(targetPath, data) {
 }
 async function resolveSymlinkTarget(targetPath) {
   try {
-    const linkStats = await lstat6(targetPath);
+    const linkStats = await lstat7(targetPath);
     if (!linkStats.isSymbolicLink())
       return targetPath;
   } catch (error) {
@@ -1954,8 +2049,8 @@ async function resolveSymlinkTarget(targetPath) {
   } catch (error) {
     if (!(error instanceof Error))
       throw error;
-    const linkValue = await readlink3(targetPath);
-    return isAbsolute3(linkValue) ? linkValue : resolve4(dirname5(targetPath), linkValue);
+    const linkValue = await readlink4(targetPath);
+    return isAbsolute4(linkValue) ? linkValue : resolve5(dirname6(targetPath), linkValue);
   }
 }
 async function renameWithRetry(fromPath, toPath) {
@@ -2296,8 +2391,8 @@ function isRootSetting(line, key) {
 }
 
 // ../src/install/codex-model-catalog.ts
-import { readFile as readFile8 } from "node:fs/promises";
-import { join as join14 } from "node:path";
+import { readFile as readFile9 } from "node:fs/promises";
+import { join as join15 } from "node:path";
 var FALLBACK_CODEX_MODEL_CATALOG = {
   current: {
     model: "gpt-5.5",
@@ -2316,9 +2411,9 @@ var FALLBACK_CODEX_MODEL_CATALOG = {
   ]
 };
 async function readCodexModelCatalog(codexPackageRoot) {
-  const catalogPath = join14(codexPackageRoot, "plugin", "model-catalog.json");
+  const catalogPath = join15(codexPackageRoot, "plugin", "model-catalog.json");
   try {
-    const parsed = JSON.parse(await readFile8(catalogPath, "utf8"));
+    const parsed = JSON.parse(await readFile9(catalogPath, "utf8"));
     return parseCodexModelCatalog(parsed) ?? FALLBACK_CODEX_MODEL_CATALOG;
   } catch (error) {
     if (error instanceof Error)
@@ -2452,10 +2547,15 @@ function readBooleanSetting(sectionText, key) {
 
 // ../src/install/codex-config-toml.ts
 async function updateCodexConfig(input) {
-  await mkdir6(dirname6(input.configPath), { recursive: true });
-  let config = "";
-  if (await exists3(input.configPath))
-    config = await readFile9(input.configPath, "utf8");
+  await mkdir6(dirname7(input.configPath), { recursive: true });
+  let config;
+  try {
+    config = await readFile10(input.configPath, "utf8");
+  } catch (error) {
+    if (!isMissingFileError(error))
+      throw error;
+    config = "";
+  }
   const pluginSet = new Set(input.pluginNames);
   for (const legacyMarketplaceName of legacyMarketplaceNames(input.marketplaceName)) {
     config = removeMarketplaceBlock(config, legacyMarketplaceName);
@@ -2489,27 +2589,20 @@ async function updateCodexConfig(input) {
   await writeFileAtomic(input.configPath, `${config.trimEnd()}
 `);
 }
-async function exists3(path) {
-  try {
-    await readFile9(path, "utf8");
-    return true;
-  } catch (error) {
-    if (error instanceof Error)
-      return false;
-    return false;
-  }
+function isMissingFileError(error) {
+  return error instanceof Error && "code" in error && error.code === "ENOENT";
 }
 
 // ../src/install/codex-git-bash-mcp-env.ts
-import { readFile as readFile10, writeFile as writeFile6 } from "node:fs/promises";
-import { join as join15 } from "node:path";
+import { readFile as readFile11, writeFile as writeFile6 } from "node:fs/promises";
+import { join as join16 } from "node:path";
 var GIT_BASH_ENV_KEY = "OMO_CODEX_GIT_BASH_PATH";
 var CODEGRAPH_RELATIVE_ARGS = new Set(["components/codegraph/dist/serve.js", "./components/codegraph/dist/serve.js"]);
 async function stampGitBashMcpEnv(input) {
-  const manifestPath = join15(input.pluginRoot, ".mcp.json");
+  const manifestPath = join16(input.pluginRoot, ".mcp.json");
   if (!await fileExistsStrict(manifestPath))
     return false;
-  const parsed = JSON.parse(await readFile10(manifestPath, "utf8"));
+  const parsed = JSON.parse(await readFile11(manifestPath, "utf8"));
   if (!isPlainRecord(parsed) || !isPlainRecord(parsed["mcpServers"]))
     return false;
   let changed = stampCodegraphMcpPath(parsed["mcpServers"], input.pluginRoot);
@@ -2539,14 +2632,14 @@ function stampCodegraphMcpPath(mcpServers, pluginRoot) {
   const entrypoint = args[0];
   if (typeof entrypoint !== "string" || !CODEGRAPH_RELATIVE_ARGS.has(entrypoint))
     return false;
-  codegraphServer["args"] = [join15(pluginRoot, "components", "codegraph", "dist", "serve.js"), ...args.slice(1)];
+  codegraphServer["args"] = [join16(pluginRoot, "components", "codegraph", "dist", "serve.js"), ...args.slice(1)];
   return true;
 }
 
 // ../src/install/codex-hook-trust.ts
 import { createHash as createHash3 } from "node:crypto";
-import { readFile as readFile11 } from "node:fs/promises";
-import { join as join16 } from "node:path";
+import { readFile as readFile12 } from "node:fs/promises";
+import { join as join17 } from "node:path";
 var EVENT_LABELS = new Map([
   ["PreToolUse", "pre_tool_use"],
   ["PermissionRequest", "permission_request"],
@@ -2560,18 +2653,18 @@ var EVENT_LABELS = new Map([
   ["Stop", "stop"]
 ]);
 async function trustedHookStatesForPlugin(input) {
-  const manifestPath = join16(input.pluginRoot, ".codex-plugin", "plugin.json");
-  if (!await exists4(manifestPath))
+  const manifestPath = join17(input.pluginRoot, ".codex-plugin", "plugin.json");
+  if (!await exists3(manifestPath))
     return [];
-  const manifest = JSON.parse(await readFile11(manifestPath, "utf8"));
+  const manifest = JSON.parse(await readFile12(manifestPath, "utf8"));
   if (!isPlainRecord(manifest))
     return [];
   const states = [];
   for (const hookPath of hookManifestPaths(manifest.hooks)) {
-    const hooksPath = join16(input.pluginRoot, hookPath);
-    if (!await exists4(hooksPath))
+    const hooksPath = join17(input.pluginRoot, hookPath);
+    if (!await exists3(hooksPath))
       continue;
-    const parsed = JSON.parse(await readFile11(hooksPath, "utf8"));
+    const parsed = JSON.parse(await readFile12(hooksPath, "utf8"));
     if (!isPlainRecord(parsed) || !isPlainRecord(parsed.hooks))
       continue;
     states.push(...trustedHookStatesForHooksFile({
@@ -2652,9 +2745,9 @@ function canonicalJson(value) {
 function stripDotSlash(value) {
   return value.startsWith("./") ? value.slice(2) : value;
 }
-async function exists4(path) {
+async function exists3(path) {
   try {
-    await readFile11(path, "utf8");
+    await readFile12(path, "utf8");
     return true;
   } catch (error) {
     if (error instanceof Error)
@@ -2665,18 +2758,19 @@ async function exists4(path) {
 
 // ../src/install/codex-installer-bin-dir.ts
 import { homedir as homedir3 } from "node:os";
-import { join as join17, resolve as resolve5 } from "node:path";
+import { join as join18, resolve as resolve6 } from "node:path";
 function resolveCodexInstallerBinDir(input) {
   const explicitBinDir = input.binDir ?? input.env?.CODEX_LOCAL_BIN_DIR;
   if (explicitBinDir !== undefined && explicitBinDir.trim().length > 0)
-    return resolve5(explicitBinDir.trim());
+    return resolve6(explicitBinDir.trim());
   const homeDir = input.homeDir ?? homedir3();
-  const defaultCodexHome = resolve5(homeDir, ".codex");
-  const resolvedCodexHome = resolve5(input.codexHome);
+  const defaultCodexHome = resolve6(homeDir, ".codex");
+  const resolvedCodexHome = resolve6(input.codexHome);
   if (resolvedCodexHome !== defaultCodexHome)
-    return join17(resolvedCodexHome, "bin");
-  return resolve5(homeDir, ".local", "bin");
+    return join18(resolvedCodexHome, "bin");
+  return resolve6(homeDir, ".local", "bin");
 }
+
 // ../../utils/src/runtime/git-bash.ts
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { existsSync as existsSync2 } from "node:fs";
@@ -2759,13 +2853,14 @@ function whereCommand(command) {
     throw error;
   }
 }
+
 // ../src/install/git-bash.ts
 var resolveGitBashForCurrentProcess2 = (input = {}) => {
   return toCodexResolution(resolveGitBashForCurrentProcess(input));
 };
 async function prepareGitBashForInstall(input) {
-  const resolve6 = input.resolveGitBash ?? (() => resolveGitBashForCurrentProcess2({ platform: input.platform, env: input.env }));
-  const initialResolution = resolve6();
+  const resolve7 = input.resolveGitBash ?? (() => resolveGitBashForCurrentProcess2({ platform: input.platform, env: input.env }));
+  const initialResolution = resolve7();
   return initialResolution;
 }
 function toCodexResolution(resolution) {
@@ -2828,9 +2923,9 @@ async function resolveGitBashStep(options, degraded) {
   return false;
 }
 async function linkBundledAgentsStep(options) {
-  const agentsTarget = join18(options.codexHome, "agents");
+  const agentsTarget = join19(options.codexHome, "agents");
   try {
-    const stageRoot = join18(options.pluginData, "bootstrap", "agents-stage");
+    const stageRoot = join19(options.pluginData, "bootstrap", "agents-stage");
     await stageBundledAgents(options.pluginRoot, stageRoot);
     const preservedReasoning = await capturePreservedAgentReasoning({ codexHome: options.codexHome });
     const preservedServiceTier = await capturePreservedAgentServiceTier({ codexHome: options.codexHome });
@@ -2856,23 +2951,23 @@ async function linkBundledAgentsStep(options) {
   }
 }
 async function stageBundledAgents(pluginRoot, stageRoot) {
-  await rm9(stageRoot, { force: true, recursive: true });
+  await rm10(stageRoot, { force: true, recursive: true });
   await mkdir7(stageRoot, { recursive: true });
-  const componentsRoot = join18(pluginRoot, "components");
+  const componentsRoot = join19(pluginRoot, "components");
   for (const componentName of await directoryNames(componentsRoot)) {
-    const agentsDir = join18(componentsRoot, componentName, "agents");
+    const agentsDir = join19(componentsRoot, componentName, "agents");
     const agentFiles = (await fileNames(agentsDir)).filter((name) => name.endsWith(".toml"));
     if (agentFiles.length === 0)
       continue;
-    const stagedAgentsDir = join18(stageRoot, "components", componentName, "agents");
+    const stagedAgentsDir = join19(stageRoot, "components", componentName, "agents");
     await mkdir7(stagedAgentsDir, { recursive: true });
     for (const agentFile of agentFiles) {
-      await copyFile2(join18(agentsDir, agentFile), join18(stagedAgentsDir, agentFile));
+      await copyFile2(join19(agentsDir, agentFile), join19(stagedAgentsDir, agentFile));
     }
   }
 }
 async function updateConfigStep(options, inputs, degraded) {
-  const configPath = join18(options.codexHome, "config.toml");
+  const configPath = join19(options.codexHome, "config.toml");
   try {
     await assertWritableConfigIfPresent(configPath);
     const trustedHookStates = await trustedHookStatesForPlugin({
@@ -2903,7 +2998,7 @@ async function updateConfigStep(options, inputs, degraded) {
 }
 async function assertWritableConfigIfPresent(configPath) {
   try {
-    if (((await stat4(configPath)).mode & 146) === 0)
+    if (((await stat5(configPath)).mode & 146) === 0)
       throw new Error(`${configPath} has no write permission bits set`);
   } catch (error) {
     if (errorCode(error) === "ENOENT")
@@ -2928,7 +3023,7 @@ async function linkComponentBinsStep(options, degraded) {
   await linkRuntimeWrapperStep(options, binDir, degraded);
 }
 async function linkRuntimeWrapperStep(options, binDir, degraded) {
-  const cliPath = join18(options.pluginRoot, "dist", "cli", "index.js");
+  const cliPath = join19(options.pluginRoot, "dist", "cli", "index.js");
   try {
     const linked = await linkRootRuntimeBin({
       binDir,
@@ -2961,7 +3056,7 @@ async function stampGitBashEnvStep(options, degraded) {
     degraded.push({
       component: "git-bash-env",
       hint: BOOTSTRAP_DOCTOR_HINT,
-      reason: `failed to stamp ${join18(options.pluginRoot, ".mcp.json")}: ${errorMessage(error)}`
+      reason: `failed to stamp ${join19(options.pluginRoot, ".mcp.json")}: ${errorMessage(error)}`
     });
   }
 }
@@ -2973,7 +3068,7 @@ async function fileNames(root) {
 }
 async function entryNames(root, keep) {
   try {
-    const entries = await readdir3(root, { withFileTypes: true });
+    const entries = await readdir4(root, { withFileTypes: true });
     return entries.filter((entry) => keep(entry)).map((entry) => entry.name).sort();
   } catch (error) {
     if (error instanceof Error && "code" in error && error.code === "ENOENT")
@@ -3029,11 +3124,11 @@ function resolvePluginDataRoot(env) {
   const fromEnv = env["PLUGIN_DATA"]?.trim();
   if (fromEnv !== undefined && fromEnv.length > 0)
     return fromEnv;
-  return join19(homedir4(), ".local", "share", "lazycodex");
+  return join20(homedir4(), ".local", "share", "lazycodex");
 }
 async function readPluginVersion(pluginRoot) {
   try {
-    const parsed = JSON.parse(await readFile12(join19(pluginRoot, ".codex-plugin", "plugin.json"), "utf8"));
+    const parsed = JSON.parse(await readFile13(join20(pluginRoot, ".codex-plugin", "plugin.json"), "utf8"));
     if (typeof parsed !== "object" || parsed === null)
       return;
     const version = parsed["version"];
@@ -3100,7 +3195,7 @@ async function runBootstrapWorker(options = {}) {
       degraded.push({
         component: "bootstrap",
         hint: BOOTSTRAP_DOCTOR_HINT,
-        reason: `plugin version unresolved from ${join19(pluginRoot, ".codex-plugin", "plugin.json")}`
+        reason: `plugin version unresolved from ${join20(pluginRoot, ".codex-plugin", "plugin.json")}`
       });
     }
     for (const step of steps) {
@@ -3139,12 +3234,12 @@ function resolvePluginRoot(env) {
   const fromEnv = env["PLUGIN_ROOT"]?.trim();
   if (fromEnv !== undefined && fromEnv.length > 0)
     return fromEnv;
-  return resolve6(dirname7(fileURLToPath2(import.meta.url)), "..", "..", "..");
+  return resolve7(dirname8(fileURLToPath2(import.meta.url)), "..", "..", "..");
 }
 async function appendBootstrapLog(pluginData, now, event, details) {
   try {
-    const logPath = join19(pluginData, "bootstrap", "bootstrap.log");
-    await mkdir8(dirname7(logPath), { recursive: true });
+    const logPath = join20(pluginData, "bootstrap", "bootstrap.log");
+    await mkdir8(dirname8(logPath), { recursive: true });
     await appendFile2(logPath, `${JSON.stringify({ timestamp: new Date(now).toISOString(), event, ...details })}
 `);
   } catch {}
@@ -3214,7 +3309,7 @@ async function executeSessionStartHook(options) {
   return { action: "spawned", exitCode: 0 };
 }
 function spawnDetachedWorker(invocation) {
-  const child = spawn2(invocation.command, [...invocation.args], {
+  const child = spawn(invocation.command, [...invocation.args], {
     detached: true,
     env: invocation.env,
     stdio: "ignore"
@@ -3226,7 +3321,7 @@ function defaultWorkerCliPath() {
 }
 async function isLockFresh(lockPath, now) {
   try {
-    const lockStat = await stat5(lockPath);
+    const lockStat = await stat6(lockPath);
     return now - lockStat.mtimeMs < DEFAULT_LOCK_STALE_MS;
   } catch {
     return false;