vybekiit 0.7.32 → 0.7.34

package/dist/bin.js

@@ -265,7 +265,7 @@ var twilioConfigSchema = Schema2.Struct({
 });
 var anthropicConfigSchema = Schema2.Struct({
   ANTHROPIC_API_KEY: NonEmpty,
-  ANTHROPIC_MODEL: Schema2.optionalWith(NonEmpty, { default: () => "claude-3-5-haiku-latest" })
+  ANTHROPIC_MODEL: Schema2.optionalWith(NonEmpty, { default: () => "claude-haiku-5-5" })
 });
 var openrouterConfigSchema = Schema2.Struct({
   OPENROUTER_API_KEY: NonEmpty,
@@ -2406,6 +2406,7 @@ var AGENT_LAYER_PATHS = [
   "language.md",
   ".claude/settings.json",
   ".claude/hooks",
+  ".codex/hooks.json",
   ".cursor/rules/vybekiit.mdc",
   ".cursor/rules/patterns.mdc",
   ".github/copilot-instructions.md",
@@ -14175,8 +14176,12 @@ var copyPackageIntoKit = async (packagesRoot, packageDir, dest) => {
     filter: (src) => shouldCopyScaffoldPath(src)
   });
 };
-var writeWorkspaceClaudeSettings = async (surfaceDest, dest, template) => {
-  const appSettingsPath = join14(surfaceDest, ".claude", "settings.json");
+var AGENT_HOOK_SETTINGS_FILES = [
+  [".claude", "settings.json"],
+  [".codex", "hooks.json"]
+];
+var writeWorkspaceHookSettings = async (dest, template, [settingsFolder, settingsFile]) => {
+  const appSettingsPath = join14(dest, "templates", template, settingsFolder, settingsFile);
   if (!await pathExists3(appSettingsPath)) {
     return;
   }
@@ -14185,8 +14190,8 @@ var writeWorkspaceClaudeSettings = async (surfaceDest, dest, template) => {
     "/.claude/hooks/",
     `/templates/${template}/.claude/hooks/`
   );
-  await mkdir5(join14(dest, ".claude"), { recursive: true });
-  await writeFile6(join14(dest, ".claude", "settings.json"), workspaceSettings);
+  await mkdir5(join14(dest, settingsFolder), { recursive: true });
+  await writeFile6(join14(dest, settingsFolder, settingsFile), workspaceSettings);
 };
 var scaffoldKitWorkspace = async (options) => {
   const surfaceSource = join14(options.kitRoot, "templates", options.template);
@@ -14252,7 +14257,11 @@ The app lives in templates/${options.template}. Before planning or changing it,
     );
     await ensureAgentSkillSymlinks(options.dest);
   }
-  await writeWorkspaceClaudeSettings(surfaceDest, options.dest, options.template);
+  await Promise.all(
+    AGENT_HOOK_SETTINGS_FILES.map(
+      (settingsPath) => writeWorkspaceHookSettings(options.dest, options.template, settingsPath)
+    )
+  );
   await shipFirstPartyMcpConfigs({ dest: options.dest, template: options.template });
   await writeKitWorkspaceManifest({
     projectRoot: options.dest,
@@ -15768,7 +15777,7 @@ var getAgentConfigsForTemplate = () => ({
   "Claude Code": ".claude/settings.json + hooks/",
   Kiro: ".kiro/steering/vybekiit.md",
   Cursor: ".cursor/rules/vybekiit.mdc",
-  Codex: "AGENTS.md",
+  Codex: "AGENTS.md + .codex/hooks.json",
   Gemini: "GEMINI.md",
   Copilot: ".github/copilot-instructions.md",
   Windsurf: ".windsurfrules",
@@ -16536,7 +16545,7 @@ var readInitPackageJson = async (cwd) => {
 // src/commands/initAssets.ts
 var execFileAsync4 = promisify4(execFile4);
 var HERE5 = dirname10(fileURLToPath5(import.meta.url));
-var copyClaudeHooks = async (cwd, templateDir) => {
+var copyAgentHooks = async (cwd, templateDir) => {
   const claudeSource = join27(templateDir, ".claude");
   if (!await pathExists4(claudeSource)) {
     process.stdout.write("  \u26A0\uFE0F  Could not copy .claude hooks (source missing)\n");
@@ -16544,6 +16553,13 @@ var copyClaudeHooks = async (cwd, templateDir) => {
   }
   await cp4(claudeSource, join27(cwd, ".claude"), { recursive: true, force: true });
   process.stdout.write("  \u2705 .claude/settings.json + hooks\n");
+  const codexHooksSource = join27(templateDir, ".codex", "hooks.json");
+  if (!await pathExists4(codexHooksSource)) {
+    return;
+  }
+  await mkdir10(join27(cwd, ".codex"), { recursive: true });
+  await cp4(codexHooksSource, join27(cwd, ".codex", "hooks.json"), { force: true });
+  process.stdout.write("  \u2705 .codex/hooks.json\n");
 };
 var copyWorkflows = async (cwd, templateDir, pm) => {
   const workflowsDir = join27(cwd, ".github", "workflows");
@@ -16766,11 +16782,11 @@ var writeInitSuccess = (pm) => {
 `);
   process.stdout.write("\n");
   process.stdout.write("   Platform configs generated:\n");
-  process.stdout.write("     .kiro/steering/vybekiit.md   -> Kiro\n");
-  process.stdout.write("     .cursor/rules/vybekiit.mdc   -> Cursor\n");
-  process.stdout.write("     AGENTS.md                    -> OpenAI Codex\n");
-  process.stdout.write("     GEMINI.md                    -> Gemini CLI\n");
-  process.stdout.write("     AGENTS.md + .claude/hooks/   -> Claude Code\n");
+  process.stdout.write("     .kiro/steering/vybekiit.md    -> Kiro\n");
+  process.stdout.write("     .cursor/rules/vybekiit.mdc    -> Cursor\n");
+  process.stdout.write("     AGENTS.md + .codex/hooks.json -> OpenAI Codex\n");
+  process.stdout.write("     GEMINI.md                     -> Gemini CLI\n");
+  process.stdout.write("     AGENTS.md + .claude/hooks/    -> Claude Code\n");
 };
 
 // src/commands/initPatches.ts
@@ -16837,7 +16853,7 @@ var runInit = async (args) => {
     const { cleanup: resolvedCleanup, source } = await locateTemplateSource(projectType);
     cleanup = resolvedCleanup;
     const templateDir = join30(source, projectType);
-    await copyClaudeHooks(cwd, templateDir);
+    await copyAgentHooks(cwd, templateDir);
     await copyWorkflows(cwd, templateDir, pm);
     await copyPrePushHook(cwd, templateDir);
     await copySecurityFile(cwd, templateDir);
@@ -20400,9 +20416,8 @@ var VerifyGateFailedError = class extends Error {
 };
 
 // ../packages/browserAutomation/src/domains/extension/connect.ts
-var DEFAULT_CDP_ENDPOINT2 = "http://localhost:9222";
 var connectToCwsChrome = async (ctx) => {
-  const endpoint = ctx.cdpEndpoint === void 0 ? DEFAULT_CDP_ENDPOINT2 : ctx.cdpEndpoint;
+  const endpoint = ctx.cdpEndpoint === void 0 ? DEFAULT_CDP_ENDPOINT : ctx.cdpEndpoint;
   const log = verbLogger(ctx);
   const profileDir = await chromeProfilePath("extension");
   log.log(`[cws] attaching to CWS Chrome at ${endpoint}`);
@@ -29939,7 +29954,7 @@ var SUPABASE = {
     command: "supabase",
     args: ["projects", "list"],
     loginHint: "supabase login",
-    signIn: { command: "supabase", args: ["login"] }
+    signIn: { command: "supabase", args: ["login"], needsTerminal: true }
   }
 };
 var NEON = {
@@ -31458,6 +31473,7 @@ var reportFor = (reports, toolName) => reports.find((report) => report.tool ===
 import { existsSync as existsSync16, readFileSync as readFileSync11 } from "fs";
 import { join as join62 } from "path";
 import process33 from "process";
+var UPDATE_KIT_HINT = 'Ask your AI helper: "Update my kit."';
 var readManifest2 = (cwd) => {
   const path = join62(cwd, "platform-skills.manifest.json");
   if (!existsSync16(path)) {
@@ -31517,19 +31533,17 @@ var formatPlatformSkillsReport = (report) => {
       const count = Object.keys(lock.skills).length;
       lines.push(`\u2713 platform skills lock - ${count} pinned skill(s) in skills-lock.json.`);
     } catch {
-      lines.push("\u2192 platform skills lock - skills-lock.json unreadable.");
+      lines.push(`\u2192 platform skills lock - skills-lock.json unreadable. ${UPDATE_KIT_HINT}`);
     }
   } else {
-    lines.push("\u2192 platform skills lock - skills-lock.json missing (run pin-platform-skills).");
+    lines.push(`\u2192 platform skills lock - skills-lock.json missing. ${UPDATE_KIT_HINT}`);
   }
   if (report.ok) {
     const scope = report.lockCount > 0 ? `all ${report.lockCount} locked skill(s)` : "all explicit manifest skills";
     lines.push(`\u2713 platform skills - ${scope} are present.`);
     return lines;
   }
-  lines.push(
-    `\u2192 platform skills - missing: ${report.missing.join(", ")}. Ask your agent to refresh platform skills (update-kit) or run the pin script.`
-  );
+  lines.push(`\u2192 platform skills - missing: ${report.missing.join(", ")}. ${UPDATE_KIT_HINT}`);
   return lines;
 };
 
@@ -32631,7 +32645,7 @@ import { homedir as homedir15 } from "os";
 import { join as join72 } from "path";
 import process39 from "process";
 import { confirm as confirm3, isCancel as isCancel5 } from "@clack/prompts";
-import { Effect as Effect45, Schema as Schema31 } from "effect";
+import { Effect as Effect46, Schema as Schema32 } from "effect";
 
 // src/global/agentGuidance.ts
 import { constants as constants3, existsSync as existsSync20 } from "fs";
@@ -33011,7 +33025,7 @@ var readCliVersion = async () => {
 
 // src/global/entitlement.ts
 import process37 from "process";
-var defaultDeps3 = { exec: makeExec("gh") };
+var defaultDeps3 = { exec: makeExec("gh"), unzippedKit: locateUnzippedKit };
 var ACCESS_PROBLEM_BY_REASON = {
   "gh-missing": "gh-missing",
   "not-authenticated": "gh-unauthed",
@@ -33035,7 +33049,10 @@ var firstReadableRepo = async (exec, org, repos) => await repos.reduce(async (ea
   return repoProbe.code === 0 ? fullName : void 0;
 }, Promise.resolve(void 0));
 var checkEntitlement = async (deps = defaultDeps3) => {
-  const { exec } = deps;
+  const { exec, unzippedKit } = deps;
+  if (await unzippedKit() !== null) {
+    return { entitled: true, reason: "kit-zip" };
+  }
   if ((await exec(["--version"])).code === 127) {
     return { entitled: false, reason: "gh-missing" };
   }
@@ -33055,6 +33072,9 @@ var formatEntitlementBlock = (entitlement) => {
   return ["", ...accountLines, ...helpLines, ""];
 };
 
+// src/global/installCodexMcp.ts
+import { Data as Data14, Effect as Effect45, Schema as Schema31 } from "effect";
+
 // src/global/installGlobalMcp.ts
 import process38 from "process";
 var ZERO_CONFIG = [
@@ -33203,6 +33223,114 @@ var installGlobalMcp = async (deps = defaultDeps4) => {
   return { enabled, alreadyPresent, refreshed, needsKey, failed, claudeMissing: false };
 };
 
+// src/global/installCodexMcp.ts
+var CodexListingError = class extends Data14.TaggedError("CodexListingError") {
+};
+var CodexMcpRegistration = Schema31.Struct({
+  name: Schema31.String,
+  transport: Schema31.Struct({
+    command: Schema31.optionalWith(Schema31.String, { default: () => "" }),
+    args: Schema31.optionalWith(Schema31.Array(Schema31.String), { default: () => [] })
+  })
+});
+var decodeCodexMcpListing = Schema31.decodeUnknown(
+  Schema31.parseJson(Schema31.Array(CodexMcpRegistration))
+);
+var CODEX_MCP_SERVERS = GLOBAL_MCP_SERVERS.filter(
+  (mcpServer) => mcpServer.transport === "stdio"
+);
+var codexMcpAddArguments = (mcpServer, environment) => {
+  const envFlags = (mcpServer.envKeys || []).flatMap((key) => [
+    "--env",
+    `${key}=${environment[key] || ""}`
+  ]);
+  return ["mcp", "add", ...envFlags, mcpServer.name, "--", ...mcpServer.command];
+};
+var codexMcpOwner = (mcpServer, registrations) => {
+  const registration = registrations.find((registered) => registered.name === mcpServer.name);
+  if (registration === void 0) {
+    return "absent";
+  }
+  const registeredCommand = [registration.transport.command, ...registration.transport.args].join(
+    " "
+  );
+  const vybekiitRegistration = mcpServer.name === "vybekiit" || registeredCommand === mcpServer.command.join(" ");
+  return vybekiitRegistration ? "vybekiit" : "user";
+};
+var codexInstalled = (codex) => Effect45.promise(() => codex(["--version"])).pipe(
+  Effect45.map((codexVersion) => codexVersion.code !== MISSING_COMMAND_CODE)
+);
+var listCodexMcpRegistrations = (codex) => Effect45.promise(() => codex(["mcp", "list", "--json"])).pipe(
+  Effect45.filterOrFail(
+    (codexListing) => codexListing.code === 0,
+    (codexListing) => new CodexListingError({
+      message: `Codex could not list its tool connections. ${codexListing.stderr.trim()}`
+    })
+  ),
+  Effect45.flatMap(
+    (codexListing) => decodeCodexMcpListing(codexListing.stdout).pipe(
+      Effect45.mapError(
+        (cause) => new CodexListingError({
+          message: "Codex listed its tool connections in a shape VybeKiit does not know.",
+          cause
+        })
+      )
+    )
+  )
+);
+var codexServerOutcome = (codexSetup, mcpServer, registrations) => {
+  if (!hasKeys(mcpServer, codexSetup.environment)) {
+    return Effect45.succeed({ name: mcpServer.name, outcome: "needsKey" });
+  }
+  const registered = codexMcpOwner(mcpServer, registrations) !== "absent";
+  const refreshDue = registered && codexSetup.forceRefresh && isZeroConfig(mcpServer);
+  if (registered && !refreshDue) {
+    return Effect45.succeed({ name: mcpServer.name, outcome: "alreadyPresent" });
+  }
+  const addedOutcome = refreshDue ? "refreshed" : "enabled";
+  const addArguments = codexMcpAddArguments(mcpServer, codexSetup.environment);
+  return Effect45.promise(() => codexSetup.codex(addArguments)).pipe(
+    Effect45.map(
+      (codexAdd) => ({
+        name: mcpServer.name,
+        outcome: codexAdd.code === 0 ? addedOutcome : "failed"
+      })
+    )
+  );
+};
+var serverNamesWith = (serverOutcomes, outcome) => serverOutcomes.filter((serverOutcome) => serverOutcome.outcome === outcome).map((serverOutcome) => serverOutcome.name);
+var codexInstallation = (serverOutcomes, codexMissing) => ({
+  enabled: serverNamesWith(serverOutcomes, "enabled"),
+  alreadyPresent: serverNamesWith(serverOutcomes, "alreadyPresent"),
+  refreshed: serverNamesWith(serverOutcomes, "refreshed"),
+  needsKey: serverNamesWith(serverOutcomes, "needsKey"),
+  failed: serverNamesWith(serverOutcomes, "failed"),
+  codexMissing
+});
+var installCodexMcp = (codexSetup) => Effect45.gen(function* () {
+  if (!(yield* codexInstalled(codexSetup.codex))) {
+    return codexInstallation([], true);
+  }
+  const unlistedOutcomes = CODEX_MCP_SERVERS.map(
+    (mcpServer) => ({
+      name: mcpServer.name,
+      outcome: hasKeys(mcpServer, codexSetup.environment) ? "failed" : "needsKey"
+    })
+  );
+  const serverOutcomes = yield* listCodexMcpRegistrations(codexSetup.codex).pipe(
+    Effect45.flatMap(
+      (registrations) => Effect45.all(
+        CODEX_MCP_SERVERS.map(
+          (mcpServer) => codexServerOutcome(codexSetup, mcpServer, registrations)
+        ),
+        { concurrency: 1 }
+      )
+    ),
+    Effect45.catchTag("CodexListingError", () => Effect45.succeed(unlistedOutcomes))
+  );
+  return codexInstallation(serverOutcomes, false);
+});
+
 // src/global/installGlobalSkills.ts
 import { cp as cp5, mkdir as mkdir22, readdir as readdir14, readFile as readFile37, rm as rm5, stat as stat3, writeFile as writeFile27 } from "fs/promises";
 import { join as join71 } from "path";
@@ -33271,7 +33399,18 @@ var installGlobalSkills = async (paths, sourceDir = paths.bundledSkillsDir) => {
 
 // src/global/runGlobalInstall.ts
 var shouldRunSessionOneOnInstall = (args, isFirstInstall) => isFirstInstall || args.includes("--session-one");
-var globalSetupComplete = (managedFilesReady, mcpInstallation) => managedFilesReady && (mcpInstallation.claudeMissing || isVybekiitMcpReady(mcpInstallation));
+var globalSetupComplete = (managedFilesReady, mcpInstallation, codexMcpInstallation) => managedFilesReady && (mcpInstallation.claudeMissing || isVybekiitMcpReady(mcpInstallation)) && (codexMcpInstallation.codexMissing || isVybekiitMcpReady(codexMcpInstallation));
+var codexMcpLines = (codexMcp) => {
+  if (codexMcp.codexMissing) {
+    return [];
+  }
+  const enabledLabel = codexMcp.enabled.length > 0 ? codexMcp.enabled.join(", ") : "none newly added";
+  return [
+    `  \u2022 Codex    ${enabledLabel} (the same tool connections in Codex)`,
+    ...codexMcp.refreshed.length > 0 ? [`             refreshed: ${codexMcp.refreshed.join(", ")}`] : [],
+    ...codexMcp.failed.length > 0 ? [`             failed to register: ${codexMcp.failed.join(", ")}`] : []
+  ];
+};
 var formatGlobalInstallSummary = (summary) => {
   const isUpdate = summary.previousVersion !== null && summary.previousVersion !== summary.version;
   const isRerun = summary.previousVersion !== null && summary.previousVersion === summary.version;
@@ -33323,6 +33462,7 @@ var formatGlobalInstallSummary = (summary) => {
       lines.push(`             failed to register: ${summary.mcpFailed.join(", ")}`);
     }
   }
+  lines.push(...codexMcpLines(summary.codexMcp));
   if (skillsEmpty) {
     lines.push("");
   } else {
@@ -33368,7 +33508,7 @@ var runGlobalInstall = async (args, gate = checkEntitlement) => {
     }
   }
   const paths = globalInstallPaths();
-  const agentSettings = Schema31.decodeUnknownSync(AgentInstallationSettings)({
+  const agentSettings = Schema32.decodeUnknownSync(AgentInstallationSettings)({
     homeDirectory: homedir15(),
     claudeDirectory: paths.configDir,
     codexDirectory: process39.env.CODEX_HOME || join72(homedir15(), ".codex"),
@@ -33389,8 +33529,11 @@ var runGlobalInstall = async (args, gate = checkEntitlement) => {
     env: process39.env,
     forceRefresh: isRerun
   });
+  const codexMcp = await Effect46.runPromise(
+    installCodexMcp({ codex: makeExec("codex"), environment: process39.env, forceRefresh: isRerun })
+  );
   const awareness = await installAwareness(paths);
-  const agentInstallations = await Effect45.runPromise(
+  const agentInstallations = await Effect46.runPromise(
     installAgentGuidance(agentSettings, detectedAgents, paths.skillsDir, skills.installed, version)
   );
   process39.stdout.write(
@@ -33418,13 +33561,14 @@ var runGlobalInstall = async (args, gate = checkEntitlement) => {
     mcpNeedsKey: mcp.needsKey,
     mcpFailed: mcp.failed,
     claudeMissing: mcp.claudeMissing,
+    codexMcp,
     commandInstalled: awareness.commandWritten,
     version,
     previousVersion: previous?.version ?? null
   };
-  if (!globalSetupComplete(postStatus.skillCount > 0 && usableAgent, mcp)) {
+  if (!globalSetupComplete(postStatus.skillCount > 0 && usableAgent, mcp, codexMcp)) {
     process39.stderr.write(
-      "VybeKiit setup is incomplete: the managed files or an available Claude Code connection could not be prepared.\n"
+      "VybeKiit setup is incomplete: the managed files or the VybeKiit connection in Claude Code or Codex could not be prepared.\n"
     );
     return 1;
   }
@@ -33566,6 +33710,10 @@ var playWelcomeBanner = async (options = {}) => {
 };
 
 // src/commands/setupAuthentication.ts
+var DESKTOP_MACHINE = {
+  canOpenBrowser: canOpenDesktopBrowser,
+  hasTerminal: isInteractive
+};
 var AUTH_PROBE_TIMEOUT_MILLISECONDS = 6e4;
 var defaultSetupCommandRunner = (command, args, interactive) => runProcess(
   command,
@@ -33573,19 +33721,26 @@ var defaultSetupCommandRunner = (command, args, interactive) => runProcess(
   interactive ? { stdio: "inherit" } : { timeout: AUTH_PROBE_TIMEOUT_MILLISECONDS }
 );
 var needsSignIn = (tool, loginHint) => ({
-  connected: false,
+  status: "needsSignIn",
   line: `\u2717 ${tool.name} needs sign-in. Run: ${loginHint}`
 });
-var connectTool = async (tool, run, canOpenBrowser) => {
+var connectTool = async (tool, run, machine) => {
   const { auth } = tool;
   if (auth === void 0) {
-    return { connected: true, line: `\u2713 ${tool.name} is ready.` };
+    return { status: "connected", line: `\u2713 ${tool.name} is ready.` };
   }
   const existingSignIn = await run(auth.command, auth.args, false);
   if (isSignedIn2(auth, existingSignIn)) {
-    return { connected: true, line: `\u2713 ${tool.name} reused your existing sign-in.` };
+    return { status: "connected", line: `\u2713 ${tool.name} reused your existing sign-in.` };
   }
-  if (auth.signIn === void 0 || !canOpenBrowser()) {
+  const signInWaitsForTerminal = auth.signIn?.needsTerminal === true && !machine.hasTerminal();
+  if (signInWaitsForTerminal) {
+    return {
+      status: "later",
+      line: `\u2192 ${tool.name} sign-in waits until your app needs it, because it asks for a code typed in a terminal. Then run: ${auth.loginHint}`
+    };
+  }
+  if (auth.signIn === void 0 || !machine.canOpenBrowser()) {
     return needsSignIn(tool, auth.loginHint);
   }
   process.stdout.write(`
@@ -33596,22 +33751,22 @@ Opening the ${tool.name} sign-in page in your browser...
     return needsSignIn(tool, auth.loginHint);
   }
   const verifiedSignIn = await run(auth.command, auth.args, false);
-  return isSignedIn2(auth, verifiedSignIn) ? { connected: true, line: `\u2713 ${tool.name} sign-in verified.` } : needsSignIn(tool, auth.loginHint);
+  return isSignedIn2(auth, verifiedSignIn) ? { status: "connected", line: `\u2713 ${tool.name} sign-in verified.` } : needsSignIn(tool, auth.loginHint);
 };
-var connectSetupServices = async (preferences, withoutGithub, run = defaultSetupCommandRunner, canOpenBrowser = canOpenDesktopBrowser) => {
+var connectSetupServices = async (preferences, withoutGithub, run = defaultSetupCommandRunner, machine = DESKTOP_MACHINE) => {
   const selectedTools = selectToolchain(setupEnvironment(preferences), {
     wantsGoogleAuth: preferences.googleSignIn,
     withoutGithub
   });
   const attempts = await selectedTools.reduce(async (earlierAttempts, tool) => {
     const finishedAttempts = await earlierAttempts;
-    const connection = await connectTool(tool, run, canOpenBrowser);
+    const connection = await connectTool(tool, run, machine);
     return [...finishedAttempts, { tool, connection }];
   }, Promise.resolve([]));
   return {
-    ok: attempts.every(({ connection }) => connection.connected),
-    connected: attempts.filter(({ connection }) => connection.connected).map(({ tool }) => tool.name),
-    needsAttention: attempts.filter(({ connection }) => !connection.connected).map(({ tool }) => tool.name),
+    ok: attempts.every(({ connection }) => connection.status !== "needsSignIn"),
+    connected: attempts.filter(({ connection }) => connection.status === "connected").map(({ tool }) => tool.name),
+    needsAttention: attempts.filter(({ connection }) => connection.status === "needsSignIn").map(({ tool }) => tool.name),
     lines: attempts.map(({ connection }) => connection.line)
   };
 };
@@ -33974,7 +34129,7 @@ import { confirm as confirm5, isCancel as isCancel7 } from "@clack/prompts";
 // src/lib/kitUpdateInspection.ts
 import { readFile as readFile39 } from "fs/promises";
 import { join as join75 } from "path";
-import { Schema as Schema32 } from "effect";
+import { Schema as Schema33 } from "effect";
 var WORKSPACE_SUPPORT_PATHS = [
   "tsconfig.base.json",
   "tsup.base.ts",
@@ -33983,10 +34138,10 @@ var WORKSPACE_SUPPORT_PATHS = [
   "scripts/lib/tsupWorkspaceAliases.d.mts",
   "scripts/lib/repoRoot.mjs"
 ];
-var KitSourcePackage = Schema32.Struct({ version: Schema32.String });
+var KitSourcePackage = Schema33.Struct({ version: Schema33.String });
 var packageVersion = async (packagePath) => {
   const packageText = await readFile39(packagePath, "utf8");
-  const kitPackage = await Schema32.decodeUnknownPromise(KitSourcePackage)(JSON.parse(packageText));
+  const kitPackage = await Schema33.decodeUnknownPromise(KitSourcePackage)(JSON.parse(packageText));
   return kitPackage.version;
 };
 var packageRootFromManifestPath = (workspacePath) => {
@@ -34171,8 +34326,21 @@ var restoreBuyerPaths = async (projectRoot, backupRoot, buyerPaths) => {
     })
   );
 };
+var changedHookSettingsFor = (inspection) => AGENT_HOOK_SETTINGS_FILES.filter(
+  ([settingsFolder, settingsFile]) => inspection.changedMaintainedPaths.includes(
+    `templates/${inspection.manifest.surface}/${settingsFolder}/${settingsFile}`
+  )
+);
 var applyVerifiedPreview = async (projectRoot, previewRoot, backupRoot, inspection) => {
-  const protectedPaths = [...inspection.changedMaintainedPaths, KIT_WORKSPACE_MANIFEST_PATH];
+  const changedHookSettings = changedHookSettingsFor(inspection);
+  const workspaceHookSettingsPaths = changedHookSettings.map(
+    ([settingsFolder, settingsFile]) => `${settingsFolder}/${settingsFile}`
+  );
+  const protectedPaths = [
+    ...inspection.changedMaintainedPaths,
+    KIT_WORKSPACE_MANIFEST_PATH,
+    ...workspaceHookSettingsPaths
+  ];
   await rm6(backupRoot, { recursive: true, force: true });
   await mkdir23(backupRoot, { recursive: true });
   const buyerPaths = await Promise.all(
@@ -34187,6 +34355,11 @@ var applyVerifiedPreview = async (projectRoot, previewRoot, backupRoot, inspecti
     )
   );
   await overlayMaintainedPaths(previewRoot, projectRoot, inspection.changedMaintainedPaths).then(async () => {
+    await Promise.all(
+      changedHookSettings.map(
+        (settingsPath) => writeWorkspaceHookSettings(projectRoot, inspection.manifest.surface, settingsPath)
+      )
+    );
     await writeKitWorkspaceManifest({
       projectRoot,
       kitVersion: inspection.plan.targetVersion,
@@ -34421,11 +34594,12 @@ import { homedir as homedir17 } from "os";
 import { join as join77, resolve as resolve24 } from "path";
 import process46 from "process";
 import { confirm as confirm6, isCancel as isCancel8 } from "@clack/prompts";
-import { Cause, Data as Data14, Effect as Effect46, Either as Either13, Exit, Option as Option4, Schema as Schema33 } from "effect";
-var GlobalUninstallError = class extends Data14.TaggedError("GlobalUninstallError") {
+import { Cause, Data as Data15, Effect as Effect47, Either as Either13, Exit, Option as Option4, Schema as Schema34 } from "effect";
+var GlobalUninstallError = class extends Data15.TaggedError("GlobalUninstallError") {
 };
 var REMOVAL_GROUPS = {
   mcp: "Claude Code tool connections",
+  codexMcp: "Codex tool connections",
   skillLinks: "Skill links for your other coding assistants",
   skills: "Skills",
   instructions: "VybeKiit instructions in your coding assistants",
@@ -34442,32 +34616,37 @@ var mcpRemoval = (name) => ({
   group: REMOVAL_GROUPS.mcp,
   name
 });
+var codexMcpRemoval = (name) => ({
+  kind: "codexMcp",
+  group: REMOVAL_GROUPS.codexMcp,
+  name
+});
 var uninstallPlan = (removals, keptNotes = [], repairNotes = []) => ({ removals, keptNotes, repairNotes });
 var combinedPlan = (plans) => uninstallPlan(
   plans.flatMap((plan) => plan.removals),
   plans.flatMap((plan) => plan.keptNotes),
   plans.flatMap((plan) => plan.repairNotes)
 );
-var readOptionalText2 = (path) => Effect46.tryPromise({
+var readOptionalText2 = (path) => Effect47.tryPromise({
   try: async () => existsSync22(path) ? Option4.some(await readFile40(path, "utf8")) : Option4.none(),
   catch: (cause) => new GlobalUninstallError({ message: `Could not read ${path}.`, cause })
 });
-var readDirectoryNames = (directory) => Effect46.tryPromise({
+var readDirectoryNames = (directory) => Effect47.tryPromise({
   try: async () => existsSync22(directory) ? await readdir16(directory) : [],
   catch: (cause) => new GlobalUninstallError({ message: `Could not read ${directory}.`, cause })
 });
-var planMcpRemovals = (claude) => Effect46.gen(function* () {
-  const claudeVersion = yield* Effect46.promise(() => claude(["--version"]));
+var planMcpRemovals = (claude) => Effect47.gen(function* () {
+  const claudeVersion = yield* Effect47.promise(() => claude(["--version"]));
   if (claudeVersion.code === 127) {
     return uninstallPlan(
       [],
       ["Claude Code tool connections, because Claude Code is not installed."]
     );
   }
-  const registrations = yield* Effect46.all(
+  const registrations = yield* Effect47.all(
     GLOBAL_MCP_SERVERS.map(
-      (mcpServer) => Effect46.promise(() => claude(["mcp", "get", mcpServer.name])).pipe(
-        Effect46.map((registeredServer) => ({
+      (mcpServer) => Effect47.promise(() => claude(["mcp", "get", mcpServer.name])).pipe(
+        Effect47.map((registeredServer) => ({
           name: mcpServer.name,
           owner: registeredServer.code === 0 ? mcpRegistrationOwner(mcpServer, registeredServer.stdout) : "absent"
         }))
@@ -34480,11 +34659,34 @@ var planMcpRemovals = (claude) => Effect46.gen(function* () {
     registrations.filter((registration) => registration.owner === "user").map((registration) => `Your own ${registration.name} tool connection in Claude Code.`)
   );
 });
-var planSkillLinkRemovals = (skillLinksDirectory, claudeSkillsDirectory, managedSkills) => Effect46.gen(function* () {
+var planCodexMcpRemovals = (codex) => Effect47.gen(function* () {
+  if (!(yield* codexInstalled(codex))) {
+    return uninstallPlan([]);
+  }
+  const registrations = yield* Effect47.either(listCodexMcpRegistrations(codex));
+  if (Either13.isLeft(registrations)) {
+    return uninstallPlan(
+      [],
+      [],
+      [
+        `${registrations.left.message} Run \`codex mcp list\` and remove the VybeKiit ones with \`codex mcp remove <name>\`.`
+      ]
+    );
+  }
+  const owners = CODEX_MCP_SERVERS.map((mcpServer) => ({
+    name: mcpServer.name,
+    owner: codexMcpOwner(mcpServer, registrations.right)
+  }));
+  return uninstallPlan(
+    owners.filter((registration) => registration.owner === "vybekiit").map((registration) => codexMcpRemoval(registration.name)),
+    owners.filter((registration) => registration.owner === "user").map((registration) => `Your own ${registration.name} tool connection in Codex.`)
+  );
+});
+var planSkillLinkRemovals = (skillLinksDirectory, claudeSkillsDirectory, managedSkills) => Effect47.gen(function* () {
   const linkedSkillNames = yield* readDirectoryNames(skillLinksDirectory);
-  const managedLinks = yield* Effect46.all(
+  const managedLinks = yield* Effect47.all(
     linkedSkillNames.filter((skillName) => managedSkills.includes(skillName)).map(
-      (skillName) => Effect46.tryPromise({
+      (skillName) => Effect47.tryPromise({
         try: async () => {
           const skillLink = join77(skillLinksDirectory, skillName);
           if (!(await lstat5(skillLink)).isSymbolicLink()) {
@@ -34505,13 +34707,13 @@ var planSkillLinkRemovals = (skillLinksDirectory, claudeSkillsDirectory, managed
     managedLinks.flatMap(Option4.toArray).map((skillLink) => pathRemoval(REMOVAL_GROUPS.skillLinks, skillLink))
   );
 });
-var planInstructionRemoval = (instructionPath) => Effect46.gen(function* () {
+var planInstructionRemoval = (instructionPath) => Effect47.gen(function* () {
   const installedInstruction = yield* readOptionalText2(instructionPath);
   if (Option4.isNone(installedInstruction)) {
     return uninstallPlan([]);
   }
-  const userInstruction = yield* Effect46.either(
-    Effect46.try(() => removeAgentInstruction(installedInstruction.value))
+  const userInstruction = yield* Effect47.either(
+    Effect47.try(() => removeAgentInstruction(installedInstruction.value))
   );
   if (Either13.isLeft(userInstruction)) {
     return uninstallPlan(
@@ -34545,7 +34747,7 @@ var planInstructionRemoval = (instructionPath) => Effect46.gen(function* () {
     pathRemoval(REMOVAL_GROUPS.instructionBackups, backupPath)
   ]);
 });
-var planStatusLineRemoval = (settingsFile) => Effect46.gen(function* () {
+var planStatusLineRemoval = (settingsFile) => Effect47.gen(function* () {
   const claudeSettingsText = yield* readOptionalText2(settingsFile);
   if (Option4.isNone(claudeSettingsText)) {
     return uninstallPlan([]);
@@ -34570,7 +34772,7 @@ var planStatusLineRemoval = (settingsFile) => Effect46.gen(function* () {
   }
   return uninstallPlan([]);
 });
-var planGuideRemoval = (guideDirectory) => Effect46.gen(function* () {
+var planGuideRemoval = (guideDirectory) => Effect47.gen(function* () {
   const guideEntries = yield* readDirectoryNames(guideDirectory);
   const otherEntries = guideEntries.filter((fileName) => !GUIDE_FILES.includes(fileName));
   const guideRemovals = guideEntries.filter((fileName) => GUIDE_FILES.includes(fileName)).map((fileName) => pathRemoval(REMOVAL_GROUPS.guide, join77(guideDirectory, fileName)));
@@ -34587,25 +34789,26 @@ var planGuideRemoval = (guideDirectory) => Effect46.gen(function* () {
     { kind: "emptyDirectory", group: REMOVAL_GROUPS.guide, path: guideDirectory }
   ]);
 });
-var planInstallStampRemoval = (claudeDirectory) => Effect46.gen(function* () {
-  const previousSetup = yield* Effect46.promise(() => readInstallState(claudeDirectory));
+var planInstallStampRemoval = (claudeDirectory) => Effect47.gen(function* () {
+  const previousSetup = yield* Effect47.promise(() => readInstallState(claudeDirectory));
   const installStampPath = installStatePath(claudeDirectory);
   const firstAppPath2 = previousSetup?.firstAppPath ?? "";
   const appNotes = firstAppPath2 === "" ? [] : [`Your app at ${firstAppPath2}. Delete that folder yourself if you no longer want it.`];
   const installStampRemovals = existsSync22(installStampPath) ? [pathRemoval(REMOVAL_GROUPS.installStamp, installStampPath)] : [];
   return uninstallPlan(installStampRemovals, appNotes);
 });
-var planGlobalUninstall = (settings, claude) => Effect46.gen(function* () {
+var planGlobalUninstall = (settings, assistantCommands) => Effect47.gen(function* () {
   const paths = globalInstallPaths(settings.claudeDirectory);
-  const managedSkills = yield* Effect46.promise(() => listManagedSkillNames(paths.skillsDir));
+  const managedSkills = yield* Effect47.promise(() => listManagedSkillNames(paths.skillsDir));
   const commandPath = join77(paths.commandsDir, "vybekiit.md");
-  const mcpPlan = yield* planMcpRemovals(claude);
-  const skillLinkPlans = yield* Effect46.all(
+  const mcpPlan = yield* planMcpRemovals(assistantCommands.claude);
+  const codexMcpPlan = yield* planCodexMcpRemovals(assistantCommands.codex);
+  const skillLinkPlans = yield* Effect47.all(
     agentSkillLinkDirectories(settings).map(
       (directory) => planSkillLinkRemovals(directory, paths.skillsDir, managedSkills)
     )
   );
-  const instructionPlans = yield* Effect46.all(
+  const instructionPlans = yield* Effect47.all(
     agentInstructionPaths(settings).map(planInstructionRemoval)
   );
   const statusLinePlan = yield* planStatusLineRemoval(paths.settingsFile);
@@ -34613,6 +34816,7 @@ var planGlobalUninstall = (settings, claude) => Effect46.gen(function* () {
   const installStampPlan = yield* planInstallStampRemoval(paths.configDir);
   return combinedPlan([
     mcpPlan,
+    codexMcpPlan,
     ...skillLinkPlans,
     uninstallPlan(
       managedSkills.map(
@@ -34628,11 +34832,23 @@ var planGlobalUninstall = (settings, claude) => Effect46.gen(function* () {
     installStampPlan
   ]);
 });
-var applyRemoval = (removal, claude) => {
+var applyRemoval = (removal, assistantCommands) => {
+  if (removal.kind === "codexMcp") {
+    return Effect47.promise(() => assistantCommands.codex(["mcp", "remove", removal.name])).pipe(
+      Effect47.flatMap(
+        (codexRemoval) => codexRemoval.code === 0 ? Effect47.void : Effect47.fail(
+          new GlobalUninstallError({
+            message: `Could not remove the ${removal.name} tool connection from Codex.`
+          })
+        )
+      )
+    );
+  }
   if (removal.kind === "mcp") {
-    return Effect46.promise(() => claude(["mcp", "remove", "-s", "user", removal.name])).pipe(
-      Effect46.flatMap(
-        (mcpRemoval2) => mcpRemoval2.code === 0 ? Effect46.void : Effect46.fail(
+    const claudeRemoval = ["mcp", "remove", "-s", "user", removal.name];
+    return Effect47.promise(() => assistantCommands.claude(claudeRemoval)).pipe(
+      Effect47.flatMap(
+        (mcpRemoval2) => mcpRemoval2.code === 0 ? Effect47.void : Effect47.fail(
           new GlobalUninstallError({
             message: `Could not remove the ${removal.name} tool connection from Claude Code.`
           })
@@ -34640,7 +34856,7 @@ var applyRemoval = (removal, claude) => {
       )
     );
   }
-  return Effect46.tryPromise({
+  return Effect47.tryPromise({
     try: async () => {
       if (removal.kind === "rewrite") {
         await writeFile29(removal.path, removal.remainingText, "utf8");
@@ -34655,33 +34871,35 @@ var applyRemoval = (removal, claude) => {
     catch: (cause) => new GlobalUninstallError({ message: `Could not remove ${removal.path}.`, cause })
   });
 };
-var applyGlobalUninstall = (plan, claude) => Effect46.all(plan.removals.map((removal) => Effect46.either(applyRemoval(removal, claude)))).pipe(
-  Effect46.map(
+var applyGlobalUninstall = (plan, assistantCommands) => Effect47.all(
+  plan.removals.map((removal) => Effect47.either(applyRemoval(removal, assistantCommands)))
+).pipe(
+  Effect47.map(
     (attempts) => attempts.flatMap((attempt) => Either13.isLeft(attempt) ? [attempt.left.message] : [])
   )
 );
-var removalSubject = (removal) => removal.kind === "mcp" ? removal.name : removal.path;
+var removalSubject = (removal) => removal.kind === "mcp" || removal.kind === "codexMcp" ? removal.name : removal.path;
 var formatUninstallPlan = (plan) => [...new Set(plan.removals.map((removal) => removal.group))].map((group) => {
   const subjects = plan.removals.filter((removal) => removal.group === group).map(removalSubject);
   const listedSubjects = subjects.length <= 3 ? `: ${subjects.join(", ")}` : "";
   return `  \u2022 ${group} (${subjects.length})${listedSubjects}`;
 });
 var noteLines = (heading, notes) => notes.length === 0 ? [] : [heading, ...notes.map((note) => `  \u2022 ${note}`)];
-var printLines = (lines) => Effect46.sync(() => process46.stdout.write(`${lines.join("\n")}
+var printLines = (lines) => Effect47.sync(() => process46.stdout.write(`${lines.join("\n")}
 `));
-var runGlobalUninstall = async (commandArguments, interactiveTerminal, claude = makeExec("claude")) => {
+var runGlobalUninstall = async (commandArguments, interactiveTerminal, assistantCommands = { claude: makeExec("claude"), codex: makeExec("codex") }) => {
   const confirmedUpfront = commandArguments.includes("--yes") || commandArguments.includes("-y");
   const dryRun = commandArguments.includes("--dry-run");
   const paths = globalInstallPaths();
-  const settings = Schema33.decodeUnknownSync(AgentInstallationSettings)({
+  const settings = Schema34.decodeUnknownSync(AgentInstallationSettings)({
     homeDirectory: homedir17(),
     claudeDirectory: paths.configDir,
     codexDirectory: process46.env.CODEX_HOME || join77(homedir17(), ".codex"),
     executablePath: "",
     plainLanguageGuide: paths.bundledLanguageGuide
   });
-  const uninstallProgram = Effect46.gen(function* () {
-    const plan = yield* planGlobalUninstall(settings, claude);
+  const uninstallProgram = Effect47.gen(function* () {
+    const plan = yield* planGlobalUninstall(settings, assistantCommands);
     const keptLines = noteLines("Not removed:", plan.keptNotes);
     const repairLines = noteLines("Needs your attention:", plan.repairNotes);
     const needsRepair = plan.repairNotes.length > 0;
@@ -34705,7 +34923,7 @@ var runGlobalUninstall = async (commandArguments, interactiveTerminal, claude =
       return 0;
     }
     if (!confirmedUpfront) {
-      const removalApproved = yield* Effect46.promise(
+      const removalApproved = yield* Effect47.promise(
         () => confirm6({ message: "Remove VybeKiit from this computer?", initialValue: false })
       );
       if (isCancel8(removalApproved) || removalApproved !== true) {
@@ -34713,7 +34931,7 @@ var runGlobalUninstall = async (commandArguments, interactiveTerminal, claude =
         return 0;
       }
     }
-    const failures = yield* applyGlobalUninstall(plan, claude);
+    const failures = yield* applyGlobalUninstall(plan, assistantCommands);
     const headline = failures.length === 0 ? "\u2705 VybeKiit was removed from this computer." : "\u2717 VybeKiit was only partly removed.";
     yield* printLines([
       headline,
@@ -34726,7 +34944,7 @@ var runGlobalUninstall = async (commandArguments, interactiveTerminal, claude =
     ]);
     return failures.length > 0 || needsRepair ? 1 : 0;
   });
-  const uninstallExit = await Effect46.runPromiseExit(uninstallProgram);
+  const uninstallExit = await Effect47.runPromiseExit(uninstallProgram);
   if (Exit.isSuccess(uninstallExit)) {
     return uninstallExit.value;
   }