claudekit-cli 4.5.0-dev.3 → 4.5.0-dev.4

package/cli-manifest.json

@@ -1,6 +1,6 @@
 {
-	"version": "4.5.0-dev.3",
-	"generatedAt": "2026-06-24T03:41:00.177Z",
+	"version": "4.5.0-dev.4",
+	"generatedAt": "2026-06-24T22:46:20.222Z",
 	"commands": {
 		"agents": {
 			"name": "agents",

package/dist/index.js

@@ -64421,7 +64421,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "4.5.0-dev.3",
+    version: "4.5.0-dev.4",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -66589,6 +66589,118 @@ This is a bug. Please open an issue at https://github.com/mrgoonie/claudekit-cli
   };
 });
 
+// src/domains/installation/plugin/codex-plugin-installer.ts
+import { execFile as execFile8 } from "node:child_process";
+import { promisify as promisify9 } from "node:util";
+function resolveCodexExecutable(platformName = process.platform) {
+  return platformName === "win32" ? "codex.cmd" : "codex";
+}
+function shouldRunCodexInShell(platformName = process.platform) {
+  return platformName === "win32";
+}
+
+class CodexPluginInstaller {
+  run;
+  codexHome;
+  constructor(run = defaultCodexRunner, codexHome) {
+    this.run = run;
+    this.codexHome = codexHome;
+  }
+  opts(timeoutMs) {
+    return { codexHome: this.codexHome, timeoutMs };
+  }
+  async isCodexAvailable() {
+    return (await this.run(["--version"], this.opts(15000))).ok;
+  }
+  async isPluginSupported() {
+    const r2 = await this.run(["plugin", "--help"], this.opts(15000));
+    return r2.ok && /marketplace/i.test(r2.stdout + r2.stderr);
+  }
+  async marketplaceAdd(source) {
+    return this.run(["plugin", "marketplace", "add", source], this.opts());
+  }
+  async add() {
+    return this.run(["plugin", "add", `${CK_PLUGIN_NAME}@${CK_MARKETPLACE_NAME}`], this.opts());
+  }
+  async listJson() {
+    return this.run(["plugin", "list", "--json"], this.opts(15000));
+  }
+  async verifyInstalled() {
+    const r2 = await this.listJson();
+    if (!r2.ok)
+      return false;
+    try {
+      const parsed = JSON.parse(r2.stdout);
+      return (parsed.installed ?? []).some((plugin) => plugin.pluginId === `${CK_PLUGIN_NAME}@${CK_MARKETPLACE_NAME}` && plugin.installed === true && plugin.enabled === true);
+    } catch {
+      return false;
+    }
+  }
+}
+async function installCodexPlugin(opts) {
+  const installer = opts.installer ?? new CodexPluginInstaller(undefined, opts.codexHome);
+  if (!await installer.isCodexAvailable() || !await installer.isPluginSupported()) {
+    return { action: "skipped-codex-unsupported", pluginVerified: false };
+  }
+  const added = await installer.marketplaceAdd(opts.pluginSourceDir);
+  if (!added.ok) {
+    return {
+      action: "install-failed",
+      pluginVerified: false,
+      error: `codex marketplace add failed: ${added.stderr.trim()}`
+    };
+  }
+  const installed = await installer.add();
+  if (!installed.ok) {
+    return {
+      action: "install-failed",
+      pluginVerified: false,
+      error: `codex plugin add failed: ${installed.stderr.trim()}`
+    };
+  }
+  const verified = await installer.verifyInstalled();
+  if (!verified) {
+    return {
+      action: "install-failed",
+      pluginVerified: false,
+      error: "codex plugin did not verify after install"
+    };
+  }
+  return { action: "installed", pluginVerified: true };
+}
+async function shouldRefreshCodexPlugin(installer = new CodexPluginInstaller) {
+  if (!await installer.isCodexAvailable() || !await installer.isPluginSupported()) {
+    return false;
+  }
+  return !await installer.verifyInstalled();
+}
+var execFileAsync6, DEFAULT_TIMEOUT_MS2 = 120000, defaultCodexRunner = async (args, opts) => {
+  const env2 = { ...process.env };
+  if (opts?.codexHome)
+    env2.CODEX_HOME = opts.codexHome;
+  try {
+    const { stdout, stderr } = await execFileAsync6(resolveCodexExecutable(), args, {
+      env: env2,
+      shell: shouldRunCodexInShell(),
+      timeout: opts?.timeoutMs ?? DEFAULT_TIMEOUT_MS2,
+      maxBuffer: 10 * 1024 * 1024
+    });
+    return { ok: true, stdout: String(stdout), stderr: String(stderr), code: 0 };
+  } catch (err) {
+    const e2 = err;
+    return {
+      ok: false,
+      stdout: e2.stdout ? String(e2.stdout) : "",
+      stderr: e2.stderr ? String(e2.stderr) : e2.message ?? "",
+      code: typeof e2.code === "number" ? e2.code : null
+    };
+  }
+};
+var init_codex_plugin_installer = __esm(() => {
+  init_install_mode_detector();
+  execFileAsync6 = promisify9(execFile8);
+});
+
 // src/domains/migration/metadata-migration.ts
 import { join as join66 } from "node:path";
 async function detectMetadataFormat(claudeDir3) {
@@ -68358,7 +68470,7 @@ import { existsSync as existsSync48 } from "node:fs";
 import { readdir as readdir19 } from "node:fs/promises";
 import { builtinModules } from "node:module";
 import { dirname as dirname30, join as join69 } from "node:path";
-import { promisify as promisify9 } from "node:util";
+import { promisify as promisify10 } from "node:util";
 function selectKitForUpdate(params) {
   const { hasLocal, hasGlobal, localKits, globalKits } = params;
   const hasLocalKit = localKits.length > 0 || hasLocal;
@@ -68567,6 +68679,7 @@ async function promptKitUpdate(beta, yes, deps) {
     const findMissingHookDepsFn = deps?.findMissingHookDependenciesFn ?? findMissingHookDependencies;
     const detectInstallModeFn = deps?.detectInstallModeFn ?? detectInstallMode;
     const hasTrackedPluginSuppliedLegacyFilesFn = deps?.hasTrackedPluginSuppliedLegacyFilesFn ?? hasTrackedPluginSuppliedLegacyFiles;
+    const shouldRefreshCodexPluginFn = deps?.shouldRefreshCodexPluginFn ?? shouldRefreshCodexPlugin;
     const setup = await getSetupFn();
     const hasLocal = !!setup.project.metadata;
     const hasGlobal = !!setup.global.metadata;
@@ -68637,6 +68750,10 @@ async function promptKitUpdate(beta, yes, deps) {
             logger.warning(`Detected ${installMode.mode} global Engineer install; migrating to plugin format`);
             forceKitReinstall = true;
           }
+          if (await shouldRefreshCodexPluginFn()) {
+            logger.warning("Detected missing Codex ClaudeKit plugin; reinstalling global Engineer content");
+            forceKitReinstall = true;
+          }
         }
       } catch (error) {
         logger.verbose(`Plugin install-mode self-heal check skipped: ${error instanceof Error ? error.message : "unknown"}`);
@@ -68927,6 +69044,7 @@ var import_fs_extra8, execAsync2, SAFE_PROVIDER_NAME, HOOK_DEPENDENCY_EXTENSIONS
 var init_post_update_handler = __esm(() => {
   init_ck_config_manager();
   init_hook_health_checker();
+  init_codex_plugin_installer();
   init_install_mode_detector();
   init_metadata_migration();
   init_version_utils();
@@ -68937,7 +69055,7 @@ var init_post_update_handler = __esm(() => {
   init_codex_sync_notice();
   init_version_comparator();
   import_fs_extra8 = __toESM(require_lib(), 1);
-  execAsync2 = promisify9(exec2);
+  execAsync2 = promisify10(exec2);
   SAFE_PROVIDER_NAME = /^[a-z0-9-]+$/;
   HOOK_DEPENDENCY_EXTENSIONS = [".js", ".cjs", ".mjs", ".json"];
 });
@@ -68948,8 +69066,8 @@ function getDefaultUpdateCliCommandDeps() {
     currentVersion: package_default.version,
     execAsyncFn: async (cmd, opts) => {
       const { exec: exec3 } = await import("node:child_process");
-      const { promisify: promisify10 } = await import("node:util");
-      const result = await promisify10(exec3)(cmd, opts);
+      const { promisify: promisify11 } = await import("node:util");
+      const result = await promisify11(exec3)(cmd, opts);
       return { stdout: String(result.stdout ?? ""), stderr: String(result.stderr ?? "") };
     },
     packageManagerDetector: PackageManagerDetector,
@@ -69335,14 +69453,14 @@ var init_config_version_checker = __esm(() => {
 
 // src/domains/web-server/routes/system-routes.ts
 import { spawn as spawn3 } from "node:child_process";
-import { execFile as execFile8 } from "node:child_process";
+import { execFile as execFile9 } from "node:child_process";
 import { existsSync as existsSync49 } from "node:fs";
 import { readFile as readFile40 } from "node:fs/promises";
 import { cpus, homedir as homedir42, totalmem } from "node:os";
 import { join as join71 } from "node:path";
 function runCommand(cmd, args, fallback2) {
   return new Promise((resolve35) => {
-    execFile8(cmd, args, { timeout: 5000 }, (err, stdout) => {
+    execFile9(cmd, args, { timeout: 5000 }, (err, stdout) => {
       if (err) {
         resolve35(fallback2);
       } else {
@@ -74607,8 +74725,8 @@ var require_picomatch2 = __commonJS((exports, module) => {
 });
 
 // src/services/package-installer/process-executor.ts
-import { exec as exec7, execFile as execFile9, spawn as spawn4 } from "node:child_process";
-import { promisify as promisify14 } from "node:util";
+import { exec as exec7, execFile as execFile10, spawn as spawn4 } from "node:child_process";
+import { promisify as promisify15 } from "node:util";
 function executeInteractiveScript(command, args, options2) {
   return new Promise((resolve38, reject) => {
     const child = spawn4(command, args, {
@@ -74645,10 +74763,10 @@ function getNpmCommand() {
   const platform10 = process.platform;
   return platform10 === "win32" ? "npm.cmd" : "npm";
 }
-var execAsync7, execFileAsync6;
+var execAsync7, execFileAsync7;
 var init_process_executor = __esm(() => {
-  execAsync7 = promisify14(exec7);
-  execFileAsync6 = promisify14(execFile9);
+  execAsync7 = promisify15(exec7);
+  execFileAsync7 = promisify15(execFile10);
 });
 
 // src/services/package-installer/validators.ts
@@ -74879,14 +74997,14 @@ async function installOpenCode() {
     const tempScriptPath = join90(tmpdir4(), "opencode-install.sh");
     try {
       logger.info("Downloading OpenCode installation script...");
-      await execFileAsync6("curl", ["-fsSL", "https://opencode.ai/install", "-o", tempScriptPath], {
+      await execFileAsync7("curl", ["-fsSL", "https://opencode.ai/install", "-o", tempScriptPath], {
         timeout: 30000
       });
-      await execFileAsync6("chmod", ["+x", tempScriptPath], {
+      await execFileAsync7("chmod", ["+x", tempScriptPath], {
         timeout: 5000
       });
       logger.info("Executing OpenCode installation script...");
-      await execFileAsync6("bash", [tempScriptPath], {
+      await execFileAsync7("bash", [tempScriptPath], {
         timeout: 120000
       });
     } finally {
@@ -75077,8 +75195,8 @@ async function checkNeedsSudoPackages() {
     return false;
   }
   const { exec: exec8 } = await import("node:child_process");
-  const { promisify: promisify15 } = await import("node:util");
-  const execAsync8 = promisify15(exec8);
+  const { promisify: promisify16 } = await import("node:util");
+  const execAsync8 = promisify16(exec8);
   try {
     await Promise.all([
       execAsync8("which ffmpeg", { timeout: WHICH_COMMAND_TIMEOUT_MS }),
@@ -75649,7 +75767,7 @@ __export(exports_package_installer, {
   getPackageVersion: () => getPackageVersion,
   getNpmCommand: () => getNpmCommand,
   executeInteractiveScript: () => executeInteractiveScript,
-  execFileAsync: () => execFileAsync6,
+  execFileAsync: () => execFileAsync7,
   execAsync: () => execAsync7,
   PARTIAL_INSTALL_VERSION: () => PARTIAL_INSTALL_VERSION,
   EXIT_CODE_PARTIAL_SUCCESS: () => EXIT_CODE_PARTIAL_SUCCESS,
@@ -77576,11 +77694,11 @@ var require_extract_zip = __commonJS((exports, module) => {
   var { createWriteStream: createWriteStream3, promises: fs19 } = __require("fs");
   var getStream = require_get_stream();
   var path15 = __require("path");
-  var { promisify: promisify15 } = __require("util");
+  var { promisify: promisify16 } = __require("util");
   var stream = __require("stream");
   var yauzl = require_yauzl();
-  var openZip = promisify15(yauzl.open);
-  var pipeline = promisify15(stream.pipeline);
+  var openZip = promisify16(yauzl.open);
+  var pipeline = promisify16(stream.pipeline);
 
   class Extractor {
     constructor(zipPath, opts) {
@@ -77665,7 +77783,7 @@ var require_extract_zip = __commonJS((exports, module) => {
       if (isDir2)
         return;
       debug("opening read stream", dest);
-      const readStream = await promisify15(this.zipfile.openReadStream.bind(this.zipfile))(entry);
+      const readStream = await promisify16(this.zipfile.openReadStream.bind(this.zipfile))(entry);
       if (symlink4) {
         const link = await getStream(readStream);
         debug("creating symlink", link, dest);
@@ -78117,7 +78235,7 @@ var init_content_validator = __esm(() => {
 
 // src/commands/content/phases/context-cache-manager.ts
 import { createHash as createHash9 } from "node:crypto";
-import { existsSync as existsSync83, mkdirSync as mkdirSync7, readFileSync as readFileSync21, readdirSync as readdirSync14, statSync as statSync15 } from "node:fs";
+import { existsSync as existsSync83, mkdirSync as mkdirSync7, readFileSync as readFileSync22, readdirSync as readdirSync14, statSync as statSync15 } from "node:fs";
 import { rename as rename16, writeFile as writeFile42 } from "node:fs/promises";
 import { homedir as homedir54 } from "node:os";
 import { basename as basename34, join as join165 } from "node:path";
@@ -78126,7 +78244,7 @@ function getCachedContext(repoPath) {
   if (!existsSync83(cachePath))
     return null;
   try {
-    const raw2 = readFileSync21(cachePath, "utf-8");
+    const raw2 = readFileSync22(cachePath, "utf-8");
     const cache5 = JSON.parse(raw2);
     const age = Date.now() - new Date(cache5.createdAt).getTime();
     if (age >= CACHE_TTL_MS5)
@@ -78374,7 +78492,7 @@ function extractContentFromResponse(response) {
 
 // src/commands/content/phases/docs-summarizer.ts
 import { execSync as execSync7 } from "node:child_process";
-import { existsSync as existsSync84, readFileSync as readFileSync22, readdirSync as readdirSync15 } from "node:fs";
+import { existsSync as existsSync84, readFileSync as readFileSync23, readdirSync as readdirSync15 } from "node:fs";
 import { join as join166 } from "node:path";
 async function summarizeProjectDocs(repoPath, contentLogger) {
   const rawContent = collectRawDocs(repoPath);
@@ -78423,7 +78541,7 @@ function collectRawDocs(repoPath) {
       return "";
     if (totalChars >= MAX_RAW_CONTENT_CHARS)
       return "";
-    const content = readFileSync22(filePath, "utf-8");
+    const content = readFileSync23(filePath, "utf-8");
     const capped = content.slice(0, Math.min(maxChars, MAX_RAW_CONTENT_CHARS - totalChars));
     totalChars += capped.length;
     return capped;
@@ -79104,7 +79222,7 @@ function isNoiseCommit(title, author) {
 
 // src/commands/content/phases/change-detector.ts
 import { execSync as execSync10, spawnSync as spawnSync9 } from "node:child_process";
-import { existsSync as existsSync88, readFileSync as readFileSync23, readdirSync as readdirSync17, statSync as statSync17 } from "node:fs";
+import { existsSync as existsSync88, readFileSync as readFileSync24, readdirSync as readdirSync17, statSync as statSync17 } from "node:fs";
 import { join as join169 } from "node:path";
 function detectCommits(repo, since) {
   try {
@@ -79231,7 +79349,7 @@ function detectCompletedPlans(repo, since) {
         const stat26 = statSync17(planFile);
         if (stat26.mtimeMs < sinceMs)
           continue;
-        const content = readFileSync23(planFile, "utf-8");
+        const content = readFileSync24(planFile, "utf-8");
         const frontmatterMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
         if (!frontmatterMatch)
           continue;
@@ -79996,7 +80114,7 @@ async function loadContentConfig(projectDir) {
 }
 async function saveContentConfig(projectDir, config) {
   const configPath = join171(projectDir, CK_CONFIG_FILE2);
-  const json = await readJsonSafe3(configPath);
+  const json = await readJsonSafe4(configPath);
   json.content = { ...json.content, ...config };
   await atomicWrite3(configPath, json);
 }
@@ -80021,14 +80139,14 @@ async function saveContentState(projectDir, state) {
     }
   }
   ContentStateSchema.parse(state);
-  const json = await readJsonSafe3(configPath);
+  const json = await readJsonSafe4(configPath);
   if (!json.content || typeof json.content !== "object") {
     json.content = {};
   }
   json.content.state = state;
   await atomicWrite3(configPath, json);
 }
-async function readJsonSafe3(filePath) {
+async function readJsonSafe4(filePath) {
   try {
     const raw2 = await readFile71(filePath, "utf-8");
     return JSON.parse(raw2);
@@ -80503,7 +80621,7 @@ __export(exports_content_subcommands, {
   logsContent: () => logsContent,
   approveContentCmd: () => approveContentCmd
 });
-import { existsSync as existsSync91, readFileSync as readFileSync24, unlinkSync as unlinkSync6 } from "node:fs";
+import { existsSync as existsSync91, readFileSync as readFileSync25, unlinkSync as unlinkSync6 } from "node:fs";
 import { homedir as homedir58 } from "node:os";
 import { join as join173 } from "node:path";
 function isDaemonRunning() {
@@ -80511,7 +80629,7 @@ function isDaemonRunning() {
   if (!existsSync91(lockFile))
     return { running: false, pid: null };
   try {
-    const pidStr = readFileSync24(lockFile, "utf-8").trim();
+    const pidStr = readFileSync25(lockFile, "utf-8").trim();
     const pid = Number.parseInt(pidStr, 10);
     if (Number.isNaN(pid)) {
       unlinkSync6(lockFile);
@@ -80545,7 +80663,7 @@ async function stopContent() {
     return;
   }
   try {
-    const pidStr = readFileSync24(lockFile, "utf-8").trim();
+    const pidStr = readFileSync25(lockFile, "utf-8").trim();
     const pid = Number.parseInt(pidStr, 10);
     if (!Number.isNaN(pid)) {
       process.kill(pid, "SIGTERM");
@@ -80593,7 +80711,7 @@ async function logsContent(options2) {
       process.exit(0);
     });
   } else {
-    const content = readFileSync24(logPath, "utf-8");
+    const content = readFileSync25(logPath, "utf-8");
     console.log(content);
   }
 }
@@ -87963,7 +88081,7 @@ class CheckRunner {
 }
 // src/domains/health-checks/system-checker.ts
 import { exec as exec6 } from "node:child_process";
-import { promisify as promisify13 } from "node:util";
+import { promisify as promisify14 } from "node:util";
 
 // src/domains/github/gh-cli-utils.ts
 init_environment();
@@ -88031,8 +88149,8 @@ function getGhUpgradeInstructions(currentVersion) {
 init_environment();
 init_logger();
 import { exec as exec3 } from "node:child_process";
-import { promisify as promisify10 } from "node:util";
-var execAsync3 = promisify10(exec3);
+import { promisify as promisify11 } from "node:util";
+var execAsync3 = promisify11(exec3);
 function getOSInfo() {
   const platform8 = process.platform;
   const arch2 = process.arch;
@@ -88253,7 +88371,7 @@ async function checkAllDependencies() {
 // src/services/package-installer/dependency-installer.ts
 init_logger();
 import { exec as exec5 } from "node:child_process";
-import { promisify as promisify12 } from "node:util";
+import { promisify as promisify13 } from "node:util";
 
 // src/services/package-installer/dependencies/node-installer.ts
 var NODEJS_INSTALLERS = [
@@ -88347,8 +88465,8 @@ var PYTHON_INSTALLERS = [
 init_logger();
 import { exec as exec4 } from "node:child_process";
 import * as fs7 from "node:fs";
-import { promisify as promisify11 } from "node:util";
-var execAsync4 = promisify11(exec4);
+import { promisify as promisify12 } from "node:util";
+var execAsync4 = promisify12(exec4);
 async function detectOS() {
   const platform8 = process.platform;
   const info = { platform: platform8 };
@@ -88418,7 +88536,7 @@ var CLAUDE_INSTALLERS = [
 ];
 
 // src/services/package-installer/dependency-installer.ts
-var execAsync5 = promisify12(exec5);
+var execAsync5 = promisify13(exec5);
 function getInstallerMethods(dependency, osInfo) {
   let installers = dependency === "claude" ? CLAUDE_INSTALLERS : dependency === "python" || dependency === "pip" ? PYTHON_INSTALLERS : dependency === "nodejs" ? NODEJS_INSTALLERS : [];
   installers = installers.filter((m2) => m2.platform === osInfo.platform);
@@ -88474,7 +88592,7 @@ async function installDependency(dependency, method) {
 
 // src/domains/health-checks/system-checker.ts
 init_logger();
-var execAsync6 = promisify13(exec6);
+var execAsync6 = promisify14(exec6);
 
 class SystemChecker {
   group = "system";
@@ -101939,10 +102057,10 @@ class TarExtractor {
 // src/domains/installation/extraction/zip-extractor.ts
 init_logger();
 var import_extract_zip = __toESM(require_extract_zip(), 1);
-import { execFile as execFile10 } from "node:child_process";
+import { execFile as execFile11 } from "node:child_process";
 import { copyFile as copyFile5, mkdir as mkdir29, readdir as readdir26, rm as rm12, stat as stat16 } from "node:fs/promises";
 import { join as join103 } from "node:path";
-import { promisify as promisify15 } from "node:util";
+import { promisify as promisify16 } from "node:util";
 
 // src/domains/installation/extraction/native-zip-commands.ts
 var NATIVE_EXTRACT_TIMEOUT_MS = 120000;
@@ -101981,7 +102099,7 @@ function getNativeZipCommands(archivePath, destDir, platformName = process.platf
 }
 
 // src/domains/installation/extraction/zip-extractor.ts
-var execFileAsync7 = promisify15(execFile10);
+var execFileAsync8 = promisify16(execFile11);
 
 class ZipExtractor {
   async tryNativeExtraction(archivePath, destDir) {
@@ -101993,7 +102111,7 @@ class ZipExtractor {
       try {
         await rm12(destDir, { recursive: true, force: true });
         await mkdir29(destDir, { recursive: true });
-        await execFileAsync7(nativeCommand.command, nativeCommand.args, {
+        await execFileAsync8(nativeCommand.command, nativeCommand.args, {
           timeout: NATIVE_EXTRACT_TIMEOUT_MS,
           windowsHide: true
         });
@@ -108818,7 +108936,8 @@ async function handlePostInstall(ctx) {
   };
 }
 // src/commands/init/phases/plugin-install-handler.ts
-import { cpSync as cpSync2, existsSync as existsSync69, mkdirSync as mkdirSync6, rmSync as rmSync4, writeFileSync as writeFileSync8 } from "node:fs";
+init_codex_plugin_installer();
+import { cpSync as cpSync2, existsSync as existsSync69, mkdirSync as mkdirSync6, readFileSync as readFileSync21, rmSync as rmSync4, writeFileSync as writeFileSync8 } from "node:fs";
 import { join as join135 } from "node:path";
 
 // src/domains/installation/plugin/migrate-legacy-to-plugin.ts
@@ -108828,18 +108947,18 @@ import { dirname as dirname43, join as join134 } from "node:path";
 
 // src/domains/installation/plugin/plugin-installer.ts
 init_install_mode_detector();
-import { execFile as execFile11 } from "node:child_process";
-import { promisify as promisify16 } from "node:util";
-var execFileAsync8 = promisify16(execFile11);
-var DEFAULT_TIMEOUT_MS2 = 120000;
+import { execFile as execFile12 } from "node:child_process";
+import { promisify as promisify17 } from "node:util";
+var execFileAsync9 = promisify17(execFile12);
+var DEFAULT_TIMEOUT_MS3 = 120000;
 var defaultClaudeRunner = async (args, opts) => {
   const env2 = { ...process.env };
   if (opts?.configDir)
     env2.CLAUDE_CONFIG_DIR = opts.configDir;
   try {
-    const { stdout: stdout2, stderr } = await execFileAsync8("claude", args, {
+    const { stdout: stdout2, stderr } = await execFileAsync9("claude", args, {
       env: env2,
-      timeout: opts?.timeoutMs ?? DEFAULT_TIMEOUT_MS2,
+      timeout: opts?.timeoutMs ?? DEFAULT_TIMEOUT_MS3,
       maxBuffer: 10 * 1024 * 1024
     });
     return { ok: true, stdout: String(stdout2), stderr: String(stderr), code: 0 };
@@ -109065,12 +109184,23 @@ async function handlePluginInstall(ctx, deps = {}) {
     return ctx;
   }
   const migrate = deps.migrate ?? migrateLegacyToPlugin;
+  const installCodex = deps.installCodex ?? installCodexPlugin;
   try {
     const pluginSourceDir = stagePluginSource(ctx.extractDir, deps.stageBaseDir);
-    const result = await migrate({ pluginSourceDir, claudeDir: ctx.claudeDir });
-    logPluginResult(result);
+    try {
+      const result = await migrate({ pluginSourceDir, claudeDir: ctx.claudeDir });
+      logPluginResult(result);
+    } catch (err) {
+      logger.verbose(`Claude plugin install skipped (legacy copy retained): ${err.message}`);
+    }
+    try {
+      const result = await installCodex({ pluginSourceDir });
+      logCodexPluginResult(result);
+    } catch (err) {
+      logger.verbose(`Codex plugin install skipped: ${err.message}`);
+    }
   } catch (err) {
-    logger.verbose(`Plugin install skipped (legacy copy retained): ${err.message}`);
+    logger.verbose(`Plugin staging skipped (legacy copy retained): ${err.message}`);
   }
   return ctx;
 }
@@ -109082,17 +109212,88 @@ function stagePluginSource(extractDir, stageBaseDir) {
   }
   rmSync4(base2, { recursive: true, force: true });
   mkdirSync6(base2, { recursive: true });
-  cpSync2(payloadSrc, join135(base2, ".claude"), { recursive: true });
-  const marketplace = {
+  const stagedPayload = join135(base2, ".claude");
+  cpSync2(payloadSrc, stagedPayload, { recursive: true });
+  ensureCodexPluginManifest(stagedPayload);
+  const claudeMarketplace = {
     name: "claudekit",
     owner: { name: "ClaudeKit" },
     plugins: [{ name: "ck", source: "./.claude", description: "ClaudeKit Engineer" }]
   };
   mkdirSync6(join135(base2, ".claude-plugin"), { recursive: true });
-  writeFileSync8(join135(base2, ".claude-plugin", "marketplace.json"), `${JSON.stringify(marketplace, null, 2)}
+  writeFileSync8(join135(base2, ".claude-plugin", "marketplace.json"), `${JSON.stringify(claudeMarketplace, null, 2)}
+`, "utf-8");
+  const codexMarketplace = {
+    name: "claudekit",
+    interface: { displayName: "ClaudeKit" },
+    plugins: [
+      {
+        name: "ck",
+        source: { source: "local", path: "./.claude" },
+        policy: { installation: "AVAILABLE", authentication: "ON_INSTALL" },
+        category: "Productivity"
+      }
+    ]
+  };
+  mkdirSync6(join135(base2, ".agents", "plugins"), { recursive: true });
+  writeFileSync8(join135(base2, ".agents", "plugins", "marketplace.json"), `${JSON.stringify(codexMarketplace, null, 2)}
 `, "utf-8");
   return base2;
 }
+function ensureCodexPluginManifest(pluginRoot) {
+  const manifestPath = join135(pluginRoot, ".codex-plugin", "plugin.json");
+  if (existsSync69(manifestPath))
+    return;
+  const claudeManifest = readJsonSafe3(join135(pluginRoot, ".claude-plugin", "plugin.json"));
+  const manifest = pruneUndefined({
+    name: stringField(claudeManifest, "name") ?? "ck",
+    version: stringField(claudeManifest, "version") ?? "0.0.0",
+    description: stringField(claudeManifest, "description") ?? "ClaudeKit Engineer — multi-agent planning, code review, debugging, and workflow skills for Codex.",
+    author: authorField(claudeManifest),
+    homepage: stringField(claudeManifest, "homepage"),
+    repository: stringField(claudeManifest, "repository"),
+    license: stringField(claudeManifest, "license"),
+    keywords: ["claudekit", "codex", "skills", "agents", "workflow"],
+    skills: "./skills/",
+    interface: {
+      displayName: "ClaudeKit Engineer",
+      shortDescription: "ClaudeKit planning, review, debugging, and workflow skills.",
+      longDescription: "ClaudeKit Engineer provides planning, code review, debugging, testing, browser workflow, and implementation skills for Codex.",
+      developerName: "ClaudeKit",
+      category: "Productivity",
+      capabilities: ["Skills"],
+      websiteURL: "https://github.com/claudekit/claudekit-engineer"
+    }
+  });
+  mkdirSync6(join135(pluginRoot, ".codex-plugin"), { recursive: true });
+  writeFileSync8(manifestPath, `${JSON.stringify(manifest, null, 2)}
+`, "utf-8");
+}
+function readJsonSafe3(filePath) {
+  try {
+    const parsed = JSON.parse(readFileSync21(filePath, "utf-8"));
+    return isRecord3(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+function stringField(source, key) {
+  const value = source?.[key];
+  return typeof value === "string" && value.trim() !== "" ? value : undefined;
+}
+function authorField(source) {
+  const author = source?.author;
+  if (isRecord3(author) && typeof author.name === "string" && author.name.trim() !== "") {
+    return { name: author.name };
+  }
+  return { name: "ClaudeKit" };
+}
+function pruneUndefined(value) {
+  return Object.fromEntries(Object.entries(value).filter(([, entry]) => entry !== undefined));
+}
+function isRecord3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function logPluginResult(result) {
   switch (result.action) {
     case "migrated-from-legacy":
@@ -109112,6 +109313,19 @@ function logPluginResult(result) {
       break;
   }
 }
+function logCodexPluginResult(result) {
+  switch (result.action) {
+    case "installed":
+      logger.info("Installed ClaudeKit Engineer as a Codex plugin.");
+      break;
+    case "skipped-codex-unsupported":
+      logger.verbose("Codex plugin support unavailable; skipped Codex plugin install.");
+      break;
+    case "install-failed":
+      logger.verbose(`Codex plugin install did not verify. ${result.error ?? ""}`);
+      break;
+  }
+}
 // src/commands/init/phases/selection-handler.ts
 init_config_manager();
 init_github_client();
@@ -109187,8 +109401,8 @@ async function detectAccessibleKits() {
 // src/domains/github/preflight-checker.ts
 init_logger();
 import { exec as exec8 } from "node:child_process";
-import { promisify as promisify17 } from "node:util";
-var execAsync8 = promisify17(exec8);
+import { promisify as promisify18 } from "node:util";
+var execAsync8 = promisify18(exec8);
 function createSuccessfulPreflightResult() {
   return {
     success: true,
@@ -118456,7 +118670,7 @@ function registerCommands(cli) {
 // src/cli/version-display.ts
 init_package();
 init_config_version_checker();
-import { existsSync as existsSync94, readFileSync as readFileSync25 } from "node:fs";
+import { existsSync as existsSync94, readFileSync as readFileSync26 } from "node:fs";
 import { join as join176 } from "node:path";
 
 // src/domains/versioning/version-checker.ts
@@ -118796,7 +119010,7 @@ async function displayVersion() {
   const isLocalSameAsGlobal = localMetadataPath === globalMetadataPath;
   if (!isLocalSameAsGlobal && existsSync94(localMetadataPath)) {
     try {
-      const rawMetadata = JSON.parse(readFileSync25(localMetadataPath, "utf-8"));
+      const rawMetadata = JSON.parse(readFileSync26(localMetadataPath, "utf-8"));
       const metadata = MetadataSchema.parse(rawMetadata);
       const kitsDisplay = formatInstalledKits(metadata);
       if (kitsDisplay) {
@@ -118810,7 +119024,7 @@ async function displayVersion() {
   }
   if (existsSync94(globalMetadataPath)) {
     try {
-      const rawMetadata = JSON.parse(readFileSync25(globalMetadataPath, "utf-8"));
+      const rawMetadata = JSON.parse(readFileSync26(globalMetadataPath, "utf-8"));
       const metadata = MetadataSchema.parse(rawMetadata);
       const kitsDisplay = formatInstalledKits(metadata);
       if (kitsDisplay) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "claudekit-cli",
-	"version": "4.5.0-dev.3",
+	"version": "4.5.0-dev.4",
 	"description": "CLI tool for bootstrapping and updating ClaudeKit projects",
 	"type": "module",
 	"repository": {