@codex-app-sdk/backend 0.17.0 → 0.18.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { i as e, n as t, r as n, s as r } from "./chunks/codex-DzX6RrF2.js";
+import { i as e, n as t, r as n, s as r } from "./chunks/codex-CmHW3ikB.js";
 import { execFile as i, execFileSync as a, spawn as o } from "node:child_process";
 import { constants as s } from "node:buffer";
 import { existsSync as c, promises as l, readFileSync as u, readdirSync as d } from "node:fs";
@@ -1584,10 +1584,10 @@ var vn = "Result returned in structuredContent.", yn = 32 * 1024;
 function bn(e, t) {
 	let n = e.status;
 	if (e.kind === "command") {
-		let r = H(e.input) ? e.input : {}, i = typeof r.cwd == "string" ? r.cwd : t ?? void 0;
+		let r = V(e.input) ? e.input : {}, i = typeof r.cwd == "string" ? r.cwd : t ?? void 0;
 		return kn(r.commandActions).flatMap((e) => {
 			if (e.type !== "read") return [];
-			let t = Vn(e.path ?? e.name, i);
+			let t = Hn(e.path ?? e.name, i);
 			return t ? [{
 				action: "read",
 				path: t,
@@ -1596,12 +1596,12 @@ function bn(e, t) {
 		});
 	}
 	if (e.kind !== "fileChange") return [];
-	let r = H(e.input) ? e.input : {}, i = e.metadata ?? {};
+	let r = V(e.input) ? e.input : {}, i = e.metadata ?? {};
 	return (Array.isArray(i.changes) ? i.changes : Array.isArray(r.changes) ? r.changes : []).flatMap((e) => {
-		if (!H(e) || typeof e.path != "string") return [];
-		let r = V(e.kind);
+		if (!V(e) || typeof e.path != "string") return [];
+		let r = Vn(e.kind);
 		if (r === "delete") return [];
-		let i = Vn(e.path, t ?? void 0);
+		let i = Hn(e.path, t ?? void 0);
 		return i ? [{
 			action: r === "add" ? "create" : "edit",
 			path: i,
@@ -1610,7 +1610,7 @@ function bn(e, t) {
 	});
 }
 function R(e, t = {}) {
-	if (!H(e) || typeof e.id != "string") return null;
+	if (!V(e) || typeof e.id != "string") return null;
 	if (e.type === "commandExecution") {
 		let n = typeof e.command == "string" ? e.command : "command", r = z(e.status), i = En(r, e.commandActions, n), a = t.includeCommandOutput && typeof e.aggregatedOutput == "string" ? e.aggregatedOutput : void 0;
 		return {
@@ -1637,14 +1637,14 @@ function R(e, t = {}) {
 		};
 	}
 	if (e.type === "mcpToolCall") {
-		let t = typeof e.server == "string" ? e.server : "mcp", n = typeof e.tool == "string" ? e.tool : "tool", r = Yn(Wn(e.error)), i = U(e.arguments), a = U(e.result);
+		let t = typeof e.server == "string" ? e.server : "mcp", n = typeof e.tool == "string" ? e.tool : "tool", r = Xn(Gn(e.error)), i = H(e.arguments), a = H(e.result);
 		return {
 			type: "tool",
 			id: e.id,
 			kind: "mcp",
 			title: `${t}.${n}`,
 			status: z(e.status),
-			body: r ?? Yn(Gn(a)),
+			body: r ?? Xn(Kn(a)),
 			...i === void 0 ? {} : { input: i },
 			...a === void 0 ? {} : { output: a },
 			metadata: {
@@ -1657,14 +1657,14 @@ function R(e, t = {}) {
 		};
 	}
 	if (e.type === "dynamicToolCall") {
-		let t = typeof e.tool == "string" ? e.tool : "tool", n = typeof e.namespace == "string" ? e.namespace : null, r = U(e.arguments), i = U(e.contentItems);
+		let t = typeof e.tool == "string" ? e.tool : "tool", n = typeof e.namespace == "string" ? e.namespace : null, r = H(e.arguments), i = H(e.contentItems);
 		return {
 			type: "tool",
 			id: e.id,
 			kind: "dynamic",
 			title: n ? `${n}.${t}` : t,
 			status: z(e.status),
-			body: Yn(qn(i)),
+			body: Xn(Jn(i)),
 			...r === void 0 ? {} : { input: r },
 			...i === void 0 ? {} : { output: i },
 			metadata: {
@@ -1684,7 +1684,7 @@ function R(e, t = {}) {
 			title: n.length === 1 ? "1 file change" : `${n.length} file changes`,
 			status: r,
 			...i ? { statusText: i } : {},
-			body: Jn(n),
+			body: Yn(n),
 			input: { changes: n },
 			metadata: {
 				changes: n,
@@ -1721,7 +1721,7 @@ function R(e, t = {}) {
 	} : null;
 }
 function xn(e) {
-	if (!H(e) || e.type !== "commandExecution" || typeof e.command != "string") return !1;
+	if (!V(e) || e.type !== "commandExecution" || typeof e.command != "string") return !1;
 	let t = e.command;
 	return An(t) || jn(t) || Mn(t);
 }
@@ -1742,7 +1742,7 @@ function Cn(e, t) {
 	let n = In("running", t);
 	return {
 		itemId: e,
-		body: Jn(t),
+		body: Yn(t),
 		...n ? { statusText: n } : {},
 		input: { changes: t },
 		metadata: { changes: t },
@@ -1753,7 +1753,7 @@ function Cn(e, t) {
 			title: t.length === 1 ? "1 file change" : `${t.length} file changes`,
 			status: "running",
 			...n ? { statusText: n } : {},
-			body: Jn(t),
+			body: Yn(t),
 			input: { changes: t },
 			metadata: { changes: t }
 		}
@@ -1773,7 +1773,7 @@ function wn(e, t) {
 	};
 }
 function Tn(e, t, n, r = "completed") {
-	let i = U(t), a = Yn(L(i));
+	let i = H(t), a = Xn(L(i));
 	return {
 		itemId: e,
 		title: n && n.trim() ? n : void 0,
@@ -1856,7 +1856,7 @@ function On(e) {
 	return e.path ?? e.name ?? e.query ?? e.command;
 }
 function kn(e) {
-	return Array.isArray(e) ? e.flatMap((e) => !H(e) || e.type !== "read" && e.type !== "listFiles" && e.type !== "search" ? [] : [{
+	return Array.isArray(e) ? e.flatMap((e) => !V(e) || e.type !== "read" && e.type !== "listFiles" && e.type !== "search" ? [] : [{
 		command: typeof e.command == "string" ? e.command : void 0,
 		name: typeof e.name == "string" ? e.name : void 0,
 		path: typeof e.path == "string" ? e.path : void 0,
@@ -1883,7 +1883,7 @@ function Pn(e, t) {
 	return Fn(e, t);
 }
 function Fn(e, t) {
-	return Nn(B(e.map(Un)), t);
+	return Nn(B(e.map(Wn)), t);
 }
 function In(e, t) {
 	let n = Ln(e, t);
@@ -1891,8 +1891,8 @@ function In(e, t) {
 }
 function Ln(e, t) {
 	let n = t.flatMap((e) => {
-		if (!H(e)) return [];
-		let t = typeof e.path == "string" ? e.path : void 0, n = V(e.kind), r = zn(e);
+		if (!V(e)) return [];
+		let t = typeof e.path == "string" ? e.path : void 0, n = Vn(e.kind), r = zn(e);
 		return [{
 			addedLines: r.addedLines,
 			kind: n,
@@ -1918,13 +1918,13 @@ function Rn(e) {
 	return e.every((e) => e === "add") ? "create" : e.every((e) => e === "delete") ? "delete" : "edit";
 }
 function zn(e) {
-	let t = typeof e.diff == "string" ? e.diff : void 0, n = V(e.kind);
+	let t = typeof e.diff == "string" ? e.diff : void 0, n = Vn(e.kind);
 	return n === "add" ? {
-		addedLines: Hn(t),
+		addedLines: Un(t),
 		removedLines: 0
 	} : n === "delete" ? {
 		addedLines: 0,
-		removedLines: Hn(t)
+		removedLines: Un(t)
 	} : Bn(t);
 }
 function Bn(e) {
@@ -1939,54 +1939,54 @@ function Bn(e) {
 		removedLines: n
 	};
 }
-function V(e) {
+function Vn(e) {
 	if (e === "add" || e === "delete") return e;
-	if (H(e) && typeof e.type == "string") return V(e.type);
+	if (V(e) && typeof e.type == "string") return Vn(e.type);
 }
-function Vn(e, t) {
+function Hn(e, t) {
 	let n = e?.trim();
 	if (n) {
 		if (v(n)) return n;
 		if (!(!t || !v(t))) return x(t, n);
 	}
 }
-function Hn(e) {
+function Un(e) {
 	if (!e) return 0;
 	let t = e.split(/\r\n|\r|\n/);
 	for (; t.at(-1) === "";) t.pop();
 	return t.length;
 }
-function Un(e) {
-	return e.split(/[\\/]/).filter(Boolean).at(-1) ?? e;
-}
 function Wn(e) {
-	if (H(e)) return typeof e.message == "string" ? e.message : void 0;
+	return e.split(/[\\/]/).filter(Boolean).at(-1) ?? e;
 }
 function Gn(e) {
-	if (!H(e)) return;
-	let t = Kn(e.content), n = "structuredContent" in e ? L(e.structuredContent) : void 0;
-	return n ? !t || t.trim() === vn ? n : `${t}\n\n${n}` : t;
+	if (V(e)) return typeof e.message == "string" ? e.message : void 0;
 }
 function Kn(e) {
-	if (Array.isArray(e)) return e.map((e) => H(e) ? typeof e.text == "string" ? e.text : JSON.stringify(e) : "").filter(Boolean).join("\n\n") || void 0;
+	if (!V(e)) return;
+	let t = qn(e.content), n = "structuredContent" in e ? L(e.structuredContent) : void 0;
+	return n ? !t || t.trim() === vn ? n : `${t}\n\n${n}` : t;
 }
 function qn(e) {
-	if (Array.isArray(e)) return e.map((e) => H(e) && typeof e.text == "string" ? e.text : JSON.stringify(e)).filter(Boolean).join("\n\n") || void 0;
+	if (Array.isArray(e)) return e.map((e) => V(e) ? typeof e.text == "string" ? e.text : JSON.stringify(e) : "").filter(Boolean).join("\n\n") || void 0;
 }
 function Jn(e) {
-	return e.map((e) => H(e) ? `${V(e.kind) ?? "update"} ${typeof e.path == "string" ? e.path : "unknown"}` : JSON.stringify(e)).join("\n") || void 0;
+	if (Array.isArray(e)) return e.map((e) => V(e) && typeof e.text == "string" ? e.text : JSON.stringify(e)).filter(Boolean).join("\n\n") || void 0;
 }
-function H(e) {
+function Yn(e) {
+	return e.map((e) => V(e) ? `${Vn(e.kind) ?? "update"} ${typeof e.path == "string" ? e.path : "unknown"}` : JSON.stringify(e)).join("\n") || void 0;
+}
+function V(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
-function Yn(e) {
+function Xn(e) {
 	return e !== void 0 && Buffer.byteLength(e) <= yn ? e : void 0;
 }
-function U(e) {
-	if (!(e === void 0 || !Xn(e, yn))) return e;
+function H(e) {
+	if (!(e === void 0 || !Zn(e, yn))) return e;
 }
-function Xn(e, t) {
-	if (Zn(e, t, /* @__PURE__ */ new Set())) return !1;
+function Zn(e, t) {
+	if (Qn(e, t, /* @__PURE__ */ new Set())) return !1;
 	try {
 		let n = JSON.stringify(e);
 		return n !== void 0 && Buffer.byteLength(n) <= t;
@@ -1994,28 +1994,28 @@ function Xn(e, t) {
 		return !1;
 	}
 }
-function Zn(e, t, n) {
+function Qn(e, t, n) {
 	if (typeof e == "string") return Buffer.byteLength(e) > t;
 	if (typeof e != "object" || !e) return !1;
 	if (n.has(e)) return !0;
 	n.add(e);
-	let r = (Array.isArray(e) ? e : Object.values(e)).some((e) => Zn(e, t, n));
+	let r = (Array.isArray(e) ? e : Object.values(e)).some((e) => Qn(e, t, n));
 	return n.delete(e), r;
 }
 //#endregion
 //#region src/node/codex-surface-message-state.ts
-function Qn(e) {
+function $n(e) {
 	for (let t = e.length - 1; t >= 0; --t) {
 		let n = e[t];
 		if (n?.status === "inProgress") return n.id;
 	}
 	return null;
 }
-function W(e, t, n, r = {}) {
-	let i = [...e], a = q(i, (e) => e.metadata?.turnId === n), o = a >= 0 ? i[a] : void 0;
+function U(e, t, n, r = {}) {
+	let i = [...e], a = K(i, (e) => e.metadata?.turnId === n), o = a >= 0 ? i[a] : void 0;
 	if (o?.role === "assistant" && o.kind === void 0 && o.status === "streaming") return i;
 	if (r.forceSegment) {
-		let e = q(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), t = e >= 0 ? i[e] : void 0;
+		let e = K(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), t = e >= 0 ? i[e] : void 0;
 		t?.parts.length === 0 ? i.splice(e, 1) : t && i.splice(e, 1, {
 			...t,
 			status: "complete"
@@ -2035,9 +2035,9 @@ function W(e, t, n, r = {}) {
 		}
 	}), i;
 }
-function $n(e, t, n, r, i, a) {
+function er(e, t, n, r, i, a) {
 	if (!i) return [...e];
-	let o = W(e, t, n), s = q(o, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), c = s >= 0 ? o[s] : void 0;
+	let o = U(e, t, n), s = K(o, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), c = s >= 0 ? o[s] : void 0;
 	if (!c) return o;
 	let l = [...c.parts], u = l.at(-1);
 	return u?.type === "text" && u.itemId === r ? l.splice(l.length - 1, 1, {
@@ -2053,9 +2053,9 @@ function $n(e, t, n, r, i, a) {
 		...c,
 		status: "streaming",
 		parts: l
-	}), K(o, t);
+	}), G(o, t);
 }
-function er(e, t, n, r, i) {
+function tr(e, t, n, r, i) {
 	let a = i.map((e, t) => {
 		let n = e.trim();
 		return n ? {
@@ -2066,16 +2066,16 @@ function er(e, t, n, r, i) {
 		} : null;
 	}).filter((e) => e !== null);
 	if (a.length === 0) return [...e];
-	let o = W(e, t, n), s = q(o, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), c = s >= 0 ? o[s] : void 0;
+	let o = U(e, t, n), s = K(o, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), c = s >= 0 ? o[s] : void 0;
 	if (!c) return o;
 	let l = c.parts.findIndex((e) => e.type === "reasoning" && e.itemId === r), u = c.parts.filter((e) => e.type !== "reasoning" || e.itemId !== r);
 	return u.splice(l >= 0 ? l : u.length, 0, ...a), o.splice(s, 1, {
 		...c,
 		status: "streaming",
 		parts: u
-	}), K(o, t);
+	}), G(o, t);
 }
-function tr(e, t, n, r, i, a) {
+function nr(e, t, n, r, i, a) {
 	let o = [...e];
 	for (let e = o.length - 1; e >= 0; --e) {
 		let s = o[e];
@@ -2091,9 +2091,9 @@ function tr(e, t, n, r, i, a) {
 		}), o.splice(e, 1, {
 			...s,
 			parts: l
-		}), K(o, t);
+		}), G(o, t);
 	}
-	let s = W(o, t, n), c = q(s, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), l = c >= 0 ? s[c] : void 0;
+	let s = U(o, t, n), c = K(s, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), l = c >= 0 ? s[c] : void 0;
 	if (!l) return s;
 	let u = {
 		type: "text",
@@ -2104,10 +2104,10 @@ function tr(e, t, n, r, i, a) {
 	return s.splice(c, 1, {
 		...l,
 		parts: [...l.parts, u]
-	}), K(s, t);
+	}), G(s, t);
 }
-function nr(e, t, n, r) {
-	return K(e.map((e) => {
+function rr(e, t, n, r) {
+	return G(e.map((e) => {
 		if (e.role !== "assistant" || e.metadata?.turnId !== n) return e;
 		let t = e.parts.filter((e) => e.type !== "text" || e.itemId !== r);
 		return t.length === e.parts.length ? e : {
@@ -2116,16 +2116,16 @@ function nr(e, t, n, r) {
 		};
 	}), t);
 }
-function rr(e) {
+function ir(e) {
 	let t = /<proposed_plan>([\s\S]*?)<\/proposed_plan>/iu.exec(e), n = t?.[1]?.trim() ?? "";
 	return !t || !n ? null : {
 		markdown: n,
 		visibleText: `${e.slice(0, t.index)}${e.slice(t.index + t[0].length)}`.trim()
 	};
 }
-function G(e, t, n, r) {
+function W(e, t, n, r) {
 	let i = [...e], a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "tool" && e.id === r.id));
-	a < 0 && (i = W(i, t, n), a = q(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
+	a < 0 && (i = U(i, t, n), a = K(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
 	let o = a >= 0 ? i[a] : void 0;
 	if (!o) return i;
 	let s = [...o.parts], c = s.findIndex((e) => e.type === "tool" && e.id === r.id);
@@ -2137,7 +2137,7 @@ function G(e, t, n, r) {
 			body: r.body ?? e.body,
 			input: r.input ?? e.input,
 			output: r.output ?? e.output,
-			statusText: r.statusText ?? ur(e.statusText, r.status),
+			statusText: r.statusText ?? dr(e.statusText, r.status),
 			metadata: {
 				...e.metadata ?? {},
 				...r.metadata ?? {}
@@ -2147,11 +2147,11 @@ function G(e, t, n, r) {
 	return i.splice(a, 1, {
 		...o,
 		parts: s
-	}), K(i, t);
+	}), G(i, t);
 }
-function ir(e, t, n, r, i = r.itemId) {
+function ar(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 = W(a, t, n), o = q(a, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
+	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);
@@ -2159,25 +2159,25 @@ function ir(e, t, n, r, i = r.itemId) {
 		...s,
 		status: "streaming",
 		parts: c
-	}), K(a, t);
+	}), G(a, t);
 }
-function ar(e, t, n, r) {
+function or(e, t, n, r) {
 	let i = [...e], a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "question" && e.request.id === r.request.id));
-	a < 0 && (i = W(i, t, n), a = q(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
+	a < 0 && (i = U(i, t, n), a = K(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
 	let o = a >= 0 ? i[a] : void 0;
 	if (!o) return i;
 	let s = [...o.parts], c = s.findIndex((e) => e.type === "question" && e.request.id === r.request.id);
 	return c >= 0 ? s.splice(c, 1, r) : s.push(r), i.splice(a, 1, {
 		...o,
 		parts: s
-	}), K(i, t);
+	}), G(i, t);
 }
-function or(e, t) {
+function sr(e, t) {
 	return e.itemId === t.itemId && e.media.url === t.media.url && e.media.alt === t.media.alt && e.media.mimeType === t.media.mimeType && e.media.prompt === t.media.prompt && e.media.title === t.media.title;
 }
-function sr(e, t, n, r) {
+function cr(e, t, n, r) {
 	let i = [...e], a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "tool" && e.id === r.itemId));
-	if (a < 0) return r.fallbackToolPart ? sr(G(i, t, n, r.fallbackToolPart), t, n, {
+	if (a < 0) return r.fallbackToolPart ? cr(W(i, t, n, r.fallbackToolPart), t, n, {
 		...r,
 		fallbackToolPart: void 0
 	}) : i;
@@ -2203,12 +2203,12 @@ function sr(e, t, n, r) {
 		parts: s
 	}), i) : i;
 }
-function cr(e, t, n, r = "streaming") {
+function lr(e, t, n, r = "streaming") {
 	if (e.some((e) => e.kind === "compaction" && e.metadata?.turnId === n)) return e.map((e) => r === "complete" && e.kind === "compaction" && e.metadata?.turnId === n ? {
 		...e,
 		status: r
 	} : e);
-	let i = [...e], a = q(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), o = a >= 0 ? i[a] : void 0;
+	let i = [...e], a = K(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), o = a >= 0 ? i[a] : void 0;
 	return o?.parts.length === 0 ? i.splice(a, 1) : o && i.splice(a, 1, {
 		...o,
 		status: "complete"
@@ -2224,16 +2224,16 @@ function cr(e, t, n, r = "streaming") {
 			conversationId: t,
 			turnId: n
 		}
-	}), K(i, t);
+	}), G(i, t);
 }
-function lr(e, t, n) {
+function ur(e, t, n) {
 	let r = n === "completed" ? "completed" : "failed";
 	return e.map((e) => {
 		if (e.metadata?.turnId !== t) return e;
 		let n = !1, i = e.parts.map((e) => e.type !== "tool" || e.status !== "running" ? e : (n = !0, {
 			...e,
 			status: r,
-			statusText: ur(e.statusText, r)
+			statusText: dr(e.statusText, r)
 		}));
 		return n ? {
 			...e,
@@ -2241,7 +2241,7 @@ function lr(e, t, n) {
 		} : e;
 	});
 }
-function ur(e, t) {
+function dr(e, t) {
 	if (t === "running" || !e) return e;
 	try {
 		let n = JSON.parse(e);
@@ -2253,27 +2253,27 @@ function ur(e, t) {
 		return e;
 	}
 }
-function K(e, t) {
+function G(e, t) {
 	let n = e.map((e, t) => ({
 		message: e,
 		index: t
 	})).filter(({ message: e }) => e.metadata?.conversationId === t).at(-1)?.index ?? -1;
 	return e.filter((e, r) => e.metadata?.conversationId !== t || r === n || e.role !== "assistant" || e.kind !== void 0 || e.parts.length > 0);
 }
-function q(e, t) {
+function K(e, t) {
 	for (let n = e.length - 1; n >= 0; --n) {
 		let r = e[n];
 		if (r !== void 0 && t(r)) return n;
 	}
 	return -1;
 }
-function dr(e, t) {
+function fr(e, t) {
 	return e.includes(t) ? [...e] : [...e, t];
 }
-function fr(e, t) {
+function pr(e, t) {
 	return [e?.trim() ?? "", ...t.map((e) => `${e.status === "completed" ? "- [x]" : "- [ ]"} ${e.step}`)].filter(Boolean).join("\n");
 }
-function pr(e, t, n) {
+function mr(e, t, n) {
 	return {
 		type: "tool",
 		id: `plan-progress-${e}`,
@@ -2296,19 +2296,19 @@ function pr(e, t, n) {
 }
 //#endregion
 //#region src/node/codex-conversation-history.ts
-var mr = 16 * 1024 * 1024, hr = /* @__PURE__ */ new Set([
+var hr = 16 * 1024 * 1024, gr = /* @__PURE__ */ new Set([
 	"image/avif",
 	"image/gif",
 	"image/jpeg",
 	"image/png",
 	"image/webp"
 ]);
-function gr(e) {
-	return (Array.isArray(e.turns) ? e.turns : []).flatMap((t) => yr(e.id, t));
+function _r(e) {
+	return (Array.isArray(e.turns) ? e.turns : []).flatMap((t) => br(e.id, t));
 }
-function _r(e, t) {
+function vr(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 || Nr(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 || Pr(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;
@@ -2327,9 +2327,9 @@ function _r(e, t) {
 		} : e;
 	});
 }
-function vr(e, t) {
+function yr(e, t) {
 	let n = new Map(e.filter((e) => e.role === "user" && e.metadata?.promptContent).map((e) => [e.id, e.metadata.promptContent]));
-	return _r(e, t).map((e) => {
+	return vr(e, t).map((e) => {
 		let t = n.get(e.id);
 		if (!t || e.role !== "user") return e;
 		let r = ne(t);
@@ -2346,14 +2346,14 @@ function vr(e, t) {
 		};
 	});
 }
-function yr(e, t) {
-	let n = [], r = [], i = Lr(t.startedAt ?? t.completedAt), a = 0, o = !1, s = /* @__PURE__ */ new Set(), c = () => {
+function br(e, t) {
+	let n = [], r = [], i = Rr(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: Ir(t.status),
+			status: Lr(t.status),
 			turnId: t.id,
 			parts: [...r],
 			createdAt: i,
@@ -2365,7 +2365,7 @@ function yr(e, t) {
 	};
 	for (let a of Array.isArray(t.items) ? t.items : []) {
 		if (a.type === "userMessage") {
-			let r = wr(a), l = Er(a);
+			let r = Tr(a), l = Dr(a);
 			if (r.length > 0) {
 				let u = o, d = u ? null : JSON.stringify(r);
 				if (d && s.has(d)) continue;
@@ -2382,7 +2382,7 @@ function yr(e, t) {
 						turnId: t.id,
 						...l.length > 0 ? {
 							asyncQuestionRequestIds: l,
-							asyncQuestionAnswers: Dr(a)
+							asyncQuestionAnswers: Or(a)
 						} : {}
 					}
 				});
@@ -2408,7 +2408,7 @@ function yr(e, t) {
 			continue;
 		}
 		if (a.type === "agentMessage") {
-			let n = typeof a.text == "string" ? a.text : "", i = xr(e, t.id, a, !0), s = a.phase === "final_answer" ? rr(n) : null;
+			let n = typeof a.text == "string" ? a.text : "", i = Sr(e, t.id, a, !0), s = a.phase === "final_answer" ? ir(n) : null;
 			s && !i ? s.visibleText && (o = !0, r.push({
 				type: "text",
 				text: s.visibleText,
@@ -2446,15 +2446,15 @@ function yr(e, t) {
 		}
 		let l = R(a);
 		l && (o = !0, r.push(l));
-		let u = Cr(a);
+		let u = wr(a);
 		u.length && (o = !0, r.push(...u));
 	}
-	return c(), t.status === "inProgress" ? n : lr(n, t.id, t.status);
+	return c(), t.status === "inProgress" ? n : ur(n, t.id, t.status);
 }
-function br(e, t, n) {
-	let r = Lr(t.startedAt);
+function xr(e, t, n) {
+	let r = Rr(t.startedAt);
 	if (n.type === "userMessage") {
-		let i = wr(n), a = Er(n);
+		let i = Tr(n), a = Dr(n);
 		return i.length > 0 ? {
 			id: n.clientId ?? `user-${e}-${t.id}-${n.id}`,
 			role: "user",
@@ -2468,13 +2468,13 @@ function br(e, t, n) {
 				itemId: n.id,
 				...a.length > 0 ? {
 					asyncQuestionRequestIds: a,
-					asyncQuestionAnswers: Dr(n)
+					asyncQuestionAnswers: Or(n)
 				} : {}
 			}
 		} : null;
 	}
 	if (n.type === "agentMessage" || n.type === "exitedReviewMode") {
-		let i = n.type === "agentMessage" ? n.text : n.review, a = n.type === "agentMessage" && n.phase === "final_answer" ? rr(i) : null, o = n.type === "agentMessage" ? xr(e, t.id, n, !0) : null, s = [...!o && (a?.visibleText || !a && i) ? [{
+		let i = n.type === "agentMessage" ? n.text : n.review, a = n.type === "agentMessage" && n.phase === "final_answer" ? ir(i) : null, o = n.type === "agentMessage" ? Sr(e, t.id, n, !0) : null, s = [...!o && (a?.visibleText || !a && i) ? [{
 			type: "text",
 			text: a?.visibleText ?? i,
 			itemId: n.id,
@@ -2483,7 +2483,7 @@ function br(e, t, n) {
 		return s.length > 0 ? {
 			id: `assistant-${n.id}`,
 			role: "assistant",
-			status: Ir(t.status),
+			status: Lr(t.status),
 			turnId: t.id,
 			parts: s,
 			createdAt: r,
@@ -2507,7 +2507,7 @@ function br(e, t, n) {
 		return i.length > 0 ? {
 			id: `assistant-${n.id}`,
 			role: "assistant",
-			status: Ir(t.status),
+			status: Lr(t.status),
 			turnId: t.id,
 			parts: i,
 			createdAt: r,
@@ -2519,11 +2519,11 @@ function br(e, t, n) {
 		} : null;
 	}
 	let i = [], a = R(n);
-	a && i.push(a), i.push(...Cr(n));
+	a && i.push(a), i.push(...wr(n));
 	let o = i.length > 0 ? {
 		id: `assistant-${n.id}`,
 		role: "assistant",
-		status: Ir(t.status),
+		status: Lr(t.status),
 		turnId: t.id,
 		parts: i,
 		createdAt: r,
@@ -2533,9 +2533,9 @@ function br(e, t, n) {
 			itemId: n.id
 		}
 	} : null;
-	return !o || t.status === "inProgress" ? o : lr([o], t.id, t.status)[0] ?? null;
+	return !o || t.status === "inProgress" ? o : ur([o], t.id, t.status)[0] ?? null;
 }
-function xr(e, t, n, r = !1) {
+function Sr(e, t, n, r = !1) {
 	if (n.delivery !== "async") return null;
 	let i = n.questions ?? [], a = i.length > 0 ? i.map((e, t) => ({
 		id: JSON.stringify([
@@ -2577,9 +2577,9 @@ function xr(e, t, n, r = !1) {
 		...r ? { historical: !0 } : {}
 	};
 }
-function Sr(e) {
+function Cr(e) {
 	if (e.type !== "imageGeneration" || R(e)?.status !== "completed") return null;
-	let t = typeof e.savedPath == "string" && v(e.savedPath) ? e.savedPath : null, n = t ? jr(t) : void 0, r = n && hr.has(n) ? t : null, i = Mr(typeof e.result == "string" ? e.result.trim() : ""), a = i?.url ?? (r ? oe(r).href : void 0);
+	let t = typeof e.savedPath == "string" && v(e.savedPath) ? e.savedPath : null, n = t ? Mr(t) : void 0, r = n && gr.has(n) ? t : null, i = Nr("result" in e && typeof e.result == "string" ? e.result.trim() : ""), a = i?.url ?? (r ? oe(r).href : void 0);
 	if (!a) return null;
 	let o = typeof e.revisedPrompt == "string" ? e.revisedPrompt.trim() : "";
 	return {
@@ -2594,8 +2594,8 @@ function Sr(e) {
 		}
 	};
 }
-function Cr(e) {
-	let t = Sr(e);
+function wr(e) {
+	let t = Cr(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 [];
@@ -2604,7 +2604,7 @@ function Cr(e) {
 		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 = Mr(a);
+		let o = Nr(a);
 		o && (i -= o.url.length, r.push({
 			type: "media",
 			itemId: r.length ? `${e.id}:image:${r.length}` : e.id,
@@ -2618,21 +2618,21 @@ function Cr(e) {
 	}
 	return r;
 }
-function wr(e) {
-	let t = Array.isArray(e.content) ? e.content : [], n = t.some((e) => J(e) && e.type === "text" && typeof e.text == "string" && e.text.length > 0), r = [], i = [], a = /* @__PURE__ */ new Set(), o = () => {
+function Tr(e) {
+	let t = Array.isArray(e.content) ? e.content : [], n = t.some((e) => q(e) && e.type === "text" && typeof e.text == "string" && e.text.length > 0), r = [], i = [], a = /* @__PURE__ */ new Set(), o = () => {
 		i.length > 0 && r.push({
 			type: "text",
 			text: i.join("\n")
 		}), i = [];
 	};
 	for (let e of t) {
-		if (J(e) && e.type === "skill" && typeof e.name == "string") {
+		if (q(e) && e.type === "skill" && typeof e.name == "string") {
 			if (n) continue;
 			let t = e.name.toLowerCase();
 			if (a.has(t)) continue;
 			a.add(t);
 		}
-		let t = Tr(e), s = Nt(t);
+		let t = Er(e), s = Nt(t);
 		if (s) {
 			o(), r.push({
 				type: "attachment",
@@ -2647,7 +2647,7 @@ function wr(e) {
 			i.push(t);
 			continue;
 		}
-		let c = kr(e);
+		let c = Ar(e);
 		c && (o(), r.push({
 			type: "attachment",
 			attachment: c
@@ -2655,26 +2655,26 @@ function wr(e) {
 	}
 	return o(), r;
 }
-function Tr(e) {
-	return !J(e) || typeof e.type != "string" ? "" : e.type === "text" && typeof e.text == "string" ? Or(e.text)?.displayText ?? e.text : e.type === "skill" && typeof e.name == "string" ? `$${e.name}` : "";
-}
 function Er(e) {
+	return !q(e) || typeof e.type != "string" ? "" : e.type === "text" && typeof e.text == "string" ? kr(e.text)?.displayText ?? e.text : e.type === "skill" && typeof e.name == "string" ? `$${e.name}` : "";
+}
+function Dr(e) {
 	let t = /* @__PURE__ */ new Set();
-	for (let n of Array.isArray(e.content) ? e.content : []) if (!(!J(n) || n.type !== "text" || typeof n.text != "string")) for (let e of Or(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 kr(n.text)?.requestIds ?? []) t.add(e);
 	return [...t];
 }
-function Dr(e) {
+function Or(e) {
 	let t = {};
-	for (let n of Array.isArray(e.content) ? e.content : []) !J(n) || n.type !== "text" || typeof n.text != "string" || Object.assign(t, Or(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, kr(n.text)?.answers);
 	return t;
 }
-function Or(e) {
+function kr(e) {
 	let t = e.match(/^<send_user_message_question_reply>\s*([\s\S]*?)\s*<\/send_user_message_question_reply>$/);
 	if (!t?.[1]) return null;
 	try {
 		let e = JSON.parse(t[1]);
 		if (!Array.isArray(e)) return null;
-		let n = e.filter((e) => J(e) && typeof e.questionItemId == "string" && typeof e.question == "string" && typeof e.answer == "string");
+		let n = e.filter((e) => q(e) && typeof e.questionItemId == "string" && typeof e.question == "string" && typeof e.answer == "string");
 		if (n.length === 0) return null;
 		let r = n.flatMap((e) => {
 			try {
@@ -2692,10 +2692,10 @@ function Or(e) {
 		return null;
 	}
 }
-function kr(e) {
-	if (!J(e) || typeof e.type != "string") return null;
+function Ar(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() : Ar(e.path, "File"), n = jr(e.path);
+		let t = typeof e.name == "string" && e.name.trim() ? e.name.trim() : jr(e.path, "File"), n = Mr(e.path);
 		return {
 			kind: "file",
 			name: t,
@@ -2704,26 +2704,26 @@ function kr(e) {
 		};
 	}
 	if (e.type === "image" && typeof e.url == "string") {
-		let t = jr(e.url);
+		let t = Mr(e.url);
 		return {
 			kind: "image",
-			name: Ar(e.url, "Image"),
+			name: jr(e.url, "Image"),
 			url: e.url,
 			...t ? { mimeType: t } : {}
 		};
 	}
 	if (e.type === "localImage" && typeof e.path == "string") {
-		let t = jr(e.path);
+		let t = Mr(e.path);
 		return {
 			kind: "image",
-			name: Ar(e.path, "Image"),
+			name: jr(e.path, "Image"),
 			path: e.path,
 			...t ? { mimeType: t } : {}
 		};
 	}
 	return null;
 }
-function Ar(e, t) {
+function jr(e, t) {
 	try {
 		let n = /^[a-z][a-z\d+.-]*:/i.test(e) ? new URL(e).pathname : e;
 		return g(decodeURIComponent(n)).trim() || t;
@@ -2731,7 +2731,7 @@ function Ar(e, t) {
 		return g(e).trim() || t;
 	}
 }
-function jr(e) {
+function Mr(e) {
 	let t = /^data:([^;,]+)/i.exec(e)?.[1]?.toLowerCase();
 	if (t) return t;
 	let n = "";
@@ -2753,23 +2753,23 @@ function jr(e) {
 		webp: "image/webp"
 	}[n];
 }
-function Mr(e) {
+function Nr(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(mr / 3) * 4 + 4;
+	let t = (/^data:image\/[a-z0-9.+-]+;base64,([a-z0-9+/=\s]+)$/i.exec(e)?.[1] ?? e).replace(/\s+/g, ""), n = Math.ceil(hr / 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 > mr) return null;
-	let i = Pr(r);
+	if (r.byteLength === 0 || r.byteLength > hr) return null;
+	let i = Fr(r);
 	return i ? {
 		url: `data:${i};base64,${t}`,
 		mimeType: i
 	} : null;
 }
-function Nr(e) {
+function Pr(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 Pr(e) {
-	if (Fr(e, [
+function Fr(e) {
+	if (Ir(e, [
 		137,
 		80,
 		78,
@@ -2779,7 +2779,7 @@ function Pr(e) {
 		26,
 		10
 	])) return "image/png";
-	if (Fr(e, [
+	if (Ir(e, [
 		255,
 		216,
 		255
@@ -2787,50 +2787,50 @@ function Pr(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 Fr(e, t) {
+function Ir(e, t) {
 	return t.every((t, n) => e[n] === t);
 }
-function Ir(e) {
+function Lr(e) {
 	return e === "inProgress" ? "streaming" : e === "failed" ? "error" : "complete";
 }
-function Lr(e) {
+function Rr(e) {
 	return typeof e != "number" || !Number.isFinite(e) ? (/* @__PURE__ */ new Date(0)).toISOString() : (/* @__PURE__ */ new Date(e * 1e3)).toISOString();
 }
-function J(e) {
+function q(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
 //#endregion
 //#region src/node/codex-raw-response-item-adapter.ts
-function Rr(e) {
-	if (!qr(e) || typeof e.type != "string") return null;
+function zr(e) {
+	if (!Jr(e) || typeof e.type != "string") return null;
 	if (e.type === "local_shell_call") {
-		let t = R(zr(e));
+		let t = R(Br(e));
 		return {
-			type: Ur(e.status) ? "item.completed" : "item.started",
+			type: Wr(e.status) ? "item.completed" : "item.started",
 			payload: { toolPart: t }
 		};
 	}
 	return e.type === "function_call" ? {
 		type: "item.started",
-		payload: { toolPart: R(Br(e)) }
-	} : e.type === "function_call_output" ? Vr(e.call_id, e.output) : e.type === "custom_tool_call" ? {
+		payload: { toolPart: R(Vr(e)) }
+	} : e.type === "function_call_output" ? Hr(e.call_id, e.output) : e.type === "custom_tool_call" ? {
 		type: "item.started",
 		payload: { toolPart: R({
 			type: "dynamicToolCall",
-			id: X(e.call_id) ?? Y(e),
+			id: Y(e.call_id) ?? J(e),
 			namespace: null,
-			tool: X(e.name) ?? "custom_tool",
+			tool: Y(e.name) ?? "custom_tool",
 			status: e.status,
-			arguments: X(e.input) ?? "",
+			arguments: Y(e.input) ?? "",
 			contentItems: null,
 			success: null,
 			durationMs: null
 		}) }
-	} : e.type === "custom_tool_call_output" ? Vr(e.call_id, e.output, X(e.name) ?? void 0) : e.type === "tool_search_call" ? {
+	} : e.type === "custom_tool_call_output" ? Hr(e.call_id, e.output, Y(e.name) ?? void 0) : e.type === "tool_search_call" ? {
 		type: "item.started",
 		payload: { toolPart: R({
 			type: "dynamicToolCall",
-			id: X(e.call_id) ?? Y(e),
+			id: Y(e.call_id) ?? J(e),
 			namespace: "codex",
 			tool: "tool_search",
 			status: e.status,
@@ -2842,20 +2842,20 @@ function Rr(e) {
 		}) }
 	} : e.type === "tool_search_output" ? {
 		type: "item.updated",
-		payload: Tn(X(e.call_id) ?? Y(e), e.tools, "tool_search", e.status)
+		payload: Tn(Y(e.call_id) ?? J(e), e.tools, "tool_search", e.status)
 	} : e.type === "web_search_call" ? {
 		type: "item.completed",
 		payload: { toolPart: R({
 			type: "webSearch",
-			id: Y(e),
-			query: Gr(e.action),
+			id: J(e),
+			query: Kr(e.action),
 			action: e.action
 		}) }
 	} : e.type === "image_generation_call" ? {
 		type: "item.completed",
 		payload: { toolPart: R({
 			type: "dynamicToolCall",
-			id: X(e.id) ?? Y(e),
+			id: Y(e.id) ?? J(e),
 			namespace: null,
 			tool: "image_generation",
 			status: e.status,
@@ -2866,29 +2866,29 @@ function Rr(e) {
 		}) }
 	} : null;
 }
-function zr(e) {
-	let t = qr(e.action) ? e.action : {}, n = Array.isArray(t.command) ? Kr(t.command) : X(t.command) ?? "local shell";
+function Br(e) {
+	let t = Jr(e.action) ? e.action : {}, n = Array.isArray(t.command) ? qr(t.command) : Y(t.command) ?? "local shell";
 	return {
 		type: "commandExecution",
-		id: X(e.call_id) ?? Y(e),
+		id: Y(e.call_id) ?? J(e),
 		command: n,
-		cwd: X(t.working_directory) ?? "",
+		cwd: Y(t.working_directory) ?? "",
 		processId: null,
 		source: "agent",
-		status: Hr(e.status),
+		status: Ur(e.status),
 		commandActions: [],
 		aggregatedOutput: null,
 		exitCode: null,
 		durationMs: null
 	};
 }
-function Br(e) {
-	let t = X(e.name) ?? "function_call", n = Wr(e.arguments), r = X(e.call_id) ?? Y(e);
-	return t === "shell_command" && qr(n) ? {
+function Vr(e) {
+	let t = Y(e.name) ?? "function_call", n = Gr(e.arguments), r = Y(e.call_id) ?? J(e);
+	return t === "shell_command" && Jr(n) ? {
 		type: "commandExecution",
 		id: r,
-		command: X(n.command) ?? t,
-		cwd: X(n.workdir) ?? X(n.cwd) ?? "",
+		command: Y(n.command) ?? t,
+		cwd: Y(n.workdir) ?? Y(n.cwd) ?? "",
 		processId: null,
 		source: "agent",
 		status: "inProgress",
@@ -2899,7 +2899,7 @@ function Br(e) {
 	} : {
 		type: "dynamicToolCall",
 		id: r,
-		namespace: X(e.namespace),
+		namespace: Y(e.namespace),
 		tool: t,
 		status: "inProgress",
 		arguments: n,
@@ -2908,19 +2908,19 @@ function Br(e) {
 		durationMs: null
 	};
 }
-function Vr(e, t, n) {
+function Hr(e, t, n) {
 	return {
 		type: "item.updated",
-		payload: Tn(X(e) ?? "raw-response-output", t, n)
+		payload: Tn(Y(e) ?? "raw-response-output", t, n)
 	};
 }
-function Hr(e) {
+function Ur(e) {
 	return e === "completed" ? "completed" : e === "incomplete" || e === "failed" || e === "error" ? "failed" : "inProgress";
 }
-function Ur(e) {
+function Wr(e) {
 	return e === "completed" || e === "failed" || e === "error" || e === "incomplete";
 }
-function Wr(e) {
+function Gr(e) {
 	if (typeof e != "string") return e;
 	try {
 		return JSON.parse(e);
@@ -2928,54 +2928,54 @@ function Wr(e) {
 		return e;
 	}
 }
-function Gr(e) {
-	return qr(e) ? X(e.query) ?? X(e.searchTerm) ?? "web search" : "web search";
-}
 function Kr(e) {
+	return Jr(e) ? Y(e.query) ?? Y(e.searchTerm) ?? "web search" : "web search";
+}
+function qr(e) {
 	return e.map((e) => {
 		let t = String(e);
 		return /\s/.test(t) ? JSON.stringify(t) : t;
 	}).join(" ");
 }
-function Y(e) {
-	return (X(e.call_id) ?? X(e.id)) || `raw-${e.type}`;
+function J(e) {
+	return (Y(e.call_id) ?? Y(e.id)) || `raw-${e.type}`;
 }
-function X(e) {
+function Y(e) {
 	return typeof e == "string" && e.length > 0 ? e : null;
 }
-function qr(e) {
+function Jr(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
 //#endregion
 //#region src/node/codex-surface-events.ts
-function Jr(e, t) {
+function Yr(e, t) {
 	return `${e}\u0000${t}`;
 }
-function Yr(e) {
+function Xr(e) {
 	return typeof e == "number" && Number.isFinite(e) ? (/* @__PURE__ */ new Date(e * 1e3)).toISOString() : (/* @__PURE__ */ new Date()).toISOString();
 }
-function Xr(e) {
+function Zr(e) {
 	return typeof e == "number" && Number.isFinite(e) ? (/* @__PURE__ */ new Date(e * 1e3)).toISOString() : null;
 }
-function Zr(e) {
+function Qr(e) {
 	return e ? {
 		message: e.message,
 		additionalDetails: e.additionalDetails,
 		codexErrorInfo: e.codexErrorInfo
 	} : null;
 }
-function Z(e, t = !1) {
+function X(e, t = !1) {
 	return {
 		id: e.id,
 		status: e.status,
-		error: Zr(e.error),
+		error: Qr(e.error),
 		willRetry: t,
-		startedAt: Xr(e.startedAt),
-		completedAt: Xr(e.completedAt),
+		startedAt: Zr(e.startedAt),
+		completedAt: Zr(e.completedAt),
 		durationMs: e.durationMs ?? null
 	};
 }
-function Q(e, t) {
+function Z(e, t) {
 	let n = e.findIndex((e) => e.id === t.id);
 	if (n < 0) return [...e, t];
 	let r = [...e];
@@ -2984,18 +2984,18 @@ function Q(e, t) {
 		startedAt: t.startedAt ?? e[n].startedAt
 	}), r;
 }
-function Qr(e, t) {
+function $r(e, t) {
 	return JSON.stringify(e) === JSON.stringify(t);
 }
-function $r() {
+function ei() {
 	return `user-${globalThis.crypto.randomUUID()}`;
 }
-function ei() {
+function ti() {
 	return `queued-prompt-${globalThis.crypto.randomUUID()}`;
 }
 //#endregion
 //#region src/node/codex-surface-subagents.ts
-function ti(e) {
+function ni(e) {
 	let t = {};
 	for (let [n, r] of Object.entries(e.agentsStates)) r && (t[n] = {
 		status: r.status,
@@ -3015,7 +3015,7 @@ function ti(e) {
 }
 //#endregion
 //#region src/node/codex-surface-items-controller.ts
-var ni = class {
+var ri = class {
 	host;
 	commandOutputForwardItemIds = /* @__PURE__ */ new Set();
 	fileActivityKeys = /* @__PURE__ */ new Set();
@@ -3033,13 +3033,13 @@ var ni = class {
 		for (let e of this.reviewOutputByTurn.keys()) e.startsWith(t) && this.reviewOutputByTurn.delete(e);
 	}
 	isForwardingCommandOutput(e, t) {
-		return this.commandOutputForwardItemIds.has(Jr(e, t));
+		return this.commandOutputForwardItemIds.has(Yr(e, t));
 	}
 	applyAgentDelta(e) {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
 		let n = t.messages.flatMap((e) => e.parts).find((t) => t.type === "text" && t.itemId === e.itemId)?.phase;
-		this.host.patchRuntime(e.threadId, { messages: $n(t.messages, e.threadId, e.turnId, e.itemId, e.delta, n) });
+		this.host.patchRuntime(e.threadId, { messages: er(t.messages, e.threadId, e.turnId, e.itemId, e.delta, n) });
 		let r = this.host.assistantMessageForTurn(e.threadId, e.turnId);
 		r && this.host.emitEvent("notification", {
 			type: "message.delta",
@@ -3057,7 +3057,7 @@ var ni = class {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
 		let n = `${t.planMarkdownByTurn.get(e.turnId) ?? ""}${e.delta}`;
-		t.planMarkdownByTurn.set(e.turnId, n), this.host.patchRuntime(e.threadId, { messages: G(t.messages, e.threadId, e.turnId, pr(e.turnId, n, "running")) }), this.host.emitEvent("notification", {
+		t.planMarkdownByTurn.set(e.turnId, n), this.host.patchRuntime(e.threadId, { messages: W(t.messages, e.threadId, e.turnId, mr(e.turnId, n, "running")) }), this.host.emitEvent("notification", {
 			type: "plan.delta",
 			conversationId: e.threadId,
 			turnId: e.turnId,
@@ -3071,7 +3071,7 @@ var ni = class {
 	applyPlanUpdated(e) {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
-		let n = fr(e.explanation, e.plan), r = (/* @__PURE__ */ new Date()).toISOString();
+		let n = pr(e.explanation, e.plan), r = (/* @__PURE__ */ new Date()).toISOString();
 		t.planMarkdownByTurn.set(e.turnId, n), this.host.patchRuntime(e.threadId, {
 			executionPlan: {
 				turnId: e.turnId,
@@ -3080,7 +3080,7 @@ var ni = class {
 				markdown: n,
 				updatedAt: r
 			},
-			messages: G(t.messages, e.threadId, e.turnId, pr(e.turnId, n, "completed"))
+			messages: W(t.messages, e.threadId, e.turnId, mr(e.turnId, n, "completed"))
 		}), this.host.emitEvent("notification", {
 			type: "plan.updated",
 			conversationId: e.threadId,
@@ -3096,13 +3096,13 @@ var ni = class {
 	applyRawResponseItem(e) {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
-		let n = Rr(e.item);
+		let n = zr(e.item);
 		if (!n) return;
 		if (n.type === "item.updated") {
 			this.applyToolUpdate(e.threadId, e.turnId, n.payload);
 			return;
 		}
-		this.host.patchRuntime(e.threadId, { messages: G(t.messages, e.threadId, e.turnId, n.payload.toolPart) });
+		this.host.patchRuntime(e.threadId, { messages: W(t.messages, e.threadId, e.turnId, n.payload.toolPart) });
 		let r = this.host.messageContainingTool(e.threadId, e.turnId, n.payload.toolPart.id);
 		r && (this.host.emitEvent("notification", {
 			type: n.type === "item.completed" ? "tool.completed" : "tool.started",
@@ -3123,7 +3123,7 @@ var ni = class {
 			startedAt: ("startedAtMs" in e ? e.startedAtMs : e.completedAtMs) / 1e3
 		};
 		if (e.item.type === "userMessage") {
-			let t = br(e.threadId, i, e.item);
+			let t = xr(e.threadId, i, e.item);
 			if (!t || n.messages.some((e) => e.id === t.id)) return;
 			let a = n.messages.some((t) => t.role === "assistant" && t.metadata?.turnId === e.turnId && t.parts.length > 0), o = !a && r ? n.messages.map((e) => e.role === "user" && e.kind !== "steer" && !e.turnId && JSON.stringify(e.parts) === JSON.stringify(t.parts)).lastIndexOf(!0) : -1;
 			if (o >= 0) {
@@ -3149,7 +3149,7 @@ var ni = class {
 				...t,
 				kind: "steer"
 			} : t, c = [...n.messages, s];
-			this.host.patchRuntime(e.threadId, { messages: a ? W(c, e.threadId, e.turnId, { forceSegment: !0 }) : c }), this.host.emitEvent("notification", {
+			this.host.patchRuntime(e.threadId, { messages: a ? U(c, e.threadId, e.turnId, { forceSegment: !0 }) : c }), this.host.emitEvent("notification", {
 				type: "message.appended",
 				conversationId: e.threadId,
 				turnId: e.turnId,
@@ -3160,7 +3160,7 @@ var ni = class {
 		if (e.item.type === "reasoning") {
 			if (e.item.summary.filter((e) => e.trim().length > 0).length === 0) return;
 			let t = this.host.assistantMessageForTurn(e.threadId, e.turnId), r = t ? JSON.stringify(t.parts) : null;
-			this.host.patchRuntime(e.threadId, { messages: er(n.messages, e.threadId, e.turnId, e.item.id, e.item.summary) });
+			this.host.patchRuntime(e.threadId, { messages: tr(n.messages, e.threadId, e.turnId, e.item.id, e.item.summary) });
 			let i = this.host.assistantMessageForTurn(e.threadId, e.turnId);
 			if (!i || JSON.stringify(i.parts) === r) return;
 			this.host.emitEvent("notification", {
@@ -3172,10 +3172,10 @@ var ni = class {
 			return;
 		}
 		if (e.item.type === "agentMessage" && t && n.planMode && e.item.phase === "final_answer") {
-			let t = rr(e.item.text);
+			let t = ir(e.item.text);
 			if (t) {
-				let r = this.host.assistantMessageForTurn(e.threadId, e.turnId), i = nr(n.messages, e.threadId, e.turnId, e.item.id);
-				t.visibleText && (i = tr(i, e.threadId, e.turnId, e.item.id, t.visibleText, e.item.phase)), i = G(i, e.threadId, e.turnId, pr(e.turnId, t.markdown, "completed")), n.planMarkdownByTurn.set(e.turnId, t.markdown), this.host.patchRuntime(e.threadId, { messages: i });
+				let r = this.host.assistantMessageForTurn(e.threadId, e.turnId), i = rr(n.messages, e.threadId, e.turnId, e.item.id);
+				t.visibleText && (i = nr(i, e.threadId, e.turnId, e.item.id, t.visibleText, e.item.phase)), i = W(i, e.threadId, e.turnId, mr(e.turnId, t.markdown, "completed")), n.planMarkdownByTurn.set(e.turnId, t.markdown), this.host.patchRuntime(e.threadId, { messages: i });
 				let a = this.host.assistantMessageForTurn(e.threadId, e.turnId);
 				a && this.host.emitEvent("notification", {
 					type: r ? "message.updated" : "message.appended",
@@ -3197,11 +3197,11 @@ var ni = 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 = Jr(e.threadId, e.turnId);
+			let i = Yr(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" ? xr(e.threadId, e.turnId, e.item) : null, d = u ? "" : t, f = u ? nr(n.messages, e.threadId, e.turnId, e.item.id) : tr(n.messages, e.threadId, e.turnId, e.item.id, t, r);
-			if (u && (f = ar(f, e.threadId, e.turnId, u)), this.host.patchRuntime(e.threadId, { messages: f }), !d && !u) return;
+			let a = new Set(n.messages.map((e) => e.id)), o = this.host.assistantMessageForTurn(e.threadId, e.turnId), s = o ? JSON.stringify(o.parts) : null, c = new Set(o?.parts.flatMap((e) => e.type === "question" ? [e.request.id] : []) ?? []), l = n.messages.flatMap((e) => e.parts).find((t) => t.type === "text" && t.itemId === e.item.id)?.text ?? "", u = e.item.type === "agentMessage" ? Sr(e.threadId, e.turnId, e.item) : null, d = u ? "" : t, f = u ? rr(n.messages, e.threadId, e.turnId, e.item.id) : nr(n.messages, e.threadId, e.turnId, e.item.id, t, r);
+			if (u && (f = or(f, e.threadId, e.turnId, u)), this.host.patchRuntime(e.threadId, { messages: f }), !d && !u) return;
 			let p = this.host.assistantMessageForTurn(e.threadId, e.turnId);
 			if (p && !a.has(p.id)) this.host.emitEvent("notification", {
 				type: "message.appended",
@@ -3245,7 +3245,7 @@ var ni = class {
 		if (e.item.type === "plan") {
 			if (!t) return;
 			let r = e.item.text.trim() || n.planMarkdownByTurn.get(e.turnId) || "";
-			n.planMarkdownByTurn.set(e.turnId, r), this.host.patchRuntime(e.threadId, { messages: G(n.messages, e.threadId, e.turnId, pr(e.turnId, r, "completed")) }), this.host.emitEvent("notification", {
+			n.planMarkdownByTurn.set(e.turnId, r), this.host.patchRuntime(e.threadId, { messages: W(n.messages, e.threadId, e.turnId, mr(e.turnId, r, "completed")) }), this.host.emitEvent("notification", {
 				type: "plan.completed",
 				conversationId: e.threadId,
 				turnId: e.turnId,
@@ -3257,7 +3257,7 @@ var ni = class {
 			return;
 		}
 		if (e.item.type === "contextCompaction") {
-			if (this.host.patchRuntime(e.threadId, { messages: cr(n.messages, e.threadId, e.turnId, t ? "complete" : "streaming") }), t) {
+			if (this.host.patchRuntime(e.threadId, { messages: lr(n.messages, e.threadId, e.turnId, t ? "complete" : "streaming") }), t) {
 				let t = this.host.requireRuntime(e.threadId).messages.find((t) => t.kind === "compaction" && t.metadata?.turnId === e.turnId);
 				t && this.host.emitEvent("notification", {
 					type: "context.compactionCompleted",
@@ -3283,7 +3283,7 @@ var ni = class {
 				turnId: e.turnId,
 				payload: {
 					lifecycle: t ? "completed" : "started",
-					toolCall: ti(e.item)
+					toolCall: ni(e.item)
 				}
 			});
 			return;
@@ -3308,10 +3308,10 @@ var ni = class {
 		let a = this.shouldForwardCommandOutput(e.threadId, t, e.item), o = R(e.item, {
 			includeCommandOutput: a,
 			cwd: n.cwd
-		}), s = Cr(e.item);
+		}), s = wr(e.item);
 		if (!o && !s.length) return;
-		let c = s.some((e) => !n.messages.some((t) => t.parts.some((t) => t.type === "media" && or(t, e)))), l = o ? G(n.messages, e.threadId, e.turnId, o) : [...n.messages];
-		for (let t of s) l = ir(l, e.threadId, e.turnId, t, e.item.id);
+		let c = s.some((e) => !n.messages.some((t) => t.parts.some((t) => t.type === "media" && sr(t, e)))), l = o ? W(n.messages, e.threadId, e.turnId, o) : [...n.messages];
+		for (let t of s) l = ar(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", {
@@ -3332,7 +3332,7 @@ var ni = class {
 	shouldForwardCommandOutput(e, t, n) {
 		let r = "id" in n && typeof n.id == "string" ? n.id : null;
 		if (!r) return !1;
-		let i = Jr(e, r);
+		let i = Yr(e, r);
 		if (!t) {
 			let e = xn(n);
 			return e ? this.commandOutputForwardItemIds.add(i) : this.commandOutputForwardItemIds.delete(i), e;
@@ -3343,14 +3343,14 @@ var ni = class {
 	applyToolUpdate(e, t, n) {
 		let r = this.host.requireRuntime(e);
 		this.host.markRuntimeTurnActive(r, t);
-		let i = r.cwd && ri(n) ? {
+		let i = r.cwd && ii(n) ? {
 			...n,
 			metadata: {
 				...n.metadata,
 				cwd: r.cwd
 			}
 		} : n;
-		this.host.patchRuntime(e, { messages: sr(r.messages, e, t, i) });
+		this.host.patchRuntime(e, { messages: cr(r.messages, e, t, i) });
 		let a = this.host.messageContainingTool(e, t, n.itemId);
 		a && this.host.emitEvent("notification", {
 			type: "tool.updated",
@@ -3386,7 +3386,7 @@ var ni = class {
 		t.turnIds.includes(e.turn.id) || t.turnIds.push(e.turn.id);
 		let n = t.activeTurnId !== e.turn.id && t.turnStartPending;
 		t.activeTurnId === e.turn.id && (t.activeTurnId = null);
-		let r = n || t.activeTurnId !== null, i = e.turn.status === "failed" ? "error" : "complete", a = lr(t.messages, e.turn.id, e.turn.status).map((t) => t.metadata?.turnId === e.turn.id ? {
+		let r = n || t.activeTurnId !== null, i = e.turn.status === "failed" ? "error" : "complete", a = ur(t.messages, e.turn.id, e.turn.status).map((t) => t.metadata?.turnId === e.turn.id ? {
 			...t,
 			status: i
 		} : t).filter((t) => !(t.role === "assistant" && t.metadata?.turnId === e.turn.id && t.kind === void 0 && t.parts.length === 0));
@@ -3398,7 +3398,7 @@ var ni = class {
 			},
 			turnStartPending: n,
 			messages: a,
-			turns: Q(t.turns, Z(e.turn))
+			turns: Z(t.turns, X(e.turn))
 		}), this.host.patch({ conversations: this.host.getState().conversations.map((n) => n.id === e.threadId ? {
 			...n,
 			status: r ? "active" : e.turn.status === "failed" ? "error" : "idle",
@@ -3412,26 +3412,26 @@ var ni = class {
 			turnId: e.turn.id,
 			payload: {
 				status: e.turn.status,
-				error: Zr(e.turn.error),
+				error: Qr(e.turn.error),
 				willRetry: !1,
-				startedAt: Xr(e.turn.startedAt),
-				completedAt: Xr(e.turn.completedAt),
+				startedAt: Zr(e.turn.startedAt),
+				completedAt: Zr(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 ri(e) {
+function ii(e) {
 	if (e.fallbackToolPart?.kind === "fileChange") return !0;
 	let t = e.input, n = e.metadata;
-	return ii(t) && Array.isArray(t.changes) || ii(n) && Array.isArray(n.changes);
+	return ai(t) && Array.isArray(t.changes) || ai(n) && Array.isArray(n.changes);
 }
-function ii(e) {
+function ai(e) {
 	return typeof e == "object" && !!e;
 }
 //#endregion
 //#region src/node/codex-surface-client-requests-controller.ts
-var ai = class {
+var oi = class {
 	host;
 	pending = /* @__PURE__ */ new Map();
 	constructor(e) {
@@ -3480,12 +3480,12 @@ var ai = class {
 			"deny"
 		].includes(r)) throw Error(`Invalid tool confirmation decision '${String(r)}'`);
 		this.pending.delete(t.id);
-		let i = this.host.requireRuntime(n.threadId), a = dr(i.answeredClientRequestIds, t.id);
+		let i = this.host.requireRuntime(n.threadId), a = fr(i.answeredClientRequestIds, t.id);
 		if (n.kind === "ask_user") {
 			let e = t.payload?.answers ?? {};
 			n.responder.resolve({ answers: e }), this.host.patchRuntime(n.threadId, {
 				answeredClientRequestIds: a,
-				messages: sr(i.messages, n.threadId, n.turnId, {
+				messages: cr(i.messages, n.threadId, n.turnId, {
 					itemId: n.itemId,
 					output: { answers: e }
 				})
@@ -3494,7 +3494,7 @@ var ai = class {
 			let e = r;
 			n.responder.resolve(et(e)), this.host.patchRuntime(n.threadId, {
 				answeredClientRequestIds: a,
-				messages: sr(i.messages, n.threadId, n.displayTurnId, {
+				messages: cr(i.messages, n.threadId, n.displayTurnId, {
 					itemId: n.itemId,
 					output: { decision: e }
 				})
@@ -3533,7 +3533,7 @@ var ai = class {
 ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ? s[0].answer : s.map((e) => `${e.question}: ${e.answer}`).join("\n");
 			await this.host.answerAsyncQuestion(a.runtime.threadId, e, t);
 		}
-		this.host.patchRuntime(a.runtime.threadId, { answeredClientRequestIds: dr(a.runtime.answeredClientRequestIds, t.id) }), this.host.emitEvent("action", {
+		this.host.patchRuntime(a.runtime.threadId, { answeredClientRequestIds: fr(a.runtime.answeredClientRequestIds, t.id) }), this.host.emitEvent("action", {
 			type: "clientRequest.resolved",
 			conversationId: a.runtime.threadId,
 			...a.request.turnId ? { turnId: a.request.turnId } : {},
@@ -3548,7 +3548,7 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 		let n = this.pending.get(e);
 		if (this.pending.delete(e), n) {
 			let t = this.host.requireRuntime(n.threadId);
-			this.host.patchRuntime(n.threadId, { answeredClientRequestIds: dr(t.answeredClientRequestIds, e) });
+			this.host.patchRuntime(n.threadId, { answeredClientRequestIds: fr(t.answeredClientRequestIds, e) });
 		}
 		this.maybeClearWaitingBusy(t), n && this.host.emitEvent("notification", {
 			type: "clientRequest.resolved",
@@ -3596,7 +3596,7 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 			responder: t
 		}), this.host.patchRuntime(n, {
 			busy: !0,
-			messages: G(o.messages, n, r, {
+			messages: W(o.messages, n, r, {
 				type: "tool",
 				id: i,
 				kind: "generic",
@@ -3695,7 +3695,7 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 		};
 		this.host.patchRuntime(n.threadId, {
 			busy: !0,
-			messages: G(o.messages, n.threadId, s, f)
+			messages: W(o.messages, n.threadId, s, f)
 		});
 		let p = this.host.messageContainingTool(n.threadId, s, l);
 		return p && this.host.emitEvent("notification", {
@@ -3713,8 +3713,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;
 	}
-}, oi = 256 * 1024;
-function si(e) {
+}, si = 256 * 1024;
+function ci(e) {
 	return {
 		id: e.id,
 		model: e.model,
@@ -3739,11 +3739,11 @@ function si(e) {
 		}
 	};
 }
-async function ci(e, t) {
-	return Promise.all(e.filter((e) => e.enabled).map((e) => li(e, t)));
-}
 async function li(e, t) {
-	let n = $(e.interface?.brandColor), r = hi(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) => ui(e, t)));
+}
+async function ui(e, t) {
+	let n = Q(e.interface?.brandColor), r = gi(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,
@@ -3758,8 +3758,8 @@ async function li(e, t) {
 		enabled: e.enabled
 	};
 }
-async function ui(e, t) {
-	let n = e.interface, r = fi(n?.composerIconUrl), i = fi(n?.logoUrl), a = fi(n?.logoUrlDark), o = $(n?.displayName) ?? e.name, s = $(n?.shortDescription), c = $(n?.longDescription), l = $(n?.brandColor), u = r ?? i ?? await di([n?.composerIcon, n?.logo], t), d = r ?? a ?? i ?? await di([
+async function di(e, t) {
+	let n = e.interface, r = pi(n?.composerIconUrl), i = pi(n?.logoUrl), a = pi(n?.logoUrlDark), o = Q(n?.displayName) ?? e.name, s = Q(n?.shortDescription), c = Q(n?.longDescription), l = Q(n?.brandColor), u = r ?? i ?? await fi([n?.composerIcon, n?.logo], t), d = r ?? a ?? i ?? await fi([
 		n?.composerIcon,
 		n?.logoDark,
 		n?.logo
@@ -3776,20 +3776,20 @@ async function ui(e, t) {
 		enabled: e.enabled
 	};
 }
-async function di(e, t) {
+async function fi(e, t) {
 	for (let n of e) {
 		if (!n) continue;
 		let e = await t(n);
 		if (e) return e;
 	}
 }
-function fi(e) {
-	let t = $(e);
+function pi(e) {
+	let t = Q(e);
 	try {
 		return new URL(t).protocol === "https:" ? t : void 0;
 	} catch {}
 }
-function pi(e) {
+function mi(e) {
 	switch (_(e).toLowerCase()) {
 		case ".avif": return "image/avif";
 		case ".bmp": return "image/bmp";
@@ -3802,23 +3802,23 @@ function pi(e) {
 		case ".webp": return "image/webp";
 	}
 }
-function mi(e, t) {
+function hi(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) > oi)) return `data:${e};base64,${`${r}${"=".repeat((4 - r.length % 4) % 4)}`}`;
+	if (!(i !== 0 && i !== a) && !(Math.floor(r.length * 3 / 4) > si)) return `data:${e};base64,${`${r}${"=".repeat((4 - r.length % 4) % 4)}`}`;
 }
-function $(e) {
+function Q(e) {
 	return (typeof e == "string" ? e.trim() : void 0) || void 0;
 }
-function hi(e) {
+function gi(e) {
 	return typeof e == "string" ? e : void 0;
 }
 //#endregion
 //#region src/node/codex-surface-catalog-controller.ts
-var gi = class {
+var _i = class {
 	client;
 	cwd;
 	host;
@@ -3853,7 +3853,7 @@ var gi = 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 ci((await this.client.request("skills/list", {
+			let n = await li((await this.client.request("skills/list", {
 				...this.cwd ? { cwds: [this.cwd] } : {},
 				forceReload: e
 			})).data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e));
@@ -3870,7 +3870,7 @@ var gi = class {
 	}
 	async listSkills(e = {}) {
 		await this.host.ensureConnected(), e.forceReload && this.iconDataUrls.clear();
-		let t = await ci((await this.client.request("skills/list", {
+		let t = await li((await this.client.request("skills/list", {
 			...e.cwd ? { cwds: [e.cwd] } : {},
 			forceReload: e.forceReload ?? !1
 		})).data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e));
@@ -3924,7 +3924,7 @@ var gi = class {
 		}), (async () => ({
 			profiles: await this.requestPermissionProfiles(e),
 			requirements: (await this.client.request("configRequirements/read", void 0)).requirements
-		}))()]), a = r.status === "fulfilled" ? await ci(r.value.data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e)) : [], o = i.status === "fulfilled" ? i.value.profiles : [];
+		}))()]), a = r.status === "fulfilled" ? await li(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",
@@ -3956,7 +3956,7 @@ var gi = class {
 				cursor: n,
 				includeHidden: e
 			});
-			t.push(...r.data.map(si)), n = r.nextCursor;
+			t.push(...r.data.map(ci)), n = r.nextCursor;
 		} while (n);
 		return t;
 	}
@@ -4026,7 +4026,7 @@ var gi = 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 = Kt(this.host.getState().plugins, await Promise.all([...n.values()].map((e) => ui(e, (e) => this.iconDataUrl(e)))));
+			let r = Kt(this.host.getState().plugins, await Promise.all([...n.values()].map((e) => di(e, (e) => this.iconDataUrl(e)))));
 			if (this.host.isClosed() || this.host.authenticationBlocksBootstrap()) return;
 			this.host.patch({
 				plugins: r,
@@ -4057,9 +4057,9 @@ var gi = class {
 	}
 	async readIconDataUrl(e) {
 		if (!v(e)) return;
-		let t = pi(e);
+		let t = mi(e);
 		if (t) try {
-			return mi(t, (await this.client.request("fs/readFile", { path: e })).dataBase64);
+			return hi(t, (await this.client.request("fs/readFile", { path: e })).dataBase64);
 		} catch {
 			return;
 		}
@@ -4067,18 +4067,18 @@ var gi = class {
 };
 //#endregion
 //#region src/node/codex-approvals.ts
-function _i(e, t) {
+function vi(e, t) {
 	let n = [
 		e.onServerRequest("item/commandExecution/requestApproval", (e, n) => (t({
-			approval: vi(e.id, e.params),
-			resolve: (t, r) => n.resolve({ decision: xi(e.params, t, r) })
+			approval: yi(e.id, e.params),
+			resolve: (t, r) => n.resolve({ decision: Si(e.params, t, r) })
 		}), !0)),
 		e.onServerRequest("item/fileChange/requestApproval", (e, n) => (t({
-			approval: yi(e.id, e.params),
+			approval: bi(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: bi(e.id, e.params),
+			approval: xi(e.id, e.params),
 			resolve: (t, r) => n.resolve({
 				permissions: t === "deny" ? {} : {
 					...e.params.permissions.fileSystem ? { fileSystem: e.params.permissions.fileSystem } : {},
@@ -4116,8 +4116,8 @@ function _i(e, t) {
 		for (let e of n) e();
 	};
 }
-function vi(e, t) {
-	let n = t.availableDecisions, r = Si(t.additionalPermissions), i = [...t.networkApprovalContext ? [{
+function yi(e, t) {
+	let n = t.availableDecisions, r = Ci(t.additionalPermissions), i = [...t.networkApprovalContext ? [{
 		kind: "network",
 		enabled: !0,
 		host: t.networkApprovalContext.host,
@@ -4140,7 +4140,7 @@ function vi(e, t) {
 		} : {}
 	};
 }
-function yi(e, t) {
+function bi(e, t) {
 	return {
 		id: String(e),
 		kind: "file-change",
@@ -4151,8 +4151,8 @@ function yi(e, t) {
 		...t.reason || t.grantRoot ? { description: t.reason ?? `Write under ${t.grantRoot}` } : {}
 	};
 }
-function bi(e, t) {
-	let n = Si(t.permissions);
+function xi(e, t) {
+	let n = Ci(t.permissions);
 	return {
 		id: String(e),
 		kind: "permissions",
@@ -4165,13 +4165,13 @@ function bi(e, t) {
 		...n.length ? { requestedPermissions: n } : {}
 	};
 }
-function xi(e, t, n) {
+function Si(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 Si(e) {
+function Ci(e) {
 	if (!e) return [];
 	let t = [];
 	if (e.network && t.push({
@@ -4191,12 +4191,12 @@ function Si(e) {
 		for (let n of e.fileSystem.entries ?? []) t.push({
 			kind: "filesystem",
 			access: n.access,
-			path: Ci(n.path)
+			path: wi(n.path)
 		});
 	}
 	return t;
 }
-function Ci(e) {
+function wi(e) {
 	if (e.type === "path") return e.path;
 	if (e.type === "glob_pattern") return e.pattern;
 	let t = e.value;
@@ -4211,12 +4211,12 @@ function Ci(e) {
 }
 //#endregion
 //#region src/node/codex-surface-approvals-controller.ts
-var wi = class {
+var Ti = class {
 	host;
 	pending = /* @__PURE__ */ new Map();
 	unsubscribeHandler;
 	constructor(e, t) {
-		this.host = t, this.unsubscribeHandler = _i(e, (e) => this.add(e));
+		this.host = t, this.unsubscribeHandler = vi(e, (e) => this.add(e));
 	}
 	close() {
 		this.unsubscribeHandler(), this.pending.clear();
@@ -4297,7 +4297,7 @@ var wi = class {
 };
 //#endregion
 //#region src/node/codex-surface-mcp.ts
-function Ti(e) {
+function Ei(e) {
 	if (!Array.isArray(e)) throw TypeError("Codex MCP servers must be an array");
 	let t = /* @__PURE__ */ new Set();
 	return e.map((e, n) => {
@@ -4306,10 +4306,10 @@ function Ti(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 = Ei(e.transport, r), a = e.toolApprovalMode;
+		let i = Di(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 : Di(e.enabledTools, `Codex MCP server '${r}' enabled tool`), s = ki(e.startupTimeoutMs, `Codex MCP server '${r}' startup timeout`), c = ki(e.toolTimeoutMs, `Codex MCP server '${r}' tool timeout`);
+		let o = e.enabledTools === void 0 ? void 0 : Oi(e.enabledTools, `Codex MCP server '${r}' enabled tool`), s = Ai(e.startupTimeoutMs, `Codex MCP server '${r}' startup timeout`), c = Ai(e.toolTimeoutMs, `Codex MCP server '${r}' tool timeout`);
 		return {
 			name: r,
 			transport: i,
@@ -4321,7 +4321,7 @@ function Ti(e) {
 		};
 	});
 }
-function Ei(e, t) {
+function Di(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;
@@ -4339,7 +4339,7 @@ function Ei(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 : Di(e.args, `Codex MCP server '${t}' argument`), i = e.cwd?.trim();
+	let r = e.args === void 0 ? void 0 : Oi(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) {
@@ -4350,7 +4350,7 @@ function Ei(e, t) {
 			a[n] = r;
 		}
 	}
-	let o = e.envVars === void 0 ? void 0 : Oi(e.envVars, t);
+	let o = e.envVars === void 0 ? void 0 : ki(e.envVars, t);
 	return {
 		type: "stdio",
 		command: n,
@@ -4360,7 +4360,7 @@ function Ei(e, t) {
 		...o === void 0 ? {} : { envVars: o }
 	};
 }
-function Di(e, t) {
+function Oi(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`);
@@ -4368,18 +4368,18 @@ function Di(e, t) {
 	});
 	return [...new Set(n)];
 }
-function Oi(e, t) {
-	let n = Di(e, `Codex MCP server '${t}' environment variable`);
+function ki(e, t) {
+	let n = Oi(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 ki(e, t) {
+function Ai(e, t) {
 	if (e !== void 0) {
 		if (!Number.isFinite(e) || e <= 0) throw TypeError(`${t} must be a positive finite number`);
 		return e;
 	}
 }
-function Ai(e) {
+function ji(e) {
 	let t = {};
 	for (let n of e) {
 		let e = n.transport.type === "http" ? { url: n.transport.url } : {
@@ -4393,7 +4393,7 @@ function Ai(e) {
 	}
 	return t;
 }
-function ji(e, t) {
+function Mi(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) {
@@ -4404,13 +4404,13 @@ function ji(e, t) {
 }
 //#endregion
 //#region src/node/codex-surface-extensions-controller.ts
-var Mi = class {
+var Ni = class {
 	extensions;
 	hostOptionsForThread;
 	dynamicTools = /* @__PURE__ */ new Map();
 	defaultMcpServers;
 	constructor(e, t, n) {
-		this.extensions = e, this.hostOptionsForThread = n, this.defaultMcpServers = Ti(t);
+		this.extensions = e, this.hostOptionsForThread = n, this.defaultMcpServers = Ei(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");
@@ -4434,13 +4434,13 @@ var Mi = class {
 		}));
 	}
 	async conversationExtension(e, t = {}, n = this.defaultMcpServers) {
-		let r = Ai(n), i = [], a;
+		let r = ji(n), i = [], a;
 		for (let t of this.extensions) {
 			if (!t.configureConversation) continue;
 			let o = await t.configureConversation(e);
-			o.config && (ji(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 && (Mi(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 && (ji(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 && (Mi(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") }
@@ -4499,7 +4499,7 @@ var Mi = class {
 			});
 		}
 	}
-}, Ni = 50, Pi = 25, Fi = 25, Ii = class {
+}, Pi = 50, Fi = 25, Ii = 25, Li = class {
 	client;
 	conversationLimit;
 	host;
@@ -4568,7 +4568,7 @@ var Mi = class {
 					let t = await this.client.request("thread/turns/list", {
 						threadId: e,
 						cursor: null,
-						limit: Ni,
+						limit: Pi,
 						sortDirection: "desc",
 						itemsView: "full"
 					});
@@ -4616,7 +4616,7 @@ var Mi = class {
 					let i = new Set(this.host.requireRuntime(e).turnIds), a = await this.client.request("thread/turns/list", {
 						threadId: e,
 						cursor: t,
-						limit: Pi,
+						limit: Fi,
 						sortDirection: "desc",
 						itemsView: "full"
 					}), o = [...a.data].reverse(), s = new Set(o.map((e) => e.id).filter((e) => !i.has(e)));
@@ -4647,8 +4647,8 @@ var Mi = class {
 	}
 	async emitHistoryChunks(e, t) {
 		for (let n = t.length; n > 0;) {
-			let r = Math.max(0, n - Fi);
-			this.host.emitHistoryPrepended(e, t.slice(r, n), "lifecycle"), await Li(), n = r;
+			let r = Math.max(0, n - Ii);
+			this.host.emitHistoryPrepended(e, t.slice(r, n), "lifecycle"), await Ri(), n = r;
 		}
 	}
 	async refreshCompleteHistory(e) {
@@ -4684,10 +4684,10 @@ var Mi = class {
 		let i = /* @__PURE__ */ new Set();
 		r.activeTurnId && i.add(r.activeTurnId);
 		for (let e of t) e.status === "inProgress" && r.turnIds.includes(e.id) && i.add(e.id);
-		let a = new Set(t.filter((e) => !i.has(e.id)).map((e) => e.id)), o = t.filter((e) => a.has(e.id)), s = r.turnIds.filter((e) => !a.has(e)), c = r.turns.filter((e) => !a.has(e.id)), l = r.messages.filter((e) => e.turnId === void 0 || !a.has(e.turnId)), u = vr(r.messages, o.flatMap((t) => yr(e, t)));
+		let a = new Set(t.filter((e) => !i.has(e.id)).map((e) => e.id)), o = t.filter((e) => a.has(e.id)), s = r.turnIds.filter((e) => !a.has(e)), c = r.turns.filter((e) => !a.has(e.id)), l = r.messages.filter((e) => e.turnId === void 0 || !a.has(e.turnId)), u = yr(r.messages, o.flatMap((t) => br(e, t)));
 		this.host.patchRuntime(e, {
 			turnIds: [...o.map((e) => e.id), ...s],
-			turns: [...o.map((e) => Z(e)), ...c],
+			turns: [...o.map((e) => X(e)), ...c],
 			messages: [...u, ...l]
 		});
 		let d = this.host.requireRuntime(e).turnIds.length, f = this.host.getState();
@@ -4711,12 +4711,12 @@ var Mi = class {
 		} : t;
 	}
 };
-function Li() {
+function Ri() {
 	return new Promise((e) => setTimeout(e, 0));
 }
 //#endregion
 //#region src/node/codex-surface-conversation-settings-controller.ts
-var Ri = class {
+var zi = class {
 	client;
 	defaults;
 	host;
@@ -4789,7 +4789,7 @@ var Ri = 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 = !Qr(r.goal, a.goal);
+		let o = !$r(r.goal, a.goal);
 		this.host.patchRuntime(e, { goal: { ...a.goal } }), o && this.host.emitEvent("action", {
 			type: "conversation.goalChanged",
 			conversationId: e,
@@ -4811,7 +4811,7 @@ var Ri = class {
 			payload: { goal: null }
 		});
 	}
-}, zi = "Review the current code changes (staged, unstaged, and untracked files) and provide prioritized findings.", Bi = class {
+}, Bi = "Review the current code changes (staged, unstaged, and untracked files) and provide prioritized findings.", Vi = class {
 	client;
 	host;
 	constructor(e, t) {
@@ -4848,22 +4848,22 @@ var Ri = class {
 			if (i.reviewThreadId !== e) throw Error(`Codex review/start returned unexpected review thread '${i.reviewThreadId}' for inline review on thread '${e}'`);
 			let a = n.turnIds.includes(i.turn.id);
 			n.activeTurnId = i.turn.status === "inProgress" ? i.turn.id : null, n.turnIds.includes(i.turn.id) || n.turnIds.push(i.turn.id), this.host.patchConversationTurnCount(e, n.turnIds.length, "action");
-			let o = yr(e, i.turn).filter((e) => !n.messages.some((t) => t.id === e.id)).map((e) => e.role === "user" ? {
+			let o = br(e, i.turn).filter((e) => !n.messages.some((t) => t.id === e.id)).map((e) => e.role === "user" ? {
 				...e,
 				parts: r.type === "uncommittedChanges" ? e.parts.map((e) => e.type === "text" && e.text === "current changes" ? {
 					...e,
-					text: zi
+					text: Bi
 				} : e) : e.parts,
 				metadata: {
 					...e.metadata,
 					reviewPrompt: !0
 				}
-			} : e), s = Vi(n.messages, i.turn.id, o);
+			} : e), s = Hi(n.messages, i.turn.id, o);
 			this.host.patchRuntime(e, {
 				busy: n.activeTurnId !== null,
 				turnStartPending: !1,
-				turns: Q(n.turns, Z(i.turn)),
-				messages: n.activeTurnId ? W(s, e, i.turn.id) : s
+				turns: Z(n.turns, X(i.turn)),
+				messages: n.activeTurnId ? U(s, e, i.turn.id) : s
 			});
 			for (let t of o) this.host.emitEvent("action", {
 				type: "message.appended",
@@ -4875,7 +4875,7 @@ var Ri = class {
 				type: "turn.started",
 				conversationId: e,
 				turnId: i.turn.id,
-				payload: { startedAt: Yr(i.turn.startedAt) }
+				payload: { startedAt: Xr(i.turn.startedAt) }
 			}), this.host.emitConversationActivity(e, "action");
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
@@ -4936,28 +4936,10 @@ var Ri = class {
 	async rollbackToTurn(e, t) {
 		let n = await this.host.ensureThreadReady(e);
 		if (n.busy) throw Error("Cannot roll back while Codex is responding");
+		if (n.historyMode !== "paginated") throw Error("Legacy conversation history does not support deleting, editing, or retrying turns with app-server 0.164.0. Start a new conversation to use these actions.");
 		let r = n.turnIds.indexOf(t);
 		if (r < 0 && (await this.host.hydrateCompleteHistory(e), r = n.turnIds.indexOf(t)), r < 0) throw Error(`Cannot roll back to unknown Codex turn '${t}'`);
-		if (n.historyMode === "paginated") {
-			await this.revertPaginatedThread(e, t, r, n);
-			return;
-		}
-		let i = await this.client.request("thread/rollback", {
-			threadId: e,
-			numTurns: n.turnIds.length - r
-		});
-		if (i.thread.id !== e) throw Error(`Codex thread/rollback returned '${i.thread.id}' for requested thread '${e}'`);
-		n.turnIds = i.thread.turns.map((e) => e.id), n.turns = i.thread.turns.map((e) => Z(e)), n.activeTurnId = null;
-		let a = P(i.thread);
-		this.host.patch({ conversations: F(this.host.getState().conversations, a) }), this.host.patchRuntime(e, {
-			messages: vr(n.messages, gr(i.thread)),
-			answeredClientRequestIds: [],
-			busy: !1,
-			turnStartPending: !1,
-			error: null,
-			contextUsage: null,
-			turnGitDiff: null
-		}), this.host.emitSummaryUpserted(a, "updated", "action"), this.host.emitHistoryReplaced(e, "rollback", "action"), this.host.emitConversationActivity(e, "action");
+		await this.revertPaginatedThread(e, t, r, n);
 	}
 	async revertPaginatedThread(e, t, n, r) {
 		let i = await this.client.request("thread/revert", {
@@ -4993,7 +4975,7 @@ var Ri = class {
 		return e;
 	}
 };
-function Vi(e, t, n) {
+function Hi(e, t, n) {
 	let r = e.findIndex((e) => e.turnId === t);
 	return r < 0 ? [...e, ...n] : [
 		...e.slice(0, r),
@@ -5003,7 +4985,7 @@ function Vi(e, t, n) {
 }
 //#endregion
 //#region src/node/codex-surface-messages-controller.ts
-var Hi = class {
+var Ui = class {
 	client;
 	host;
 	constructor(e, t) {
@@ -5090,13 +5072,13 @@ var Hi = class {
 			this.host.patchRuntime(e, {
 				busy: i,
 				turnStartPending: !1,
-				turns: Q(t.turns, Z(n.turn)),
-				messages: i ? W(t.messages, e, n.turn.id) : t.messages
+				turns: Z(t.turns, X(n.turn)),
+				messages: i ? U(t.messages, e, n.turn.id) : t.messages
 			}), this.host.patchConversationStatus(e, i ? "active" : "idle", "action"), i && !r && this.host.emitEvent("action", {
 				type: "turn.started",
 				conversationId: e,
 				turnId: n.turn.id,
-				payload: { startedAt: Yr(n.turn.startedAt) }
+				payload: { startedAt: Xr(n.turn.startedAt) }
 			}), this.host.emitConversationActivity(e, "action");
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
@@ -5112,13 +5094,13 @@ var Hi = class {
 		let s = o ? ie(o) : r?.trim() || t, c = ct(E(ot(o), i.skills), E(a.skills ?? [], i.skills)), l = Jt(a.attachments ?? []);
 		if (i.busy) {
 			this.host.patchRuntime(e, { queuedPrompts: [...i.queuedPrompts, {
-				id: ei(),
+				id: ti(),
 				text: s,
 				...Object.keys(a).length > 0 ? { options: a } : {}
 			}] }), this.emitQueuedPrompts(e);
 			return;
 		}
-		let u = $r(), d = {
+		let u = ei(), d = {
 			id: u,
 			role: "user",
 			status: "complete",
@@ -5176,8 +5158,8 @@ var Hi = class {
 			this.host.patchRuntime(e, {
 				busy: s,
 				turnStartPending: !1,
-				turns: Q(i.turns, Z(n.turn)),
-				messages: s ? W(d, e, n.turn.id) : d
+				turns: Z(i.turns, X(n.turn)),
+				messages: s ? U(d, e, n.turn.id) : d
 			}), this.host.patchConversationStatus(e, s ? "active" : "idle", "action");
 			let f = d.find((e) => e.id === u);
 			f && this.host.emitEvent("action", {
@@ -5189,7 +5171,7 @@ var Hi = class {
 				type: "turn.started",
 				conversationId: e,
 				turnId: n.turn.id,
-				payload: { startedAt: Yr(n.turn.startedAt) }
+				payload: { startedAt: Xr(n.turn.startedAt) }
 			}), this.host.emitConversationActivity(e, "action");
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
@@ -5207,7 +5189,7 @@ var Hi = class {
 		let i = await this.host.ensureThreadReady(e), a = t.trim(), o = at(n.content), s = ct(E(ot(o), i.skills), E(n.skills ?? [], i.skills)), c = o ? ie(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 = Jt(n.attachments ?? []), u = $r(), d = {
+		let l = Jt(n.attachments ?? []), u = ei(), d = {
 			id: u,
 			kind: "steer",
 			role: "user",
@@ -5227,7 +5209,7 @@ var Hi = class {
 		};
 		this.host.patchRuntime(e, {
 			error: null,
-			messages: W([...i.messages, d], e, i.activeTurnId, { forceSegment: !0 })
+			messages: U([...i.messages, d], e, i.activeTurnId, { forceSegment: !0 })
 		}), this.host.emitEvent("action", {
 			type: "message.appended",
 			conversationId: e,
@@ -5254,7 +5236,7 @@ var Hi = class {
 					}))
 				]
 			}), n = i.turnIds.includes(t.turnId);
-			i.activeTurnId = t.turnId, i.turnIds.includes(t.turnId) || i.turnIds.push(t.turnId), i.turns = Q(i.turns, {
+			i.activeTurnId = t.turnId, i.turnIds.includes(t.turnId) || i.turnIds.push(t.turnId), i.turns = Z(i.turns, {
 				id: t.turnId,
 				status: "inProgress",
 				error: null,
@@ -5271,7 +5253,7 @@ var Hi = class {
 					turnId: t.turnId
 				}
 			} : e);
-			this.host.patchRuntime(e, { messages: K(W(r, e, t.turnId), e) }), n || this.host.emitEvent("action", {
+			this.host.patchRuntime(e, { messages: G(U(r, e, t.turnId), e) }), n || this.host.emitEvent("action", {
 				type: "turn.started",
 				conversationId: e,
 				turnId: t.turnId,
@@ -5364,7 +5346,7 @@ var Hi = class {
 		if (!e) throw Error("There is no active conversation");
 		return e;
 	}
-}, Ui = 5, Wi = class {
+}, Wi = 5, Gi = class {
 	client;
 	options;
 	catalog;
@@ -5404,7 +5386,7 @@ var Hi = class {
 			...a ? { approvalPreset: a } : {}
 		}, r.approvalPresets), s = A(i.models, i.selectedModelId), c = e.model ? Pt(i.models, e.model) : s, l = c?.model, u = e.reasoningEffort ?? (c?.id === s?.id ? i.selectedReasoningEffort : c ? j(c) : null) ?? void 0, d = e.serviceTier === void 0 ? c?.id === s?.id ? i.selectedServiceTier ?? null : c?.defaultServiceTier ?? null : e.serviceTier;
 		Ft(c, u), M(c, d);
-		let f = t.mcpServers === void 0 ? this.extensions.defaultMcpServers : Ti(t.mcpServers), p = await this.extensions.conversationExtension({
+		let f = t.mcpServers === void 0 ? this.extensions.defaultMcpServers : Ei(t.mcpServers), p = await this.extensions.conversationExtension({
 			operation: "start",
 			conversationId: null,
 			cwd: n,
@@ -5521,7 +5503,7 @@ var Hi = class {
 			...n
 		}, a = {
 			...i,
-			mcpServers: i.mcpServers === void 0 ? this.extensions.defaultMcpServers : Ti(i.mcpServers)
+			mcpServers: i.mcpServers === void 0 ? this.extensions.defaultMcpServers : Ei(i.mcpServers)
 		};
 		this.hostOptionsByThread.set(e, a);
 		let o = await this.extensions.conversationExtension({
@@ -5539,7 +5521,7 @@ var Hi = class {
 				threadId: e,
 				excludeTurns: !0,
 				initialTurnsPage: {
-					limit: Ui,
+					limit: Wi,
 					sortDirection: "desc",
 					itemsView: "full"
 				},
@@ -5552,20 +5534,20 @@ var Hi = class {
 			let i = t.initialTurnsPage ?? await this.client.request("thread/turns/list", {
 				threadId: t.thread.id,
 				cursor: null,
-				limit: Ui,
+				limit: Wi,
 				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 : I(t.thread.status), g = d.map((e) => h.type === "idle" && e.status === "inProgress" ? {
 				...e,
 				status: "interrupted"
-			} : e), _ = new Map(g.map((e) => [e.id, Z(e)]));
+			} : e), _ = new Map(g.map((e) => [e.id, X(e)]));
 			for (let e of m) _.set(e.id, e);
-			let v = m.length > 0 ? s.activeTurnId : h.type === "active" ? Qn(d) : null, y = vr(s.messages, gr({
+			let v = m.length > 0 ? s.activeTurnId : h.type === "active" ? $n(d) : null, y = yr(s.messages, _r({
 				...t.thread,
 				turns: g
 			})), b = new Map(y.map((e) => [e.id, e]));
 			for (let e of s.messages) l.get(e.id) !== e && b.set(e.id, e);
-			let x = v ? W([...b.values()], t.thread.id, v) : [...b.values()], S = this.host.createRuntime(t.thread.id, {
+			let x = v ? U([...b.values()], t.thread.id, v) : [...b.values()], S = this.host.createRuntime(t.thread.id, {
 				hydrated: !0,
 				historyMode: t.thread.historyMode ?? "legacy",
 				loadingStrategy: a.loadingStrategy ?? this.options.loadingStrategy ?? "lazy",
@@ -5612,7 +5594,7 @@ var Hi = class {
 			threadStatus: structuredClone(t.threadStatus)
 		};
 	}
-}, Gi = class {
+}, Ki = class {
 	authentication;
 	approvals;
 	catalog;
@@ -5694,7 +5676,7 @@ var Hi = class {
 				return;
 			}
 			case "thread/goal/updated":
-				if (Qr(this.host.requireRuntime(e.params.threadId).goal, e.params.goal)) return;
+				if ($r(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,
@@ -5750,13 +5732,13 @@ var Hi = class {
 					turnStartPending: !1,
 					error: null,
 					turnGitDiff: null,
-					turns: Q(t.turns, Z(e.params.turn)),
-					messages: W(t.messages, e.params.threadId, e.params.turn.id, { createdAt: Yr(e.params.turn.startedAt) })
+					turns: Z(t.turns, X(e.params.turn)),
+					messages: U(t.messages, e.params.threadId, e.params.turn.id, { createdAt: Xr(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: Yr(e.params.turn.startedAt) }
+					payload: { startedAt: Xr(e.params.turn.startedAt) }
 				}), this.host.emitConversationActivity(e.params.threadId, "notification");
 				return;
 			}
@@ -5808,7 +5790,7 @@ var Hi = class {
 			}
 			case "thread/compacted": {
 				let t = this.host.requireRuntime(e.params.threadId);
-				this.host.patchRuntime(e.params.threadId, { messages: cr(t.messages, e.params.threadId, e.params.turnId, "complete") });
+				this.host.patchRuntime(e.params.threadId, { messages: lr(t.messages, e.params.threadId, e.params.turnId, "complete") });
 				let n = this.host.requireRuntime(e.params.threadId).messages.find((t) => t.kind === "compaction" && t.metadata?.turnId === e.params.turnId);
 				this.host.emitEvent("notification", {
 					type: "context.compactionCompleted",
@@ -5828,7 +5810,7 @@ var Hi = class {
 				let t = this.host.requireRuntime(e.params.threadId), n = !e.params.willRetry && t.activeTurnId === e.params.turnId;
 				n && (t.activeTurnId = null), this.host.patchRuntime(e.params.threadId, {
 					error: e.params.error.message,
-					turns: Q(t.turns, {
+					turns: Z(t.turns, {
 						...t.turns.find((t) => t.id === e.params.turnId) ?? {
 							id: e.params.turnId,
 							status: "inProgress",
@@ -5837,7 +5819,7 @@ var Hi = class {
 							durationMs: null
 						},
 						status: e.params.willRetry ? "inProgress" : "failed",
-						error: Zr(e.params.error),
+						error: Qr(e.params.error),
 						willRetry: e.params.willRetry
 					}),
 					...n ? {
@@ -5849,7 +5831,7 @@ var Hi = class {
 					conversationId: e.params.threadId,
 					turnId: e.params.turnId,
 					payload: {
-						error: Zr(e.params.error),
+						error: Qr(e.params.error),
 						willRetry: e.params.willRetry
 					}
 				}), this.host.emitConversationActivity(e.params.threadId, "notification");
@@ -5995,7 +5977,7 @@ var Hi = class {
 			default: return this.host.unknownNotification(e);
 		}
 	}
-}, Ki = class {
+}, qi = class {
 	approvals;
 	clientRequests;
 	host;
@@ -6056,7 +6038,7 @@ var Hi = class {
 			conversationId: e,
 			payload: {
 				historyLoading: n.historyLoading,
-				historyState: Yi(n),
+				historyState: Xi(n),
 				error: n.error
 			}
 		});
@@ -6150,7 +6132,7 @@ var Hi = class {
 				reason: t,
 				messages: structuredClone(r.messages),
 				threadStatus: structuredClone(r.threadStatus),
-				state: qi(r)
+				state: Ji(r)
 			}
 		});
 	}
@@ -6162,7 +6144,7 @@ var Hi = class {
 			conversationId: e,
 			payload: {
 				messages: structuredClone(t.map((e) => r.get(e.id) ?? e)),
-				state: Ji(this.require(e))
+				state: Yi(this.require(e))
 			}
 		});
 	}
@@ -6173,7 +6155,7 @@ var Hi = class {
 		return [...this.require(e).messages].reverse().find((e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === t) ?? null;
 	}
 	markTurnActive(e, t) {
-		e.activeTurnId = t, e.busy = !0, e.turnStartPending = !1, e.turnIds.includes(t) || e.turnIds.push(t), e.turns = Q(e.turns, {
+		e.activeTurnId = t, e.busy = !0, e.turnStartPending = !1, e.turnIds.includes(t) || e.turnIds.push(t), e.turns = Z(e.turns, {
 			id: t,
 			status: "inProgress",
 			error: null,
@@ -6204,7 +6186,7 @@ var Hi = class {
 		i && this.emitSummaryUpserted(i, "updated", n);
 	}
 };
-function qi(e) {
+function Ji(e) {
 	return structuredClone({
 		activeTurnId: e.activeTurnId,
 		answeredClientRequestIds: e.answeredClientRequestIds,
@@ -6213,21 +6195,21 @@ function qi(e) {
 		error: e.error,
 		executionPlan: e.executionPlan,
 		historyLoading: e.historyLoading,
-		historyState: Yi(e),
+		historyState: Xi(e),
 		turnGitDiff: e.turnGitDiff,
 		turnIds: e.turnIds,
 		turns: e.turns
 	});
 }
-function Ji(e) {
+function Yi(e) {
 	return structuredClone({
 		historyLoading: e.historyLoading,
-		historyState: Yi(e),
+		historyState: Xi(e),
 		turnIds: e.turnIds,
 		turns: e.turns
 	});
 }
-function Yi(e) {
+function Xi(e) {
 	return {
 		loadingStrategy: e.loadingStrategy,
 		hasOlder: e.historyHasOlder,
@@ -6237,7 +6219,7 @@ function Yi(e) {
 }
 //#endregion
 //#region src/node/codex-surface-connection-controller.ts
-var Xi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_request_user_input"]), Zi = class {
+var Zi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_request_user_input"]), Qi = class {
 	client;
 	options;
 	authentication;
@@ -6300,7 +6282,7 @@ var Xi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 					limit: 100,
 					threadId: null
 				});
-				for (let e of n.data) Xi.has(e.name) && !e.enabled && (t[e.name] = !0);
+				for (let e of n.data) Zi.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 });
@@ -6434,7 +6416,7 @@ var Xi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			error: null
 		});
 	}
-}, Qi = 5, $i = class {
+}, $i = 5, ea = class {
 	client;
 	loadingStrategy;
 	catalog;
@@ -6448,7 +6430,7 @@ var Xi = /* @__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 ? Pt(s.models, t.model) : A(s.models, i.selectedModelId);
 		Ft(c, t.reasoningEffort), M(c, t.serviceTier);
-		let l = n.mcpServers === void 0 ? this.extensions.defaultMcpServers : Ti(n.mcpServers), u = await this.extensions.conversationExtension({
+		let l = n.mcpServers === void 0 ? this.extensions.defaultMcpServers : Ei(n.mcpServers), u = await this.extensions.conversationExtension({
 			operation: "start",
 			conversationId: null,
 			cwd: a ?? void 0,
@@ -6466,7 +6448,7 @@ var Xi = /* @__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 },
-			...ea(t, o.approvalPresets)
+			...ta(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", {
@@ -6477,13 +6459,13 @@ var Xi = /* @__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: Qi,
+			limit: $i,
 			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 = Qn(m), g = gr({
+		}), this.client.request("thread/goal/get", { threadId: d.thread.id }).then((e) => e.goal).catch(() => null)]), m = [...f.data].reverse(), h = $n(m), g = _r({
 			...d.thread,
 			turns: m
-		}), _ = h ? W(g, d.thread.id, h) : g, v = n.loadingStrategy ?? this.loadingStrategy ?? "lazy", y = this.host.createRuntime(d.thread.id, {
+		}), _ = h ? U(g, d.thread.id, h) : g, v = n.loadingStrategy ?? this.loadingStrategy ?? "lazy", y = this.host.createRuntime(d.thread.id, {
 			hydrated: !0,
 			historyMode: d.thread.historyMode ?? "legacy",
 			loadingStrategy: v,
@@ -6493,7 +6475,7 @@ var Xi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			fullHistoryHydrated: f.nextCursor === null,
 			cwd: d.cwd ?? d.thread.cwd ?? a ?? null,
 			activeTurnId: h,
-			turns: m.map((e) => Z(e)),
+			turns: m.map((e) => X(e)),
 			turnIds: m.map((e) => e.id),
 			messages: _,
 			busy: !!h,
@@ -6519,7 +6501,7 @@ var Xi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 		return this.fork(e, n, r, { lastTurnId: t });
 	}
 };
-function ea(e, t) {
+function ta(e, t) {
 	if (e.approvalPreset) {
 		if (!t.includes(e.approvalPreset)) throw Error(`Approval preset '${e.approvalPreset}' is not available`);
 		return Rt(e.approvalPreset);
@@ -6531,27 +6513,27 @@ function ea(e, t) {
 }
 //#endregion
 //#region src/node/codex-markdown-images.ts
-var ta = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, na = /* @__PURE__ */ new Set([
+var na = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, ra = /* @__PURE__ */ new Set([
 	".avif",
 	".gif",
 	".jpeg",
 	".jpg",
 	".png",
 	".webp"
-]), ra = class {
+]), ia = class {
 	client;
 	constructor(e) {
 		this.client = e;
 	}
 	async hydrate(e, t) {
-		let n = oa(e);
-		return aa(e, (await Promise.all(Array.from(e.matchAll(ta), async (e) => {
+		let n = sa(e);
+		return oa(e, (await Promise.all(Array.from(e.matchAll(na), async (e) => {
 			let r = e.index ?? 0;
-			if (sa(r, n)) return null;
-			let i = e[2], a = ia(i, t);
+			if (ca(r, n)) return null;
+			let i = e[2], a = aa(i, t);
 			if (!a) return null;
 			try {
-				let t = Mr((await this.client.request("fs/readFile", { path: a })).dataBase64);
+				let t = Nr((await this.client.request("fs/readFile", { path: a })).dataBase64);
 				if (!t) return null;
 				let n = e[0].indexOf("](") + 2;
 				return {
@@ -6565,7 +6547,7 @@ var ta = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, na = /* @
 		}))).filter((e) => e !== null));
 	}
 };
-function ia(e, t) {
+function aa(e, t) {
 	let n = e.trim();
 	if (!n || /[\u0000-\u001f\u007f]/.test(n)) return null;
 	let r;
@@ -6580,18 +6562,18 @@ function ia(e, t) {
 	} catch {
 		return null;
 	}
-	if (!na.has(_(r).toLowerCase())) return null;
+	if (!ra.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 aa(e, t) {
+function oa(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 oa(e) {
+function sa(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");
@@ -6612,15 +6594,15 @@ function oa(e) {
 	}
 	return t;
 }
-function sa(e, t) {
+function ca(e, t) {
 	return t.some((t) => e >= t.start && e <= t.end);
 }
-var ca = /<context>[\s\S]*?<\/context>\s*/g, la = /<in-app-browser-context(?:\s[^>]*)?>[\s\S]*?<\/in-app-browser-context>\s*/g, ua = /^[ \t]*## My request for Codex:[ \t]*$/m;
-async function da(e, t) {
+var la = /<context>[\s\S]*?<\/context>\s*/g, ua = /<in-app-browser-context(?:\s[^>]*)?>[\s\S]*?<\/in-app-browser-context>\s*/g, da = /^[ \t]*## My request for Codex:[ \t]*$/m;
+async function fa(e, t) {
 	let n = O(t);
 	return {
 		conversationId: n,
-		prompts: fa((await e.request("thread/turns/list", {
+		prompts: pa((await e.request("thread/turns/list", {
 			threadId: n,
 			cursor: null,
 			limit: 100,
@@ -6629,20 +6611,20 @@ async function da(e, t) {
 		})).data)
 	};
 }
-function fa(e) {
+function pa(e) {
 	return [...e].reverse().flatMap((e) => e.items.flatMap((e) => {
 		if (e.type !== "userMessage") return [];
-		let t = pa(e.content.flatMap((e) => e.type === "text" ? [e.text] : []).join(""));
+		let t = ma(e.content.flatMap((e) => e.type === "text" ? [e.text] : []).join(""));
 		return t && t !== "(no user instructions)" ? [t] : [];
 	}));
 }
-function pa(e) {
-	let t = e.replace(ca, ""), n = t.replace(la, "");
-	return (n === t ? n : n.replace(ua, "")).trim();
+function ma(e) {
+	let t = e.replace(la, ""), n = t.replace(ua, "");
+	return (n === t ? n : n.replace(da, "")).trim();
 }
 //#endregion
 //#region src/node/codex-surface-text-generation-controller.ts
-var ma = 12e4, ha = class {
+var ha = 12e4, ga = class {
 	client;
 	defaultCwd;
 	host;
@@ -6653,7 +6635,7 @@ var ma = 12e4, ha = class {
 	}
 	handleNotification(e) {
 		e.method === "thread/started" && e.params.thread.ephemeral && this.hiddenThreadIds.add(e.params.thread.id);
-		let t = ya(e);
+		let t = ba(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;
@@ -6661,7 +6643,7 @@ var ma = 12e4, ha = class {
 	async generate(e, t = {}) {
 		let n = e.trim();
 		if (!n) throw Error("Generation prompt cannot be empty");
-		if (t.signal?.aborted) throw ba();
+		if (t.signal?.aborted) throw xa();
 		await this.host.ensureConnected();
 		let r = this.host.getSnapshot(), i = A(r.models, r.selectedModelId), a = t.model ? Pt(r.models, t.model) : i, o = a?.model, s = t.reasoningEffort ?? (a?.id === i?.id ? r.selectedReasoningEffort : a ? j(a) : null) ?? void 0, c = t.serviceTier === void 0 ? a?.id === i?.id ? r.selectedServiceTier : a?.defaultServiceTier ?? null : t.serviceTier;
 		Ft(a, s), M(a, c);
@@ -6680,15 +6662,15 @@ var ma = 12e4, ha = class {
 			serviceName: "codex_app_sdk",
 			threadSource: "sdk_ephemeral_generation"
 		}), u = l.thread.id;
-		if (!l.thread.ephemeral) throw await ga(() => 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 ga(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u), ba();
-		let d = _a();
+		if (!l.thread.ephemeral) throw await _a(() => 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 _a(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u), xa();
+		let d = va();
 		this.pendingByThread.set(u, d);
-		let f = null, p = !1, m = () => d.reject(ba());
+		let f = null, p = !1, m = () => d.reject(xa());
 		t.signal?.addEventListener("abort", m);
 		let h = setTimeout(() => {
 			d.reject(/* @__PURE__ */ Error("Codex ephemeral generation timed out"));
-		}, t.timeoutMs ?? ma);
+		}, t.timeoutMs ?? ha);
 		try {
 			let e = await this.client.request("turn/start", {
 				threadId: u,
@@ -6704,18 +6686,18 @@ var ma = 12e4, ha = class {
 				serviceTier: c,
 				...t.outputSchema === void 0 ? {} : { outputSchema: t.outputSchema }
 			});
-			f = e.turn.id, d.turnId = f, va(d, e.turn);
+			f = e.turn.id, d.turnId = f, ya(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 ga(() => this.client.request("turn/interrupt", {
+				await _a(() => this.client.request("turn/interrupt", {
 					threadId: u,
 					turnId: e
 				}));
 			}
-			await ga(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u);
+			await _a(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u);
 		}
 	}
 	close(e = /* @__PURE__ */ Error("Codex surface closed")) {
@@ -6738,16 +6720,16 @@ var ma = 12e4, ha = class {
 		}
 		if (t.method === "turn/completed") {
 			if (e.turnId && t.params.turn.id !== e.turnId) return;
-			va(e, t.params.turn);
+			ya(e, t.params.turn);
 		}
 	}
 };
-async function ga(e) {
+async function _a(e) {
 	try {
 		await e();
 	} catch {}
 }
-function _a() {
+function va() {
 	let e, t, n = {
 		promise: new Promise((n, r) => {
 			e = n, t = r;
@@ -6763,7 +6745,7 @@ function _a() {
 	};
 	return n.promise.catch(() => void 0), n;
 }
-function va(e, t) {
+function ya(e, t) {
 	for (let n of t.items) {
 		if (n.type !== "agentMessage") continue;
 		let t = n.text.trim();
@@ -6785,17 +6767,17 @@ function va(e, t) {
 	}
 	e.resolve({ text: n });
 }
-function ya(e) {
+function ba(e) {
 	if (e.method === "thread/started") return e.params.thread.id;
 	let t = e.params;
 	return typeof t.threadId == "string" ? t.threadId : null;
 }
-function ba() {
+function xa() {
 	return /* @__PURE__ */ Error("Codex ephemeral generation was aborted");
 }
 //#endregion
 //#region src/node/codex-surface-usage-controller.ts
-var xa = {
+var Sa = {
 	status: "unavailable",
 	reason: "public-runtime-request-evidence-unavailable",
 	unavailableFields: [
@@ -6813,7 +6795,7 @@ var xa = {
 		"finality"
 	],
 	requests: null
-}, Sa = class {
+}, Ca = class {
 	threads = /* @__PURE__ */ new Map();
 	clear() {
 		this.threads.clear();
@@ -6855,16 +6837,16 @@ var xa = {
 			let e = r.executions.get(r.activeTurnId);
 			e && (e.baseline = null), i && (i.baseline = null);
 		}
-		i && (!wa(a.total) || i.latest && !Ta(i.latest.total, a.total)) && (i.baseline = null);
+		i && (!$(a.total) || i.latest && !Ta(i.latest.total, a.total)) && (i.baseline = null);
 		let s = i?.baseline ? Ea(i.baseline, a.total) : null;
 		i && s === null && (i.baseline = null);
 		let c = {
 			...a,
 			execution: s,
 			observedStart: !!i,
-			requestUsage: structuredClone(xa)
+			requestUsage: structuredClone(Sa)
 		};
-		return i && (i.latest = structuredClone(c)), r.total = !o && wa(a.total) ? structuredClone(a.total) : null, r.lastUsageTurnId = t.turnId, {
+		return i && (i.latest = structuredClone(c)), r.total = !o && $(a.total) ? structuredClone(a.total) : null, r.lastUsageTurnId = t.turnId, {
 			...t,
 			payload: { usage: c }
 		};
@@ -6878,21 +6860,21 @@ var xa = {
 			executions: /* @__PURE__ */ new Map()
 		}, this.threads.set(e, t)), t;
 	}
-}, Ca = [
+}, wa = [
 	"totalTokens",
 	"inputTokens",
 	"cachedInputTokens",
 	"outputTokens",
 	"reasoningOutputTokens"
 ];
-function wa(e) {
-	return Ca.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 $(e) {
+	return wa.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 Ta(e, t) {
-	return Ca.every((n) => t[n] >= e[n]) && (e.cacheWriteInputTokens === null || t.cacheWriteInputTokens === null || t.cacheWriteInputTokens >= e.cacheWriteInputTokens);
+	return wa.every((n) => t[n] >= e[n]) && (e.cacheWriteInputTokens === null || t.cacheWriteInputTokens === null || t.cacheWriteInputTokens >= e.cacheWriteInputTokens);
 }
 function Ea(e, t) {
-	if (!wa(e) || !wa(t) || !Ta(e, t)) return null;
+	if (!$(e) || !$(t) || !Ta(e, t)) return null;
 	let n = {
 		totalTokens: t.totalTokens - e.totalTokens,
 		inputTokens: t.inputTokens - e.inputTokens,
@@ -6901,7 +6883,7 @@ function Ea(e, t) {
 		outputTokens: t.outputTokens - e.outputTokens,
 		reasoningOutputTokens: t.reasoningOutputTokens - e.reasoningOutputTokens
 	};
-	return wa(n) ? n : null;
+	return $(n) ? n : null;
 }
 //#endregion
 //#region src/node/codex-surface.ts
@@ -6936,21 +6918,21 @@ var Da = class {
 	unsubscribeToolInputRequests;
 	unsubscribeMcpElicitationRequests;
 	eventSequence = 0;
-	usage = new Sa();
+	usage = new Ca();
 	accountGeneration = 0;
 	pendingMarkdownImageHydrations = /* @__PURE__ */ new Set();
 	closed = !1;
 	state = xt(wt());
 	constructor(e = {}) {
-		this.options = e, this.extensions = new Mi(e.extensions ?? [], e.mcpServers ?? [], (e) => this.lifecycle.hostOptions(e));
+		this.options = e, this.extensions = new Ni(e.extensions ?? [], e.mcpServers ?? [], (e) => this.lifecycle.hostOptions(e));
 		let n = dn(e);
-		this.client = e.client ?? new t(un(n) ? new Ye(n) : new We(n), e.onListenerError ? { onListenerError: e.onListenerError } : {}), this.markdownImages = new ra(this.client), this.authentication = new pn(this.client, {
+		this.client = e.client ?? new t(un(n) ? new Ye(n) : new We(n), e.onListenerError ? { onListenerError: e.onListenerError } : {}), this.markdownImages = new ia(this.client), this.authentication = new pn(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: k(e) })
-		}), this.items = new ni({
+		}), this.items = new ri({
 			assistantMessageForTurn: (e, t) => this.assistantMessageForTurn(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
 			emitEvent: (e, t) => this.emitEvent(e, t),
@@ -6964,7 +6946,7 @@ var Da = class {
 			sendNextQueuedPrompt: (e) => {
 				this.messagesController.sendNextQueuedPrompt(e);
 			}
-		}), this.approvals = new wi(this.client, {
+		}), this.approvals = new Ti(this.client, {
 			activeConversationId: () => this.state.activeConversationId,
 			createRuntime: (e, t) => this.createRuntime(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -6974,7 +6956,7 @@ var Da = class {
 			patch: (e) => this.patch(e),
 			patchConversationStatus: (e, t) => this.patchConversationStatus(e, t),
 			patchRuntime: (e, t) => this.patchRuntime(e, t)
-		}), this.clientRequests = new ai({
+		}), this.clientRequests = new oi({
 			activeConversationId: () => this.state.activeConversationId,
 			answerAsyncQuestion: (e, t, n) => this.messagesController.answerAsyncQuestion(e, t, n),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -6984,13 +6966,13 @@ var Da = class {
 			messageContainingTool: (e, t, n) => this.messageContainingTool(e, t, n),
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			requireRuntime: (e) => this.requireRuntime(e)
-		}), this.runtimeState = new Ki(this.approvals, this.clientRequests, {
+		}), this.runtimeState = new qi(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 Ri(this.client, {
+		}), this.conversationSettings = new zi(this.client, {
 			approvalMode: e.approvalMode,
 			approvalPreset: e.approvalPreset,
 			permissionMode: e.permissionMode
@@ -7008,7 +6990,7 @@ var Da = class {
 			patch: (e) => this.patch(e),
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}), this.turnActions = new Bi(this.client, {
+		}), this.turnActions = new Vi(this.client, {
 			createConversation: async () => {
 				await this.createConversation();
 			},
@@ -7025,7 +7007,7 @@ var Da = class {
 			patchConversationTurnCount: (e, t, n) => this.patchConversationTurnCount(e, t, n),
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			sendMessageToThread: (e, t, n) => this.messagesController.sendToThread(e, t, n)
-		}), this.messagesController = new Hi(this.client, {
+		}), this.messagesController = new Ui(this.client, {
 			clearGoalForThread: (e) => this.conversationSettings.clearGoalForThread(e),
 			compactForThread: (e) => this.turnActions.compactForThread(e),
 			createConversation: async () => {
@@ -7048,7 +7030,7 @@ var Da = class {
 			startReviewForThread: (e, t) => this.turnActions.startReviewForThread(e, t),
 			updateSettings: (e) => this.conversationSettings.update(e),
 			updateSettingsForThread: (e, t) => this.conversationSettings.updateForThread(e, t)
-		}), this.catalog = new gi(this.client, e.cwd, {
+		}), this.catalog = new _i(this.client, e.cwd, {
 			authenticationBlocksBootstrap: () => this.authentication.blocksBootstrap(),
 			emitConversationSkills: (e, t) => this.emitConversationSkills(e, t),
 			emitEvent: (e, t) => this.emitEvent(e, t),
@@ -7059,7 +7041,7 @@ var Da = class {
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			preferredApprovalPreset: () => this.conversationSettings.preferredApprovalPreset(),
 			runtimes: () => this.runtimeState.values()
-		}), this.conversations = new Ii(this.client, e.conversationLimit, {
+		}), this.conversations = new Li(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(),
@@ -7071,7 +7053,7 @@ var Da = class {
 			requireRuntime: (e) => this.requireRuntime(e),
 			runtime: (e) => this.runtimeState.get(e),
 			schedulePluginRefresh: (e) => this.catalog.schedulePluginRefresh(e)
-		}), this.lifecycle = new Wi(this.client, e, this.catalog, this.extensions, this.conversationSettings, this.conversations, {
+		}), this.lifecycle = new Gi(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),
@@ -7094,7 +7076,7 @@ var Da = class {
 			runtime: (e) => this.runtimeState.get(e),
 			runtimeProjection: (e) => this.runtimeProjection(e),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}), this.forks = new $i(this.client, e.loadingStrategy, this.catalog, this.extensions, {
+		}), this.forks = new ea(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"),
@@ -7108,7 +7090,7 @@ var Da = class {
 			rememberHostOptions: (e, t) => this.lifecycle.rememberHostOptions(e, t),
 			requireRuntime: (e) => this.requireRuntime(e),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}), this.connection = new Zi(this.client, e, this.authentication, this.approvals, this.catalog, this.clientRequests, this.conversations, this.items, this.lifecycle, this.runtimeState, {
+		}), this.connection = new Qi(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,
@@ -7120,7 +7102,7 @@ var Da = class {
 			getSnapshot: () => this.getSnapshot(),
 			getState: () => this.state,
 			patch: (e) => this.patch(e)
-		}), this.notifications = new Gi(this.authentication, this.approvals, this.catalog, this.clientRequests, this.conversations, this.items, {
+		}), this.notifications = new Ki(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),
@@ -7144,7 +7126,7 @@ var Da = class {
 			},
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e),
 			unknownNotification: (e) => this.handleUnknownNotification(e)
-		}), this.textGeneration = new ha(this.client, e.cwd, {
+		}), this.textGeneration = new ga(this.client, e.cwd, {
 			ensureConnected: () => this.ensureConnected(),
 			getSnapshot: () => this.getSnapshot()
 		}), this.unsubscribeNotification = this.client.onNotification((e) => {
@@ -7317,7 +7299,7 @@ var Da = class {
 		return this.lifecycle.readHistory(e);
 	}
 	async readConversationPromptHistory(e = this.state.activeConversationId ?? "") {
-		return await this.ensureConnected(), da(this.client, e);
+		return await this.ensureConnected(), fa(this.client, e);
 	}
 	async loadOlderConversationHistory(e = this.state.activeConversationId ?? "") {
 		return this.conversations.loadOlderHistory(O(e));
@@ -8069,6 +8051,6 @@ async function za(e, t, n = {}) {
 	};
 }
 //#endregion
-export { ja as CodexAppBackend, Aa as CodexAppBackendTtlCache, We as CodexAppServerStdioTransport, Ye as CodexAppServerUnixSocketTransport, Da as CodexSurface, Sr as codexItemToMediaPart, br as codexItemToSurfaceMessage, R as codexItemToToolPart, _e as codexRuntimePathEntries, gr as codexThreadToSurfaceMessages, yr as codexTurnToSurfaceMessages, Ma as createCodexAppBackend, Oa as createCodexSurface, ge as discoverCodexExecutable, _r as preserveHistoricalAttachmentPreviews, Pa as resolveAppleSpeechAnalyzerPath, ye as resolveCodexRuntime, za as startAppleSpeechSession, Na as transcribeWithAppleSpeechAnalyzer, ve as withCodexRuntimePath };
+export { ja as CodexAppBackend, Aa as CodexAppBackendTtlCache, We as CodexAppServerStdioTransport, Ye as CodexAppServerUnixSocketTransport, Da as CodexSurface, Cr as codexItemToMediaPart, xr as codexItemToSurfaceMessage, R as codexItemToToolPart, _e as codexRuntimePathEntries, _r as codexThreadToSurfaceMessages, br as codexTurnToSurfaceMessages, Ma as createCodexAppBackend, Oa as createCodexSurface, ge as discoverCodexExecutable, vr as preserveHistoricalAttachmentPreviews, Pa as resolveAppleSpeechAnalyzerPath, ye as resolveCodexRuntime, za as startAppleSpeechSession, Na as transcribeWithAppleSpeechAnalyzer, ve as withCodexRuntimePath };
 
 //# sourceMappingURL=index.js.map