@codex-app-sdk/backend 0.16.1 → 0.16.3

package/dist/index.js

@@ -2140,17 +2140,17 @@ function W(e, t, n, r) {
 		parts: s
 	}), G(i, t);
 }
-function er(e, t, n, r) {
-	let i = [...e], a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "media" && e.itemId === r.itemId));
-	a < 0 && r.itemId && (a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "tool" && e.id === r.itemId))), a < 0 && (i = U(i, t, n), a = K(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
-	let o = a >= 0 ? i[a] : void 0;
-	if (!o) return i;
-	let s = [...o.parts], c = s.findIndex((e) => e.type === "media" && e.itemId === r.itemId);
-	return c >= 0 ? s.splice(c, 1, r) : s.push(r), i.splice(a, 1, {
-		...o,
+function er(e, t, n, r, i = r.itemId) {
+	let a = [...e], o = a.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "media" && e.itemId === r.itemId));
+	o < 0 && r.itemId && (o = a.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "tool" && e.id === i))), o < 0 && (a = U(a, t, n), o = K(a, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
+	let s = o >= 0 ? a[o] : void 0;
+	if (!s) return a;
+	let c = [...s.parts], l = c.findIndex((e) => e.type === "media" && e.itemId === r.itemId);
+	return l >= 0 ? c.splice(l, 1, r) : c.push(r), a.splice(o, 1, {
+		...s,
 		status: "streaming",
-		parts: s
-	}), G(i, t);
+		parts: c
+	}), G(a, t);
 }
 function tr(e, t, n, r) {
 	let i = [...e], a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "question" && e.request.id === r.request.id));
@@ -2299,7 +2299,7 @@ function fr(e) {
 }
 function pr(e, t) {
 	let n = /* @__PURE__ */ new Map();
-	for (let t of e) for (let e of t.parts) e.type !== "attachment" || e.attachment.kind !== "image" || !e.attachment.path || Dr(e.attachment.url) && n.set(e.attachment.path, e.attachment.url);
+	for (let t of e) for (let e of t.parts) e.type !== "attachment" || e.attachment.kind !== "image" || !e.attachment.path || Or(e.attachment.url) && n.set(e.attachment.path, e.attachment.url);
 	return n.size === 0 ? [...t] : t.map((e) => {
 		let t = !1, r = e.parts.map((e) => {
 			if (e.type !== "attachment" || e.attachment.kind !== "image" || !e.attachment.path) return e;
@@ -2319,13 +2319,13 @@ function pr(e, t) {
 	});
 }
 function mr(e, t) {
-	let n = [], r = [], i = jr(t.startedAt ?? t.completedAt), a = 0, o = !1, s = /* @__PURE__ */ new Set(), c = () => {
+	let n = [], r = [], i = Mr(t.startedAt ?? t.completedAt), a = 0, o = !1, s = /* @__PURE__ */ new Set(), c = () => {
 		if (r.length === 0) return;
 		let o = a === 0 ? "" : `-segment-${a}`;
 		n.push({
 			id: `assistant-${t.id}${o}`,
 			role: "assistant",
-			status: Ar(t.status),
+			status: jr(t.status),
 			turnId: t.id,
 			parts: [...r],
 			createdAt: i,
@@ -2337,7 +2337,7 @@ function mr(e, t) {
 	};
 	for (let a of Array.isArray(t.items) ? t.items : []) {
 		if (a.type === "userMessage") {
-			let r = vr(a), l = br(a);
+			let r = yr(a), l = xr(a);
 			if (r.length > 0) {
 				let u = o, d = u ? null : JSON.stringify(r);
 				if (d && s.has(d)) continue;
@@ -2354,7 +2354,7 @@ function mr(e, t) {
 						turnId: t.id,
 						...l.length > 0 ? {
 							asyncQuestionRequestIds: l,
-							asyncQuestionAnswers: xr(a)
+							asyncQuestionAnswers: Sr(a)
 						} : {}
 					}
 				});
@@ -2418,15 +2418,15 @@ function mr(e, t) {
 		}
 		let l = L(a);
 		l && (o = !0, r.push(l));
-		let u = _r(a);
-		u && (o = !0, r.push(u));
+		let u = vr(a);
+		u.length && (o = !0, r.push(...u));
 	}
 	return c(), t.status === "inProgress" ? n : ar(n, t.id, t.status);
 }
 function hr(e, t, n) {
-	let r = jr(t.startedAt);
+	let r = Mr(t.startedAt);
 	if (n.type === "userMessage") {
-		let i = vr(n), a = br(n);
+		let i = yr(n), a = xr(n);
 		return i.length > 0 ? {
 			id: n.clientId ?? `user-${e}-${t.id}-${n.id}`,
 			role: "user",
@@ -2440,7 +2440,7 @@ function hr(e, t, n) {
 				itemId: n.id,
 				...a.length > 0 ? {
 					asyncQuestionRequestIds: a,
-					asyncQuestionAnswers: xr(n)
+					asyncQuestionAnswers: Sr(n)
 				} : {}
 			}
 		} : null;
@@ -2455,7 +2455,7 @@ function hr(e, t, n) {
 		return s.length > 0 ? {
 			id: `assistant-${n.id}`,
 			role: "assistant",
-			status: Ar(t.status),
+			status: jr(t.status),
 			turnId: t.id,
 			parts: s,
 			createdAt: r,
@@ -2479,7 +2479,7 @@ function hr(e, t, n) {
 		return i.length > 0 ? {
 			id: `assistant-${n.id}`,
 			role: "assistant",
-			status: Ar(t.status),
+			status: jr(t.status),
 			turnId: t.id,
 			parts: i,
 			createdAt: r,
@@ -2491,13 +2491,11 @@ function hr(e, t, n) {
 		} : null;
 	}
 	let i = [], a = L(n);
-	a && i.push(a);
-	let o = _r(n);
-	o && i.push(o);
-	let s = i.length > 0 ? {
+	a && i.push(a), i.push(...vr(n));
+	let o = i.length > 0 ? {
 		id: `assistant-${n.id}`,
 		role: "assistant",
-		status: Ar(t.status),
+		status: jr(t.status),
 		turnId: t.id,
 		parts: i,
 		createdAt: r,
@@ -2507,7 +2505,7 @@ function hr(e, t, n) {
 			itemId: n.id
 		}
 	} : null;
-	return !s || t.status === "inProgress" ? s : ar([s], t.id, t.status)[0] ?? null;
+	return !o || t.status === "inProgress" ? o : ar([o], t.id, t.status)[0] ?? null;
 }
 function gr(e, t, n, r = !1) {
 	if (n.delivery !== "async") return null;
@@ -2553,7 +2551,7 @@ function gr(e, t, n, r = !1) {
 }
 function _r(e) {
 	if (e.type !== "imageGeneration" || L(e)?.status !== "completed") return null;
-	let t = typeof e.savedPath == "string" && v(e.savedPath) ? e.savedPath : null, n = t ? Tr(t) : void 0, r = n && dr.has(n) ? t : null, i = Er(typeof e.result == "string" ? e.result.trim() : ""), a = i?.url ?? (r ? re(r).href : void 0);
+	let t = typeof e.savedPath == "string" && v(e.savedPath) ? e.savedPath : null, n = t ? Er(t) : void 0, r = n && dr.has(n) ? t : null, i = Dr(typeof e.result == "string" ? e.result.trim() : ""), a = i?.url ?? (r ? re(r).href : void 0);
 	if (!a) return null;
 	let o = typeof e.revisedPrompt == "string" ? e.revisedPrompt.trim() : "";
 	return {
@@ -2569,6 +2567,30 @@ function _r(e) {
 	};
 }
 function vr(e) {
+	let t = _r(e);
+	if (t) return [t];
+	let n = e.type === "mcpToolCall" && e.status === "completed" ? e.result?.content : e.type === "dynamicToolCall" && e.status === "completed" ? e.contentItems : void 0;
+	if (!Array.isArray(n)) return [];
+	let r = [], i = 20 * 1024 * 1024;
+	for (let t of n) {
+		if (!t || typeof t != "object" || Array.isArray(t) || r.length >= 8) continue;
+		let n = t, a = n.type === "image" && typeof n.data == "string" ? n.data : n.type === "inputImage" && typeof n.imageUrl == "string" ? n.imageUrl : "";
+		if (a.length > i) continue;
+		let o = Dr(a);
+		o && (i -= o.url.length, r.push({
+			type: "media",
+			itemId: r.length ? `${e.id}:image:${r.length}` : e.id,
+			media: {
+				url: o.url,
+				mimeType: o.mimeType,
+				alt: "Tool image",
+				title: "Tool image"
+			}
+		}));
+	}
+	return r;
+}
+function yr(e) {
 	let t = Array.isArray(e.content) ? e.content : [], n = t.some((e) => q(e) && e.type === "text" && typeof e.text == "string" && e.text.length > 0), r = [], i = [], a = /* @__PURE__ */ new Set(), o = () => {
 		i.length > 0 && r.push({
 			type: "text",
@@ -2582,7 +2604,7 @@ function vr(e) {
 			if (a.has(t)) continue;
 			a.add(t);
 		}
-		let t = yr(e), s = kt(t);
+		let t = br(e), s = kt(t);
 		if (s) {
 			o(), r.push({
 				type: "attachment",
@@ -2597,7 +2619,7 @@ function vr(e) {
 			i.push(t);
 			continue;
 		}
-		let c = Cr(e);
+		let c = wr(e);
 		c && (o(), r.push({
 			type: "attachment",
 			attachment: c
@@ -2605,20 +2627,20 @@ function vr(e) {
 	}
 	return o(), r;
 }
-function yr(e) {
-	return !q(e) || typeof e.type != "string" ? "" : e.type === "text" && typeof e.text == "string" ? Sr(e.text)?.displayText ?? e.text : e.type === "skill" && typeof e.name == "string" ? `$${e.name}` : "";
-}
 function br(e) {
+	return !q(e) || typeof e.type != "string" ? "" : e.type === "text" && typeof e.text == "string" ? Cr(e.text)?.displayText ?? e.text : e.type === "skill" && typeof e.name == "string" ? `$${e.name}` : "";
+}
+function xr(e) {
 	let t = /* @__PURE__ */ new Set();
-	for (let n of Array.isArray(e.content) ? e.content : []) if (!(!q(n) || n.type !== "text" || typeof n.text != "string")) for (let e of Sr(n.text)?.requestIds ?? []) t.add(e);
+	for (let n of Array.isArray(e.content) ? e.content : []) if (!(!q(n) || n.type !== "text" || typeof n.text != "string")) for (let e of Cr(n.text)?.requestIds ?? []) t.add(e);
 	return [...t];
 }
-function xr(e) {
+function Sr(e) {
 	let t = {};
-	for (let n of Array.isArray(e.content) ? e.content : []) !q(n) || n.type !== "text" || typeof n.text != "string" || Object.assign(t, Sr(n.text)?.answers);
+	for (let n of Array.isArray(e.content) ? e.content : []) !q(n) || n.type !== "text" || typeof n.text != "string" || Object.assign(t, Cr(n.text)?.answers);
 	return t;
 }
-function Sr(e) {
+function Cr(e) {
 	let t = e.match(/^<send_user_message_question_reply>\s*([\s\S]*?)\s*<\/send_user_message_question_reply>$/);
 	if (!t?.[1]) return null;
 	try {
@@ -2642,10 +2664,10 @@ function Sr(e) {
 		return null;
 	}
 }
-function Cr(e) {
+function wr(e) {
 	if (!q(e) || typeof e.type != "string") return null;
 	if (e.type === "mention" && typeof e.path == "string") {
-		let t = typeof e.name == "string" && e.name.trim() ? e.name.trim() : wr(e.path, "File"), n = Tr(e.path);
+		let t = typeof e.name == "string" && e.name.trim() ? e.name.trim() : Tr(e.path, "File"), n = Er(e.path);
 		return {
 			kind: "file",
 			name: t,
@@ -2654,26 +2676,26 @@ function Cr(e) {
 		};
 	}
 	if (e.type === "image" && typeof e.url == "string") {
-		let t = Tr(e.url);
+		let t = Er(e.url);
 		return {
 			kind: "image",
-			name: wr(e.url, "Image"),
+			name: Tr(e.url, "Image"),
 			url: e.url,
 			...t ? { mimeType: t } : {}
 		};
 	}
 	if (e.type === "localImage" && typeof e.path == "string") {
-		let t = Tr(e.path);
+		let t = Er(e.path);
 		return {
 			kind: "image",
-			name: wr(e.path, "Image"),
+			name: Tr(e.path, "Image"),
 			path: e.path,
 			...t ? { mimeType: t } : {}
 		};
 	}
 	return null;
 }
-function wr(e, t) {
+function Tr(e, t) {
 	try {
 		let n = /^[a-z][a-z\d+.-]*:/i.test(e) ? new URL(e).pathname : e;
 		return g(decodeURIComponent(n)).trim() || t;
@@ -2681,7 +2703,7 @@ function wr(e, t) {
 		return g(e).trim() || t;
 	}
 }
-function Tr(e) {
+function Er(e) {
 	let t = /^data:([^;,]+)/i.exec(e)?.[1]?.toLowerCase();
 	if (t) return t;
 	let n = "";
@@ -2703,23 +2725,23 @@ function Tr(e) {
 		webp: "image/webp"
 	}[n];
 }
-function Er(e) {
+function Dr(e) {
 	if (!e) return null;
 	let t = (/^data:image\/[a-z0-9.+-]+;base64,([a-z0-9+/=\s]+)$/i.exec(e)?.[1] ?? e).replace(/\s+/g, ""), n = Math.ceil(ur / 3) * 4 + 4;
 	if (!t || t.length > n || t.length % 4 != 0 || !/^[a-z0-9+/]+={0,2}$/i.test(t)) return null;
 	let r = Buffer.from(t, "base64");
 	if (r.byteLength === 0 || r.byteLength > ur) return null;
-	let i = Or(r);
+	let i = kr(r);
 	return i ? {
 		url: `data:${i};base64,${t}`,
 		mimeType: i
 	} : null;
 }
-function Dr(e) {
+function Or(e) {
 	return !!(e && e.length <= 16 * 1024 * 1024 && /^data:image\/(?:avif|bmp|gif|heic|heif|jpe?g|png|webp);base64,[a-z\d+/]+={0,2}$/i.test(e));
 }
-function Or(e) {
-	if (kr(e, [
+function kr(e) {
+	if (Ar(e, [
 		137,
 		80,
 		78,
@@ -2729,7 +2751,7 @@ function Or(e) {
 		26,
 		10
 	])) return "image/png";
-	if (kr(e, [
+	if (Ar(e, [
 		255,
 		216,
 		255
@@ -2737,13 +2759,13 @@ function Or(e) {
 	let t = Buffer.from(e.subarray(0, 12)).toString("ascii");
 	return t.startsWith("GIF87a") || t.startsWith("GIF89a") ? "image/gif" : t.startsWith("RIFF") && t.slice(8, 12) === "WEBP" ? "image/webp" : e.byteLength >= 12 && t.slice(4, 12) === "ftypavif" ? "image/avif" : null;
 }
-function kr(e, t) {
+function Ar(e, t) {
 	return t.every((t, n) => e[n] === t);
 }
-function Ar(e) {
+function jr(e) {
 	return e === "inProgress" ? "streaming" : e === "failed" ? "error" : "complete";
 }
-function jr(e) {
+function Mr(e) {
 	return typeof e != "number" || !Number.isFinite(e) ? (/* @__PURE__ */ new Date(0)).toISOString() : (/* @__PURE__ */ new Date(e * 1e3)).toISOString();
 }
 function q(e) {
@@ -2751,19 +2773,19 @@ function q(e) {
 }
 //#endregion
 //#region src/node/codex-raw-response-item-adapter.ts
-function Mr(e) {
-	if (!Vr(e) || typeof e.type != "string") return null;
+function Nr(e) {
+	if (!Hr(e) || typeof e.type != "string") return null;
 	if (e.type === "local_shell_call") {
-		let t = L(Nr(e));
+		let t = L(Pr(e));
 		return {
-			type: Lr(e.status) ? "item.completed" : "item.started",
+			type: Rr(e.status) ? "item.completed" : "item.started",
 			payload: { toolPart: t }
 		};
 	}
 	return e.type === "function_call" ? {
 		type: "item.started",
-		payload: { toolPart: L(Pr(e)) }
-	} : e.type === "function_call_output" ? Fr(e.call_id, e.output) : e.type === "custom_tool_call" ? {
+		payload: { toolPart: L(Fr(e)) }
+	} : e.type === "function_call_output" ? Ir(e.call_id, e.output) : e.type === "custom_tool_call" ? {
 		type: "item.started",
 		payload: { toolPart: L({
 			type: "dynamicToolCall",
@@ -2776,7 +2798,7 @@ function Mr(e) {
 			success: null,
 			durationMs: null
 		}) }
-	} : e.type === "custom_tool_call_output" ? Fr(e.call_id, e.output, Y(e.name) ?? void 0) : e.type === "tool_search_call" ? {
+	} : e.type === "custom_tool_call_output" ? Ir(e.call_id, e.output, Y(e.name) ?? void 0) : e.type === "tool_search_call" ? {
 		type: "item.started",
 		payload: { toolPart: L({
 			type: "dynamicToolCall",
@@ -2798,7 +2820,7 @@ function Mr(e) {
 		payload: { toolPart: L({
 			type: "webSearch",
 			id: J(e),
-			query: zr(e.action),
+			query: Br(e.action),
 			action: e.action
 		}) }
 	} : e.type === "image_generation_call" ? {
@@ -2816,8 +2838,8 @@ function Mr(e) {
 		}) }
 	} : null;
 }
-function Nr(e) {
-	let t = Vr(e.action) ? e.action : {}, n = Array.isArray(t.command) ? Br(t.command) : Y(t.command) ?? "local shell";
+function Pr(e) {
+	let t = Hr(e.action) ? e.action : {}, n = Array.isArray(t.command) ? Vr(t.command) : Y(t.command) ?? "local shell";
 	return {
 		type: "commandExecution",
 		id: Y(e.call_id) ?? J(e),
@@ -2825,16 +2847,16 @@ function Nr(e) {
 		cwd: Y(t.working_directory) ?? "",
 		processId: null,
 		source: "agent",
-		status: Ir(e.status),
+		status: Lr(e.status),
 		commandActions: [],
 		aggregatedOutput: null,
 		exitCode: null,
 		durationMs: null
 	};
 }
-function Pr(e) {
-	let t = Y(e.name) ?? "function_call", n = Rr(e.arguments), r = Y(e.call_id) ?? J(e);
-	return t === "shell_command" && Vr(n) ? {
+function Fr(e) {
+	let t = Y(e.name) ?? "function_call", n = zr(e.arguments), r = Y(e.call_id) ?? J(e);
+	return t === "shell_command" && Hr(n) ? {
 		type: "commandExecution",
 		id: r,
 		command: Y(n.command) ?? t,
@@ -2858,19 +2880,19 @@ function Pr(e) {
 		durationMs: null
 	};
 }
-function Fr(e, t, n) {
+function Ir(e, t, n) {
 	return {
 		type: "item.updated",
 		payload: xn(Y(e) ?? "raw-response-output", t, n)
 	};
 }
-function Ir(e) {
+function Lr(e) {
 	return e === "completed" ? "completed" : e === "incomplete" || e === "failed" || e === "error" ? "failed" : "inProgress";
 }
-function Lr(e) {
+function Rr(e) {
 	return e === "completed" || e === "failed" || e === "error" || e === "incomplete";
 }
-function Rr(e) {
+function zr(e) {
 	if (typeof e != "string") return e;
 	try {
 		return JSON.parse(e);
@@ -2878,10 +2900,10 @@ function Rr(e) {
 		return e;
 	}
 }
-function zr(e) {
-	return Vr(e) ? Y(e.query) ?? Y(e.searchTerm) ?? "web search" : "web search";
-}
 function Br(e) {
+	return Hr(e) ? Y(e.query) ?? Y(e.searchTerm) ?? "web search" : "web search";
+}
+function Vr(e) {
 	return e.map((e) => {
 		let t = String(e);
 		return /\s/.test(t) ? JSON.stringify(t) : t;
@@ -2893,21 +2915,21 @@ function J(e) {
 function Y(e) {
 	return typeof e == "string" && e.length > 0 ? e : null;
 }
-function Vr(e) {
+function Hr(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
 //#endregion
 //#region src/node/codex-surface-events.ts
-function Hr(e, t) {
+function Ur(e, t) {
 	return `${e}\u0000${t}`;
 }
 function X(e) {
 	return typeof e == "number" && Number.isFinite(e) ? (/* @__PURE__ */ new Date(e * 1e3)).toISOString() : (/* @__PURE__ */ new Date()).toISOString();
 }
-function Ur(e) {
+function Wr(e) {
 	return typeof e == "number" && Number.isFinite(e) ? (/* @__PURE__ */ new Date(e * 1e3)).toISOString() : null;
 }
-function Wr(e) {
+function Gr(e) {
 	return e ? {
 		message: e.message,
 		additionalDetails: e.additionalDetails,
@@ -2918,10 +2940,10 @@ function Z(e, t = !1) {
 	return {
 		id: e.id,
 		status: e.status,
-		error: Wr(e.error),
+		error: Gr(e.error),
 		willRetry: t,
-		startedAt: Ur(e.startedAt),
-		completedAt: Ur(e.completedAt),
+		startedAt: Wr(e.startedAt),
+		completedAt: Wr(e.completedAt),
 		durationMs: e.durationMs ?? null
 	};
 }
@@ -2931,18 +2953,18 @@ function Q(e, t) {
 	let r = [...e];
 	return r.splice(n, 1, t), r;
 }
-function Gr(e, t) {
+function Kr(e, t) {
 	return JSON.stringify(e) === JSON.stringify(t);
 }
-function Kr() {
+function qr() {
 	return `user-${globalThis.crypto.randomUUID()}`;
 }
-function qr() {
+function Jr() {
 	return `queued-prompt-${globalThis.crypto.randomUUID()}`;
 }
 //#endregion
 //#region src/node/codex-surface-subagents.ts
-function Jr(e) {
+function Yr(e) {
 	let t = {};
 	for (let [n, r] of Object.entries(e.agentsStates)) r && (t[n] = {
 		status: r.status,
@@ -2962,7 +2984,7 @@ function Jr(e) {
 }
 //#endregion
 //#region src/node/codex-surface-items-controller.ts
-var Yr = class {
+var Xr = class {
 	host;
 	commandOutputForwardItemIds = /* @__PURE__ */ new Set();
 	fileActivityKeys = /* @__PURE__ */ new Set();
@@ -2980,7 +3002,7 @@ var Yr = class {
 		for (let e of this.reviewOutputByTurn.keys()) e.startsWith(t) && this.reviewOutputByTurn.delete(e);
 	}
 	isForwardingCommandOutput(e, t) {
-		return this.commandOutputForwardItemIds.has(Hr(e, t));
+		return this.commandOutputForwardItemIds.has(Ur(e, t));
 	}
 	applyAgentDelta(e) {
 		let t = this.host.requireRuntime(e.threadId);
@@ -3043,7 +3065,7 @@ var Yr = class {
 	applyRawResponseItem(e) {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
-		let n = Mr(e.item);
+		let n = Nr(e.item);
 		if (!n) return;
 		if (n.type === "item.updated") {
 			this.applyToolUpdate(e.threadId, e.turnId, n.payload);
@@ -3144,7 +3166,7 @@ var Yr = 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 = Hr(e.threadId, e.turnId);
+			let i = Ur(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" ? gr(e.threadId, e.turnId, e.item) : null, d = u ? "" : t, f = u ? Qn(n.messages, e.threadId, e.turnId, e.item.id) : Zn(n.messages, e.threadId, e.turnId, e.item.id, t, r);
@@ -3230,7 +3252,7 @@ var Yr = class {
 				turnId: e.turnId,
 				payload: {
 					lifecycle: t ? "completed" : "started",
-					toolCall: Jr(e.item)
+					toolCall: Yr(e.item)
 				}
 			});
 			return;
@@ -3255,10 +3277,11 @@ var Yr = class {
 		let a = this.shouldForwardCommandOutput(e.threadId, t, e.item), o = L(e.item, {
 			includeCommandOutput: a,
 			cwd: n.cwd
-		}), s = _r(e.item);
-		if (!o && !s) return;
-		let c = s ? !n.messages.some((e) => e.parts.some((e) => e.type === "media" && nr(e, s))) : !1, l = o ? W(n.messages, e.threadId, e.turnId, o) : [...n.messages];
-		s && (l = er(l, e.threadId, e.turnId, s)), this.host.patchRuntime(e.threadId, { messages: l });
+		}), s = vr(e.item);
+		if (!o && !s.length) return;
+		let c = s.some((e) => !n.messages.some((t) => t.parts.some((t) => t.type === "media" && nr(t, e)))), l = o ? W(n.messages, e.threadId, e.turnId, o) : [...n.messages];
+		for (let t of s) l = er(l, e.threadId, e.turnId, t, e.item.id);
+		this.host.patchRuntime(e.threadId, { messages: l });
 		let u = o ? this.host.messageContainingTool(e.threadId, e.turnId, o.id) : this.host.assistantMessageForTurn(e.threadId, e.turnId);
 		u && o && this.host.emitEvent("notification", {
 			type: t ? "tool.completed" : "tool.started",
@@ -3268,7 +3291,7 @@ var Yr = class {
 				messageId: u.id,
 				toolPart: structuredClone(o)
 			}
-		}), u && o && this.emitFileActivities(e.threadId, e.turnId, u.id, o.id, o, n.cwd), u && s && c && this.host.emitEvent("notification", {
+		}), u && o && this.emitFileActivities(e.threadId, e.turnId, u.id, o.id, o, n.cwd), u && c && this.host.emitEvent("notification", {
 			type: "message.updated",
 			conversationId: e.threadId,
 			turnId: e.turnId,
@@ -3278,7 +3301,7 @@ var Yr = class {
 	shouldForwardCommandOutput(e, t, n) {
 		let r = "id" in n && typeof n.id == "string" ? n.id : null;
 		if (!r) return !1;
-		let i = Hr(e, r);
+		let i = Ur(e, r);
 		if (!t) {
 			let e = _n(n);
 			return e ? this.commandOutputForwardItemIds.add(i) : this.commandOutputForwardItemIds.delete(i), e;
@@ -3289,7 +3312,7 @@ var Yr = class {
 	applyToolUpdate(e, t, n) {
 		let r = this.host.requireRuntime(e);
 		this.host.markRuntimeTurnActive(r, t);
-		let i = r.cwd && Xr(n) ? {
+		let i = r.cwd && Zr(n) ? {
 			...n,
 			metadata: {
 				...n.metadata,
@@ -3358,26 +3381,26 @@ var Yr = class {
 			turnId: e.turn.id,
 			payload: {
 				status: e.turn.status,
-				error: Wr(e.turn.error),
+				error: Gr(e.turn.error),
 				willRetry: !1,
-				startedAt: Ur(e.turn.startedAt),
-				completedAt: Ur(e.turn.completedAt),
+				startedAt: Wr(e.turn.startedAt),
+				completedAt: Wr(e.turn.completedAt),
 				durationMs: e.turn.durationMs ?? null
 			}
 		}), this.host.emitConversationActivity(e.threadId, "notification"), t.planMarkdownByTurn.delete(e.turn.id), this.host.sendNextQueuedPrompt(e.threadId);
 	}
 };
-function Xr(e) {
+function Zr(e) {
 	if (e.fallbackToolPart?.kind === "fileChange") return !0;
 	let t = e.input, n = e.metadata;
-	return Zr(t) && Array.isArray(t.changes) || Zr(n) && Array.isArray(n.changes);
+	return Qr(t) && Array.isArray(t.changes) || Qr(n) && Array.isArray(n.changes);
 }
-function Zr(e) {
+function Qr(e) {
 	return typeof e == "object" && !!e;
 }
 //#endregion
 //#region src/node/codex-surface-client-requests-controller.ts
-var Qr = class {
+var $r = class {
 	host;
 	pending = /* @__PURE__ */ new Map();
 	constructor(e) {
@@ -3659,8 +3682,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;
 	}
-}, $r = 256 * 1024;
-function ei(e) {
+}, ei = 256 * 1024;
+function ti(e) {
 	return {
 		id: e.id,
 		model: e.model,
@@ -3685,11 +3708,11 @@ function ei(e) {
 		}
 	};
 }
-async function ti(e, t) {
-	return Promise.all(e.filter((e) => e.enabled).map((e) => ni(e, t)));
-}
 async function ni(e, t) {
-	let n = $(e.interface?.brandColor), r = ci(e.interface?.defaultPrompt), [i, a] = await Promise.all([e.interface?.iconSmall ? t(e.interface.iconSmall) : void 0, e.interface?.iconLarge ? t(e.interface.iconLarge) : void 0]);
+	return Promise.all(e.filter((e) => e.enabled).map((e) => ri(e, t)));
+}
+async function ri(e, t) {
+	let n = $(e.interface?.brandColor), r = li(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,
@@ -3704,8 +3727,8 @@ async function ni(e, t) {
 		enabled: e.enabled
 	};
 }
-async function ri(e, t) {
-	let n = e.interface, r = ai(n?.composerIconUrl), i = ai(n?.logoUrl), a = ai(n?.logoUrlDark), o = $(n?.displayName) ?? e.name, s = $(n?.shortDescription), c = $(n?.longDescription), l = $(n?.brandColor), u = r ?? i ?? await ii([n?.composerIcon, n?.logo], t), d = r ?? a ?? i ?? await ii([
+async function ii(e, t) {
+	let n = e.interface, r = oi(n?.composerIconUrl), i = oi(n?.logoUrl), a = oi(n?.logoUrlDark), o = $(n?.displayName) ?? e.name, s = $(n?.shortDescription), c = $(n?.longDescription), l = $(n?.brandColor), u = r ?? i ?? await ai([n?.composerIcon, n?.logo], t), d = r ?? a ?? i ?? await ai([
 		n?.composerIcon,
 		n?.logoDark,
 		n?.logo
@@ -3722,20 +3745,20 @@ async function ri(e, t) {
 		enabled: e.enabled
 	};
 }
-async function ii(e, t) {
+async function ai(e, t) {
 	for (let n of e) {
 		if (!n) continue;
 		let e = await t(n);
 		if (e) return e;
 	}
 }
-function ai(e) {
+function oi(e) {
 	let t = $(e);
 	try {
 		return new URL(t).protocol === "https:" ? t : void 0;
 	} catch {}
 }
-function oi(e) {
+function si(e) {
 	switch (_(e).toLowerCase()) {
 		case ".avif": return "image/avif";
 		case ".bmp": return "image/bmp";
@@ -3748,23 +3771,23 @@ function oi(e) {
 		case ".webp": return "image/webp";
 	}
 }
-function si(e, t) {
+function ci(e, t) {
 	let n = t.trim();
 	if (!/^[a-z\d+/]+={0,2}$/i.test(n)) return;
 	let r = n.replace(/=+$/, "");
 	if (r.length % 4 == 1) return;
 	let i = n.length - r.length, a = (4 - r.length % 4) % 4;
-	if (!(i !== 0 && i !== a) && !(Math.floor(r.length * 3 / 4) > $r)) return `data:${e};base64,${`${r}${"=".repeat((4 - r.length % 4) % 4)}`}`;
+	if (!(i !== 0 && i !== a) && !(Math.floor(r.length * 3 / 4) > ei)) return `data:${e};base64,${`${r}${"=".repeat((4 - r.length % 4) % 4)}`}`;
 }
 function $(e) {
 	return (typeof e == "string" ? e.trim() : void 0) || void 0;
 }
-function ci(e) {
+function li(e) {
 	return typeof e == "string" ? e : void 0;
 }
 //#endregion
 //#region src/node/codex-surface-catalog-controller.ts
-var li = class {
+var ui = class {
 	client;
 	cwd;
 	host;
@@ -3799,7 +3822,7 @@ var li = 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 ti((await this.client.request("skills/list", {
+			let n = await ni((await this.client.request("skills/list", {
 				...this.cwd ? { cwds: [this.cwd] } : {},
 				forceReload: e
 			})).data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e));
@@ -3816,7 +3839,7 @@ var li = class {
 	}
 	async listSkills(e = {}) {
 		await this.host.ensureConnected(), e.forceReload && this.iconDataUrls.clear();
-		let t = await ti((await this.client.request("skills/list", {
+		let t = await ni((await this.client.request("skills/list", {
 			...e.cwd ? { cwds: [e.cwd] } : {},
 			forceReload: e.forceReload ?? !1
 		})).data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e));
@@ -3870,7 +3893,7 @@ var li = class {
 		}), (async () => ({
 			profiles: await this.requestPermissionProfiles(e),
 			requirements: (await this.client.request("configRequirements/read", void 0)).requirements
-		}))()]), a = r.status === "fulfilled" ? await ti(r.value.data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e)) : [], o = i.status === "fulfilled" ? i.value.profiles : [];
+		}))()]), a = r.status === "fulfilled" ? await ni(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",
@@ -3902,7 +3925,7 @@ var li = class {
 				cursor: n,
 				includeHidden: e
 			});
-			t.push(...r.data.map(ei)), n = r.nextCursor;
+			t.push(...r.data.map(ti)), n = r.nextCursor;
 		} while (n);
 		return t;
 	}
@@ -3972,7 +3995,7 @@ var li = 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 = Ht(this.host.getState().plugins, await Promise.all([...n.values()].map((e) => ri(e, (e) => this.iconDataUrl(e)))));
+			let r = Ht(this.host.getState().plugins, await Promise.all([...n.values()].map((e) => ii(e, (e) => this.iconDataUrl(e)))));
 			if (this.host.isClosed() || this.host.authenticationBlocksBootstrap()) return;
 			this.host.patch({
 				plugins: r,
@@ -4003,9 +4026,9 @@ var li = class {
 	}
 	async readIconDataUrl(e) {
 		if (!v(e)) return;
-		let t = oi(e);
+		let t = si(e);
 		if (t) try {
-			return si(t, (await this.client.request("fs/readFile", { path: e })).dataBase64);
+			return ci(t, (await this.client.request("fs/readFile", { path: e })).dataBase64);
 		} catch {
 			return;
 		}
@@ -4013,18 +4036,18 @@ var li = class {
 };
 //#endregion
 //#region src/node/codex-approvals.ts
-function ui(e, t) {
+function di(e, t) {
 	let n = [
 		e.onServerRequest("item/commandExecution/requestApproval", (e, n) => (t({
-			approval: di(e.id, e.params),
-			resolve: (t, r) => n.resolve({ decision: mi(e.params, t, r) })
+			approval: fi(e.id, e.params),
+			resolve: (t, r) => n.resolve({ decision: hi(e.params, t, r) })
 		}), !0)),
 		e.onServerRequest("item/fileChange/requestApproval", (e, n) => (t({
-			approval: fi(e.id, e.params),
+			approval: pi(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: pi(e.id, e.params),
+			approval: mi(e.id, e.params),
 			resolve: (t, r) => n.resolve({
 				permissions: t === "deny" ? {} : {
 					...e.params.permissions.fileSystem ? { fileSystem: e.params.permissions.fileSystem } : {},
@@ -4062,8 +4085,8 @@ function ui(e, t) {
 		for (let e of n) e();
 	};
 }
-function di(e, t) {
-	let n = t.availableDecisions, r = hi(t.additionalPermissions), i = [...t.networkApprovalContext ? [{
+function fi(e, t) {
+	let n = t.availableDecisions, r = gi(t.additionalPermissions), i = [...t.networkApprovalContext ? [{
 		kind: "network",
 		enabled: !0,
 		host: t.networkApprovalContext.host,
@@ -4086,7 +4109,7 @@ function di(e, t) {
 		} : {}
 	};
 }
-function fi(e, t) {
+function pi(e, t) {
 	return {
 		id: String(e),
 		kind: "file-change",
@@ -4097,8 +4120,8 @@ function fi(e, t) {
 		...t.reason || t.grantRoot ? { description: t.reason ?? `Write under ${t.grantRoot}` } : {}
 	};
 }
-function pi(e, t) {
-	let n = hi(t.permissions);
+function mi(e, t) {
+	let n = gi(t.permissions);
 	return {
 		id: String(e),
 		kind: "permissions",
@@ -4111,13 +4134,13 @@ function pi(e, t) {
 		...n.length ? { requestedPermissions: n } : {}
 	};
 }
-function mi(e, t, n) {
+function hi(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 hi(e) {
+function gi(e) {
 	if (!e) return [];
 	let t = [];
 	if (e.network && t.push({
@@ -4137,12 +4160,12 @@ function hi(e) {
 		for (let n of e.fileSystem.entries ?? []) t.push({
 			kind: "filesystem",
 			access: n.access,
-			path: gi(n.path)
+			path: _i(n.path)
 		});
 	}
 	return t;
 }
-function gi(e) {
+function _i(e) {
 	if (e.type === "path") return e.path;
 	if (e.type === "glob_pattern") return e.pattern;
 	let t = e.value;
@@ -4157,12 +4180,12 @@ function gi(e) {
 }
 //#endregion
 //#region src/node/codex-surface-approvals-controller.ts
-var _i = class {
+var vi = class {
 	host;
 	pending = /* @__PURE__ */ new Map();
 	unsubscribeHandler;
 	constructor(e, t) {
-		this.host = t, this.unsubscribeHandler = ui(e, (e) => this.add(e));
+		this.host = t, this.unsubscribeHandler = di(e, (e) => this.add(e));
 	}
 	close() {
 		this.unsubscribeHandler(), this.pending.clear();
@@ -4243,7 +4266,7 @@ var _i = class {
 };
 //#endregion
 //#region src/node/codex-surface-mcp.ts
-function vi(e) {
+function yi(e) {
 	if (!Array.isArray(e)) throw TypeError("Codex MCP servers must be an array");
 	let t = /* @__PURE__ */ new Set();
 	return e.map((e, n) => {
@@ -4252,10 +4275,10 @@ function vi(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 = yi(e.transport, r), a = e.toolApprovalMode;
+		let i = bi(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 : bi(e.enabledTools, `Codex MCP server '${r}' enabled tool`), s = Si(e.startupTimeoutMs, `Codex MCP server '${r}' startup timeout`), c = Si(e.toolTimeoutMs, `Codex MCP server '${r}' tool timeout`);
+		let o = e.enabledTools === void 0 ? void 0 : xi(e.enabledTools, `Codex MCP server '${r}' enabled tool`), s = Ci(e.startupTimeoutMs, `Codex MCP server '${r}' startup timeout`), c = Ci(e.toolTimeoutMs, `Codex MCP server '${r}' tool timeout`);
 		return {
 			name: r,
 			transport: i,
@@ -4267,7 +4290,7 @@ function vi(e) {
 		};
 	});
 }
-function yi(e, t) {
+function bi(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;
@@ -4285,7 +4308,7 @@ function yi(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 : bi(e.args, `Codex MCP server '${t}' argument`), i = e.cwd?.trim();
+	let r = e.args === void 0 ? void 0 : xi(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) {
@@ -4296,7 +4319,7 @@ function yi(e, t) {
 			a[n] = r;
 		}
 	}
-	let o = e.envVars === void 0 ? void 0 : xi(e.envVars, t);
+	let o = e.envVars === void 0 ? void 0 : Si(e.envVars, t);
 	return {
 		type: "stdio",
 		command: n,
@@ -4306,7 +4329,7 @@ function yi(e, t) {
 		...o === void 0 ? {} : { envVars: o }
 	};
 }
-function bi(e, t) {
+function xi(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`);
@@ -4314,18 +4337,18 @@ function bi(e, t) {
 	});
 	return [...new Set(n)];
 }
-function xi(e, t) {
-	let n = bi(e, `Codex MCP server '${t}' environment variable`);
+function Si(e, t) {
+	let n = xi(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 Si(e, t) {
+function Ci(e, t) {
 	if (e !== void 0) {
 		if (!Number.isFinite(e) || e <= 0) throw TypeError(`${t} must be a positive finite number`);
 		return e;
 	}
 }
-function Ci(e) {
+function wi(e) {
 	let t = {};
 	for (let n of e) {
 		let e = n.transport.type === "http" ? { url: n.transport.url } : {
@@ -4339,7 +4362,7 @@ function Ci(e) {
 	}
 	return t;
 }
-function wi(e, t) {
+function Ti(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) {
@@ -4350,13 +4373,13 @@ function wi(e, t) {
 }
 //#endregion
 //#region src/node/codex-surface-extensions-controller.ts
-var Ti = class {
+var Ei = class {
 	extensions;
 	hostOptionsForThread;
 	dynamicTools = /* @__PURE__ */ new Map();
 	defaultMcpServers;
 	constructor(e, t, n) {
-		this.extensions = e, this.hostOptionsForThread = n, this.defaultMcpServers = vi(t);
+		this.extensions = e, this.hostOptionsForThread = n, this.defaultMcpServers = yi(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");
@@ -4380,13 +4403,13 @@ var Ti = class {
 		}));
 	}
 	async conversationExtension(e, t = {}, n = this.defaultMcpServers) {
-		let r = Ci(n), i = [], a;
+		let r = wi(n), i = [], a;
 		for (let t of this.extensions) {
 			if (!t.configureConversation) continue;
 			let o = await t.configureConversation(e);
-			o.config && (wi(o.config, n), Object.assign(r, o.config)), o.baseInstructions !== void 0 && (a = o.baseInstructions), o.developerInstructions?.trim() && i.push(o.developerInstructions.trim());
+			o.config && (Ti(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 && (wi(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 && (Ti(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") }
@@ -4445,7 +4468,7 @@ var Ti = class {
 			});
 		}
 	}
-}, Ei = 50, Di = 25, Oi = 25, ki = class {
+}, Di = 50, Oi = 25, ki = 25, Ai = class {
 	client;
 	conversationLimit;
 	host;
@@ -4514,7 +4537,7 @@ var Ti = class {
 					let t = await this.client.request("thread/turns/list", {
 						threadId: e,
 						cursor: null,
-						limit: Ei,
+						limit: Di,
 						sortDirection: "desc",
 						itemsView: "full"
 					});
@@ -4562,7 +4585,7 @@ var Ti = class {
 					let i = new Set(this.host.requireRuntime(e).turnIds), a = await this.client.request("thread/turns/list", {
 						threadId: e,
 						cursor: t,
-						limit: Di,
+						limit: Oi,
 						sortDirection: "desc",
 						itemsView: "full"
 					}), o = [...a.data].reverse(), s = new Set(o.map((e) => e.id).filter((e) => !i.has(e)));
@@ -4593,8 +4616,8 @@ var Ti = class {
 	}
 	async emitHistoryChunks(e, t) {
 		for (let n = t.length; n > 0;) {
-			let r = Math.max(0, n - Oi);
-			this.host.emitHistoryPrepended(e, t.slice(r, n), "lifecycle"), await Ai(), n = r;
+			let r = Math.max(0, n - ki);
+			this.host.emitHistoryPrepended(e, t.slice(r, n), "lifecycle"), await ji(), n = r;
 		}
 	}
 	async refreshCompleteHistory(e) {
@@ -4657,12 +4680,12 @@ var Ti = class {
 		} : t;
 	}
 };
-function Ai() {
+function ji() {
 	return new Promise((e) => setTimeout(e, 0));
 }
 //#endregion
 //#region src/node/codex-surface-conversation-settings-controller.ts
-var ji = class {
+var Mi = class {
 	client;
 	defaults;
 	host;
@@ -4735,7 +4758,7 @@ var ji = class {
 			...n === void 0 ? {} : { tokenBudget: n }
 		});
 		if (a.goal.threadId !== e) throw Error(`Codex thread/goal/set returned a goal for '${a.goal.threadId}' instead of '${e}'`);
-		let o = !Gr(r.goal, a.goal);
+		let o = !Kr(r.goal, a.goal);
 		this.host.patchRuntime(e, { goal: { ...a.goal } }), o && this.host.emitEvent("action", {
 			type: "conversation.goalChanged",
 			conversationId: e,
@@ -4757,7 +4780,7 @@ var ji = class {
 			payload: { goal: null }
 		});
 	}
-}, Mi = "Review the current code changes (staged, unstaged, and untracked files) and provide prioritized findings.", Ni = class {
+}, Ni = "Review the current code changes (staged, unstaged, and untracked files) and provide prioritized findings.", Pi = class {
 	client;
 	host;
 	constructor(e, t) {
@@ -4798,13 +4821,13 @@ var ji = class {
 				...e,
 				parts: r.type === "uncommittedChanges" ? e.parts.map((e) => e.type === "text" && e.text === "current changes" ? {
 					...e,
-					text: Mi
+					text: Ni
 				} : e) : e.parts,
 				metadata: {
 					...e.metadata,
 					reviewPrompt: !0
 				}
-			} : e), s = Pi(n.messages, i.turn.id, o);
+			} : e), s = Fi(n.messages, i.turn.id, o);
 			this.host.patchRuntime(e, {
 				busy: n.activeTurnId !== null,
 				turnStartPending: !1,
@@ -4933,7 +4956,7 @@ var ji = class {
 		return e;
 	}
 };
-function Pi(e, t, n) {
+function Fi(e, t, n) {
 	let r = e.findIndex((e) => e.turnId === t);
 	return r < 0 ? [...e, ...n] : [
 		...e.slice(0, r),
@@ -4943,7 +4966,7 @@ function Pi(e, t, n) {
 }
 //#endregion
 //#region src/node/codex-surface-messages-controller.ts
-var Fi = class {
+var Ii = class {
 	client;
 	host;
 	constructor(e, t) {
@@ -5050,13 +5073,13 @@ var Fi = class {
 		let i = this.host.requireRuntime(e), a = Ut(this.host.snapshotForRuntime(i), n), o = r?.trim() || t, s = it(nt(t, i.skills), rt(a.skills ?? [], i.skills)), c = Wt(a.attachments ?? []);
 		if (i.busy) {
 			this.host.patchRuntime(e, { queuedPrompts: [...i.queuedPrompts, {
-				id: qr(),
+				id: Jr(),
 				text: o,
 				...Object.keys(a).length > 0 ? { options: a } : {}
 			}] }), this.emitQueuedPrompts(e);
 			return;
 		}
-		let l = Kr(), u = {
+		let l = qr(), u = {
 			id: l,
 			role: "user",
 			status: "complete",
@@ -5143,7 +5166,7 @@ var Fi = class {
 		let i = await this.host.ensureThreadReady(e), a = t.trim(), o = r?.trim() || a;
 		if (!a) throw Error("Cannot steer with an empty message");
 		if (!i.activeTurnId) throw Error("There is no active turn to steer");
-		let s = Wt(n.attachments ?? []), c = Kr(), l = {
+		let s = Wt(n.attachments ?? []), c = qr(), l = {
 			id: c,
 			kind: "steer",
 			role: "user",
@@ -5275,7 +5298,7 @@ var Fi = class {
 		if (!e) throw Error("There is no active conversation");
 		return e;
 	}
-}, Ii = 5, Li = class {
+}, Li = 5, Ri = class {
 	client;
 	options;
 	catalog;
@@ -5315,7 +5338,7 @@ var Fi = class {
 			...a ? { approvalPreset: a } : {}
 		}, r.approvalPresets), s = k(i.models, i.selectedModelId), c = e.model ? At(i.models, e.model) : s, l = c?.model, u = e.reasoningEffort ?? (c?.id === s?.id ? i.selectedReasoningEffort : c ? A(c) : null) ?? void 0, d = e.serviceTier === void 0 ? c?.id === s?.id ? i.selectedServiceTier ?? null : c?.defaultServiceTier ?? null : e.serviceTier;
 		jt(c, u), j(c, d);
-		let f = t.mcpServers === void 0 ? this.extensions.defaultMcpServers : vi(t.mcpServers), p = await this.extensions.conversationExtension({
+		let f = t.mcpServers === void 0 ? this.extensions.defaultMcpServers : yi(t.mcpServers), p = await this.extensions.conversationExtension({
 			operation: "start",
 			conversationId: null,
 			cwd: n,
@@ -5332,7 +5355,9 @@ var Fi = class {
 			...d === void 0 ? {} : { serviceTier: d },
 			...e.threadSource === void 0 ? {} : { threadSource: e.threadSource },
 			serviceName: "codex_app_sdk"
-		}), h = Lt(m, i.models, i);
+		});
+		this.host.observeEmptyConversation(m.thread.id);
+		let h = Lt(m, i.models, i);
 		u && (await this.client.request("thread/settings/update", {
 			threadId: m.thread.id,
 			effort: u,
@@ -5430,7 +5455,7 @@ var Fi = class {
 			...n
 		}, a = {
 			...i,
-			mcpServers: i.mcpServers === void 0 ? this.extensions.defaultMcpServers : vi(i.mcpServers)
+			mcpServers: i.mcpServers === void 0 ? this.extensions.defaultMcpServers : yi(i.mcpServers)
 		};
 		this.hostOptionsByThread.set(e, a);
 		let o = await this.extensions.conversationExtension({
@@ -5448,7 +5473,7 @@ var Fi = class {
 				threadId: e,
 				excludeTurns: !0,
 				initialTurnsPage: {
-					limit: Ii,
+					limit: Li,
 					sortDirection: "desc",
 					itemsView: "full"
 				},
@@ -5461,7 +5486,7 @@ var Fi = class {
 			let i = t.initialTurnsPage ?? await this.client.request("thread/turns/list", {
 				threadId: t.thread.id,
 				cursor: null,
-				limit: Ii,
+				limit: Li,
 				sortDirection: "desc",
 				itemsView: "full"
 			}), d = [...i.data].reverse(), f = t.cwd ?? t.thread.cwd ?? a.cwd, p = await this.catalog.loadConversationCatalogs(f), m = s.turns.filter((e) => c.get(e.id) !== e), h = s.threadStatus !== u && s.threadStatus ? s.threadStatus : F(t.thread.status), g = d.map((e) => h.type === "idle" && e.status === "inProgress" ? {
@@ -5521,7 +5546,7 @@ var Fi = class {
 			threadStatus: structuredClone(t.threadStatus)
 		};
 	}
-}, Ri = class {
+}, zi = class {
 	authentication;
 	approvals;
 	catalog;
@@ -5603,7 +5628,7 @@ var Fi = class {
 				return;
 			}
 			case "thread/goal/updated":
-				if (Gr(this.host.requireRuntime(e.params.threadId).goal, e.params.goal)) return;
+				if (Kr(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,
@@ -5746,7 +5771,7 @@ var Fi = class {
 							durationMs: null
 						},
 						status: e.params.willRetry ? "inProgress" : "failed",
-						error: Wr(e.params.error),
+						error: Gr(e.params.error),
 						willRetry: e.params.willRetry
 					}),
 					...n ? {
@@ -5758,7 +5783,7 @@ var Fi = class {
 					conversationId: e.params.threadId,
 					turnId: e.params.turnId,
 					payload: {
-						error: Wr(e.params.error),
+						error: Gr(e.params.error),
 						willRetry: e.params.willRetry
 					}
 				}), this.host.emitConversationActivity(e.params.threadId, "notification");
@@ -5904,7 +5929,7 @@ var Fi = class {
 			default: return this.host.unknownNotification(e);
 		}
 	}
-}, zi = class {
+}, Bi = class {
 	approvals;
 	clientRequests;
 	host;
@@ -5965,7 +5990,7 @@ var Fi = class {
 			conversationId: e,
 			payload: {
 				historyLoading: n.historyLoading,
-				historyState: Hi(n),
+				historyState: Ui(n),
 				error: n.error
 			}
 		});
@@ -6059,7 +6084,7 @@ var Fi = class {
 				reason: t,
 				messages: structuredClone(r.messages),
 				threadStatus: structuredClone(r.threadStatus),
-				state: Bi(r)
+				state: Vi(r)
 			}
 		});
 	}
@@ -6071,7 +6096,7 @@ var Fi = class {
 			conversationId: e,
 			payload: {
 				messages: structuredClone(t.map((e) => r.get(e.id) ?? e)),
-				state: Vi(this.require(e))
+				state: Hi(this.require(e))
 			}
 		});
 	}
@@ -6113,7 +6138,7 @@ var Fi = class {
 		i && this.emitSummaryUpserted(i, "updated", n);
 	}
 };
-function Bi(e) {
+function Vi(e) {
 	return structuredClone({
 		activeTurnId: e.activeTurnId,
 		answeredClientRequestIds: e.answeredClientRequestIds,
@@ -6122,21 +6147,21 @@ function Bi(e) {
 		error: e.error,
 		executionPlan: e.executionPlan,
 		historyLoading: e.historyLoading,
-		historyState: Hi(e),
+		historyState: Ui(e),
 		turnGitDiff: e.turnGitDiff,
 		turnIds: e.turnIds,
 		turns: e.turns
 	});
 }
-function Vi(e) {
+function Hi(e) {
 	return structuredClone({
 		historyLoading: e.historyLoading,
-		historyState: Hi(e),
+		historyState: Ui(e),
 		turnIds: e.turnIds,
 		turns: e.turns
 	});
 }
-function Hi(e) {
+function Ui(e) {
 	return {
 		loadingStrategy: e.loadingStrategy,
 		hasOlder: e.historyHasOlder,
@@ -6146,7 +6171,7 @@ function Hi(e) {
 }
 //#endregion
 //#region src/node/codex-surface-connection-controller.ts
-var Ui = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_request_user_input"]), Wi = class {
+var Wi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_request_user_input"]), Gi = class {
 	client;
 	options;
 	authentication;
@@ -6209,7 +6234,7 @@ var Ui = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 					limit: 100,
 					threadId: null
 				});
-				for (let e of n.data) Ui.has(e.name) && !e.enabled && (t[e.name] = !0);
+				for (let e of n.data) Wi.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 });
@@ -6343,7 +6368,7 @@ var Ui = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			error: null
 		});
 	}
-}, Gi = 5, Ki = class {
+}, Ki = 5, qi = class {
 	client;
 	loadingStrategy;
 	catalog;
@@ -6357,7 +6382,7 @@ var Ui = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 		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 ? At(s.models, t.model) : k(s.models, i.selectedModelId);
 		jt(c, t.reasoningEffort), j(c, t.serviceTier);
-		let l = n.mcpServers === void 0 ? this.extensions.defaultMcpServers : vi(n.mcpServers), u = await this.extensions.conversationExtension({
+		let l = n.mcpServers === void 0 ? this.extensions.defaultMcpServers : yi(n.mcpServers), u = await this.extensions.conversationExtension({
 			operation: "start",
 			conversationId: null,
 			cwd: a ?? void 0,
@@ -6375,7 +6400,7 @@ var Ui = /* @__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 },
-			...qi(t, o.approvalPresets)
+			...Ji(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", {
@@ -6386,7 +6411,7 @@ var Ui = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 		let [f, p] = await Promise.all([this.client.request("thread/turns/list", {
 			threadId: d.thread.id,
 			cursor: null,
-			limit: Gi,
+			limit: Ki,
 			sortDirection: "desc",
 			itemsView: "full"
 		}), this.client.request("thread/goal/get", { threadId: d.thread.id }).then((e) => e.goal).catch(() => null)]), m = [...f.data].reverse(), h = Jn(m), g = fr({
@@ -6428,7 +6453,7 @@ var Ui = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 		return this.fork(e, n, r, { lastTurnId: t });
 	}
 };
-function qi(e, t) {
+function Ji(e, t) {
 	if (e.approvalPreset) {
 		if (!t.includes(e.approvalPreset)) throw Error(`Approval preset '${e.approvalPreset}' is not available`);
 		return Pt(e.approvalPreset);
@@ -6440,27 +6465,27 @@ function qi(e, t) {
 }
 //#endregion
 //#region src/node/codex-markdown-images.ts
-var Ji = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, Yi = /* @__PURE__ */ new Set([
+var Yi = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, Xi = /* @__PURE__ */ new Set([
 	".avif",
 	".gif",
 	".jpeg",
 	".jpg",
 	".png",
 	".webp"
-]), Xi = class {
+]), Zi = class {
 	client;
 	constructor(e) {
 		this.client = e;
 	}
 	async hydrate(e, t) {
-		let n = $i(e);
-		return Qi(e, (await Promise.all(Array.from(e.matchAll(Ji), async (e) => {
+		let n = ea(e);
+		return $i(e, (await Promise.all(Array.from(e.matchAll(Yi), async (e) => {
 			let r = e.index ?? 0;
-			if (ea(r, n)) return null;
-			let i = e[2], a = Zi(i, t);
+			if (ta(r, n)) return null;
+			let i = e[2], a = Qi(i, t);
 			if (!a) return null;
 			try {
-				let t = Er((await this.client.request("fs/readFile", { path: a })).dataBase64);
+				let t = Dr((await this.client.request("fs/readFile", { path: a })).dataBase64);
 				if (!t) return null;
 				let n = e[0].indexOf("](") + 2;
 				return {
@@ -6474,7 +6499,7 @@ var Ji = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, Yi = /* @
 		}))).filter((e) => e !== null));
 	}
 };
-function Zi(e, t) {
+function Qi(e, t) {
 	let n = e.trim();
 	if (!n || /[\u0000-\u001f\u007f]/.test(n)) return null;
 	let r;
@@ -6489,18 +6514,18 @@ function Zi(e, t) {
 	} catch {
 		return null;
 	}
-	if (!Yi.has(_(r).toLowerCase())) return null;
+	if (!Xi.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 Qi(e, t) {
+function $i(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 $i(e) {
+function ea(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");
@@ -6521,15 +6546,15 @@ function $i(e) {
 	}
 	return t;
 }
-function ea(e, t) {
+function ta(e, t) {
 	return t.some((t) => e >= t.start && e <= t.end);
 }
-var ta = /<context>[\s\S]*?<\/context>\s*/g, na = /<in-app-browser-context(?:\s[^>]*)?>[\s\S]*?<\/in-app-browser-context>\s*/g, ra = /^[ \t]*## My request for Codex:[ \t]*$/m;
-async function ia(e, t) {
+var na = /<context>[\s\S]*?<\/context>\s*/g, ra = /<in-app-browser-context(?:\s[^>]*)?>[\s\S]*?<\/in-app-browser-context>\s*/g, ia = /^[ \t]*## My request for Codex:[ \t]*$/m;
+async function aa(e, t) {
 	let n = D(t);
 	return {
 		conversationId: n,
-		prompts: aa((await e.request("thread/turns/list", {
+		prompts: oa((await e.request("thread/turns/list", {
 			threadId: n,
 			cursor: null,
 			limit: 100,
@@ -6538,20 +6563,20 @@ async function ia(e, t) {
 		})).data)
 	};
 }
-function aa(e) {
+function oa(e) {
 	return [...e].reverse().flatMap((e) => e.items.flatMap((e) => {
 		if (e.type !== "userMessage") return [];
-		let t = oa(e.content.flatMap((e) => e.type === "text" ? [e.text] : []).join(""));
+		let t = sa(e.content.flatMap((e) => e.type === "text" ? [e.text] : []).join(""));
 		return t && t !== "(no user instructions)" ? [t] : [];
 	}));
 }
-function oa(e) {
-	let t = e.replace(ta, ""), n = t.replace(na, "");
-	return (n === t ? n : n.replace(ra, "")).trim();
+function sa(e) {
+	let t = e.replace(na, ""), n = t.replace(ra, "");
+	return (n === t ? n : n.replace(ia, "")).trim();
 }
 //#endregion
 //#region src/node/codex-surface-text-generation-controller.ts
-var sa = 12e4, ca = class {
+var ca = 12e4, la = class {
 	client;
 	defaultCwd;
 	host;
@@ -6562,7 +6587,7 @@ var sa = 12e4, ca = class {
 	}
 	handleNotification(e) {
 		e.method === "thread/started" && e.params.thread.ephemeral && this.hiddenThreadIds.add(e.params.thread.id);
-		let t = fa(e);
+		let t = pa(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;
@@ -6570,7 +6595,7 @@ var sa = 12e4, ca = class {
 	async generate(e, t = {}) {
 		let n = e.trim();
 		if (!n) throw Error("Generation prompt cannot be empty");
-		if (t.signal?.aborted) throw pa();
+		if (t.signal?.aborted) throw ma();
 		await this.host.ensureConnected();
 		let r = this.host.getSnapshot(), i = k(r.models, r.selectedModelId), a = t.model ? At(r.models, t.model) : i, o = a?.model, s = t.reasoningEffort ?? (a?.id === i?.id ? r.selectedReasoningEffort : a ? A(a) : null) ?? void 0, c = t.serviceTier === void 0 ? a?.id === i?.id ? r.selectedServiceTier : a?.defaultServiceTier ?? null : t.serviceTier;
 		jt(a, s), j(a, c);
@@ -6589,15 +6614,15 @@ var sa = 12e4, ca = class {
 			serviceName: "codex_app_sdk",
 			threadSource: "sdk_ephemeral_generation"
 		}), u = l.thread.id;
-		if (!l.thread.ephemeral) throw await la(() => this.client.request("thread/delete", { threadId: u })), Error("Codex app-server did not create an ephemeral generation thread");
-		if (this.hiddenThreadIds.add(u), t.signal?.aborted) throw await la(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u), pa();
-		let d = ua();
+		if (!l.thread.ephemeral) throw await ua(() => 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 ua(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u), ma();
+		let d = da();
 		this.pendingByThread.set(u, d);
-		let f = null, p = !1, m = () => d.reject(pa());
+		let f = null, p = !1, m = () => d.reject(ma());
 		t.signal?.addEventListener("abort", m);
 		let h = setTimeout(() => {
 			d.reject(/* @__PURE__ */ Error("Codex ephemeral generation timed out"));
-		}, t.timeoutMs ?? sa);
+		}, t.timeoutMs ?? ca);
 		try {
 			let e = await this.client.request("turn/start", {
 				threadId: u,
@@ -6613,18 +6638,18 @@ var sa = 12e4, ca = class {
 				serviceTier: c,
 				...t.outputSchema === void 0 ? {} : { outputSchema: t.outputSchema }
 			});
-			f = e.turn.id, d.turnId = f, da(d, e.turn);
+			f = e.turn.id, d.turnId = f, fa(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 la(() => this.client.request("turn/interrupt", {
+				await ua(() => this.client.request("turn/interrupt", {
 					threadId: u,
 					turnId: e
 				}));
 			}
-			await la(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u);
+			await ua(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u);
 		}
 	}
 	close(e = /* @__PURE__ */ Error("Codex surface closed")) {
@@ -6647,16 +6672,16 @@ var sa = 12e4, ca = class {
 		}
 		if (t.method === "turn/completed") {
 			if (e.turnId && t.params.turn.id !== e.turnId) return;
-			da(e, t.params.turn);
+			fa(e, t.params.turn);
 		}
 	}
 };
-async function la(e) {
+async function ua(e) {
 	try {
 		await e();
 	} catch {}
 }
-function ua() {
+function da() {
 	let e, t, n = {
 		promise: new Promise((n, r) => {
 			e = n, t = r;
@@ -6672,7 +6697,7 @@ function ua() {
 	};
 	return n.promise.catch(() => void 0), n;
 }
-function da(e, t) {
+function fa(e, t) {
 	for (let n of t.items) {
 		if (n.type !== "agentMessage") continue;
 		let t = n.text.trim();
@@ -6694,21 +6719,31 @@ function da(e, t) {
 	}
 	e.resolve({ text: n });
 }
-function fa(e) {
+function pa(e) {
 	if (e.method === "thread/started") return e.params.thread.id;
 	let t = e.params;
 	return typeof t.threadId == "string" ? t.threadId : null;
 }
-function pa() {
+function ma() {
 	return /* @__PURE__ */ Error("Codex ephemeral generation was aborted");
 }
 //#endregion
 //#region src/node/codex-surface-usage-controller.ts
-var ma = class {
+var ha = class {
 	threads = /* @__PURE__ */ new Map();
 	clear() {
 		this.threads.clear();
 	}
+	observeEmptyConversation(e) {
+		this.threads.has(e) || (this.thread(e).total = {
+			totalTokens: 0,
+			inputTokens: 0,
+			cachedInputTokens: 0,
+			cacheWriteInputTokens: 0,
+			outputTokens: 0,
+			reasoningOutputTokens: 0
+		});
+	}
 	observe(e, t) {
 		if (!("conversationId" in t)) return t;
 		let n = t.conversationId;
@@ -6736,15 +6771,15 @@ var ma = class {
 			let e = r.executions.get(r.activeTurnId);
 			e && (e.baseline = null), i && (i.baseline = null);
 		}
-		i && (!ga(a.total) || i.latest && !_a(i.latest.total, a.total)) && (i.baseline = null);
-		let s = i?.baseline ? va(i.baseline, a.total) : null;
+		i && (!_a(a.total) || i.latest && !va(i.latest.total, a.total)) && (i.baseline = null);
+		let s = i?.baseline ? ya(i.baseline, a.total) : null;
 		i && s === null && (i.baseline = null);
 		let c = {
 			...a,
 			execution: s,
 			observedStart: !!i
 		};
-		return i && (i.latest = structuredClone(c)), r.total = !o && ga(a.total) ? structuredClone(a.total) : null, r.lastUsageTurnId = t.turnId, {
+		return i && (i.latest = structuredClone(c)), r.total = !o && _a(a.total) ? structuredClone(a.total) : null, r.lastUsageTurnId = t.turnId, {
 			...t,
 			payload: { usage: c }
 		};
@@ -6758,21 +6793,21 @@ var ma = class {
 			executions: /* @__PURE__ */ new Map()
 		}, this.threads.set(e, t)), t;
 	}
-}, ha = [
+}, ga = [
 	"totalTokens",
 	"inputTokens",
 	"cachedInputTokens",
 	"outputTokens",
 	"reasoningOutputTokens"
 ];
-function ga(e) {
-	return ha.every((t) => Number.isSafeInteger(e[t]) && e[t] >= 0) && (e.cacheWriteInputTokens === null || Number.isSafeInteger(e.cacheWriteInputTokens) && e.cacheWriteInputTokens >= 0) && e.totalTokens === e.inputTokens + e.outputTokens && e.cachedInputTokens <= e.inputTokens && e.reasoningOutputTokens <= e.outputTokens;
-}
-function _a(e, t) {
-	return ha.every((n) => t[n] >= e[n]) && (e.cacheWriteInputTokens === null || t.cacheWriteInputTokens === null || t.cacheWriteInputTokens >= e.cacheWriteInputTokens);
+function _a(e) {
+	return ga.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 va(e, t) {
-	if (!ga(e) || !ga(t) || !_a(e, t)) return null;
+	return ga.every((n) => t[n] >= e[n]) && (e.cacheWriteInputTokens === null || t.cacheWriteInputTokens === null || t.cacheWriteInputTokens >= e.cacheWriteInputTokens);
+}
+function ya(e, t) {
+	if (!_a(e) || !_a(t) || !va(e, t)) return null;
 	let n = {
 		totalTokens: t.totalTokens - e.totalTokens,
 		inputTokens: t.inputTokens - e.inputTokens,
@@ -6781,11 +6816,11 @@ function va(e, t) {
 		outputTokens: t.outputTokens - e.outputTokens,
 		reasoningOutputTokens: t.reasoningOutputTokens - e.reasoningOutputTokens
 	};
-	return ga(n) ? n : null;
+	return _a(n) ? n : null;
 }
 //#endregion
 //#region src/node/codex-surface.ts
-var ya = class {
+var ba = class {
 	options;
 	client;
 	listeners = /* @__PURE__ */ new Set();
@@ -6816,21 +6851,21 @@ var ya = class {
 	unsubscribeToolInputRequests;
 	unsubscribeMcpElicitationRequests;
 	eventSequence = 0;
-	usage = new ma();
+	usage = new ha();
 	accountGeneration = 0;
 	pendingMarkdownImageHydrations = /* @__PURE__ */ new Set();
 	closed = !1;
 	state = _t(bt());
 	constructor(e = {}) {
-		this.options = e, this.extensions = new Ti(e.extensions ?? [], e.mcpServers ?? [], (e) => this.lifecycle.hostOptions(e));
+		this.options = e, this.extensions = new Ei(e.extensions ?? [], e.mcpServers ?? [], (e) => this.lifecycle.hostOptions(e));
 		let n = sn(e);
-		this.client = e.client ?? new t(on(n) ? new Ke(n) : new Ve(n), e.onListenerError ? { onListenerError: e.onListenerError } : {}), this.markdownImages = new Xi(this.client), this.authentication = new ln(this.client, {
+		this.client = e.client ?? new t(on(n) ? new Ke(n) : new Ve(n), e.onListenerError ? { onListenerError: e.onListenerError } : {}), this.markdownImages = new Zi(this.client), this.authentication = new ln(this.client, {
 			bootstrapSurfaceData: (e) => this.connection.bootstrapSurfaceData(e),
 			clearAuthenticatedSurfaceData: () => this.connection.clearAuthenticatedSurfaceData(),
 			getSnapshot: () => this.getSnapshot(),
 			patchAuthentication: (e, t) => this.connection.patchAuthentication(e, t),
 			reportError: (e) => this.patch({ error: O(e) })
-		}), this.items = new Yr({
+		}), this.items = new Xr({
 			assistantMessageForTurn: (e, t) => this.assistantMessageForTurn(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
 			emitEvent: (e, t) => this.emitEvent(e, t),
@@ -6844,7 +6879,7 @@ var ya = class {
 			sendNextQueuedPrompt: (e) => {
 				this.messagesController.sendNextQueuedPrompt(e);
 			}
-		}), this.approvals = new _i(this.client, {
+		}), this.approvals = new vi(this.client, {
 			activeConversationId: () => this.state.activeConversationId,
 			createRuntime: (e, t) => this.createRuntime(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -6854,7 +6889,7 @@ var ya = class {
 			patch: (e) => this.patch(e),
 			patchConversationStatus: (e, t) => this.patchConversationStatus(e, t),
 			patchRuntime: (e, t) => this.patchRuntime(e, t)
-		}), this.clientRequests = new Qr({
+		}), this.clientRequests = new $r({
 			activeConversationId: () => this.state.activeConversationId,
 			answerAsyncQuestion: (e, t, n) => this.messagesController.answerAsyncQuestion(e, t, n),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -6864,13 +6899,13 @@ var ya = 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 zi(this.approvals, this.clientRequests, {
+		}), this.runtimeState = new Bi(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 ji(this.client, {
+		}), this.conversationSettings = new Mi(this.client, {
 			approvalMode: e.approvalMode,
 			approvalPreset: e.approvalPreset,
 			permissionMode: e.permissionMode
@@ -6888,7 +6923,7 @@ var ya = class {
 			patch: (e) => this.patch(e),
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}), this.turnActions = new Ni(this.client, {
+		}), this.turnActions = new Pi(this.client, {
 			createConversation: async () => {
 				await this.createConversation();
 			},
@@ -6905,7 +6940,7 @@ var ya = 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 Fi(this.client, {
+		}), this.messagesController = new Ii(this.client, {
 			clearGoalForThread: (e) => this.conversationSettings.clearGoalForThread(e),
 			compactForThread: (e) => this.turnActions.compactForThread(e),
 			createConversation: async () => {
@@ -6928,7 +6963,7 @@ var ya = 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 li(this.client, e.cwd, {
+		}), this.catalog = new ui(this.client, e.cwd, {
 			authenticationBlocksBootstrap: () => this.authentication.blocksBootstrap(),
 			emitConversationSkills: (e, t) => this.emitConversationSkills(e, t),
 			emitEvent: (e, t) => this.emitEvent(e, t),
@@ -6939,7 +6974,7 @@ var ya = class {
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			preferredApprovalPreset: () => this.conversationSettings.preferredApprovalPreset(),
 			runtimes: () => this.runtimeState.values()
-		}), this.conversations = new ki(this.client, e.conversationLimit, {
+		}), this.conversations = new Ai(this.client, e.conversationLimit, {
 			emitHistoryPrepended: (e, t, n) => this.emitHistoryPrepended(e, t, n),
 			emitSummaryUpserted: (e, t, n) => this.emitSummaryUpserted(e, t, n),
 			ensureConnected: () => this.ensureConnected(),
@@ -6951,7 +6986,7 @@ var ya = class {
 			requireRuntime: (e) => this.requireRuntime(e),
 			runtime: (e) => this.runtimeState.get(e),
 			schedulePluginRefresh: (e) => this.catalog.schedulePluginRefresh(e)
-		}), this.lifecycle = new Li(this.client, e, this.catalog, this.extensions, this.conversationSettings, this.conversations, {
+		}), this.lifecycle = new Ri(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),
@@ -6967,13 +7002,14 @@ var ya = class {
 			ensureConnected: () => this.ensureConnected(),
 			getSnapshot: () => this.getSnapshot(),
 			getState: () => this.state,
+			observeEmptyConversation: (e) => this.usage.observeEmptyConversation(e),
 			patch: (e) => this.patch(e),
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			requireRuntime: (e) => this.requireRuntime(e),
 			runtime: (e) => this.runtimeState.get(e),
 			runtimeProjection: (e) => this.runtimeProjection(e),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}), this.forks = new Ki(this.client, e.loadingStrategy, this.catalog, this.extensions, {
+		}), this.forks = new qi(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"),
@@ -6987,7 +7023,7 @@ var ya = class {
 			rememberHostOptions: (e, t) => this.lifecycle.rememberHostOptions(e, t),
 			requireRuntime: (e) => this.requireRuntime(e),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}), this.connection = new Wi(this.client, e, this.authentication, this.approvals, this.catalog, this.clientRequests, this.conversations, this.items, this.lifecycle, this.runtimeState, {
+		}), this.connection = new Gi(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,
@@ -6999,7 +7035,7 @@ var ya = class {
 			getSnapshot: () => this.getSnapshot(),
 			getState: () => this.state,
 			patch: (e) => this.patch(e)
-		}), this.notifications = new Ri(this.authentication, this.approvals, this.catalog, this.clientRequests, this.conversations, this.items, {
+		}), this.notifications = new zi(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),
@@ -7023,7 +7059,7 @@ var ya = class {
 			},
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e),
 			unknownNotification: (e) => this.handleUnknownNotification(e)
-		}), this.textGeneration = new ca(this.client, e.cwd, {
+		}), this.textGeneration = new la(this.client, e.cwd, {
 			ensureConnected: () => this.ensureConnected(),
 			getSnapshot: () => this.getSnapshot()
 		}), this.unsubscribeNotification = this.client.onNotification((e) => {
@@ -7196,7 +7232,7 @@ var ya = class {
 		return this.lifecycle.readHistory(e);
 	}
 	async readConversationPromptHistory(e = this.state.activeConversationId ?? "") {
-		return await this.ensureConnected(), ia(this.client, e);
+		return await this.ensureConnected(), aa(this.client, e);
 	}
 	async loadOlderConversationHistory(e = this.state.activeConversationId ?? "") {
 		return this.conversations.loadOlderHistory(D(e));
@@ -7584,19 +7620,19 @@ var ya = class {
 		for (let e of this.conversationListeners.keys()) this.notifyConversationListeners(e);
 	}
 };
-function ba(e = {}) {
-	return new ya(e);
+function xa(e = {}) {
+	return new ba(e);
 }
 //#endregion
 //#region src/node/codex-app-backend-cache.ts
-var xa = {
+var Sa = {
 	set(e, t) {
 		return setTimeout(e, t);
 	},
 	clear(e) {
 		clearTimeout(e);
 	}
-}, Sa = class {
+}, Ca = class {
 	options;
 	records = /* @__PURE__ */ new Map();
 	now;
@@ -7609,7 +7645,7 @@ var xa = {
 	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 ?? xa, this.sweepIntervalMs = e.sweepIntervalMs ?? null;
+		this.now = e.now ?? Date.now, this.scheduler = e.scheduler ?? Sa, this.sweepIntervalMs = e.sweepIntervalMs ?? null;
 	}
 	get size() {
 		return this.records.size;
@@ -7707,7 +7743,7 @@ var xa = {
 	assertOpen() {
 		if (this.closed) throw Error("Codex backend cache is closed");
 	}
-}, Ca = class {
+}, wa = class {
 	surface;
 	moduleServices = /* @__PURE__ */ new Map();
 	ttlCaches = /* @__PURE__ */ new Set();
@@ -7723,7 +7759,7 @@ var xa = {
 			if (n.has(e)) throw Error(`Duplicate Codex backend module '${e}'`);
 			n.add(e);
 		}
-		this.surface = e.surface ?? new ya(e.surfaceOptions);
+		this.surface = e.surface ?? new ba(e.surfaceOptions);
 		for (let { id: e, module: n } of t) this.moduleServices.set(e, n.create({
 			surface: this.surface,
 			closeBackend: () => this.close(),
@@ -7737,7 +7773,7 @@ var xa = {
 	}
 	createTtlCache(e) {
 		if (this.closePromise) throw Error("Cannot create a cache after the Codex backend is closed");
-		let t = new Sa(e);
+		let t = new Ca(e);
 		return this.ttlCaches.add(t), t;
 	}
 	close() {
@@ -7747,16 +7783,16 @@ var xa = {
 		await Promise.all([...this.ttlCaches].map((e) => e.close())), await this.surface.close();
 	}
 };
-function wa(e = {}) {
-	return new Ca(e);
+function Ta(e = {}) {
+	return new wa(e);
 }
 //#endregion
 //#region src/node/apple-speech-transcription.ts
-async function Ta(e, t = {}, n = {}) {
+async function Ea(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 Aa(Ea(n.assetsPath), s, r);
-		return await r.writeFile(c, e), await Oa(i, a, Da(c, u, t)), { text: (await r.readFile(u, "utf8")).trim() };
+		let a = await ja(Da(n.assetsPath), s, r);
+		return await r.writeFile(c, e), await ka(i, a, Oa(c, u, t)), { text: (await r.readFile(u, "utf8")).trim() };
 	} catch (e) {
 		return {
 			text: "",
@@ -7769,10 +7805,10 @@ async function Ta(e, t = {}, n = {}) {
 		});
 	}
 }
-function Ea(e, t = {}) {
-	return h.join(e ?? ka(t), "apple-speechanalyzer-cli");
+function Da(e, t = {}) {
+	return h.join(e ?? Aa(t), "apple-speechanalyzer-cli");
 }
-function Da(e, t, n) {
+function Oa(e, t, n) {
 	let r = [
 		"--input-audio-path",
 		e,
@@ -7781,7 +7817,7 @@ function Da(e, t, n) {
 	], i = n.locale?.trim();
 	return i && r.push("--locale", i), n.live && r.push("--live"), r;
 }
-function Oa(e, t, n) {
+function ka(e, t, n) {
 	return new Promise((r, i) => {
 		let a = e(t, n), o = "";
 		a.stderr?.on("data", (e) => {
@@ -7797,7 +7833,7 @@ function Oa(e, t, n) {
 		});
 	});
 }
-function ka(e) {
+function Aa(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;
@@ -7828,18 +7864,18 @@ function ka(e) {
 	let u = import.meta.url, d = e.moduleUrl === void 0 ? u : e.moduleUrl ?? void 0, f = d ? h.dirname(ne(d)) : s, p = [h.resolve(f, "../assets"), h.resolve(f, "../../assets")];
 	return p.find((e) => i(h.join(e, "apple-speechanalyzer-cli"))) ?? p[0];
 }
-async function Aa(e, t, n) {
+async function ja(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 ja(e, t, n = {}) {
+async function Ma(e, t, n = {}) {
 	if (n.signal?.throwIfAborted(), !Number.isInteger(e.sampleRate) || e.sampleRate < 8e3 || e.sampleRate > 96e3) throw Error("Unsupported speech sample rate.");
 	let r = await se(h.join(m(), "codex-sdk-live-speech-")), i;
 	try {
 		let t = h.join(r, "apple-speechanalyzer-cli");
-		await oe(Ea(n.assetsPath), t), await ae(t, 448), n.signal?.throwIfAborted(), i = (n.spawn ?? o)(t, [
+		await oe(Da(n.assetsPath), t), await ae(t, 448), n.signal?.throwIfAborted(), i = (n.spawn ?? o)(t, [
 			"--stream",
 			"--sample-rate",
 			String(e.sampleRate),
@@ -7941,6 +7977,6 @@ async function ja(e, t, n = {}) {
 	};
 }
 //#endregion
-export { Ca as CodexAppBackend, Sa as CodexAppBackendTtlCache, Ve as CodexAppServerStdioTransport, Ke as CodexAppServerUnixSocketTransport, ya as CodexSurface, _r as codexItemToMediaPart, hr as codexItemToSurfaceMessage, L as codexItemToToolPart, me as codexRuntimePathEntries, fr as codexThreadToSurfaceMessages, mr as codexTurnToSurfaceMessages, wa as createCodexAppBackend, ba as createCodexSurface, pe as discoverCodexExecutable, pr as preserveHistoricalAttachmentPreviews, Ea as resolveAppleSpeechAnalyzerPath, ge as resolveCodexRuntime, ja as startAppleSpeechSession, Ta as transcribeWithAppleSpeechAnalyzer, he as withCodexRuntimePath };
+export { wa as CodexAppBackend, Ca as CodexAppBackendTtlCache, Ve as CodexAppServerStdioTransport, Ke as CodexAppServerUnixSocketTransport, ba as CodexSurface, _r as codexItemToMediaPart, hr as codexItemToSurfaceMessage, L as codexItemToToolPart, me as codexRuntimePathEntries, fr as codexThreadToSurfaceMessages, mr as codexTurnToSurfaceMessages, Ta as createCodexAppBackend, xa as createCodexSurface, pe as discoverCodexExecutable, pr as preserveHistoricalAttachmentPreviews, Da as resolveAppleSpeechAnalyzerPath, ge as resolveCodexRuntime, Ma as startAppleSpeechSession, Ea as transcribeWithAppleSpeechAnalyzer, he as withCodexRuntimePath };
 
 //# sourceMappingURL=index.js.map