holycodex 0.10.6-dev.30770925419.1 → 0.10.7

package/dist/cli.js

@@ -4252,7 +4252,7 @@ function superRefine(fn, params) {
 }
 //#endregion
 //#region packages/cli/src/catalog.ts
-var VERSION = "0.10.6-dev.30770925419.1";
+var VERSION = "0.10.7";
 var SKILLS = [
 	"ast-grep",
 	"caveman",
@@ -5781,9 +5781,11 @@ function deduplicate(candidates) {
 //#endregion
 //#region packages/cli/src/codex-security.ts
 var CODEX_SECURITY_PLUGIN = "codex-security@openai-curated";
+var CODEX_SECURITY_MARKETPLACE = "openai-curated";
 var CODEX_PLUGIN_OPERATIONAL_TIMEOUT_MS = 15e3;
 var CODEX_PACKAGE_BOOTSTRAP_TIMEOUT_MS = 12e4;
 var MAX_CODEX_OUTPUT_CHARS = 64 * 1024;
+var MAX_JSON_DOCUMENTS = 16;
 var SPAWN_UNAVAILABLE_CODES = /* @__PURE__ */ new Set([
 	"EACCES",
 	"ENOENT",
@@ -5829,23 +5831,50 @@ async function installCodexSecurity(runProcess = runManagedProcess, platform = p
 	const fallbackReasons = [];
 	for (const launcher of candidates) {
 		attemptedLaunchers.push(launcher.source);
-		const listOutcome = inspectListResult(await runCodexPlugin(runProcess, launcher, [
+		const installedOutcome = inspectListResult(await runCodexPlugin(runProcess, launcher, [
 			"plugin",
 			"list",
-			"--available",
 			"--json"
 		], platform, env, "list"), launcher);
-		if (listOutcome.kind === "fallback") {
-			fallbackReasons.push(listOutcome.reason);
+		if (installedOutcome.kind === "fallback") {
+			fallbackReasons.push(installedOutcome.reason);
 			continue;
 		}
-		if (listOutcome.kind === "fatal") return skipped(listOutcome.reason, attemptedLaunchers);
-		const plugin = listOutcome.catalog.plugins.find(({ id }) => id === CODEX_SECURITY_PLUGIN);
-		if (plugin?.installed === true && plugin.enabled === true) return {
+		if (installedOutcome.kind === "fatal") return skipped(installedOutcome.reason, attemptedLaunchers);
+		const installedPlugin = findPlugin(installedOutcome.catalog);
+		if (installedPlugin?.installed === true && installedPlugin.enabled === true) return {
 			status: "already-installed",
 			launcherSource: launcher.source
 		};
-		const wasDisabled = plugin?.installed === true;
+		const wasDisabled = installedPlugin?.installed === true;
+		if (!wasDisabled) {
+			const catalogOutcome = inspectListResult(await runCodexPlugin(runProcess, launcher, [
+				"plugin",
+				"list",
+				"--available",
+				"--json"
+			], platform, env, "list"), launcher);
+			if (catalogOutcome.kind === "fallback") {
+				fallbackReasons.push(catalogOutcome.reason);
+				continue;
+			}
+			if (catalogOutcome.kind === "fatal") return skipped(catalogOutcome.reason, attemptedLaunchers);
+			if (findPlugin(catalogOutcome.catalog) === void 0) {
+				const marketplaceOutcome = inspectMarketplaceResult(await runCodexPlugin(runProcess, launcher, [
+					"plugin",
+					"marketplace",
+					"list",
+					"--json"
+				], platform, env, "list"), launcher);
+				if (marketplaceOutcome.kind === "fallback") {
+					fallbackReasons.push(marketplaceOutcome.reason);
+					continue;
+				}
+				if (marketplaceOutcome.kind === "fatal") return skipped(marketplaceOutcome.reason, attemptedLaunchers);
+				fallbackReasons.push(marketplaceOutcome.marketplaces.includes(CODEX_SECURITY_MARKETPLACE) ? "plugin-not-offered" : "marketplace-unavailable");
+				continue;
+			}
+		}
 		const addOutcome = inspectAddResult(await runCodexPlugin(runProcess, launcher, [
 			"plugin",
 			"add",
@@ -5860,7 +5889,6 @@ async function installCodexSecurity(runProcess = runManagedProcess, platform = p
 		const verification = inspectListResult(await runCodexPlugin(runProcess, launcher, [
 			"plugin",
 			"list",
-			"--available",
 			"--json"
 		], platform, env, "list"), launcher);
 		if (verification.kind === "fallback") {
@@ -5868,9 +5896,9 @@ async function installCodexSecurity(runProcess = runManagedProcess, platform = p
 			continue;
 		}
 		if (verification.kind === "fatal") return skipped(verification.reason, attemptedLaunchers);
-		const verifiedPlugin = verification.catalog.plugins.find(({ id }) => id === CODEX_SECURITY_PLUGIN);
+		const verifiedPlugin = findPlugin(verification.catalog);
 		if (verifiedPlugin?.installed !== true || verifiedPlugin.enabled !== true) {
-			fallbackReasons.push("plugin-unavailable");
+			fallbackReasons.push("verification-failed");
 			continue;
 		}
 		return {
@@ -5929,11 +5957,26 @@ function inspectAddResult(result, launcher) {
 	};
 	const failure = classifyFailure(result, launcher);
 	if (failure !== void 0) return failure;
-	if (!isRecord(parseUnknownJson(result.stdout))) return {
+	return { kind: "added" };
+}
+function inspectMarketplaceResult(result, launcher) {
+	if (result.timedOut) return {
+		kind: "fallback",
+		reason: "timeout"
+	};
+	const failure = classifyFailure(result, launcher);
+	if (failure !== void 0) return failure;
+	const marketplaces = parseMarketplaceNames(result.stdout);
+	return marketplaces === void 0 ? {
 		kind: "fallback",
 		reason: "invalid-response"
+	} : {
+		kind: "selected",
+		marketplaces
 	};
-	return { kind: "added" };
+}
+function findPlugin(catalog) {
+	return catalog.plugins.find(({ id }) => id === CODEX_SECURITY_PLUGIN);
 }
 function classifyFailure(result, launcher) {
 	if (result.error !== void 0) {
@@ -5947,7 +5990,7 @@ function classifyFailure(result, launcher) {
 		};
 	}
 	if (result.exitCode === 0) return void 0;
-	const failureReason = classifyFailureReason(structuredErrorCode(parseUnknownJson(result.stderr) ?? parseUnknownJson(result.stdout)), sanitizeDiagnostic(result.stderr));
+	const failureReason = classifyFailureReason(structuredErrorCodeFromOutput(result.stderr) ?? structuredErrorCodeFromOutput(result.stdout), sanitizeDiagnostic(result.stderr));
 	if (failureReason === "unauthenticated" || failureReason === "installation-rejected") return {
 		kind: "fatal",
 		reason: failureReason
@@ -5984,6 +6027,9 @@ function classifyFailureReason(code, diagnostic) {
 	return "invalid-response";
 }
 function finalFallbackReason(reasons) {
+	if (reasons.length > 0 && reasons.every((reason) => reason === "plugin-not-offered")) return "all-launchers-lacked-plugin";
+	if (reasons.includes("verification-failed")) return "verification-failed";
+	if (reasons.includes("plugin-not-offered")) return "plugin-not-offered";
 	if (reasons.includes("timeout")) return "timeout";
 	if (reasons.includes("unsupported")) return "unsupported";
 	if (reasons.includes("download-failed")) return "download-failed";
@@ -6000,10 +6046,29 @@ function isPackageLauncher(launcher) {
 }
 /** Normalizes supported flat and marketplace-oriented Codex catalogs. */
 function parsePluginCatalog(input) {
-	const value = parseUnknownJson(input);
-	if (value === void 0) return void 0;
-	const plugins = parseCatalogValue(value);
-	return plugins === void 0 ? void 0 : { plugins };
+	for (const value of parseJsonDocuments(input) ?? []) {
+		const plugins = parseCatalogValue(value);
+		if (plugins !== void 0) return { plugins };
+	}
+}
+function parseMarketplaceNames(input) {
+	for (const value of parseJsonDocuments(input) ?? []) {
+		if (!isRecord(value) || !Array.isArray(value.marketplaces)) continue;
+		const names = [];
+		for (const marketplace of value.marketplaces) {
+			if (!isRecord(marketplace)) {
+				names.length = 0;
+				break;
+			}
+			const name = stringField(marketplace, ["name"]);
+			if (name === void 0) {
+				names.length = 0;
+				break;
+			}
+			names.push(name);
+		}
+		if (names.length > 0 || value.marketplaces.length === 0) return names;
+	}
 }
 function parseCatalogValue(value) {
 	if (Array.isArray(value)) return parseMarketplaceEntries(value);
@@ -6108,13 +6173,42 @@ function enabledFromState(value) {
 	if (state === "enabled") return true;
 	if (state === "disabled") return false;
 }
-function parseUnknownJson(input) {
+function parseJsonDocuments(input) {
+	const wholeDocument = tryParseJson(input);
+	if (wholeDocument !== void 0) return [wholeDocument];
+	const lines = input.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+	if (lines.length === 0) return void 0;
+	for (let index = 1; index < lines.length; index += 1) {
+		const document = tryParseJson(lines.slice(index).join("\n"));
+		if (document !== void 0) return [document];
+	}
+	const documents = [];
+	let parsedDocument = false;
+	for (const line of lines) {
+		const document = tryParseJson(line);
+		if (document === void 0) {
+			if (parsedDocument) return void 0;
+			continue;
+		}
+		documents.push(document);
+		if (documents.length > MAX_JSON_DOCUMENTS) return void 0;
+		parsedDocument = true;
+	}
+	return documents.length === 0 ? void 0 : documents;
+}
+function tryParseJson(input) {
 	try {
 		return JSON.parse(input);
 	} catch {
 		return;
 	}
 }
+function structuredErrorCodeFromOutput(input) {
+	for (const value of parseJsonDocuments(input) ?? []) {
+		const code = structuredErrorCode(value);
+		if (code !== void 0) return code;
+	}
+}
 function structuredErrorCode(value) {
 	if (!isRecord(value)) return void 0;
 	if (value.error !== void 0) {
@@ -6491,8 +6585,11 @@ function renderCodexSecurity(result) {
 var CODEX_SECURITY_SKIP_MESSAGES = {
 	"codex-unavailable": "no usable Codex launcher was found.",
 	unauthenticated: "Codex authentication is required.",
-	"marketplace-unavailable": "the plugin marketplace could not be reached.",
+	"marketplace-unavailable": "the official plugin marketplace was unavailable.",
+	"plugin-not-offered": "the configured marketplace does not offer the official plugin.",
+	"all-launchers-lacked-plugin": "no usable Codex launcher offered the official plugin.",
 	"plugin-unavailable": "the plugin was unavailable from every usable Codex launcher.",
+	"verification-failed": "Codex did not confirm the plugin was installed and enabled.",
 	"installation-rejected": "the account or workspace policy rejected installation.",
 	timeout: "all usable Codex launchers timed out.",
 	"invalid-response": "Codex returned an unsupported or malformed response.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "holycodex",
-  "version": "0.10.6-dev.30770925419.1",
+  "version": "0.10.7",
   "description": "Lean Codex-only agent toolkit installer and doctor",
   "keywords": [
     "agents",
@@ -39,7 +39,7 @@
     "prepack": "vp run --workspace-root build"
   },
   "dependencies": {
-    "@holycodex/plugin": "0.10.6-dev.30770925419.1",
+    "@holycodex/plugin": "0.10.7",
     "zod": "^4.4.3"
   },
   "engines": {