holycodex 0.10.4 → 0.10.7-dev.30815334981.1

package/dist/cli.js

@@ -614,7 +614,6 @@ var string$1 = (params) => {
 };
 var integer = /^-?\d+$/;
 var number$1 = /^-?\d+(?:\.\d+)?$/;
-var boolean$1 = /^(?:true|false)$/i;
 var lowercase = /^[^A-Z]*$/;
 var uppercase = /^[^a-z]*$/;
 //#endregion
@@ -1409,24 +1408,6 @@ var $ZodNumberFormat = /*@__PURE__*/ $constructor("$ZodNumberFormat", (inst, def
 	$ZodCheckNumberFormat.init(inst, def);
 	$ZodNumber.init(inst, def);
 });
-var $ZodBoolean = /*@__PURE__*/ $constructor("$ZodBoolean", (inst, def) => {
-	$ZodType.init(inst, def);
-	inst._zod.pattern = boolean$1;
-	inst._zod.parse = (payload, _ctx) => {
-		if (def.coerce) try {
-			payload.value = Boolean(payload.value);
-		} catch (_) {}
-		const input = payload.value;
-		if (typeof input === "boolean") return payload;
-		payload.issues.push({
-			expected: "boolean",
-			code: "invalid_type",
-			input,
-			inst
-		});
-		return payload;
-	};
-});
 var $ZodUnknown = /*@__PURE__*/ $constructor("$ZodUnknown", (inst, def) => {
 	$ZodType.init(inst, def);
 	inst._zod.parse = (payload) => payload;
@@ -2642,13 +2623,6 @@ function _int(Class, params) {
 	});
 }
 // @__NO_SIDE_EFFECTS__
-function _boolean(Class, params) {
-	return new Class({
-		type: "boolean",
-		...normalizeParams(params)
-	});
-}
-// @__NO_SIDE_EFFECTS__
 function _unknown(Class) {
 	return new Class({ type: "unknown" });
 }
@@ -3194,9 +3168,6 @@ var numberProcessor = (schema, ctx, _json, _params) => {
 	else if (typeof maximum === "number") json.maximum = maximum;
 	if (typeof multipleOf === "number") json.multipleOf = multipleOf;
 };
-var booleanProcessor = (_schema, _ctx, json, _params) => {
-	json.type = "boolean";
-};
 var neverProcessor = (_schema, _ctx, json, _params) => {
 	json.not = {};
 };
@@ -3880,14 +3851,6 @@ var ZodNumberFormat = /*@__PURE__*/ $constructor("ZodNumberFormat", (inst, def)
 function int(params) {
 	return /* @__PURE__ */ _int(ZodNumberFormat, params);
 }
-var ZodBoolean = /*@__PURE__*/ $constructor("ZodBoolean", (inst, def) => {
-	$ZodBoolean.init(inst, def);
-	ZodType.init(inst, def);
-	inst._zod.processJSONSchema = (ctx, json, params) => booleanProcessor(inst, ctx, json, params);
-});
-function boolean(params) {
-	return /* @__PURE__ */ _boolean(ZodBoolean, params);
-}
 var ZodUnknown = /*@__PURE__*/ $constructor("ZodUnknown", (inst, def) => {
 	$ZodUnknown.init(inst, def);
 	ZodType.init(inst, def);
@@ -4289,7 +4252,7 @@ function superRefine(fn, params) {
 }
 //#endregion
 //#region packages/cli/src/catalog.ts
-var VERSION = "0.10.4";
+var VERSION = "0.10.7-dev.30815334981.1";
 var SKILLS = [
 	"ast-grep",
 	"caveman",
@@ -4325,7 +4288,8 @@ var ReasoningEffortSchema = _enum([
 	"low",
 	"medium",
 	"high",
-	"xhigh"
+	"xhigh",
+	"max"
 ]);
 var FastModeSchema = _enum([
 	"standard",
@@ -4370,21 +4334,21 @@ var DEFAULT_PLAN = "plus";
 var MODEL_ROUTING_PLANS = ModelRoutingPlansSchema.parse({
 	go: {
 		root: {
-			model: "gpt-5.6-terra",
-			reasoningEffort: "medium"
+			model: "gpt-5.6-luna",
+			reasoningEffort: "xhigh"
 		},
 		agents: {
 			explorer: {
-				model: "gpt-5.6-terra",
-				reasoningEffort: "low"
+				model: "gpt-5.6-luna",
+				reasoningEffort: "high"
 			},
 			librarian: {
-				model: "gpt-5.6-terra",
-				reasoningEffort: "low"
+				model: "gpt-5.6-luna",
+				reasoningEffort: "high"
 			},
 			worker: {
-				model: "gpt-5.6-terra",
-				reasoningEffort: "medium"
+				model: "gpt-5.6-luna",
+				reasoningEffort: "xhigh"
 			}
 		},
 		usage: {
@@ -4456,7 +4420,7 @@ var MODEL_ROUTING_PLANS = ModelRoutingPlansSchema.parse({
 			},
 			worker: {
 				model: "gpt-5.6-luna",
-				reasoningEffort: "xhigh"
+				reasoningEffort: "max"
 			}
 		},
 		usage: {
@@ -4480,7 +4444,7 @@ var MODEL_ROUTING_PLANS = ModelRoutingPlansSchema.parse({
 			},
 			worker: {
 				model: "gpt-5.6-luna",
-				reasoningEffort: "xhigh"
+				reasoningEffort: "max"
 			}
 		},
 		usage: {
@@ -4496,15 +4460,15 @@ var MODEL_ROUTING_PLANS = ModelRoutingPlansSchema.parse({
 		agents: {
 			explorer: {
 				model: "gpt-5.6-luna",
-				reasoningEffort: "xhigh"
+				reasoningEffort: "max"
 			},
 			librarian: {
 				model: "gpt-5.6-luna",
-				reasoningEffort: "xhigh"
+				reasoningEffort: "max"
 			},
 			worker: {
 				model: "gpt-5.6-luna",
-				reasoningEffort: "xhigh"
+				reasoningEffort: "max"
 			}
 		},
 		usage: {
@@ -4520,14 +4484,23 @@ var LEGACY_MANAGED_AGENT_MODEL_HISTORY = {
 		explorer: [{
 			model: "gpt-5.6-luna",
 			reasoningEffort: "low"
+		}, {
+			model: "gpt-5.6-terra",
+			reasoningEffort: "low"
 		}],
 		librarian: [{
 			model: "gpt-5.6-luna",
 			reasoningEffort: "low"
+		}, {
+			model: "gpt-5.6-terra",
+			reasoningEffort: "low"
 		}],
 		worker: [{
 			model: "gpt-5.6-terra",
 			reasoningEffort: "low"
+		}, {
+			model: "gpt-5.6-terra",
+			reasoningEffort: "medium"
 		}]
 	},
 	"plus-low": {
@@ -4690,6 +4663,9 @@ var LEGACY_MANAGED_ROOT_MODEL_HISTORY = {
 	go: [{
 		model: "gpt-5.6-sol",
 		reasoningEffort: "low"
+	}, {
+		model: "gpt-5.6-terra",
+		reasoningEffort: "medium"
 	}],
 	"plus-low": [],
 	plus: [],
@@ -4856,6 +4832,7 @@ async function runManagedProcess(input, runtime = defaultManagedProcessRuntime)
 				detached: input.platform !== "win32"
 			});
 		} catch (error) {
+			const code = errorCode(error);
 			resolve({
 				exitCode: null,
 				stdout: "",
@@ -4863,7 +4840,8 @@ async function runManagedProcess(input, runtime = defaultManagedProcessRuntime)
 				timedOut: false,
 				matched: false,
 				outputTruncated: false,
-				error: error instanceof Error ? error.message : String(error)
+				error: error instanceof Error ? error.message : String(error),
+				...code === void 0 ? {} : { errorCode: code }
 			});
 			return;
 		}
@@ -4896,7 +4874,7 @@ async function runManagedProcess(input, runtime = defaultManagedProcessRuntime)
 		let matched = false;
 		let settled = false;
 		let forceKillTimeout;
-		const finish = (exitCode, error) => {
+		const finish = (exitCode, error, errorCode) => {
 			if (settled) return;
 			settled = true;
 			clearTimeout(timeout);
@@ -4908,7 +4886,8 @@ async function runManagedProcess(input, runtime = defaultManagedProcessRuntime)
 				timedOut,
 				matched,
 				outputTruncated: stdout.truncated || stderr.truncated,
-				...error === void 0 ? {} : { error }
+				...error === void 0 ? {} : { error },
+				...errorCode === void 0 ? {} : { errorCode }
 			});
 		};
 		const terminate = () => {
@@ -4934,7 +4913,7 @@ async function runManagedProcess(input, runtime = defaultManagedProcessRuntime)
 			stderr = appendOutput(stderr, chunk.toString(), input.maxOutputChars);
 			inspectMatch();
 		});
-		child.once("error", (error) => finish(null, error.message));
+		child.once("error", (error) => finish(null, error.message, errorCode(error)));
 		child.once("close", (code) => finish(code));
 		const timeout = setTimeout(() => {
 			timedOut = true;
@@ -4985,6 +4964,11 @@ function appendOutput(state, chunk, limit) {
 function outputText(state) {
 	return state.truncated ? `${state.head}${TRUNCATED_MARKER}${state.tail}` : state.head;
 }
+function errorCode(value) {
+	if (typeof value !== "object" || value === null || !("code" in value)) return void 0;
+	const code = value.code;
+	return typeof code === "string" ? code : void 0;
+}
 //#endregion
 //#region packages/cli/src/toml.ts
 var TOML_TABLE = /^[ \t]*(?:\[[^\]\r\n]+\]|\[\[[^\]\r\n]+\]\])[ \t]*(?:#.*)?$/m;
@@ -4992,7 +4976,7 @@ var TOML_TABLE = /^[ \t]*(?:\[[^\]\r\n]+\]|\[\[[^\]\r\n]+\]\])[ \t]*(?:#.*)?$/m;
 function rootTomlString(input, key) {
 	const table = TOML_TABLE.exec(input);
 	const root = table === null ? input : input.slice(0, table.index);
-	const match = new RegExp(String.raw`^[ \t]*${escapeRegExp(key)}[ \t]*=[ \t]*(?:"((?:\\.|[^"\\\r\n])*)"|'([^'\r\n]*)')[ \t]*(?:#.*)?$`, "m").exec(root);
+	const match = new RegExp(String.raw`^[ \t]*${escapeRegExp$1(key)}[ \t]*=[ \t]*(?:"((?:\\.|[^"\\\r\n])*)"|'([^'\r\n]*)')[ \t]*(?:#.*)?$`, "m").exec(root);
 	if (match === null) return void 0;
 	if (match[2] !== void 0) return match[2];
 	try {
@@ -5012,7 +4996,7 @@ function rootTomlStringArraySource(input, key) {
 function parseRootTomlStringArray(input, key) {
 	const table = TOML_TABLE.exec(input);
 	const root = table === null ? input : input.slice(0, table.index);
-	const assignment = new RegExp(String.raw`^[ \t]*${escapeRegExp(key)}[ \t]*=`, "m").exec(root);
+	const assignment = new RegExp(String.raw`^[ \t]*${escapeRegExp$1(key)}[ \t]*=`, "m").exec(root);
 	if (assignment === null) return void 0;
 	const start = root.indexOf("[", assignment.index + assignment[0].length);
 	if (start < 0) return void 0;
@@ -5066,6 +5050,128 @@ function parseRootTomlStringArray(input, key) {
 		}
 	}
 }
+function escapeRegExp$1(value) {
+	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+//#endregion
+//#region packages/cli/src/permission-selection.ts
+var PERMISSION_KEYS = [
+	"default_permissions",
+	"approval_policy",
+	"approvals_reviewer",
+	"sandbox_mode"
+];
+var AUTONOMY_PREFIX = "# holycodex autonomy: ";
+var ORIGINAL_PERMISSION_PREFIX = "# holycodex original permissions: ";
+/** Normalizes legacy string callers while preserving an omitted request. */
+function normalizeRequestedAutonomy(value) {
+	if (value === void 0) return { requested: false };
+	if (typeof value === "string") return {
+		requested: true,
+		mode: value
+	};
+	return value;
+}
+/** Reads the raw root permission selection without filling missing values. */
+function readRawPermissionSelection(input) {
+	const defaultPermissions = rootTomlString(input, "default_permissions");
+	const approvalPolicy = rootTomlString(input, "approval_policy");
+	const approvalsReviewer = rootTomlString(input, "approvals_reviewer");
+	const sandboxMode = rootTomlString(input, "sandbox_mode");
+	return {
+		...defaultPermissions === void 0 ? {} : { defaultPermissions },
+		...approvalPolicy === void 0 ? {} : { approvalPolicy },
+		...approvalsReviewer === void 0 ? {} : { approvalsReviewer },
+		...sandboxMode === void 0 ? {} : { sandboxMode }
+	};
+}
+/** Returns root assignment lines for permission keys in source order. */
+function readPermissionLines(input) {
+	const firstTable = input.search(/^\s*\[/m);
+	const root = firstTable < 0 ? input : input.slice(0, firstTable);
+	const keys = new Set(PERMISSION_KEYS);
+	return root.split(/\r?\n/).filter((line) => {
+		const key = /^\s*([A-Za-z0-9_-]+)\s*=/.exec(line)?.[1];
+		return key !== void 0 && keys.has(key);
+	});
+}
+/** Removes all root permission assignment lines while preserving other text. */
+function removePermissionLines(input) {
+	const firstTable = input.search(/^\s*\[/m);
+	const root = firstTable < 0 ? input : input.slice(0, firstTable);
+	const tables = firstTable < 0 ? "" : input.slice(firstTable);
+	const keys = PERMISSION_KEYS.map((key) => key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
+	return `${root.split(/\r?\n/).filter((line) => !new RegExp(`^\\s*(?:${keys.join("|")})\\s*=`).test(line)).join("\n").trim()}${tables ? `\n${tables.trimStart()}` : ""}`.trim();
+}
+/** Returns the exact tuple represented by an explicit autonomy mode. */
+function permissionSelectionForMode(mode) {
+	if (mode === "default") return {
+		approvalPolicy: "on-request",
+		approvalsReviewer: "auto_review",
+		sandboxMode: "workspace-write"
+	};
+	if (mode === "autonomous") return {
+		approvalPolicy: "never",
+		sandboxMode: "workspace-write"
+	};
+	return {
+		approvalPolicy: "never",
+		sandboxMode: "danger-full-access"
+	};
+}
+/** Identifies generated tuples from current and historical installers. */
+function permissionSelectionMatchesMode(selection, mode) {
+	if (permissionSelectionsEqual(selection, permissionSelectionForMode(mode))) return true;
+	return mode === "default" && permissionSelectionsEqual(selection, {
+		approvalPolicy: "on-request",
+		sandboxMode: "workspace-write"
+	});
+}
+/** Compares all raw permission fields, including intentional omissions. */
+function permissionSelectionsEqual(left, right) {
+	return PERMISSION_KEYS.every((key) => {
+		const field = permissionField(key);
+		return left[field] === right[field];
+	});
+}
+/** Identifies a historical generated tuple, if one is exact. */
+function inferAutonomyMode(selection) {
+	for (const mode of [
+		"default",
+		"autonomous",
+		"dangerous"
+	]) if (permissionSelectionMatchesMode(selection, mode)) return mode;
+	return "custom";
+}
+/** Reads deterministic autonomy metadata from a managed block. */
+function readAutonomyMetadata(input) {
+	const value = new RegExp(`^${escapeRegExp(AUTONOMY_PREFIX)}(.+)$`, "m").exec(input)?.[1]?.trim();
+	if (value === "default" || value === "autonomous" || value === "dangerous" || value === "custom") return value;
+}
+/** Encodes durable original root permission assignment provenance. */
+function originalPermissionMetadata(lines) {
+	return `${ORIGINAL_PERMISSION_PREFIX}${lines.length === 0 ? "-" : Buffer.from(lines.join("\n"), "utf8").toString("base64")}\n`;
+}
+/** Reads durable original root permission assignment provenance. */
+function readOriginalPermissionMetadata(input) {
+	const encoded = new RegExp(`^${escapeRegExp(ORIGINAL_PERMISSION_PREFIX)}([A-Za-z0-9+/=_-]+)$`, "m").exec(input)?.[1];
+	if (encoded === void 0) return void 0;
+	if (encoded === "-") return [];
+	return Buffer.from(encoded, "base64").toString("utf8").split(/\r?\n/).filter(Boolean);
+}
+/** Returns a generated tuple for an explicit request or preserves a live omitted selection. */
+function selectPermissionSelection(live, request) {
+	if (request.requested) return permissionSelectionForMode(request.mode);
+	if (Object.keys(live).length > 0) return live;
+	return permissionSelectionForMode("default");
+}
+var AUTONOMY_METADATA_PREFIX = AUTONOMY_PREFIX;
+function permissionField(key) {
+	if (key === "default_permissions") return "defaultPermissions";
+	if (key === "approval_policy") return "approvalPolicy";
+	if (key === "approvals_reviewer") return "approvalsReviewer";
+	return "sandboxMode";
+}
 function escapeRegExp(value) {
 	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -5078,7 +5184,6 @@ var ORIGINAL_TABLE_KEY = "# holycodex original table key: ";
 var PLAN_PREFIX = "# holycodex plan: ";
 var FAST_MODE_PREFIX = "# holycodex fast: ";
 var MAX_SUBAGENTS_PREFIX = "# holycodex max-subagents: ";
-var MANAGED_PERMISSION_PROFILE = "holycodex-config";
 var OLD_NAMESPACES = [
 	"marketplaces.sisyphuslabs",
 	"plugins.\"omo@sisyphuslabs\"",
@@ -5098,13 +5203,35 @@ var OLD_NAMESPACES = [
 	"hooks.state.\"omo@lazycodex",
 	"hooks.state.\"omo@code-yeongyu-codex-plugins"
 ];
-/** Removes managed. */
-function removeManaged(input) {
+function readOriginalRootMetadata(input) {
+	const encoded = input.match(/^# holycodex original root: ([A-Za-z0-9+/=]+)$/m)?.[1];
+	return encoded === void 0 ? void 0 : Buffer.from(encoded, "base64").toString("utf8");
+}
+function readLegacyGeneratedRoot(input) {
+	const body = input.match(/^# >>> holycodex managed >>>\r?\n([\s\S]*?)^# <<< holycodex managed <<</m)?.[1];
+	if (body === void 0 || readPermissionLines(body).length === 0) return void 0;
+	return inferAutonomyMode(readRawPermissionSelection(body)) === "custom" ? void 0 : body;
+}
+/** Removes managed configuration and restores durable original values. */
+function removeManaged(input, preserveGeneratedPermissions = false) {
 	const escapedStart = START.replaceAll(">", "\\>");
 	const escapedEnd = END.replaceAll("<", "\\<");
 	return input.replace(new RegExp(`${escapedStart}([\\s\\S]*?)${escapedEnd}(?:\\r?\\n){0,2}`, "g"), (_match, body) => {
-		const encoded = body.match(/^# holycodex original root: ([A-Za-z0-9+/=]+)$/m)?.[1];
-		if (encoded !== void 0) return `${Buffer.from(encoded, "base64").toString("utf8")}\n`;
+		const original = readOriginalRootMetadata(body);
+		const originalPermissions = readOriginalPermissionMetadata(body);
+		const currentPermissions = readPermissionLines(body);
+		const currentSelection = readRawPermissionSelection(body);
+		const metadata = readAutonomyMetadata(body);
+		const expected = metadata === void 0 || metadata === "custom" ? originalPermissions === void 0 ? void 0 : readRawPermissionSelection(originalPermissions.join("\n")) : permissionSelectionForMode(metadata);
+		const generated = metadata !== void 0 && metadata !== "custom" ? permissionSelectionMatchesMode(currentSelection, metadata) : expected !== void 0 ? permissionSelectionsEqual(currentSelection, expected) : metadata === void 0 && [
+			"default",
+			"autonomous",
+			"dangerous"
+		].some((mode) => permissionSelectionMatchesMode(currentSelection, mode));
+		const preserveCurrent = preserveGeneratedPermissions || !generated;
+		if (original !== void 0) return `${preserveCurrent ? `${removePermissionLines(original)}${currentPermissions.length === 0 ? "" : `\n${currentPermissions.join("\n")}`}`.trim() : `${removePermissionLines(original)}${(originalPermissions ?? readPermissionLines(original)).length === 0 ? "" : `\n${(originalPermissions ?? readPermissionLines(original)).join("\n")}`}`.trim()}\n`;
+		if (!preserveCurrent && originalPermissions !== void 0) return `${originalPermissions.join("\n")}\n`;
+		if (preserveCurrent && currentPermissions.length > 0) return `${currentPermissions.join("\n")}\n`;
 		const tableKeys = [...body.matchAll(/^# holycodex original table key: ([A-Za-z0-9+/=]+)$/gm)].flatMap((match) => match[1] === void 0 ? [] : [match[1]]);
 		return tableKeys.length === 0 ? "" : `${tableKeys.map((key) => Buffer.from(key, "base64").toString("utf8")).join("\n")}\n`;
 	}).trim();
@@ -5228,10 +5355,25 @@ function mergedStatusLine(original) {
 }
 /** Installs config. */
 function installConfig(input, mode, _platform, plan = DEFAULT_PLAN, maxSubagents, fastMode = "standard") {
-	const base = preserveManagedRootPreferences(input, removeLegacyOmo(removeManaged(input)));
+	const request = normalizeRequestedAutonomy(mode);
+	const priorAutonomy = readAutonomyMetadata(input);
+	const previousOriginalRoot = readOriginalRootMetadata(input);
+	const legacyGeneratedRoot = readLegacyGeneratedRoot(input);
+	const originalPermissionLines = readOriginalPermissionMetadata(input);
+	const base = preserveManagedRootPreferences(input, removeLegacyOmo(removeManaged(input, !request.requested)));
 	const firstTable = base.search(/^\s*\[/m);
 	const root = firstTable < 0 ? base : base.slice(0, firstTable);
 	const tables = firstTable < 0 ? "" : base.slice(firstTable);
+	const permissions = selectPermissionSelection(readRawPermissionSelection(root), request);
+	const effectiveAutonomy = request.requested ? inferAutonomyMode(permissions) : priorAutonomy ?? inferAutonomyMode(permissions);
+	const rootPermissionLines = [
+		permissions.approvalPolicy === void 0 ? void 0 : `approval_policy = ${JSON.stringify(permissions.approvalPolicy)}`,
+		permissions.approvalsReviewer === void 0 ? void 0 : `approvals_reviewer = ${JSON.stringify(permissions.approvalsReviewer)}`,
+		permissions.sandboxMode === void 0 ? void 0 : `sandbox_mode = ${JSON.stringify(permissions.sandboxMode)}`
+	].filter((line) => line !== void 0);
+	const hadManagedAutonomy = readAutonomyMetadata(input) !== void 0;
+	const hadOriginalRoot = /^# holycodex original root:/m.test(input);
+	const permissionLines = originalPermissionLines ?? (legacyGeneratedRoot !== void 0 && previousOriginalRoot === void 0 ? [] : previousOriginalRoot === void 0 ? hadManagedAutonomy && !hadOriginalRoot ? [] : readPermissionLines(root) : readPermissionLines(previousOriginalRoot));
 	const controlled = [
 		"approval_policy",
 		"approvals_reviewer",
@@ -5239,7 +5381,8 @@ function installConfig(input, mode, _platform, plan = DEFAULT_PLAN, maxSubagents
 		"max_concurrent_threads_per_session",
 		"status_line",
 		"model_verbosity",
-		"service_tier"
+		"service_tier",
+		...request.requested ? ["default_permissions"] : []
 	].map((key) => rootValue(root, key));
 	const preservedRoot = [
 		"approval_policy",
@@ -5248,7 +5391,8 @@ function installConfig(input, mode, _platform, plan = DEFAULT_PLAN, maxSubagents
 		"max_concurrent_threads_per_session",
 		"status_line",
 		"model_verbosity",
-		"service_tier"
+		"service_tier",
+		...request.requested ? ["default_permissions"] : []
 	].reduce(removeRootKey, root).trim();
 	const originalControlled = controlled.filter((value) => value !== void 0).sort((left, right) => root.indexOf(left) - root.indexOf(right)).join("\n");
 	const hasModel = /^\s*model\s*=/m.test(preservedRoot);
@@ -5257,14 +5401,12 @@ function installConfig(input, mode, _platform, plan = DEFAULT_PLAN, maxSubagents
 	const effectiveMaxSubagents = maxSubagents ?? MODEL_ROUTING_PLANS[plan].usage.maxSubagents;
 	const model = hasModel ? "" : `model = "${rootRoute.model}"\n`;
 	const effort = hasEffort ? "" : `model_reasoning_effort = "${rootRoute.reasoningEffort}"\n`;
-	const approval = mode === "default" ? "on-request" : "never";
-	const approvalsReviewer = mode === "default" ? "approvals_reviewer = \"auto_review\"\n" : "";
-	const sandbox = mode === "dangerous" ? "danger-full-access" : "workspace-write";
-	const original = originalControlled ? `${ORIGINAL_ROOT}${Buffer.from(originalControlled).toString("base64")}\n` : "";
-	const rootBlock = `${START}\n${PLAN_PREFIX}${plan}\n${FAST_MODE_PREFIX}${fastMode}\n${maxSubagents === void 0 ? "" : `${MAX_SUBAGENTS_PREFIX}${maxSubagents}\n`}${original}${model}${effort}model_verbosity = "low"\nservice_tier = "${fastMode === "fast-all" ? "fast" : "default"}"\napproval_policy = "${approval}"\n${approvalsReviewer}sandbox_mode = "${sandbox}"\nstatus_line = ${mergedStatusLine(rootValue(root, "status_line"))}\n${END}`;
+	const originalSource = previousOriginalRoot === void 0 ? priorAutonomy === void 0 && legacyGeneratedRoot === void 0 ? originalControlled : "" : removePermissionLines(previousOriginalRoot);
+	const original = originalSource ? `${ORIGINAL_ROOT}${Buffer.from(originalSource).toString("base64")}\n` : "";
+	const maxSubagentsMetadata = maxSubagents === void 0 ? "" : `${MAX_SUBAGENTS_PREFIX}${maxSubagents}\n`;
+	const rootServiceTier = fastMode === "fast-all" ? "fast" : "default";
+	const rootBlock = `${START}\n${PLAN_PREFIX}${plan}\n${FAST_MODE_PREFIX}${fastMode}\n${AUTONOMY_METADATA_PREFIX}${effectiveAutonomy}\n${maxSubagentsMetadata}${original}${originalPermissionMetadata(permissionLines)}${model}${effort}model_verbosity = "low"\nservice_tier = "${rootServiceTier}"\n${rootPermissionLines.join("\n")}\nstatus_line = ${mergedStatusLine(rootValue(root, "status_line"))}\n${END}`;
 	let configured = `${preservedRoot ? `${preservedRoot}\n` : ""}${rootBlock}${tables ? `\n\n${tables}` : ""}`;
-	configured = injectTableKeys(configured, `permissions.${MANAGED_PERMISSION_PROFILE}`, [["description", "\"HolyCodex config.toml permissions.\""], ["extends", "\":workspace\""]]);
-	configured = injectTableKeys(configured, `permissions.${MANAGED_PERMISSION_PROFILE}.network`, [["enabled", "true"]]);
 	configured = injectTableKeys(configured, "features", [
 		["default_mode_request_user_input", "true"],
 		["multi_agent", "true"],
@@ -5272,8 +5414,8 @@ function installConfig(input, mode, _platform, plan = DEFAULT_PLAN, maxSubagents
 	]);
 	const usage = MODEL_ROUTING_PLANS[plan].usage;
 	configured = injectTableKeys(configured, "agents", [["max_threads", String(effectiveMaxSubagents + 1)], ["max_depth", String(usage.maxDepth)]]);
-	if (mode !== "dangerous") configured = injectTableKeys(configured, "sandbox_workspace_write", [["network_access", "true"]]);
-	configured = injectTableKeys(configured, "desktop", [["enabled-reasoning-efforts", "[\"low\", \"medium\", \"high\"]"], ["show-context-window-usage", "true"]]);
+	if (effectiveAutonomy !== "dangerous") configured = injectTableKeys(configured, "sandbox_workspace_write", [["network_access", "true"]]);
+	configured = injectTableKeys(configured, "desktop", [["enabled-reasoning-efforts", "[\"low\", \"medium\", \"high\", \"xhigh\", \"max\"]"], ["show-context-window-usage", "true"]]);
 	if (_platform === "win32") configured = injectTableKeys(configured, "windows", [["sandbox", "\"unelevated\""]]);
 	for (const agent of AGENTS) configured = injectTableKeys(configured, `agents.${agent}`, [["config_file", `"holycodex/agents/${agent}.toml"`]]);
 	const plugin = `${START}\n[plugins."holycodex@holycodex"]\nenabled = true\n${END}`;
@@ -5467,7 +5609,7 @@ async function doctor(home = process.env.CODEX_HOME ?? join(homedir(), ".codex")
 	checks.push(preset === void 0 || expectedMaxSubagents === void 0 || tableInteger(config, "agents", "max_threads") !== expectedMaxSubagents + 1 || tableInteger(config, "agents", "max_depth") !== preset.usage.maxDepth ? check("agent-usage", "error", "agent-usage-stale", "Agent concurrency configuration does not match the selected routing plan or explicit override.", "Reinstall HolyCodex.") : check("agent-usage", "ok", "agent-usage-ready", `Agent concurrency allows ${expectedMaxSubagents} direct subagent${expectedMaxSubagents === 1 ? "" : "s"}.`));
 	checks.push(mode === "unknown" ? check("autonomy", "error", "invalid-autonomy-config", "Approval policy, approval reviewer, sandbox, and network settings do not match a supported mode.", "Rerun install with the intended autonomy flag.") : mode === "dangerous" ? check("autonomy", "warning", "dangerous-autonomy", "Explicit dangerous autonomy is active; workspace containment is removed.") : check("autonomy", "ok", `${mode}-ready`, mode === "safe-workspace" ? "Safe workspace autonomy is active." : "Approval-free workspace autonomy is active."));
 	checks.push(tableBoolean(config, "features", "default_mode_request_user_input") === true ? check("user-input", "ok", "user-input-ready", "default_mode_request_user_input is enabled.") : check("user-input", "error", "user-input-disabled", "default_mode_request_user_input is not enabled.", "Rerun holycodex install."));
-	checks.push(tableStringArray(config, "desktop", "enabled-reasoning-efforts")?.join(",") === "low,medium,high" ? check("desktop-reasoning", "ok", "desktop-reasoning-ready", "Desktop exposes low, medium, and high reasoning efforts.") : check("desktop-reasoning", "error", "desktop-reasoning-stale", "Desktop reasoning choices must be low, medium, and high.", "Reinstall HolyCodex."));
+	checks.push(tableStringArray(config, "desktop", "enabled-reasoning-efforts")?.join(",") === "low,medium,high,xhigh,max" ? check("desktop-reasoning", "ok", "desktop-reasoning-ready", "Desktop exposes low through max reasoning efforts.") : check("desktop-reasoning", "error", "desktop-reasoning-stale", "Desktop reasoning choices must include low through max.", "Reinstall HolyCodex."));
 	checks.push(tableBoolean(config, "desktop", "show-context-window-usage") === true ? check("desktop-context-usage", "ok", "desktop-context-usage-ready", "Desktop context-window usage is visible.") : check("desktop-context-usage", "error", "desktop-context-usage-hidden", "Desktop context-window usage is not enabled.", "Reinstall HolyCodex."));
 	checks.push(rootTomlStringArray(config, "status_line")?.includes("context-remaining") === true ? check("context-visibility", "warning", "context-visible-support-unverified", "status_line includes context-remaining. Current official Codex config documents this item, but publishes no minimum compatible Codex version.") : check("context-visibility", "error", "context-hidden", "status_line does not include context-remaining.", "Rerun holycodex install."));
 	const codex = await runtime.command("codex", ["--version"]);
@@ -5493,60 +5635,292 @@ async function doctor(home = process.env.CODEX_HOME ?? join(homedir(), ".codex")
 	};
 }
 //#endregion
+//#region packages/cli/src/codex-launcher.ts
+var CODEX_PACKAGE_SPEC = "@openai/codex@latest";
+/** Derives safe process facts for the default installation flow. */
+function defaultCodexLauncherRuntimeFacts(platform = process.platform, env = process.env) {
+	const bun = typeof process.versions.bun === "string";
+	const allowPackageResolution = env.HOLYCODEX_TEST_SKIP_PACKAGE_RESOLUTION !== "1";
+	const npmExecPath = bun ? void 0 : env.npm_execpath;
+	return {
+		allowPackageResolution,
+		platform,
+		execPath: process.execPath,
+		runtime: bun ? "bun" : "node",
+		...npmExecPath === void 0 ? {} : { npmExecPath },
+		availableRunners: ["npm", "pnpm"],
+		npm: platform === "win32" ? "npm.cmd" : "npm",
+		pnpm: platform === "win32" ? "pnpm.cmd" : "pnpm"
+	};
+}
+/** Builds ordered Codex launcher candidates once for an installation. */
+function createCodexLauncherCandidates(input = {}) {
+	const facts = input.runtimeFacts ?? {};
+	const candidates = [];
+	const injected = input.injected === void 0 ? [] : toArray(input.injected);
+	for (const candidate of injected) {
+		const launcher = normalizeLauncher(candidate, "injected");
+		if (launcher !== void 0) candidates.push(launcher);
+	}
+	const pathLauncher = normalizeLauncher(facts.pathCodex ?? "codex", "path");
+	if (pathLauncher !== void 0) candidates.push(pathLauncher);
+	if (facts.allowPackageResolution === false) return deduplicate(candidates);
+	if ((facts.runtime ?? (typeof process.versions.bun === "string" ? "bun" : "node")) === "bun") {
+		const bunLauncher = normalizeLauncher({
+			command: facts.execPath ?? process.execPath,
+			argsPrefix: ["x", CODEX_PACKAGE_SPEC],
+			source: "bunx"
+		}, "bunx");
+		if (bunLauncher !== void 0) candidates.push(bunLauncher);
+	}
+	const nodeRunner = facts.nodeRunner ?? activeNodeRunner(facts);
+	if (nodeRunner !== void 0) {
+		const launcher = normalizeLauncher(nodeRunner, nodeRunnerSource(nodeRunner));
+		if (launcher !== void 0) candidates.push(launcher);
+	}
+	const availableRunners = facts.availableRunners ?? [];
+	if (facts.npm !== false && (facts.npm !== void 0 || availableRunners.includes("npm"))) candidates.push(packageLauncher(facts.npm, facts.platform, "npm-exec"));
+	if (facts.pnpm !== false && (facts.pnpm !== void 0 || availableRunners.includes("pnpm"))) candidates.push(packageLauncher(facts.pnpm, facts.platform, "pnpm-exec"));
+	return deduplicate(candidates);
+}
+/** Appends command arguments to a launcher prefix without mutating either array. */
+function codexLauncherArgs(launcher, args) {
+	return [...launcher.argsPrefix, ...args];
+}
+function activeNodeRunner(facts) {
+	if (facts.npmExecPath === void 0 || facts.execPath === void 0) return void 0;
+	const source = packageRunnerSource(facts.npmExecPath);
+	if (source === void 0) return void 0;
+	return {
+		command: facts.execPath,
+		argsPrefix: source === "npm-exec" ? [
+			facts.npmExecPath,
+			"exec",
+			"--yes",
+			"--package",
+			CODEX_PACKAGE_SPEC,
+			"--",
+			"codex"
+		] : [
+			facts.npmExecPath,
+			"dlx",
+			CODEX_PACKAGE_SPEC
+		],
+		source
+	};
+}
+function packageRunnerSource(path) {
+	const basename = path.replaceAll("\\", "/").split("/").pop()?.toLowerCase() ?? "";
+	if ([
+		"npm",
+		"npm.cmd",
+		"npm-cli.js",
+		"npm-cli.cjs"
+	].includes(basename)) return "npm-exec";
+	if ([
+		"pnpm",
+		"pnpm.cmd",
+		"pnpm.js",
+		"pnpm.cjs"
+	].includes(basename)) return "pnpm-exec";
+}
+function nodeRunnerSource(value) {
+	if (typeof value === "object" && value !== null && "source" in value) {
+		if (value.source === "pnpm-exec") return "pnpm-exec";
+		if (value.source === "npm-exec") return "npm-exec";
+	}
+	return "npm-exec";
+}
+function packageLauncher(command, platform, source) {
+	return {
+		command: typeof command === "string" ? command : source === "npm-exec" ? platform === "win32" ? "npm.cmd" : "npm" : platform === "win32" ? "pnpm.cmd" : "pnpm",
+		argsPrefix: source === "npm-exec" ? [
+			"exec",
+			"--yes",
+			"--package",
+			CODEX_PACKAGE_SPEC,
+			"--",
+			"codex"
+		] : ["dlx", CODEX_PACKAGE_SPEC],
+		source
+	};
+}
+function toArray(value) {
+	return Array.isArray(value) ? value : [value];
+}
+function normalizeLauncher(value, source) {
+	if (typeof value === "string") {
+		const command = value.trim();
+		return command === "" ? void 0 : {
+			command,
+			argsPrefix: [],
+			source
+		};
+	}
+	if (typeof value !== "object" || value === null || typeof value.command !== "string") return void 0;
+	const command = value.command.trim();
+	if (command === "" || !Array.isArray(value.argsPrefix)) return void 0;
+	if (!value.argsPrefix.every((arg) => typeof arg === "string")) return void 0;
+	return {
+		command,
+		argsPrefix: [...value.argsPrefix],
+		source
+	};
+}
+function deduplicate(candidates) {
+	const seen = /* @__PURE__ */ new Set();
+	const result = [];
+	for (const candidate of candidates) {
+		const key = JSON.stringify([candidate.command, candidate.argsPrefix]);
+		if (seen.has(key)) continue;
+		seen.add(key);
+		result.push(candidate);
+	}
+	return result;
+}
+//#endregion
 //#region packages/cli/src/codex-security.ts
 var CODEX_SECURITY_PLUGIN = "codex-security@openai-curated";
-var CODEX_PLUGIN_TIMEOUT_MS = 2e4;
+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 PluginEntrySchema = looseObject({
-	pluginId: string(),
-	installed: boolean().optional(),
-	enabled: boolean().optional()
-});
-var PluginListSchema = looseObject({
-	installed: array(PluginEntrySchema),
-	available: array(PluginEntrySchema)
-});
-var PluginAddSchema = looseObject({ pluginId: string() });
+var MAX_JSON_DOCUMENTS = 16;
+var SPAWN_UNAVAILABLE_CODES = /* @__PURE__ */ new Set([
+	"EACCES",
+	"ENOENT",
+	"EPERM"
+]);
+var FATAL_AUTH_CODES = /* @__PURE__ */ new Set([
+	"401",
+	"UNAUTHENTICATED",
+	"AUTHENTICATION_REQUIRED"
+]);
+var FATAL_ACCOUNT_CODES = /* @__PURE__ */ new Set(["ACCOUNT_REQUIRED", "ACCOUNT_NOT_FOUND"]);
+var FATAL_MARKETPLACE_CODES = /* @__PURE__ */ new Set([
+	"502",
+	"503",
+	"504",
+	"MARKETPLACE_UNAVAILABLE",
+	"MARKETPLACE_LOAD_FAILED",
+	"CATALOG_UNAVAILABLE"
+]);
+var FATAL_PLUGIN_CODES = /* @__PURE__ */ new Set([
+	"404",
+	"PLUGIN_NOT_FOUND",
+	"PLUGIN_UNAVAILABLE"
+]);
+var FATAL_POLICY_CODES = /* @__PURE__ */ new Set([
+	"403",
+	"ACCOUNT_RESTRICTED",
+	"ACCOUNT_UNAVAILABLE",
+	"ACCOUNT_SUSPENDED",
+	"ACCOUNT_DISABLED",
+	"INSTALLATION_REJECTED",
+	"PERMISSION_DENIED",
+	"POLICY_REJECTED"
+]);
 /** Installs or enables the official Codex Security plugin without failing HolyCodex installation. */
-async function installCodexSecurity(runProcess = runManagedProcess, platform = process.platform, env = process.env) {
-	const listed = await runCodexPlugin(runProcess, [
-		"plugin",
-		"list",
-		"--available",
-		"--json"
-	], platform, env);
-	const listFailure = externalFailure(listed);
-	if (listFailure !== void 0) return listFailure;
-	const parsedList = parseJson(listed.stdout, PluginListSchema);
-	if (parsedList === void 0) return skipped("invalid-response");
-	const installed = parsedList.installed.find((plugin) => plugin.pluginId === CODEX_SECURITY_PLUGIN);
-	if (installed?.installed === true && installed.enabled === true) return { status: "already-installed" };
-	const wasDisabled = installed?.installed === true;
-	const available = parsedList.available.some((plugin) => plugin.pluginId === CODEX_SECURITY_PLUGIN);
-	if (!wasDisabled && !available) return skipped("plugin-unavailable");
-	const added = await runCodexPlugin(runProcess, [
-		"plugin",
-		"add",
-		CODEX_SECURITY_PLUGIN,
-		"--json"
-	], platform, env);
-	const addFailure = externalFailure(added);
-	if (addFailure !== void 0) return addFailure;
-	if (parseJson(added.stdout, PluginAddSchema)?.pluginId !== CODEX_SECURITY_PLUGIN) return skipped("invalid-response");
-	return { status: wasDisabled ? "enabled" : "installed" };
-}
-async function runCodexPlugin(runProcess, args, platform, env) {
+async function installCodexSecurity(runProcess = runManagedProcess, platform = process.platform, env = process.env, options = {}) {
+	const runtimeFacts = options.runtimeFacts ?? (runProcess === runManagedProcess ? defaultCodexLauncherRuntimeFacts(platform) : void 0);
+	const candidates = createCodexLauncherCandidates({
+		...options.injected === void 0 ? {} : { injected: options.injected },
+		...runtimeFacts === void 0 ? {} : { runtimeFacts }
+	});
+	const attemptedLaunchers = [];
+	const fallbackReasons = [];
+	for (const launcher of candidates) {
+		attemptedLaunchers.push(launcher.source);
+		const installedOutcome = inspectListResult(await runCodexPlugin(runProcess, launcher, [
+			"plugin",
+			"list",
+			"--json"
+		], platform, env, "list"), launcher);
+		if (installedOutcome.kind === "fallback") {
+			fallbackReasons.push(installedOutcome.reason);
+			continue;
+		}
+		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 = 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",
+			CODEX_SECURITY_PLUGIN,
+			"--json"
+		], platform, env, "add"), launcher);
+		if (addOutcome.kind === "fallback") {
+			fallbackReasons.push(addOutcome.reason);
+			continue;
+		}
+		if (addOutcome.kind === "fatal") return skipped(addOutcome.reason, attemptedLaunchers);
+		const verification = inspectListResult(await runCodexPlugin(runProcess, launcher, [
+			"plugin",
+			"list",
+			"--json"
+		], platform, env, "list"), launcher);
+		if (verification.kind === "fallback") {
+			fallbackReasons.push(verification.reason);
+			continue;
+		}
+		if (verification.kind === "fatal") return skipped(verification.reason, attemptedLaunchers);
+		const verifiedPlugin = findPlugin(verification.catalog);
+		if (verifiedPlugin?.installed !== true || verifiedPlugin.enabled !== true) {
+			fallbackReasons.push("verification-failed");
+			continue;
+		}
+		return {
+			status: wasDisabled ? "enabled" : "installed",
+			launcherSource: launcher.source
+		};
+	}
+	return skipped(finalFallbackReason(fallbackReasons), attemptedLaunchers);
+}
+async function runCodexPlugin(runProcess, launcher, args, platform, env, operation) {
 	try {
 		return await runProcess({
-			command: "codex",
-			args,
+			command: launcher.command,
+			args: codexLauncherArgs(launcher, args),
 			platform,
-			timeoutMs: CODEX_PLUGIN_TIMEOUT_MS,
+			timeoutMs: timeoutFor(launcher, operation),
 			maxOutputChars: MAX_CODEX_OUTPUT_CHARS,
 			env
 		});
 	} catch (error) {
-		if (!isUnavailableProcessError(error)) throw error;
+		const code = thrownErrorCode(error);
+		if (!isUnavailableThrownError(error) && !(isPackageLauncher(launcher) && isBootstrapThrownError(error))) throw error;
 		return {
 			exitCode: null,
 			stdout: "",
@@ -5554,53 +5928,291 @@ async function runCodexPlugin(runProcess, args, platform, env) {
 			timedOut: false,
 			matched: false,
 			outputTruncated: false,
-			error: "Codex executable unavailable."
+			error: "Codex launcher could not be started.",
+			...code === void 0 ? {} : { errorCode: code }
 		};
 	}
 }
-function externalFailure(result) {
-	if (result.timedOut) return skipped("timeout");
-	if (result.error !== void 0) return skipped("codex-unavailable");
+function inspectListResult(result, launcher) {
+	if (result.timedOut) return {
+		kind: "fallback",
+		reason: "timeout"
+	};
+	const failure = classifyFailure(result, launcher);
+	if (failure !== void 0) return failure;
+	const catalog = parsePluginCatalog(result.stdout);
+	if (catalog === void 0) return {
+		kind: "fallback",
+		reason: "invalid-response"
+	};
+	return {
+		kind: "selected",
+		catalog
+	};
+}
+function inspectAddResult(result, launcher) {
+	if (result.timedOut) return {
+		kind: "fallback",
+		reason: "timeout"
+	};
+	const failure = classifyFailure(result, launcher);
+	if (failure !== void 0) return failure;
+	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
+	};
+}
+function findPlugin(catalog) {
+	return catalog.plugins.find(({ id }) => id === CODEX_SECURITY_PLUGIN);
+}
+function classifyFailure(result, launcher) {
+	if (result.error !== void 0) {
+		if (isUnavailableProcessError(result)) return {
+			kind: "fallback",
+			reason: "codex-unavailable"
+		};
+		return {
+			kind: "fallback",
+			reason: isPackageLauncher(launcher) ? "download-failed" : "invalid-response"
+		};
+	}
 	if (result.exitCode === 0) return void 0;
-	const diagnostic = parseUnknownJson(result.stderr) ?? parseUnknownJson(result.stdout);
-	if (diagnostic === void 0) return skipped("invalid-response");
-	return skipped(classifyStructuredFailure(diagnostic));
+	const failureReason = classifyFailureReason(structuredErrorCodeFromOutput(result.stderr) ?? structuredErrorCodeFromOutput(result.stdout), sanitizeDiagnostic(result.stderr));
+	if (failureReason === "unauthenticated" || failureReason === "installation-rejected") return {
+		kind: "fatal",
+		reason: failureReason
+	};
+	return {
+		kind: "fallback",
+		reason: failureReason
+	};
 }
-function classifyStructuredFailure(value) {
-	const code = structuredErrorCode(value);
-	if (code === void 0) return "invalid-response";
-	if ([
-		"401",
-		"UNAUTHENTICATED",
-		"AUTHENTICATION_REQUIRED"
-	].includes(code)) return "unauthenticated";
-	if ([
-		"502",
-		"503",
-		"504",
-		"MARKETPLACE_UNAVAILABLE",
-		"MARKETPLACE_LOAD_FAILED",
-		"CATALOG_UNAVAILABLE"
-	].includes(code)) return "marketplace-unavailable";
+function classifyFailureReason(code, diagnostic) {
+	if (code !== void 0) {
+		if (FATAL_AUTH_CODES.has(code) || FATAL_ACCOUNT_CODES.has(code)) return "unauthenticated";
+		if (FATAL_MARKETPLACE_CODES.has(code)) return "marketplace-unavailable";
+		if (FATAL_PLUGIN_CODES.has(code)) return "plugin-unavailable";
+		if (FATAL_POLICY_CODES.has(code)) return "installation-rejected";
+		if (SPAWN_UNAVAILABLE_CODES.has(code)) return "codex-unavailable";
+		if ([
+			"ETIMEDOUT",
+			"ECONNRESET",
+			"ECONNREFUSED",
+			"EAI_AGAIN",
+			"ENETUNREACH"
+		].includes(code)) return "download-failed";
+	}
+	const lower = diagnostic.toLowerCase();
+	if (/unknown (?:command|subcommand)|unrecognized (?:command|subcommand)|invalid subcommand/.test(lower)) return "unsupported";
+	if (/not supported on (?:this )?platform|unsupported (?:platform|architecture)|no matching (?:binary|package)|platform package|not compatible/.test(lower)) return "unsupported";
+	if (/unauthenticated|authentication required|not logged in|account (?:required|not found)/.test(lower)) return "unauthenticated";
+	if (/account (?:restricted|unavailable|suspended|disabled)/.test(lower)) return "installation-rejected";
+	if (/marketplace|catalog/.test(lower)) return "marketplace-unavailable";
+	if (/eai_again|enetwork|network|timed out|timeout|download|fetch|resolve package/.test(lower)) return "download-failed";
+	if (/plugin (?:not found|unavailable|missing)/.test(lower)) return "plugin-unavailable";
+	if (/permission denied|policy|rejected|forbidden/.test(lower)) return "installation-rejected";
+	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";
+	if (reasons.includes("marketplace-unavailable")) return "marketplace-unavailable";
+	if (reasons.includes("plugin-unavailable")) return "plugin-unavailable";
+	if (reasons.includes("invalid-response")) return "invalid-response";
+	return "codex-unavailable";
+}
+function timeoutFor(launcher, operation) {
+	return operation === "list" && isPackageLauncher(launcher) ? CODEX_PACKAGE_BOOTSTRAP_TIMEOUT_MS : CODEX_PLUGIN_OPERATIONAL_TIMEOUT_MS;
+}
+function isPackageLauncher(launcher) {
+	return launcher.source === "bunx" || launcher.source === "npm-exec" || launcher.source === "pnpm-exec";
+}
+/** Normalizes supported flat and marketplace-oriented Codex catalogs. */
+function parsePluginCatalog(input) {
+	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);
+	if (!isRecord(value)) return void 0;
+	if ("installed" in value || "available" in value) {
+		if (!Array.isArray(value.installed) || !Array.isArray(value.available)) return void 0;
+		const installed = parsePluginEntries(value.installed, void 0, true);
+		const available = parsePluginEntries(value.available, void 0, false);
+		return installed === void 0 || available === void 0 ? void 0 : [...installed, ...available];
+	}
+	if ("marketplaces" in value) return Array.isArray(value.marketplaces) ? parseMarketplaceEntries(value.marketplaces) : void 0;
+	if ("plugins" in value) return parseMarketplaceEntry(value);
+}
+function parseMarketplaceEntries(entries) {
+	const plugins = [];
+	for (const entry of entries) {
+		const parsed = parseMarketplaceEntry(entry);
+		if (parsed === void 0) return void 0;
+		plugins.push(...parsed);
+	}
+	return plugins;
+}
+function parseMarketplaceEntry(value) {
+	if (!isRecord(value) || !Array.isArray(value.plugins)) return void 0;
+	const marketplace = stringField(value, [
+		"marketplace",
+		"marketplaceId",
+		"marketplaceName",
+		"id",
+		"name"
+	]);
+	if (marketplace === void 0) return void 0;
+	return parsePluginEntries(value.plugins, marketplace);
+}
+function parsePluginEntries(entries, parentMarketplace, defaultInstalled) {
+	const plugins = [];
+	for (const value of entries) {
+		const plugin = parsePluginEntry(value, parentMarketplace, defaultInstalled);
+		if (plugin === void 0) return void 0;
+		plugins.push(plugin);
+	}
+	return plugins;
+}
+function parsePluginEntry(value, parentMarketplace, defaultInstalled = false) {
+	if (!isRecord(value)) return void 0;
+	const rawId = stringField(value, [
+		"pluginId",
+		"id",
+		"name"
+	]);
+	if (rawId === void 0) return void 0;
+	const marketplace = stringField(value, [
+		"marketplace",
+		"marketplaceId",
+		"marketplaceName"
+	]) ?? parentMarketplace;
+	const id = rawId.includes("@") ? rawId : marketplace === void 0 ? rawId : `${rawId}@${marketplace}`;
+	const state = stringField(value, [
+		"installationState",
+		"installState",
+		"status",
+		"state"
+	]);
+	const policy = isRecord(value.policy) ? stringField(value.policy, ["installation"]) : void 0;
+	return {
+		id,
+		installed: booleanField(value.installed) ?? installedFromState(state ?? policy) ?? defaultInstalled,
+		enabled: booleanField(value.enabled) ?? enabledFromState(state) ?? false
+	};
+}
+function stringField(value, keys) {
+	for (const key of keys) {
+		const candidate = value[key];
+		if (typeof candidate === "string" && candidate.trim() !== "") return candidate.trim();
+	}
+}
+function booleanField(value) {
+	if (typeof value === "boolean") return value;
+	if (typeof value !== "string") return void 0;
+	if (value.toLowerCase() === "true") return true;
+	if (value.toLowerCase() === "false") return false;
+}
+function installedFromState(value) {
+	if (value === void 0) return void 0;
+	const state = value.toLowerCase().replaceAll("-", "_");
 	if ([
-		"404",
-		"PLUGIN_NOT_FOUND",
-		"PLUGIN_UNAVAILABLE"
-	].includes(code)) return "plugin-unavailable";
+		"installed",
+		"enabled",
+		"disabled",
+		"installed_by_default"
+	].includes(state)) return true;
 	if ([
-		"403",
-		"INSTALLATION_REJECTED",
-		"PERMISSION_DENIED",
-		"POLICY_REJECTED",
-		"ACCOUNT_RESTRICTED"
-	].includes(code)) return "installation-rejected";
-	return "invalid-response";
+		"available",
+		"not_installed",
+		"uninstalled",
+		"not_available"
+	].includes(state)) return false;
+}
+function enabledFromState(value) {
+	if (value === void 0) return void 0;
+	const state = value.toLowerCase();
+	if (state === "enabled") return true;
+	if (state === "disabled") return false;
+}
+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;
-	const nested = value.error;
-	if (nested !== void 0) {
-		const nestedCode = structuredErrorCode(nested);
+	if (value.error !== void 0) {
+		const nestedCode = structuredErrorCode(value.error);
 		if (nestedCode !== void 0) return nestedCode;
 	}
 	for (const key of [
@@ -5612,34 +6224,43 @@ function structuredErrorCode(value) {
 		if (typeof candidate === "string" || typeof candidate === "number") return String(candidate).trim().toUpperCase();
 	}
 }
-function parseJson(input, schema) {
-	const value = parseUnknownJson(input);
-	if (value === void 0) return void 0;
-	const parsed = schema.safeParse(value);
-	return parsed.success ? parsed.data : void 0;
-}
-function parseUnknownJson(input) {
-	try {
-		return JSON.parse(input);
-	} catch {
-		return;
-	}
+function sanitizeDiagnostic(input) {
+	return input.replaceAll(/(?:[A-Za-z]:)?[\\/][^\s"']+/g, "<path>").replaceAll(/(token|secret|password|authorization)\s*[:=]\s*[^\s,}]+/gi, "$1=<redacted>").slice(0, 2048);
 }
 function isRecord(value) {
 	return typeof value === "object" && value !== null;
 }
-function isUnavailableProcessError(value) {
-	if (!isRecord(value)) return false;
-	return [
-		"EACCES",
-		"ENOENT",
-		"EPERM"
-	].includes(String(value.code).toUpperCase());
-}
-function skipped(reason) {
+function isUnavailableProcessError(result) {
+	if (result.errorCode !== void 0 && SPAWN_UNAVAILABLE_CODES.has(result.errorCode.toUpperCase())) return true;
+	const error = result.error?.toUpperCase() ?? "";
+	return [...SPAWN_UNAVAILABLE_CODES].some((code) => new RegExp(`(?:^|\\s)${code}(?:$|\\s)`).test(error));
+}
+function isUnavailableThrownError(value) {
+	const code = thrownErrorCode(value);
+	return code !== void 0 && SPAWN_UNAVAILABLE_CODES.has(code.toUpperCase());
+}
+function isBootstrapThrownError(value) {
+	const code = thrownErrorCode(value)?.toUpperCase();
+	if (code !== void 0 && [
+		"ETIMEDOUT",
+		"ECONNRESET",
+		"ECONNREFUSED",
+		"EAI_AGAIN",
+		"ENETUNREACH"
+	].includes(code)) return true;
+	if (!(value instanceof Error)) return false;
+	return /bootstrap|network|download|fetch|timeout|timed out/i.test(value.message);
+}
+function thrownErrorCode(value) {
+	if (typeof value !== "object" || value === null || !("code" in value)) return void 0;
+	const code = value.code;
+	return typeof code === "string" ? code : void 0;
+}
+function skipped(reason, attemptedLaunchers) {
 	return {
 		status: "skipped",
-		reason
+		reason,
+		attemptedLaunchers: [...attemptedLaunchers]
 	};
 }
 //#endregion
@@ -5778,6 +6399,7 @@ var AGENT_MANAGED_KEYS = /* @__PURE__ */ new Set([
 	"service_tier"
 ]);
 var AGENT_BUNDLED_KEYS = /* @__PURE__ */ new Set(["description", "developer_instructions"]);
+var COMPACT_WINDOWS_SHELL_POLICY = /^On native Windows, resolve `mcp__git_bash__run` before shell use;[^\r\n]*never use PowerShell\/cmd\.\r?\n\r?\n/m;
 async function readAgentPreferences(root, previousPlan) {
 	const preferences = {};
 	await Promise.all(AGENTS.map(async (agent) => {
@@ -5859,7 +6481,7 @@ async function writeInstalledAgents(root, platform, plan, fastMode) {
 			await atomicWrite(path, source);
 			return;
 		}
-		await atomicWrite(path, source.replace(`${WINDOWS_SHELL_POLICY}\r\n\r\n`, "").replace(`${WINDOWS_SHELL_POLICY}\n\n`, ""));
+		await atomicWrite(path, source.replace(`${WINDOWS_SHELL_POLICY}\r\n\r\n`, "").replace(`${WINDOWS_SHELL_POLICY}\n\n`, "").replace(COMPACT_WINDOWS_SHELL_POLICY, ""));
 	}));
 }
 /** Provides cleanup. */
@@ -5958,8 +6580,22 @@ function renderCodexSecurity(result) {
 	if (result.codexSecurity.status === "installed") return "\n  Installed official Codex Security plugin.";
 	if (result.codexSecurity.status === "enabled") return "\n  Enabled existing official Codex Security plugin.";
 	if (result.codexSecurity.status === "already-installed") return "\n  Official Codex Security plugin is already installed and enabled.";
-	return `\n  Skipped official Codex Security plugin: ${result.codexSecurity.reason}.`;
-}
+	return `\n  Skipped official Codex Security plugin: ${CODEX_SECURITY_SKIP_MESSAGES[result.codexSecurity.reason]}`;
+}
+var CODEX_SECURITY_SKIP_MESSAGES = {
+	"codex-unavailable": "no usable Codex launcher was found.",
+	unauthenticated: "Codex authentication is required.",
+	"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.",
+	unsupported: "the available Codex launchers do not support plugin installation.",
+	"download-failed": "the latest Codex package could not be downloaded."
+};
 /** Renders notice. */
 function renderNotice(kind, message, color) {
 	return `${paint(color, kind === "warning" ? RED : YELLOW, `! ${kind === "warning" ? "WARNING" : "NOTICE"}`)}  ${message}\n`;
@@ -6012,8 +6648,18 @@ async function main() {
 		process$1.exitCode = 1;
 		return;
 	}
+	const autonomy = args.includes("--dangerous-codex-autonomous") ? {
+		requested: true,
+		mode: "dangerous"
+	} : args.includes("--codex-autonomous") ? {
+		requested: true,
+		mode: "autonomous"
+	} : args.includes("--no-codex-autonomous") ? {
+		requested: true,
+		mode: "default"
+	} : { requested: false };
 	const options = {
-		autonomy: args.includes("--dangerous-codex-autonomous") ? "dangerous" : args.includes("--codex-autonomous") ? "autonomous" : "default",
+		autonomy,
 		json: args.includes("--json"),
 		fast: args.includes("--fast-all") ? "fast-all" : args.includes("--fast") ? "fast" : "standard",
 		plan,
@@ -6025,7 +6671,7 @@ async function main() {
 		if (!result.healthy) process$1.exitCode = 1;
 		return;
 	}
-	if (options.autonomy === "dangerous") process$1.stderr.write(renderNotice("warning", "Dangerous autonomy disables approvals and filesystem sandboxing.", stderrColor));
+	if (autonomy.requested && autonomy.mode === "dangerous") process$1.stderr.write(renderNotice("warning", "Dangerous autonomy disables approvals and filesystem sandboxing.", stderrColor));
 	const result = command === "install" ? await install(options) : command === "cleanup" ? await cleanup(options) : void 0;
 	if (result === void 0) {
 		process$1.stderr.write(renderError(`Unknown command: ${command ?? args[0] ?? ""}`, stderrColor));