@codex-app-sdk/backend 0.19.1 → 0.19.3

package/dist/index.js

@@ -1742,6 +1742,7 @@ function Nn(e) {
 		let t = Vn(e.path);
 		return v(e.path) && t && En.has(t) ? [{
 			type: "media",
+			phase: "commentary",
 			itemId: e.id,
 			media: {
 				url: fe(e.path).href,
@@ -1776,6 +1777,7 @@ function Nn(e) {
 			let u = Hn(l);
 			u && (i -= u.url.length, r.push({
 				type: "media",
+				phase: "commentary",
 				itemId: r.length ? `${e.id}:image:${r.length}` : e.id,
 				media: {
 					url: u.url,
@@ -2782,7 +2784,7 @@ function Pi(e) {
 }
 //#endregion
 //#region src/node/codex-original-history-images.ts
-var Fi = 256 * 1024 * 1024, Ii = 32 * 1024 * 1024, Li = 20 * 1024 * 1024, Ri = 2048, zi = class {
+var Fi = 32 * 1024 * 1024, Ii = 20 * 1024 * 1024, Li = 2048, Ri = class {
 	client;
 	paths = /* @__PURE__ */ new Map();
 	indexes = /* @__PURE__ */ new Map();
@@ -2839,13 +2841,13 @@ var Fi = 256 * 1024 * 1024, Ii = 32 * 1024 * 1024, Li = 20 * 1024 * 1024, Ri = 2
 		let r = await this.index(e), i = r.images.get(t);
 		if (!i) throw Error("Original conversation image is no longer available.");
 		if (!Number.isSafeInteger(n) || n < 0 || n >= i.byteLength) throw Error("Invalid content offset.");
-		let a = Ui(await se(r.path));
+		let a = Hi(await se(r.path));
 		if (this.disposed || this.paths.get(e) !== r.path) throw Error("Conversation image reader was released.");
 		let o = this.images.get(t), s = o?.signature === a ? o.url : void 0;
 		if (this.images.delete(t), !s) {
 			let t = await ae(r.path, "r");
 			try {
-				await Wi(t, e);
+				await Ui(t, e);
 				let n = Buffer.alloc(i.length);
 				for (let e = 0; e < n.length;) {
 					let r = await t.read(n, e, Math.min(64 * 1024, n.length - e), i.offset + e);
@@ -2853,9 +2855,9 @@ var Fi = 256 * 1024 * 1024, Ii = 32 * 1024 * 1024, Li = 20 * 1024 * 1024, Ri = 2
 					e += r.bytesRead;
 				}
 				let a = JSON.parse(n.toString("utf8")), o = a.payload;
-				if (a.type !== "response_item" || o?.type !== "custom_tool_call_output" || o.call_id !== i.callId || Bi(o) !== i.turnId || !Array.isArray(o.output)) throw Error("Original image identity changed.");
-				let c = o.output[i.imageIndex], l = Vi(c);
-				if (!l || Hi(l) !== i.hash) throw Error("Original image bytes changed.");
+				if (a.type !== "response_item" || o?.type !== "custom_tool_call_output" || o.call_id !== i.callId || zi(o) !== i.turnId || !Array.isArray(o.output)) throw Error("Original image identity changed.");
+				let c = o.output[i.imageIndex], l = Bi(c);
+				if (!l || Vi(l) !== i.hash) throw Error("Original image bytes changed.");
 				if (s = l, this.disposed || this.paths.get(e) !== r.path) throw Error("Conversation image reader was released.");
 			} finally {
 				await t.close();
@@ -2864,7 +2866,7 @@ var Fi = 256 * 1024 * 1024, Ii = 32 * 1024 * 1024, Li = 20 * 1024 * 1024, Ri = 2
 		for (this.images.set(t, {
 			signature: a,
 			url: s
-		}); this.images.size > 2 || [...this.images.values()].reduce((e, t) => e + t.url.length, 0) > Li;) this.images.delete(this.images.keys().next().value);
+		}); this.images.size > 2 || [...this.images.values()].reduce((e, t) => e + t.url.length, 0) > Ii;) this.images.delete(this.images.keys().next().value);
 		let c = Math.min(s.length, n + 64 * 1024);
 		return {
 			data: Buffer.from(s.slice(n, c)).toString("base64"),
@@ -2885,15 +2887,15 @@ var Fi = 256 * 1024 * 1024, Ii = 32 * 1024 * 1024, Li = 20 * 1024 * 1024, Ri = 2
 			t = n.path, this.paths.set(e, t);
 		}
 		let n = await se(t);
-		if (!n.isFile() || n.size > Fi) throw Error("Original history exceeds the read limit.");
-		let r = Ui(n), i = this.indexes.get(e);
+		if (!n.isFile()) throw Error("Original history is not a file.");
+		let r = Hi(n), i = this.indexes.get(e);
 		if (i?.signature === r) return i;
 		let a = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map(), s = await ae(t, "r");
 		try {
-			await Wi(s, e);
+			await Ui(s, e);
 			let t = 0;
-			for await (let r of Gi(s, n.size)) {
-				if (++t > 1e5 || a.size >= Ri) break;
+			for await (let r of Wi(s, n.size)) {
+				if (++t > 1e5 || a.size >= Li) break;
 				let n;
 				try {
 					n = JSON.parse(r.text);
@@ -2902,7 +2904,7 @@ var Fi = 256 * 1024 * 1024, Ii = 32 * 1024 * 1024, Li = 20 * 1024 * 1024, Ri = 2
 				}
 				let i = n?.payload;
 				if (n?.type !== "response_item" || !i || typeof i.call_id != "string" || !i.call_id || i.call_id.length > 256) continue;
-				let s = Bi(i);
+				let s = zi(i);
 				if (s) {
 					if (i.type === "custom_tool_call") {
 						o.size < 4096 && o.set(i.call_id, s);
@@ -2910,10 +2912,10 @@ var Fi = 256 * 1024 * 1024, Ii = 32 * 1024 * 1024, Li = 20 * 1024 * 1024, Ri = 2
 					}
 					if (!(i.type !== "custom_tool_call_output" || o.get(i.call_id) !== s || !Array.isArray(i.output))) {
 						o.delete(i.call_id);
-						for (let t = 0; t < Math.min(i.output.length, 256) && a.size < Ri; t++) {
-							let n = Vi(i.output[t]);
+						for (let t = 0; t < Math.min(i.output.length, 256) && a.size < Li; t++) {
+							let n = Bi(i.output[t]);
 							if (!n) continue;
-							let o = Hi(n), c = Hi(JSON.stringify([
+							let o = Vi(n), c = Vi(JSON.stringify([
 								e,
 								s,
 								i.call_id,
@@ -2930,6 +2932,7 @@ var Fi = 256 * 1024 * 1024, Ii = 32 * 1024 * 1024, Li = 20 * 1024 * 1024, Ri = 2
 								hash: o,
 								part: {
 									type: "media",
+									phase: "commentary",
 									itemId: `original-image:${i.call_id}:${t}`,
 									media: {
 										url: `conversation-image:${encodeURIComponent(e)}:${c}`,
@@ -2957,24 +2960,24 @@ var Fi = 256 * 1024 * 1024, Ii = 32 * 1024 * 1024, Li = 20 * 1024 * 1024, Ri = 2
 		return c;
 	}
 };
-function Bi(e) {
+function zi(e) {
 	let t = e.internal_chat_message_metadata_passthrough;
 	return t && typeof t == "object" && "turn_id" in t && typeof t.turn_id == "string" && t.turn_id.length <= 256 ? t.turn_id : void 0;
 }
-function Vi(e) {
-	if (!(!e || typeof e != "object" || !("type" in e) || e.type !== "input_image" || !("image_url" in e) || typeof e.image_url != "string" || e.image_url.length > Li)) return Hn(e.image_url)?.url;
+function Bi(e) {
+	if (!(!e || typeof e != "object" || !("type" in e) || e.type !== "input_image" || !("image_url" in e) || typeof e.image_url != "string" || e.image_url.length > Ii)) return Hn(e.image_url)?.url;
 }
-function Hi(e) {
+function Vi(e) {
 	return C("sha256").update(e).digest("hex");
 }
-function Ui(e) {
+function Hi(e) {
 	return `${e.dev}:${e.ino}:${e.size}:${e.mtimeMs}`;
 }
-async function Wi(e, t) {
+async function Ui(e, t) {
 	let n = Buffer.alloc(64 * 1024), { bytesRead: r } = await e.read(n, 0, n.length, 0), i = n.subarray(0, r).toString("utf8").split("\n", 1)[0], a = JSON.parse(i);
 	if (a?.type !== "session_meta" || a.payload?.id !== t) throw Error("Original history belongs to a different conversation.");
 }
-async function* Gi(e, t) {
+async function* Wi(e, t) {
 	let n = 0, r = 0, i = 0, a = [];
 	for (; n < t;) {
 		let o = Buffer.alloc(Math.min(64 * 1024, t - n)), { bytesRead: s } = await e.read(o, 0, o.length, n);
@@ -2982,7 +2985,7 @@ async function* Gi(e, t) {
 		let c = 0;
 		for (; c < s;) {
 			let e = o.indexOf(10, c), t = e < 0 || e >= s ? s : e, l = o.subarray(c, t);
-			i += l.length, i <= Ii ? a.push(l) : a = [], e >= 0 && e < s && (i <= Ii && (yield {
+			i += l.length, i <= Fi ? a.push(l) : a = [], e >= 0 && e < s && (i <= Fi && (yield {
 				offset: r,
 				length: i,
 				text: Buffer.concat(a, i).toString("utf8")
@@ -2991,7 +2994,7 @@ async function* Gi(e, t) {
 		n += s;
 	}
 }
-function Ki(e) {
+function Gi(e) {
 	return e.map((e) => {
 		let t = new Set(e.parts.filter((e) => e.type === "tool" && e.title === "view_image").map((e) => e.type === "tool" ? e.id : ""));
 		return t.size ? {
@@ -3002,22 +3005,22 @@ function Ki(e) {
 }
 //#endregion
 //#region src/node/codex-surface-realtime.ts
-function qi(e, t) {
+function Ki(e, t) {
 	if (e === void 0) return;
 	if (typeof e != "string") throw TypeError(`Realtime ${t} must be a string`);
 	let n = e.trim();
 	if (!n) throw TypeError(`Realtime ${t} cannot be empty`);
 	return n;
 }
-function Ji(e, t) {
+function qi(e, t) {
 	if (typeof e != "string") throw TypeError(`Realtime ${t} must be a string`);
 	let n = e.trim();
 	if (!n) throw TypeError(`Realtime ${t} cannot be empty`);
 	return n;
 }
-function Yi(e) {
+function Ji(e) {
 	if (!(e.data instanceof Uint8Array)) throw TypeError("Realtime audio data must be a Uint8Array");
-	let t = Zi(e.sampleRate, "sampleRate"), n = Zi(e.numChannels, "numChannels"), r = e.samplesPerChannel === void 0 ? Math.floor(e.data.byteLength / 2 / n) : Qi(e.samplesPerChannel, "samplesPerChannel"), i = e.itemId === void 0 ? null : e.itemId;
+	let t = Xi(e.sampleRate, "sampleRate"), n = Xi(e.numChannels, "numChannels"), r = e.samplesPerChannel === void 0 ? Math.floor(e.data.byteLength / 2 / n) : Zi(e.samplesPerChannel, "samplesPerChannel"), i = e.itemId === void 0 ? null : e.itemId;
 	if (i !== null && (typeof i != "string" || !i.trim())) throw TypeError("Realtime audio itemId must be a non-empty string or null");
 	return {
 		data: Buffer.from(e.data.buffer, e.data.byteOffset, e.data.byteLength).toString("base64"),
@@ -3027,7 +3030,7 @@ function Yi(e) {
 		itemId: i
 	};
 }
-function Xi(e) {
+function Yi(e) {
 	return {
 		data: new Uint8Array(Buffer.from(e.data, "base64")),
 		sampleRate: e.sampleRate,
@@ -3036,28 +3039,28 @@ function Xi(e) {
 		itemId: e.itemId
 	};
 }
-function Zi(e, t) {
+function Xi(e, t) {
 	if (!Number.isSafeInteger(e) || e <= 0) throw TypeError(`Realtime audio ${t} must be a positive integer`);
 	return e;
 }
-function Qi(e, t) {
+function Zi(e, t) {
 	if (e === null) return null;
 	if (!Number.isSafeInteger(e) || e < 0) throw TypeError(`Realtime audio ${t} must be a non-negative integer or null`);
 	return e;
 }
 //#endregion
 //#region src/node/codex-surface-realtime-session.ts
-async function $i(e) {
+async function Qi(e) {
 	let { client: t, ensureThreadReady: n, onConversationEvent: r, options: i, threadId: a } = e;
 	await n();
 	let o = i.outputModality;
 	if (o !== "text" && o !== "audio") throw TypeError(`Invalid realtime output modality '${String(o)}'`);
 	let s = i.version;
 	if (s !== void 0 && s !== "v1" && s !== "v2" && s !== "v3") throw TypeError(`Invalid realtime version '${String(s)}'`);
-	let c = qi(i.model, "model"), l = qi(i.voice, "voice"), u = i.transport ?? { type: "websocket" };
+	let c = Ki(i.model, "model"), l = Ki(i.voice, "voice"), u = i.transport ?? { type: "websocket" };
 	if (u.type !== "websocket" && u.type !== "webrtc") throw TypeError(`Invalid realtime transport '${String(u.type)}'`);
 	if (u.type === "webrtc" && !u.sdp.trim()) throw TypeError("WebRTC realtime transport requires a non-empty SDP offer");
-	let d = u.type === "webrtc" ? ea(r) : null, f;
+	let d = u.type === "webrtc" ? $i(r) : null, f;
 	try {
 		let [, e] = await Promise.all([t.request("thread/realtime/start", {
 			threadId: a,
@@ -3088,12 +3091,12 @@ async function $i(e) {
 			if (m(), u.type === "webrtc") throw Error("WebRTC realtime audio must be sent through its negotiated media track");
 			await t.request("thread/realtime/appendAudio", {
 				threadId: a,
-				audio: Yi(e)
+				audio: Ji(e)
 			});
 		},
 		appendText: async (e, n = "user") => {
 			m();
-			let r = Ji(e, "text");
+			let r = qi(e, "text");
 			if (n !== "user" && n !== "developer" && n !== "assistant") throw TypeError(`Invalid realtime text role '${String(n)}'`);
 			await t.request("thread/realtime/appendText", {
 				threadId: a,
@@ -3104,7 +3107,7 @@ async function $i(e) {
 		appendSpeech: async (e) => {
 			m(), await t.request("thread/realtime/appendSpeech", {
 				threadId: a,
-				text: Ji(e, "speech")
+				text: qi(e, "speech")
 			});
 		},
 		stop: async () => {
@@ -3115,7 +3118,7 @@ async function $i(e) {
 		})
 	};
 }
-function ea(e) {
+function $i(e) {
 	let t = () => void 0, n, r = !1, i = () => {
 		r || (r = !0, clearTimeout(n), t());
 	};
@@ -3132,7 +3135,7 @@ function ea(e) {
 }
 //#endregion
 //#region src/node/codex-surface-runtime.ts
-function ta(e) {
+function ea(e) {
 	return {
 		status: "idle",
 		authentication: e,
@@ -3175,7 +3178,7 @@ function ta(e) {
 		error: null
 	};
 }
-function na(e, t, n = {}) {
+function ta(e, t, n = {}) {
 	return {
 		threadId: e,
 		cwd: null,
@@ -3215,7 +3218,7 @@ function na(e, t, n = {}) {
 		...n
 	};
 }
-function ra(e, t, n) {
+function na(e, t, n) {
 	let r = [...n], i = new Set(r.map((e) => e.id)), a = new Set(e.answeredClientRequestIds);
 	for (let t of e.messages) {
 		let e = t.metadata?.asyncQuestionRequestIds;
@@ -3258,7 +3261,7 @@ function ra(e, t, n) {
 }
 //#endregion
 //#region src/node/codex-surface-authentication.ts
-function ia() {
+function ra() {
 	return {
 		status: "notLoaded",
 		account: null,
@@ -3272,7 +3275,7 @@ function ia() {
 		}
 	};
 }
-function aa(e) {
+function ia(e) {
 	return e.type === "chatgpt" ? {
 		type: "chatgpt",
 		email: e.email,
@@ -3282,13 +3285,13 @@ function aa(e) {
 		credentialSource: e.usesCodexManagedCredentials ? "codexManaged" : "awsManaged"
 	} : { type: "apiKey" };
 }
-function oa(e) {
+function aa(e) {
 	return JSON.stringify({
 		account: e.account,
 		requiresOpenaiAuth: e.requiresOpenaiAuth
 	});
 }
-function sa(e) {
+function oa(e) {
 	let t = e.account;
 	return t ? t.type === "chatgpt" ? JSON.stringify({
 		type: t.type,
@@ -3301,12 +3304,12 @@ function sa(e) {
 		requiresOpenaiAuth: e.requiresOpenaiAuth
 	});
 }
-function ca(e) {
+function sa(e) {
 	let t = e.trim();
 	if (!t) throw Error("Codex login id cannot be empty");
 	return t;
 }
-function la(e) {
+function ca(e) {
 	let t;
 	try {
 		t = new URL(e);
@@ -3321,38 +3324,38 @@ function la(e) {
 function q(e, t) {
 	return e.find((e) => e.id === t || e.model === t) ?? e.find((e) => e.isDefault) ?? e[0] ?? null;
 }
-function ua(e, t) {
+function la(e, t) {
 	let n = e.find((e) => e.id === t || e.model === t);
 	if (!n) throw Error(`Unknown model '${t}'`);
 	return n;
 }
-function da(e, t) {
+function ua(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 fa(e) {
+function da(e) {
 	return e.defaultReasoningEffort ?? e.supportedReasoningEfforts?.[0]?.reasoningEffort ?? null;
 }
-function pa(e) {
+function fa(e) {
 	return e.defaultServiceTier ?? null;
 }
-function ma(e, t) {
+function pa(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 ha(e, t) {
+function ma(e, t) {
 	let n = new Set(e.filter((e) => e.allowed).map((e) => e.id)), r = [];
-	return n.has(":workspace") && ga(t?.allowedApprovalPolicies, "on-request") && ga(t?.allowedApprovalsReviewers, "user") && r.push("ask-for-approval"), n.has(":workspace") && ga(t?.allowedApprovalPolicies, "on-request") && ga(t?.allowedApprovalsReviewers, "auto_review") && r.push("approve-for-me"), (n.has(":danger-full-access") || n.has(":danger-no-sandbox")) && ga(t?.allowedApprovalPolicies, "never") && ga(t?.allowedApprovalsReviewers, "user") && r.push("full-access"), r;
+	return n.has(":workspace") && ha(t?.allowedApprovalPolicies, "on-request") && ha(t?.allowedApprovalsReviewers, "user") && r.push("ask-for-approval"), n.has(":workspace") && ha(t?.allowedApprovalPolicies, "on-request") && ha(t?.allowedApprovalsReviewers, "auto_review") && r.push("approve-for-me"), (n.has(":danger-full-access") || n.has(":danger-no-sandbox")) && ha(t?.allowedApprovalPolicies, "never") && ha(t?.allowedApprovalsReviewers, "user") && r.push("full-access"), r;
 }
-function ga(e, t) {
+function ha(e, t) {
 	return !Array.isArray(e) || e.length === 0 || e.includes(t);
 }
-function _a(e) {
+function ga(e) {
 	return e === "full-access" ? {
 		approvalPolicy: "never",
 		approvalsReviewer: "user",
@@ -3363,39 +3366,39 @@ function _a(e) {
 		permissions: ":workspace"
 	};
 }
-function va(e) {
-	return _a(e);
+function _a(e) {
+	return ga(e);
 }
-function ya(e, t, n, r) {
+function va(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 ba(e, t, n) {
+function ya(e, t, n) {
 	let r = q(t, e.model);
 	return {
-		approvalPreset: ya(e.approvalPolicy, e.approvalsReviewer, e.sandbox, e.activePermissionProfile) ?? n.approvalPreset,
+		approvalPreset: va(e.approvalPolicy, e.approvalsReviewer, e.sandbox, e.activePermissionProfile) ?? n.approvalPreset,
 		planMode: n.planMode,
 		selectedModelId: r?.id ?? n.selectedModelId,
-		selectedReasoningEffort: e.reasoningEffort ?? (r ? fa(r) : null),
-		selectedServiceTier: e.serviceTier === void 0 ? r ? pa(r) : null : e.serviceTier
+		selectedReasoningEffort: e.reasoningEffort ?? (r ? da(r) : null),
+		selectedServiceTier: e.serviceTier === void 0 ? r ? fa(r) : null : e.serviceTier
 	};
 }
-function xa(e, t, n) {
+function ba(e, t, n) {
 	let r = q(t, e.model);
 	return {
-		approvalPreset: ya(e.approvalPolicy, e.approvalsReviewer, e.sandboxPolicy, e.activePermissionProfile) ?? n.approvalPreset,
+		approvalPreset: va(e.approvalPolicy, e.approvalsReviewer, e.sandboxPolicy, e.activePermissionProfile) ?? n.approvalPreset,
 		planMode: e.collaborationMode.mode === "plan",
 		selectedModelId: r?.id ?? n.selectedModelId,
-		selectedReasoningEffort: e.effort ?? (r ? fa(r) : null),
-		selectedServiceTier: e.serviceTier === void 0 ? r ? pa(r) : null : e.serviceTier
+		selectedReasoningEffort: e.effort ?? (r ? da(r) : null),
+		selectedServiceTier: e.serviceTier === void 0 ? r ? fa(r) : null : e.serviceTier
 	};
 }
-function Sa(e, t) {
+function xa(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 ? fa(n) : null), t.serviceTier !== void 0 && ma(n, i), t.serviceTier === void 0 && t.modelId && i && !n.serviceTiers?.some((e) => e.id === i) && (i = n ? pa(n) : null), {
+	return t.modelId && a.length > 0 && (!r || !a.includes(r)) && (r = n ? da(n) : null), t.serviceTier !== void 0 && pa(n, i), t.serviceTier === void 0 && t.modelId && i && !n.serviceTiers?.some((e) => e.id === i) && (i = n ? fa(n) : null), {
 		approvalPreset: t.approvalPreset ?? e.approvalPreset,
 		planMode: t.planMode ?? e.planMode,
 		selectedModelId: n?.id ?? null,
@@ -3403,7 +3406,7 @@ function Sa(e, t) {
 		selectedServiceTier: i
 	};
 }
-function Ca(e, t, n) {
+function Sa(e, t, n) {
 	return {
 		mode: e ? "plan" : "default",
 		settings: {
@@ -3413,12 +3416,12 @@ function Ca(e, t, n) {
 		}
 	};
 }
-function wa(e, t) {
+function Ca(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: Ca(a, r, i) } : {},
+		...r ? { collaborationMode: Sa(a, r, i) } : {},
 		...t.serviceTier === void 0 ? e.selectedServiceTier ? { serviceTier: e.selectedServiceTier } : {} : { serviceTier: t.serviceTier }
 	};
 }
@@ -3441,7 +3444,7 @@ function J(e) {
 		updatedAt: (/* @__PURE__ */ new Date((e.recencyAt ?? e.updatedAt) * 1e3)).toISOString()
 	};
 }
-function Ta(e, t) {
+function wa(e, t) {
 	let n = new Map(e.map((e) => [e.id, e])), r = t.map((e) => {
 		let t = n.get(e.id);
 		return t && me(t, e) ? t : e;
@@ -3451,15 +3454,15 @@ function Ta(e, t) {
 function Y(e, t) {
 	return [t, ...e.filter((e) => e.id !== t.id)].sort((e, t) => t.updatedAt.localeCompare(e.updatedAt));
 }
-function Ea(e, t) {
-	let n = t.model ? ua(e.models, t.model) : q(e.models, e.selectedModelId);
-	return da(n, t.reasoningEffort), ma(n, t.serviceTier), {
+function Ta(e, t) {
+	let n = t.model ? la(e.models, t.model) : q(e.models, e.selectedModelId);
+	return ua(n, t.reasoningEffort), pa(n, t.serviceTier), {
 		...t,
-		...t.attachments ? { attachments: Da(t.attachments) } : {},
+		...t.attachments ? { attachments: Ea(t.attachments) } : {},
 		...t.model && n ? { model: n.model } : {}
 	};
 }
-function Da(e) {
+function Ea(e) {
 	return e.map((e) => {
 		let t = e.path.trim();
 		if (!t) throw Error("Attachment paths cannot be empty");
@@ -3476,14 +3479,14 @@ function Da(e) {
 		};
 	});
 }
-function Oa(e) {
+function Da(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 ka(e) {
+function Oa(e) {
 	let t = e.name?.trim() || g(e.path);
 	return e.type === "image" ? {
 		type: "attachment",
@@ -3504,14 +3507,14 @@ function ka(e) {
 		}
 	};
 }
-function Aa(e) {
+function ka(e) {
 	let t = e.metadata?.turnId;
 	return e.turnId ?? (typeof t == "string" ? t : null);
 }
-function ja(e) {
+function Aa(e) {
 	return e.parts.filter((e) => e.type === "text").map((e) => e.text).join("\n").trim();
 }
-function Ma(e) {
+function ja(e) {
 	return e.parts.flatMap((e) => {
 		if (e.type !== "attachment") return [];
 		let t = e.attachment, n = t.path;
@@ -3529,7 +3532,7 @@ function Ma(e) {
 		}] : [];
 	});
 }
-function Na(e) {
+function Ma(e) {
 	return {
 		totalTokens: e.totalTokens,
 		inputTokens: e.inputTokens,
@@ -3539,7 +3542,7 @@ function Na(e) {
 		reasoningOutputTokens: e.reasoningOutputTokens
 	};
 }
-function Pa(e) {
+function Na(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,
@@ -3552,34 +3555,34 @@ function Pa(e) {
 		usedPercent: r
 	};
 }
-function Fa(e) {
+function Pa(e) {
 	return e.type === "active" ? {
 		type: "active",
 		activeFlags: [...e.activeFlags]
 	} : { type: e.type };
 }
-function Ia(e) {
+function Fa(e) {
 	return e.type === "active" ? "active" : e.type === "systemError" ? "error" : "idle";
 }
-function La(e) {
-	let t = e.rateLimitsByLimitId ? Object.fromEntries(Object.entries(e.rateLimitsByLimitId).filter((e) => !!e[1]).map(([e, t]) => [e, Ba(t)])) : null;
+function Ia(e) {
+	let t = e.rateLimitsByLimitId ? Object.fromEntries(Object.entries(e.rateLimitsByLimitId).filter((e) => !!e[1]).map(([e, t]) => [e, za(t)])) : null;
 	return {
-		rateLimits: Ba(e.rateLimits),
+		rateLimits: za(e.rateLimits),
 		rateLimitsByLimitId: t,
 		rateLimitResetCredits: e.rateLimitResetCredits ? {
-			availableCount: Ra(e.rateLimitResetCredits.availableCount),
+			availableCount: La(e.rateLimitResetCredits.availableCount),
 			credits: e.rateLimitResetCredits.credits?.map((e) => ({ ...e })) ?? null
 		} : null
 	};
 }
-function Ra(e) {
+function La(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 za(e) {
-	let t = (e) => e === null ? null : Ra(e);
+function Ra(e) {
+	let t = (e) => e === null ? null : La(e);
 	return {
 		summary: {
 			lifetimeTokens: t(e.summary.lifetimeTokens),
@@ -3590,11 +3593,11 @@ function za(e) {
 		},
 		dailyUsageBuckets: e.dailyUsageBuckets?.map((e) => ({
 			startDate: e.startDate,
-			tokens: Ra(e.tokens)
+			tokens: La(e.tokens)
 		})) ?? null
 	};
 }
-function Ba(e) {
+function za(e) {
 	return {
 		limitId: e.limitId,
 		limitName: e.limitName,
@@ -3606,21 +3609,21 @@ function Ba(e) {
 		rateLimitReachedType: e.rateLimitReachedType
 	};
 }
-function Va(e, t) {
-	let n = Ba(t);
+function Ba(e, t) {
+	let n = za(t);
 	if (!e) return {
 		rateLimits: n,
 		rateLimitsByLimitId: n.limitId ? { [n.limitId]: n } : null,
 		rateLimitResetCredits: null
 	};
-	let r = Ha(e.rateLimits, n), i = e.rateLimitsByLimitId ? { ...e.rateLimitsByLimitId } : {};
-	return r.limitId && (i[r.limitId] = Ha(i[r.limitId] ?? r, n)), {
+	let r = Va(e.rateLimits, n), i = e.rateLimitsByLimitId ? { ...e.rateLimitsByLimitId } : {};
+	return r.limitId && (i[r.limitId] = Va(i[r.limitId] ?? r, n)), {
 		...e,
 		rateLimits: r,
 		rateLimitsByLimitId: Object.keys(i).length > 0 ? i : null
 	};
 }
-function Ha(e, t) {
+function Va(e, t) {
 	return {
 		limitId: t.limitId ?? e.limitId,
 		limitName: t.limitName ?? e.limitName,
@@ -3646,18 +3649,18 @@ function Ha(e, t) {
 }
 //#endregion
 //#region src/node/codex-surface-transport-options.ts
-function Ua(e) {
+function Ha(e) {
 	return "type" in e && e.type === "unixSocket";
 }
-function Wa(e) {
-	let t = e.codexHome === void 0 ? void 0 : Ga(e.codexHome), n = e.transport?.codexHome;
+function Ua(e) {
+	let t = e.codexHome === void 0 ? void 0 : Wa(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 Ga(e) {
+function Wa(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");
@@ -3665,7 +3668,7 @@ function Ga(e) {
 }
 //#endregion
 //#region src/node/codex-surface-authentication-controller.ts
-var Ka = class {
+var Ga = class {
 	client;
 	host;
 	accountRefreshPromise = null;
@@ -3699,7 +3702,7 @@ var Ka = class {
 			try {
 				let e = await this.client.request("account/login/start", { type: "chatgpt" });
 				if (e.type !== "chatgpt") throw Error(`Codex account/login/start returned unexpected login type '${e.type}'`);
-				let t = ca(e.loginId), n = la(e.authUrl);
+				let t = sa(e.loginId), n = ca(e.authUrl);
 				return this.host.patchAuthentication({ login: {
 					status: "pending",
 					loginId: t,
@@ -3736,7 +3739,7 @@ var Ka = class {
 			try {
 				let e = await this.client.request("account/login/start", { type: "chatgptDeviceCode" });
 				if (e.type !== "chatgptDeviceCode") throw Error(`Codex account/login/start returned unexpected login type '${e.type}'`);
-				let t = ca(e.loginId), n = la(e.verificationUrl), r = e.userCode.trim();
+				let t = sa(e.loginId), n = ca(e.verificationUrl), r = e.userCode.trim();
 				if (!r) throw Error("Codex account/login/start returned an empty device user code");
 				this.host.patchAuthentication({ login: {
 					status: "pending",
@@ -3764,7 +3767,7 @@ var Ka = class {
 		}).catch(() => void 0), t;
 	}
 	async cancelLogin(e) {
-		let t = ca(e), n = await this.client.request("account/login/cancel", { loginId: t });
+		let t = sa(e), n = await this.client.request("account/login/cancel", { loginId: t });
 		return this.host.patchAuthentication({ login: {
 			status: n.status === "canceled" ? "cancelled" : "idle",
 			loginId: null,
@@ -3806,7 +3809,7 @@ var Ka = class {
 			error: null
 		}, e);
 		try {
-			let n = await this.client.request("account/read", { refreshToken: !1 }), r = n.account ? aa(n.account) : null, i = sa({
+			let n = await this.client.request("account/read", { refreshToken: !1 }), r = n.account ? ia(n.account) : null, i = oa({
 				...this.host.getSnapshot().authentication,
 				account: r,
 				requiresOpenaiAuth: n.requiresOpenaiAuth
@@ -3849,7 +3852,7 @@ var Ka = class {
 };
 //#endregion
 //#region src/node/codex-conversation-handle.ts
-function qa(e, t) {
+function Ka(e, t) {
 	let n = async (e) => (await e(), t.getSnapshot());
 	return {
 		id: e,
@@ -3894,19 +3897,19 @@ function qa(e, t) {
 }
 //#endregion
 //#region src/node/codex-raw-response-item-adapter.ts
-function Ja(e) {
-	if (!ro(e) || typeof e.type != "string") return null;
+function qa(e) {
+	if (!no(e) || typeof e.type != "string") return null;
 	if (e.type === "local_shell_call") {
-		let t = T(Ya(e));
+		let t = T(Ja(e));
 		return {
-			type: $a(e.status) ? "item.completed" : "item.started",
+			type: Qa(e.status) ? "item.completed" : "item.started",
 			payload: { toolPart: t }
 		};
 	}
 	return e.type === "function_call" ? {
 		type: "item.started",
-		payload: { toolPart: T(Xa(e)) }
-	} : e.type === "function_call_output" ? Za(e.call_id, e.output) : e.type === "custom_tool_call" ? {
+		payload: { toolPart: T(Ya(e)) }
+	} : e.type === "function_call_output" ? Xa(e.call_id, e.output) : e.type === "custom_tool_call" ? {
 		type: "item.started",
 		payload: { toolPart: T({
 			type: "dynamicToolCall",
@@ -3919,7 +3922,7 @@ function Ja(e) {
 			success: null,
 			durationMs: null
 		}) }
-	} : e.type === "custom_tool_call_output" ? Za(e.call_id, e.output, Z(e.name) ?? void 0) : e.type === "tool_search_call" ? {
+	} : e.type === "custom_tool_call_output" ? Xa(e.call_id, e.output, Z(e.name) ?? void 0) : e.type === "tool_search_call" ? {
 		type: "item.started",
 		payload: { toolPart: T({
 			type: "dynamicToolCall",
@@ -3941,7 +3944,7 @@ function Ja(e) {
 		payload: { toolPart: T({
 			type: "webSearch",
 			id: X(e),
-			query: to(e.action),
+			query: eo(e.action),
 			action: e.action
 		}) }
 	} : e.type === "image_generation_call" ? {
@@ -3959,8 +3962,8 @@ function Ja(e) {
 		}) }
 	} : null;
 }
-function Ya(e) {
-	let t = ro(e.action) ? e.action : {}, n = Array.isArray(t.command) ? no(t.command) : Z(t.command) ?? "local shell";
+function Ja(e) {
+	let t = no(e.action) ? e.action : {}, n = Array.isArray(t.command) ? to(t.command) : Z(t.command) ?? "local shell";
 	return {
 		type: "commandExecution",
 		id: Z(e.call_id) ?? X(e),
@@ -3968,16 +3971,16 @@ function Ya(e) {
 		cwd: Z(t.working_directory) ?? "",
 		processId: null,
 		source: "agent",
-		status: Qa(e.status),
+		status: Za(e.status),
 		commandActions: [],
 		aggregatedOutput: null,
 		exitCode: null,
 		durationMs: null
 	};
 }
-function Xa(e) {
-	let t = Z(e.name) ?? "function_call", n = eo(e.arguments), r = Z(e.call_id) ?? X(e);
-	return t === "shell_command" && ro(n) ? {
+function Ya(e) {
+	let t = Z(e.name) ?? "function_call", n = $a(e.arguments), r = Z(e.call_id) ?? X(e);
+	return t === "shell_command" && no(n) ? {
 		type: "commandExecution",
 		id: r,
 		command: Z(n.command) ?? t,
@@ -4001,19 +4004,19 @@ function Xa(e) {
 		durationMs: null
 	};
 }
-function Za(e, t, n) {
+function Xa(e, t, n) {
 	return {
 		type: "item.updated",
 		payload: yt(Z(e) ?? "raw-response-output", t, n)
 	};
 }
-function Qa(e) {
+function Za(e) {
 	return e === "completed" ? "completed" : e === "incomplete" || e === "failed" || e === "error" ? "failed" : "inProgress";
 }
-function $a(e) {
+function Qa(e) {
 	return e === "completed" || e === "failed" || e === "error" || e === "incomplete";
 }
-function eo(e) {
+function $a(e) {
 	if (typeof e != "string") return e;
 	try {
 		return JSON.parse(e);
@@ -4021,10 +4024,10 @@ function eo(e) {
 		return e;
 	}
 }
-function to(e) {
-	return ro(e) ? Z(e.query) ?? Z(e.searchTerm) ?? "web search" : "web search";
+function eo(e) {
+	return no(e) ? Z(e.query) ?? Z(e.searchTerm) ?? "web search" : "web search";
 }
-function no(e) {
+function to(e) {
 	return e.map((e) => {
 		let t = String(e);
 		return /\s/.test(t) ? JSON.stringify(t) : t;
@@ -4036,21 +4039,21 @@ function X(e) {
 function Z(e) {
 	return typeof e == "string" && e.length > 0 ? e : null;
 }
-function ro(e) {
+function no(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
 //#endregion
 //#region src/node/codex-surface-events.ts
-function io(e, t) {
+function ro(e, t) {
 	return `${e}\u0000${t}`;
 }
-function ao(e) {
+function io(e) {
 	return typeof e == "number" && Number.isFinite(e) ? (/* @__PURE__ */ new Date(e * 1e3)).toISOString() : (/* @__PURE__ */ new Date()).toISOString();
 }
-function oo(e) {
+function ao(e) {
 	return typeof e == "number" && Number.isFinite(e) ? (/* @__PURE__ */ new Date(e * 1e3)).toISOString() : null;
 }
-function so(e) {
+function oo(e) {
 	return e ? {
 		message: e.message,
 		additionalDetails: e.additionalDetails,
@@ -4062,10 +4065,10 @@ function Q(e, t = !1) {
 		id: e.id,
 		...e.itemsView === "summary" || e.itemsView === "notLoaded" ? { itemsView: "summary" } : {},
 		status: e.status,
-		error: so(e.error),
+		error: oo(e.error),
 		willRetry: t,
-		startedAt: oo(e.startedAt),
-		completedAt: oo(e.completedAt),
+		startedAt: ao(e.startedAt),
+		completedAt: ao(e.completedAt),
 		durationMs: e.durationMs ?? null
 	};
 }
@@ -4078,18 +4081,18 @@ function $(e, t) {
 		startedAt: t.startedAt ?? e[n].startedAt
 	}), r;
 }
-function co(e, t) {
+function so(e, t) {
 	return JSON.stringify(e) === JSON.stringify(t);
 }
-function lo() {
+function co() {
 	return `user-${globalThis.crypto.randomUUID()}`;
 }
-function uo() {
+function lo() {
 	return `queued-prompt-${globalThis.crypto.randomUUID()}`;
 }
 //#endregion
 //#region src/node/codex-surface-subagents.ts
-function fo(e) {
+function uo(e) {
 	let t = {};
 	for (let [n, r] of Object.entries(e.agentsStates)) r && (t[n] = {
 		status: r.status,
@@ -4109,7 +4112,7 @@ function fo(e) {
 }
 //#endregion
 //#region src/node/codex-surface-items-controller.ts
-var po = class {
+var fo = class {
 	host;
 	commandOutputForwardItemIds = /* @__PURE__ */ new Set();
 	fileActivityKeys = /* @__PURE__ */ new Set();
@@ -4127,7 +4130,7 @@ var po = class {
 		for (let e of this.reviewOutputByTurn.keys()) e.startsWith(t) && this.reviewOutputByTurn.delete(e);
 	}
 	isForwardingCommandOutput(e, t) {
-		return this.commandOutputForwardItemIds.has(io(e, t));
+		return this.commandOutputForwardItemIds.has(ro(e, t));
 	}
 	applyAgentDelta(e) {
 		let t = this.host.requireRuntime(e.threadId);
@@ -4190,7 +4193,7 @@ var po = class {
 	applyRawResponseItem(e) {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
-		let n = Ja(e.item);
+		let n = qa(e.item);
 		if (!n) return;
 		if (n.type === "item.updated") {
 			this.applyToolUpdate(e.threadId, e.turnId, n.payload);
@@ -4290,7 +4293,7 @@ var po = 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 = io(e.threadId, e.turnId);
+			let i = ro(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" ? jn(e.threadId, e.turnId, e.item) : null, d = u ? "" : t, f = u ? pn(n.messages, e.threadId, e.turnId, e.item.id) : fn(n.messages, e.threadId, e.turnId, e.item.id, t, r);
@@ -4376,7 +4379,7 @@ var po = class {
 				turnId: e.turnId,
 				payload: {
 					lifecycle: t ? "completed" : "started",
-					toolCall: fo(e.item)
+					toolCall: uo(e.item)
 				}
 			});
 			return;
@@ -4425,7 +4428,7 @@ var po = class {
 	shouldForwardCommandOutput(e, t, n) {
 		let r = "id" in n && typeof n.id == "string" ? n.id : null;
 		if (!r) return !1;
-		let i = io(e, r);
+		let i = ro(e, r);
 		if (!t) {
 			let e = ht(n);
 			return e ? this.commandOutputForwardItemIds.add(i) : this.commandOutputForwardItemIds.delete(i), e;
@@ -4436,7 +4439,7 @@ var po = class {
 	applyToolUpdate(e, t, n) {
 		let r = this.host.requireRuntime(e);
 		this.host.markRuntimeTurnActive(r, t);
-		let i = r.cwd && mo(n) ? {
+		let i = r.cwd && po(n) ? {
 			...n,
 			metadata: {
 				...n.metadata,
@@ -4505,26 +4508,26 @@ var po = class {
 			turnId: e.turn.id,
 			payload: {
 				status: e.turn.status,
-				error: so(e.turn.error),
+				error: oo(e.turn.error),
 				willRetry: !1,
-				startedAt: oo(e.turn.startedAt),
-				completedAt: oo(e.turn.completedAt),
+				startedAt: ao(e.turn.startedAt),
+				completedAt: ao(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 mo(e) {
+function po(e) {
 	if (e.fallbackToolPart?.kind === "fileChange") return !0;
 	let t = e.input, n = e.metadata;
-	return ho(t) && Array.isArray(t.changes) || ho(n) && Array.isArray(n.changes);
+	return mo(t) && Array.isArray(t.changes) || mo(n) && Array.isArray(n.changes);
 }
-function ho(e) {
+function mo(e) {
 	return typeof e == "object" && !!e;
 }
 //#endregion
 //#region src/node/codex-surface-client-requests-controller.ts
-var go = class {
+var ho = class {
 	host;
 	pending = /* @__PURE__ */ new Map();
 	constructor(e) {
@@ -4605,7 +4608,7 @@ var go = class {
 		}), this.host.emitConversationActivity(n.threadId, "action");
 	}
 	async respondToAsyncQuestion(e, t) {
-		let n = e ?? this.host.activeConversationId(), r = n === null ? null : this.host.requireRuntime(n), i = r && ra(r, [], []).clientRequests.find((e) => e.kind === "ask_user" && e.id === t.id), a = r && i ? {
+		let n = e ?? this.host.activeConversationId(), r = n === null ? null : this.host.requireRuntime(n), i = r && na(r, [], []).clientRequests.find((e) => e.kind === "ask_user" && e.id === t.id), a = r && i ? {
 			request: i,
 			runtime: r
 		} : null;
@@ -4804,8 +4807,8 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 			payload: { request: structuredClone(d) }
 		}), this.host.emitConversationActivity(n.threadId, "notification"), !0;
 	}
-}, _o = 256 * 1024;
-function vo(e) {
+}, go = 256 * 1024;
+function _o(e) {
 	return {
 		id: e.id,
 		model: e.model,
@@ -4830,11 +4833,11 @@ function vo(e) {
 		}
 	};
 }
-async function yo(e, t) {
-	return Promise.all(e.filter((e) => e.enabled).map((e) => bo(e, t)));
+async function vo(e, t) {
+	return Promise.all(e.filter((e) => e.enabled).map((e) => yo(e, t)));
 }
-async function bo(e, t) {
-	let n = Eo(e.interface?.brandColor), r = Do(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]);
+async function yo(e, t) {
+	let n = To(e.interface?.brandColor), r = Eo(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,
@@ -4849,8 +4852,8 @@ async function bo(e, t) {
 		enabled: e.enabled
 	};
 }
-async function xo(e, t) {
-	let n = e.interface, r = Co(n?.composerIconUrl), i = Co(n?.logoUrl), a = Co(n?.logoUrlDark), o = Eo(n?.displayName) ?? e.name, s = Eo(n?.shortDescription), c = Eo(n?.longDescription), l = Eo(n?.brandColor), u = r ?? i ?? await So([n?.composerIcon, n?.logo], t), d = r ?? a ?? i ?? await So([
+async function bo(e, t) {
+	let n = e.interface, r = So(n?.composerIconUrl), i = So(n?.logoUrl), a = So(n?.logoUrlDark), o = To(n?.displayName) ?? e.name, s = To(n?.shortDescription), c = To(n?.longDescription), l = To(n?.brandColor), u = r ?? i ?? await xo([n?.composerIcon, n?.logo], t), d = r ?? a ?? i ?? await xo([
 		n?.composerIcon,
 		n?.logoDark,
 		n?.logo
@@ -4867,20 +4870,20 @@ async function xo(e, t) {
 		enabled: e.enabled
 	};
 }
-async function So(e, t) {
+async function xo(e, t) {
 	for (let n of e) {
 		if (!n) continue;
 		let e = await t(n);
 		if (e) return e;
 	}
 }
-function Co(e) {
-	let t = Eo(e);
+function So(e) {
+	let t = To(e);
 	try {
 		return new URL(t).protocol === "https:" ? t : void 0;
 	} catch {}
 }
-function wo(e) {
+function Co(e) {
 	switch (_(e).toLowerCase()) {
 		case ".avif": return "image/avif";
 		case ".bmp": return "image/bmp";
@@ -4893,23 +4896,23 @@ function wo(e) {
 		case ".webp": return "image/webp";
 	}
 }
-function To(e, t) {
+function wo(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) > _o)) return `data:${e};base64,${`${r}${"=".repeat((4 - r.length % 4) % 4)}`}`;
+	if (!(i !== 0 && i !== a) && !(Math.floor(r.length * 3 / 4) > go)) return `data:${e};base64,${`${r}${"=".repeat((4 - r.length % 4) % 4)}`}`;
 }
-function Eo(e) {
+function To(e) {
 	return (typeof e == "string" ? e.trim() : void 0) || void 0;
 }
-function Do(e) {
+function Eo(e) {
 	return typeof e == "string" ? e : void 0;
 }
 //#endregion
 //#region src/node/codex-surface-catalog-controller.ts
-var Oo = class {
+var Do = class {
 	client;
 	cwd;
 	host;
@@ -4944,7 +4947,7 @@ var Oo = 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 yo((await this.client.request("skills/list", {
+			let n = await vo((await this.client.request("skills/list", {
 				...this.cwd ? { cwds: [this.cwd] } : {},
 				forceReload: e
 			})).data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e));
@@ -4961,7 +4964,7 @@ var Oo = class {
 	}
 	async listSkills(e = {}) {
 		await this.host.ensureConnected(), e.forceReload && this.iconDataUrls.clear();
-		let t = await yo((await this.client.request("skills/list", {
+		let t = await vo((await this.client.request("skills/list", {
 			...e.cwd ? { cwds: [e.cwd] } : {},
 			forceReload: e.forceReload ?? !1
 		})).data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e));
@@ -4973,7 +4976,7 @@ var Oo = class {
 	}
 	async loadPermissionProfiles() {
 		try {
-			let e = await this.requestPermissionProfiles(this.cwd), t = (await this.client.request("configRequirements/read", void 0)).requirements, n = ha(e, t), r = this.host.preferredApprovalPreset();
+			let e = await this.requestPermissionProfiles(this.cwd), t = (await this.client.request("configRequirements/read", void 0)).requirements, n = ma(e, t), r = this.host.preferredApprovalPreset();
 			this.host.patch({
 				permissionProfiles: e,
 				approvalPresets: n,
@@ -4989,7 +4992,7 @@ var Oo = class {
 	}
 	async loadRateLimits() {
 		try {
-			let e = La(await this.client.request("account/rateLimits/read", void 0));
+			let e = Ia(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) }
@@ -5015,12 +5018,12 @@ var Oo = class {
 		}), (async () => ({
 			profiles: await this.requestPermissionProfiles(e),
 			requirements: (await this.client.request("configRequirements/read", void 0)).requirements
-		}))()]), a = r.status === "fulfilled" ? await yo(r.value.data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e)) : [], o = i.status === "fulfilled" ? i.value.profiles : [];
+		}))()]), a = r.status === "fulfilled" ? await vo(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" ? ha(o, i.value.requirements) : []
+			approvalPresets: i.status === "fulfilled" ? ma(o, i.value.requirements) : []
 		};
 	}
 	schedulePluginRefresh(e = !1) {
@@ -5047,7 +5050,7 @@ var Oo = class {
 				cursor: n,
 				includeHidden: e
 			});
-			t.push(...r.data.map(vo)), n = r.nextCursor;
+			t.push(...r.data.map(_o)), n = r.nextCursor;
 		} while (n);
 		return t;
 	}
@@ -5057,8 +5060,8 @@ var Oo = class {
 			models: e,
 			modelCatalogStatus: "loaded",
 			selectedModelId: n?.id ?? null,
-			selectedReasoningEffort: n ? fa(n) : null,
-			selectedServiceTier: n ? pa(n) : null
+			selectedReasoningEffort: n ? da(n) : null,
+			selectedServiceTier: n ? fa(n) : null
 		}), this.emitModels(e, "loaded", t);
 	}
 	emitModels(e, t, n = "action") {
@@ -5117,7 +5120,7 @@ var Oo = 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 = Ta(this.host.getState().plugins, await Promise.all([...n.values()].map((e) => xo(e, (e) => this.iconDataUrl(e)))));
+			let r = wa(this.host.getState().plugins, await Promise.all([...n.values()].map((e) => bo(e, (e) => this.iconDataUrl(e)))));
 			if (this.host.isClosed() || this.host.authenticationBlocksBootstrap()) return;
 			this.host.patch({
 				plugins: r,
@@ -5148,9 +5151,9 @@ var Oo = class {
 	}
 	async readIconDataUrl(e) {
 		if (!v(e)) return;
-		let t = wo(e);
+		let t = Co(e);
 		if (t) try {
-			return To(t, (await this.client.request("fs/readFile", { path: e })).dataBase64);
+			return wo(t, (await this.client.request("fs/readFile", { path: e })).dataBase64);
 		} catch {
 			return;
 		}
@@ -5158,18 +5161,18 @@ var Oo = class {
 };
 //#endregion
 //#region src/node/codex-approvals.ts
-function ko(e, t) {
+function Oo(e, t) {
 	let n = [
 		e.onServerRequest("item/commandExecution/requestApproval", (e, n) => (t({
-			approval: Ao(e.id, e.params),
-			resolve: (t, r) => n.resolve({ decision: No(e.params, t, r) })
+			approval: ko(e.id, e.params),
+			resolve: (t, r) => n.resolve({ decision: Mo(e.params, t, r) })
 		}), !0)),
 		e.onServerRequest("item/fileChange/requestApproval", (e, n) => (t({
-			approval: jo(e.id, e.params),
+			approval: Ao(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: Mo(e.id, e.params),
+			approval: jo(e.id, e.params),
 			resolve: (t, r) => n.resolve({
 				permissions: t === "deny" ? {} : {
 					...e.params.permissions.fileSystem ? { fileSystem: e.params.permissions.fileSystem } : {},
@@ -5207,8 +5210,8 @@ function ko(e, t) {
 		for (let e of n) e();
 	};
 }
-function Ao(e, t) {
-	let n = t.availableDecisions, r = Po(t.additionalPermissions), i = [...t.networkApprovalContext ? [{
+function ko(e, t) {
+	let n = t.availableDecisions, r = No(t.additionalPermissions), i = [...t.networkApprovalContext ? [{
 		kind: "network",
 		enabled: !0,
 		host: t.networkApprovalContext.host,
@@ -5231,7 +5234,7 @@ function Ao(e, t) {
 		} : {}
 	};
 }
-function jo(e, t) {
+function Ao(e, t) {
 	return {
 		id: String(e),
 		kind: "file-change",
@@ -5242,8 +5245,8 @@ function jo(e, t) {
 		...t.reason || t.grantRoot ? { description: t.reason ?? `Write under ${t.grantRoot}` } : {}
 	};
 }
-function Mo(e, t) {
-	let n = Po(t.permissions);
+function jo(e, t) {
+	let n = No(t.permissions);
 	return {
 		id: String(e),
 		kind: "permissions",
@@ -5256,13 +5259,13 @@ function Mo(e, t) {
 		...n.length ? { requestedPermissions: n } : {}
 	};
 }
-function No(e, t, n) {
+function Mo(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 Po(e) {
+function No(e) {
 	if (!e) return [];
 	let t = [];
 	if (e.network && t.push({
@@ -5282,12 +5285,12 @@ function Po(e) {
 		for (let n of e.fileSystem.entries ?? []) t.push({
 			kind: "filesystem",
 			access: n.access,
-			path: Fo(n.path)
+			path: Po(n.path)
 		});
 	}
 	return t;
 }
-function Fo(e) {
+function Po(e) {
 	if (e.type === "path") return e.path;
 	if (e.type === "glob_pattern") return e.pattern;
 	let t = e.value;
@@ -5302,12 +5305,12 @@ function Fo(e) {
 }
 //#endregion
 //#region src/node/codex-surface-approvals-controller.ts
-var Io = class {
+var Fo = class {
 	host;
 	pending = /* @__PURE__ */ new Map();
 	unsubscribeHandler;
 	constructor(e, t) {
-		this.host = t, this.unsubscribeHandler = ko(e, (e) => this.add(e));
+		this.host = t, this.unsubscribeHandler = Oo(e, (e) => this.add(e));
 	}
 	close() {
 		this.unsubscribeHandler(), this.pending.clear();
@@ -5388,7 +5391,7 @@ var Io = class {
 };
 //#endregion
 //#region src/node/codex-surface-mcp.ts
-function Lo(e) {
+function Io(e) {
 	if (!Array.isArray(e)) throw TypeError("Codex MCP servers must be an array");
 	let t = /* @__PURE__ */ new Set();
 	return e.map((e, n) => {
@@ -5397,10 +5400,10 @@ function Lo(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 = Ro(e.transport, r), a = e.toolApprovalMode;
+		let i = Lo(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 : zo(e.enabledTools, `Codex MCP server '${r}' enabled tool`), s = Vo(e.startupTimeoutMs, `Codex MCP server '${r}' startup timeout`), c = Vo(e.toolTimeoutMs, `Codex MCP server '${r}' tool timeout`);
+		let o = e.enabledTools === void 0 ? void 0 : Ro(e.enabledTools, `Codex MCP server '${r}' enabled tool`), s = Bo(e.startupTimeoutMs, `Codex MCP server '${r}' startup timeout`), c = Bo(e.toolTimeoutMs, `Codex MCP server '${r}' tool timeout`);
 		return {
 			name: r,
 			transport: i,
@@ -5412,7 +5415,7 @@ function Lo(e) {
 		};
 	});
 }
-function Ro(e, t) {
+function Lo(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;
@@ -5430,7 +5433,7 @@ function Ro(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 : zo(e.args, `Codex MCP server '${t}' argument`), i = e.cwd?.trim();
+	let r = e.args === void 0 ? void 0 : Ro(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) {
@@ -5441,7 +5444,7 @@ function Ro(e, t) {
 			a[n] = r;
 		}
 	}
-	let o = e.envVars === void 0 ? void 0 : Bo(e.envVars, t);
+	let o = e.envVars === void 0 ? void 0 : zo(e.envVars, t);
 	return {
 		type: "stdio",
 		command: n,
@@ -5451,7 +5454,7 @@ function Ro(e, t) {
 		...o === void 0 ? {} : { envVars: o }
 	};
 }
-function zo(e, t) {
+function Ro(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`);
@@ -5459,18 +5462,18 @@ function zo(e, t) {
 	});
 	return [...new Set(n)];
 }
-function Bo(e, t) {
-	let n = zo(e, `Codex MCP server '${t}' environment variable`);
+function zo(e, t) {
+	let n = Ro(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 Vo(e, t) {
+function Bo(e, t) {
 	if (e !== void 0) {
 		if (!Number.isFinite(e) || e <= 0) throw TypeError(`${t} must be a positive finite number`);
 		return e;
 	}
 }
-function Ho(e) {
+function Vo(e) {
 	let t = {};
 	for (let n of e) {
 		let e = n.transport.type === "http" ? { url: n.transport.url } : {
@@ -5484,7 +5487,7 @@ function Ho(e) {
 	}
 	return t;
 }
-function Uo(e, t) {
+function Ho(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) {
@@ -5495,13 +5498,13 @@ function Uo(e, t) {
 }
 //#endregion
 //#region src/node/codex-surface-extensions-controller.ts
-var Wo = class {
+var Uo = class {
 	extensions;
 	hostOptionsForThread;
 	dynamicTools = /* @__PURE__ */ new Map();
 	defaultMcpServers;
 	constructor(e, t, n) {
-		this.extensions = e, this.hostOptionsForThread = n, this.defaultMcpServers = Lo(t);
+		this.extensions = e, this.hostOptionsForThread = n, this.defaultMcpServers = Io(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");
@@ -5525,13 +5528,13 @@ var Wo = class {
 		}));
 	}
 	async conversationExtension(e, t = {}, n = this.defaultMcpServers) {
-		let r = Ho(n), i = [], a;
+		let r = Vo(n), i = [], a;
 		for (let t of this.extensions) {
 			if (!t.configureConversation) continue;
 			let o = await t.configureConversation(e);
-			o.config && (Uo(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 && (Ho(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 && (Uo(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 && (Ho(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") }
@@ -5590,7 +5593,7 @@ var Wo = class {
 			});
 		}
 	}
-}, Go = 50, Ko = 25, qo = 25, Jo = class {
+}, Wo = 50, Go = 25, Ko = 25, qo = class {
 	client;
 	conversationLimit;
 	host;
@@ -5629,7 +5632,7 @@ var Wo = class {
 					detailsLoading: !0,
 					detailsError: null
 				});
-				let r = await Xo(this.client, e, t);
+				let r = await Yo(this.client, e, t);
 				if (this.host.runtime(e) !== n) throw Error("Conversation changed while loading turn details.");
 				let i = n.turns.find((e) => e.id === t);
 				if (!i) throw Error("Turn is no longer available.");
@@ -5645,7 +5648,7 @@ var Wo = class {
 						completedAt: i.completedAt ? Date.parse(i.completedAt) / 1e3 : null,
 						durationMs: i.durationMs
 					}, o = kn(n.messages, I(e, a));
-					this.originalImages && (o = Ki(o));
+					this.originalImages && (o = Gi(o));
 					let s = n.messages.findIndex((e) => e.turnId === t), c = n.messages.filter((e) => e.turnId !== t);
 					c.splice(s < 0 ? c.length : s, 0, ...o), this.host.patchRuntime(e, { messages: c });
 				}
@@ -5688,7 +5691,7 @@ var Wo = class {
 		return await this.host.ensureConnected(), this.load();
 	}
 	async load() {
-		let e = Ta(this.host.getState().conversations, await this.requestConversations({ limit: this.conversationLimit }));
+		let e = wa(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();
@@ -5738,7 +5741,7 @@ var Wo = class {
 					let t = await this.client.request("thread/turns/list", {
 						threadId: e,
 						cursor: null,
-						limit: Go,
+						limit: Wo,
 						sortDirection: "desc",
 						itemsView: "full"
 					});
@@ -5786,14 +5789,14 @@ var Wo = class {
 					let a = new Set(this.host.requireRuntime(e).turnIds), o = t ?? this.host.requireRuntime(e).historyItemsView, s = await this.client.request("thread/turns/list", {
 						threadId: e,
 						cursor: n,
-						limit: Ko,
+						limit: Go,
 						sortDirection: "desc",
 						itemsView: o
 					});
 					o === "summary" && (t ?? this.host.requireRuntime(e).historyItemsView) === "full" && (s = await this.client.request("thread/turns/list", {
 						threadId: e,
 						cursor: n,
-						limit: Ko,
+						limit: Go,
 						sortDirection: "desc",
 						itemsView: "full"
 					}));
@@ -5825,8 +5828,8 @@ var Wo = class {
 	}
 	async emitHistoryChunks(e, t) {
 		for (let n = t.length; n > 0;) {
-			let r = Math.max(0, n - qo);
-			this.host.emitHistoryPrepended(e, t.slice(r, n), "lifecycle"), await Yo(), n = r;
+			let r = Math.max(0, n - Ko);
+			this.host.emitHistoryPrepended(e, t.slice(r, n), "lifecycle"), await Jo(), n = r;
 		}
 	}
 	async refreshCompleteHistory(e) {
@@ -5866,7 +5869,7 @@ var Wo = class {
 		i.activeTurnId && a.add(i.activeTurnId);
 		for (let e of t) (e.status === "inProgress" || e.itemsView === "summary" && i.turns.find((t) => t.id === e.id)?.itemsView !== "summary") && i.turnIds.includes(e.id) && a.add(e.id);
 		let o = new Set(t.filter((e) => !a.has(e.id)).map((e) => e.id)), s = t.filter((e) => o.has(e.id)), c = i.turnIds.filter((e) => !o.has(e)), l = i.turns.filter((e) => !o.has(e.id)), u = i.messages.filter((e) => e.turnId === void 0 || !o.has(e.turnId)), d = kn(i.messages, s.flatMap((t) => I(e, t)));
-		r ? d = r(d) : this.originalImages && (d = Ki(d)), this.host.patchRuntime(e, {
+		r ? d = r(d) : this.originalImages && (d = Gi(d)), this.host.patchRuntime(e, {
 			turnIds: [...s.map((e) => e.id), ...c],
 			turns: [...s.map((e) => Q(e)), ...l],
 			messages: [...d, ...u]
@@ -5892,10 +5895,10 @@ var Wo = class {
 		} : t;
 	}
 };
-function Yo() {
+function Jo() {
 	return new Promise((e) => setTimeout(e, 0));
 }
-async function Xo(e, t, n) {
+async function Yo(e, t, n) {
 	let r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Set(), a = null;
 	do {
 		let o = await e.request("thread/items/list", {
@@ -5914,7 +5917,7 @@ async function Xo(e, t, n) {
 }
 //#endregion
 //#region src/node/codex-surface-conversation-settings-controller.ts
-var Zo = class {
+var Xo = class {
 	client;
 	defaults;
 	host;
@@ -5926,7 +5929,7 @@ var Zo = 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 _a(r);
+		if (r) return ga(r);
 		let i = e.approvalMode ?? this.defaults.approvalMode, a = e.permissionMode ?? this.defaults.permissionMode ?? "read-only";
 		return {
 			approvalPolicy: i === "ask" ? "on-request" : "never",
@@ -5952,23 +5955,23 @@ var Zo = class {
 	async update(e) {
 		let t = this.host.getState(), n = t.activeConversationId;
 		if (!n) {
-			let n = Sa(t, e);
+			let n = xa(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 = Sa(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 = xa(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);
 		await this.client.request("thread/settings/update", {
 			threadId: e,
-			...t.approvalPreset ? va(t.approvalPreset) : {},
+			...t.approvalPreset ? _a(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: Ca(i.planMode, o.model, i.selectedReasoningEffort) } : {}
+			...o && (typeof t.planMode == "boolean" || t.modelId || t.reasoningEffort) ? { collaborationMode: Sa(i.planMode, o.model, i.selectedReasoningEffort) } : {}
 		}), this.host.patchRuntime(e, i), a && this.host.emitConversationSettings(e, "action");
 	}
 	async setGoal(e, t) {
@@ -5987,7 +5990,7 @@ var Zo = 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 = !co(r.goal, a.goal);
+		let o = !so(r.goal, a.goal);
 		this.host.patchRuntime(e, { goal: { ...a.goal } }), o && this.host.emitEvent("action", {
 			type: "conversation.goalChanged",
 			conversationId: e,
@@ -6009,7 +6012,7 @@ var Zo = class {
 			payload: { goal: null }
 		});
 	}
-}, Qo = "Review the current code changes (staged, unstaged, and untracked files) and provide prioritized findings.", $o = class {
+}, Zo = "Review the current code changes (staged, unstaged, and untracked files) and provide prioritized findings.", Qo = class {
 	client;
 	host;
 	constructor(e, t) {
@@ -6050,13 +6053,13 @@ var Zo = class {
 				...e,
 				parts: r.type === "uncommittedChanges" ? e.parts.map((e) => e.type === "text" && e.text === "current changes" ? {
 					...e,
-					text: Qo
+					text: Zo
 				} : e) : e.parts,
 				metadata: {
 					...e.metadata,
 					reviewPrompt: !0
 				}
-			} : e), s = es(n.messages, i.turn.id, o);
+			} : e), s = $o(n.messages, i.turn.id, o);
 			this.host.patchRuntime(e, {
 				busy: n.activeTurnId !== null,
 				turnStartPending: !1,
@@ -6073,7 +6076,7 @@ var Zo = class {
 				type: "turn.started",
 				conversationId: e,
 				turnId: i.turn.id,
-				payload: { startedAt: ao(i.turn.startedAt) }
+				payload: { startedAt: io(i.turn.startedAt) }
 			}), this.host.emitConversationActivity(e, "action");
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
@@ -6108,11 +6111,11 @@ var Zo = class {
 	async editTurnForThread(e, t, n, r) {
 		let i = await this.host.ensureThreadReady(e);
 		i.turns.find((e) => e.id === t)?.itemsView === "summary" && await this.host.loadTurnHistory?.(e, t);
-		let a = i.messages.find((e) => e.role === "user" && e.kind !== "steer" && Aa(e) === t);
+		let a = i.messages.find((e) => e.role === "user" && e.kind !== "steer" && ka(e) === t);
 		if (!a) throw Error(`Could not find the user prompt for Codex turn '${t}'`);
 		let o = n.trim();
 		if (!o) throw Error("Cannot replace a turn prompt with empty content");
-		let s = Ma(a);
+		let s = ja(a);
 		await this.rollbackToTurn(e, t), await this.host.sendMessageToThread(e, o, {
 			...r,
 			...s.length > 0 ? { attachments: s } : {}
@@ -6125,11 +6128,11 @@ var Zo = class {
 	async retryTurnForThread(e, t) {
 		let n = await this.host.ensureThreadReady(e);
 		n.turns.find((e) => e.id === t)?.itemsView === "summary" && await this.host.loadTurnHistory?.(e, t);
-		let r = n.messages.find((e) => e.role === "user" && e.kind !== "steer" && Aa(e) === t);
+		let r = n.messages.find((e) => e.role === "user" && e.kind !== "steer" && ka(e) === t);
 		if (!r) throw Error("Could not find the user prompt for this turn");
-		let i = ja(r);
+		let i = Aa(r);
 		if (!i) throw Error("Could not find the user prompt for this turn");
-		let a = Ma(r);
+		let a = ja(r);
 		await this.rollbackToTurn(e, t), await this.host.sendMessageToThread(e, i, {
 			...r.metadata?.promptContent ? { content: ce(r.metadata.promptContent) } : {},
 			...a.length > 0 ? { attachments: a } : {}
@@ -6150,7 +6153,7 @@ var Zo = 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 = Aa(e);
+			let t = ka(e);
 			return t === null || o.has(t);
 		});
 		r.turnIds = a, r.turns = r.turns.filter((e) => o.has(e.id)), r.activeTurnId = null;
@@ -6177,7 +6180,7 @@ var Zo = class {
 		return e;
 	}
 };
-function es(e, t, n) {
+function $o(e, t, n) {
 	let r = e.findIndex((e) => e.turnId === t);
 	return r < 0 ? [...e, ...n] : [
 		...e.slice(0, r),
@@ -6187,7 +6190,7 @@ function es(e, t, n) {
 }
 //#endregion
 //#region src/node/codex-surface-messages-controller.ts
-var ts = class {
+var es = class {
 	client;
 	host;
 	constructor(e, t) {
@@ -6243,7 +6246,7 @@ var ts = class {
 		let s = Zt(i);
 		if (s) return this.host.startReviewForThread(e, { target: s });
 		n = {
-			...Ea(this.host.snapshotForRuntime(r), n),
+			...Ta(this.host.snapshotForRuntime(r), n),
 			...n.skills ? { skills: k(n.skills, r.skills) } : {}
 		}, await this.sendPromptToThread(e, i, n);
 	}
@@ -6267,7 +6270,7 @@ var ts = class {
 			let n = await this.client.request("turn/start", {
 				threadId: e,
 				input: [],
-				...wa(this.host.snapshotForRuntime(t), {})
+				...Ca(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";
@@ -6280,7 +6283,7 @@ var ts = class {
 				type: "turn.started",
 				conversationId: e,
 				turnId: n.turn.id,
-				payload: { startedAt: ao(n.turn.startedAt) }
+				payload: { startedAt: io(n.turn.startedAt) }
 			}), this.host.emitConversationActivity(e, "action");
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
@@ -6291,25 +6294,25 @@ var ts = class {
 		}
 	}
 	async sendPromptToThread(e, t, n = {}, r) {
-		let i = this.host.requireRuntime(e), a = Ea(this.host.snapshotForRuntime(i), n), o = $t(a.content);
+		let i = this.host.requireRuntime(e), a = Ta(this.host.snapshotForRuntime(i), n), o = $t(a.content);
 		o && (a.content = o);
-		let s = o ? ue(o) : r?.trim() || t, c = nn(k(en(o), i.skills), k(a.skills ?? [], i.skills)), l = Da(a.attachments ?? []);
+		let s = o ? ue(o) : r?.trim() || t, c = nn(k(en(o), i.skills), k(a.skills ?? [], i.skills)), l = Ea(a.attachments ?? []);
 		if (i.busy) {
 			this.host.patchRuntime(e, { queuedPrompts: [...i.queuedPrompts, {
-				id: uo(),
+				id: lo(),
 				text: s,
 				...Object.keys(a).length > 0 ? { options: a } : {}
 			}] }), this.emitQueuedPrompts(e);
 			return;
 		}
-		let u = lo(), d = {
+		let u = co(), d = {
 			id: u,
 			role: "user",
 			status: "complete",
 			parts: [{
 				type: "text",
 				text: s
-			}, ...l.map(ka)],
+			}, ...l.map(Oa)],
 			createdAt: (/* @__PURE__ */ new Date()).toISOString(),
 			metadata: {
 				conversationId: e,
@@ -6337,7 +6340,7 @@ var ts = class {
 						text: le(o ?? [], t),
 						text_elements: []
 					},
-					...l.map(Oa),
+					...l.map(Da),
 					...tn(o),
 					...c.map((e) => ({
 						type: "skill",
@@ -6345,7 +6348,7 @@ var ts = class {
 						path: e.path
 					}))
 				],
-				...wa(this.host.snapshotForRuntime(i), a),
+				...Ca(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");
@@ -6373,7 +6376,7 @@ var ts = class {
 				type: "turn.started",
 				conversationId: e,
 				turnId: n.turn.id,
-				payload: { startedAt: ao(n.turn.startedAt) }
+				payload: { startedAt: io(n.turn.startedAt) }
 			}), this.host.emitConversationActivity(e, "action");
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
@@ -6391,7 +6394,7 @@ var ts = class {
 		let i = await this.host.ensureThreadReady(e), a = t.trim(), o = $t(n.content), s = nn(k(en(o), i.skills), k(n.skills ?? [], i.skills)), c = o ? ue(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 l = Da(n.attachments ?? []), u = lo(), d = {
+		let l = Ea(n.attachments ?? []), u = co(), d = {
 			id: u,
 			kind: "steer",
 			role: "user",
@@ -6399,7 +6402,7 @@ var ts = class {
 			parts: [{
 				type: "text",
 				text: c
-			}, ...l.map(ka)],
+			}, ...l.map(Oa)],
 			createdAt: (/* @__PURE__ */ new Date()).toISOString(),
 			turnId: i.activeTurnId,
 			metadata: {
@@ -6429,7 +6432,7 @@ var ts = class {
 						text: le(o ?? [], a),
 						text_elements: []
 					},
-					...l.map(Oa),
+					...l.map(Da),
 					...tn(o),
 					...s.map((e) => ({
 						type: "skill",
@@ -6548,7 +6551,7 @@ var ts = class {
 		if (!e) throw Error("There is no active conversation");
 		return e;
 	}
-}, ns = 5, rs = class {
+}, ts = 5, ns = class {
 	client;
 	options;
 	catalog;
@@ -6587,9 +6590,9 @@ var ts = 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 ? ua(i.models, e.model) : s, l = c?.model, u = e.reasoningEffort ?? (c?.id === s?.id ? i.selectedReasoningEffort : c ? fa(c) : null) ?? void 0, d = e.serviceTier === void 0 ? c?.id === s?.id ? i.selectedServiceTier ?? null : c?.defaultServiceTier ?? null : e.serviceTier;
-		da(c, u), ma(c, d);
-		let f = t.mcpServers === void 0 ? this.extensions.defaultMcpServers : Lo(t.mcpServers), p = await this.extensions.conversationExtension({
+		}, r.approvalPresets), s = q(i.models, i.selectedModelId), c = e.model ? la(i.models, e.model) : s, l = c?.model, u = e.reasoningEffort ?? (c?.id === s?.id ? i.selectedReasoningEffort : c ? da(c) : null) ?? void 0, d = e.serviceTier === void 0 ? c?.id === s?.id ? i.selectedServiceTier ?? null : c?.defaultServiceTier ?? null : e.serviceTier;
+		ua(c, u), pa(c, d);
+		let f = t.mcpServers === void 0 ? this.extensions.defaultMcpServers : Io(t.mcpServers), p = await this.extensions.conversationExtension({
 			operation: "start",
 			conversationId: null,
 			cwd: n,
@@ -6608,11 +6611,11 @@ var ts = class {
 			serviceName: "codex_app_sdk"
 		});
 		this.host.observeEmptyConversation(m.thread.id);
-		let h = ba(m, i.models, i);
+		let h = ya(m, i.models, i);
 		u && (await this.client.request("thread/settings/update", {
 			threadId: m.thread.id,
 			effort: u,
-			...c ? { collaborationMode: Ca(i.planMode, c.model, u) } : {}
+			...c ? { collaborationMode: Sa(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,
@@ -6623,7 +6626,7 @@ var ts = class {
 			turnIds: [],
 			messages: [],
 			answeredClientRequestIds: [],
-			threadStatus: Fa(m.thread.status),
+			threadStatus: Pa(m.thread.status),
 			...r,
 			...h
 		});
@@ -6691,7 +6694,7 @@ var ts = class {
 				historyLoadingOlder: !1,
 				fullHistoryHydrated: !0,
 				busy: !!n.activeTurnId,
-				threadStatus: Fa(t.thread.status)
+				threadStatus: Pa(t.thread.status)
 			}), i = {
 				...J(t.thread),
 				turnCount: r.turnIds.length
@@ -6713,7 +6716,7 @@ var ts = class {
 			...n
 		}, a = {
 			...i,
-			mcpServers: i.mcpServers === void 0 ? this.extensions.defaultMcpServers : Lo(i.mcpServers)
+			mcpServers: i.mcpServers === void 0 ? this.extensions.defaultMcpServers : Io(i.mcpServers)
 		};
 		this.hostOptionsByThread.set(e, a);
 		let o = await this.extensions.conversationExtension({
@@ -6731,7 +6734,7 @@ var ts = class {
 				threadId: e,
 				excludeTurns: !0,
 				initialTurnsPage: {
-					limit: ns,
+					limit: ts,
 					sortDirection: "desc",
 					itemsView: s
 				},
@@ -6744,14 +6747,14 @@ var ts = class {
 			let i = t.initialTurnsPage ?? await this.client.request("thread/turns/list", {
 				threadId: t.thread.id,
 				cursor: null,
-				limit: ns,
+				limit: ts,
 				sortDirection: "desc",
 				itemsView: s
 			}), f = await Promise.all([...i.data].reverse().map(async (e) => e.status === "inProgress" && (e.itemsView === "summary" || e.itemsView === "notLoaded") ? {
 				...e,
-				items: await Xo(this.client, t.thread.id, e.id),
+				items: await Yo(this.client, t.thread.id, e.id),
 				itemsView: "full"
-			} : e)), p = t.cwd ?? t.thread.cwd ?? a.cwd, m = await this.catalog.loadConversationCatalogs(p), h = s === "full" ? await this.originalImages?.prepare(t.thread.id, t.thread.path) : void 0, g = c.turns.filter((e) => l.get(e.id) !== e), _ = c.threadStatus !== d && c.threadStatus ? c.threadStatus : Fa(t.thread.status), v = f.map((e) => _.type === "idle" && e.status === "inProgress" ? {
+			} : e)), p = t.cwd ?? t.thread.cwd ?? a.cwd, m = await this.catalog.loadConversationCatalogs(p), h = s === "full" ? await this.originalImages?.prepare(t.thread.id, t.thread.path) : void 0, g = c.turns.filter((e) => l.get(e.id) !== e), _ = c.threadStatus !== d && c.threadStatus ? c.threadStatus : Pa(t.thread.status), v = f.map((e) => _.type === "idle" && e.status === "inProgress" ? {
 				...e,
 				status: "interrupted"
 			} : e), y = new Set(c.turns.filter((e) => e.itemsView !== "summary").map((e) => e.id)), b = new Map(v.map((e) => [e.id, e.itemsView === "summary" && y.has(e.id) ? {
@@ -6783,7 +6786,7 @@ var ts = class {
 				goal: n ? { ...n } : null,
 				threadStatus: _,
 				...m,
-				...ba(t, this.host.getState().models, this.host.snapshotForRuntime(c))
+				...ya(t, this.host.getState().models, this.host.snapshotForRuntime(c))
 			}), ne = {
 				...J(t.thread),
 				turnCount: f.length
@@ -6812,7 +6815,7 @@ var ts = class {
 			threadStatus: structuredClone(t.threadStatus)
 		};
 	}
-}, is = class {
+}, rs = class {
 	authentication;
 	approvals;
 	catalog;
@@ -6828,7 +6831,7 @@ var ts = class {
 			case "thread/started": {
 				this.host.createRuntime(e.params.thread.id, {
 					historyMode: e.params.thread.historyMode ?? "legacy",
-					threadStatus: Fa(e.params.thread.status)
+					threadStatus: Pa(e.params.thread.status)
 				});
 				let t = J(e.params.thread);
 				this.host.patch({ conversations: Y(this.host.getState().conversations, t) }), this.host.emitSummaryUpserted(t, "started", "notification"), this.host.emitConversationActivity(e.params.thread.id, "notification");
@@ -6837,7 +6840,7 @@ var ts = class {
 			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: Fa(n),
+					threadStatus: Pa(n),
 					busy: i ? !1 : r.turnStartPending || n.type === "active" || r.activeTurnId !== null,
 					...i ? {
 						turnStartPending: !1,
@@ -6847,7 +6850,7 @@ var ts = class {
 				let a = this.host.getState();
 				this.host.patch({ conversations: a.conversations.map((e) => e.id === t ? {
 					...e,
-					status: Ia(n)
+					status: Fa(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);
@@ -6889,12 +6892,12 @@ var ts = class {
 				return;
 			}
 			case "thread/settings/updated": {
-				let t = this.host.requireRuntime(e.params.threadId), n = this.host.getState(), r = xa(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 = ba(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 (co(this.host.requireRuntime(e.params.threadId).goal, e.params.goal)) return;
+				if (so(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,
@@ -6911,7 +6914,7 @@ var ts = class {
 				});
 				return;
 			case "thread/tokenUsage/updated": {
-				let t = Pa(e.params.tokenUsage);
+				let t = Na(e.params.tokenUsage);
 				this.host.patchRuntime(e.params.threadId, { contextUsage: t }), this.host.emitEvent("notification", {
 					type: "conversation.contextUsageChanged",
 					conversationId: e.params.threadId,
@@ -6922,8 +6925,8 @@ var ts = class {
 					conversationId: e.params.threadId,
 					turnId: e.params.turnId,
 					payload: { usage: {
-						last: Na(e.params.tokenUsage.last),
-						total: Na(e.params.tokenUsage.total),
+						last: Ma(e.params.tokenUsage.last),
+						total: Ma(e.params.tokenUsage.total),
 						execution: null,
 						model: null,
 						observedStart: !1
@@ -6951,12 +6954,12 @@ var ts = class {
 					error: null,
 					turnGitDiff: null,
 					turns: $(t.turns, Q(e.params.turn)),
-					messages: M(t.messages, e.params.threadId, e.params.turn.id, { createdAt: ao(e.params.turn.startedAt) })
+					messages: M(t.messages, e.params.threadId, e.params.turn.id, { createdAt: io(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: ao(e.params.turn.startedAt) }
+					payload: { startedAt: io(e.params.turn.startedAt) }
 				}), this.host.emitConversationActivity(e.params.threadId, "notification");
 				return;
 			}
@@ -7037,7 +7040,7 @@ var ts = class {
 							durationMs: null
 						},
 						status: e.params.willRetry ? "inProgress" : "failed",
-						error: so(e.params.error),
+						error: oo(e.params.error),
 						willRetry: e.params.willRetry
 					}),
 					...n ? {
@@ -7049,7 +7052,7 @@ var ts = class {
 					conversationId: e.params.threadId,
 					turnId: e.params.turnId,
 					payload: {
-						error: so(e.params.error),
+						error: oo(e.params.error),
 						willRetry: e.params.willRetry
 					}
 				}), this.host.emitConversationActivity(e.params.threadId, "notification");
@@ -7057,7 +7060,7 @@ var ts = class {
 			}
 			case "account/rateLimits/updated": {
 				let t = this.host.getState();
-				this.host.patch({ rateLimits: Va(t.rateLimits, e.params.rateLimits) }), this.host.emitEvent("notification", {
+				this.host.patch({ rateLimits: Ba(t.rateLimits, e.params.rateLimits) }), this.host.emitEvent("notification", {
 					type: "rateLimits.changed",
 					payload: { rateLimits: structuredClone(this.host.getState().rateLimits) }
 				});
@@ -7128,7 +7131,7 @@ var ts = class {
 				this.host.emitEvent("notification", {
 					type: "realtime.audioDelta",
 					conversationId: e.params.threadId,
-					payload: { audio: Xi(e.params.audio) }
+					payload: { audio: Yi(e.params.audio) }
 				});
 				return;
 			case "thread/realtime/sdp":
@@ -7195,7 +7198,7 @@ var ts = class {
 			default: return this.host.unknownNotification(e);
 		}
 	}
-}, as = class {
+}, is = class {
 	approvals;
 	clientRequests;
 	host;
@@ -7219,14 +7222,14 @@ var ts = class {
 	create(e, t = {}) {
 		let n = this.runtimes.get(e);
 		if (n) return Object.assign(n, t), n;
-		let r = na(e, this.host.getState(), t);
+		let r = ta(e, this.host.getState(), t);
 		return this.runtimes.set(e, r), r;
 	}
 	require(e) {
 		return this.runtimes.get(e) ?? this.create(e);
 	}
 	projection(e) {
-		return ra(e, this.approvals.approvalsForThread(e.threadId), this.clientRequests.requestsForThread(e.threadId));
+		return na(e, this.approvals.approvalsForThread(e.threadId), this.clientRequests.requestsForThread(e.threadId));
 	}
 	snapshot(e) {
 		return {
@@ -7257,7 +7260,7 @@ var ts = class {
 			conversationId: e,
 			payload: {
 				historyLoading: n.historyLoading,
-				historyState: cs(n),
+				historyState: ss(n),
 				error: n.error
 			}
 		});
@@ -7351,7 +7354,7 @@ var ts = class {
 				reason: t,
 				messages: structuredClone(r.messages),
 				threadStatus: structuredClone(r.threadStatus),
-				state: os(r)
+				state: as(r)
 			}
 		});
 	}
@@ -7363,7 +7366,7 @@ var ts = class {
 			conversationId: e,
 			payload: {
 				messages: structuredClone(t.map((e) => r.get(e.id) ?? e)),
-				state: ss(this.require(e))
+				state: os(this.require(e))
 			}
 		});
 	}
@@ -7418,7 +7421,7 @@ var ts = class {
 		i && this.emitSummaryUpserted(i, "updated", n);
 	}
 };
-function os(e) {
+function as(e) {
 	return structuredClone({
 		activeTurnId: e.activeTurnId,
 		answeredClientRequestIds: e.answeredClientRequestIds,
@@ -7427,21 +7430,21 @@ function os(e) {
 		error: e.error,
 		executionPlan: e.executionPlan,
 		historyLoading: e.historyLoading,
-		historyState: cs(e),
+		historyState: ss(e),
 		turnGitDiff: e.turnGitDiff,
 		turnIds: e.turnIds,
 		turns: e.turns
 	});
 }
-function ss(e) {
+function os(e) {
 	return structuredClone({
 		historyLoading: e.historyLoading,
-		historyState: cs(e),
+		historyState: ss(e),
 		turnIds: e.turnIds,
 		turns: e.turns
 	});
 }
-function cs(e) {
+function ss(e) {
 	return {
 		loadingStrategy: e.loadingStrategy,
 		...e.historyItemsView === "summary" ? { itemsView: "summary" } : {},
@@ -7452,7 +7455,7 @@ function cs(e) {
 }
 //#endregion
 //#region src/node/codex-surface-connection-controller.ts
-var ls = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_request_user_input"]), us = class {
+var cs = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_request_user_input"]), ls = class {
 	client;
 	options;
 	authentication;
@@ -7515,7 +7518,7 @@ var ls = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 					limit: 100,
 					threadId: null
 				});
-				for (let e of n.data) ls.has(e.name) && !e.enabled && (t[e.name] = !0);
+				for (let e of n.data) cs.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 });
@@ -7532,7 +7535,7 @@ var ls = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 		}
 	}
 	bootstrapSurfaceData(e = !1) {
-		let t = oa(this.host.getState().authentication);
+		let t = aa(this.host.getState().authentication);
 		if (!e && this.bootstrappedAuthenticationKey === t) return Promise.resolve();
 		if (this.surfaceBootstrapPromise) return this.surfaceBootstrapPromise.then(() => this.bootstrapSurfaceData(e));
 		let n = (async () => {
@@ -7649,7 +7652,7 @@ var ls = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			error: null
 		});
 	}
-}, ds = 5, fs = class {
+}, us = 5, ds = class {
 	client;
 	loadingStrategy;
 	catalog;
@@ -7662,9 +7665,9 @@ var ls = /* @__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 ? ua(s.models, t.model) : q(s.models, i.selectedModelId);
-		da(c, t.reasoningEffort), ma(c, t.serviceTier);
-		let l = n.mcpServers === void 0 ? this.extensions.defaultMcpServers : Lo(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 ? la(s.models, t.model) : q(s.models, i.selectedModelId);
+		ua(c, t.reasoningEffort), pa(c, t.serviceTier);
+		let l = n.mcpServers === void 0 ? this.extensions.defaultMcpServers : Io(n.mcpServers), u = await this.extensions.conversationExtension({
 			operation: "start",
 			conversationId: null,
 			cwd: a ?? void 0,
@@ -7682,23 +7685,23 @@ var ls = /* @__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 },
-			...ps(t, o.approvalPresets)
+			...fs(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: Ca(i.planMode, c.model, t.reasoningEffort) } : {}
+			...c ? { collaborationMode: Sa(i.planMode, c.model, t.reasoningEffort) } : {}
 		});
 		let f = n.historyItemsView ?? i.historyItemsView ?? "full", [p, m] = await Promise.all([this.client.request("thread/turns/list", {
 			threadId: d.thread.id,
 			cursor: null,
-			limit: ds,
+			limit: us,
 			sortDirection: "desc",
 			itemsView: f
 		}), this.client.request("thread/goal/get", { threadId: d.thread.id }).then((e) => e.goal).catch(() => null)]), h = await Promise.all([...p.data].reverse().map(async (e) => e.status === "inProgress" && (e.itemsView === "summary" || e.itemsView === "notLoaded") ? {
 			...e,
-			items: await Xo(this.client, d.thread.id, e.id),
+			items: await Yo(this.client, d.thread.id, e.id),
 			itemsView: "full"
 		} : e)), g = f === "full" ? await this.originalImages?.prepare(d.thread.id, d.thread.path) : void 0, _ = ln(h), v = Dn({
 			...d.thread,
@@ -7721,9 +7724,9 @@ var ls = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			messages: y,
 			busy: !!_,
 			goal: m ? { ...m } : null,
-			threadStatus: Fa(d.thread.status),
+			threadStatus: Pa(d.thread.status),
 			...o,
-			...ba(d, s.models, this.host.snapshotForRuntime(i))
+			...ya(d, s.models, this.host.snapshotForRuntime(i))
 		});
 		t.reasoningEffort && (x.selectedReasoningEffort = t.reasoningEffort), t.serviceTier !== void 0 && (x.selectedServiceTier = t.serviceTier), t.model && c && (x.selectedModelId = c.id), this.host.rememberHostOptions(d.thread.id, {
 			...n,
@@ -7743,10 +7746,10 @@ var ls = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 		return this.fork(e, n, r, { lastTurnId: t });
 	}
 };
-function ps(e, t) {
+function fs(e, t) {
 	if (e.approvalPreset) {
 		if (!t.includes(e.approvalPreset)) throw Error(`Approval preset '${e.approvalPreset}' is not available`);
-		return _a(e.approvalPreset);
+		return ga(e.approvalPreset);
 	}
 	return {
 		...e.approvalMode === void 0 ? {} : { approvalPolicy: e.approvalMode === "ask" ? "on-request" : "never" },
@@ -7755,24 +7758,24 @@ function ps(e, t) {
 }
 //#endregion
 //#region src/node/codex-markdown-images.ts
-var ms = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, hs = /* @__PURE__ */ new Set([
+var ps = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, ms = /* @__PURE__ */ new Set([
 	".avif",
 	".gif",
 	".jpeg",
 	".jpg",
 	".png",
 	".webp"
-]), gs = class {
+]), hs = class {
 	client;
 	constructor(e) {
 		this.client = e;
 	}
 	async hydrate(e, t) {
-		let n = ys(e);
-		return vs(e, (await Promise.all(Array.from(e.matchAll(ms), async (e) => {
+		let n = vs(e);
+		return _s(e, (await Promise.all(Array.from(e.matchAll(ps), async (e) => {
 			let r = e.index ?? 0;
-			if (bs(r, n)) return null;
-			let i = e[2], a = _s(i, t);
+			if (ys(r, n)) return null;
+			let i = e[2], a = gs(i, t);
 			if (!a) return null;
 			try {
 				let t = Hn((await this.client.request("fs/readFile", { path: a })).dataBase64);
@@ -7789,7 +7792,7 @@ var ms = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, hs = /* @
 		}))).filter((e) => e !== null));
 	}
 };
-function _s(e, t) {
+function gs(e, t) {
 	let n = e.trim();
 	if (!n || /[\u0000-\u001f\u007f]/.test(n)) return null;
 	let r;
@@ -7804,18 +7807,18 @@ function _s(e, t) {
 	} catch {
 		return null;
 	}
-	if (!hs.has(_(r).toLowerCase())) return null;
+	if (!ms.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 vs(e, t) {
+function _s(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 ys(e) {
+function vs(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");
@@ -7836,15 +7839,15 @@ function ys(e) {
 	}
 	return t;
 }
-function bs(e, t) {
+function ys(e, t) {
 	return t.some((t) => e >= t.start && e <= t.end);
 }
-var xs = /<context>[\s\S]*?<\/context>\s*/g, Ss = /<in-app-browser-context(?:\s[^>]*)?>[\s\S]*?<\/in-app-browser-context>\s*/g, Cs = /^[ \t]*## My request for Codex:[ \t]*$/m;
-async function ws(e, t) {
+var bs = /<context>[\s\S]*?<\/context>\s*/g, xs = /<in-app-browser-context(?:\s[^>]*)?>[\s\S]*?<\/in-app-browser-context>\s*/g, Ss = /^[ \t]*## My request for Codex:[ \t]*$/m;
+async function Cs(e, t) {
 	let n = A(t);
 	return {
 		conversationId: n,
-		prompts: Ts((await e.request("thread/turns/list", {
+		prompts: ws((await e.request("thread/turns/list", {
 			threadId: n,
 			cursor: null,
 			limit: 100,
@@ -7853,20 +7856,20 @@ async function ws(e, t) {
 		})).data)
 	};
 }
-function Ts(e) {
+function ws(e) {
 	return [...e].reverse().flatMap((e) => e.items.flatMap((e) => {
 		if (e.type !== "userMessage") return [];
-		let t = Es(e.content.flatMap((e) => e.type === "text" ? [e.text] : []).join(""));
+		let t = Ts(e.content.flatMap((e) => e.type === "text" ? [e.text] : []).join(""));
 		return t && t !== "(no user instructions)" ? [t] : [];
 	}));
 }
-function Es(e) {
-	let t = e.replace(xs, ""), n = t.replace(Ss, "");
-	return (n === t ? n : n.replace(Cs, "")).trim();
+function Ts(e) {
+	let t = e.replace(bs, ""), n = t.replace(xs, "");
+	return (n === t ? n : n.replace(Ss, "")).trim();
 }
 //#endregion
 //#region src/node/codex-surface-text-generation-controller.ts
-var Ds = 12e4, Os = class {
+var Es = 12e4, Ds = class {
 	client;
 	defaultCwd;
 	host;
@@ -7877,7 +7880,7 @@ var Ds = 12e4, Os = class {
 	}
 	handleNotification(e) {
 		e.method === "thread/started" && e.params.thread.ephemeral && this.hiddenThreadIds.add(e.params.thread.id);
-		let t = Ms(e);
+		let t = js(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;
@@ -7885,10 +7888,10 @@ var Ds = 12e4, Os = class {
 	async generate(e, t = {}) {
 		let n = e.trim();
 		if (!n) throw Error("Generation prompt cannot be empty");
-		if (t.signal?.aborted) throw Ns();
+		if (t.signal?.aborted) throw Ms();
 		await this.host.ensureConnected();
-		let r = this.host.getSnapshot(), i = q(r.models, r.selectedModelId), a = t.model ? ua(r.models, t.model) : i, o = a?.model, s = t.reasoningEffort ?? (a?.id === i?.id ? r.selectedReasoningEffort : a ? fa(a) : null) ?? void 0, c = t.serviceTier === void 0 ? a?.id === i?.id ? r.selectedServiceTier : a?.defaultServiceTier ?? null : t.serviceTier;
-		da(a, s), ma(a, c);
+		let r = this.host.getSnapshot(), i = q(r.models, r.selectedModelId), a = t.model ? la(r.models, t.model) : i, o = a?.model, s = t.reasoningEffort ?? (a?.id === i?.id ? r.selectedReasoningEffort : a ? da(a) : null) ?? void 0, c = t.serviceTier === void 0 ? a?.id === i?.id ? r.selectedServiceTier : a?.defaultServiceTier ?? null : t.serviceTier;
+		ua(a, s), pa(a, c);
 		let l = await this.client.request("thread/start", {
 			approvalPolicy: "never",
 			approvalsReviewer: "user",
@@ -7904,15 +7907,15 @@ var Ds = 12e4, Os = class {
 			serviceName: "codex_app_sdk",
 			threadSource: "sdk_ephemeral_generation"
 		}), u = l.thread.id;
-		if (!l.thread.ephemeral) throw await ks(() => 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 ks(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u), Ns();
-		let d = As();
+		if (!l.thread.ephemeral) throw await Os(() => 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 Os(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u), Ms();
+		let d = ks();
 		this.pendingByThread.set(u, d);
-		let f = null, p = !1, m = () => d.reject(Ns());
+		let f = null, p = !1, m = () => d.reject(Ms());
 		t.signal?.addEventListener("abort", m);
 		let h = setTimeout(() => {
 			d.reject(/* @__PURE__ */ Error("Codex ephemeral generation timed out"));
-		}, t.timeoutMs ?? Ds);
+		}, t.timeoutMs ?? Es);
 		try {
 			let e = await this.client.request("turn/start", {
 				threadId: u,
@@ -7928,18 +7931,18 @@ var Ds = 12e4, Os = class {
 				serviceTier: c,
 				...t.outputSchema === void 0 ? {} : { outputSchema: t.outputSchema }
 			});
-			f = e.turn.id, d.turnId = f, js(d, e.turn);
+			f = e.turn.id, d.turnId = f, As(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 ks(() => this.client.request("turn/interrupt", {
+				await Os(() => this.client.request("turn/interrupt", {
 					threadId: u,
 					turnId: e
 				}));
 			}
-			await ks(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u);
+			await Os(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u);
 		}
 	}
 	close(e = /* @__PURE__ */ Error("Codex surface closed")) {
@@ -7962,16 +7965,16 @@ var Ds = 12e4, Os = class {
 		}
 		if (t.method === "turn/completed") {
 			if (e.turnId && t.params.turn.id !== e.turnId) return;
-			js(e, t.params.turn);
+			As(e, t.params.turn);
 		}
 	}
 };
-async function ks(e) {
+async function Os(e) {
 	try {
 		await e();
 	} catch {}
 }
-function As() {
+function ks() {
 	let e, t, n = {
 		promise: new Promise((n, r) => {
 			e = n, t = r;
@@ -7987,7 +7990,7 @@ function As() {
 	};
 	return n.promise.catch(() => void 0), n;
 }
-function js(e, t) {
+function As(e, t) {
 	for (let n of t.items) {
 		if (n.type !== "agentMessage") continue;
 		let t = n.text.trim();
@@ -8009,17 +8012,17 @@ function js(e, t) {
 	}
 	e.resolve({ text: n });
 }
-function Ms(e) {
+function js(e) {
 	if (e.method === "thread/started") return e.params.thread.id;
 	let t = e.params;
 	return typeof t.threadId == "string" ? t.threadId : null;
 }
-function Ns() {
+function Ms() {
 	return /* @__PURE__ */ Error("Codex ephemeral generation was aborted");
 }
 //#endregion
 //#region src/node/codex-surface-usage-controller.ts
-var Ps = {
+var Ns = {
 	status: "unavailable",
 	reason: "public-runtime-request-evidence-unavailable",
 	unavailableFields: [
@@ -8037,7 +8040,7 @@ var Ps = {
 		"finality"
 	],
 	requests: null
-}, Fs = class {
+}, Ps = class {
 	threads = /* @__PURE__ */ new Map();
 	clear() {
 		this.threads.clear();
@@ -8079,16 +8082,16 @@ var Ps = {
 			let e = r.executions.get(r.activeTurnId);
 			e && (e.baseline = null), i && (i.baseline = null);
 		}
-		i && (!Ls(a.total) || i.latest && !Rs(i.latest.total, a.total)) && (i.baseline = null);
-		let s = i?.baseline ? zs(i.baseline, a.total) : null;
+		i && (!Is(a.total) || i.latest && !Ls(i.latest.total, a.total)) && (i.baseline = null);
+		let s = i?.baseline ? Rs(i.baseline, a.total) : null;
 		i && s === null && (i.baseline = null);
 		let c = {
 			...a,
 			execution: s,
 			observedStart: !!i,
-			requestUsage: structuredClone(Ps)
+			requestUsage: structuredClone(Ns)
 		};
-		return i && (i.latest = structuredClone(c)), r.total = !o && Ls(a.total) ? structuredClone(a.total) : null, r.lastUsageTurnId = t.turnId, {
+		return i && (i.latest = structuredClone(c)), r.total = !o && Is(a.total) ? structuredClone(a.total) : null, r.lastUsageTurnId = t.turnId, {
 			...t,
 			payload: { usage: c }
 		};
@@ -8102,21 +8105,21 @@ var Ps = {
 			executions: /* @__PURE__ */ new Map()
 		}, this.threads.set(e, t)), t;
 	}
-}, Is = [
+}, Fs = [
 	"totalTokens",
 	"inputTokens",
 	"cachedInputTokens",
 	"outputTokens",
 	"reasoningOutputTokens"
 ];
-function Ls(e) {
-	return Is.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 Is(e) {
+	return Fs.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 Rs(e, t) {
-	return Is.every((n) => t[n] >= e[n]) && (e.cacheWriteInputTokens === null || t.cacheWriteInputTokens === null || t.cacheWriteInputTokens >= e.cacheWriteInputTokens);
+function Ls(e, t) {
+	return Fs.every((n) => t[n] >= e[n]) && (e.cacheWriteInputTokens === null || t.cacheWriteInputTokens === null || t.cacheWriteInputTokens >= e.cacheWriteInputTokens);
 }
-function zs(e, t) {
-	if (!Ls(e) || !Ls(t) || !Rs(e, t)) return null;
+function Rs(e, t) {
+	if (!Is(e) || !Is(t) || !Ls(e, t)) return null;
 	let n = {
 		totalTokens: t.totalTokens - e.totalTokens,
 		inputTokens: t.inputTokens - e.inputTokens,
@@ -8125,11 +8128,11 @@ function zs(e, t) {
 		outputTokens: t.outputTokens - e.outputTokens,
 		reasoningOutputTokens: t.reasoningOutputTokens - e.reasoningOutputTokens
 	};
-	return Ls(n) ? n : null;
+	return Is(n) ? n : null;
 }
 //#endregion
 //#region src/node/codex-surface.ts
-var Bs = class {
+var zs = class {
 	options;
 	client;
 	listeners = /* @__PURE__ */ new Set();
@@ -8161,21 +8164,21 @@ var Bs = class {
 	unsubscribeToolInputRequests;
 	unsubscribeMcpElicitationRequests;
 	eventSequence = 0;
-	usage = new Fs();
+	usage = new Ps();
 	accountGeneration = 0;
 	pendingMarkdownImageHydrations = /* @__PURE__ */ new Set();
 	closed = !1;
-	state = ta(ia());
+	state = ea(ra());
 	constructor(e = {}) {
-		this.options = e, this.extensions = new Wo(e.extensions ?? [], e.mcpServers ?? [], (e) => this.lifecycle.hostOptions(e));
-		let n = Wa(e);
-		this.client = e.client ?? new t(Ua(n) ? new $e(n) : new Je(n), e.onListenerError ? { onListenerError: e.onListenerError } : {}), this.originalImages = e.originalHistoryImages ? new zi(this.client) : void 0, this.markdownImages = new gs(this.client), this.authentication = new Ka(this.client, {
+		this.options = e, this.extensions = new Uo(e.extensions ?? [], e.mcpServers ?? [], (e) => this.lifecycle.hostOptions(e));
+		let n = Ua(e);
+		this.client = e.client ?? new t(Ha(n) ? new $e(n) : new Je(n), e.onListenerError ? { onListenerError: e.onListenerError } : {}), this.originalImages = e.originalHistoryImages ? new Ri(this.client) : void 0, this.markdownImages = new hs(this.client), this.authentication = new Ga(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: j(e) })
-		}), this.items = new po({
+		}), this.items = new fo({
 			assistantMessageForTurn: (e, t) => this.assistantMessageForTurn(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
 			emitEvent: (e, t) => this.emitEvent(e, t),
@@ -8189,7 +8192,7 @@ var Bs = class {
 			sendNextQueuedPrompt: (e) => {
 				this.messagesController.sendNextQueuedPrompt(e);
 			}
-		}), this.approvals = new Io(this.client, {
+		}), this.approvals = new Fo(this.client, {
 			activeConversationId: () => this.state.activeConversationId,
 			createRuntime: (e, t) => this.createRuntime(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -8199,7 +8202,7 @@ var Bs = class {
 			patch: (e) => this.patch(e),
 			patchConversationStatus: (e, t) => this.patchConversationStatus(e, t),
 			patchRuntime: (e, t) => this.patchRuntime(e, t)
-		}), this.clientRequests = new go({
+		}), this.clientRequests = new ho({
 			activeConversationId: () => this.state.activeConversationId,
 			answerAsyncQuestion: (e, t, n) => this.messagesController.answerAsyncQuestion(e, t, n),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -8209,13 +8212,13 @@ var Bs = 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 as(this.approvals, this.clientRequests, {
+		}), this.runtimeState = new is(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 Zo(this.client, {
+		}), this.conversationSettings = new Xo(this.client, {
 			approvalMode: e.approvalMode,
 			approvalPreset: e.approvalPreset,
 			permissionMode: e.permissionMode
@@ -8233,7 +8236,7 @@ var Bs = class {
 			patch: (e) => this.patch(e),
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}), this.turnActions = new $o(this.client, {
+		}), this.turnActions = new Qo(this.client, {
 			createConversation: async () => {
 				await this.createConversation();
 			},
@@ -8251,7 +8254,7 @@ var Bs = 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 ts(this.client, {
+		}), this.messagesController = new es(this.client, {
 			clearGoalForThread: (e) => this.conversationSettings.clearGoalForThread(e),
 			compactForThread: (e) => this.turnActions.compactForThread(e),
 			createConversation: async () => {
@@ -8274,7 +8277,7 @@ var Bs = 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 Oo(this.client, e.cwd, {
+		}), this.catalog = new Do(this.client, e.cwd, {
 			authenticationBlocksBootstrap: () => this.authentication.blocksBootstrap(),
 			emitConversationSkills: (e, t) => this.emitConversationSkills(e, t),
 			emitEvent: (e, t) => this.emitEvent(e, t),
@@ -8285,7 +8288,7 @@ var Bs = class {
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			preferredApprovalPreset: () => this.conversationSettings.preferredApprovalPreset(),
 			runtimes: () => this.runtimeState.values()
-		}), this.conversations = new Jo(this.client, e.conversationLimit, {
+		}), this.conversations = new qo(this.client, e.conversationLimit, {
 			emitHistoryReplaced: (e, t, n) => this.emitHistoryReplaced(e, t, n),
 			emitHistoryPrepended: (e, t, n) => this.emitHistoryPrepended(e, t, n),
 			emitSummaryUpserted: (e, t, n) => this.emitSummaryUpserted(e, t, n),
@@ -8298,7 +8301,7 @@ var Bs = class {
 			requireRuntime: (e) => this.requireRuntime(e),
 			runtime: (e) => this.runtimeState.get(e),
 			schedulePluginRefresh: (e) => this.catalog.schedulePluginRefresh(e)
-		}, this.originalImages), this.lifecycle = new rs(this.client, e, this.catalog, this.extensions, this.conversationSettings, this.conversations, {
+		}, this.originalImages), this.lifecycle = new ns(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),
@@ -8321,7 +8324,7 @@ var Bs = class {
 			runtime: (e) => this.runtimeState.get(e),
 			runtimeProjection: (e) => this.runtimeProjection(e),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}, this.originalImages), this.forks = new fs(this.client, e.loadingStrategy, this.catalog, this.extensions, {
+		}, this.originalImages), this.forks = new ds(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"),
@@ -8336,7 +8339,7 @@ var Bs = class {
 			rememberHostOptions: (e, t) => this.lifecycle.rememberHostOptions(e, t),
 			requireRuntime: (e) => this.requireRuntime(e),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}, this.originalImages), this.connection = new us(this.client, e, this.authentication, this.approvals, this.catalog, this.clientRequests, this.conversations, this.items, this.lifecycle, this.runtimeState, {
+		}, this.originalImages), this.connection = new ls(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,
@@ -8348,7 +8351,7 @@ var Bs = class {
 			getSnapshot: () => this.getSnapshot(),
 			getState: () => this.state,
 			patch: (e) => this.patch(e)
-		}), this.notifications = new is(this.authentication, this.approvals, this.catalog, this.clientRequests, this.conversations, this.items, {
+		}), this.notifications = new rs(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),
@@ -8372,7 +8375,7 @@ var Bs = class {
 			},
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e),
 			unknownNotification: (e) => this.handleUnknownNotification(e)
-		}), this.textGeneration = new Os(this.client, e.cwd, {
+		}), this.textGeneration = new Ds(this.client, e.cwd, {
 			ensureConnected: () => this.ensureConnected(),
 			getSnapshot: () => this.getSnapshot()
 		}), this.unsubscribeNotification = this.client.onNotification((e) => {
@@ -8406,7 +8409,7 @@ var Bs = class {
 	}
 	async readRateLimits(e) {
 		return this.requestForAccount(() => this.client.request("account/rateLimits/read", e), (e) => {
-			let t = La(e);
+			let t = Ia(e);
 			return this.patch({ rateLimits: t }), this.emitEvent("action", {
 				type: "rateLimits.changed",
 				payload: { rateLimits: structuredClone(t) }
@@ -8414,7 +8417,7 @@ var Bs = class {
 		});
 	}
 	async readAccountUsage() {
-		return this.requestForAccount(() => this.client.request("account/usage/read", {}), za);
+		return this.requestForAccount(() => this.client.request("account/usage/read", {}), Ra);
 	}
 	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");
@@ -8557,7 +8560,7 @@ var Bs = class {
 		return this.lifecycle.readHistory(e);
 	}
 	async readConversationPromptHistory(e = this.state.activeConversationId ?? "") {
-		return await this.ensureConnected(), ws(this.client, e);
+		return await this.ensureConnected(), Cs(this.client, e);
 	}
 	async loadTurnHistory(e, t = this.state.activeConversationId ?? "") {
 		return await this.ensureThreadReady(t), await this.conversations.loadTurnHistory(t, e), this.getConversationSnapshot(t);
@@ -8629,7 +8632,7 @@ var Bs = class {
 	conversation(e) {
 		let t = A(e), n = this.conversationHandles.get(t);
 		if (n) return n;
-		let r = qa(t, {
+		let r = Ka(t, {
 			clearGoal: () => this.conversationSettings.clearGoalForThread(t),
 			compact: () => this.turnActions.compactForThread(t),
 			continueInterruptedTurn: () => this.messagesController.continueInterruptedTurnForThread(t),
@@ -8686,7 +8689,7 @@ var Bs = class {
 		await this.client.request("thread/realtime/stop", { threadId: e });
 	}
 	startRealtimeForThread(e, t) {
-		return $i({
+		return Qi({
 			client: this.client,
 			ensureThreadReady: async () => {
 				await this.ensureThreadReady(e);
@@ -8907,8 +8910,8 @@ var Bs = class {
 	}
 	async requestForAccount(e, t) {
 		await this.ensureConnected(), await this.authentication.pendingRefresh();
-		let n = this.accountGeneration, r = sa(this.state.authentication), i = await e();
-		if (this.closed || n !== this.accountGeneration || r !== sa(this.state.authentication)) throw Error("Account changed during account operation");
+		let n = this.accountGeneration, r = oa(this.state.authentication), i = await e();
+		if (this.closed || n !== this.accountGeneration || r !== oa(this.state.authentication)) throw Error("Account changed during account operation");
 		return t(i);
 	}
 	emitEvent(e, t) {
@@ -8959,19 +8962,19 @@ var Bs = class {
 		for (let e of this.conversationListeners.keys()) this.notifyConversationListeners(e);
 	}
 };
-function Vs(e = {}) {
-	return new Bs(e);
+function Bs(e = {}) {
+	return new zs(e);
 }
 //#endregion
 //#region src/node/codex-app-backend-cache.ts
-var Hs = {
+var Vs = {
 	set(e, t) {
 		return setTimeout(e, t);
 	},
 	clear(e) {
 		clearTimeout(e);
 	}
-}, Us = class {
+}, Hs = class {
 	options;
 	records = /* @__PURE__ */ new Map();
 	now;
@@ -8984,7 +8987,7 @@ var Hs = {
 	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 ?? Hs, this.sweepIntervalMs = e.sweepIntervalMs ?? null;
+		this.now = e.now ?? Date.now, this.scheduler = e.scheduler ?? Vs, this.sweepIntervalMs = e.sweepIntervalMs ?? null;
 	}
 	get size() {
 		return this.records.size;
@@ -9082,7 +9085,7 @@ var Hs = {
 	assertOpen() {
 		if (this.closed) throw Error("Codex backend cache is closed");
 	}
-}, Ws = class {
+}, Us = class {
 	surface;
 	moduleServices = /* @__PURE__ */ new Map();
 	ttlCaches = /* @__PURE__ */ new Set();
@@ -9098,7 +9101,7 @@ var Hs = {
 			if (n.has(e)) throw Error(`Duplicate Codex backend module '${e}'`);
 			n.add(e);
 		}
-		this.surface = e.surface ?? new Bs(e.surfaceOptions);
+		this.surface = e.surface ?? new zs(e.surfaceOptions);
 		for (let { id: e, module: n } of t) this.moduleServices.set(e, n.create({
 			surface: this.surface,
 			closeBackend: () => this.close(),
@@ -9112,7 +9115,7 @@ var Hs = {
 	}
 	createTtlCache(e) {
 		if (this.closePromise) throw Error("Cannot create a cache after the Codex backend is closed");
-		let t = new Us(e);
+		let t = new Hs(e);
 		return this.ttlCaches.add(t), t;
 	}
 	close() {
@@ -9122,16 +9125,16 @@ var Hs = {
 		await Promise.all([...this.ttlCaches].map((e) => e.close())), await this.surface.close();
 	}
 };
-function Gs(e = {}) {
-	return new Ws(e);
+function Ws(e = {}) {
+	return new Us(e);
 }
 //#endregion
 //#region src/node/apple-speech-transcription.ts
-async function Ks(e, t = {}, n = {}) {
+async function Gs(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 Zs(qs(n.assetsPath), s, r);
-		return await r.writeFile(c, e), await Ys(i, a, Js(c, u, t)), { text: (await r.readFile(u, "utf8")).trim() };
+		let a = await Xs(Ks(n.assetsPath), s, r);
+		return await r.writeFile(c, e), await Js(i, a, qs(c, u, t)), { text: (await r.readFile(u, "utf8")).trim() };
 	} catch (e) {
 		return {
 			text: "",
@@ -9144,10 +9147,10 @@ async function Ks(e, t = {}, n = {}) {
 		});
 	}
 }
-function qs(e, t = {}) {
-	return h.join(e ?? Xs(t), "apple-speechanalyzer-cli");
+function Ks(e, t = {}) {
+	return h.join(e ?? Ys(t), "apple-speechanalyzer-cli");
 }
-function Js(e, t, n) {
+function qs(e, t, n) {
 	let r = [
 		"--input-audio-path",
 		e,
@@ -9156,7 +9159,7 @@ function Js(e, t, n) {
 	], i = n.locale?.trim();
 	return i && r.push("--locale", i), n.live && r.push("--live"), r;
 }
-function Ys(e, t, n) {
+function Js(e, t, n) {
 	return new Promise((r, i) => {
 		let a = e(t, n), o = "";
 		a.stderr?.on("data", (e) => {
@@ -9172,7 +9175,7 @@ function Ys(e, t, n) {
 		});
 	});
 }
-function Xs(e) {
+function Ys(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;
@@ -9203,18 +9206,18 @@ function Xs(e) {
 	let u = import.meta.url, d = e.moduleUrl === void 0 ? u : e.moduleUrl ?? void 0, f = d ? h.dirname(de(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 Zs(e, t, n) {
+async function Xs(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 Qs(e, t, n = {}) {
+async function Zs(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 ie(h.join(m(), "codex-sdk-live-speech-")), i;
 	try {
 		let t = h.join(r, "apple-speechanalyzer-cli");
-		await re(qs(n.assetsPath), t), await ne(t, 448), n.signal?.throwIfAborted(), i = (n.spawn ?? o)(t, [
+		await re(Ks(n.assetsPath), t), await ne(t, 448), n.signal?.throwIfAborted(), i = (n.spawn ?? o)(t, [
 			"--stream",
 			"--sample-rate",
 			String(e.sampleRate),
@@ -9316,6 +9319,6 @@ async function Qs(e, t, n = {}) {
 	};
 }
 //#endregion
-export { Ws as CodexAppBackend, Us as CodexAppBackendTtlCache, Je as CodexAppServerStdioTransport, $e as CodexAppServerUnixSocketTransport, Bs as CodexSurface, Ai as ConversationContentTransport, Mn as codexItemToMediaPart, An as codexItemToSurfaceMessage, T as codexItemToToolPart, be as codexRuntimePathEntries, Dn as codexThreadToSurfaceMessages, I as codexTurnToSurfaceMessages, Gs as createCodexAppBackend, Vs as createCodexSurface, ye as discoverCodexExecutable, On as preserveHistoricalAttachmentPreviews, qs as resolveAppleSpeechAnalyzerPath, Se as resolveCodexRuntime, Qs as startAppleSpeechSession, Ks as transcribeWithAppleSpeechAnalyzer, xe as withCodexRuntimePath };
+export { Us as CodexAppBackend, Hs as CodexAppBackendTtlCache, Je as CodexAppServerStdioTransport, $e as CodexAppServerUnixSocketTransport, zs as CodexSurface, Ai as ConversationContentTransport, Mn as codexItemToMediaPart, An as codexItemToSurfaceMessage, T as codexItemToToolPart, be as codexRuntimePathEntries, Dn as codexThreadToSurfaceMessages, I as codexTurnToSurfaceMessages, Ws as createCodexAppBackend, Bs as createCodexSurface, ye as discoverCodexExecutable, On as preserveHistoricalAttachmentPreviews, Ks as resolveAppleSpeechAnalyzerPath, Se as resolveCodexRuntime, Zs as startAppleSpeechSession, Gs as transcribeWithAppleSpeechAnalyzer, xe as withCodexRuntimePath };
 
 //# sourceMappingURL=index.js.map