@codex-app-sdk/backend 0.15.1 → 0.16.1

package/dist/index.js

@@ -949,19 +949,374 @@ function Tt(e) {
 	return t.href;
 }
 //#endregion
+//#region src/node/codex-file-attachment.ts
+var Et = "<attached_file>\n", Dt = "\n</attached_file>";
+function Ot(e, t) {
+	return {
+		type: "text",
+		text: `${Et}${JSON.stringify({
+			name: e,
+			path: t
+		}).replaceAll("<", "\\u003c")}${Dt}`,
+		text_elements: []
+	};
+}
+function kt(e) {
+	if (!e.startsWith(Et) || !e.endsWith(Dt)) return null;
+	try {
+		let t = JSON.parse(e.slice(16, -17));
+		if (typeof t != "object" || !t || Array.isArray(t)) return null;
+		let n = t;
+		return typeof n.name == "string" && typeof n.path == "string" && n.path.length > 0 ? {
+			name: n.name,
+			path: n.path
+		} : null;
+	} catch {
+		return null;
+	}
+}
+//#endregion
+//#region src/node/codex-surface-settings.ts
+function k(e, t) {
+	return e.find((e) => e.id === t || e.model === t) ?? e.find((e) => e.isDefault) ?? e[0] ?? null;
+}
+function At(e, t) {
+	let n = e.find((e) => e.id === t || e.model === t);
+	if (!n) throw Error(`Unknown model '${t}'`);
+	return n;
+}
+function jt(e, t) {
+	if (!t) return;
+	if (!e) throw Error(`Cannot select reasoning effort '${t}' without a model`);
+	let n = e.supportedReasoningEfforts?.map((e) => e.reasoningEffort) ?? [];
+	if (n.length > 0 && !n.includes(t)) throw Error(`Reasoning effort '${t}' is not available for '${e.displayName}'`);
+}
+function A(e) {
+	return e.defaultReasoningEffort ?? e.supportedReasoningEfforts?.[0]?.reasoningEffort ?? null;
+}
+function Mt(e) {
+	return e.defaultServiceTier ?? null;
+}
+function j(e, t) {
+	if (!t) return;
+	if (!e) throw Error(`Cannot select service tier '${t}' without a model`);
+	if (t === "default" || t === e.defaultServiceTier) return;
+	let n = e.serviceTiers?.map((e) => e.id) ?? [];
+	if (n.length > 0 && !n.includes(t)) throw Error(`Service tier '${t}' is not available for '${e.displayName}'`);
+}
+function Nt(e, t) {
+	let n = new Set(e.filter((e) => e.allowed).map((e) => e.id)), r = [];
+	return n.has(":workspace") && M(t?.allowedApprovalPolicies, "on-request") && M(t?.allowedApprovalsReviewers, "user") && r.push("ask-for-approval"), n.has(":workspace") && M(t?.allowedApprovalPolicies, "on-request") && M(t?.allowedApprovalsReviewers, "auto_review") && r.push("approve-for-me"), (n.has(":danger-full-access") || n.has(":danger-no-sandbox")) && M(t?.allowedApprovalPolicies, "never") && M(t?.allowedApprovalsReviewers, "user") && r.push("full-access"), r;
+}
+function M(e, t) {
+	return !Array.isArray(e) || e.length === 0 || e.includes(t);
+}
+function Pt(e) {
+	return e === "full-access" ? {
+		approvalPolicy: "never",
+		approvalsReviewer: "user",
+		permissions: ":danger-full-access"
+	} : {
+		approvalPolicy: "on-request",
+		approvalsReviewer: e === "approve-for-me" ? "auto_review" : "user",
+		permissions: ":workspace"
+	};
+}
+function Ft(e) {
+	return Pt(e);
+}
+function It(e, t, n, r) {
+	let i = r?.id;
+	return e === "never" && (n.type === "dangerFullAccess" || i === ":danger-full-access" || i === ":danger-no-sandbox") ? "full-access" : e === "on-request" && (t === "auto_review" || t === "guardian_subagent") ? "approve-for-me" : e === "on-request" ? "ask-for-approval" : null;
+}
+function Lt(e, t, n) {
+	let r = k(t, e.model);
+	return {
+		approvalPreset: It(e.approvalPolicy, e.approvalsReviewer, e.sandbox, e.activePermissionProfile) ?? n.approvalPreset,
+		planMode: n.planMode,
+		selectedModelId: r?.id ?? n.selectedModelId,
+		selectedReasoningEffort: e.reasoningEffort ?? (r ? A(r) : null),
+		selectedServiceTier: e.serviceTier === void 0 ? r ? Mt(r) : null : e.serviceTier
+	};
+}
+function Rt(e, t, n) {
+	let r = k(t, e.model);
+	return {
+		approvalPreset: It(e.approvalPolicy, e.approvalsReviewer, e.sandboxPolicy, e.activePermissionProfile) ?? n.approvalPreset,
+		planMode: e.collaborationMode.mode === "plan",
+		selectedModelId: r?.id ?? n.selectedModelId,
+		selectedReasoningEffort: e.effort ?? (r ? A(r) : null),
+		selectedServiceTier: e.serviceTier === void 0 ? r ? Mt(r) : null : e.serviceTier
+	};
+}
+function zt(e, t) {
+	let n = k(e.models, e.selectedModelId);
+	if (t.modelId && (n = e.models.find((e) => e.id === t.modelId) ?? null, !n)) throw Error(`Unknown model '${t.modelId}'`);
+	let r = t.reasoningEffort ?? e.selectedReasoningEffort, i = t.serviceTier === void 0 ? e.selectedServiceTier ?? null : t.serviceTier, a = n?.supportedReasoningEfforts?.map((e) => e.reasoningEffort) ?? [];
+	if (t.reasoningEffort && a.length > 0 && !a.includes(t.reasoningEffort)) throw Error(`Reasoning effort '${t.reasoningEffort}' is not available for '${n.displayName}'`);
+	return t.modelId && a.length > 0 && (!r || !a.includes(r)) && (r = n ? A(n) : null), t.serviceTier !== void 0 && j(n, i), t.serviceTier === void 0 && t.modelId && i && !n.serviceTiers?.some((e) => e.id === i) && (i = n ? Mt(n) : null), {
+		approvalPreset: t.approvalPreset ?? e.approvalPreset,
+		planMode: t.planMode ?? e.planMode,
+		selectedModelId: n?.id ?? null,
+		selectedReasoningEffort: r,
+		selectedServiceTier: i
+	};
+}
+function Bt(e, t, n) {
+	return {
+		mode: e ? "plan" : "default",
+		settings: {
+			model: t,
+			reasoning_effort: n,
+			developer_instructions: null
+		}
+	};
+}
+function Vt(e, t) {
+	let n = k(e.models, e.selectedModelId), r = t.model ?? n?.model, i = t.reasoningEffort ?? e.selectedReasoningEffort, a = t.planMode ?? e.planMode;
+	return {
+		...r ? { model: r } : {},
+		...i ? { effort: i } : {},
+		...r ? { collaborationMode: Bt(a, r, i) } : {},
+		...t.serviceTier === void 0 ? e.selectedServiceTier ? { serviceTier: e.selectedServiceTier } : {} : { serviceTier: t.serviceTier }
+	};
+}
+//#endregion
+//#region src/node/codex-surface-data.ts
+function N(e) {
+	let t = e.preview.trim(), n = t.split("\n")[0];
+	return {
+		id: e.id,
+		...e.sessionId ? { sessionId: e.sessionId } : {},
+		...e.parentThreadId ? { parentConversationId: e.parentThreadId } : {},
+		...e.agentNickname ? { agentNickname: e.agentNickname } : {},
+		...e.agentRole ? { agentRole: e.agentRole } : {},
+		title: e.name?.trim() || n.trim() || "Untitled conversation",
+		preview: t,
+		cwd: e.cwd,
+		status: e.status.type === "active" ? "active" : e.status.type === "systemError" ? "error" : "idle",
+		turnCount: e.turns.length,
+		createdAt: (/* @__PURE__ */ new Date(e.createdAt * 1e3)).toISOString(),
+		updatedAt: (/* @__PURE__ */ new Date((e.recencyAt ?? e.updatedAt) * 1e3)).toISOString()
+	};
+}
+function Ht(e, t) {
+	let n = new Map(e.map((e) => [e.id, e])), r = t.map((e) => {
+		let t = n.get(e.id);
+		return t && ie(t, e) ? t : e;
+	});
+	return r.length === e.length && r.every((t, n) => t === e[n]) ? e : r;
+}
+function P(e, t) {
+	return [t, ...e.filter((e) => e.id !== t.id)].sort((e, t) => t.updatedAt.localeCompare(e.updatedAt));
+}
+function Ut(e, t) {
+	let n = t.model ? At(e.models, t.model) : k(e.models, e.selectedModelId);
+	return jt(n, t.reasoningEffort), j(n, t.serviceTier), {
+		...t,
+		...t.attachments ? { attachments: Wt(t.attachments) } : {},
+		...t.model && n ? { model: n.model } : {}
+	};
+}
+function Wt(e) {
+	return e.map((e) => {
+		let t = e.path.trim();
+		if (!t) throw Error("Attachment paths cannot be empty");
+		if (!v(t)) throw Error(`Attachment path must be absolute: '${t}'`);
+		if (e.type === "image") return {
+			...e,
+			path: t
+		};
+		let n = e.name?.trim();
+		return {
+			...e,
+			path: t,
+			...n ? { name: n } : {}
+		};
+	});
+}
+function Gt(e) {
+	return e.type === "image" ? {
+		type: "localImage",
+		path: e.path,
+		...e.detail === void 0 ? {} : { detail: e.detail }
+	} : Ot(e.name ?? g(e.path), e.path);
+}
+function Kt(e) {
+	let t = e.name?.trim() || g(e.path);
+	return e.type === "image" ? {
+		type: "attachment",
+		attachment: {
+			kind: "image",
+			name: t,
+			path: e.path,
+			url: e.previewUrl ?? re(e.path).href,
+			...e.mimeType ? { mimeType: e.mimeType } : {}
+		}
+	} : {
+		type: "attachment",
+		attachment: {
+			kind: "file",
+			name: t,
+			path: e.path,
+			...e.mimeType ? { mimeType: e.mimeType } : {}
+		}
+	};
+}
+function qt(e) {
+	let t = e.metadata?.turnId;
+	return e.turnId ?? (typeof t == "string" ? t : null);
+}
+function Jt(e) {
+	return e.parts.filter((e) => e.type === "text").map((e) => e.text).join("\n").trim();
+}
+function Yt(e) {
+	return e.parts.flatMap((e) => {
+		if (e.type !== "attachment") return [];
+		let t = e.attachment, n = t.path;
+		return n ? t.kind === "image" ? [{
+			type: "image",
+			path: n,
+			name: t.name,
+			...t.mimeType ? { mimeType: t.mimeType } : {},
+			...t.url?.startsWith("data:image/") ? { previewUrl: t.url } : {}
+		}] : [{
+			type: "file",
+			path: n,
+			name: t.name,
+			...t.mimeType ? { mimeType: t.mimeType } : {}
+		}] : [];
+	});
+}
+function Xt(e) {
+	return {
+		totalTokens: e.totalTokens,
+		inputTokens: e.inputTokens,
+		cachedInputTokens: e.cachedInputTokens,
+		cacheWriteInputTokens: e.cacheWriteInputTokens ?? null,
+		outputTokens: e.outputTokens,
+		reasoningOutputTokens: e.reasoningOutputTokens
+	};
+}
+function Zt(e) {
+	let t = e.modelContextWindow, n = e.last.totalTokens, r = typeof t == "number" && t > 0 ? Math.min(100, Math.max(0, n / t * 100)) : null;
+	return {
+		totalTokens: e.total.totalTokens,
+		inputTokens: e.total.inputTokens,
+		cachedInputTokens: e.total.cachedInputTokens,
+		outputTokens: e.total.outputTokens,
+		reasoningOutputTokens: e.total.reasoningOutputTokens,
+		lastTotalTokens: e.last.totalTokens,
+		modelContextWindow: t,
+		usedPercent: r
+	};
+}
+function F(e) {
+	return e.type === "active" ? {
+		type: "active",
+		activeFlags: [...e.activeFlags]
+	} : { type: e.type };
+}
+function Qt(e) {
+	return e.type === "active" ? "active" : e.type === "systemError" ? "error" : "idle";
+}
+function $t(e) {
+	let t = e.rateLimitsByLimitId ? Object.fromEntries(Object.entries(e.rateLimitsByLimitId).filter((e) => !!e[1]).map(([e, t]) => [e, nn(t)])) : null;
+	return {
+		rateLimits: nn(e.rateLimits),
+		rateLimitsByLimitId: t,
+		rateLimitResetCredits: e.rateLimitResetCredits ? {
+			availableCount: en(e.rateLimitResetCredits.availableCount),
+			credits: e.rateLimitResetCredits.credits?.map((e) => ({ ...e })) ?? null
+		} : null
+	};
+}
+function en(e) {
+	if (typeof e == "bigint" && e >= 0n) return e.toString();
+	if (typeof e == "number" && Number.isSafeInteger(e) && e >= 0) return String(e);
+	if (typeof e == "string" && /^(0|[1-9][0-9]*)$/.test(e)) return e;
+	throw Error("Invalid account count: expected an exact nonnegative integer");
+}
+function tn(e) {
+	let t = (e) => e === null ? null : en(e);
+	return {
+		summary: {
+			lifetimeTokens: t(e.summary.lifetimeTokens),
+			peakDailyTokens: t(e.summary.peakDailyTokens),
+			longestRunningTurnSec: t(e.summary.longestRunningTurnSec),
+			currentStreakDays: t(e.summary.currentStreakDays),
+			longestStreakDays: t(e.summary.longestStreakDays)
+		},
+		dailyUsageBuckets: e.dailyUsageBuckets?.map((e) => ({
+			startDate: e.startDate,
+			tokens: en(e.tokens)
+		})) ?? null
+	};
+}
+function nn(e) {
+	return {
+		limitId: e.limitId,
+		limitName: e.limitName,
+		primary: e.primary ? { ...e.primary } : null,
+		secondary: e.secondary ? { ...e.secondary } : null,
+		credits: e.credits ? { ...e.credits } : null,
+		individualLimit: e.individualLimit ? { ...e.individualLimit } : null,
+		planType: e.planType,
+		rateLimitReachedType: e.rateLimitReachedType
+	};
+}
+function rn(e, t) {
+	let n = nn(t);
+	if (!e) return {
+		rateLimits: n,
+		rateLimitsByLimitId: n.limitId ? { [n.limitId]: n } : null,
+		rateLimitResetCredits: null
+	};
+	let r = an(e.rateLimits, n), i = e.rateLimitsByLimitId ? { ...e.rateLimitsByLimitId } : {};
+	return r.limitId && (i[r.limitId] = an(i[r.limitId] ?? r, n)), {
+		...e,
+		rateLimits: r,
+		rateLimitsByLimitId: Object.keys(i).length > 0 ? i : null
+	};
+}
+function an(e, t) {
+	return {
+		limitId: t.limitId ?? e.limitId,
+		limitName: t.limitName ?? e.limitName,
+		primary: t.primary ? {
+			...e.primary ?? {},
+			...t.primary
+		} : e.primary,
+		secondary: t.secondary ? {
+			...e.secondary ?? {},
+			...t.secondary
+		} : e.secondary,
+		credits: t.credits ? {
+			...e.credits ?? {},
+			...t.credits
+		} : e.credits,
+		individualLimit: t.individualLimit ? {
+			...e.individualLimit ?? {},
+			...t.individualLimit
+		} : e.individualLimit,
+		planType: t.planType ?? e.planType,
+		rateLimitReachedType: t.rateLimitReachedType ?? e.rateLimitReachedType
+	};
+}
+//#endregion
 //#region src/node/codex-surface-transport-options.ts
-function Et(e) {
+function on(e) {
 	return "type" in e && e.type === "unixSocket";
 }
-function Dt(e) {
-	let t = e.codexHome === void 0 ? void 0 : Ot(e.codexHome), n = e.transport?.codexHome;
+function sn(e) {
+	let t = e.codexHome === void 0 ? void 0 : cn(e.codexHome), n = e.transport?.codexHome;
 	if (t !== void 0 && n !== void 0 && t !== n) throw Error("Codex surface codexHome conflicts with transport.codexHome");
 	return {
 		...e.transport ?? {},
 		...t === void 0 ? {} : { codexHome: t }
 	};
 }
-function Ot(e) {
+function cn(e) {
 	let t = e.trim();
 	if (!t) throw Error("Codex surface codexHome cannot be empty");
 	if (!v(t)) throw Error("Codex surface codexHome must be an absolute path");
@@ -969,7 +1324,7 @@ function Ot(e) {
 }
 //#endregion
 //#region src/node/codex-surface-authentication-controller.ts
-var kt = class {
+var ln = class {
 	client;
 	host;
 	accountRefreshPromise = null;
@@ -1153,7 +1508,7 @@ var kt = class {
 };
 //#endregion
 //#region src/node/codex-conversation-handle.ts
-function At(e, t) {
+function un(e, t) {
 	let n = async (e) => (await e(), t.getSnapshot());
 	return {
 		id: e,
@@ -1193,64 +1548,37 @@ function At(e, t) {
 	};
 }
 //#endregion
-//#region src/node/codex-file-attachment.ts
-var jt = "<attached_file>\n", Mt = "\n</attached_file>";
-function Nt(e, t) {
-	return {
-		type: "text",
-		text: `${jt}${JSON.stringify({
-			name: e,
-			path: t
-		}).replaceAll("<", "\\u003c")}${Mt}`,
-		text_elements: []
-	};
-}
-function Pt(e) {
-	if (!e.startsWith(jt) || !e.endsWith(Mt)) return null;
-	try {
-		let t = JSON.parse(e.slice(16, -17));
-		if (typeof t != "object" || !t || Array.isArray(t)) return null;
-		let n = t;
-		return typeof n.name == "string" && typeof n.path == "string" && n.path.length > 0 ? {
-			name: n.name,
-			path: n.path
-		} : null;
-	} catch {
-		return null;
-	}
-}
-//#endregion
 //#region src/node/tool-output.ts
-var Ft = "Result returned in structuredContent.";
-function k(e) {
+var dn = "Result returned in structuredContent.";
+function I(e) {
 	if (typeof e == "string") return e;
-	if (Array.isArray(e)) return e.map((e) => k(e)).filter(Boolean).join("\n\n") || void 0;
-	if (!Lt(e)) return JSON.stringify(e);
-	let t = "structuredContent" in e ? k(e.structuredContent) : void 0;
+	if (Array.isArray(e)) return e.map((e) => I(e)).filter(Boolean).join("\n\n") || void 0;
+	if (!pn(e)) return JSON.stringify(e);
+	let t = "structuredContent" in e ? I(e.structuredContent) : void 0;
 	if (t) {
-		let n = It(e);
-		return !n || n.trim() === Ft ? t : `${n}\n\n${t}`;
+		let n = fn(e);
+		return !n || n.trim() === dn ? t : `${n}\n\n${t}`;
 	}
-	return It(e) ?? JSON.stringify(e);
+	return fn(e) ?? JSON.stringify(e);
 }
-function It(e) {
+function fn(e) {
 	if (typeof e.text == "string") return e.text;
 	if (typeof e.content == "string") return e.content;
-	if (Array.isArray(e.content)) return k(e.content);
+	if (Array.isArray(e.content)) return I(e.content);
 }
-function Lt(e) {
+function pn(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
 //#endregion
 //#region src/node/codex-tool-part-adapter.ts
-var Rt = "Result returned in structuredContent.", zt = 32 * 1024;
-function Bt(e, t) {
+var mn = "Result returned in structuredContent.", hn = 32 * 1024;
+function gn(e, t) {
 	let n = e.status;
 	if (e.kind === "command") {
-		let r = P(e.input) ? e.input : {}, i = typeof r.cwd == "string" ? r.cwd : t ?? void 0;
-		return Yt(r.commandActions).flatMap((e) => {
+		let r = V(e.input) ? e.input : {}, i = typeof r.cwd == "string" ? r.cwd : t ?? void 0;
+		return Tn(r.commandActions).flatMap((e) => {
 			if (e.type !== "read") return [];
-			let t = cn(e.path ?? e.name, i);
+			let t = Ln(e.path ?? e.name, i);
 			return t ? [{
 				action: "read",
 				path: t,
@@ -1259,12 +1587,12 @@ function Bt(e, t) {
 		});
 	}
 	if (e.kind !== "fileChange") return [];
-	let r = P(e.input) ? e.input : {}, i = e.metadata ?? {};
+	let r = V(e.input) ? e.input : {}, i = e.metadata ?? {};
 	return (Array.isArray(i.changes) ? i.changes : Array.isArray(r.changes) ? r.changes : []).flatMap((e) => {
-		if (!P(e) || typeof e.path != "string") return [];
-		let r = N(e.kind);
+		if (!V(e) || typeof e.path != "string") return [];
+		let r = B(e.kind);
 		if (r === "delete") return [];
-		let i = cn(e.path, t ?? void 0);
+		let i = Ln(e.path, t ?? void 0);
 		return i ? [{
 			action: r === "add" ? "create" : "edit",
 			path: i,
@@ -1272,10 +1600,10 @@ function Bt(e, t) {
 		}] : [];
 	});
 }
-function A(e, t = {}) {
-	if (!P(e) || typeof e.id != "string") return null;
+function L(e, t = {}) {
+	if (!V(e) || typeof e.id != "string") return null;
 	if (e.type === "commandExecution") {
-		let n = typeof e.command == "string" ? e.command : "command", r = j(e.status), i = Kt(r, e.commandActions, n), a = t.includeCommandOutput && typeof e.aggregatedOutput == "string" ? e.aggregatedOutput : void 0;
+		let n = typeof e.command == "string" ? e.command : "command", r = R(e.status), i = Sn(r, e.commandActions, n), a = t.includeCommandOutput && typeof e.aggregatedOutput == "string" ? e.aggregatedOutput : void 0;
 		return {
 			type: "tool",
 			id: e.id,
@@ -1300,14 +1628,14 @@ function A(e, t = {}) {
 		};
 	}
 	if (e.type === "mcpToolCall") {
-		let t = typeof e.server == "string" ? e.server : "mcp", n = typeof e.tool == "string" ? e.tool : "tool", r = gn(dn(e.error)), i = F(e.arguments), a = F(e.result);
+		let t = typeof e.server == "string" ? e.server : "mcp", n = typeof e.tool == "string" ? e.tool : "tool", r = Gn(Bn(e.error)), i = H(e.arguments), a = H(e.result);
 		return {
 			type: "tool",
 			id: e.id,
 			kind: "mcp",
 			title: `${t}.${n}`,
-			status: j(e.status),
-			body: r ?? gn(fn(a)),
+			status: R(e.status),
+			body: r ?? Gn(Vn(a)),
 			...i === void 0 ? {} : { input: i },
 			...a === void 0 ? {} : { output: a },
 			metadata: {
@@ -1320,14 +1648,14 @@ function A(e, t = {}) {
 		};
 	}
 	if (e.type === "dynamicToolCall") {
-		let t = typeof e.tool == "string" ? e.tool : "tool", n = typeof e.namespace == "string" ? e.namespace : null, r = F(e.arguments), i = F(e.contentItems);
+		let t = typeof e.tool == "string" ? e.tool : "tool", n = typeof e.namespace == "string" ? e.namespace : null, r = H(e.arguments), i = H(e.contentItems);
 		return {
 			type: "tool",
 			id: e.id,
 			kind: "dynamic",
 			title: n ? `${n}.${t}` : t,
-			status: j(e.status),
-			body: gn(mn(i)),
+			status: R(e.status),
+			body: Gn(Un(i)),
 			...r === void 0 ? {} : { input: r },
 			...i === void 0 ? {} : { output: i },
 			metadata: {
@@ -1339,7 +1667,7 @@ function A(e, t = {}) {
 		};
 	}
 	if (e.type === "fileChange") {
-		let n = Array.isArray(e.changes) ? e.changes : [], r = j(e.status), i = nn(r, n);
+		let n = Array.isArray(e.changes) ? e.changes : [], r = R(e.status), i = Mn(r, n);
 		return {
 			type: "tool",
 			id: e.id,
@@ -1347,7 +1675,7 @@ function A(e, t = {}) {
 			title: n.length === 1 ? "1 file change" : `${n.length} file changes`,
 			status: r,
 			...i ? { statusText: i } : {},
-			body: hn(n),
+			body: Wn(n),
 			input: { changes: n },
 			metadata: {
 				changes: n,
@@ -1376,19 +1704,19 @@ function A(e, t = {}) {
 		id: e.id,
 		kind: "dynamic",
 		title: "image_generation",
-		status: j(e.status),
+		status: R(e.status),
 		body: typeof e.revisedPrompt == "string" ? e.revisedPrompt : void 0,
 		input: { revisedPrompt: e.revisedPrompt },
 		output: e.savedPath,
 		metadata: { savedPath: e.savedPath }
 	} : null;
 }
-function Vt(e) {
-	if (!P(e) || e.type !== "commandExecution" || typeof e.command != "string") return !1;
+function _n(e) {
+	if (!V(e) || e.type !== "commandExecution" || typeof e.command != "string") return !1;
 	let t = e.command;
-	return Xt(t) || Zt(t) || Qt(t);
+	return En(t) || Dn(t) || On(t);
 }
-function Ht(e, t) {
+function vn(e, t) {
 	return {
 		itemId: e,
 		bodyDelta: t,
@@ -1401,11 +1729,11 @@ function Ht(e, t) {
 		}
 	};
 }
-function Ut(e, t) {
-	let n = nn("running", t);
+function yn(e, t) {
+	let n = Mn("running", t);
 	return {
 		itemId: e,
-		body: hn(t),
+		body: Wn(t),
 		...n ? { statusText: n } : {},
 		input: { changes: t },
 		metadata: { changes: t },
@@ -1416,13 +1744,13 @@ function Ut(e, t) {
 			title: t.length === 1 ? "1 file change" : `${t.length} file changes`,
 			status: "running",
 			...n ? { statusText: n } : {},
-			body: hn(t),
+			body: Wn(t),
 			input: { changes: t },
 			metadata: { changes: t }
 		}
 	};
 }
-function Wt(e, t) {
+function bn(e, t) {
 	return {
 		itemId: e,
 		bodyAppend: t,
@@ -1435,12 +1763,12 @@ function Wt(e, t) {
 		}
 	};
 }
-function Gt(e, t, n, r = "completed") {
-	let i = F(t), a = gn(k(i));
+function xn(e, t, n, r = "completed") {
+	let i = H(t), a = Gn(I(i));
 	return {
 		itemId: e,
 		title: n && n.trim() ? n : void 0,
-		status: j(r),
+		status: R(r),
 		body: a,
 		...i === void 0 ? {} : { output: i },
 		fallbackToolPart: {
@@ -1448,21 +1776,21 @@ function Gt(e, t, n, r = "completed") {
 			id: e,
 			kind: "generic",
 			title: n && n.trim() ? n : "Tool output",
-			status: j(r),
+			status: R(r),
 			body: a,
 			...i === void 0 ? {} : { output: i }
 		}
 	};
 }
-function j(e) {
+function R(e) {
 	return e === "completed" || e === "succeeded" || e === "success" ? "completed" : e === "failed" || e === "error" || e === "declined" || e === "incomplete" || e === "canceled" || e === "cancelled" ? "failed" : "running";
 }
-function Kt(e, t, n) {
-	let r = qt(e, t, n);
+function Sn(e, t, n) {
+	let r = Cn(e, t, n);
 	return r ? JSON.stringify(r) : void 0;
 }
-function qt(e, t, n) {
-	let r = Yt(t), i = new Set(r.map((e) => e.type));
+function Cn(e, t, n) {
+	let r = Tn(t), i = new Set(r.map((e) => e.type));
 	if (r.length === 0) return {
 		action: "run",
 		phase: e,
@@ -1470,37 +1798,37 @@ function qt(e, t, n) {
 		source: "codex"
 	};
 	if (i.size === 1 && i.has("read")) {
-		let t = M(r.map((e) => e.name ?? e.path));
+		let t = z(r.map((e) => e.name ?? e.path));
 		return {
 			action: "read",
 			phase: e,
 			params: {
 				names: t,
-				target: en(t, n)
+				target: An(t, n)
 			},
 			source: "codex"
 		};
 	}
 	if (i.size === 1 && i.has("listFiles")) {
-		let t = M(r.map((e) => e.path ?? e.command));
+		let t = z(r.map((e) => e.path ?? e.command));
 		return {
 			action: "list",
 			phase: e,
 			params: {
 				targets: t,
-				target: $t(t, n)
+				target: kn(t, n)
 			},
 			source: "codex"
 		};
 	}
 	if (i.size === 1 && i.has("search")) {
-		let t = M(r.map((e) => e.query && e.path ? `"${e.query}" in ${e.path}` : e.query ?? e.path ?? e.command));
+		let t = z(r.map((e) => e.query && e.path ? `"${e.query}" in ${e.path}` : e.query ?? e.path ?? e.command));
 		return {
 			action: "search",
 			phase: e,
 			params: {
 				targets: t,
-				target: $t(t, n)
+				target: kn(t, n)
 			},
 			source: "codex"
 		};
@@ -1510,16 +1838,16 @@ function qt(e, t, n) {
 		phase: e,
 		params: {
 			actions: r.map((e) => e.type),
-			target: $t(M(r.map(Jt)), n)
+			target: kn(z(r.map(wn)), n)
 		},
 		source: "codex"
 	};
 }
-function Jt(e) {
+function wn(e) {
 	return e.path ?? e.name ?? e.query ?? e.command;
 }
-function Yt(e) {
-	return Array.isArray(e) ? e.flatMap((e) => !P(e) || e.type !== "read" && e.type !== "listFiles" && e.type !== "search" ? [] : [{
+function Tn(e) {
+	return Array.isArray(e) ? e.flatMap((e) => !V(e) || e.type !== "read" && e.type !== "listFiles" && e.type !== "search" ? [] : [{
 		command: typeof e.command == "string" ? e.command : void 0,
 		name: typeof e.name == "string" ? e.name : void 0,
 		path: typeof e.path == "string" ? e.path : void 0,
@@ -1527,35 +1855,35 @@ function Yt(e) {
 		type: e.type
 	}]) : [];
 }
-function Xt(e) {
+function En(e) {
 	return /(?:^|[\s;"'(|&])apply_patch(?:\s|$)/u.test(e);
 }
-function Zt(e) {
+function Dn(e) {
 	return /(?:^|[\s;"'(|&])(?:cat|printf|echo)\b[\s\S]*>>?\s*(?:"[^"]+"|'[^']+'|[^\s;"'&|]+)(?=$|[\s;&|])/u.test(e);
 }
-function Qt(e) {
+function On(e) {
 	return /(?:^|[\s;"'(|&])tee(?:\s+-a)?\s+(?!-)(?:"[^"]+"|'[^']+'|[^\s;"'&|]+)(?=$|[\s;&|])/u.test(e);
 }
-function M(e) {
+function z(e) {
 	return [...new Set(e.map((e) => e?.trim()).filter((e) => !!e))];
 }
-function $t(e, t) {
+function kn(e, t) {
 	return e.length === 0 ? t : e.length <= 3 ? e.join(", ") : `${e.slice(0, 3).join(", ")} and ${e.length - 3} more`;
 }
-function en(e, t) {
-	return tn(e, t);
+function An(e, t) {
+	return jn(e, t);
 }
-function tn(e, t) {
-	return $t(M(e.map(un)), t);
+function jn(e, t) {
+	return kn(z(e.map(zn)), t);
 }
-function nn(e, t) {
-	let n = rn(e, t);
+function Mn(e, t) {
+	let n = Nn(e, t);
 	return n ? JSON.stringify(n) : void 0;
 }
-function rn(e, t) {
+function Nn(e, t) {
 	let n = t.flatMap((e) => {
-		if (!P(e)) return [];
-		let t = typeof e.path == "string" ? e.path : void 0, n = N(e.kind), r = on(e);
+		if (!V(e)) return [];
+		let t = typeof e.path == "string" ? e.path : void 0, n = B(e.kind), r = Fn(e);
 		return [{
 			addedLines: r.addedLines,
 			kind: n,
@@ -1564,9 +1892,9 @@ function rn(e, t) {
 		}];
 	});
 	if (!n.length) return;
-	let r = n.reduce((e, t) => e + t.addedLines, 0), i = n.reduce((e, t) => e + t.removedLines, 0), a = M(n.map((e) => e.path)), o = tn(a, `${n.length} files`);
+	let r = n.reduce((e, t) => e + t.addedLines, 0), i = n.reduce((e, t) => e + t.removedLines, 0), a = z(n.map((e) => e.path)), o = jn(a, `${n.length} files`);
 	return {
-		action: an(n.map((e) => e.kind)),
+		action: Pn(n.map((e) => e.kind)),
 		phase: e,
 		params: {
 			addedLines: r,
@@ -1577,20 +1905,20 @@ function rn(e, t) {
 		source: "codex"
 	};
 }
-function an(e) {
+function Pn(e) {
 	return e.every((e) => e === "add") ? "create" : e.every((e) => e === "delete") ? "delete" : "edit";
 }
-function on(e) {
-	let t = typeof e.diff == "string" ? e.diff : void 0, n = N(e.kind);
+function Fn(e) {
+	let t = typeof e.diff == "string" ? e.diff : void 0, n = B(e.kind);
 	return n === "add" ? {
-		addedLines: ln(t),
+		addedLines: Rn(t),
 		removedLines: 0
 	} : n === "delete" ? {
 		addedLines: 0,
-		removedLines: ln(t)
-	} : sn(t);
+		removedLines: Rn(t)
+	} : In(t);
 }
-function sn(e) {
+function In(e) {
 	if (!e) return {
 		addedLines: 0,
 		removedLines: 0
@@ -1602,54 +1930,54 @@ function sn(e) {
 		removedLines: n
 	};
 }
-function N(e) {
+function B(e) {
 	if (e === "add" || e === "delete") return e;
-	if (P(e) && typeof e.type == "string") return N(e.type);
+	if (V(e) && typeof e.type == "string") return B(e.type);
 }
-function cn(e, t) {
+function Ln(e, t) {
 	let n = e?.trim();
 	if (n) {
 		if (v(n)) return n;
 		if (!(!t || !v(t))) return x(t, n);
 	}
 }
-function ln(e) {
+function Rn(e) {
 	if (!e) return 0;
 	let t = e.split(/\r\n|\r|\n/);
 	for (; t.at(-1) === "";) t.pop();
 	return t.length;
 }
-function un(e) {
+function zn(e) {
 	return e.split(/[\\/]/).filter(Boolean).at(-1) ?? e;
 }
-function dn(e) {
-	if (P(e)) return typeof e.message == "string" ? e.message : void 0;
+function Bn(e) {
+	if (V(e)) return typeof e.message == "string" ? e.message : void 0;
 }
-function fn(e) {
-	if (!P(e)) return;
-	let t = pn(e.content), n = "structuredContent" in e ? k(e.structuredContent) : void 0;
-	return n ? !t || t.trim() === Rt ? n : `${t}\n\n${n}` : t;
+function Vn(e) {
+	if (!V(e)) return;
+	let t = Hn(e.content), n = "structuredContent" in e ? I(e.structuredContent) : void 0;
+	return n ? !t || t.trim() === mn ? n : `${t}\n\n${n}` : t;
 }
-function pn(e) {
-	if (Array.isArray(e)) return e.map((e) => P(e) ? typeof e.text == "string" ? e.text : JSON.stringify(e) : "").filter(Boolean).join("\n\n") || void 0;
+function Hn(e) {
+	if (Array.isArray(e)) return e.map((e) => V(e) ? typeof e.text == "string" ? e.text : JSON.stringify(e) : "").filter(Boolean).join("\n\n") || void 0;
 }
-function mn(e) {
-	if (Array.isArray(e)) return e.map((e) => P(e) && typeof e.text == "string" ? e.text : JSON.stringify(e)).filter(Boolean).join("\n\n") || void 0;
+function Un(e) {
+	if (Array.isArray(e)) return e.map((e) => V(e) && typeof e.text == "string" ? e.text : JSON.stringify(e)).filter(Boolean).join("\n\n") || void 0;
 }
-function hn(e) {
-	return e.map((e) => P(e) ? `${N(e.kind) ?? "update"} ${typeof e.path == "string" ? e.path : "unknown"}` : JSON.stringify(e)).join("\n") || void 0;
+function Wn(e) {
+	return e.map((e) => V(e) ? `${B(e.kind) ?? "update"} ${typeof e.path == "string" ? e.path : "unknown"}` : JSON.stringify(e)).join("\n") || void 0;
 }
-function P(e) {
+function V(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
-function gn(e) {
-	return e !== void 0 && Buffer.byteLength(e) <= zt ? e : void 0;
+function Gn(e) {
+	return e !== void 0 && Buffer.byteLength(e) <= hn ? e : void 0;
 }
-function F(e) {
-	if (!(e === void 0 || !_n(e, zt))) return e;
+function H(e) {
+	if (!(e === void 0 || !Kn(e, hn))) return e;
 }
-function _n(e, t) {
-	if (vn(e, t, /* @__PURE__ */ new Set())) return !1;
+function Kn(e, t) {
+	if (qn(e, t, /* @__PURE__ */ new Set())) return !1;
 	try {
 		let n = JSON.stringify(e);
 		return n !== void 0 && Buffer.byteLength(n) <= t;
@@ -1657,28 +1985,28 @@ function _n(e, t) {
 		return !1;
 	}
 }
-function vn(e, t, n) {
+function qn(e, t, n) {
 	if (typeof e == "string") return Buffer.byteLength(e) > t;
 	if (typeof e != "object" || !e) return !1;
 	if (n.has(e)) return !0;
 	n.add(e);
-	let r = (Array.isArray(e) ? e : Object.values(e)).some((e) => vn(e, t, n));
+	let r = (Array.isArray(e) ? e : Object.values(e)).some((e) => qn(e, t, n));
 	return n.delete(e), r;
 }
 //#endregion
 //#region src/node/codex-surface-message-state.ts
-function yn(e) {
+function Jn(e) {
 	for (let t = e.length - 1; t >= 0; --t) {
 		let n = e[t];
 		if (n?.status === "inProgress") return n.id;
 	}
 	return null;
 }
-function I(e, t, n, r = {}) {
-	let i = [...e], a = z(i, (e) => e.metadata?.turnId === n), o = a >= 0 ? i[a] : void 0;
+function U(e, t, n, r = {}) {
+	let i = [...e], a = K(i, (e) => e.metadata?.turnId === n), o = a >= 0 ? i[a] : void 0;
 	if (o?.role === "assistant" && o.kind === void 0 && o.status === "streaming") return i;
 	if (r.forceSegment) {
-		let e = z(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), t = e >= 0 ? i[e] : void 0;
+		let e = K(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), t = e >= 0 ? i[e] : void 0;
 		t?.parts.length === 0 ? i.splice(e, 1) : t && i.splice(e, 1, {
 			...t,
 			status: "complete"
@@ -1698,9 +2026,9 @@ function I(e, t, n, r = {}) {
 		}
 	}), i;
 }
-function bn(e, t, n, r, i, a) {
+function Yn(e, t, n, r, i, a) {
 	if (!i) return [...e];
-	let o = I(e, t, n), s = z(o, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), c = s >= 0 ? o[s] : void 0;
+	let o = U(e, t, n), s = K(o, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), c = s >= 0 ? o[s] : void 0;
 	if (!c) return o;
 	let l = [...c.parts], u = l.at(-1);
 	return u?.type === "text" && u.itemId === r ? l.splice(l.length - 1, 1, {
@@ -1716,9 +2044,9 @@ function bn(e, t, n, r, i, a) {
 		...c,
 		status: "streaming",
 		parts: l
-	}), R(o, t);
+	}), G(o, t);
 }
-function xn(e, t, n, r, i) {
+function Xn(e, t, n, r, i) {
 	let a = i.map((e, t) => {
 		let n = e.trim();
 		return n ? {
@@ -1729,16 +2057,16 @@ function xn(e, t, n, r, i) {
 		} : null;
 	}).filter((e) => e !== null);
 	if (a.length === 0) return [...e];
-	let o = I(e, t, n), s = z(o, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), c = s >= 0 ? o[s] : void 0;
+	let o = U(e, t, n), s = K(o, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), c = s >= 0 ? o[s] : void 0;
 	if (!c) return o;
 	let l = c.parts.findIndex((e) => e.type === "reasoning" && e.itemId === r), u = c.parts.filter((e) => e.type !== "reasoning" || e.itemId !== r);
 	return u.splice(l >= 0 ? l : u.length, 0, ...a), o.splice(s, 1, {
 		...c,
 		status: "streaming",
 		parts: u
-	}), R(o, t);
+	}), G(o, t);
 }
-function Sn(e, t, n, r, i, a) {
+function Zn(e, t, n, r, i, a) {
 	let o = [...e];
 	for (let e = o.length - 1; e >= 0; --e) {
 		let s = o[e];
@@ -1754,9 +2082,9 @@ function Sn(e, t, n, r, i, a) {
 		}), o.splice(e, 1, {
 			...s,
 			parts: l
-		}), R(o, t);
+		}), G(o, t);
 	}
-	let s = I(o, t, n), c = z(s, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), l = c >= 0 ? s[c] : void 0;
+	let s = U(o, t, n), c = K(s, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), l = c >= 0 ? s[c] : void 0;
 	if (!l) return s;
 	let u = {
 		type: "text",
@@ -1767,10 +2095,10 @@ function Sn(e, t, n, r, i, a) {
 	return s.splice(c, 1, {
 		...l,
 		parts: [...l.parts, u]
-	}), R(s, t);
+	}), G(s, t);
 }
-function Cn(e, t, n, r) {
-	return R(e.map((e) => {
+function Qn(e, t, n, r) {
+	return G(e.map((e) => {
 		if (e.role !== "assistant" || e.metadata?.turnId !== n) return e;
 		let t = e.parts.filter((e) => e.type !== "text" || e.itemId !== r);
 		return t.length === e.parts.length ? e : {
@@ -1779,16 +2107,16 @@ function Cn(e, t, n, r) {
 		};
 	}), t);
 }
-function wn(e) {
+function $n(e) {
 	let t = /<proposed_plan>([\s\S]*?)<\/proposed_plan>/iu.exec(e), n = t?.[1]?.trim() ?? "";
 	return !t || !n ? null : {
 		markdown: n,
 		visibleText: `${e.slice(0, t.index)}${e.slice(t.index + t[0].length)}`.trim()
 	};
 }
-function L(e, t, n, r) {
+function W(e, t, n, r) {
 	let i = [...e], a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "tool" && e.id === r.id));
-	a < 0 && (i = I(i, t, n), a = z(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
+	a < 0 && (i = U(i, t, n), a = K(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
 	let o = a >= 0 ? i[a] : void 0;
 	if (!o) return i;
 	let s = [...o.parts], c = s.findIndex((e) => e.type === "tool" && e.id === r.id);
@@ -1800,7 +2128,7 @@ function L(e, t, n, r) {
 			body: r.body ?? e.body,
 			input: r.input ?? e.input,
 			output: r.output ?? e.output,
-			statusText: r.statusText ?? jn(e.statusText, r.status),
+			statusText: r.statusText ?? or(e.statusText, r.status),
 			metadata: {
 				...e.metadata ?? {},
 				...r.metadata ?? {}
@@ -1810,11 +2138,11 @@ function L(e, t, n, r) {
 	return i.splice(a, 1, {
 		...o,
 		parts: s
-	}), R(i, t);
+	}), G(i, t);
 }
-function Tn(e, t, n, r) {
+function er(e, t, n, r) {
 	let i = [...e], a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "media" && e.itemId === r.itemId));
-	a < 0 && r.itemId && (a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "tool" && e.id === r.itemId))), a < 0 && (i = I(i, t, n), a = z(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
+	a < 0 && r.itemId && (a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "tool" && e.id === r.itemId))), a < 0 && (i = U(i, t, n), a = K(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
 	let o = a >= 0 ? i[a] : void 0;
 	if (!o) return i;
 	let s = [...o.parts], c = s.findIndex((e) => e.type === "media" && e.itemId === r.itemId);
@@ -1822,25 +2150,25 @@ function Tn(e, t, n, r) {
 		...o,
 		status: "streaming",
 		parts: s
-	}), R(i, t);
+	}), G(i, t);
 }
-function En(e, t, n, r) {
+function tr(e, t, n, r) {
 	let i = [...e], a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "question" && e.request.id === r.request.id));
-	a < 0 && (i = I(i, t, n), a = z(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
+	a < 0 && (i = U(i, t, n), a = K(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
 	let o = a >= 0 ? i[a] : void 0;
 	if (!o) return i;
 	let s = [...o.parts], c = s.findIndex((e) => e.type === "question" && e.request.id === r.request.id);
 	return c >= 0 ? s.splice(c, 1, r) : s.push(r), i.splice(a, 1, {
 		...o,
 		parts: s
-	}), R(i, t);
+	}), G(i, t);
 }
-function Dn(e, t) {
+function nr(e, t) {
 	return e.itemId === t.itemId && e.media.url === t.media.url && e.media.alt === t.media.alt && e.media.mimeType === t.media.mimeType && e.media.prompt === t.media.prompt && e.media.title === t.media.title;
 }
-function On(e, t, n, r) {
+function rr(e, t, n, r) {
 	let i = [...e], a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "tool" && e.id === r.itemId));
-	if (a < 0) return r.fallbackToolPart ? On(L(i, t, n, r.fallbackToolPart), t, n, {
+	if (a < 0) return r.fallbackToolPart ? rr(W(i, t, n, r.fallbackToolPart), t, n, {
 		...r,
 		fallbackToolPart: void 0
 	}) : i;
@@ -1866,12 +2194,12 @@ function On(e, t, n, r) {
 		parts: s
 	}), i) : i;
 }
-function kn(e, t, n, r = "streaming") {
+function ir(e, t, n, r = "streaming") {
 	if (e.some((e) => e.kind === "compaction" && e.metadata?.turnId === n)) return e.map((e) => r === "complete" && e.kind === "compaction" && e.metadata?.turnId === n ? {
 		...e,
 		status: r
 	} : e);
-	let i = [...e], a = z(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), o = a >= 0 ? i[a] : void 0;
+	let i = [...e], a = K(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), o = a >= 0 ? i[a] : void 0;
 	return o?.parts.length === 0 ? i.splice(a, 1) : o && i.splice(a, 1, {
 		...o,
 		status: "complete"
@@ -1887,16 +2215,16 @@ function kn(e, t, n, r = "streaming") {
 			conversationId: t,
 			turnId: n
 		}
-	}), R(i, t);
+	}), G(i, t);
 }
-function An(e, t, n) {
+function ar(e, t, n) {
 	let r = n === "completed" ? "completed" : "failed";
 	return e.map((e) => {
 		if (e.metadata?.turnId !== t) return e;
 		let n = !1, i = e.parts.map((e) => e.type !== "tool" || e.status !== "running" ? e : (n = !0, {
 			...e,
 			status: r,
-			statusText: jn(e.statusText, r)
+			statusText: or(e.statusText, r)
 		}));
 		return n ? {
 			...e,
@@ -1904,7 +2232,7 @@ function An(e, t, n) {
 		} : e;
 	});
 }
-function jn(e, t) {
+function or(e, t) {
 	if (t === "running" || !e) return e;
 	try {
 		let n = JSON.parse(e);
@@ -1916,27 +2244,27 @@ function jn(e, t) {
 		return e;
 	}
 }
-function R(e, t) {
+function G(e, t) {
 	let n = e.map((e, t) => ({
 		message: e,
 		index: t
 	})).filter(({ message: e }) => e.metadata?.conversationId === t).at(-1)?.index ?? -1;
 	return e.filter((e, r) => e.metadata?.conversationId !== t || r === n || e.role !== "assistant" || e.kind !== void 0 || e.parts.length > 0);
 }
-function z(e, t) {
+function K(e, t) {
 	for (let n = e.length - 1; n >= 0; --n) {
 		let r = e[n];
 		if (r !== void 0 && t(r)) return n;
 	}
 	return -1;
 }
-function Mn(e, t) {
+function sr(e, t) {
 	return e.includes(t) ? [...e] : [...e, t];
 }
-function Nn(e, t) {
+function cr(e, t) {
 	return [e?.trim() ?? "", ...t.map((e) => `${e.status === "completed" ? "- [x]" : "- [ ]"} ${e.step}`)].filter(Boolean).join("\n");
 }
-function Pn(e, t, n) {
+function lr(e, t, n) {
 	return {
 		type: "tool",
 		id: `plan-progress-${e}`,
@@ -1959,19 +2287,19 @@ function Pn(e, t, n) {
 }
 //#endregion
 //#region src/node/codex-conversation-history.ts
-var Fn = 16 * 1024 * 1024, In = /* @__PURE__ */ new Set([
+var ur = 16 * 1024 * 1024, dr = /* @__PURE__ */ new Set([
 	"image/avif",
 	"image/gif",
 	"image/jpeg",
 	"image/png",
 	"image/webp"
 ]);
-function Ln(e) {
-	return (Array.isArray(e.turns) ? e.turns : []).flatMap((t) => zn(e.id, t));
+function fr(e) {
+	return (Array.isArray(e.turns) ? e.turns : []).flatMap((t) => mr(e.id, t));
 }
-function Rn(e, t) {
+function pr(e, t) {
 	let n = /* @__PURE__ */ new Map();
-	for (let t of e) for (let e of t.parts) e.type !== "attachment" || e.attachment.kind !== "image" || !e.attachment.path || Qn(e.attachment.url) && n.set(e.attachment.path, e.attachment.url);
+	for (let t of e) for (let e of t.parts) e.type !== "attachment" || e.attachment.kind !== "image" || !e.attachment.path || Dr(e.attachment.url) && n.set(e.attachment.path, e.attachment.url);
 	return n.size === 0 ? [...t] : t.map((e) => {
 		let t = !1, r = e.parts.map((e) => {
 			if (e.type !== "attachment" || e.attachment.kind !== "image" || !e.attachment.path) return e;
@@ -1990,14 +2318,14 @@ function Rn(e, t) {
 		} : e;
 	});
 }
-function zn(e, t) {
-	let n = [], r = [], i = nr(t.startedAt ?? t.completedAt), a = 0, o = !1, s = /* @__PURE__ */ new Set(), c = () => {
+function mr(e, t) {
+	let n = [], r = [], i = jr(t.startedAt ?? t.completedAt), a = 0, o = !1, s = /* @__PURE__ */ new Set(), c = () => {
 		if (r.length === 0) return;
 		let o = a === 0 ? "" : `-segment-${a}`;
 		n.push({
 			id: `assistant-${t.id}${o}`,
 			role: "assistant",
-			status: tr(t.status),
+			status: Ar(t.status),
 			turnId: t.id,
 			parts: [...r],
 			createdAt: i,
@@ -2009,7 +2337,7 @@ function zn(e, t) {
 	};
 	for (let a of Array.isArray(t.items) ? t.items : []) {
 		if (a.type === "userMessage") {
-			let r = Un(a), l = Gn(a);
+			let r = vr(a), l = br(a);
 			if (r.length > 0) {
 				let u = o, d = u ? null : JSON.stringify(r);
 				if (d && s.has(d)) continue;
@@ -2026,7 +2354,7 @@ function zn(e, t) {
 						turnId: t.id,
 						...l.length > 0 ? {
 							asyncQuestionRequestIds: l,
-							asyncQuestionAnswers: Kn(a)
+							asyncQuestionAnswers: xr(a)
 						} : {}
 					}
 				});
@@ -2052,7 +2380,7 @@ function zn(e, t) {
 			continue;
 		}
 		if (a.type === "agentMessage") {
-			let n = typeof a.text == "string" ? a.text : "", i = Vn(e, t.id, a, !0), s = a.phase === "final_answer" ? wn(n) : null;
+			let n = typeof a.text == "string" ? a.text : "", i = gr(e, t.id, a, !0), s = a.phase === "final_answer" ? $n(n) : null;
 			s && !i ? s.visibleText && (o = !0, r.push({
 				type: "text",
 				text: s.visibleText,
@@ -2088,17 +2416,17 @@ function zn(e, t) {
 			}));
 			continue;
 		}
-		let l = A(a);
+		let l = L(a);
 		l && (o = !0, r.push(l));
-		let u = Hn(a);
+		let u = _r(a);
 		u && (o = !0, r.push(u));
 	}
-	return c(), t.status === "inProgress" ? n : An(n, t.id, t.status);
+	return c(), t.status === "inProgress" ? n : ar(n, t.id, t.status);
 }
-function Bn(e, t, n) {
-	let r = nr(t.startedAt);
+function hr(e, t, n) {
+	let r = jr(t.startedAt);
 	if (n.type === "userMessage") {
-		let i = Un(n), a = Gn(n);
+		let i = vr(n), a = br(n);
 		return i.length > 0 ? {
 			id: n.clientId ?? `user-${e}-${t.id}-${n.id}`,
 			role: "user",
@@ -2112,13 +2440,13 @@ function Bn(e, t, n) {
 				itemId: n.id,
 				...a.length > 0 ? {
 					asyncQuestionRequestIds: a,
-					asyncQuestionAnswers: Kn(n)
+					asyncQuestionAnswers: xr(n)
 				} : {}
 			}
 		} : null;
 	}
 	if (n.type === "agentMessage" || n.type === "exitedReviewMode") {
-		let i = n.type === "agentMessage" ? n.text : n.review, a = n.type === "agentMessage" && n.phase === "final_answer" ? wn(i) : null, o = n.type === "agentMessage" ? Vn(e, t.id, n, !0) : null, s = [...!o && (a?.visibleText || !a && i) ? [{
+		let i = n.type === "agentMessage" ? n.text : n.review, a = n.type === "agentMessage" && n.phase === "final_answer" ? $n(i) : null, o = n.type === "agentMessage" ? gr(e, t.id, n, !0) : null, s = [...!o && (a?.visibleText || !a && i) ? [{
 			type: "text",
 			text: a?.visibleText ?? i,
 			itemId: n.id,
@@ -2127,7 +2455,7 @@ function Bn(e, t, n) {
 		return s.length > 0 ? {
 			id: `assistant-${n.id}`,
 			role: "assistant",
-			status: tr(t.status),
+			status: Ar(t.status),
 			turnId: t.id,
 			parts: s,
 			createdAt: r,
@@ -2151,7 +2479,7 @@ function Bn(e, t, n) {
 		return i.length > 0 ? {
 			id: `assistant-${n.id}`,
 			role: "assistant",
-			status: tr(t.status),
+			status: Ar(t.status),
 			turnId: t.id,
 			parts: i,
 			createdAt: r,
@@ -2162,14 +2490,14 @@ function Bn(e, t, n) {
 			}
 		} : null;
 	}
-	let i = [], a = A(n);
+	let i = [], a = L(n);
 	a && i.push(a);
-	let o = Hn(n);
+	let o = _r(n);
 	o && i.push(o);
 	let s = i.length > 0 ? {
 		id: `assistant-${n.id}`,
 		role: "assistant",
-		status: tr(t.status),
+		status: Ar(t.status),
 		turnId: t.id,
 		parts: i,
 		createdAt: r,
@@ -2179,9 +2507,9 @@ function Bn(e, t, n) {
 			itemId: n.id
 		}
 	} : null;
-	return !s || t.status === "inProgress" ? s : An([s], t.id, t.status)[0] ?? null;
+	return !s || t.status === "inProgress" ? s : ar([s], t.id, t.status)[0] ?? null;
 }
-function Vn(e, t, n, r = !1) {
+function gr(e, t, n, r = !1) {
 	if (n.delivery !== "async") return null;
 	let i = n.questions ?? [], a = i.length > 0 ? i.map((e, t) => ({
 		id: JSON.stringify([
@@ -2223,9 +2551,9 @@ function Vn(e, t, n, r = !1) {
 		...r ? { historical: !0 } : {}
 	};
 }
-function Hn(e) {
-	if (e.type !== "imageGeneration" || A(e)?.status !== "completed") return null;
-	let t = typeof e.savedPath == "string" && v(e.savedPath) ? e.savedPath : null, n = t ? Xn(t) : void 0, r = n && In.has(n) ? t : null, i = Zn(typeof e.result == "string" ? e.result.trim() : ""), a = i?.url ?? (r ? re(r).href : void 0);
+function _r(e) {
+	if (e.type !== "imageGeneration" || L(e)?.status !== "completed") return null;
+	let t = typeof e.savedPath == "string" && v(e.savedPath) ? e.savedPath : null, n = t ? Tr(t) : void 0, r = n && dr.has(n) ? t : null, i = Er(typeof e.result == "string" ? e.result.trim() : ""), a = i?.url ?? (r ? re(r).href : void 0);
 	if (!a) return null;
 	let o = typeof e.revisedPrompt == "string" ? e.revisedPrompt.trim() : "";
 	return {
@@ -2240,21 +2568,21 @@ function Hn(e) {
 		}
 	};
 }
-function Un(e) {
-	let t = Array.isArray(e.content) ? e.content : [], n = t.some((e) => B(e) && e.type === "text" && typeof e.text == "string" && e.text.length > 0), r = [], i = [], a = /* @__PURE__ */ new Set(), o = () => {
+function vr(e) {
+	let t = Array.isArray(e.content) ? e.content : [], n = t.some((e) => q(e) && e.type === "text" && typeof e.text == "string" && e.text.length > 0), r = [], i = [], a = /* @__PURE__ */ new Set(), o = () => {
 		i.length > 0 && r.push({
 			type: "text",
 			text: i.join("\n")
 		}), i = [];
 	};
 	for (let e of t) {
-		if (B(e) && e.type === "skill" && typeof e.name == "string") {
+		if (q(e) && e.type === "skill" && typeof e.name == "string") {
 			if (n) continue;
 			let t = e.name.toLowerCase();
 			if (a.has(t)) continue;
 			a.add(t);
 		}
-		let t = Wn(e), s = Pt(t);
+		let t = yr(e), s = kt(t);
 		if (s) {
 			o(), r.push({
 				type: "attachment",
@@ -2269,7 +2597,7 @@ function Un(e) {
 			i.push(t);
 			continue;
 		}
-		let c = Jn(e);
+		let c = Cr(e);
 		c && (o(), r.push({
 			type: "attachment",
 			attachment: c
@@ -2277,26 +2605,26 @@ function Un(e) {
 	}
 	return o(), r;
 }
-function Wn(e) {
-	return !B(e) || typeof e.type != "string" ? "" : e.type === "text" && typeof e.text == "string" ? qn(e.text)?.displayText ?? e.text : e.type === "skill" && typeof e.name == "string" ? `$${e.name}` : "";
+function yr(e) {
+	return !q(e) || typeof e.type != "string" ? "" : e.type === "text" && typeof e.text == "string" ? Sr(e.text)?.displayText ?? e.text : e.type === "skill" && typeof e.name == "string" ? `$${e.name}` : "";
 }
-function Gn(e) {
+function br(e) {
 	let t = /* @__PURE__ */ new Set();
-	for (let n of Array.isArray(e.content) ? e.content : []) if (!(!B(n) || n.type !== "text" || typeof n.text != "string")) for (let e of qn(n.text)?.requestIds ?? []) t.add(e);
+	for (let n of Array.isArray(e.content) ? e.content : []) if (!(!q(n) || n.type !== "text" || typeof n.text != "string")) for (let e of Sr(n.text)?.requestIds ?? []) t.add(e);
 	return [...t];
 }
-function Kn(e) {
+function xr(e) {
 	let t = {};
-	for (let n of Array.isArray(e.content) ? e.content : []) !B(n) || n.type !== "text" || typeof n.text != "string" || Object.assign(t, qn(n.text)?.answers);
+	for (let n of Array.isArray(e.content) ? e.content : []) !q(n) || n.type !== "text" || typeof n.text != "string" || Object.assign(t, Sr(n.text)?.answers);
 	return t;
 }
-function qn(e) {
+function Sr(e) {
 	let t = e.match(/^<send_user_message_question_reply>\s*([\s\S]*?)\s*<\/send_user_message_question_reply>$/);
 	if (!t?.[1]) return null;
 	try {
 		let e = JSON.parse(t[1]);
 		if (!Array.isArray(e)) return null;
-		let n = e.filter((e) => B(e) && typeof e.questionItemId == "string" && typeof e.question == "string" && typeof e.answer == "string");
+		let n = e.filter((e) => q(e) && typeof e.questionItemId == "string" && typeof e.question == "string" && typeof e.answer == "string");
 		if (n.length === 0) return null;
 		let r = n.flatMap((e) => {
 			try {
@@ -2314,10 +2642,10 @@ function qn(e) {
 		return null;
 	}
 }
-function Jn(e) {
-	if (!B(e) || typeof e.type != "string") return null;
+function Cr(e) {
+	if (!q(e) || typeof e.type != "string") return null;
 	if (e.type === "mention" && typeof e.path == "string") {
-		let t = typeof e.name == "string" && e.name.trim() ? e.name.trim() : Yn(e.path, "File"), n = Xn(e.path);
+		let t = typeof e.name == "string" && e.name.trim() ? e.name.trim() : wr(e.path, "File"), n = Tr(e.path);
 		return {
 			kind: "file",
 			name: t,
@@ -2326,26 +2654,26 @@ function Jn(e) {
 		};
 	}
 	if (e.type === "image" && typeof e.url == "string") {
-		let t = Xn(e.url);
+		let t = Tr(e.url);
 		return {
 			kind: "image",
-			name: Yn(e.url, "Image"),
+			name: wr(e.url, "Image"),
 			url: e.url,
 			...t ? { mimeType: t } : {}
 		};
 	}
 	if (e.type === "localImage" && typeof e.path == "string") {
-		let t = Xn(e.path);
+		let t = Tr(e.path);
 		return {
 			kind: "image",
-			name: Yn(e.path, "Image"),
+			name: wr(e.path, "Image"),
 			path: e.path,
 			...t ? { mimeType: t } : {}
 		};
 	}
 	return null;
 }
-function Yn(e, t) {
+function wr(e, t) {
 	try {
 		let n = /^[a-z][a-z\d+.-]*:/i.test(e) ? new URL(e).pathname : e;
 		return g(decodeURIComponent(n)).trim() || t;
@@ -2353,7 +2681,7 @@ function Yn(e, t) {
 		return g(e).trim() || t;
 	}
 }
-function Xn(e) {
+function Tr(e) {
 	let t = /^data:([^;,]+)/i.exec(e)?.[1]?.toLowerCase();
 	if (t) return t;
 	let n = "";
@@ -2375,23 +2703,23 @@ function Xn(e) {
 		webp: "image/webp"
 	}[n];
 }
-function Zn(e) {
+function Er(e) {
 	if (!e) return null;
-	let t = (/^data:image\/[a-z0-9.+-]+;base64,([a-z0-9+/=\s]+)$/i.exec(e)?.[1] ?? e).replace(/\s+/g, ""), n = Math.ceil(Fn / 3) * 4 + 4;
+	let t = (/^data:image\/[a-z0-9.+-]+;base64,([a-z0-9+/=\s]+)$/i.exec(e)?.[1] ?? e).replace(/\s+/g, ""), n = Math.ceil(ur / 3) * 4 + 4;
 	if (!t || t.length > n || t.length % 4 != 0 || !/^[a-z0-9+/]+={0,2}$/i.test(t)) return null;
 	let r = Buffer.from(t, "base64");
-	if (r.byteLength === 0 || r.byteLength > Fn) return null;
-	let i = $n(r);
+	if (r.byteLength === 0 || r.byteLength > ur) return null;
+	let i = Or(r);
 	return i ? {
 		url: `data:${i};base64,${t}`,
 		mimeType: i
 	} : null;
 }
-function Qn(e) {
+function Dr(e) {
 	return !!(e && e.length <= 16 * 1024 * 1024 && /^data:image\/(?:avif|bmp|gif|heic|heif|jpe?g|png|webp);base64,[a-z\d+/]+={0,2}$/i.test(e));
 }
-function $n(e) {
-	if (er(e, [
+function Or(e) {
+	if (kr(e, [
 		137,
 		80,
 		78,
@@ -2401,7 +2729,7 @@ function $n(e) {
 		26,
 		10
 	])) return "image/png";
-	if (er(e, [
+	if (kr(e, [
 		255,
 		216,
 		255
@@ -2409,50 +2737,50 @@ function $n(e) {
 	let t = Buffer.from(e.subarray(0, 12)).toString("ascii");
 	return t.startsWith("GIF87a") || t.startsWith("GIF89a") ? "image/gif" : t.startsWith("RIFF") && t.slice(8, 12) === "WEBP" ? "image/webp" : e.byteLength >= 12 && t.slice(4, 12) === "ftypavif" ? "image/avif" : null;
 }
-function er(e, t) {
+function kr(e, t) {
 	return t.every((t, n) => e[n] === t);
 }
-function tr(e) {
+function Ar(e) {
 	return e === "inProgress" ? "streaming" : e === "failed" ? "error" : "complete";
 }
-function nr(e) {
+function jr(e) {
 	return typeof e != "number" || !Number.isFinite(e) ? (/* @__PURE__ */ new Date(0)).toISOString() : (/* @__PURE__ */ new Date(e * 1e3)).toISOString();
 }
-function B(e) {
+function q(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
 //#endregion
 //#region src/node/codex-raw-response-item-adapter.ts
-function rr(e) {
-	if (!fr(e) || typeof e.type != "string") return null;
+function Mr(e) {
+	if (!Vr(e) || typeof e.type != "string") return null;
 	if (e.type === "local_shell_call") {
-		let t = A(ir(e));
+		let t = L(Nr(e));
 		return {
-			type: cr(e.status) ? "item.completed" : "item.started",
+			type: Lr(e.status) ? "item.completed" : "item.started",
 			payload: { toolPart: t }
 		};
 	}
 	return e.type === "function_call" ? {
 		type: "item.started",
-		payload: { toolPart: A(ar(e)) }
-	} : e.type === "function_call_output" ? or(e.call_id, e.output) : e.type === "custom_tool_call" ? {
+		payload: { toolPart: L(Pr(e)) }
+	} : e.type === "function_call_output" ? Fr(e.call_id, e.output) : e.type === "custom_tool_call" ? {
 		type: "item.started",
-		payload: { toolPart: A({
+		payload: { toolPart: L({
 			type: "dynamicToolCall",
-			id: H(e.call_id) ?? V(e),
+			id: Y(e.call_id) ?? J(e),
 			namespace: null,
-			tool: H(e.name) ?? "custom_tool",
+			tool: Y(e.name) ?? "custom_tool",
 			status: e.status,
-			arguments: H(e.input) ?? "",
+			arguments: Y(e.input) ?? "",
 			contentItems: null,
 			success: null,
 			durationMs: null
 		}) }
-	} : e.type === "custom_tool_call_output" ? or(e.call_id, e.output, H(e.name) ?? void 0) : e.type === "tool_search_call" ? {
+	} : e.type === "custom_tool_call_output" ? Fr(e.call_id, e.output, Y(e.name) ?? void 0) : e.type === "tool_search_call" ? {
 		type: "item.started",
-		payload: { toolPart: A({
+		payload: { toolPart: L({
 			type: "dynamicToolCall",
-			id: H(e.call_id) ?? V(e),
+			id: Y(e.call_id) ?? J(e),
 			namespace: "codex",
 			tool: "tool_search",
 			status: e.status,
@@ -2464,20 +2792,20 @@ function rr(e) {
 		}) }
 	} : e.type === "tool_search_output" ? {
 		type: "item.updated",
-		payload: Gt(H(e.call_id) ?? V(e), e.tools, "tool_search", e.status)
+		payload: xn(Y(e.call_id) ?? J(e), e.tools, "tool_search", e.status)
 	} : e.type === "web_search_call" ? {
 		type: "item.completed",
-		payload: { toolPart: A({
+		payload: { toolPart: L({
 			type: "webSearch",
-			id: V(e),
-			query: ur(e.action),
+			id: J(e),
+			query: zr(e.action),
 			action: e.action
 		}) }
 	} : e.type === "image_generation_call" ? {
 		type: "item.completed",
-		payload: { toolPart: A({
+		payload: { toolPart: L({
 			type: "dynamicToolCall",
-			id: H(e.id) ?? V(e),
+			id: Y(e.id) ?? J(e),
 			namespace: null,
 			tool: "image_generation",
 			status: e.status,
@@ -2488,29 +2816,29 @@ function rr(e) {
 		}) }
 	} : null;
 }
-function ir(e) {
-	let t = fr(e.action) ? e.action : {}, n = Array.isArray(t.command) ? dr(t.command) : H(t.command) ?? "local shell";
+function Nr(e) {
+	let t = Vr(e.action) ? e.action : {}, n = Array.isArray(t.command) ? Br(t.command) : Y(t.command) ?? "local shell";
 	return {
 		type: "commandExecution",
-		id: H(e.call_id) ?? V(e),
+		id: Y(e.call_id) ?? J(e),
 		command: n,
-		cwd: H(t.working_directory) ?? "",
+		cwd: Y(t.working_directory) ?? "",
 		processId: null,
 		source: "agent",
-		status: sr(e.status),
+		status: Ir(e.status),
 		commandActions: [],
 		aggregatedOutput: null,
 		exitCode: null,
 		durationMs: null
 	};
 }
-function ar(e) {
-	let t = H(e.name) ?? "function_call", n = lr(e.arguments), r = H(e.call_id) ?? V(e);
-	return t === "shell_command" && fr(n) ? {
+function Pr(e) {
+	let t = Y(e.name) ?? "function_call", n = Rr(e.arguments), r = Y(e.call_id) ?? J(e);
+	return t === "shell_command" && Vr(n) ? {
 		type: "commandExecution",
 		id: r,
-		command: H(n.command) ?? t,
-		cwd: H(n.workdir) ?? H(n.cwd) ?? "",
+		command: Y(n.command) ?? t,
+		cwd: Y(n.workdir) ?? Y(n.cwd) ?? "",
 		processId: null,
 		source: "agent",
 		status: "inProgress",
@@ -2521,7 +2849,7 @@ function ar(e) {
 	} : {
 		type: "dynamicToolCall",
 		id: r,
-		namespace: H(e.namespace),
+		namespace: Y(e.namespace),
 		tool: t,
 		status: "inProgress",
 		arguments: n,
@@ -2530,19 +2858,19 @@ function ar(e) {
 		durationMs: null
 	};
 }
-function or(e, t, n) {
+function Fr(e, t, n) {
 	return {
 		type: "item.updated",
-		payload: Gt(H(e) ?? "raw-response-output", t, n)
+		payload: xn(Y(e) ?? "raw-response-output", t, n)
 	};
 }
-function sr(e) {
+function Ir(e) {
 	return e === "completed" ? "completed" : e === "incomplete" || e === "failed" || e === "error" ? "failed" : "inProgress";
 }
-function cr(e) {
+function Lr(e) {
 	return e === "completed" || e === "failed" || e === "error" || e === "incomplete";
 }
-function lr(e) {
+function Rr(e) {
 	if (typeof e != "string") return e;
 	try {
 		return JSON.parse(e);
@@ -2550,71 +2878,71 @@ function lr(e) {
 		return e;
 	}
 }
-function ur(e) {
-	return fr(e) ? H(e.query) ?? H(e.searchTerm) ?? "web search" : "web search";
+function zr(e) {
+	return Vr(e) ? Y(e.query) ?? Y(e.searchTerm) ?? "web search" : "web search";
 }
-function dr(e) {
+function Br(e) {
 	return e.map((e) => {
 		let t = String(e);
 		return /\s/.test(t) ? JSON.stringify(t) : t;
 	}).join(" ");
 }
-function V(e) {
-	return (H(e.call_id) ?? H(e.id)) || `raw-${e.type}`;
+function J(e) {
+	return (Y(e.call_id) ?? Y(e.id)) || `raw-${e.type}`;
 }
-function H(e) {
+function Y(e) {
 	return typeof e == "string" && e.length > 0 ? e : null;
 }
-function fr(e) {
+function Vr(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
 //#endregion
 //#region src/node/codex-surface-events.ts
-function pr(e, t) {
+function Hr(e, t) {
 	return `${e}\u0000${t}`;
 }
-function U(e) {
+function X(e) {
 	return typeof e == "number" && Number.isFinite(e) ? (/* @__PURE__ */ new Date(e * 1e3)).toISOString() : (/* @__PURE__ */ new Date()).toISOString();
 }
-function mr(e) {
+function Ur(e) {
 	return typeof e == "number" && Number.isFinite(e) ? (/* @__PURE__ */ new Date(e * 1e3)).toISOString() : null;
 }
-function hr(e) {
+function Wr(e) {
 	return e ? {
 		message: e.message,
 		additionalDetails: e.additionalDetails,
 		codexErrorInfo: e.codexErrorInfo
 	} : null;
 }
-function W(e, t = !1) {
+function Z(e, t = !1) {
 	return {
 		id: e.id,
 		status: e.status,
-		error: hr(e.error),
+		error: Wr(e.error),
 		willRetry: t,
-		startedAt: mr(e.startedAt),
-		completedAt: mr(e.completedAt),
+		startedAt: Ur(e.startedAt),
+		completedAt: Ur(e.completedAt),
 		durationMs: e.durationMs ?? null
 	};
 }
-function G(e, t) {
+function Q(e, t) {
 	let n = e.findIndex((e) => e.id === t.id);
 	if (n < 0) return [...e, t];
 	let r = [...e];
 	return r.splice(n, 1, t), r;
 }
-function gr(e, t) {
+function Gr(e, t) {
 	return JSON.stringify(e) === JSON.stringify(t);
 }
-function _r() {
+function Kr() {
 	return `user-${globalThis.crypto.randomUUID()}`;
 }
-function vr() {
+function qr() {
 	return `queued-prompt-${globalThis.crypto.randomUUID()}`;
 }
 //#endregion
 //#region src/node/codex-surface-subagents.ts
-function yr(e) {
+function Jr(e) {
 	let t = {};
 	for (let [n, r] of Object.entries(e.agentsStates)) r && (t[n] = {
 		status: r.status,
@@ -2634,7 +2962,7 @@ function yr(e) {
 }
 //#endregion
 //#region src/node/codex-surface-items-controller.ts
-var br = class {
+var Yr = class {
 	host;
 	commandOutputForwardItemIds = /* @__PURE__ */ new Set();
 	fileActivityKeys = /* @__PURE__ */ new Set();
@@ -2652,13 +2980,13 @@ var br = class {
 		for (let e of this.reviewOutputByTurn.keys()) e.startsWith(t) && this.reviewOutputByTurn.delete(e);
 	}
 	isForwardingCommandOutput(e, t) {
-		return this.commandOutputForwardItemIds.has(pr(e, t));
+		return this.commandOutputForwardItemIds.has(Hr(e, t));
 	}
 	applyAgentDelta(e) {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
 		let n = t.messages.flatMap((e) => e.parts).find((t) => t.type === "text" && t.itemId === e.itemId)?.phase;
-		this.host.patchRuntime(e.threadId, { messages: bn(t.messages, e.threadId, e.turnId, e.itemId, e.delta, n) });
+		this.host.patchRuntime(e.threadId, { messages: Yn(t.messages, e.threadId, e.turnId, e.itemId, e.delta, n) });
 		let r = this.host.assistantMessageForTurn(e.threadId, e.turnId);
 		r && this.host.emitEvent("notification", {
 			type: "message.delta",
@@ -2676,7 +3004,7 @@ var br = class {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
 		let n = `${t.planMarkdownByTurn.get(e.turnId) ?? ""}${e.delta}`;
-		t.planMarkdownByTurn.set(e.turnId, n), this.host.patchRuntime(e.threadId, { messages: L(t.messages, e.threadId, e.turnId, Pn(e.turnId, n, "running")) }), this.host.emitEvent("notification", {
+		t.planMarkdownByTurn.set(e.turnId, n), this.host.patchRuntime(e.threadId, { messages: W(t.messages, e.threadId, e.turnId, lr(e.turnId, n, "running")) }), this.host.emitEvent("notification", {
 			type: "plan.delta",
 			conversationId: e.threadId,
 			turnId: e.turnId,
@@ -2690,7 +3018,7 @@ var br = class {
 	applyPlanUpdated(e) {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
-		let n = Nn(e.explanation, e.plan), r = (/* @__PURE__ */ new Date()).toISOString();
+		let n = cr(e.explanation, e.plan), r = (/* @__PURE__ */ new Date()).toISOString();
 		t.planMarkdownByTurn.set(e.turnId, n), this.host.patchRuntime(e.threadId, {
 			executionPlan: {
 				turnId: e.turnId,
@@ -2699,7 +3027,7 @@ var br = class {
 				markdown: n,
 				updatedAt: r
 			},
-			messages: L(t.messages, e.threadId, e.turnId, Pn(e.turnId, n, "completed"))
+			messages: W(t.messages, e.threadId, e.turnId, lr(e.turnId, n, "completed"))
 		}), this.host.emitEvent("notification", {
 			type: "plan.updated",
 			conversationId: e.threadId,
@@ -2715,13 +3043,13 @@ var br = class {
 	applyRawResponseItem(e) {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
-		let n = rr(e.item);
+		let n = Mr(e.item);
 		if (!n) return;
 		if (n.type === "item.updated") {
 			this.applyToolUpdate(e.threadId, e.turnId, n.payload);
 			return;
 		}
-		this.host.patchRuntime(e.threadId, { messages: L(t.messages, e.threadId, e.turnId, n.payload.toolPart) });
+		this.host.patchRuntime(e.threadId, { messages: W(t.messages, e.threadId, e.turnId, n.payload.toolPart) });
 		let r = this.host.messageContainingTool(e.threadId, e.turnId, n.payload.toolPart.id);
 		r && (this.host.emitEvent("notification", {
 			type: n.type === "item.completed" ? "tool.completed" : "tool.started",
@@ -2742,7 +3070,7 @@ var br = class {
 			startedAt: ("startedAtMs" in e ? e.startedAtMs : e.completedAtMs) / 1e3
 		};
 		if (e.item.type === "userMessage") {
-			let t = Bn(e.threadId, i, e.item);
+			let t = hr(e.threadId, i, e.item);
 			if (!t || n.messages.some((e) => e.id === t.id)) return;
 			let a = n.messages.some((t) => t.role === "assistant" && t.metadata?.turnId === e.turnId && t.parts.length > 0), o = !a && r ? n.messages.map((e) => e.role === "user" && e.kind !== "steer" && !e.turnId && JSON.stringify(e.parts) === JSON.stringify(t.parts)).lastIndexOf(!0) : -1;
 			if (o >= 0) {
@@ -2768,7 +3096,7 @@ var br = class {
 				...t,
 				kind: "steer"
 			} : t, c = [...n.messages, s];
-			this.host.patchRuntime(e.threadId, { messages: a ? I(c, e.threadId, e.turnId, { forceSegment: !0 }) : c }), this.host.emitEvent("notification", {
+			this.host.patchRuntime(e.threadId, { messages: a ? U(c, e.threadId, e.turnId, { forceSegment: !0 }) : c }), this.host.emitEvent("notification", {
 				type: "message.appended",
 				conversationId: e.threadId,
 				turnId: e.turnId,
@@ -2779,7 +3107,7 @@ var br = class {
 		if (e.item.type === "reasoning") {
 			if (e.item.summary.filter((e) => e.trim().length > 0).length === 0) return;
 			let t = this.host.assistantMessageForTurn(e.threadId, e.turnId), r = t ? JSON.stringify(t.parts) : null;
-			this.host.patchRuntime(e.threadId, { messages: xn(n.messages, e.threadId, e.turnId, e.item.id, e.item.summary) });
+			this.host.patchRuntime(e.threadId, { messages: Xn(n.messages, e.threadId, e.turnId, e.item.id, e.item.summary) });
 			let i = this.host.assistantMessageForTurn(e.threadId, e.turnId);
 			if (!i || JSON.stringify(i.parts) === r) return;
 			this.host.emitEvent("notification", {
@@ -2791,10 +3119,10 @@ var br = class {
 			return;
 		}
 		if (e.item.type === "agentMessage" && t && n.planMode && e.item.phase === "final_answer") {
-			let t = wn(e.item.text);
+			let t = $n(e.item.text);
 			if (t) {
-				let r = this.host.assistantMessageForTurn(e.threadId, e.turnId), i = Cn(n.messages, e.threadId, e.turnId, e.item.id);
-				t.visibleText && (i = Sn(i, e.threadId, e.turnId, e.item.id, t.visibleText, e.item.phase)), i = L(i, e.threadId, e.turnId, Pn(e.turnId, t.markdown, "completed")), n.planMarkdownByTurn.set(e.turnId, t.markdown), this.host.patchRuntime(e.threadId, { messages: i });
+				let r = this.host.assistantMessageForTurn(e.threadId, e.turnId), i = Qn(n.messages, e.threadId, e.turnId, e.item.id);
+				t.visibleText && (i = Zn(i, e.threadId, e.turnId, e.item.id, t.visibleText, e.item.phase)), i = W(i, e.threadId, e.turnId, lr(e.turnId, t.markdown, "completed")), n.planMarkdownByTurn.set(e.turnId, t.markdown), this.host.patchRuntime(e.threadId, { messages: i });
 				let a = this.host.assistantMessageForTurn(e.threadId, e.turnId);
 				a && this.host.emitEvent("notification", {
 					type: r ? "message.updated" : "message.appended",
@@ -2816,11 +3144,11 @@ var br = class {
 		if (e.item.type === "agentMessage" || e.item.type === "exitedReviewMode") {
 			let t = e.item.type === "agentMessage" ? e.item.text : e.item.review, r = e.item.type === "agentMessage" ? e.item.phase ?? void 0 : void 0;
 			if (!t && e.item.type !== "agentMessage") return;
-			let i = pr(e.threadId, e.turnId);
+			let i = Hr(e.threadId, e.turnId);
 			if (e.item.type === "agentMessage" && this.reviewOutputByTurn.get(i) === t) return;
 			e.item.type === "exitedReviewMode" && this.reviewOutputByTurn.set(i, t);
-			let a = new Set(n.messages.map((e) => e.id)), o = this.host.assistantMessageForTurn(e.threadId, e.turnId), s = o ? JSON.stringify(o.parts) : null, c = new Set(o?.parts.flatMap((e) => e.type === "question" ? [e.request.id] : []) ?? []), l = n.messages.flatMap((e) => e.parts).find((t) => t.type === "text" && t.itemId === e.item.id)?.text ?? "", u = e.item.type === "agentMessage" ? Vn(e.threadId, e.turnId, e.item) : null, d = u ? "" : t, f = u ? Cn(n.messages, e.threadId, e.turnId, e.item.id) : Sn(n.messages, e.threadId, e.turnId, e.item.id, t, r);
-			if (u && (f = En(f, e.threadId, e.turnId, u)), this.host.patchRuntime(e.threadId, { messages: f }), !d && !u) return;
+			let a = new Set(n.messages.map((e) => e.id)), o = this.host.assistantMessageForTurn(e.threadId, e.turnId), s = o ? JSON.stringify(o.parts) : null, c = new Set(o?.parts.flatMap((e) => e.type === "question" ? [e.request.id] : []) ?? []), l = n.messages.flatMap((e) => e.parts).find((t) => t.type === "text" && t.itemId === e.item.id)?.text ?? "", u = e.item.type === "agentMessage" ? gr(e.threadId, e.turnId, e.item) : null, d = u ? "" : t, f = u ? Qn(n.messages, e.threadId, e.turnId, e.item.id) : Zn(n.messages, e.threadId, e.turnId, e.item.id, t, r);
+			if (u && (f = tr(f, e.threadId, e.turnId, u)), this.host.patchRuntime(e.threadId, { messages: f }), !d && !u) return;
 			let p = this.host.assistantMessageForTurn(e.threadId, e.turnId);
 			if (p && !a.has(p.id)) this.host.emitEvent("notification", {
 				type: "message.appended",
@@ -2864,7 +3192,7 @@ var br = class {
 		if (e.item.type === "plan") {
 			if (!t) return;
 			let r = e.item.text.trim() || n.planMarkdownByTurn.get(e.turnId) || "";
-			n.planMarkdownByTurn.set(e.turnId, r), this.host.patchRuntime(e.threadId, { messages: L(n.messages, e.threadId, e.turnId, Pn(e.turnId, r, "completed")) }), this.host.emitEvent("notification", {
+			n.planMarkdownByTurn.set(e.turnId, r), this.host.patchRuntime(e.threadId, { messages: W(n.messages, e.threadId, e.turnId, lr(e.turnId, r, "completed")) }), this.host.emitEvent("notification", {
 				type: "plan.completed",
 				conversationId: e.threadId,
 				turnId: e.turnId,
@@ -2876,7 +3204,7 @@ var br = class {
 			return;
 		}
 		if (e.item.type === "contextCompaction") {
-			if (this.host.patchRuntime(e.threadId, { messages: kn(n.messages, e.threadId, e.turnId, t ? "complete" : "streaming") }), t) {
+			if (this.host.patchRuntime(e.threadId, { messages: ir(n.messages, e.threadId, e.turnId, t ? "complete" : "streaming") }), t) {
 				let t = this.host.requireRuntime(e.threadId).messages.find((t) => t.kind === "compaction" && t.metadata?.turnId === e.turnId);
 				t && this.host.emitEvent("notification", {
 					type: "context.compactionCompleted",
@@ -2902,7 +3230,7 @@ var br = class {
 				turnId: e.turnId,
 				payload: {
 					lifecycle: t ? "completed" : "started",
-					toolCall: yr(e.item)
+					toolCall: Jr(e.item)
 				}
 			});
 			return;
@@ -2924,13 +3252,13 @@ var br = class {
 			});
 			return;
 		}
-		let a = this.shouldForwardCommandOutput(e.threadId, t, e.item), o = A(e.item, {
+		let a = this.shouldForwardCommandOutput(e.threadId, t, e.item), o = L(e.item, {
 			includeCommandOutput: a,
 			cwd: n.cwd
-		}), s = Hn(e.item);
+		}), s = _r(e.item);
 		if (!o && !s) return;
-		let c = s ? !n.messages.some((e) => e.parts.some((e) => e.type === "media" && Dn(e, s))) : !1, l = o ? L(n.messages, e.threadId, e.turnId, o) : [...n.messages];
-		s && (l = Tn(l, e.threadId, e.turnId, s)), this.host.patchRuntime(e.threadId, { messages: l });
+		let c = s ? !n.messages.some((e) => e.parts.some((e) => e.type === "media" && nr(e, s))) : !1, l = o ? W(n.messages, e.threadId, e.turnId, o) : [...n.messages];
+		s && (l = er(l, e.threadId, e.turnId, s)), this.host.patchRuntime(e.threadId, { messages: l });
 		let u = o ? this.host.messageContainingTool(e.threadId, e.turnId, o.id) : this.host.assistantMessageForTurn(e.threadId, e.turnId);
 		u && o && this.host.emitEvent("notification", {
 			type: t ? "tool.completed" : "tool.started",
@@ -2950,25 +3278,25 @@ var br = class {
 	shouldForwardCommandOutput(e, t, n) {
 		let r = "id" in n && typeof n.id == "string" ? n.id : null;
 		if (!r) return !1;
-		let i = pr(e, r);
+		let i = Hr(e, r);
 		if (!t) {
-			let e = Vt(n);
+			let e = _n(n);
 			return e ? this.commandOutputForwardItemIds.add(i) : this.commandOutputForwardItemIds.delete(i), e;
 		}
-		let a = this.commandOutputForwardItemIds.has(i) || Vt(n);
+		let a = this.commandOutputForwardItemIds.has(i) || _n(n);
 		return this.commandOutputForwardItemIds.delete(i), a;
 	}
 	applyToolUpdate(e, t, n) {
 		let r = this.host.requireRuntime(e);
 		this.host.markRuntimeTurnActive(r, t);
-		let i = r.cwd && xr(n) ? {
+		let i = r.cwd && Xr(n) ? {
 			...n,
 			metadata: {
 				...n.metadata,
 				cwd: r.cwd
 			}
 		} : n;
-		this.host.patchRuntime(e, { messages: On(r.messages, e, t, i) });
+		this.host.patchRuntime(e, { messages: rr(r.messages, e, t, i) });
 		let a = this.host.messageContainingTool(e, t, n.itemId);
 		a && this.host.emitEvent("notification", {
 			type: "tool.updated",
@@ -2983,7 +3311,7 @@ var br = class {
 		a && o && this.emitFileActivities(e, t, a.id, o.id, o, r.cwd);
 	}
 	emitFileActivities(e, t, n, r, i, a) {
-		for (let o of Bt(i, a)) {
+		for (let o of gn(i, a)) {
 			let i = `${e}\u0000${r}\u0000${o.action}\u0000${o.path}\u0000${o.status}`;
 			this.fileActivityKeys.has(i) || (this.fileActivityKeys.add(i), this.host.emitEvent("notification", {
 				type: "file.activity",
@@ -3004,7 +3332,7 @@ var br = class {
 		t.turnIds.includes(e.turn.id) || t.turnIds.push(e.turn.id);
 		let n = t.activeTurnId !== e.turn.id && t.turnStartPending;
 		t.activeTurnId === e.turn.id && (t.activeTurnId = null);
-		let r = n || t.activeTurnId !== null, i = e.turn.status === "failed" ? "error" : "complete", a = An(t.messages, e.turn.id, e.turn.status).map((t) => t.metadata?.turnId === e.turn.id ? {
+		let r = n || t.activeTurnId !== null, i = e.turn.status === "failed" ? "error" : "complete", a = ar(t.messages, e.turn.id, e.turn.status).map((t) => t.metadata?.turnId === e.turn.id ? {
 			...t,
 			status: i
 		} : t).filter((t) => !(t.role === "assistant" && t.metadata?.turnId === e.turn.id && t.kind === void 0 && t.parts.length === 0));
@@ -3016,7 +3344,7 @@ var br = class {
 			},
 			turnStartPending: n,
 			messages: a,
-			turns: G(t.turns, W(e.turn))
+			turns: Q(t.turns, Z(e.turn))
 		}), this.host.patch({ conversations: this.host.getState().conversations.map((n) => n.id === e.threadId ? {
 			...n,
 			status: r ? "active" : e.turn.status === "failed" ? "error" : "idle",
@@ -3030,26 +3358,26 @@ var br = class {
 			turnId: e.turn.id,
 			payload: {
 				status: e.turn.status,
-				error: hr(e.turn.error),
+				error: Wr(e.turn.error),
 				willRetry: !1,
-				startedAt: mr(e.turn.startedAt),
-				completedAt: mr(e.turn.completedAt),
+				startedAt: Ur(e.turn.startedAt),
+				completedAt: Ur(e.turn.completedAt),
 				durationMs: e.turn.durationMs ?? null
 			}
 		}), this.host.emitConversationActivity(e.threadId, "notification"), t.planMarkdownByTurn.delete(e.turn.id), this.host.sendNextQueuedPrompt(e.threadId);
 	}
 };
-function xr(e) {
+function Xr(e) {
 	if (e.fallbackToolPart?.kind === "fileChange") return !0;
 	let t = e.input, n = e.metadata;
-	return Sr(t) && Array.isArray(t.changes) || Sr(n) && Array.isArray(n.changes);
+	return Zr(t) && Array.isArray(t.changes) || Zr(n) && Array.isArray(n.changes);
 }
-function Sr(e) {
+function Zr(e) {
 	return typeof e == "object" && !!e;
 }
 //#endregion
 //#region src/node/codex-surface-client-requests-controller.ts
-var Cr = class {
+var Qr = class {
 	host;
 	pending = /* @__PURE__ */ new Map();
 	constructor(e) {
@@ -3098,12 +3426,12 @@ var Cr = class {
 			"deny"
 		].includes(r)) throw Error(`Invalid tool confirmation decision '${String(r)}'`);
 		this.pending.delete(t.id);
-		let i = this.host.requireRuntime(n.threadId), a = Mn(i.answeredClientRequestIds, t.id);
+		let i = this.host.requireRuntime(n.threadId), a = sr(i.answeredClientRequestIds, t.id);
 		if (n.kind === "ask_user") {
 			let e = t.payload?.answers ?? {};
 			n.responder.resolve({ answers: e }), this.host.patchRuntime(n.threadId, {
 				answeredClientRequestIds: a,
-				messages: On(i.messages, n.threadId, n.turnId, {
+				messages: rr(i.messages, n.threadId, n.turnId, {
 					itemId: n.itemId,
 					output: { answers: e }
 				})
@@ -3112,7 +3440,7 @@ var Cr = class {
 			let e = r;
 			n.responder.resolve(Ze(e)), this.host.patchRuntime(n.threadId, {
 				answeredClientRequestIds: a,
-				messages: On(i.messages, n.threadId, n.displayTurnId, {
+				messages: rr(i.messages, n.threadId, n.displayTurnId, {
 					itemId: n.itemId,
 					output: { decision: e }
 				})
@@ -3151,7 +3479,7 @@ var Cr = class {
 ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ? s[0].answer : s.map((e) => `${e.question}: ${e.answer}`).join("\n");
 			await this.host.answerAsyncQuestion(a.runtime.threadId, e, t);
 		}
-		this.host.patchRuntime(a.runtime.threadId, { answeredClientRequestIds: Mn(a.runtime.answeredClientRequestIds, t.id) }), this.host.emitEvent("action", {
+		this.host.patchRuntime(a.runtime.threadId, { answeredClientRequestIds: sr(a.runtime.answeredClientRequestIds, t.id) }), this.host.emitEvent("action", {
 			type: "clientRequest.resolved",
 			conversationId: a.runtime.threadId,
 			...a.request.turnId ? { turnId: a.request.turnId } : {},
@@ -3166,7 +3494,7 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 		let n = this.pending.get(e);
 		if (this.pending.delete(e), n) {
 			let t = this.host.requireRuntime(n.threadId);
-			this.host.patchRuntime(n.threadId, { answeredClientRequestIds: Mn(t.answeredClientRequestIds, e) });
+			this.host.patchRuntime(n.threadId, { answeredClientRequestIds: sr(t.answeredClientRequestIds, e) });
 		}
 		this.maybeClearWaitingBusy(t), n && this.host.emitEvent("notification", {
 			type: "clientRequest.resolved",
@@ -3214,7 +3542,7 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 			responder: t
 		}), this.host.patchRuntime(n, {
 			busy: !0,
-			messages: L(o.messages, n, r, {
+			messages: W(o.messages, n, r, {
 				type: "tool",
 				id: i,
 				kind: "generic",
@@ -3313,7 +3641,7 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 		};
 		this.host.patchRuntime(n.threadId, {
 			busy: !0,
-			messages: L(o.messages, n.threadId, s, f)
+			messages: W(o.messages, n.threadId, s, f)
 		});
 		let p = this.host.messageContainingTool(n.threadId, s, l);
 		return p && this.host.emitEvent("notification", {
@@ -3331,408 +3659,112 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 			payload: { request: structuredClone(d) }
 		}), this.host.emitConversationActivity(n.threadId, "notification"), !0;
 	}
-}, wr = 256 * 1024;
-function Tr(e) {
-	return {
-		id: e.id,
-		model: e.model,
-		displayName: e.displayName,
-		description: e.description,
-		hidden: e.hidden,
-		supportedReasoningEfforts: e.supportedReasoningEfforts,
-		defaultReasoningEffort: e.defaultReasoningEffort,
-		...e.serviceTiers.length > 0 ? { serviceTiers: e.serviceTiers.map((e) => ({
-			id: e.id,
-			name: e.name,
-			description: e.description
-		})) } : {},
-		...e.defaultServiceTier ? { defaultServiceTier: e.defaultServiceTier } : {},
-		isDefault: e.isDefault,
-		providerMetadata: {
-			inputModalities: e.inputModalities,
-			serviceTiers: e.serviceTiers,
-			supportsPersonality: e.supportsPersonality,
-			upgrade: e.upgrade,
-			upgradeInfo: e.upgradeInfo
-		}
-	};
-}
-async function Er(e, t) {
-	return Promise.all(e.filter((e) => e.enabled).map((e) => Dr(e, t)));
-}
-async function Dr(e, t) {
-	let n = K(e.interface?.brandColor), r = Nr(e.interface?.defaultPrompt), [i, a] = await Promise.all([e.interface?.iconSmall ? t(e.interface.iconSmall) : void 0, e.interface?.iconLarge ? t(e.interface.iconLarge) : void 0]);
-	return {
-		name: e.name,
-		description: e.description,
-		shortDescription: e.shortDescription ?? e.interface?.shortDescription,
-		displayName: e.interface?.displayName,
-		iconSmall: i,
-		iconLarge: a,
-		...n ? { brandColor: n } : {},
-		...r === void 0 ? {} : { defaultPrompt: r },
-		path: e.path,
-		scope: e.scope,
-		enabled: e.enabled
-	};
-}
-async function Or(e, t) {
-	let n = e.interface, r = Ar(n?.composerIconUrl), i = Ar(n?.logoUrl), a = Ar(n?.logoUrlDark), o = K(n?.displayName) ?? e.name, s = K(n?.shortDescription), c = K(n?.longDescription), l = K(n?.brandColor), u = r ?? i ?? await kr([n?.composerIcon, n?.logo], t), d = r ?? a ?? i ?? await kr([
-		n?.composerIcon,
-		n?.logoDark,
-		n?.logo
-	], t);
-	return {
-		id: e.id,
-		name: e.name,
-		displayName: o,
-		...s ? { shortDescription: s } : {},
-		...c ? { longDescription: c } : {},
-		...l ? { brandColor: l } : {},
-		...u ? { iconUrl: u } : {},
-		...d ? { iconUrlDark: d } : {},
-		enabled: e.enabled
-	};
-}
-async function kr(e, t) {
-	for (let n of e) {
-		if (!n) continue;
-		let e = await t(n);
-		if (e) return e;
-	}
-}
-function Ar(e) {
-	let t = K(e);
-	try {
-		return new URL(t).protocol === "https:" ? t : void 0;
-	} catch {}
-}
-function jr(e) {
-	switch (_(e).toLowerCase()) {
-		case ".avif": return "image/avif";
-		case ".bmp": return "image/bmp";
-		case ".gif": return "image/gif";
-		case ".ico": return "image/x-icon";
-		case ".jpeg":
-		case ".jpg": return "image/jpeg";
-		case ".png": return "image/png";
-		case ".svg": return "image/svg+xml";
-		case ".webp": return "image/webp";
-	}
-}
-function Mr(e, t) {
-	let n = t.trim();
-	if (!/^[a-z\d+/]+={0,2}$/i.test(n)) return;
-	let r = n.replace(/=+$/, "");
-	if (r.length % 4 == 1) return;
-	let i = n.length - r.length, a = (4 - r.length % 4) % 4;
-	if (!(i !== 0 && i !== a) && !(Math.floor(r.length * 3 / 4) > wr)) return `data:${e};base64,${`${r}${"=".repeat((4 - r.length % 4) % 4)}`}`;
-}
-function K(e) {
-	return (typeof e == "string" ? e.trim() : void 0) || void 0;
-}
-function Nr(e) {
-	return typeof e == "string" ? e : void 0;
-}
-//#endregion
-//#region src/node/codex-surface-settings.ts
-function q(e, t) {
-	return e.find((e) => e.id === t || e.model === t) ?? e.find((e) => e.isDefault) ?? e[0] ?? null;
-}
-function Pr(e, t) {
-	let n = e.find((e) => e.id === t || e.model === t);
-	if (!n) throw Error(`Unknown model '${t}'`);
-	return n;
-}
-function Fr(e, t) {
-	if (!t) return;
-	if (!e) throw Error(`Cannot select reasoning effort '${t}' without a model`);
-	let n = e.supportedReasoningEfforts?.map((e) => e.reasoningEffort) ?? [];
-	if (n.length > 0 && !n.includes(t)) throw Error(`Reasoning effort '${t}' is not available for '${e.displayName}'`);
-}
-function J(e) {
-	return e.defaultReasoningEffort ?? e.supportedReasoningEfforts?.[0]?.reasoningEffort ?? null;
-}
-function Ir(e) {
-	return e.defaultServiceTier ?? null;
-}
-function Y(e, t) {
-	if (!t) return;
-	if (!e) throw Error(`Cannot select service tier '${t}' without a model`);
-	if (t === "default" || t === e.defaultServiceTier) return;
-	let n = e.serviceTiers?.map((e) => e.id) ?? [];
-	if (n.length > 0 && !n.includes(t)) throw Error(`Service tier '${t}' is not available for '${e.displayName}'`);
-}
-function Lr(e, t) {
-	let n = new Set(e.filter((e) => e.allowed).map((e) => e.id)), r = [];
-	return n.has(":workspace") && X(t?.allowedApprovalPolicies, "on-request") && X(t?.allowedApprovalsReviewers, "user") && r.push("ask-for-approval"), n.has(":workspace") && X(t?.allowedApprovalPolicies, "on-request") && X(t?.allowedApprovalsReviewers, "auto_review") && r.push("approve-for-me"), (n.has(":danger-full-access") || n.has(":danger-no-sandbox")) && X(t?.allowedApprovalPolicies, "never") && X(t?.allowedApprovalsReviewers, "user") && r.push("full-access"), r;
-}
-function X(e, t) {
-	return !Array.isArray(e) || e.length === 0 || e.includes(t);
-}
-function Rr(e) {
-	return e === "full-access" ? {
-		approvalPolicy: "never",
-		approvalsReviewer: "user",
-		permissions: ":danger-full-access"
-	} : {
-		approvalPolicy: "on-request",
-		approvalsReviewer: e === "approve-for-me" ? "auto_review" : "user",
-		permissions: ":workspace"
-	};
-}
-function zr(e) {
-	return Rr(e);
-}
-function Br(e, t, n, r) {
-	let i = r?.id;
-	return e === "never" && (n.type === "dangerFullAccess" || i === ":danger-full-access" || i === ":danger-no-sandbox") ? "full-access" : e === "on-request" && (t === "auto_review" || t === "guardian_subagent") ? "approve-for-me" : e === "on-request" ? "ask-for-approval" : null;
-}
-function Vr(e, t, n) {
-	let r = q(t, e.model);
-	return {
-		approvalPreset: Br(e.approvalPolicy, e.approvalsReviewer, e.sandbox, e.activePermissionProfile) ?? n.approvalPreset,
-		planMode: n.planMode,
-		selectedModelId: r?.id ?? n.selectedModelId,
-		selectedReasoningEffort: e.reasoningEffort ?? (r ? J(r) : null),
-		selectedServiceTier: e.serviceTier === void 0 ? r ? Ir(r) : null : e.serviceTier
-	};
-}
-function Hr(e, t, n) {
-	let r = q(t, e.model);
-	return {
-		approvalPreset: Br(e.approvalPolicy, e.approvalsReviewer, e.sandboxPolicy, e.activePermissionProfile) ?? n.approvalPreset,
-		planMode: e.collaborationMode.mode === "plan",
-		selectedModelId: r?.id ?? n.selectedModelId,
-		selectedReasoningEffort: e.effort ?? (r ? J(r) : null),
-		selectedServiceTier: e.serviceTier === void 0 ? r ? Ir(r) : null : e.serviceTier
-	};
-}
-function Ur(e, t) {
-	let n = q(e.models, e.selectedModelId);
-	if (t.modelId && (n = e.models.find((e) => e.id === t.modelId) ?? null, !n)) throw Error(`Unknown model '${t.modelId}'`);
-	let r = t.reasoningEffort ?? e.selectedReasoningEffort, i = t.serviceTier === void 0 ? e.selectedServiceTier ?? null : t.serviceTier, a = n?.supportedReasoningEfforts?.map((e) => e.reasoningEffort) ?? [];
-	if (t.reasoningEffort && a.length > 0 && !a.includes(t.reasoningEffort)) throw Error(`Reasoning effort '${t.reasoningEffort}' is not available for '${n.displayName}'`);
-	return t.modelId && a.length > 0 && (!r || !a.includes(r)) && (r = n ? J(n) : null), t.serviceTier !== void 0 && Y(n, i), t.serviceTier === void 0 && t.modelId && i && !n.serviceTiers?.some((e) => e.id === i) && (i = n ? Ir(n) : null), {
-		approvalPreset: t.approvalPreset ?? e.approvalPreset,
-		planMode: t.planMode ?? e.planMode,
-		selectedModelId: n?.id ?? null,
-		selectedReasoningEffort: r,
-		selectedServiceTier: i
-	};
-}
-function Wr(e, t, n) {
-	return {
-		mode: e ? "plan" : "default",
-		settings: {
-			model: t,
-			reasoning_effort: n,
-			developer_instructions: null
-		}
-	};
-}
-function Gr(e, t) {
-	let n = q(e.models, e.selectedModelId), r = t.model ?? n?.model, i = t.reasoningEffort ?? e.selectedReasoningEffort, a = t.planMode ?? e.planMode;
-	return {
-		...r ? { model: r } : {},
-		...i ? { effort: i } : {},
-		...r ? { collaborationMode: Wr(a, r, i) } : {},
-		...t.serviceTier === void 0 ? e.selectedServiceTier ? { serviceTier: e.selectedServiceTier } : {} : { serviceTier: t.serviceTier }
-	};
-}
-//#endregion
-//#region src/node/codex-surface-data.ts
-function Z(e) {
-	let t = e.preview.trim(), n = t.split("\n")[0];
-	return {
-		id: e.id,
-		...e.sessionId ? { sessionId: e.sessionId } : {},
-		...e.parentThreadId ? { parentConversationId: e.parentThreadId } : {},
-		...e.agentNickname ? { agentNickname: e.agentNickname } : {},
-		...e.agentRole ? { agentRole: e.agentRole } : {},
-		title: e.name?.trim() || n.trim() || "Untitled conversation",
-		preview: t,
-		cwd: e.cwd,
-		status: e.status.type === "active" ? "active" : e.status.type === "systemError" ? "error" : "idle",
-		turnCount: e.turns.length,
-		createdAt: (/* @__PURE__ */ new Date(e.createdAt * 1e3)).toISOString(),
-		updatedAt: (/* @__PURE__ */ new Date((e.recencyAt ?? e.updatedAt) * 1e3)).toISOString()
-	};
-}
-function Kr(e, t) {
-	let n = new Map(e.map((e) => [e.id, e])), r = t.map((e) => {
-		let t = n.get(e.id);
-		return t && ie(t, e) ? t : e;
-	});
-	return r.length === e.length && r.every((t, n) => t === e[n]) ? e : r;
-}
-function Q(e, t) {
-	return [t, ...e.filter((e) => e.id !== t.id)].sort((e, t) => t.updatedAt.localeCompare(e.updatedAt));
-}
-function qr(e, t) {
-	let n = t.model ? Pr(e.models, t.model) : q(e.models, e.selectedModelId);
-	return Fr(n, t.reasoningEffort), Y(n, t.serviceTier), {
-		...t,
-		...t.attachments ? { attachments: Jr(t.attachments) } : {},
-		...t.model && n ? { model: n.model } : {}
+}, $r = 256 * 1024;
+function ei(e) {
+	return {
+		id: e.id,
+		model: e.model,
+		displayName: e.displayName,
+		description: e.description,
+		hidden: e.hidden,
+		supportedReasoningEfforts: e.supportedReasoningEfforts,
+		defaultReasoningEffort: e.defaultReasoningEffort,
+		...e.serviceTiers.length > 0 ? { serviceTiers: e.serviceTiers.map((e) => ({
+			id: e.id,
+			name: e.name,
+			description: e.description
+		})) } : {},
+		...e.defaultServiceTier ? { defaultServiceTier: e.defaultServiceTier } : {},
+		isDefault: e.isDefault,
+		providerMetadata: {
+			inputModalities: e.inputModalities,
+			serviceTiers: e.serviceTiers,
+			supportsPersonality: e.supportsPersonality,
+			upgrade: e.upgrade,
+			upgradeInfo: e.upgradeInfo
+		}
 	};
 }
-function Jr(e) {
-	return e.map((e) => {
-		let t = e.path.trim();
-		if (!t) throw Error("Attachment paths cannot be empty");
-		if (!v(t)) throw Error(`Attachment path must be absolute: '${t}'`);
-		if (e.type === "image") return {
-			...e,
-			path: t
-		};
-		let n = e.name?.trim();
-		return {
-			...e,
-			path: t,
-			...n ? { name: n } : {}
-		};
-	});
+async function ti(e, t) {
+	return Promise.all(e.filter((e) => e.enabled).map((e) => ni(e, t)));
 }
-function Yr(e) {
-	return e.type === "image" ? {
-		type: "localImage",
+async function ni(e, t) {
+	let n = $(e.interface?.brandColor), r = ci(e.interface?.defaultPrompt), [i, a] = await Promise.all([e.interface?.iconSmall ? t(e.interface.iconSmall) : void 0, e.interface?.iconLarge ? t(e.interface.iconLarge) : void 0]);
+	return {
+		name: e.name,
+		description: e.description,
+		shortDescription: e.shortDescription ?? e.interface?.shortDescription,
+		displayName: e.interface?.displayName,
+		iconSmall: i,
+		iconLarge: a,
+		...n ? { brandColor: n } : {},
+		...r === void 0 ? {} : { defaultPrompt: r },
 		path: e.path,
-		...e.detail === void 0 ? {} : { detail: e.detail }
-	} : Nt(e.name ?? g(e.path), e.path);
-}
-function Xr(e) {
-	let t = e.name?.trim() || g(e.path);
-	return e.type === "image" ? {
-		type: "attachment",
-		attachment: {
-			kind: "image",
-			name: t,
-			path: e.path,
-			url: e.previewUrl ?? re(e.path).href,
-			...e.mimeType ? { mimeType: e.mimeType } : {}
-		}
-	} : {
-		type: "attachment",
-		attachment: {
-			kind: "file",
-			name: t,
-			path: e.path,
-			...e.mimeType ? { mimeType: e.mimeType } : {}
-		}
+		scope: e.scope,
+		enabled: e.enabled
 	};
 }
-function Zr(e) {
-	let t = e.metadata?.turnId;
-	return e.turnId ?? (typeof t == "string" ? t : null);
-}
-function Qr(e) {
-	return e.parts.filter((e) => e.type === "text").map((e) => e.text).join("\n").trim();
-}
-function $r(e) {
-	return e.parts.flatMap((e) => {
-		if (e.type !== "attachment") return [];
-		let t = e.attachment, n = t.path;
-		return n ? t.kind === "image" ? [{
-			type: "image",
-			path: n,
-			name: t.name,
-			...t.mimeType ? { mimeType: t.mimeType } : {},
-			...t.url?.startsWith("data:image/") ? { previewUrl: t.url } : {}
-		}] : [{
-			type: "file",
-			path: n,
-			name: t.name,
-			...t.mimeType ? { mimeType: t.mimeType } : {}
-		}] : [];
-	});
-}
-function ei(e) {
-	let t = e.modelContextWindow, n = e.last.totalTokens, r = typeof t == "number" && t > 0 ? Math.min(100, Math.max(0, n / t * 100)) : null;
+async function ri(e, t) {
+	let n = e.interface, r = ai(n?.composerIconUrl), i = ai(n?.logoUrl), a = ai(n?.logoUrlDark), o = $(n?.displayName) ?? e.name, s = $(n?.shortDescription), c = $(n?.longDescription), l = $(n?.brandColor), u = r ?? i ?? await ii([n?.composerIcon, n?.logo], t), d = r ?? a ?? i ?? await ii([
+		n?.composerIcon,
+		n?.logoDark,
+		n?.logo
+	], t);
 	return {
-		totalTokens: e.total.totalTokens,
-		inputTokens: e.total.inputTokens,
-		cachedInputTokens: e.total.cachedInputTokens,
-		outputTokens: e.total.outputTokens,
-		reasoningOutputTokens: e.total.reasoningOutputTokens,
-		lastTotalTokens: e.last.totalTokens,
-		modelContextWindow: t,
-		usedPercent: r
+		id: e.id,
+		name: e.name,
+		displayName: o,
+		...s ? { shortDescription: s } : {},
+		...c ? { longDescription: c } : {},
+		...l ? { brandColor: l } : {},
+		...u ? { iconUrl: u } : {},
+		...d ? { iconUrlDark: d } : {},
+		enabled: e.enabled
 	};
 }
-function $(e) {
-	return e.type === "active" ? {
-		type: "active",
-		activeFlags: [...e.activeFlags]
-	} : { type: e.type };
+async function ii(e, t) {
+	for (let n of e) {
+		if (!n) continue;
+		let e = await t(n);
+		if (e) return e;
+	}
 }
-function ti(e) {
-	return e.type === "active" ? "active" : e.type === "systemError" ? "error" : "idle";
+function ai(e) {
+	let t = $(e);
+	try {
+		return new URL(t).protocol === "https:" ? t : void 0;
+	} catch {}
 }
-function ni(e) {
-	let t = e.rateLimitsByLimitId ? Object.fromEntries(Object.entries(e.rateLimitsByLimitId).filter((e) => !!e[1]).map(([e, t]) => [e, ri(t)])) : null;
-	return {
-		rateLimits: ri(e.rateLimits),
-		rateLimitsByLimitId: t,
-		rateLimitResetCredits: e.rateLimitResetCredits ? {
-			availableCount: String(e.rateLimitResetCredits.availableCount),
-			credits: e.rateLimitResetCredits.credits?.map((e) => ({ ...e })) ?? null
-		} : null
-	};
+function oi(e) {
+	switch (_(e).toLowerCase()) {
+		case ".avif": return "image/avif";
+		case ".bmp": return "image/bmp";
+		case ".gif": return "image/gif";
+		case ".ico": return "image/x-icon";
+		case ".jpeg":
+		case ".jpg": return "image/jpeg";
+		case ".png": return "image/png";
+		case ".svg": return "image/svg+xml";
+		case ".webp": return "image/webp";
+	}
 }
-function ri(e) {
-	return {
-		limitId: e.limitId,
-		limitName: e.limitName,
-		primary: e.primary ? { ...e.primary } : null,
-		secondary: e.secondary ? { ...e.secondary } : null,
-		credits: e.credits ? { ...e.credits } : null,
-		individualLimit: e.individualLimit ? { ...e.individualLimit } : null,
-		planType: e.planType,
-		rateLimitReachedType: e.rateLimitReachedType
-	};
+function si(e, t) {
+	let n = t.trim();
+	if (!/^[a-z\d+/]+={0,2}$/i.test(n)) return;
+	let r = n.replace(/=+$/, "");
+	if (r.length % 4 == 1) return;
+	let i = n.length - r.length, a = (4 - r.length % 4) % 4;
+	if (!(i !== 0 && i !== a) && !(Math.floor(r.length * 3 / 4) > $r)) return `data:${e};base64,${`${r}${"=".repeat((4 - r.length % 4) % 4)}`}`;
 }
-function ii(e, t) {
-	let n = ri(t);
-	if (!e) return {
-		rateLimits: n,
-		rateLimitsByLimitId: n.limitId ? { [n.limitId]: n } : null,
-		rateLimitResetCredits: null
-	};
-	let r = ai(e.rateLimits, n), i = e.rateLimitsByLimitId ? { ...e.rateLimitsByLimitId } : {};
-	return r.limitId && (i[r.limitId] = ai(i[r.limitId] ?? r, n)), {
-		...e,
-		rateLimits: r,
-		rateLimitsByLimitId: Object.keys(i).length > 0 ? i : null
-	};
+function $(e) {
+	return (typeof e == "string" ? e.trim() : void 0) || void 0;
 }
-function ai(e, t) {
-	return {
-		limitId: t.limitId ?? e.limitId,
-		limitName: t.limitName ?? e.limitName,
-		primary: t.primary ? {
-			...e.primary ?? {},
-			...t.primary
-		} : e.primary,
-		secondary: t.secondary ? {
-			...e.secondary ?? {},
-			...t.secondary
-		} : e.secondary,
-		credits: t.credits ? {
-			...e.credits ?? {},
-			...t.credits
-		} : e.credits,
-		individualLimit: t.individualLimit ? {
-			...e.individualLimit ?? {},
-			...t.individualLimit
-		} : e.individualLimit,
-		planType: t.planType ?? e.planType,
-		rateLimitReachedType: t.rateLimitReachedType ?? e.rateLimitReachedType
-	};
+function ci(e) {
+	return typeof e == "string" ? e : void 0;
 }
 //#endregion
 //#region src/node/codex-surface-catalog-controller.ts
-var oi = class {
+var li = class {
 	client;
 	cwd;
 	host;
@@ -3767,7 +3799,7 @@ var oi = class {
 	async loadSkills(e = !1, t = "action") {
 		e && this.iconDataUrls.clear(), this.host.patch({ skillCatalogStatus: "loading" }), this.emitSkills(this.cwd ?? null, [], "loading", t);
 		try {
-			let n = await Er((await this.client.request("skills/list", {
+			let n = await ti((await this.client.request("skills/list", {
 				...this.cwd ? { cwds: [this.cwd] } : {},
 				forceReload: e
 			})).data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e));
@@ -3784,7 +3816,7 @@ var oi = class {
 	}
 	async listSkills(e = {}) {
 		await this.host.ensureConnected(), e.forceReload && this.iconDataUrls.clear();
-		let t = await Er((await this.client.request("skills/list", {
+		let t = await ti((await this.client.request("skills/list", {
 			...e.cwd ? { cwds: [e.cwd] } : {},
 			forceReload: e.forceReload ?? !1
 		})).data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e));
@@ -3796,7 +3828,7 @@ var oi = class {
 	}
 	async loadPermissionProfiles() {
 		try {
-			let e = await this.requestPermissionProfiles(this.cwd), t = (await this.client.request("configRequirements/read", void 0)).requirements, n = Lr(e, t), r = this.host.preferredApprovalPreset();
+			let e = await this.requestPermissionProfiles(this.cwd), t = (await this.client.request("configRequirements/read", void 0)).requirements, n = Nt(e, t), r = this.host.preferredApprovalPreset();
 			this.host.patch({
 				permissionProfiles: e,
 				approvalPresets: n,
@@ -3812,7 +3844,7 @@ var oi = class {
 	}
 	async loadRateLimits() {
 		try {
-			let e = ni(await this.client.request("account/rateLimits/read", void 0));
+			let e = $t(await this.client.request("account/rateLimits/read", void 0));
 			this.host.patch({ rateLimits: e }), this.host.emitEvent("action", {
 				type: "rateLimits.changed",
 				payload: { rateLimits: structuredClone(e) }
@@ -3838,12 +3870,12 @@ var oi = class {
 		}), (async () => ({
 			profiles: await this.requestPermissionProfiles(e),
 			requirements: (await this.client.request("configRequirements/read", void 0)).requirements
-		}))()]), a = r.status === "fulfilled" ? await Er(r.value.data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e)) : [], o = i.status === "fulfilled" ? i.value.profiles : [];
+		}))()]), a = r.status === "fulfilled" ? await ti(r.value.data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e)) : [], o = i.status === "fulfilled" ? i.value.profiles : [];
 		return {
 			skills: a,
 			skillCatalogStatus: r.status === "fulfilled" ? "loaded" : "error",
 			permissionProfiles: o,
-			approvalPresets: i.status === "fulfilled" ? Lr(o, i.value.requirements) : []
+			approvalPresets: i.status === "fulfilled" ? Nt(o, i.value.requirements) : []
 		};
 	}
 	schedulePluginRefresh(e = !1) {
@@ -3870,18 +3902,18 @@ var oi = class {
 				cursor: n,
 				includeHidden: e
 			});
-			t.push(...r.data.map(Tr)), n = r.nextCursor;
+			t.push(...r.data.map(ei)), n = r.nextCursor;
 		} while (n);
 		return t;
 	}
 	applyModels(e, t) {
-		let n = q(e, this.host.getState().selectedModelId);
+		let n = k(e, this.host.getState().selectedModelId);
 		this.host.patch({
 			models: e,
 			modelCatalogStatus: "loaded",
 			selectedModelId: n?.id ?? null,
-			selectedReasoningEffort: n ? J(n) : null,
-			selectedServiceTier: n ? Ir(n) : null
+			selectedReasoningEffort: n ? A(n) : null,
+			selectedServiceTier: n ? Mt(n) : null
 		}), this.emitModels(e, "loaded", t);
 	}
 	emitModels(e, t, n = "action") {
@@ -3940,7 +3972,7 @@ var oi = class {
 		try {
 			let t = await this.client.request("plugin/installed", { ...e.length > 0 ? { cwds: [...e] } : {} }), n = /* @__PURE__ */ new Map();
 			for (let e of t.marketplaces) for (let t of e.plugins) n.has(t.id) || n.set(t.id, t);
-			let r = Kr(this.host.getState().plugins, await Promise.all([...n.values()].map((e) => Or(e, (e) => this.iconDataUrl(e)))));
+			let r = Ht(this.host.getState().plugins, await Promise.all([...n.values()].map((e) => ri(e, (e) => this.iconDataUrl(e)))));
 			if (this.host.isClosed() || this.host.authenticationBlocksBootstrap()) return;
 			this.host.patch({
 				plugins: r,
@@ -3971,9 +4003,9 @@ var oi = class {
 	}
 	async readIconDataUrl(e) {
 		if (!v(e)) return;
-		let t = jr(e);
+		let t = oi(e);
 		if (t) try {
-			return Mr(t, (await this.client.request("fs/readFile", { path: e })).dataBase64);
+			return si(t, (await this.client.request("fs/readFile", { path: e })).dataBase64);
 		} catch {
 			return;
 		}
@@ -3981,18 +4013,18 @@ var oi = class {
 };
 //#endregion
 //#region src/node/codex-approvals.ts
-function si(e, t) {
+function ui(e, t) {
 	let n = [
 		e.onServerRequest("item/commandExecution/requestApproval", (e, n) => (t({
-			approval: ci(e.id, e.params),
-			resolve: (t, r) => n.resolve({ decision: di(e.params, t, r) })
+			approval: di(e.id, e.params),
+			resolve: (t, r) => n.resolve({ decision: mi(e.params, t, r) })
 		}), !0)),
 		e.onServerRequest("item/fileChange/requestApproval", (e, n) => (t({
-			approval: li(e.id, e.params),
+			approval: fi(e.id, e.params),
 			resolve: (e, t) => n.resolve({ decision: e === "deny" ? "decline" : t === "session" ? "acceptForSession" : "accept" })
 		}), !0)),
 		e.onServerRequest("item/permissions/requestApproval", (e, n) => (t({
-			approval: ui(e.id, e.params),
+			approval: pi(e.id, e.params),
 			resolve: (t, r) => n.resolve({
 				permissions: t === "deny" ? {} : {
 					...e.params.permissions.fileSystem ? { fileSystem: e.params.permissions.fileSystem } : {},
@@ -4030,8 +4062,8 @@ function si(e, t) {
 		for (let e of n) e();
 	};
 }
-function ci(e, t) {
-	let n = t.availableDecisions, r = fi(t.additionalPermissions), i = [...t.networkApprovalContext ? [{
+function di(e, t) {
+	let n = t.availableDecisions, r = hi(t.additionalPermissions), i = [...t.networkApprovalContext ? [{
 		kind: "network",
 		enabled: !0,
 		host: t.networkApprovalContext.host,
@@ -4054,7 +4086,7 @@ function ci(e, t) {
 		} : {}
 	};
 }
-function li(e, t) {
+function fi(e, t) {
 	return {
 		id: String(e),
 		kind: "file-change",
@@ -4065,8 +4097,8 @@ function li(e, t) {
 		...t.reason || t.grantRoot ? { description: t.reason ?? `Write under ${t.grantRoot}` } : {}
 	};
 }
-function ui(e, t) {
-	let n = fi(t.permissions);
+function pi(e, t) {
+	let n = hi(t.permissions);
 	return {
 		id: String(e),
 		kind: "permissions",
@@ -4079,13 +4111,13 @@ function ui(e, t) {
 		...n.length ? { requestedPermissions: n } : {}
 	};
 }
-function di(e, t, n) {
+function mi(e, t, n) {
 	let r = e.availableDecisions, i = t === "deny" ? "decline" : n === "session" ? "acceptForSession" : "accept";
 	if (!r || r.includes(i)) return i;
 	if (t === "deny" && r.includes("cancel")) return "cancel";
 	throw Error(`Approval decision '${t}:${n}' is not available for this command`);
 }
-function fi(e) {
+function hi(e) {
 	if (!e) return [];
 	let t = [];
 	if (e.network && t.push({
@@ -4105,12 +4137,12 @@ function fi(e) {
 		for (let n of e.fileSystem.entries ?? []) t.push({
 			kind: "filesystem",
 			access: n.access,
-			path: pi(n.path)
+			path: gi(n.path)
 		});
 	}
 	return t;
 }
-function pi(e) {
+function gi(e) {
 	if (e.type === "path") return e.path;
 	if (e.type === "glob_pattern") return e.pattern;
 	let t = e.value;
@@ -4125,12 +4157,12 @@ function pi(e) {
 }
 //#endregion
 //#region src/node/codex-surface-approvals-controller.ts
-var mi = class {
+var _i = class {
 	host;
 	pending = /* @__PURE__ */ new Map();
 	unsubscribeHandler;
 	constructor(e, t) {
-		this.host = t, this.unsubscribeHandler = si(e, (e) => this.add(e));
+		this.host = t, this.unsubscribeHandler = ui(e, (e) => this.add(e));
 	}
 	close() {
 		this.unsubscribeHandler(), this.pending.clear();
@@ -4211,7 +4243,7 @@ var mi = class {
 };
 //#endregion
 //#region src/node/codex-surface-mcp.ts
-function hi(e) {
+function vi(e) {
 	if (!Array.isArray(e)) throw TypeError("Codex MCP servers must be an array");
 	let t = /* @__PURE__ */ new Set();
 	return e.map((e, n) => {
@@ -4220,10 +4252,10 @@ function hi(e) {
 		if (!r || !/^[A-Za-z0-9][A-Za-z0-9_-]*$/.test(r)) throw TypeError(`Codex MCP server ${n + 1} name must match ^[A-Za-z0-9][A-Za-z0-9_-]*$`);
 		if (t.has(r)) throw Error(`Duplicate Codex MCP server '${r}'`);
 		t.add(r);
-		let i = gi(e.transport, r), a = e.toolApprovalMode;
+		let i = yi(e.transport, r), a = e.toolApprovalMode;
 		if (a !== void 0 && a !== "auto" && a !== "prompt" && a !== "writes" && a !== "approve") throw TypeError(`Codex MCP server '${r}' tool approval mode is invalid`);
 		if (e.required !== void 0 && typeof e.required != "boolean") throw TypeError(`Codex MCP server '${r}' required flag must be a boolean`);
-		let o = e.enabledTools === void 0 ? void 0 : _i(e.enabledTools, `Codex MCP server '${r}' enabled tool`), s = yi(e.startupTimeoutMs, `Codex MCP server '${r}' startup timeout`), c = yi(e.toolTimeoutMs, `Codex MCP server '${r}' tool timeout`);
+		let o = e.enabledTools === void 0 ? void 0 : bi(e.enabledTools, `Codex MCP server '${r}' enabled tool`), s = Si(e.startupTimeoutMs, `Codex MCP server '${r}' startup timeout`), c = Si(e.toolTimeoutMs, `Codex MCP server '${r}' tool timeout`);
 		return {
 			name: r,
 			transport: i,
@@ -4235,7 +4267,7 @@ function hi(e) {
 		};
 	});
 }
-function gi(e, t) {
+function yi(e, t) {
 	if (!e || typeof e != "object" || Array.isArray(e)) throw TypeError(`Codex MCP server '${t}' transport must be an object`);
 	if (e.type === "http") {
 		let n = e.url?.trim(), r;
@@ -4253,7 +4285,7 @@ function gi(e, t) {
 	if (e.type !== "stdio") throw TypeError(`Codex MCP server '${t}' transport type is invalid`);
 	let n = e.command?.trim();
 	if (!n) throw TypeError(`Codex MCP server '${t}' command cannot be empty`);
-	let r = e.args === void 0 ? void 0 : _i(e.args, `Codex MCP server '${t}' argument`), i = e.cwd?.trim();
+	let r = e.args === void 0 ? void 0 : bi(e.args, `Codex MCP server '${t}' argument`), i = e.cwd?.trim();
 	if (i !== void 0 && (!i || !v(i))) throw TypeError(`Codex MCP server '${t}' cwd must be an absolute path`);
 	let a;
 	if (e.env !== void 0) {
@@ -4264,7 +4296,7 @@ function gi(e, t) {
 			a[n] = r;
 		}
 	}
-	let o = e.envVars === void 0 ? void 0 : vi(e.envVars, t);
+	let o = e.envVars === void 0 ? void 0 : xi(e.envVars, t);
 	return {
 		type: "stdio",
 		command: n,
@@ -4274,7 +4306,7 @@ function gi(e, t) {
 		...o === void 0 ? {} : { envVars: o }
 	};
 }
-function _i(e, t) {
+function bi(e, t) {
 	if (!Array.isArray(e)) throw TypeError(`${t}s must be an array`);
 	let n = e.map((e) => {
 		if (typeof e != "string" || !e.trim()) throw TypeError(`${t} cannot be empty`);
@@ -4282,18 +4314,18 @@ function _i(e, t) {
 	});
 	return [...new Set(n)];
 }
-function vi(e, t) {
-	let n = _i(e, `Codex MCP server '${t}' environment variable`);
+function xi(e, t) {
+	let n = bi(e, `Codex MCP server '${t}' environment variable`);
 	for (let e of n) if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(e)) throw TypeError(`Codex MCP server '${t}' environment variable '${e}' is invalid`);
 	return n;
 }
-function yi(e, t) {
+function Si(e, t) {
 	if (e !== void 0) {
 		if (!Number.isFinite(e) || e <= 0) throw TypeError(`${t} must be a positive finite number`);
 		return e;
 	}
 }
-function bi(e) {
+function Ci(e) {
 	let t = {};
 	for (let n of e) {
 		let e = n.transport.type === "http" ? { url: n.transport.url } : {
@@ -4307,7 +4339,7 @@ function bi(e) {
 	}
 	return t;
 }
-function xi(e, t) {
+function wi(e, t) {
 	if (t.length !== 0) for (let n of Object.keys(e)) {
 		if (n === "mcp_servers") throw Error("Raw mcp_servers config cannot be combined with typed Codex MCP servers");
 		for (let e of t) {
@@ -4318,13 +4350,13 @@ function xi(e, t) {
 }
 //#endregion
 //#region src/node/codex-surface-extensions-controller.ts
-var Si = class {
+var Ti = class {
 	extensions;
 	hostOptionsForThread;
 	dynamicTools = /* @__PURE__ */ new Map();
 	defaultMcpServers;
 	constructor(e, t, n) {
-		this.extensions = e, this.hostOptionsForThread = n, this.defaultMcpServers = hi(t);
+		this.extensions = e, this.hostOptionsForThread = n, this.defaultMcpServers = vi(t);
 		for (let t of e) for (let e of t.dynamicTools ?? []) {
 			let t = e.name.trim();
 			if (!t) throw Error("Dynamic tool names cannot be empty");
@@ -4348,13 +4380,13 @@ var Si = class {
 		}));
 	}
 	async conversationExtension(e, t = {}, n = this.defaultMcpServers) {
-		let r = bi(n), i = [], a;
+		let r = Ci(n), i = [], a;
 		for (let t of this.extensions) {
 			if (!t.configureConversation) continue;
 			let o = await t.configureConversation(e);
-			o.config && (xi(o.config, n), Object.assign(r, o.config)), o.baseInstructions !== void 0 && (a = o.baseInstructions), o.developerInstructions?.trim() && i.push(o.developerInstructions.trim());
+			o.config && (wi(o.config, n), Object.assign(r, o.config)), o.baseInstructions !== void 0 && (a = o.baseInstructions), o.developerInstructions?.trim() && i.push(o.developerInstructions.trim());
 		}
-		return t.config && (xi(t.config, n), Object.assign(r, t.config)), t.baseInstructions !== void 0 && (a = t.baseInstructions), t.developerInstructions?.trim() && i.push(t.developerInstructions.trim()), {
+		return t.config && (wi(t.config, n), Object.assign(r, t.config)), t.baseInstructions !== void 0 && (a = t.baseInstructions), t.developerInstructions?.trim() && i.push(t.developerInstructions.trim()), {
 			...a === void 0 ? {} : { baseInstructions: a },
 			...Object.keys(r).length === 0 ? {} : { config: r },
 			...i.length === 0 ? {} : { developerInstructions: i.join("\n\n") }
@@ -4413,7 +4445,7 @@ var Si = class {
 			});
 		}
 	}
-}, Ci = 50, wi = 25, Ti = 25, Ei = class {
+}, Ei = 50, Di = 25, Oi = 25, ki = class {
 	client;
 	conversationLimit;
 	host;
@@ -4432,7 +4464,7 @@ var Si = class {
 		return await this.host.ensureConnected(), this.load();
 	}
 	async load() {
-		let e = Kr(this.host.getState().conversations, await this.requestConversations({ limit: this.conversationLimit }));
+		let e = Ht(this.host.getState().conversations, await this.requestConversations({ limit: this.conversationLimit }));
 		this.host.patch({ conversations: e }), this.host.schedulePluginRefresh(!0);
 		for (let t of e) this.host.emitSummaryUpserted(t, "listed", "action");
 		return this.host.getSnapshot();
@@ -4465,7 +4497,7 @@ var Si = class {
 		let n = await this.client.request("thread/unarchive", { threadId: t });
 		if (n.thread.id !== t) throw Error(`Codex thread/unarchive returned '${n.thread.id}' for requested thread '${t}'`);
 		let r = this.summaryWithKnownTurnCount(n.thread);
-		return this.host.patch({ conversations: Q(this.host.getState().conversations, r) }), this.host.emitSummaryUpserted(r, "updated", "action"), this.host.getSnapshot();
+		return this.host.patch({ conversations: P(this.host.getState().conversations, r) }), this.host.emitSummaryUpserted(r, "updated", "action"), this.host.getSnapshot();
 	}
 	hydrateCompleteHistory(e, t = {}) {
 		if (this.host.requireRuntime(e).fullHistoryHydrated && !t.restart) return Promise.resolve();
@@ -4482,7 +4514,7 @@ var Si = class {
 					let t = await this.client.request("thread/turns/list", {
 						threadId: e,
 						cursor: null,
-						limit: Ci,
+						limit: Ei,
 						sortDirection: "desc",
 						itemsView: "full"
 					});
@@ -4530,7 +4562,7 @@ var Si = class {
 					let i = new Set(this.host.requireRuntime(e).turnIds), a = await this.client.request("thread/turns/list", {
 						threadId: e,
 						cursor: t,
-						limit: wi,
+						limit: Di,
 						sortDirection: "desc",
 						itemsView: "full"
 					}), o = [...a.data].reverse(), s = new Set(o.map((e) => e.id).filter((e) => !i.has(e)));
@@ -4561,8 +4593,8 @@ var Si = class {
 	}
 	async emitHistoryChunks(e, t) {
 		for (let n = t.length; n > 0;) {
-			let r = Math.max(0, n - Ti);
-			this.host.emitHistoryPrepended(e, t.slice(r, n), "lifecycle"), await Di(), n = r;
+			let r = Math.max(0, n - Oi);
+			this.host.emitHistoryPrepended(e, t.slice(r, n), "lifecycle"), await Ai(), n = r;
 		}
 	}
 	async refreshCompleteHistory(e) {
@@ -4598,10 +4630,10 @@ var Si = class {
 		let i = /* @__PURE__ */ new Set();
 		r.activeTurnId && i.add(r.activeTurnId);
 		for (let e of t) e.status === "inProgress" && r.turnIds.includes(e.id) && i.add(e.id);
-		let a = new Set(t.filter((e) => !i.has(e.id)).map((e) => e.id)), o = t.filter((e) => a.has(e.id)), s = r.turnIds.filter((e) => !a.has(e)), c = r.turns.filter((e) => !a.has(e.id)), l = r.messages.filter((e) => e.turnId === void 0 || !a.has(e.turnId)), u = Rn(r.messages, o.flatMap((t) => zn(e, t)));
+		let a = new Set(t.filter((e) => !i.has(e.id)).map((e) => e.id)), o = t.filter((e) => a.has(e.id)), s = r.turnIds.filter((e) => !a.has(e)), c = r.turns.filter((e) => !a.has(e.id)), l = r.messages.filter((e) => e.turnId === void 0 || !a.has(e.turnId)), u = pr(r.messages, o.flatMap((t) => mr(e, t)));
 		this.host.patchRuntime(e, {
 			turnIds: [...o.map((e) => e.id), ...s],
-			turns: [...o.map((e) => W(e)), ...c],
+			turns: [...o.map((e) => Z(e)), ...c],
 			messages: [...u, ...l]
 		});
 		let d = this.host.requireRuntime(e).turnIds.length, f = this.host.getState();
@@ -4613,7 +4645,7 @@ var Si = class {
 		return p && this.host.emitSummaryUpserted(p, "updated", "action"), u.filter((e) => e.turnId !== void 0 && n.has(e.turnId));
 	}
 	summaryWithKnownTurnCount(e) {
-		let t = Z(e), n = this.host.runtime(e.id);
+		let t = N(e), n = this.host.runtime(e.id);
 		if (n?.hydrated) return {
 			...t,
 			turnCount: n.turnIds.length
@@ -4625,12 +4657,12 @@ var Si = class {
 		} : t;
 	}
 };
-function Di() {
+function Ai() {
 	return new Promise((e) => setTimeout(e, 0));
 }
 //#endregion
 //#region src/node/codex-surface-conversation-settings-controller.ts
-var Oi = class {
+var ji = class {
 	client;
 	defaults;
 	host;
@@ -4642,7 +4674,7 @@ var Oi = class {
 	}
 	threadStartSettings(e, t) {
 		let n = this.preferredApprovalPreset(), r = e.approvalPreset ?? (e.approvalMode === void 0 && e.permissionMode === void 0 ? t.includes(n ?? "ask-for-approval") ? n : t[0] ?? null : null);
-		if (r) return Rr(r);
+		if (r) return Pt(r);
 		let i = e.approvalMode ?? this.defaults.approvalMode, a = e.permissionMode ?? this.defaults.permissionMode ?? "read-only";
 		return {
 			approvalPolicy: i === "ask" ? "on-request" : "never",
@@ -4668,23 +4700,23 @@ var Oi = class {
 	async update(e) {
 		let t = this.host.getState(), n = t.activeConversationId;
 		if (!n) {
-			let n = Ur(t, e);
+			let n = zt(t, e);
 			if (e.approvalPreset && !t.approvalPresets.includes(e.approvalPreset)) throw Error(`Approval preset '${e.approvalPreset}' is not available`);
 			return this.host.patch(n), this.host.getSnapshot();
 		}
 		return await this.updateForThread(n, e), this.host.getSnapshot();
 	}
 	async updateForThread(e, t) {
-		let n = await this.host.ensureThreadReady(e), r = this.host.snapshotForRuntime(n), i = Ur(r, t), a = n.approvalPreset !== i.approvalPreset || n.selectedModelId !== i.selectedModelId || n.selectedReasoningEffort !== i.selectedReasoningEffort || n.selectedServiceTier !== i.selectedServiceTier || n.planMode !== i.planMode;
+		let n = await this.host.ensureThreadReady(e), r = this.host.snapshotForRuntime(n), i = zt(r, t), a = n.approvalPreset !== i.approvalPreset || n.selectedModelId !== i.selectedModelId || n.selectedReasoningEffort !== i.selectedReasoningEffort || n.selectedServiceTier !== i.selectedServiceTier || n.planMode !== i.planMode;
 		if (t.approvalPreset && !r.approvalPresets.includes(t.approvalPreset)) throw Error(`Approval preset '${t.approvalPreset}' is not available`);
-		let o = q(this.host.getState().models, i.selectedModelId);
+		let o = k(this.host.getState().models, i.selectedModelId);
 		await this.client.request("thread/settings/update", {
 			threadId: e,
-			...t.approvalPreset ? zr(t.approvalPreset) : {},
+			...t.approvalPreset ? Ft(t.approvalPreset) : {},
 			...t.modelId && o ? { model: o.model } : {},
 			...t.reasoningEffort || t.modelId ? { effort: i.selectedReasoningEffort } : {},
 			...t.serviceTier !== void 0 || t.modelId ? { serviceTier: i.selectedServiceTier } : {},
-			...o && (typeof t.planMode == "boolean" || t.modelId || t.reasoningEffort) ? { collaborationMode: Wr(i.planMode, o.model, i.selectedReasoningEffort) } : {}
+			...o && (typeof t.planMode == "boolean" || t.modelId || t.reasoningEffort) ? { collaborationMode: Bt(i.planMode, o.model, i.selectedReasoningEffort) } : {}
 		}), this.host.patchRuntime(e, i), a && this.host.emitConversationSettings(e, "action");
 	}
 	async setGoal(e, t) {
@@ -4703,7 +4735,7 @@ var Oi = class {
 			...n === void 0 ? {} : { tokenBudget: n }
 		});
 		if (a.goal.threadId !== e) throw Error(`Codex thread/goal/set returned a goal for '${a.goal.threadId}' instead of '${e}'`);
-		let o = !gr(r.goal, a.goal);
+		let o = !Gr(r.goal, a.goal);
 		this.host.patchRuntime(e, { goal: { ...a.goal } }), o && this.host.emitEvent("action", {
 			type: "conversation.goalChanged",
 			conversationId: e,
@@ -4725,7 +4757,7 @@ var Oi = class {
 			payload: { goal: null }
 		});
 	}
-}, ki = "Review the current code changes (staged, unstaged, and untracked files) and provide prioritized findings.", Ai = class {
+}, Mi = "Review the current code changes (staged, unstaged, and untracked files) and provide prioritized findings.", Ni = class {
 	client;
 	host;
 	constructor(e, t) {
@@ -4762,22 +4794,22 @@ var Oi = class {
 			if (i.reviewThreadId !== e) throw Error(`Codex review/start returned unexpected review thread '${i.reviewThreadId}' for inline review on thread '${e}'`);
 			let a = n.turnIds.includes(i.turn.id);
 			n.activeTurnId = i.turn.status === "inProgress" ? i.turn.id : null, n.turnIds.includes(i.turn.id) || n.turnIds.push(i.turn.id), this.host.patchConversationTurnCount(e, n.turnIds.length, "action");
-			let o = zn(e, i.turn).filter((e) => !n.messages.some((t) => t.id === e.id)).map((e) => e.role === "user" ? {
+			let o = mr(e, i.turn).filter((e) => !n.messages.some((t) => t.id === e.id)).map((e) => e.role === "user" ? {
 				...e,
 				parts: r.type === "uncommittedChanges" ? e.parts.map((e) => e.type === "text" && e.text === "current changes" ? {
 					...e,
-					text: ki
+					text: Mi
 				} : e) : e.parts,
 				metadata: {
 					...e.metadata,
 					reviewPrompt: !0
 				}
-			} : e), s = ji(n.messages, i.turn.id, o);
+			} : e), s = Pi(n.messages, i.turn.id, o);
 			this.host.patchRuntime(e, {
 				busy: n.activeTurnId !== null,
 				turnStartPending: !1,
-				turns: G(n.turns, W(i.turn)),
-				messages: n.activeTurnId ? I(s, e, i.turn.id) : s
+				turns: Q(n.turns, Z(i.turn)),
+				messages: n.activeTurnId ? U(s, e, i.turn.id) : s
 			});
 			for (let t of o) this.host.emitEvent("action", {
 				type: "message.appended",
@@ -4789,7 +4821,7 @@ var Oi = class {
 				type: "turn.started",
 				conversationId: e,
 				turnId: i.turn.id,
-				payload: { startedAt: U(i.turn.startedAt) }
+				payload: { startedAt: X(i.turn.startedAt) }
 			}), this.host.emitConversationActivity(e, "action");
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
@@ -4822,11 +4854,11 @@ var Oi = class {
 		return await this.editTurnForThread(n, e, t), this.host.getSnapshot();
 	}
 	async editTurnForThread(e, t, n) {
-		let r = (await this.host.ensureThreadReady(e)).messages.find((e) => e.role === "user" && e.kind !== "steer" && Zr(e) === t);
+		let r = (await this.host.ensureThreadReady(e)).messages.find((e) => e.role === "user" && e.kind !== "steer" && qt(e) === t);
 		if (!r) throw Error(`Could not find the user prompt for Codex turn '${t}'`);
 		let i = n.trim();
 		if (!i) throw Error("Cannot replace a turn prompt with empty content");
-		let a = $r(r);
+		let a = Yt(r);
 		await this.rollbackToTurn(e, t), await this.host.sendMessageToThread(e, i, a.length > 0 ? { attachments: a } : {});
 	}
 	async retryTurn(e) {
@@ -4834,11 +4866,11 @@ var Oi = class {
 		return await this.retryTurnForThread(t, e), this.host.getSnapshot();
 	}
 	async retryTurnForThread(e, t) {
-		let n = (await this.host.ensureThreadReady(e)).messages.find((e) => e.role === "user" && e.kind !== "steer" && Zr(e) === t);
+		let n = (await this.host.ensureThreadReady(e)).messages.find((e) => e.role === "user" && e.kind !== "steer" && qt(e) === t);
 		if (!n) throw Error("Could not find the user prompt for this turn");
-		let r = Qr(n);
+		let r = Jt(n);
 		if (!r) throw Error("Could not find the user prompt for this turn");
-		let i = $r(n);
+		let i = Yt(n);
 		await this.rollbackToTurn(e, t), await this.host.sendMessageToThread(e, r, i.length > 0 ? { attachments: i } : {});
 	}
 	async rollbackToTurn(e, t) {
@@ -4855,10 +4887,10 @@ var Oi = class {
 			numTurns: n.turnIds.length - r
 		});
 		if (i.thread.id !== e) throw Error(`Codex thread/rollback returned '${i.thread.id}' for requested thread '${e}'`);
-		n.turnIds = i.thread.turns.map((e) => e.id), n.turns = i.thread.turns.map((e) => W(e)), n.activeTurnId = null;
-		let a = Z(i.thread);
-		this.host.patch({ conversations: Q(this.host.getState().conversations, a) }), this.host.patchRuntime(e, {
-			messages: Ln(i.thread),
+		n.turnIds = i.thread.turns.map((e) => e.id), n.turns = i.thread.turns.map((e) => Z(e)), n.activeTurnId = null;
+		let a = N(i.thread);
+		this.host.patch({ conversations: P(this.host.getState().conversations, a) }), this.host.patchRuntime(e, {
+			messages: fr(i.thread),
 			answeredClientRequestIds: [],
 			busy: !1,
 			turnStartPending: !1,
@@ -4874,15 +4906,15 @@ var Oi = class {
 		});
 		if (i.thread.id !== e) throw Error(`Codex thread/revert returned '${i.thread.id}' for requested thread '${e}'`);
 		let a = r.turnIds.slice(0, n), o = new Set(a), s = r.messages.filter((e) => {
-			let t = Zr(e);
+			let t = qt(e);
 			return t === null || o.has(t);
 		});
 		r.turnIds = a, r.turns = r.turns.filter((e) => o.has(e.id)), r.activeTurnId = null;
 		let c = {
-			...Z(i.thread),
+			...N(i.thread),
 			turnCount: a.length
 		};
-		this.host.patch({ conversations: Q(this.host.getState().conversations, c) }), this.host.patchRuntime(e, {
+		this.host.patch({ conversations: P(this.host.getState().conversations, c) }), this.host.patchRuntime(e, {
 			messages: s,
 			answeredClientRequestIds: [],
 			busy: !1,
@@ -4901,7 +4933,7 @@ var Oi = class {
 		return e;
 	}
 };
-function ji(e, t, n) {
+function Pi(e, t, n) {
 	let r = e.findIndex((e) => e.turnId === t);
 	return r < 0 ? [...e, ...n] : [
 		...e.slice(0, r),
@@ -4911,7 +4943,7 @@ function ji(e, t, n) {
 }
 //#endregion
 //#region src/node/codex-surface-messages-controller.ts
-var Mi = class {
+var Fi = class {
 	client;
 	host;
 	constructor(e, t) {
@@ -4967,7 +4999,7 @@ var Mi = class {
 		let s = et(i);
 		if (s) return this.host.startReviewForThread(e, { target: s });
 		n = {
-			...qr(this.host.snapshotForRuntime(r), n),
+			...Ut(this.host.snapshotForRuntime(r), n),
 			...n.skills ? { skills: rt(n.skills, r.skills) } : {}
 		}, await this.sendPromptToThread(e, i, n);
 	}
@@ -4991,20 +5023,20 @@ var Mi = class {
 			let n = await this.client.request("turn/start", {
 				threadId: e,
 				input: [],
-				...Gr(this.host.snapshotForRuntime(t), {})
+				...Vt(this.host.snapshotForRuntime(t), {})
 			}), r = t.turnIds.includes(n.turn.id);
 			t.activeTurnId = n.turn.status === "inProgress" ? n.turn.id : null, r || t.turnIds.push(n.turn.id), this.host.patchConversationTurnCount(e, t.turnIds.length, "action");
 			let i = n.turn.status === "inProgress";
 			this.host.patchRuntime(e, {
 				busy: i,
 				turnStartPending: !1,
-				turns: G(t.turns, W(n.turn)),
-				messages: i ? I(t.messages, e, n.turn.id) : t.messages
+				turns: Q(t.turns, Z(n.turn)),
+				messages: i ? U(t.messages, e, n.turn.id) : t.messages
 			}), this.host.patchConversationStatus(e, i ? "active" : "idle", "action"), i && !r && this.host.emitEvent("action", {
 				type: "turn.started",
 				conversationId: e,
 				turnId: n.turn.id,
-				payload: { startedAt: U(n.turn.startedAt) }
+				payload: { startedAt: X(n.turn.startedAt) }
 			}), this.host.emitConversationActivity(e, "action");
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
@@ -5015,23 +5047,23 @@ var Mi = class {
 		}
 	}
 	async sendPromptToThread(e, t, n = {}, r) {
-		let i = this.host.requireRuntime(e), a = qr(this.host.snapshotForRuntime(i), n), o = r?.trim() || t, s = it(nt(t, i.skills), rt(a.skills ?? [], i.skills)), c = Jr(a.attachments ?? []);
+		let i = this.host.requireRuntime(e), a = Ut(this.host.snapshotForRuntime(i), n), o = r?.trim() || t, s = it(nt(t, i.skills), rt(a.skills ?? [], i.skills)), c = Wt(a.attachments ?? []);
 		if (i.busy) {
 			this.host.patchRuntime(e, { queuedPrompts: [...i.queuedPrompts, {
-				id: vr(),
+				id: qr(),
 				text: o,
 				...Object.keys(a).length > 0 ? { options: a } : {}
 			}] }), this.emitQueuedPrompts(e);
 			return;
 		}
-		let l = _r(), u = {
+		let l = Kr(), u = {
 			id: l,
 			role: "user",
 			status: "complete",
 			parts: [{
 				type: "text",
 				text: o
-			}, ...c.map(Xr)],
+			}, ...c.map(Kt)],
 			createdAt: (/* @__PURE__ */ new Date()).toISOString(),
 			metadata: {
 				conversationId: e,
@@ -5058,14 +5090,14 @@ var Mi = class {
 						text: t,
 						text_elements: []
 					},
-					...c.map(Yr),
+					...c.map(Gt),
 					...s.map((e) => ({
 						type: "skill",
 						name: e.name,
 						path: e.path
 					}))
 				],
-				...Gr(this.host.snapshotForRuntime(i), a),
+				...Vt(this.host.snapshotForRuntime(i), a),
 				...a.outputSchema === void 0 ? {} : { outputSchema: a.outputSchema }
 			}), r = i.turnIds.includes(n.turn.id);
 			i.activeTurnId = n.turn.status === "inProgress" ? n.turn.id : null, i.turnIds.includes(n.turn.id) || i.turnIds.push(n.turn.id), this.host.patchConversationTurnCount(e, i.turnIds.length, "action");
@@ -5080,8 +5112,8 @@ var Mi = class {
 			this.host.patchRuntime(e, {
 				busy: o,
 				turnStartPending: !1,
-				turns: G(i.turns, W(n.turn)),
-				messages: o ? I(u, e, n.turn.id) : u
+				turns: Q(i.turns, Z(n.turn)),
+				messages: o ? U(u, e, n.turn.id) : u
 			}), this.host.patchConversationStatus(e, o ? "active" : "idle", "action");
 			let d = u.find((e) => e.id === l);
 			d && this.host.emitEvent("action", {
@@ -5093,7 +5125,7 @@ var Mi = class {
 				type: "turn.started",
 				conversationId: e,
 				turnId: n.turn.id,
-				payload: { startedAt: U(n.turn.startedAt) }
+				payload: { startedAt: X(n.turn.startedAt) }
 			}), this.host.emitConversationActivity(e, "action");
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
@@ -5111,7 +5143,7 @@ var Mi = class {
 		let i = await this.host.ensureThreadReady(e), a = t.trim(), o = r?.trim() || a;
 		if (!a) throw Error("Cannot steer with an empty message");
 		if (!i.activeTurnId) throw Error("There is no active turn to steer");
-		let s = Jr(n.attachments ?? []), c = _r(), l = {
+		let s = Wt(n.attachments ?? []), c = Kr(), l = {
 			id: c,
 			kind: "steer",
 			role: "user",
@@ -5119,7 +5151,7 @@ var Mi = class {
 			parts: [{
 				type: "text",
 				text: o
-			}, ...s.map(Xr)],
+			}, ...s.map(Kt)],
 			createdAt: (/* @__PURE__ */ new Date()).toISOString(),
 			turnId: i.activeTurnId,
 			metadata: {
@@ -5130,7 +5162,7 @@ var Mi = class {
 		};
 		this.host.patchRuntime(e, {
 			error: null,
-			messages: I([...i.messages, l], e, i.activeTurnId, { forceSegment: !0 })
+			messages: U([...i.messages, l], e, i.activeTurnId, { forceSegment: !0 })
 		}), this.host.emitEvent("action", {
 			type: "message.appended",
 			conversationId: e,
@@ -5146,9 +5178,9 @@ var Mi = class {
 					type: "text",
 					text: a,
 					text_elements: []
-				}, ...s.map(Yr)]
+				}, ...s.map(Gt)]
 			}), n = i.turnIds.includes(t.turnId);
-			i.activeTurnId = t.turnId, i.turnIds.includes(t.turnId) || i.turnIds.push(t.turnId), i.turns = G(i.turns, {
+			i.activeTurnId = t.turnId, i.turnIds.includes(t.turnId) || i.turnIds.push(t.turnId), i.turns = Q(i.turns, {
 				id: t.turnId,
 				status: "inProgress",
 				error: null,
@@ -5165,7 +5197,7 @@ var Mi = class {
 					turnId: t.turnId
 				}
 			} : e);
-			this.host.patchRuntime(e, { messages: R(I(r, e, t.turnId), e) }), n || this.host.emitEvent("action", {
+			this.host.patchRuntime(e, { messages: G(U(r, e, t.turnId), e) }), n || this.host.emitEvent("action", {
 				type: "turn.started",
 				conversationId: e,
 				turnId: t.turnId,
@@ -5243,7 +5275,7 @@ var Mi = class {
 		if (!e) throw Error("There is no active conversation");
 		return e;
 	}
-}, Ni = 5, Pi = class {
+}, Ii = 5, Li = class {
 	client;
 	options;
 	catalog;
@@ -5281,9 +5313,9 @@ var Mi = class {
 		let i = this.host.getState(), a = e.approvalPreset ?? (e.approvalMode === void 0 && e.permissionMode === void 0 && i.approvalPreset && r.approvalPresets.includes(i.approvalPreset) ? i.approvalPreset : void 0), o = this.settings.threadStartSettings({
 			...e,
 			...a ? { approvalPreset: a } : {}
-		}, r.approvalPresets), s = q(i.models, i.selectedModelId), c = e.model ? Pr(i.models, e.model) : s, l = c?.model, u = e.reasoningEffort ?? (c?.id === s?.id ? i.selectedReasoningEffort : c ? J(c) : null) ?? void 0, d = e.serviceTier === void 0 ? c?.id === s?.id ? i.selectedServiceTier ?? null : c?.defaultServiceTier ?? null : e.serviceTier;
-		Fr(c, u), Y(c, d);
-		let f = t.mcpServers === void 0 ? this.extensions.defaultMcpServers : hi(t.mcpServers), p = await this.extensions.conversationExtension({
+		}, r.approvalPresets), s = k(i.models, i.selectedModelId), c = e.model ? At(i.models, e.model) : s, l = c?.model, u = e.reasoningEffort ?? (c?.id === s?.id ? i.selectedReasoningEffort : c ? A(c) : null) ?? void 0, d = e.serviceTier === void 0 ? c?.id === s?.id ? i.selectedServiceTier ?? null : c?.defaultServiceTier ?? null : e.serviceTier;
+		jt(c, u), j(c, d);
+		let f = t.mcpServers === void 0 ? this.extensions.defaultMcpServers : vi(t.mcpServers), p = await this.extensions.conversationExtension({
 			operation: "start",
 			conversationId: null,
 			cwd: n,
@@ -5300,11 +5332,11 @@ var Mi = class {
 			...d === void 0 ? {} : { serviceTier: d },
 			...e.threadSource === void 0 ? {} : { threadSource: e.threadSource },
 			serviceName: "codex_app_sdk"
-		}), h = Vr(m, i.models, i);
+		}), h = Lt(m, i.models, i);
 		u && (await this.client.request("thread/settings/update", {
 			threadId: m.thread.id,
 			effort: u,
-			...c ? { collaborationMode: Wr(i.planMode, c.model, u) } : {}
+			...c ? { collaborationMode: Bt(i.planMode, c.model, u) } : {}
 		}), h.selectedReasoningEffort = u), d !== void 0 && (h.selectedServiceTier = d), c && (h.selectedModelId = c.id), a && (h.approvalPreset = a);
 		let g = this.host.createRuntime(m.thread.id, {
 			hydrated: !0,
@@ -5314,7 +5346,7 @@ var Mi = class {
 			turnIds: [],
 			messages: [],
 			answeredClientRequestIds: [],
-			threadStatus: $(m.thread.status),
+			threadStatus: F(m.thread.status),
 			...r,
 			...h
 		});
@@ -5323,10 +5355,10 @@ var Mi = class {
 			...t,
 			mcpServers: f
 		});
-		let _ = Z(m.thread);
+		let _ = N(m.thread);
 		return this.host.patch({
 			activeConversationId: m.thread.id,
-			conversations: Q(i.conversations, _),
+			conversations: P(i.conversations, _),
 			...this.host.runtimeProjection(g)
 		}), this.host.emitSummaryUpserted(_, "created", "action"), this.host.emitSelected(m.thread.id), this.emitConversationState(m.thread.id), this.host.getSnapshot();
 	}
@@ -5376,13 +5408,13 @@ var Mi = class {
 				historyLoadingOlder: !1,
 				fullHistoryHydrated: !0,
 				busy: !!n.activeTurnId,
-				threadStatus: $(t.thread.status)
+				threadStatus: F(t.thread.status)
 			}), i = {
-				...Z(t.thread),
+				...N(t.thread),
 				turnCount: r.turnIds.length
 			}, a = this.host.getState();
 			return this.host.patch({
-				conversations: Q(a.conversations, i),
+				conversations: P(a.conversations, i),
 				...a.activeConversationId === e ? this.host.runtimeProjection(r) : {}
 			}), this.host.emitSummaryUpserted(i, "updated", "action"), this.host.emitHistoryReplaced(e, "resync", "action"), this.host.emitConversationActivity(e, "action"), this.historySnapshot(e, r);
 		} catch (t) {
@@ -5398,7 +5430,7 @@ var Mi = class {
 			...n
 		}, a = {
 			...i,
-			mcpServers: i.mcpServers === void 0 ? this.extensions.defaultMcpServers : hi(i.mcpServers)
+			mcpServers: i.mcpServers === void 0 ? this.extensions.defaultMcpServers : vi(i.mcpServers)
 		};
 		this.hostOptionsByThread.set(e, a);
 		let o = await this.extensions.conversationExtension({
@@ -5416,7 +5448,7 @@ var Mi = class {
 				threadId: e,
 				excludeTurns: !0,
 				initialTurnsPage: {
-					limit: Ni,
+					limit: Ii,
 					sortDirection: "desc",
 					itemsView: "full"
 				},
@@ -5429,20 +5461,20 @@ var Mi = class {
 			let i = t.initialTurnsPage ?? await this.client.request("thread/turns/list", {
 				threadId: t.thread.id,
 				cursor: null,
-				limit: Ni,
+				limit: Ii,
 				sortDirection: "desc",
 				itemsView: "full"
-			}), d = [...i.data].reverse(), f = t.cwd ?? t.thread.cwd ?? a.cwd, p = await this.catalog.loadConversationCatalogs(f), m = s.turns.filter((e) => c.get(e.id) !== e), h = s.threadStatus !== u && s.threadStatus ? s.threadStatus : $(t.thread.status), g = d.map((e) => h.type === "idle" && e.status === "inProgress" ? {
+			}), d = [...i.data].reverse(), f = t.cwd ?? t.thread.cwd ?? a.cwd, p = await this.catalog.loadConversationCatalogs(f), m = s.turns.filter((e) => c.get(e.id) !== e), h = s.threadStatus !== u && s.threadStatus ? s.threadStatus : F(t.thread.status), g = d.map((e) => h.type === "idle" && e.status === "inProgress" ? {
 				...e,
 				status: "interrupted"
-			} : e), _ = new Map(g.map((e) => [e.id, W(e)]));
+			} : e), _ = new Map(g.map((e) => [e.id, Z(e)]));
 			for (let e of m) _.set(e.id, e);
-			let v = m.length > 0 ? s.activeTurnId : h.type === "active" ? yn(d) : null, y = Rn(s.messages, Ln({
+			let v = m.length > 0 ? s.activeTurnId : h.type === "active" ? Jn(d) : null, y = pr(s.messages, fr({
 				...t.thread,
 				turns: g
 			})), b = new Map(y.map((e) => [e.id, e]));
 			for (let e of s.messages) l.get(e.id) !== e && b.set(e.id, e);
-			let x = v ? I([...b.values()], t.thread.id, v) : [...b.values()], S = this.host.createRuntime(t.thread.id, {
+			let x = v ? U([...b.values()], t.thread.id, v) : [...b.values()], S = this.host.createRuntime(t.thread.id, {
 				hydrated: !0,
 				historyMode: t.thread.historyMode ?? "legacy",
 				loadingStrategy: a.loadingStrategy ?? this.options.loadingStrategy ?? "lazy",
@@ -5460,13 +5492,13 @@ var Mi = class {
 				goal: n ? { ...n } : null,
 				threadStatus: h,
 				...p,
-				...Vr(t, this.host.getState().models, this.host.snapshotForRuntime(s))
+				...Lt(t, this.host.getState().models, this.host.snapshotForRuntime(s))
 			}), C = {
-				...Z(t.thread),
+				...N(t.thread),
 				turnCount: d.length
 			}, ee = this.host.getState();
 			return this.host.patch({
-				conversations: Q(ee.conversations, C),
+				conversations: P(ee.conversations, C),
 				...ee.activeConversationId === t.thread.id ? this.host.runtimeProjection(S) : {}
 			}), this.host.emitSummaryUpserted(C, "resumed", "action"), this.host.emitHistoryReplaced(t.thread.id, r, "action"), this.emitConversationState(t.thread.id), S.loadingStrategy === "eager" && i.nextCursor !== null && this.conversations.hydrateCompleteHistory(t.thread.id, {
 				cursor: i.nextCursor,
@@ -5489,7 +5521,7 @@ var Mi = class {
 			threadStatus: structuredClone(t.threadStatus)
 		};
 	}
-}, Fi = class {
+}, Ri = class {
 	authentication;
 	approvals;
 	catalog;
@@ -5505,16 +5537,16 @@ var Mi = class {
 			case "thread/started": {
 				this.host.createRuntime(e.params.thread.id, {
 					historyMode: e.params.thread.historyMode ?? "legacy",
-					threadStatus: $(e.params.thread.status)
+					threadStatus: F(e.params.thread.status)
 				});
-				let t = Z(e.params.thread);
-				this.host.patch({ conversations: Q(this.host.getState().conversations, t) }), this.host.emitSummaryUpserted(t, "started", "notification"), this.host.emitConversationActivity(e.params.thread.id, "notification");
+				let t = N(e.params.thread);
+				this.host.patch({ conversations: P(this.host.getState().conversations, t) }), this.host.emitSummaryUpserted(t, "started", "notification"), this.host.emitConversationActivity(e.params.thread.id, "notification");
 				return;
 			}
 			case "thread/status/changed": {
 				let { threadId: t, status: n } = e.params, r = this.host.requireRuntime(t), i = n.type === "systemError";
 				(i || n.type === "idle" && !r.turnStartPending) && (r.activeTurnId = null), this.host.patchRuntime(t, {
-					threadStatus: $(n),
+					threadStatus: F(n),
 					busy: i ? !1 : r.turnStartPending || n.type === "active" || r.activeTurnId !== null,
 					...i ? {
 						turnStartPending: !1,
@@ -5524,7 +5556,7 @@ var Mi = class {
 				let a = this.host.getState();
 				this.host.patch({ conversations: a.conversations.map((e) => e.id === t ? {
 					...e,
-					status: ti(n)
+					status: Qt(n)
 				} : e) });
 				let o = this.host.getState().conversations.find((e) => e.id === t);
 				o && this.host.emitSummaryUpserted(o, "updated", "notification"), this.host.emitConversationActivity(t, "notification"), n.type === "idle" && this.host.sendNextQueuedPrompt(t);
@@ -5566,12 +5598,12 @@ var Mi = class {
 				return;
 			}
 			case "thread/settings/updated": {
-				let t = this.host.requireRuntime(e.params.threadId), n = this.host.getState(), r = Hr(e.params.threadSettings, n.models, this.host.snapshotForRuntime(t)), i = t.approvalPreset !== r.approvalPreset || t.selectedModelId !== r.selectedModelId || t.selectedReasoningEffort !== r.selectedReasoningEffort || t.selectedServiceTier !== r.selectedServiceTier || t.planMode !== r.planMode;
+				let t = this.host.requireRuntime(e.params.threadId), n = this.host.getState(), r = Rt(e.params.threadSettings, n.models, this.host.snapshotForRuntime(t)), i = t.approvalPreset !== r.approvalPreset || t.selectedModelId !== r.selectedModelId || t.selectedReasoningEffort !== r.selectedReasoningEffort || t.selectedServiceTier !== r.selectedServiceTier || t.planMode !== r.planMode;
 				this.host.patchRuntime(e.params.threadId, r), i && this.host.emitConversationSettings(e.params.threadId, "notification");
 				return;
 			}
 			case "thread/goal/updated":
-				if (gr(this.host.requireRuntime(e.params.threadId).goal, e.params.goal)) return;
+				if (Gr(this.host.requireRuntime(e.params.threadId).goal, e.params.goal)) return;
 				this.host.patchRuntime(e.params.threadId, { goal: { ...e.params.goal } }), this.host.emitEvent("notification", {
 					type: "conversation.goalChanged",
 					conversationId: e.params.threadId,
@@ -5588,15 +5620,38 @@ var Mi = class {
 				});
 				return;
 			case "thread/tokenUsage/updated": {
-				let t = ei(e.params.tokenUsage);
+				let t = Zt(e.params.tokenUsage);
 				this.host.patchRuntime(e.params.threadId, { contextUsage: t }), this.host.emitEvent("notification", {
 					type: "conversation.contextUsageChanged",
 					conversationId: e.params.threadId,
 					turnId: e.params.turnId,
 					payload: { contextUsage: structuredClone(t) }
+				}), this.host.emitEvent("notification", {
+					type: "conversation.executionUsageChanged",
+					conversationId: e.params.threadId,
+					turnId: e.params.turnId,
+					payload: { usage: {
+						last: Xt(e.params.tokenUsage.last),
+						total: Xt(e.params.tokenUsage.total),
+						execution: null,
+						model: null,
+						observedStart: !1
+					} }
 				});
 				return;
 			}
+			case "model/rerouted":
+				this.host.emitEvent("notification", {
+					type: "turn.modelRerouted",
+					conversationId: e.params.threadId,
+					turnId: e.params.turnId,
+					payload: {
+						fromModel: e.params.fromModel,
+						toModel: e.params.toModel,
+						reason: e.params.reason
+					}
+				});
+				return;
 			case "turn/started": {
 				let t = this.host.requireRuntime(e.params.threadId), n = t.activeTurnId === e.params.turn.id;
 				this.host.markRuntimeTurnActive(t, e.params.turn.id), this.host.patchConversationTurnCount(e.params.threadId, t.turnIds.length), this.host.patchRuntime(e.params.threadId, {
@@ -5604,13 +5659,13 @@ var Mi = class {
 					turnStartPending: !1,
 					error: null,
 					turnGitDiff: null,
-					turns: G(t.turns, W(e.params.turn)),
-					messages: I(t.messages, e.params.threadId, e.params.turn.id, { createdAt: U(e.params.turn.startedAt) })
+					turns: Q(t.turns, Z(e.params.turn)),
+					messages: U(t.messages, e.params.threadId, e.params.turn.id, { createdAt: X(e.params.turn.startedAt) })
 				}), this.host.patchConversationStatus(e.params.threadId, "active"), n || this.host.emitEvent("notification", {
 					type: "turn.started",
 					conversationId: e.params.threadId,
 					turnId: e.params.turn.id,
-					payload: { startedAt: U(e.params.turn.startedAt) }
+					payload: { startedAt: X(e.params.turn.startedAt) }
 				}), this.host.emitConversationActivity(e.params.threadId, "notification");
 				return;
 			}
@@ -5626,13 +5681,13 @@ var Mi = class {
 				return;
 			case "item/commandExecution/outputDelta":
 				if (!this.items.isForwardingCommandOutput(e.params.threadId, e.params.itemId)) return;
-				this.items.applyToolUpdate(e.params.threadId, e.params.turnId, Ht(e.params.itemId, e.params.delta));
+				this.items.applyToolUpdate(e.params.threadId, e.params.turnId, vn(e.params.itemId, e.params.delta));
 				return;
 			case "item/fileChange/patchUpdated":
-				this.items.applyToolUpdate(e.params.threadId, e.params.turnId, Ut(e.params.itemId, e.params.changes));
+				this.items.applyToolUpdate(e.params.threadId, e.params.turnId, yn(e.params.itemId, e.params.changes));
 				return;
 			case "item/mcpToolCall/progress":
-				this.items.applyToolUpdate(e.params.threadId, e.params.turnId, Wt(e.params.itemId, e.params.message));
+				this.items.applyToolUpdate(e.params.threadId, e.params.turnId, bn(e.params.itemId, e.params.message));
 				return;
 			case "rawResponseItem/completed":
 				this.items.applyRawResponseItem(e.params);
@@ -5646,7 +5701,7 @@ var Mi = class {
 				return;
 			}
 			case "turn/diff/updated": {
-				let t = sn(e.params.diff);
+				let t = In(e.params.diff);
 				this.host.patchRuntime(e.params.threadId, { turnGitDiff: {
 					turnId: e.params.turnId,
 					addedLines: t.addedLines,
@@ -5662,7 +5717,7 @@ var Mi = class {
 			}
 			case "thread/compacted": {
 				let t = this.host.requireRuntime(e.params.threadId);
-				this.host.patchRuntime(e.params.threadId, { messages: kn(t.messages, e.params.threadId, e.params.turnId, "complete") });
+				this.host.patchRuntime(e.params.threadId, { messages: ir(t.messages, e.params.threadId, e.params.turnId, "complete") });
 				let n = this.host.requireRuntime(e.params.threadId).messages.find((t) => t.kind === "compaction" && t.metadata?.turnId === e.params.turnId);
 				this.host.emitEvent("notification", {
 					type: "context.compactionCompleted",
@@ -5682,7 +5737,7 @@ var Mi = class {
 				let t = this.host.requireRuntime(e.params.threadId), n = !e.params.willRetry && t.activeTurnId === e.params.turnId;
 				n && (t.activeTurnId = null), this.host.patchRuntime(e.params.threadId, {
 					error: e.params.error.message,
-					turns: G(t.turns, {
+					turns: Q(t.turns, {
 						...t.turns.find((t) => t.id === e.params.turnId) ?? {
 							id: e.params.turnId,
 							status: "inProgress",
@@ -5691,7 +5746,7 @@ var Mi = class {
 							durationMs: null
 						},
 						status: e.params.willRetry ? "inProgress" : "failed",
-						error: hr(e.params.error),
+						error: Wr(e.params.error),
 						willRetry: e.params.willRetry
 					}),
 					...n ? {
@@ -5703,7 +5758,7 @@ var Mi = class {
 					conversationId: e.params.threadId,
 					turnId: e.params.turnId,
 					payload: {
-						error: hr(e.params.error),
+						error: Wr(e.params.error),
 						willRetry: e.params.willRetry
 					}
 				}), this.host.emitConversationActivity(e.params.threadId, "notification");
@@ -5711,7 +5766,7 @@ var Mi = class {
 			}
 			case "account/rateLimits/updated": {
 				let t = this.host.getState();
-				this.host.patch({ rateLimits: ii(t.rateLimits, e.params.rateLimits) }), this.host.emitEvent("notification", {
+				this.host.patch({ rateLimits: rn(t.rateLimits, e.params.rateLimits) }), this.host.emitEvent("notification", {
 					type: "rateLimits.changed",
 					payload: { rateLimits: structuredClone(this.host.getState().rateLimits) }
 				});
@@ -5824,7 +5879,6 @@ var Mi = class {
 			case "item/reasoning/summaryTextDelta":
 			case "item/reasoning/summaryPartAdded":
 			case "item/reasoning/textDelta":
-			case "model/rerouted":
 			case "model/verification":
 			case "turn/moderationMetadata":
 			case "model/safetyBuffering/updated":
@@ -5850,7 +5904,7 @@ var Mi = class {
 			default: return this.host.unknownNotification(e);
 		}
 	}
-}, Ii = class {
+}, zi = class {
 	approvals;
 	clientRequests;
 	host;
@@ -5911,7 +5965,7 @@ var Mi = class {
 			conversationId: e,
 			payload: {
 				historyLoading: n.historyLoading,
-				historyState: zi(n),
+				historyState: Hi(n),
 				error: n.error
 			}
 		});
@@ -6005,7 +6059,7 @@ var Mi = class {
 				reason: t,
 				messages: structuredClone(r.messages),
 				threadStatus: structuredClone(r.threadStatus),
-				state: Li(r)
+				state: Bi(r)
 			}
 		});
 	}
@@ -6017,7 +6071,7 @@ var Mi = class {
 			conversationId: e,
 			payload: {
 				messages: structuredClone(t.map((e) => r.get(e.id) ?? e)),
-				state: Ri(this.require(e))
+				state: Vi(this.require(e))
 			}
 		});
 	}
@@ -6028,7 +6082,7 @@ var Mi = class {
 		return [...this.require(e).messages].reverse().find((e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === t) ?? null;
 	}
 	markTurnActive(e, t) {
-		e.activeTurnId = t, e.busy = !0, e.turnStartPending = !1, e.turnIds.includes(t) || e.turnIds.push(t), e.turns = G(e.turns, {
+		e.activeTurnId = t, e.busy = !0, e.turnStartPending = !1, e.turnIds.includes(t) || e.turnIds.push(t), e.turns = Q(e.turns, {
 			id: t,
 			status: "inProgress",
 			error: null,
@@ -6059,7 +6113,7 @@ var Mi = class {
 		i && this.emitSummaryUpserted(i, "updated", n);
 	}
 };
-function Li(e) {
+function Bi(e) {
 	return structuredClone({
 		activeTurnId: e.activeTurnId,
 		answeredClientRequestIds: e.answeredClientRequestIds,
@@ -6068,21 +6122,21 @@ function Li(e) {
 		error: e.error,
 		executionPlan: e.executionPlan,
 		historyLoading: e.historyLoading,
-		historyState: zi(e),
+		historyState: Hi(e),
 		turnGitDiff: e.turnGitDiff,
 		turnIds: e.turnIds,
 		turns: e.turns
 	});
 }
-function Ri(e) {
+function Vi(e) {
 	return structuredClone({
 		historyLoading: e.historyLoading,
-		historyState: zi(e),
+		historyState: Hi(e),
 		turnIds: e.turnIds,
 		turns: e.turns
 	});
 }
-function zi(e) {
+function Hi(e) {
 	return {
 		loadingStrategy: e.loadingStrategy,
 		hasOlder: e.historyHasOlder,
@@ -6092,7 +6146,7 @@ function zi(e) {
 }
 //#endregion
 //#region src/node/codex-surface-connection-controller.ts
-var Bi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_request_user_input"]), Vi = class {
+var Ui = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_request_user_input"]), Wi = class {
 	client;
 	options;
 	authentication;
@@ -6155,7 +6209,7 @@ var Bi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 					limit: 100,
 					threadId: null
 				});
-				for (let e of n.data) Bi.has(e.name) && !e.enabled && (t[e.name] = !0);
+				for (let e of n.data) Ui.has(e.name) && !e.enabled && (t[e.name] = !0);
 				e = n.nextCursor;
 			} while (e);
 			Object.keys(t).length > 0 && await this.client.request("experimentalFeature/enablement/set", { enablement: t });
@@ -6289,7 +6343,7 @@ var Bi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			error: null
 		});
 	}
-}, Hi = 5, Ui = class {
+}, Gi = 5, Ki = class {
 	client;
 	loadingStrategy;
 	catalog;
@@ -6301,9 +6355,9 @@ var Bi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 	async fork(e, t = {}, n = {}, r = {}) {
 		let i = this.host.requireRuntime(e);
 		if ((i.busy || i.activeTurnId) && !r.beforeTurnId && (!r.lastTurnId || r.lastTurnId === i.activeTurnId)) throw Error("Cannot fork a conversation while its current turn is still active");
-		let a = t.cwd ?? i.cwd ?? n.cwd, o = await this.catalog.loadConversationCatalogs(a ?? void 0), s = this.host.getState(), c = t.model ? Pr(s.models, t.model) : q(s.models, i.selectedModelId);
-		Fr(c, t.reasoningEffort), Y(c, t.serviceTier);
-		let l = n.mcpServers === void 0 ? this.extensions.defaultMcpServers : hi(n.mcpServers), u = await this.extensions.conversationExtension({
+		let a = t.cwd ?? i.cwd ?? n.cwd, o = await this.catalog.loadConversationCatalogs(a ?? void 0), s = this.host.getState(), c = t.model ? At(s.models, t.model) : k(s.models, i.selectedModelId);
+		jt(c, t.reasoningEffort), j(c, t.serviceTier);
+		let l = n.mcpServers === void 0 ? this.extensions.defaultMcpServers : vi(n.mcpServers), u = await this.extensions.conversationExtension({
 			operation: "start",
 			conversationId: null,
 			cwd: a ?? void 0,
@@ -6321,24 +6375,24 @@ var Bi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			...u.baseInstructions === void 0 ? {} : { baseInstructions: u.baseInstructions },
 			...u.developerInstructions === void 0 ? {} : { developerInstructions: u.developerInstructions },
 			...u.config === void 0 ? {} : { config: u.config },
-			...Wi(t, o.approvalPresets)
+			...qi(t, o.approvalPresets)
 		});
 		if (!d.thread.id || d.thread.id === e) throw Error(`Codex thread/fork returned an invalid new thread id '${d.thread.id}'`);
 		t.reasoningEffort && await this.client.request("thread/settings/update", {
 			threadId: d.thread.id,
 			effort: t.reasoningEffort,
-			...c ? { collaborationMode: Wr(i.planMode, c.model, t.reasoningEffort) } : {}
+			...c ? { collaborationMode: Bt(i.planMode, c.model, t.reasoningEffort) } : {}
 		});
 		let [f, p] = await Promise.all([this.client.request("thread/turns/list", {
 			threadId: d.thread.id,
 			cursor: null,
-			limit: Hi,
+			limit: Gi,
 			sortDirection: "desc",
 			itemsView: "full"
-		}), this.client.request("thread/goal/get", { threadId: d.thread.id }).then((e) => e.goal).catch(() => null)]), m = [...f.data].reverse(), h = yn(m), g = Ln({
+		}), this.client.request("thread/goal/get", { threadId: d.thread.id }).then((e) => e.goal).catch(() => null)]), m = [...f.data].reverse(), h = Jn(m), g = fr({
 			...d.thread,
 			turns: m
-		}), _ = h ? I(g, d.thread.id, h) : g, v = n.loadingStrategy ?? this.loadingStrategy ?? "lazy", y = this.host.createRuntime(d.thread.id, {
+		}), _ = h ? U(g, d.thread.id, h) : g, v = n.loadingStrategy ?? this.loadingStrategy ?? "lazy", y = this.host.createRuntime(d.thread.id, {
 			hydrated: !0,
 			historyMode: d.thread.historyMode ?? "legacy",
 			loadingStrategy: v,
@@ -6348,14 +6402,14 @@ var Bi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			fullHistoryHydrated: f.nextCursor === null,
 			cwd: d.cwd ?? d.thread.cwd ?? a ?? null,
 			activeTurnId: h,
-			turns: m.map((e) => W(e)),
+			turns: m.map((e) => Z(e)),
 			turnIds: m.map((e) => e.id),
 			messages: _,
 			busy: !!h,
 			goal: p ? { ...p } : null,
-			threadStatus: $(d.thread.status),
+			threadStatus: F(d.thread.status),
 			...o,
-			...Vr(d, s.models, this.host.snapshotForRuntime(i))
+			...Lt(d, s.models, this.host.snapshotForRuntime(i))
 		});
 		t.reasoningEffort && (y.selectedReasoningEffort = t.reasoningEffort), t.serviceTier !== void 0 && (y.selectedServiceTier = t.serviceTier), t.model && c && (y.selectedModelId = c.id), this.host.rememberHostOptions(d.thread.id, {
 			...n,
@@ -6364,20 +6418,20 @@ var Bi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			mcpServers: l
 		});
 		let b = {
-			...Z(d.thread),
+			...N(d.thread),
 			turnCount: m.length
 		};
-		return this.host.patch({ conversations: Q(this.host.getState().conversations, b) }), this.host.emitSummaryUpserted(b), this.host.emitHistoryReplaced(d.thread.id), this.host.emitConversationActivity(d.thread.id), this.host.emitConversationSettings(d.thread.id), this.host.emitConversationSkills(d.thread.id), this.host.emitConversationPermissions(d.thread.id), v === "eager" && f.nextCursor !== null && this.host.hydrateCompleteHistory(d.thread.id).catch(() => void 0), d.thread.id;
+		return this.host.patch({ conversations: P(this.host.getState().conversations, b) }), this.host.emitSummaryUpserted(b), this.host.emitHistoryReplaced(d.thread.id), this.host.emitConversationActivity(d.thread.id), this.host.emitConversationSettings(d.thread.id), this.host.emitConversationSkills(d.thread.id), this.host.emitConversationPermissions(d.thread.id), v === "eager" && f.nextCursor !== null && this.host.hydrateCompleteHistory(d.thread.id).catch(() => void 0), d.thread.id;
 	}
 	async forkTurn(e, t, n = {}, r = {}) {
 		if (!this.host.requireRuntime(e).turnIds.includes(t)) throw Error(`Cannot fork at unknown Codex turn '${t}'`);
 		return this.fork(e, n, r, { lastTurnId: t });
 	}
 };
-function Wi(e, t) {
+function qi(e, t) {
 	if (e.approvalPreset) {
 		if (!t.includes(e.approvalPreset)) throw Error(`Approval preset '${e.approvalPreset}' is not available`);
-		return Rr(e.approvalPreset);
+		return Pt(e.approvalPreset);
 	}
 	return {
 		...e.approvalMode === void 0 ? {} : { approvalPolicy: e.approvalMode === "ask" ? "on-request" : "never" },
@@ -6386,27 +6440,27 @@ function Wi(e, t) {
 }
 //#endregion
 //#region src/node/codex-markdown-images.ts
-var Gi = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, Ki = /* @__PURE__ */ new Set([
+var Ji = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, Yi = /* @__PURE__ */ new Set([
 	".avif",
 	".gif",
 	".jpeg",
 	".jpg",
 	".png",
 	".webp"
-]), qi = class {
+]), Xi = class {
 	client;
 	constructor(e) {
 		this.client = e;
 	}
 	async hydrate(e, t) {
-		let n = Xi(e);
-		return Yi(e, (await Promise.all(Array.from(e.matchAll(Gi), async (e) => {
+		let n = $i(e);
+		return Qi(e, (await Promise.all(Array.from(e.matchAll(Ji), async (e) => {
 			let r = e.index ?? 0;
-			if (Zi(r, n)) return null;
-			let i = e[2], a = Ji(i, t);
+			if (ea(r, n)) return null;
+			let i = e[2], a = Zi(i, t);
 			if (!a) return null;
 			try {
-				let t = Zn((await this.client.request("fs/readFile", { path: a })).dataBase64);
+				let t = Er((await this.client.request("fs/readFile", { path: a })).dataBase64);
 				if (!t) return null;
 				let n = e[0].indexOf("](") + 2;
 				return {
@@ -6420,7 +6474,7 @@ var Gi = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, Ki = /* @
 		}))).filter((e) => e !== null));
 	}
 };
-function Ji(e, t) {
+function Zi(e, t) {
 	let n = e.trim();
 	if (!n || /[\u0000-\u001f\u007f]/.test(n)) return null;
 	let r;
@@ -6435,18 +6489,18 @@ function Ji(e, t) {
 	} catch {
 		return null;
 	}
-	if (!Ki.has(_(r).toLowerCase())) return null;
+	if (!Yi.has(_(r).toLowerCase())) return null;
 	if (v(r)) return r;
 	if (!t || !v(t)) return null;
 	let i = x(t, r), a = b(t, i);
 	return a === ".." || a.startsWith(`..${S}`) || v(a) ? null : i;
 }
-function Yi(e, t) {
+function Qi(e, t) {
 	let n = e;
 	for (let e of t.sort((e, t) => t.start - e.start)) n = `${n.slice(0, e.start)}${e.value}${n.slice(e.end)}`;
 	return n;
 }
-function Xi(e) {
+function $i(e) {
 	let t = [], n = /(^|\n)(```|~~~)/g, r;
 	for (; (r = n.exec(e)) !== null;) {
 		let i = r[2], a = r[1], o = r.index + a.length, s = RegExp(`(^|\\n)${i}`, "g");
@@ -6467,15 +6521,15 @@ function Xi(e) {
 	}
 	return t;
 }
-function Zi(e, t) {
+function ea(e, t) {
 	return t.some((t) => e >= t.start && e <= t.end);
 }
-var Qi = /<context>[\s\S]*?<\/context>\s*/g, $i = /<in-app-browser-context(?:\s[^>]*)?>[\s\S]*?<\/in-app-browser-context>\s*/g, ea = /^[ \t]*## My request for Codex:[ \t]*$/m;
-async function ta(e, t) {
+var ta = /<context>[\s\S]*?<\/context>\s*/g, na = /<in-app-browser-context(?:\s[^>]*)?>[\s\S]*?<\/in-app-browser-context>\s*/g, ra = /^[ \t]*## My request for Codex:[ \t]*$/m;
+async function ia(e, t) {
 	let n = D(t);
 	return {
 		conversationId: n,
-		prompts: na((await e.request("thread/turns/list", {
+		prompts: aa((await e.request("thread/turns/list", {
 			threadId: n,
 			cursor: null,
 			limit: 100,
@@ -6484,20 +6538,20 @@ async function ta(e, t) {
 		})).data)
 	};
 }
-function na(e) {
+function aa(e) {
 	return [...e].reverse().flatMap((e) => e.items.flatMap((e) => {
 		if (e.type !== "userMessage") return [];
-		let t = ra(e.content.flatMap((e) => e.type === "text" ? [e.text] : []).join(""));
+		let t = oa(e.content.flatMap((e) => e.type === "text" ? [e.text] : []).join(""));
 		return t && t !== "(no user instructions)" ? [t] : [];
 	}));
 }
-function ra(e) {
-	let t = e.replace(Qi, ""), n = t.replace($i, "");
-	return (n === t ? n : n.replace(ea, "")).trim();
+function oa(e) {
+	let t = e.replace(ta, ""), n = t.replace(na, "");
+	return (n === t ? n : n.replace(ra, "")).trim();
 }
 //#endregion
 //#region src/node/codex-surface-text-generation-controller.ts
-var ia = 12e4, aa = class {
+var sa = 12e4, ca = class {
 	client;
 	defaultCwd;
 	host;
@@ -6508,7 +6562,7 @@ var ia = 12e4, aa = class {
 	}
 	handleNotification(e) {
 		e.method === "thread/started" && e.params.thread.ephemeral && this.hiddenThreadIds.add(e.params.thread.id);
-		let t = la(e);
+		let t = fa(e);
 		if (!t || !this.hiddenThreadIds.has(t)) return !1;
 		let n = this.pendingByThread.get(t);
 		return n && this.consumeNotification(n, e), (e.method === "thread/closed" || e.method === "thread/deleted") && this.hiddenThreadIds.delete(t), !0;
@@ -6516,10 +6570,10 @@ var ia = 12e4, aa = class {
 	async generate(e, t = {}) {
 		let n = e.trim();
 		if (!n) throw Error("Generation prompt cannot be empty");
-		if (t.signal?.aborted) throw ua();
+		if (t.signal?.aborted) throw pa();
 		await this.host.ensureConnected();
-		let r = this.host.getSnapshot(), i = q(r.models, r.selectedModelId), a = t.model ? Pr(r.models, t.model) : i, o = a?.model, s = t.reasoningEffort ?? (a?.id === i?.id ? r.selectedReasoningEffort : a ? J(a) : null) ?? void 0, c = t.serviceTier === void 0 ? a?.id === i?.id ? r.selectedServiceTier : a?.defaultServiceTier ?? null : t.serviceTier;
-		Fr(a, s), Y(a, c);
+		let r = this.host.getSnapshot(), i = k(r.models, r.selectedModelId), a = t.model ? At(r.models, t.model) : i, o = a?.model, s = t.reasoningEffort ?? (a?.id === i?.id ? r.selectedReasoningEffort : a ? A(a) : null) ?? void 0, c = t.serviceTier === void 0 ? a?.id === i?.id ? r.selectedServiceTier : a?.defaultServiceTier ?? null : t.serviceTier;
+		jt(a, s), j(a, c);
 		let l = await this.client.request("thread/start", {
 			approvalPolicy: "never",
 			approvalsReviewer: "user",
@@ -6535,15 +6589,15 @@ var ia = 12e4, aa = class {
 			serviceName: "codex_app_sdk",
 			threadSource: "sdk_ephemeral_generation"
 		}), u = l.thread.id;
-		if (!l.thread.ephemeral) throw await oa(() => this.client.request("thread/delete", { threadId: u })), Error("Codex app-server did not create an ephemeral generation thread");
-		if (this.hiddenThreadIds.add(u), t.signal?.aborted) throw await oa(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u), ua();
-		let d = sa();
+		if (!l.thread.ephemeral) throw await la(() => this.client.request("thread/delete", { threadId: u })), Error("Codex app-server did not create an ephemeral generation thread");
+		if (this.hiddenThreadIds.add(u), t.signal?.aborted) throw await la(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u), pa();
+		let d = ua();
 		this.pendingByThread.set(u, d);
-		let f = null, p = !1, m = () => d.reject(ua());
+		let f = null, p = !1, m = () => d.reject(pa());
 		t.signal?.addEventListener("abort", m);
 		let h = setTimeout(() => {
 			d.reject(/* @__PURE__ */ Error("Codex ephemeral generation timed out"));
-		}, t.timeoutMs ?? ia);
+		}, t.timeoutMs ?? sa);
 		try {
 			let e = await this.client.request("turn/start", {
 				threadId: u,
@@ -6559,18 +6613,18 @@ var ia = 12e4, aa = class {
 				serviceTier: c,
 				...t.outputSchema === void 0 ? {} : { outputSchema: t.outputSchema }
 			});
-			f = e.turn.id, d.turnId = f, ca(d, e.turn);
+			f = e.turn.id, d.turnId = f, da(d, e.turn);
 			let r = await d.promise;
 			return p = !0, r;
 		} finally {
 			if (clearTimeout(h), t.signal?.removeEventListener("abort", m), this.pendingByThread.delete(u), !p && f) {
 				let e = f;
-				await oa(() => this.client.request("turn/interrupt", {
+				await la(() => this.client.request("turn/interrupt", {
 					threadId: u,
 					turnId: e
 				}));
 			}
-			await oa(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u);
+			await la(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u);
 		}
 	}
 	close(e = /* @__PURE__ */ Error("Codex surface closed")) {
@@ -6593,16 +6647,16 @@ var ia = 12e4, aa = class {
 		}
 		if (t.method === "turn/completed") {
 			if (e.turnId && t.params.turn.id !== e.turnId) return;
-			ca(e, t.params.turn);
+			da(e, t.params.turn);
 		}
 	}
 };
-async function oa(e) {
+async function la(e) {
 	try {
 		await e();
 	} catch {}
 }
-function sa() {
+function ua() {
 	let e, t, n = {
 		promise: new Promise((n, r) => {
 			e = n, t = r;
@@ -6618,7 +6672,7 @@ function sa() {
 	};
 	return n.promise.catch(() => void 0), n;
 }
-function ca(e, t) {
+function da(e, t) {
 	for (let n of t.items) {
 		if (n.type !== "agentMessage") continue;
 		let t = n.text.trim();
@@ -6640,17 +6694,98 @@ function ca(e, t) {
 	}
 	e.resolve({ text: n });
 }
-function la(e) {
+function fa(e) {
 	if (e.method === "thread/started") return e.params.thread.id;
 	let t = e.params;
 	return typeof t.threadId == "string" ? t.threadId : null;
 }
-function ua() {
+function pa() {
 	return /* @__PURE__ */ Error("Codex ephemeral generation was aborted");
 }
 //#endregion
+//#region src/node/codex-surface-usage-controller.ts
+var ma = class {
+	threads = /* @__PURE__ */ new Map();
+	clear() {
+		this.threads.clear();
+	}
+	observe(e, t) {
+		if (!("conversationId" in t)) return t;
+		let n = t.conversationId;
+		if (t.type === "conversation.historyReplaced" || t.type === "conversation.summaryRemoved") return this.threads.delete(n), t;
+		if (t.type === "turn.started" && e !== "lifecycle") {
+			let e = this.thread(n);
+			return e.executions.has(t.turnId) || e.executions.set(t.turnId, {
+				baseline: e.lastUsageTurnId === t.turnId ? null : e.total,
+				latest: null
+			}), e.activeTurnId = t.turnId, t;
+		}
+		if (t.type === "turn.completed") {
+			let e = this.threads.get(n);
+			return e?.activeTurnId === t.turnId && (e.activeTurnId = null), {
+				...t,
+				payload: {
+					...t.payload,
+					executionUsage: structuredClone(e?.executions.get(t.turnId)?.latest ?? null)
+				}
+			};
+		}
+		if (t.type !== "conversation.executionUsageChanged") return t;
+		let r = this.thread(n), i = r.executions.get(t.turnId), a = t.payload.usage, o = r.activeTurnId !== null && r.activeTurnId !== t.turnId;
+		if (o) {
+			let e = r.executions.get(r.activeTurnId);
+			e && (e.baseline = null), i && (i.baseline = null);
+		}
+		i && (!ga(a.total) || i.latest && !_a(i.latest.total, a.total)) && (i.baseline = null);
+		let s = i?.baseline ? va(i.baseline, a.total) : null;
+		i && s === null && (i.baseline = null);
+		let c = {
+			...a,
+			execution: s,
+			observedStart: !!i
+		};
+		return i && (i.latest = structuredClone(c)), r.total = !o && ga(a.total) ? structuredClone(a.total) : null, r.lastUsageTurnId = t.turnId, {
+			...t,
+			payload: { usage: c }
+		};
+	}
+	thread(e) {
+		let t = this.threads.get(e);
+		return t || (t = {
+			total: null,
+			lastUsageTurnId: null,
+			activeTurnId: null,
+			executions: /* @__PURE__ */ new Map()
+		}, this.threads.set(e, t)), t;
+	}
+}, ha = [
+	"totalTokens",
+	"inputTokens",
+	"cachedInputTokens",
+	"outputTokens",
+	"reasoningOutputTokens"
+];
+function ga(e) {
+	return ha.every((t) => Number.isSafeInteger(e[t]) && e[t] >= 0) && (e.cacheWriteInputTokens === null || Number.isSafeInteger(e.cacheWriteInputTokens) && e.cacheWriteInputTokens >= 0) && e.totalTokens === e.inputTokens + e.outputTokens && e.cachedInputTokens <= e.inputTokens && e.reasoningOutputTokens <= e.outputTokens;
+}
+function _a(e, t) {
+	return ha.every((n) => t[n] >= e[n]) && (e.cacheWriteInputTokens === null || t.cacheWriteInputTokens === null || t.cacheWriteInputTokens >= e.cacheWriteInputTokens);
+}
+function va(e, t) {
+	if (!ga(e) || !ga(t) || !_a(e, t)) return null;
+	let n = {
+		totalTokens: t.totalTokens - e.totalTokens,
+		inputTokens: t.inputTokens - e.inputTokens,
+		cachedInputTokens: t.cachedInputTokens - e.cachedInputTokens,
+		cacheWriteInputTokens: e.cacheWriteInputTokens === null || t.cacheWriteInputTokens === null ? null : t.cacheWriteInputTokens - e.cacheWriteInputTokens,
+		outputTokens: t.outputTokens - e.outputTokens,
+		reasoningOutputTokens: t.reasoningOutputTokens - e.reasoningOutputTokens
+	};
+	return ga(n) ? n : null;
+}
+//#endregion
 //#region src/node/codex-surface.ts
-var da = class {
+var ya = class {
 	options;
 	client;
 	listeners = /* @__PURE__ */ new Set();
@@ -6681,19 +6816,21 @@ var da = class {
 	unsubscribeToolInputRequests;
 	unsubscribeMcpElicitationRequests;
 	eventSequence = 0;
+	usage = new ma();
+	accountGeneration = 0;
 	pendingMarkdownImageHydrations = /* @__PURE__ */ new Set();
 	closed = !1;
 	state = _t(bt());
 	constructor(e = {}) {
-		this.options = e, this.extensions = new Si(e.extensions ?? [], e.mcpServers ?? [], (e) => this.lifecycle.hostOptions(e));
-		let n = Dt(e);
-		this.client = e.client ?? new t(Et(n) ? new Ke(n) : new Ve(n), e.onListenerError ? { onListenerError: e.onListenerError } : {}), this.markdownImages = new qi(this.client), this.authentication = new kt(this.client, {
+		this.options = e, this.extensions = new Ti(e.extensions ?? [], e.mcpServers ?? [], (e) => this.lifecycle.hostOptions(e));
+		let n = sn(e);
+		this.client = e.client ?? new t(on(n) ? new Ke(n) : new Ve(n), e.onListenerError ? { onListenerError: e.onListenerError } : {}), this.markdownImages = new Xi(this.client), this.authentication = new ln(this.client, {
 			bootstrapSurfaceData: (e) => this.connection.bootstrapSurfaceData(e),
 			clearAuthenticatedSurfaceData: () => this.connection.clearAuthenticatedSurfaceData(),
 			getSnapshot: () => this.getSnapshot(),
 			patchAuthentication: (e, t) => this.connection.patchAuthentication(e, t),
 			reportError: (e) => this.patch({ error: O(e) })
-		}), this.items = new br({
+		}), this.items = new Yr({
 			assistantMessageForTurn: (e, t) => this.assistantMessageForTurn(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
 			emitEvent: (e, t) => this.emitEvent(e, t),
@@ -6707,7 +6844,7 @@ var da = class {
 			sendNextQueuedPrompt: (e) => {
 				this.messagesController.sendNextQueuedPrompt(e);
 			}
-		}), this.approvals = new mi(this.client, {
+		}), this.approvals = new _i(this.client, {
 			activeConversationId: () => this.state.activeConversationId,
 			createRuntime: (e, t) => this.createRuntime(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -6717,7 +6854,7 @@ var da = class {
 			patch: (e) => this.patch(e),
 			patchConversationStatus: (e, t) => this.patchConversationStatus(e, t),
 			patchRuntime: (e, t) => this.patchRuntime(e, t)
-		}), this.clientRequests = new Cr({
+		}), this.clientRequests = new Qr({
 			activeConversationId: () => this.state.activeConversationId,
 			answerAsyncQuestion: (e, t, n) => this.messagesController.answerAsyncQuestion(e, t, n),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -6727,13 +6864,13 @@ var da = class {
 			messageContainingTool: (e, t, n) => this.messageContainingTool(e, t, n),
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			requireRuntime: (e) => this.requireRuntime(e)
-		}), this.runtimeState = new Ii(this.approvals, this.clientRequests, {
+		}), this.runtimeState = new zi(this.approvals, this.clientRequests, {
 			emitEvent: (e, t) => this.emitEvent(e, t),
 			getState: () => this.state,
 			notifyConversationListeners: (e) => this.notifyConversationListeners(e),
 			patch: (e, t) => this.patch(e, t),
 			schedulePluginRefresh: () => this.catalog.schedulePluginRefresh()
-		}), this.conversationSettings = new Oi(this.client, {
+		}), this.conversationSettings = new ji(this.client, {
 			approvalMode: e.approvalMode,
 			approvalPreset: e.approvalPreset,
 			permissionMode: e.permissionMode
@@ -6751,7 +6888,7 @@ var da = class {
 			patch: (e) => this.patch(e),
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}), this.turnActions = new Ai(this.client, {
+		}), this.turnActions = new Ni(this.client, {
 			createConversation: async () => {
 				await this.createConversation();
 			},
@@ -6768,7 +6905,7 @@ var da = class {
 			patchConversationTurnCount: (e, t, n) => this.patchConversationTurnCount(e, t, n),
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			sendMessageToThread: (e, t, n) => this.messagesController.sendToThread(e, t, n)
-		}), this.messagesController = new Mi(this.client, {
+		}), this.messagesController = new Fi(this.client, {
 			clearGoalForThread: (e) => this.conversationSettings.clearGoalForThread(e),
 			compactForThread: (e) => this.turnActions.compactForThread(e),
 			createConversation: async () => {
@@ -6791,7 +6928,7 @@ var da = class {
 			startReviewForThread: (e, t) => this.turnActions.startReviewForThread(e, t),
 			updateSettings: (e) => this.conversationSettings.update(e),
 			updateSettingsForThread: (e, t) => this.conversationSettings.updateForThread(e, t)
-		}), this.catalog = new oi(this.client, e.cwd, {
+		}), this.catalog = new li(this.client, e.cwd, {
 			authenticationBlocksBootstrap: () => this.authentication.blocksBootstrap(),
 			emitConversationSkills: (e, t) => this.emitConversationSkills(e, t),
 			emitEvent: (e, t) => this.emitEvent(e, t),
@@ -6802,7 +6939,7 @@ var da = class {
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			preferredApprovalPreset: () => this.conversationSettings.preferredApprovalPreset(),
 			runtimes: () => this.runtimeState.values()
-		}), this.conversations = new Ei(this.client, e.conversationLimit, {
+		}), this.conversations = new ki(this.client, e.conversationLimit, {
 			emitHistoryPrepended: (e, t, n) => this.emitHistoryPrepended(e, t, n),
 			emitSummaryUpserted: (e, t, n) => this.emitSummaryUpserted(e, t, n),
 			ensureConnected: () => this.ensureConnected(),
@@ -6814,7 +6951,7 @@ var da = class {
 			requireRuntime: (e) => this.requireRuntime(e),
 			runtime: (e) => this.runtimeState.get(e),
 			schedulePluginRefresh: (e) => this.catalog.schedulePluginRefresh(e)
-		}), this.lifecycle = new Pi(this.client, e, this.catalog, this.extensions, this.conversationSettings, this.conversations, {
+		}), this.lifecycle = new Li(this.client, e, this.catalog, this.extensions, this.conversationSettings, this.conversations, {
 			activateRuntime: (e) => this.activateRuntime(e),
 			createRuntime: (e, t) => this.createRuntime(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -6836,7 +6973,7 @@ var da = class {
 			runtime: (e) => this.runtimeState.get(e),
 			runtimeProjection: (e) => this.runtimeProjection(e),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}), this.forks = new Ui(this.client, e.loadingStrategy, this.catalog, this.extensions, {
+		}), this.forks = new Ki(this.client, e.loadingStrategy, this.catalog, this.extensions, {
 			createRuntime: (e, t) => this.createRuntime(e, t),
 			emitConversationActivity: (e) => this.emitConversationActivity(e, "action"),
 			emitConversationPermissions: (e) => this.emitConversationPermissions(e, "action"),
@@ -6850,7 +6987,7 @@ var da = class {
 			rememberHostOptions: (e, t) => this.lifecycle.rememberHostOptions(e, t),
 			requireRuntime: (e) => this.requireRuntime(e),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}), this.connection = new Vi(this.client, e, this.authentication, this.approvals, this.catalog, this.clientRequests, this.conversations, this.items, this.lifecycle, this.runtimeState, {
+		}), this.connection = new Wi(this.client, e, this.authentication, this.approvals, this.catalog, this.clientRequests, this.conversations, this.items, this.lifecycle, this.runtimeState, {
 			clearConversationHandles: () => this.conversationHandles.clear(),
 			clearPendingForThread: (e, t, n) => this.clearPendingForThread(e, t, n),
 			closed: () => this.closed,
@@ -6862,7 +6999,7 @@ var da = class {
 			getSnapshot: () => this.getSnapshot(),
 			getState: () => this.state,
 			patch: (e) => this.patch(e)
-		}), this.notifications = new Fi(this.authentication, this.approvals, this.catalog, this.clientRequests, this.conversations, this.items, {
+		}), this.notifications = new Ri(this.authentication, this.approvals, this.catalog, this.clientRequests, this.conversations, this.items, {
 			clearPendingForThread: (e, t, n) => this.clearPendingForThread(e, t, n),
 			createRuntime: (e, t) => this.createRuntime(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -6886,13 +7023,13 @@ var da = class {
 			},
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e),
 			unknownNotification: (e) => this.handleUnknownNotification(e)
-		}), this.textGeneration = new aa(this.client, e.cwd, {
+		}), this.textGeneration = new ca(this.client, e.cwd, {
 			ensureConnected: () => this.ensureConnected(),
 			getSnapshot: () => this.getSnapshot()
 		}), this.unsubscribeNotification = this.client.onNotification((e) => {
-			this.textGeneration.handleNotification(e) || this.notifications.handle(e);
+			(e.method === "account/updated" || e.method === "account/login/completed") && (this.accountGeneration += 1, this.usage.clear()), this.textGeneration.handleNotification(e) || this.notifications.handle(e);
 		}), this.unsubscribeDisconnect = this.client.onDisconnect((e) => {
-			this.textGeneration.close(e), this.connection.handleDisconnect(e);
+			this.accountGeneration += 1, this.usage.clear(), this.textGeneration.close(e), this.connection.handleDisconnect(e);
 		}), this.unsubscribeToolInputRequests = this.client.onServerRequest("item/tool/requestUserInput", (e, t) => this.clientRequests.handleToolInputRequest(e, t)), this.unsubscribeMcpElicitationRequests = this.client.onServerRequest("mcpServer/elicitation/request", (e, t) => this.clientRequests.handleMcpElicitationRequest(e, t)), this.client.onServerRequest("item/tool/call", async (e, t) => {
 			await this.extensions.handleDynamicToolCall(e, t);
 		}), this.client.onServerRequest("account/chatgptAuthTokens/refresh", (e, t) => {
@@ -6916,13 +7053,41 @@ var da = class {
 		return this.textGeneration.generate(e, t);
 	}
 	async refreshAccount() {
-		return this.connection.refreshAccount();
+		return this.accountGeneration += 1, this.connection.refreshAccount();
+	}
+	async readRateLimits(e) {
+		return this.requestForAccount(() => this.client.request("account/rateLimits/read", e), (e) => {
+			let t = $t(e);
+			return this.patch({ rateLimits: t }), this.emitEvent("action", {
+				type: "rateLimits.changed",
+				payload: { rateLimits: structuredClone(t) }
+			}), structuredClone(t);
+		});
+	}
+	async readAccountUsage() {
+		return this.requestForAccount(() => this.client.request("account/usage/read", {}), tn);
+	}
+	async consumeRateLimitResetCredit(e) {
+		if (!e || typeof e.idempotencyKey != "string" || !e.idempotencyKey.trim() || e.creditId !== void 0 && (typeof e.creditId != "string" || !e.creditId.trim())) throw TypeError("Reset-credit options require non-empty identifiers");
+		let t = {
+			idempotencyKey: e.idempotencyKey,
+			...e.creditId === void 0 ? {} : { creditId: e.creditId }
+		};
+		return this.requestForAccount(() => this.client.request("account/rateLimitResetCredit/consume", t), (e) => {
+			switch (e?.outcome) {
+				case "reset":
+				case "alreadyRedeemed":
+				case "nothingToReset":
+				case "noCredit": return { outcome: e.outcome };
+				default: throw Error("Invalid reset-credit outcome");
+			}
+		});
 	}
 	async startChatGptLogin() {
-		return this.connection.startChatGptLogin();
+		return this.accountGeneration += 1, this.connection.startChatGptLogin();
 	}
 	async startChatGptDeviceCodeLogin() {
-		return this.connection.startChatGptDeviceCodeLogin();
+		return this.accountGeneration += 1, this.connection.startChatGptDeviceCodeLogin();
 	}
 	async readRemoteControlStatus() {
 		return this.connection.readRemoteControlStatus();
@@ -6952,7 +7117,7 @@ var da = class {
 		return this.connection.cancelLogin(e);
 	}
 	async logout() {
-		return this.connection.logout();
+		return this.accountGeneration += 1, this.connection.logout();
 	}
 	async refreshConversations() {
 		return this.conversations.refresh();
@@ -7031,7 +7196,7 @@ var da = class {
 		return this.lifecycle.readHistory(e);
 	}
 	async readConversationPromptHistory(e = this.state.activeConversationId ?? "") {
-		return await this.ensureConnected(), ta(this.client, e);
+		return await this.ensureConnected(), ia(this.client, e);
 	}
 	async loadOlderConversationHistory(e = this.state.activeConversationId ?? "") {
 		return this.conversations.loadOlderHistory(D(e));
@@ -7100,7 +7265,7 @@ var da = class {
 	conversation(e) {
 		let t = D(e), n = this.conversationHandles.get(t);
 		if (n) return n;
-		let r = At(t, {
+		let r = un(t, {
 			clearGoal: () => this.conversationSettings.clearGoalForThread(t),
 			compact: () => this.turnActions.compactForThread(t),
 			continueInterruptedTurn: () => this.messagesController.continueInterruptedTurnForThread(t),
@@ -7212,7 +7377,7 @@ var da = class {
 	}
 	async close() {
 		if (!this.closed) {
-			this.closed = !0, this.unsubscribeNotification(), this.unsubscribeToolInputRequests(), this.unsubscribeMcpElicitationRequests(), this.unsubscribeDisconnect(), this.approvals.close(), this.clientRequests.clear(), this.items.reset(), this.catalog.reset(!1), this.textGeneration.close();
+			this.closed = !0, this.usage.clear(), this.unsubscribeNotification(), this.unsubscribeToolInputRequests(), this.unsubscribeMcpElicitationRequests(), this.unsubscribeDisconnect(), this.approvals.close(), this.clientRequests.clear(), this.items.reset(), this.catalog.reset(!1), this.textGeneration.close();
 			for (let e of this.runtimeState.values()) e.activeTurnId = null, e.busy = !1, e.turnStartPending = !1;
 			await this.client.close(), this.patch({
 				status: "idle",
@@ -7372,7 +7537,20 @@ var da = class {
 			..."params" in t ? { params: t.params } : {}
 		});
 	}
+	async requestForAccount(e, t) {
+		await this.ensureConnected(), await this.authentication.pendingRefresh();
+		let n = this.accountGeneration, r = Ct(this.state.authentication), i = await e();
+		if (this.closed || n !== this.accountGeneration || r !== Ct(this.state.authentication)) throw Error("Account changed during account operation");
+		return t(i);
+	}
 	emitEvent(e, t) {
+		if (t = this.usage.observe(e, t), t.type === "conversation.executionUsageChanged" || t.type === "turn.completed") {
+			let e = this.runtimeState.get(t.conversationId), n = t.type === "turn.completed" ? t.payload.executionUsage : t.payload.usage, r = t.turnId;
+			e?.turns.some((e) => e.id === r) && this.patchRuntime(t.conversationId, { turns: e.turns.map((e) => e.id === r ? {
+				...e,
+				executionUsage: structuredClone(n)
+			} : e) });
+		}
 		let n = {
 			...t,
 			seq: ++this.eventSequence,
@@ -7406,19 +7584,19 @@ var da = class {
 		for (let e of this.conversationListeners.keys()) this.notifyConversationListeners(e);
 	}
 };
-function fa(e = {}) {
-	return new da(e);
+function ba(e = {}) {
+	return new ya(e);
 }
 //#endregion
 //#region src/node/codex-app-backend-cache.ts
-var pa = {
+var xa = {
 	set(e, t) {
 		return setTimeout(e, t);
 	},
 	clear(e) {
 		clearTimeout(e);
 	}
-}, ma = class {
+}, Sa = class {
 	options;
 	records = /* @__PURE__ */ new Map();
 	now;
@@ -7431,7 +7609,7 @@ var pa = {
 	constructor(e) {
 		if (this.options = e, !Number.isFinite(e.ttlMs) || e.ttlMs <= 0) throw Error("Codex backend cache ttlMs must be greater than zero");
 		if (e.sweepIntervalMs !== void 0 && e.sweepIntervalMs !== null && (!Number.isFinite(e.sweepIntervalMs) || e.sweepIntervalMs <= 0)) throw Error("Codex backend cache sweepIntervalMs must be greater than zero");
-		this.now = e.now ?? Date.now, this.scheduler = e.scheduler ?? pa, this.sweepIntervalMs = e.sweepIntervalMs ?? null;
+		this.now = e.now ?? Date.now, this.scheduler = e.scheduler ?? xa, this.sweepIntervalMs = e.sweepIntervalMs ?? null;
 	}
 	get size() {
 		return this.records.size;
@@ -7529,7 +7707,7 @@ var pa = {
 	assertOpen() {
 		if (this.closed) throw Error("Codex backend cache is closed");
 	}
-}, ha = class {
+}, Ca = class {
 	surface;
 	moduleServices = /* @__PURE__ */ new Map();
 	ttlCaches = /* @__PURE__ */ new Set();
@@ -7545,7 +7723,7 @@ var pa = {
 			if (n.has(e)) throw Error(`Duplicate Codex backend module '${e}'`);
 			n.add(e);
 		}
-		this.surface = e.surface ?? new da(e.surfaceOptions);
+		this.surface = e.surface ?? new ya(e.surfaceOptions);
 		for (let { id: e, module: n } of t) this.moduleServices.set(e, n.create({
 			surface: this.surface,
 			closeBackend: () => this.close(),
@@ -7559,7 +7737,7 @@ var pa = {
 	}
 	createTtlCache(e) {
 		if (this.closePromise) throw Error("Cannot create a cache after the Codex backend is closed");
-		let t = new ma(e);
+		let t = new Sa(e);
 		return this.ttlCaches.add(t), t;
 	}
 	close() {
@@ -7569,16 +7747,16 @@ var pa = {
 		await Promise.all([...this.ttlCaches].map((e) => e.close())), await this.surface.close();
 	}
 };
-function ga(e = {}) {
-	return new ha(e);
+function wa(e = {}) {
+	return new Ca(e);
 }
 //#endregion
 //#region src/node/apple-speech-transcription.ts
-async function _a(e, t = {}, n = {}) {
+async function Ta(e, t = {}, n = {}) {
 	let r = n.fs ?? l, i = n.spawn ?? o, a = n.tmpdir ?? f.tmpdir, s = await r.mkdtemp(h.join(a(), "codex-app-sdk-apple-stt-")), c = h.join(s, "input.wav"), u = h.join(s, "output.txt");
 	try {
-		let a = await Sa(va(n.assetsPath), s, r);
-		return await r.writeFile(c, e), await ba(i, a, ya(c, u, t)), { text: (await r.readFile(u, "utf8")).trim() };
+		let a = await Aa(Ea(n.assetsPath), s, r);
+		return await r.writeFile(c, e), await Oa(i, a, Da(c, u, t)), { text: (await r.readFile(u, "utf8")).trim() };
 	} catch (e) {
 		return {
 			text: "",
@@ -7591,10 +7769,10 @@ async function _a(e, t = {}, n = {}) {
 		});
 	}
 }
-function va(e, t = {}) {
-	return h.join(e ?? xa(t), "apple-speechanalyzer-cli");
+function Ea(e, t = {}) {
+	return h.join(e ?? ka(t), "apple-speechanalyzer-cli");
 }
-function ya(e, t, n) {
+function Da(e, t, n) {
 	let r = [
 		"--input-audio-path",
 		e,
@@ -7603,7 +7781,7 @@ function ya(e, t, n) {
 	], i = n.locale?.trim();
 	return i && r.push("--locale", i), n.live && r.push("--live"), r;
 }
-function ba(e, t, n) {
+function Oa(e, t, n) {
 	return new Promise((r, i) => {
 		let a = e(t, n), o = "";
 		a.stderr?.on("data", (e) => {
@@ -7619,7 +7797,7 @@ function ba(e, t, n) {
 		});
 	});
 }
-function xa(e) {
+function ka(e) {
 	let t = (e.env ?? process.env).CODEX_APP_SDK_ASSETS_PATH?.trim();
 	if (t) return t;
 	let n = process.resourcesPath, r = e.resourcesPath === void 0 ? n : e.resourcesPath ?? void 0, i = e.existsSync ?? c;
@@ -7650,18 +7828,18 @@ function xa(e) {
 	let u = import.meta.url, d = e.moduleUrl === void 0 ? u : e.moduleUrl ?? void 0, f = d ? h.dirname(ne(d)) : s, p = [h.resolve(f, "../assets"), h.resolve(f, "../../assets")];
 	return p.find((e) => i(h.join(e, "apple-speechanalyzer-cli"))) ?? p[0];
 }
-async function Sa(e, t, n) {
+async function Aa(e, t, n) {
 	let r = h.join(t, "apple-speechanalyzer-cli");
 	return await n.copyFile(e, r), await n.chmod(r, 448), r;
 }
 //#endregion
 //#region src/node/apple-speech-session.ts
-async function Ca(e, t, n = {}) {
+async function ja(e, t, n = {}) {
 	if (n.signal?.throwIfAborted(), !Number.isInteger(e.sampleRate) || e.sampleRate < 8e3 || e.sampleRate > 96e3) throw Error("Unsupported speech sample rate.");
 	let r = await se(h.join(m(), "codex-sdk-live-speech-")), i;
 	try {
 		let t = h.join(r, "apple-speechanalyzer-cli");
-		await oe(va(n.assetsPath), t), await ae(t, 448), n.signal?.throwIfAborted(), i = (n.spawn ?? o)(t, [
+		await oe(Ea(n.assetsPath), t), await ae(t, 448), n.signal?.throwIfAborted(), i = (n.spawn ?? o)(t, [
 			"--stream",
 			"--sample-rate",
 			String(e.sampleRate),
@@ -7763,6 +7941,6 @@ async function Ca(e, t, n = {}) {
 	};
 }
 //#endregion
-export { ha as CodexAppBackend, ma as CodexAppBackendTtlCache, Ve as CodexAppServerStdioTransport, Ke as CodexAppServerUnixSocketTransport, da as CodexSurface, Hn as codexItemToMediaPart, Bn as codexItemToSurfaceMessage, A as codexItemToToolPart, me as codexRuntimePathEntries, Ln as codexThreadToSurfaceMessages, zn as codexTurnToSurfaceMessages, ga as createCodexAppBackend, fa as createCodexSurface, pe as discoverCodexExecutable, Rn as preserveHistoricalAttachmentPreviews, va as resolveAppleSpeechAnalyzerPath, ge as resolveCodexRuntime, Ca as startAppleSpeechSession, _a as transcribeWithAppleSpeechAnalyzer, he as withCodexRuntimePath };
+export { Ca as CodexAppBackend, Sa as CodexAppBackendTtlCache, Ve as CodexAppServerStdioTransport, Ke as CodexAppServerUnixSocketTransport, ya as CodexSurface, _r as codexItemToMediaPart, hr as codexItemToSurfaceMessage, L as codexItemToToolPart, me as codexRuntimePathEntries, fr as codexThreadToSurfaceMessages, mr as codexTurnToSurfaceMessages, wa as createCodexAppBackend, ba as createCodexSurface, pe as discoverCodexExecutable, pr as preserveHistoricalAttachmentPreviews, Ea as resolveAppleSpeechAnalyzerPath, ge as resolveCodexRuntime, ja as startAppleSpeechSession, Ta as transcribeWithAppleSpeechAnalyzer, he as withCodexRuntimePath };
 
 //# sourceMappingURL=index.js.map