@posthog/wizard 2.76.0 → 2.77.0

package/dist/{add-mcp-server-to-clients-Exddicp2.js → add-mcp-server-to-clients-BnRyE4pw.js}

@@ -1,18 +1,18 @@
 import { t as __exportAll } from "./rolldown-runtime-B_-DWIq7.js";
-import { p as getUI, r as debug, xt as runtimeEnv } from "./debug-C5Zz8hmm.js";
-import { n as analytics } from "./analytics-C_RyE8fz.js";
-import { n as openTrackedLink, t as withProgress } from "./telemetry-Dp6zjZBj.js";
-import { a as getNativeHTTPServerConfig, c as namesWithStatus, d as toClientResult, i as getDefaultServerConfig, l as redactSecrets, r as buildMCPUrl, t as ALL_FEATURE_VALUES } from "./defaults-DulzMJpN.js";
+import { Ct as runtimeEnv, p as getUI, r as debug } from "./debug-B4kzIZPi.js";
+import { n as analytics } from "./analytics-C67F2vee.js";
+import { n as openTrackedLink, t as withProgress } from "./telemetry-BRnxBRWK.js";
+import { a as getNativeHTTPServerConfig, d as scrubHomePaths, i as getDefaultServerConfig, l as namesWithStatus, p as toClientResult, r as buildMCPUrl, s as expectedFailureHint, t as ALL_FEATURE_VALUES, u as redactSecrets } from "./defaults-4c4YwTmW.js";
 import * as fs$2 from "fs";
 import * as path$3 from "path";
 import * as os from "node:os";
 import * as path$2 from "node:path";
-import { execSync, spawnSync } from "node:child_process";
+import { execFile, execSync } from "node:child_process";
 import * as fs$1 from "node:fs";
 import z$1 from "zod";
 import * as os$1 from "os";
 import * as jsonc from "jsonc-parser";
-import { execSync as execSync$1 } from "child_process";
+import { execFile as execFile$1, execSync as execSync$1 } from "child_process";
 //#region src/steps/add-mcp-server-to-clients/MCPClient.ts
 var MCPClient = class {
 	name;
@@ -129,6 +129,31 @@ var CursorMCPClient = class extends DefaultMCPClient {
 };
 //#endregion
 //#region src/steps/add-mcp-server-to-clients/clients/claude-code.ts
+const PLUGIN_NAME = "posthog";
+const PLUGIN_MARKETPLACE$1 = "posthog";
+const PLUGIN_MARKETPLACE_SOURCE$1 = "PostHog/ai-plugin";
+const PLUGIN_REF$1 = `${PLUGIN_NAME}@${PLUGIN_MARKETPLACE$1}`;
+/** The plugin is missing from every catalog the CLI can currently see. */
+const NOT_IN_A_MARKETPLACE = /not found in/i;
+/**
+* `plugin marketplace add` clones a git repository, the slowest thing we run.
+* Past this the command is not slow, it is stuck, and a clone waiting on a
+* credential prompt would otherwise hang the wizard with the spinner frozen.
+*/
+const RUN_TIMEOUT_MS$1 = 12e4;
+/**
+* `execFile` kills the child once output passes this. The default is 1 MB,
+* which a verbose clone can reach, and the kill then looks like Claude Code
+* rejecting the install rather than us cutting it off.
+*/
+const MAX_OUTPUT_BYTES$1 = 16 * 1024 * 1024;
+/**
+* Our catalog, by name *and* repository. A marketplace merely called `posthog`
+* may be someone else's, and neither installing from it nor removing it is
+* ours to do. `repo` is absent on CLIs predating it, where the name is all
+* there is.
+*/
+const isOurMarketplace = (m) => m?.name === PLUGIN_MARKETPLACE$1 && (m.repo === void 0 || m.repo.toLowerCase() === PLUGIN_MARKETPLACE_SOURCE$1.toLowerCase());
 var ClaudeCodeMCPClient = class extends DefaultMCPClient {
 	name = "Claude Code";
 	claudeBinaryPath = null;
@@ -235,21 +260,39 @@ var ClaudeCodeMCPClient = class extends DefaultMCPClient {
 			success: false,
 			reason: "The claude CLI is no longer on your PATH."
 		};
-		if (!await this.isPluginInstalled()) return {
+		const ids = await this.installedPluginIds(binary);
+		const marketplace = await this.ourMarketplaceRegistered(binary);
+		const nothingInstalled = ids?.length === 0 || ids === null && !await this.isPluginInstalled();
+		if (nothingInstalled && !marketplace) return {
 			success: true,
 			alreadyInstalled: true
 		};
-		try {
-			execSync$1(`${binary} plugin uninstall posthog`, { stdio: "pipe" });
-			return { success: true };
-		} catch (error) {
-			const msg = error instanceof Error ? error.message : String(error);
-			analytics.captureException(/* @__PURE__ */ new Error(`Claude Code plugin uninstall failed: ${msg}`));
-			return {
-				success: false,
-				reason: msg
-			};
+		const targets = nothingInstalled ? [] : ids?.length ? ids : [PLUGIN_NAME];
+		const failures = [];
+		for (const target of targets) {
+			const run = await this.runClaude(binary, [
+				"plugin",
+				"uninstall",
+				target
+			]);
+			if (!run.ok) failures.push(`${target}: ${run.output}`);
 		}
+		if (marketplace) {
+			const run = await this.runClaude(binary, [
+				"plugin",
+				"marketplace",
+				"remove",
+				PLUGIN_MARKETPLACE$1
+			]);
+			if (!run.ok) failures.push(`${PLUGIN_MARKETPLACE$1}: ${run.output}`);
+		}
+		if (failures.length === 0) return { success: true };
+		const reason = failures.join("; ");
+		analytics.captureException(/* @__PURE__ */ new Error(`Claude Code plugin uninstall failed: ${reason}`));
+		return {
+			success: false,
+			reason
+		};
 	}
 	removeServer(local) {
 		const claudeBinary = this.findClaudeBinary();
@@ -281,40 +324,134 @@ var ClaudeCodeMCPClient = class extends DefaultMCPClient {
 	supportsPlugin() {
 		return this.findClaudeBinary() !== null;
 	}
-	isPluginInstalled() {
-		const binary = this.findClaudeBinary();
-		if (!binary) return Promise.resolve(false);
+	runClaude(binary, args) {
+		return new Promise((resolve) => {
+			execFile$1(binary, args, {
+				timeout: RUN_TIMEOUT_MS$1,
+				maxBuffer: MAX_OUTPUT_BYTES$1
+			}, (error, stdout) => {
+				if (!error) return resolve({
+					ok: true,
+					output: stdout?.toString() ?? ""
+				});
+				if (error.code === "ERR_CHILD_PROCESS_STDIO_MAXBUFFER") return resolve({
+					ok: false,
+					output: "claude produced more output than the wizard can hold, so it was stopped"
+				});
+				if (error.killed || error.signal) return resolve({
+					ok: false,
+					output: `claude did not finish within ${RUN_TIMEOUT_MS$1 / 1e3}s, so it was stopped`
+				});
+				resolve({
+					ok: false,
+					output: scrubHomePaths(redactSecrets(error.message))
+				});
+			});
+		});
+	}
+	/** Null when `--json` is unsupported, the command failed, or output didn't parse — never "nothing installed". */
+	async listJson(binary, args) {
+		const result = await this.runClaude(binary, [...args, "--json"]);
+		if (!result.ok) return null;
 		try {
-			const output = execSync$1(`${binary} plugin list`, { stdio: "pipe" }).toString();
-			return Promise.resolve(output.toLowerCase().includes("posthog"));
+			const parsed = JSON.parse(result.output);
+			return Array.isArray(parsed) ? parsed : null;
 		} catch {
-			return Promise.resolve(false);
+			return null;
 		}
 	}
+	async installedPlugins(binary) {
+		const listed = await this.listJson(binary, ["plugin", "list"]);
+		if (!listed) return null;
+		return listed.filter((p) => typeof p?.id === "string" && p.id.split("@")[0] === PLUGIN_NAME);
+	}
+	async installedPluginIds(binary) {
+		return (await this.installedPlugins(binary))?.map((p) => p.id) ?? null;
+	}
+	async isPluginInstalled() {
+		const binary = this.findClaudeBinary();
+		if (!binary) return false;
+		const listed = await this.installedPlugins(binary);
+		if (listed) return listed.length > 0;
+		const plain = await this.runClaude(binary, ["plugin", "list"]);
+		return plain.ok && plain.output.toLowerCase().includes(PLUGIN_NAME);
+	}
 	async installPlugin() {
 		const binary = this.findClaudeBinary();
 		if (!binary) return {
 			success: false,
 			reason: "The claude CLI is no longer on your PATH."
 		};
-		if (await this.isPluginInstalled()) return {
+		const listed = await this.installedPlugins(binary);
+		if (listed ? listed.some((p) => p.enabled !== false) : await this.isPluginInstalled()) return {
 			success: true,
 			alreadyInstalled: true
 		};
-		try {
-			execSync$1(`${binary} plugin install posthog`, { stdio: "pipe" });
-			return { success: true };
-		} catch (error) {
-			const msg = error instanceof Error ? error.message : String(error);
-			if (msg.includes("already installed") || msg.includes("already exists")) return {
-				success: true,
-				alreadyInstalled: true
-			};
-			analytics.captureException(/* @__PURE__ */ new Error(`Claude Code plugin install failed: ${msg}`));
-			return {
-				success: false,
-				reason: msg
-			};
+		const marketplaceFailure = await this.ensurePluginMarketplace(binary);
+		let result = await this.runClaude(binary, [
+			"plugin",
+			"install",
+			PLUGIN_REF$1
+		]);
+		if (!result.ok && NOT_IN_A_MARKETPLACE.test(result.output)) {
+			await this.runClaude(binary, [
+				"plugin",
+				"marketplace",
+				"update",
+				PLUGIN_MARKETPLACE$1
+			]);
+			result = await this.runClaude(binary, [
+				"plugin",
+				"install",
+				PLUGIN_REF$1
+			]);
+		}
+		if (!result.ok && NOT_IN_A_MARKETPLACE.test(result.output)) result = await this.runClaude(binary, [
+			"plugin",
+			"install",
+			PLUGIN_NAME
+		]);
+		if (result.ok) return { success: true };
+		const msg = result.output;
+		if (msg.includes("already installed") || msg.includes("already exists")) return {
+			success: true,
+			alreadyInstalled: true
+		};
+		const failure = /* @__PURE__ */ new Error(`Claude Code plugin install failed: ${msg}`);
+		if (marketplaceFailure) analytics.captureException(failure, { marketplaceFailure });
+		else analytics.captureException(failure);
+		return {
+			success: false,
+			reason: msg
+		};
+	}
+	/** Registered, and ours: a catalog merely named `posthog` is someone else's. */
+	async ourMarketplaceRegistered(binary) {
+		const listed = await this.listJson(binary, [
+			"plugin",
+			"marketplace",
+			"list"
+		]);
+		return listed ? listed.some(isOurMarketplace) : null;
+	}
+	async ensurePluginMarketplace(binary) {
+		if ((await this.listJson(binary, [
+			"plugin",
+			"marketplace",
+			"list"
+		]))?.some(isOurMarketplace)) {
+			debug(`  Marketplace ${PLUGIN_MARKETPLACE$1} already registered`);
+			return;
+		}
+		const added = await this.runClaude(binary, [
+			"plugin",
+			"marketplace",
+			"add",
+			PLUGIN_MARKETPLACE_SOURCE$1
+		]);
+		if (!added.ok) {
+			debug(`  Marketplace add failed: ${added.output}`);
+			return added.output;
 		}
 	}
 };
@@ -429,6 +566,163 @@ var ZedClient = class extends DefaultMCPClient {
 };
 //#endregion
 //#region src/steps/add-mcp-server-to-clients/clients/codex.ts
+const PLUGIN_MARKETPLACE = "posthog";
+const PLUGIN_MARKETPLACE_SOURCE = "PostHog/ai-plugin";
+const PLUGIN_REF = `posthog@${PLUGIN_MARKETPLACE}`;
+/**
+* The plugin's row in `codex plugin list`, whose STATUS column reads
+* `installed, enabled` or `not installed`. Registering the marketplace only
+* publishes the catalog, so the marketplace section in config.toml says nothing
+* about whether the plugin itself is there.
+*/
+const listedAsInstalled = (stdout) => {
+	const row = new RegExp(`^${PLUGIN_REF}\\s+(.*)$`, "m").exec(stdout)?.[1];
+	return !!row && /\binstalled\b/.test(row) && !/\bnot installed\b/.test(row);
+};
+const PLUGIN_STAGES = [
+	"plugin install",
+	"plugin uninstall",
+	"marketplace add"
+];
+const MCP_STAGES = ["MCP add", "MCP remove"];
+const ALL_STAGES = [...PLUGIN_STAGES, ...MCP_STAGES];
+/**
+* Failures in the user's own environment. Reporting them files issues nobody
+* can action, so hand back a hint instead. Drawn from what the codex install
+* path actually produced in the field.
+*
+* Every entry is scoped: a hint that fires on the wrong stage tells the user to
+* run a command that has nothing to do with what just failed.
+*/
+const EXPECTED_FAILURES = [
+	{
+		match: /unexpected argument|unknown (command|option|argument)|Missing option/i,
+		stages: PLUGIN_STAGES,
+		hint: "your codex CLI is too old for plugins — update codex, then run `codex plugin marketplace add PostHog/ai-plugin`"
+	},
+	{
+		match: /unexpected argument|unknown (command|option|argument)|Missing option/i,
+		stages: MCP_STAGES,
+		hint: "your codex CLI is too old for this install — update codex, then run `npx @posthog/wizard mcp add` again"
+	},
+	{
+		match: /ENOENT|not found in PATH|spawn .* ENOENT/i,
+		stages: ALL_STAGES,
+		hint: "your codex install looks broken — reinstall codex, then run `codex plugin marketplace add PostHog/ai-plugin`"
+	},
+	{
+		match: /failed to load (bootstrap )?configuration|OPENAI_API_KEY|Missing OpenAI API key|(?=[\s\S]*config\.toml)[\s\S]*(invalid type|unknown field|is no longer supported|must contain at least one)/i,
+		stages: ALL_STAGES,
+		unless: /ai-plugin|plugin\.toml|plugin\.json|marketplace\.toml|posthog@posthog/i,
+		hint: "codex could not read its own config — fix what it reports in ~/.codex/config.toml, then retry"
+	},
+	{
+		match: /EACCES|EPERM|permission denied|read-only file system|not permitted/i,
+		stages: ALL_STAGES,
+		unless: /permission denied \((?:publickey|password|gssapi)/i,
+		hint: "codex could not write to its config — fix the permissions on ~/.codex, then retry"
+	},
+	{
+		match: /ENOSPC|no space left/i,
+		stages: ALL_STAGES,
+		hint: "the disk is full — free some space, then retry"
+	},
+	{
+		match: /git clone .* failed|ENOTFOUND|ETIMEDOUT|ECONNREFUSED|could not resolve host/i,
+		stages: ALL_STAGES,
+		unless: /repository not found|not found|404|does not exist|authentication failed/i,
+		hint: "codex could not reach GitHub to download the plugin — check your network, then retry"
+	}
+];
+/**
+* A clone of the plugin marketplace is the slowest thing we run. Past this the
+* command is not slow, it is stuck, and the wizard should say so rather than
+* wait forever.
+*/
+const RUN_TIMEOUT_MS = 12e4;
+/**
+* `execFile` kills the child once output passes this. The default is 1 MB,
+* which a verbose clone can reach, and the kill then looks like codex rejecting
+* the install rather than us cutting it off.
+*/
+const MAX_OUTPUT_BYTES = 16 * 1024 * 1024;
+/**
+* What `execFile` puts in `error.message` when the command itself never spoke:
+* the full binary path and arguments. That path contains the user's home
+* directory, so reporting it fingerprints one root cause per machine — the
+* failure this reporting was built to stop. Never send it onward.
+*/
+const COMMAND_FAILED_PREAMBLE = /^Command failed:.*$/m;
+/**
+* The cause when neither stream carried one. `execFile` always sets a message,
+* so there is no "empty error" case to fall through — the message just isn't
+* usable as it stands.
+*/
+const describeExecFailure = (error) => {
+	if (error.code === "ERR_CHILD_PROCESS_STDIO_MAXBUFFER") return "codex produced more output than the wizard can hold, so it was stopped";
+	if (error.killed) return `codex did not finish within ${RUN_TIMEOUT_MS / 1e3}s, so it was stopped`;
+	if (error.signal) return `codex was killed by ${error.signal}`;
+	const said = error.message.replace(COMMAND_FAILED_PREAMBLE, "").trim();
+	if (said) return said;
+	if (typeof error.code === "number") return `codex exited with code ${error.code}`;
+	if (error.code) return `codex failed with ${error.code}`;
+	return "codex failed without reporting a reason";
+};
+/**
+* One codex invocation. Async on purpose: `plugin marketplace add` and
+* `plugin add` clone git repositories and take seconds, and a synchronous child
+* process blocks the event loop, which freezes the TUI spinner on its first
+* frame. Never throws; the caller decides what a failure means.
+*
+* A failure's cause is split across the error and the two streams, and none of
+* them carries it when the process merely exits non-zero — reading one alone
+* reported a blank reason and filed an exception carrying nothing.
+*/
+const runCodex = (binary, args, env) => new Promise((resolve) => {
+	execFile(binary, args, {
+		env,
+		timeout: RUN_TIMEOUT_MS,
+		maxBuffer: MAX_OUTPUT_BYTES
+	}, (error, stdout, stderr) => {
+		if (!error) return resolve({
+			ok: true,
+			output: stdout ?? ""
+		});
+		const said = [stderr, stdout].map((p) => p ? String(p).trim() : "").filter(Boolean).join("\n");
+		resolve({
+			ok: false,
+			output: redactSecrets(error.killed || !!error.signal || error.code === "ERR_CHILD_PROCESS_STDIO_MAXBUFFER" || !said ? describeExecFailure(error) : said)
+		});
+	}).stdin?.end();
+});
+/**
+* Turn a failed spawn into a result: an expected local failure becomes a hint,
+* anything else is reported under a constant message so one root cause stays
+* one issue, with the varying detail in properties.
+*/
+const reportSpawnFailure = (stage, details) => {
+	const hint = expectedFailureHint(details, EXPECTED_FAILURES, stage);
+	if (hint) {
+		analytics.wizardCapture("mcp expected failure hinted", {
+			client: "Codex",
+			stage,
+			hint,
+			details: scrubHomePaths(details)
+		});
+		return {
+			success: false,
+			reason: hint
+		};
+	}
+	analytics.captureException(/* @__PURE__ */ new Error(`Codex ${stage} failed`), {
+		stage,
+		details: scrubHomePaths(details)
+	});
+	return {
+		success: false,
+		reason: details
+	};
+};
 /** Wording codex uses when the thing we're adding is already registered. */
 const ALREADY_INSTALLED_PATTERN = /already (installed|exists|added|registered)/i;
 /** Wording that means the opposite: a cache entry exists but the plugin doesn't. */
@@ -490,16 +784,16 @@ var CodexMCPClient = class extends DefaultMCPClient {
 			return Promise.resolve(false);
 		}
 	}
-	addServer(apiKey, selectedFeatures, local) {
+	async addServer(apiKey, selectedFeatures, local) {
 		const serverName = local ? "posthog-local" : "posthog";
 		const url = buildMCPUrl(selectedFeatures, local);
 		if (apiKey) {
 			const binary = this.findCodexBinary();
-			if (!binary) return Promise.resolve({
+			if (!binary) return {
 				success: false,
 				reason: "An API-key install into Codex needs the codex CLI."
-			});
-			const result = spawnSync(binary, [
+			};
+			const result = await runCodex(binary, [
 				"mcp",
 				"add",
 				serverName,
@@ -508,28 +802,19 @@ var CodexMCPClient = class extends DefaultMCPClient {
 				"--bearer-token-env-var",
 				"POSTHOG_AUTH_HEADER"
 			], {
-				encoding: "utf-8",
-				env: {
-					...process.env,
-					POSTHOG_AUTH_HEADER: `Bearer ${apiKey}`
-				}
+				...process.env,
+				POSTHOG_AUTH_HEADER: `Bearer ${apiKey}`
 			});
-			if (result.status !== 0) {
-				const stderr = result.stderr ?? "";
-				if (ALREADY_INSTALLED_PATTERN.test(stderr)) return Promise.resolve({
+			if (!result.ok) {
+				if (ALREADY_INSTALLED_PATTERN.test(result.output)) return {
 					success: true,
 					alreadyInstalled: true
-				});
-				const reason = redactSecrets(stderr);
-				analytics.captureException(/* @__PURE__ */ new Error(`Codex MCP add failed: ${reason}`));
-				return Promise.resolve({
-					success: false,
-					reason
-				});
+				};
+				return reportSpawnFailure("MCP add", result.output);
 			}
-			return Promise.resolve({ success: true });
+			return { success: true };
 		}
-		return Promise.resolve(this.writeServerSection(serverName, url));
+		return this.writeServerSection(serverName, url);
 	}
 	/**
 	* Create or update the `[mcp_servers.<name>]` section in config.toml, editing
@@ -561,7 +846,7 @@ var CodexMCPClient = class extends DefaultMCPClient {
 			return { success: true };
 		} catch (error) {
 			const reason = error instanceof Error ? error.message : String(error);
-			analytics.captureException(/* @__PURE__ */ new Error(`Codex config.toml write failed: ${reason}`));
+			analytics.captureException(/* @__PURE__ */ new Error("Codex config.toml write failed"), { details: scrubHomePaths(reason) });
 			return {
 				success: false,
 				reason
@@ -579,26 +864,19 @@ var CodexMCPClient = class extends DefaultMCPClient {
 		if (!this.findCodexBinary()) return null;
 		return `codex mcp login ${local ? "posthog-local" : "posthog"}`;
 	}
-	removeServer(local) {
+	async removeServer(local) {
 		const binary = this.findCodexBinary();
-		if (!binary) return Promise.resolve({
+		if (!binary) return {
 			success: false,
 			reason: "The codex CLI is no longer on your PATH."
-		});
-		const result = spawnSync(binary, [
+		};
+		const result = await runCodex(binary, [
 			"mcp",
 			"remove",
 			local ? "posthog-local" : "posthog"
-		], { encoding: "utf-8" });
-		if (result.error || result.status !== 0) {
-			const reason = redactSecrets(result.error?.message ?? result.stderr ?? "codex mcp remove failed");
-			analytics.captureException(/* @__PURE__ */ new Error(`Failed to remove server from Codex CLI: ${reason}`));
-			return Promise.resolve({
-				success: false,
-				reason
-			});
-		}
-		return Promise.resolve({ success: true });
+		]);
+		if (!result.ok) return reportSpawnFailure("MCP remove", result.output);
+		return { success: true };
 	}
 	/** The codex marketplace plugin ships skills only — the MCP server needs its own entry. */
 	pluginBundlesMcpServer() {
@@ -607,13 +885,33 @@ var CodexMCPClient = class extends DefaultMCPClient {
 	supportsPlugin() {
 		return this.findCodexBinary() !== null;
 	}
-	isPluginInstalled() {
-		const configPath = path$2.join(os.homedir(), ".codex", "config.toml");
+	/** The plugin itself, as the CLI reports it. The install decision's question. */
+	async isPluginPresent() {
+		const binary = this.findCodexBinary();
+		if (!binary) return false;
+		const result = await runCodex(binary, [
+			"plugin",
+			"list",
+			"-m",
+			PLUGIN_MARKETPLACE
+		]);
+		return result.ok && listedAsInstalled(result.output);
+	}
+	/**
+	* Anything of ours left on the machine, which is what `index.ts` asks before
+	* offering removal. A registered marketplace with no plugin is a state the
+	* wizard created — and the state this branch exists to correct — so removal
+	* has to see it, or `removePlugin` never runs and the catalog stays forever.
+	*/
+	async isPluginInstalled() {
+		return await this.isPluginPresent() || this.isMarketplaceRegistered();
+	}
+	/** The catalog, which the plugin is installed *from* — not the plugin. */
+	isMarketplaceRegistered() {
 		try {
-			const contents = fs$1.readFileSync(configPath, "utf-8");
-			return Promise.resolve(contents.toLowerCase().includes("[marketplaces.posthog]"));
+			return fs$1.readFileSync(this.configPath(), "utf-8").toLowerCase().includes(`[marketplaces.${PLUGIN_MARKETPLACE}]`);
 		} catch {
-			return Promise.resolve(false);
+			return false;
 		}
 	}
 	async removePlugin() {
@@ -622,23 +920,25 @@ var CodexMCPClient = class extends DefaultMCPClient {
 			success: false,
 			reason: "The codex CLI is no longer on your PATH."
 		};
-		if (!await this.isPluginInstalled()) return {
-			success: true,
-			alreadyInstalled: true
-		};
-		const result = spawnSync(binary, [
+		const steps = [];
+		if (await this.isPluginPresent()) steps.push([
+			"plugin",
+			"remove",
+			PLUGIN_REF
+		]);
+		if (this.isMarketplaceRegistered()) steps.push([
 			"plugin",
 			"marketplace",
 			"remove",
-			"posthog"
-		], { encoding: "utf-8" });
-		if (result.status !== 0) {
-			const reason = redactSecrets(result.stderr ?? "codex plugin marketplace remove failed");
-			analytics.captureException(/* @__PURE__ */ new Error(`Codex plugin uninstall failed: ${reason}`));
-			return {
-				success: false,
-				reason
-			};
+			PLUGIN_MARKETPLACE
+		]);
+		if (steps.length === 0) return {
+			success: true,
+			alreadyInstalled: true
+		};
+		for (const args of steps) {
+			const result = await runCodex(binary, args);
+			if (!result.ok) return reportSpawnFailure("plugin uninstall", result.output);
 		}
 		return { success: true };
 	}
@@ -648,39 +948,53 @@ var CodexMCPClient = class extends DefaultMCPClient {
 			success: false,
 			reason: "The codex CLI is no longer on your PATH."
 		};
-		if (await this.isPluginInstalled()) return {
+		if (await this.isPluginPresent()) return {
 			success: true,
 			alreadyInstalled: true
 		};
-		const run = () => spawnSync(binary, [
+		const marketplace = this.isMarketplaceRegistered() ? null : await this.registerMarketplace(binary);
+		if (marketplace && !marketplace.success) return marketplace;
+		const result = await runCodex(binary, [
+			"plugin",
+			"add",
+			PLUGIN_REF
+		]);
+		if (!result.ok) {
+			if (ALREADY_INSTALLED_PATTERN.test(result.output)) return {
+				success: true,
+				alreadyInstalled: true
+			};
+			return reportSpawnFailure("plugin install", result.output);
+		}
+		return { success: true };
+	}
+	/**
+	* Add the catalog the plugin is published in. A stale cache directory with no
+	* config.toml entry reports the marketplace as added from a different source;
+	* clear it and retry once.
+	*/
+	async registerMarketplace(binary) {
+		const run = () => runCodex(binary, [
 			"plugin",
 			"marketplace",
 			"add",
-			"PostHog/ai-plugin"
-		], { encoding: "utf-8" });
-		let result = run();
-		if (result.status !== 0 && STALE_MARKETPLACE_CACHE.test(result.stderr ?? "")) {
-			const staleDir = path$2.join(os.homedir(), ".codex", ".tmp", "marketplaces", "posthog");
+			PLUGIN_MARKETPLACE_SOURCE
+		]);
+		let result = await run();
+		if (!result.ok && STALE_MARKETPLACE_CACHE.test(result.output)) {
+			const staleDir = path$2.join(os.homedir(), ".codex", ".tmp", "marketplaces", PLUGIN_MARKETPLACE);
 			try {
 				fs$1.rmSync(staleDir, {
 					recursive: true,
 					force: true
 				});
 			} catch {}
-			result = run();
+			result = await run();
 		}
-		if (result.status !== 0) {
-			const stderr = result.stderr ?? "";
-			if (ALREADY_INSTALLED_PATTERN.test(stderr) && !STALE_MARKETPLACE_CACHE.test(stderr)) return {
-				success: true,
-				alreadyInstalled: true
-			};
-			const reason = redactSecrets(stderr);
-			analytics.captureException(/* @__PURE__ */ new Error(`Codex plugin install failed: ${reason}`));
-			return {
-				success: false,
-				reason
-			};
+		if (!result.ok) {
+			const details = result.output;
+			if (ALREADY_INSTALLED_PATTERN.test(details) && !STALE_MARKETPLACE_CACHE.test(details)) return { success: true };
+			return reportSpawnFailure("marketplace add", details);
 		}
 		return { success: true };
 	}
@@ -900,4 +1214,4 @@ const removeMCPServer = async (clients, local) => {
 //#endregion
 export { getSupportedClients as a, removeMCPServer as c, getInstalledClients as i, removeMCPServerFromClientsStep as l, addMCPServerToClientsStep as n, getSupportedPluginClients as o, add_mcp_server_to_clients_exports as r, installPlugins as s, addMCPServer as t, isPluginCapable as u };
 
-//# sourceMappingURL=add-mcp-server-to-clients-Exddicp2.js.map
+//# sourceMappingURL=add-mcp-server-to-clients-BnRyE4pw.js.map