@codex-app-sdk/backend 0.21.1 → 0.21.2

package/dist/index.js

@@ -1,10 +1,10 @@
-import { i as e, n as t, r as n, s as r } from "./chunks/codex-CmHW3ikB.js";
+import { i as e, n as t, r as n, s as r } from "./chunks/codex-qk7I-QSQ.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";
 import f, { homedir as p, tmpdir as m } from "node:os";
-import h, { basename as g, extname as _, isAbsolute as v, join as y, relative as b, resolve as x, sep as ee } from "node:path";
-import { createHash as S, randomBytes as te } from "node:crypto";
+import h, { basename as g, extname as _, isAbsolute as v, join as y, relative as b, resolve as x, sep as S } from "node:path";
+import { createHash as ee, randomBytes as te } from "node:crypto";
 import { createConnection as ne } from "node:net";
 import { chmod as re, copyFile as ie, mkdtemp as ae, open as oe, rm as se, stat as ce } from "node:fs/promises";
 import { normalizePromptContent as le, promptContentDispatchText as ue, promptContentText as de } from "@codex-app-sdk/core/surface";
@@ -1075,7 +1075,7 @@ function nn(e = []) {
 		path: e.kind === "plugin" ? `plugin://${e.id}` : e.id
 	}] : []);
 }
-function O(e, t) {
+function rn(e, t) {
 	return e.map((e) => {
 		let n = t.find((t) => t.enabled && t.name === e.name && t.path === e.path);
 		if (!n) throw Error(`Skill '${e.name}' is not an enabled skill in the Codex catalog`);
@@ -1085,58 +1085,58 @@ function O(e, t) {
 		};
 	});
 }
-function rn(...e) {
+function an(...e) {
 	let t = /* @__PURE__ */ new Set();
 	return e.flatMap((e) => e.filter((e) => {
 		let n = `${e.name}\u0000${e.path}`;
 		return t.has(n) ? !1 : (t.add(n), !0);
 	}));
 }
-function an(e, t, n, r) {
+function on(e, t, n, r) {
 	let i = e.filter((e) => e.metadata?.turnId === t).flatMap((e) => e.parts).filter((e) => e.type === "tool" && e.kind === "mcp" && e.status === "running");
 	return i.find((e) => {
-		let t = k(e.metadata?.server), i = k(e.metadata?.tool);
+		let t = ln(e.metadata?.server), i = ln(e.metadata?.tool);
 		return t === n && i === r || e.title.endsWith(`.${r}`);
 	}) ?? (i.length === 1 ? i[0] ?? null : null);
 }
-function on(e) {
+function sn(e) {
 	if (Array.isArray(e.tool_params_display)) {
-		let t = e.tool_params_display.map((e) => !cn(e) || typeof e.name != "string" ? "" : `${k(e.display_name) ?? e.name}: ${typeof e.value == "string" ? e.value : JSON.stringify(e.value)}`).filter(Boolean);
+		let t = e.tool_params_display.map((e) => !un(e) || typeof e.name != "string" ? "" : `${ln(e.display_name) ?? e.name}: ${typeof e.value == "string" ? e.value : JSON.stringify(e.value)}`).filter(Boolean);
 		if (t.length > 0) return t.join("\n");
 	}
 	return e.tool_params === void 0 ? "" : JSON.stringify(e.tool_params, null, 2);
 }
-function sn(e, t) {
+function cn(e, t) {
 	return e === t || Array.isArray(e) && e.includes(t);
 }
-function k(e) {
+function ln(e) {
 	return typeof e == "string" && e.trim() ? e.trim() : null;
 }
-function A(e) {
+function O(e) {
 	let t = e.trim();
 	if (!t) throw Error("Conversation id cannot be empty");
 	return t;
 }
-function cn(e) {
+function un(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
-function j(e) {
+function k(e) {
 	return e instanceof Error ? e.message : String(e);
 }
 //#endregion
 //#region src/node/codex-surface-message-state.ts
-function ln(e) {
+function dn(e) {
 	for (let t = e.length - 1; t >= 0; --t) {
 		let n = e[t];
 		if (n?.status === "inProgress") return n.id;
 	}
 	return null;
 }
-function M(e, t, n, r = {}) {
-	let i = [...e], a = F(i, (e) => e.metadata?.turnId === n), o = a >= 0 ? i[a] : void 0;
+function A(e, t, n, r = {}) {
+	let i = [...e], a = N(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 = F(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), t = e >= 0 ? i[e] : void 0;
+		let e = N(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"
@@ -1156,12 +1156,12 @@ function M(e, t, n, r = {}) {
 		}
 	}), i;
 }
-function un(e, t, n) {
-	return e[F(e, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === t && e.parts.some((e) => e.type === "text" && e.itemId === n))];
+function fn(e, t, n) {
+	return e[N(e, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === t && e.parts.some((e) => e.type === "text" && e.itemId === n))];
 }
-function dn(e, t, n, r, i, a) {
+function pn(e, t, n, r, i, a) {
 	if (!i) return [...e];
-	let o = un(e, n, r), s = o ? [...e] : M(e, t, n), c = o ? s.indexOf(o) : F(s, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), l = c >= 0 ? s[c] : void 0;
+	let o = fn(e, n, r), s = o ? [...e] : A(e, t, n), c = o ? s.indexOf(o) : N(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 = [...l.parts], d = u.at(-1);
 	return d?.type === "text" && d.itemId === r ? u.splice(u.length - 1, 1, {
@@ -1177,9 +1177,9 @@ function dn(e, t, n, r, i, a) {
 		...l,
 		status: "streaming",
 		parts: u
-	}), P(s, t);
+	}), M(s, t);
 }
-function fn(e, t, n, r, i) {
+function mn(e, t, n, r, i) {
 	let a = i.map((e, t) => {
 		let n = e.trim();
 		return n ? {
@@ -1195,16 +1195,16 @@ function fn(e, t, n, r, i) {
 		itemId: r,
 		summaryIndex: 0
 	});
-	let o = M(e, t, n), s = F(o, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), c = s >= 0 ? o[s] : void 0;
+	let o = A(e, t, n), s = N(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
-	}), P(o, t);
+	}), M(o, t);
 }
-function pn(e, t, n, r, i, a) {
+function hn(e, t, n, r, i, a) {
 	let o = [...e];
 	for (let e = o.length - 1; e >= 0; --e) {
 		let s = o[e];
@@ -1220,9 +1220,9 @@ function pn(e, t, n, r, i, a) {
 		}), o.splice(e, 1, {
 			...s,
 			parts: l
-		}), P(o, t);
+		}), M(o, t);
 	}
-	let s = M(o, t, n), c = F(s, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), l = c >= 0 ? s[c] : void 0;
+	let s = A(o, t, n), c = N(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",
@@ -1233,10 +1233,10 @@ function pn(e, t, n, r, i, a) {
 	return s.splice(c, 1, {
 		...l,
 		parts: [...l.parts, u]
-	}), P(s, t);
+	}), M(s, t);
 }
-function mn(e, t, n, r) {
-	return P(e.map((e) => {
+function gn(e, t, n, r) {
+	return M(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 : {
@@ -1245,16 +1245,16 @@ function mn(e, t, n, r) {
 		};
 	}), t);
 }
-function hn(e) {
+function _n(e) {
 	let t = /<proposed_plan>([\s\S]*?)<\/proposed_plan>/iu.exec(e), n = t?.[1]?.trim() ?? "";
 	return !t || !n ? null : {
 		markdown: n,
 		visibleText: `${e.slice(0, t.index)}${e.slice(t.index + t[0].length)}`.trim()
 	};
 }
-function N(e, t, n, r) {
+function j(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 = M(i, t, n), a = F(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
+	a < 0 && (i = A(i, t, n), a = N(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);
@@ -1266,7 +1266,7 @@ function N(e, t, n, r) {
 			body: r.body ?? e.body,
 			input: r.input ?? e.input,
 			output: r.output ?? e.output,
-			statusText: r.statusText ?? Sn(e.statusText, r.status),
+			statusText: r.statusText ?? wn(e.statusText, r.status),
 			metadata: {
 				...e.metadata ?? {},
 				...r.metadata ?? {}
@@ -1276,11 +1276,11 @@ function N(e, t, n, r) {
 	return i.splice(a, 1, {
 		...o,
 		parts: s
-	}), P(i, t);
+	}), M(i, t);
 }
-function gn(e, t, n, r, i = r.itemId) {
+function vn(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 = M(a, t, n), o = F(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 = A(a, t, n), o = N(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);
@@ -1288,25 +1288,25 @@ function gn(e, t, n, r, i = r.itemId) {
 		...s,
 		status: "streaming",
 		parts: c
-	}), P(a, t);
+	}), M(a, t);
 }
-function _n(e, t, n, r) {
+function yn(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 = M(i, t, n), a = F(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
+	a < 0 && (i = A(i, t, n), a = N(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
-	}), P(i, t);
+	}), M(i, t);
 }
-function vn(e, t) {
+function bn(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 yn(e, t, n, r) {
+function xn(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 ? yn(N(i, t, n, r.fallbackToolPart), t, n, {
+	if (a < 0) return r.fallbackToolPart ? xn(j(i, t, n, r.fallbackToolPart), t, n, {
 		...r,
 		fallbackToolPart: void 0
 	}) : i;
@@ -1332,12 +1332,12 @@ function yn(e, t, n, r) {
 		parts: s
 	}), i) : i;
 }
-function bn(e, t, n, r = "streaming") {
+function Sn(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 = F(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), o = a >= 0 ? i[a] : void 0;
+	let i = [...e], a = N(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"
@@ -1353,16 +1353,16 @@ function bn(e, t, n, r = "streaming") {
 			conversationId: t,
 			turnId: n
 		}
-	}), P(i, t);
+	}), M(i, t);
 }
-function xn(e, t, n) {
+function Cn(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: Sn(e.statusText, r)
+			statusText: wn(e.statusText, r)
 		}));
 		return n ? {
 			...e,
@@ -1370,11 +1370,11 @@ function xn(e, t, n) {
 		} : e;
 	});
 }
-function Sn(e, t) {
+function wn(e, t) {
 	if (t === "running" || !e) return e;
 	try {
 		let n = JSON.parse(e);
-		return cn(n) ? JSON.stringify({
+		return un(n) ? JSON.stringify({
 			...n,
 			phase: t
 		}) : e;
@@ -1382,27 +1382,27 @@ function Sn(e, t) {
 		return e;
 	}
 }
-function P(e, t) {
+function M(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 F(e, t) {
+function N(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 Cn(e, t) {
+function Tn(e, t) {
 	return e.includes(t) ? [...e] : [...e, t];
 }
-function wn(e, t) {
+function En(e, t) {
 	return [e?.trim() ?? "", ...t.map((e) => `${e.status === "completed" ? "- [x]" : "- [ ]"} ${e.step}`)].filter(Boolean).join("\n");
 }
-function Tn(e, t, n) {
+function Dn(e, t, n) {
 	return {
 		type: "tool",
 		id: `plan-progress-${e}`,
@@ -1425,19 +1425,19 @@ function Tn(e, t, n) {
 }
 //#endregion
 //#region src/node/codex-conversation-history.ts
-var En = 16 * 1024 * 1024, Dn = /* @__PURE__ */ new Set([
+var On = 16 * 1024 * 1024, kn = /* @__PURE__ */ new Set([
 	"image/avif",
 	"image/gif",
 	"image/jpeg",
 	"image/png",
 	"image/webp"
 ]);
-function On(e) {
-	return (Array.isArray(e.turns) ? e.turns : []).flatMap((t) => jn(e.id, t));
+function An(e) {
+	return (Array.isArray(e.turns) ? e.turns : []).flatMap((t) => P(e.id, t));
 }
-function kn(e, t) {
+function jn(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 || Gn(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 || Kn(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;
@@ -1456,9 +1456,9 @@ function kn(e, t) {
 		} : e;
 	});
 }
-function An(e, t) {
+function Mn(e, t) {
 	let n = new Map(e.filter((e) => e.role === "user" && e.metadata?.promptContent).map((e) => [e.id, e.metadata.promptContent]));
-	return kn(e, t).map((e) => {
+	return jn(e, t).map((e) => {
 		let t = n.get(e.id);
 		if (!t || e.role !== "user") return e;
 		let r = le(t);
@@ -1475,14 +1475,14 @@ function An(e, t) {
 		};
 	});
 }
-function jn(e, t) {
-	let n = [], r = [], i = Yn(t.startedAt ?? t.completedAt), a = 0, o = !1, s = !1, c = /* @__PURE__ */ new Set(), l = () => {
+function P(e, t) {
+	let n = [], r = [], i = Xn(t.startedAt ?? t.completedAt), a = 0, o = !1, s = !1, c = /* @__PURE__ */ new Set(), l = () => {
 		if (r.length === 0) return;
 		let o = a === 0 ? "" : `-segment-${a}`;
 		n.push({
 			id: `assistant-${t.id}${o}`,
 			role: "assistant",
-			status: Jn(t.status),
+			status: Yn(t.status),
 			turnId: t.id,
 			parts: [...r],
 			createdAt: i,
@@ -1494,7 +1494,7 @@ function jn(e, t) {
 	};
 	for (let a of Array.isArray(t.items) ? t.items : []) {
 		if (a.type === "userMessage") {
-			let r = In(a), s = Rn(a);
+			let r = Ln(a), s = zn(a);
 			if (r.length > 0) {
 				let u = o, d = u ? null : JSON.stringify(r);
 				if (d && c.has(d)) continue;
@@ -1511,7 +1511,7 @@ function jn(e, t) {
 						turnId: t.id,
 						...s.length > 0 ? {
 							asyncQuestionRequestIds: s,
-							asyncQuestionAnswers: zn(a)
+							asyncQuestionAnswers: Bn(a)
 						} : {}
 					}
 				});
@@ -1539,7 +1539,7 @@ function jn(e, t) {
 		if (a.type === "agentMessage") {
 			let n = typeof a.text == "string" ? a.text : "";
 			a.phase === "final_answer" && n.trim() && (s = !0);
-			let i = Nn(e, t.id, a, !0), c = a.phase === "final_answer" ? hn(n) : null;
+			let i = Pn(e, t.id, a, !0), c = a.phase === "final_answer" ? _n(n) : null;
 			c && !i ? c.visibleText && (o = !0, r.push({
 				type: "text",
 				text: c.visibleText,
@@ -1580,13 +1580,13 @@ function jn(e, t) {
 		}
 		let u = w(a);
 		u && (o = !0, r.push(u));
-		let d = Fn(a);
+		let d = In(a);
 		d.length && (o = !0, r.push(...d));
 	}
 	return l(), (t.itemsView === "summary" || t.itemsView === "notLoaded") && !n.some((e) => e.role === "assistant") && n.push({
 		id: `assistant-${t.id}`,
 		role: "assistant",
-		status: Jn(t.status),
+		status: Yn(t.status),
 		turnId: t.id,
 		parts: [],
 		createdAt: i,
@@ -1594,12 +1594,12 @@ function jn(e, t) {
 			conversationId: e,
 			turnId: t.id
 		}
-	}), t.status === "inProgress" ? n : xn(n, t.id, t.status);
+	}), t.status === "inProgress" ? n : Cn(n, t.id, t.status);
 }
-function Mn(e, t, n) {
-	let r = Yn(t.startedAt);
+function Nn(e, t, n) {
+	let r = Xn(t.startedAt);
 	if (n.type === "userMessage") {
-		let i = In(n), a = Rn(n);
+		let i = Ln(n), a = zn(n);
 		return i.length > 0 ? {
 			id: n.clientId ?? `user-${e}-${t.id}-${n.id}`,
 			role: "user",
@@ -1613,13 +1613,13 @@ function Mn(e, t, n) {
 				itemId: n.id,
 				...a.length > 0 ? {
 					asyncQuestionRequestIds: a,
-					asyncQuestionAnswers: zn(n)
+					asyncQuestionAnswers: Bn(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" ? hn(i) : null, o = n.type === "agentMessage" ? Nn(e, t.id, n, !0) : null, s = [...!o && (a?.visibleText || !a && i) ? [{
+		let i = n.type === "agentMessage" ? n.text : n.review, a = n.type === "agentMessage" && n.phase === "final_answer" ? _n(i) : null, o = n.type === "agentMessage" ? Pn(e, t.id, n, !0) : null, s = [...!o && (a?.visibleText || !a && i) ? [{
 			type: "text",
 			text: a?.visibleText ?? i,
 			itemId: n.id,
@@ -1628,7 +1628,7 @@ function Mn(e, t, n) {
 		return s.length > 0 ? {
 			id: `assistant-${n.id}`,
 			role: "assistant",
-			status: Jn(t.status),
+			status: Yn(t.status),
 			turnId: t.id,
 			parts: s,
 			createdAt: r,
@@ -1652,7 +1652,7 @@ function Mn(e, t, n) {
 		return i.length > 0 ? {
 			id: `assistant-${n.id}`,
 			role: "assistant",
-			status: Jn(t.status),
+			status: Yn(t.status),
 			turnId: t.id,
 			parts: i,
 			createdAt: r,
@@ -1664,11 +1664,11 @@ function Mn(e, t, n) {
 		} : null;
 	}
 	let i = [], a = w(n);
-	a && i.push(a), i.push(...Fn(n));
+	a && i.push(a), i.push(...In(n));
 	let o = i.length > 0 ? {
 		id: `assistant-${n.id}`,
 		role: "assistant",
-		status: Jn(t.status),
+		status: Yn(t.status),
 		turnId: t.id,
 		parts: i,
 		createdAt: r,
@@ -1678,9 +1678,9 @@ function Mn(e, t, n) {
 			itemId: n.id
 		}
 	} : null;
-	return !o || t.status === "inProgress" ? o : xn([o], t.id, t.status)[0] ?? null;
+	return !o || t.status === "inProgress" ? o : Cn([o], t.id, t.status)[0] ?? null;
 }
-function Nn(e, t, n, r = !1) {
+function Pn(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([
@@ -1722,9 +1722,9 @@ function Nn(e, t, n, r = !1) {
 		...r ? { historical: !0 } : {}
 	};
 }
-function Pn(e) {
+function Fn(e) {
 	if (e.type !== "imageGeneration" || w(e)?.status !== "completed") return null;
-	let t = typeof e.savedPath == "string" && v(e.savedPath) ? e.savedPath : null, n = t ? Un(t) : void 0, r = n && Dn.has(n) ? t : null, i = Wn("result" in e && typeof e.result == "string" ? e.result.trim() : ""), a = i?.url ?? (r ? pe(r).href : void 0);
+	let t = typeof e.savedPath == "string" && v(e.savedPath) ? e.savedPath : null, n = t ? Wn(t) : void 0, r = n && kn.has(n) ? t : null, i = Gn("result" in e && typeof e.result == "string" ? e.result.trim() : ""), a = i?.url ?? (r ? pe(r).href : void 0);
 	if (!a) return null;
 	let o = typeof e.revisedPrompt == "string" ? e.revisedPrompt.trim() : "";
 	return {
@@ -1739,11 +1739,11 @@ function Pn(e) {
 		}
 	};
 }
-function Fn(e) {
+function In(e) {
 	if (e.type === "imageView") {
 		if (typeof e.path != "string") return [];
-		let t = Un(e.path);
-		return v(e.path) && t && Dn.has(t) ? [{
+		let t = Wn(e.path);
+		return v(e.path) && t && kn.has(t) ? [{
 			type: "media",
 			phase: "commentary",
 			itemId: e.id,
@@ -1755,7 +1755,7 @@ function Fn(e) {
 			}
 		}] : [];
 	}
-	let t = Pn(e);
+	let t = Fn(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 [];
@@ -1771,13 +1771,13 @@ function Fn(e) {
 				a -= e;
 				try {
 					let e = JSON.parse(t.text);
-					I(e) && Array.isArray(e.content) && s(e.content, n + 1);
+					F(e) && Array.isArray(e.content) && s(e.content, n + 1);
 				} catch {}
 				continue;
 			}
 			let l = t.type === "image" && typeof t.data == "string" ? t.data : t.type === "inputImage" && typeof t.imageUrl == "string" ? t.imageUrl : "";
 			if (l.length > i) continue;
-			let u = Wn(l);
+			let u = Gn(l);
 			u && (i -= u.url.length, r.push({
 				type: "media",
 				phase: "commentary",
@@ -1793,21 +1793,21 @@ function Fn(e) {
 	};
 	return s(n, 0), r;
 }
-function In(e) {
-	let t = Array.isArray(e.content) ? e.content : [], n = t.some((e) => I(e) && e.type === "text" && typeof e.text == "string" && e.text.length > 0), r = [], i = [], a = /* @__PURE__ */ new Set(), o = () => {
+function Ln(e) {
+	let t = Array.isArray(e.content) ? e.content : [], n = t.some((e) => F(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 (I(e) && e.type === "skill" && typeof e.name == "string") {
+		if (F(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 = Ln(e), s = ct(t);
+		let t = Rn(e), s = ct(t);
 		if (s) {
 			o(), r.push({
 				type: "attachment",
@@ -1822,7 +1822,7 @@ function In(e) {
 			i.push(t);
 			continue;
 		}
-		let c = Vn(e);
+		let c = Hn(e);
 		c && (o(), r.push({
 			type: "attachment",
 			attachment: c
@@ -1830,26 +1830,26 @@ function In(e) {
 	}
 	return o(), r;
 }
-function Ln(e) {
-	return !I(e) || typeof e.type != "string" ? "" : e.type === "text" && typeof e.text == "string" ? Bn(e.text)?.displayText ?? e.text : e.type === "skill" && typeof e.name == "string" ? `$${e.name}` : "";
-}
 function Rn(e) {
+	return !F(e) || typeof e.type != "string" ? "" : e.type === "text" && typeof e.text == "string" ? Vn(e.text)?.displayText ?? e.text : e.type === "skill" && typeof e.name == "string" ? `$${e.name}` : "";
+}
+function zn(e) {
 	let t = /* @__PURE__ */ new Set();
-	for (let n of Array.isArray(e.content) ? e.content : []) if (!(!I(n) || n.type !== "text" || typeof n.text != "string")) for (let e of Bn(n.text)?.requestIds ?? []) t.add(e);
+	for (let n of Array.isArray(e.content) ? e.content : []) if (!(!F(n) || n.type !== "text" || typeof n.text != "string")) for (let e of Vn(n.text)?.requestIds ?? []) t.add(e);
 	return [...t];
 }
-function zn(e) {
+function Bn(e) {
 	let t = {};
-	for (let n of Array.isArray(e.content) ? e.content : []) !I(n) || n.type !== "text" || typeof n.text != "string" || Object.assign(t, Bn(n.text)?.answers);
+	for (let n of Array.isArray(e.content) ? e.content : []) !F(n) || n.type !== "text" || typeof n.text != "string" || Object.assign(t, Vn(n.text)?.answers);
 	return t;
 }
-function Bn(e) {
+function Vn(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) => I(e) && typeof e.questionItemId == "string" && typeof e.question == "string" && typeof e.answer == "string");
+		let n = e.filter((e) => F(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 {
@@ -1867,10 +1867,10 @@ function Bn(e) {
 		return null;
 	}
 }
-function Vn(e) {
-	if (!I(e) || typeof e.type != "string") return null;
+function Hn(e) {
+	if (!F(e) || typeof e.type != "string") return null;
 	if (e.type === "mention" && typeof e.path == "string" && !e.path.startsWith("plugin://")) {
-		let t = typeof e.name == "string" && e.name.trim() ? e.name.trim() : Hn(e.path, "File"), n = Un(e.path);
+		let t = typeof e.name == "string" && e.name.trim() ? e.name.trim() : Un(e.path, "File"), n = Wn(e.path);
 		return {
 			kind: "file",
 			name: t,
@@ -1879,26 +1879,26 @@ function Vn(e) {
 		};
 	}
 	if (e.type === "image" && typeof e.url == "string") {
-		let t = Un(e.url);
+		let t = Wn(e.url);
 		return {
 			kind: "image",
-			name: Hn(e.url, "Image"),
+			name: Un(e.url, "Image"),
 			url: e.url,
 			...t ? { mimeType: t } : {}
 		};
 	}
 	if (e.type === "localImage" && typeof e.path == "string") {
-		let t = Un(e.path);
+		let t = Wn(e.path);
 		return {
 			kind: "image",
-			name: Hn(e.path, "Image"),
+			name: Un(e.path, "Image"),
 			path: e.path,
 			...t ? { mimeType: t } : {}
 		};
 	}
 	return null;
 }
-function Hn(e, t) {
+function Un(e, t) {
 	try {
 		let n = /^[a-z][a-z\d+.-]*:/i.test(e) ? new URL(e).pathname : e;
 		return g(decodeURIComponent(n)).trim() || t;
@@ -1906,7 +1906,7 @@ function Hn(e, t) {
 		return g(e).trim() || t;
 	}
 }
-function Un(e) {
+function Wn(e) {
 	let t = /^data:([^;,]+)/i.exec(e)?.[1]?.toLowerCase();
 	if (t) return t;
 	let n = "";
@@ -1928,23 +1928,23 @@ function Un(e) {
 		webp: "image/webp"
 	}[n];
 }
-function Wn(e) {
+function Gn(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(En / 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(On / 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 > En) return null;
-	let i = Kn(r);
+	if (r.byteLength === 0 || r.byteLength > On) return null;
+	let i = qn(r);
 	return i ? {
 		url: `data:${i};base64,${t}`,
 		mimeType: i
 	} : null;
 }
-function Gn(e) {
+function Kn(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 Kn(e) {
-	if (qn(e, [
+function qn(e) {
+	if (Jn(e, [
 		137,
 		80,
 		78,
@@ -1954,7 +1954,7 @@ function Kn(e) {
 		26,
 		10
 	])) return "image/png";
-	if (qn(e, [
+	if (Jn(e, [
 		255,
 		216,
 		255
@@ -1962,50 +1962,50 @@ function Kn(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 qn(e, t) {
+function Jn(e, t) {
 	return t.every((t, n) => e[n] === t);
 }
-function Jn(e) {
+function Yn(e) {
 	return e === "inProgress" ? "streaming" : e === "failed" ? "error" : "complete";
 }
-function Yn(e) {
+function Xn(e) {
 	return typeof e != "number" || !Number.isFinite(e) ? (/* @__PURE__ */ new Date(0)).toISOString() : (/* @__PURE__ */ new Date(e * 1e3)).toISOString();
 }
-function I(e) {
+function F(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
 //#endregion
 //#region ../../node_modules/image-size/dist/esm/types/utils.js
-var Xn = new TextDecoder(), L = (e, t = 0, n = e.length) => Xn.decode(e.slice(t, n)), R = (e, t = 0, n = e.length) => e.slice(t, n).reduce((e, t) => e + `0${t.toString(16)}`.slice(-2), ""), z = (e, t) => new DataView(e.buffer, e.byteOffset + t), Zn = (e, t = 0) => z(e, t).getInt16(0, !0), Qn = (e, t = 0) => z(e, t).getUint16(0, !1), B = (e, t = 0) => z(e, t).getUint16(0, !0), $n = (e, t = 0) => {
-	let n = z(e, t);
+var Zn = new TextDecoder(), I = (e, t = 0, n = e.length) => Zn.decode(e.slice(t, n)), L = (e, t = 0, n = e.length) => e.slice(t, n).reduce((e, t) => e + `0${t.toString(16)}`.slice(-2), ""), R = (e, t) => new DataView(e.buffer, e.byteOffset + t), Qn = (e, t = 0) => R(e, t).getInt16(0, !0), $n = (e, t = 0) => R(e, t).getUint16(0, !1), z = (e, t = 0) => R(e, t).getUint16(0, !0), er = (e, t = 0) => {
+	let n = R(e, t);
 	return n.getUint16(0, !0) + (n.getUint8(2) << 16);
-}, er = (e, t = 0) => z(e, t).getInt32(0, !0), V = (e, t = 0) => z(e, t).getUint32(0, !1), H = (e, t = 0) => z(e, t).getUint32(0, !0), tr = (e, t, n) => z(e, t).getBigUint64(0, !n), nr = {
-	readUInt16BE: Qn,
-	readUInt16LE: B,
-	readUInt32BE: V,
-	readUInt32LE: H
+}, tr = (e, t = 0) => R(e, t).getInt32(0, !0), B = (e, t = 0) => R(e, t).getUint32(0, !1), V = (e, t = 0) => R(e, t).getUint32(0, !0), nr = (e, t, n) => R(e, t).getBigUint64(0, !n), rr = {
+	readUInt16BE: $n,
+	readUInt16LE: z,
+	readUInt32BE: B,
+	readUInt32LE: V
 };
-function U(e, t, n = 0, r = !1) {
-	return nr[`readUInt${t}${r ? "BE" : "LE"}`](e, n);
+function H(e, t, n = 0, r = !1) {
+	return rr[`readUInt${t}${r ? "BE" : "LE"}`](e, n);
 }
-var rr = 8;
-function ir(e, t) {
-	if (e.length - t < rr) return;
-	let n = V(e, t);
+var ir = 8;
+function ar(e, t) {
+	if (e.length - t < ir) return;
+	let n = B(e, t);
 	if (!(e.length - t < n)) return {
-		name: L(e, 4 + t, 8 + t),
+		name: I(e, 4 + t, 8 + t),
 		offset: t,
 		size: n
 	};
 }
-function W(e, t, n) {
+function U(e, t, n) {
 	let r = n;
 	for (; r < e.length && !(e.length - r < 4);) {
-		if (V(e, r) < rr) {
-			r += rr;
+		if (B(e, r) < ir) {
+			r += ir;
 			continue;
 		}
-		let n = ir(e, r);
+		let n = ar(e, r);
 		if (!n) break;
 		if (n.name === t) return n;
 		r += n.size;
@@ -2013,61 +2013,61 @@ function W(e, t, n) {
 }
 //#endregion
 //#region ../../node_modules/image-size/dist/esm/types/bmp.js
-var ar = {
-	validate: (e) => L(e, 0, 2) === "BM",
+var or = {
+	validate: (e) => I(e, 0, 2) === "BM",
 	calculate: (e) => ({
-		height: Math.abs(er(e, 22)),
-		width: H(e, 18)
+		height: Math.abs(tr(e, 22)),
+		width: V(e, 18)
 	})
-}, or = 1, sr = 6, cr = 16;
-function lr(e, t) {
+}, sr = 1, cr = 6, lr = 16;
+function ur(e, t) {
 	let n = e[t];
 	return n === 0 ? 256 : n;
 }
-function ur(e, t) {
-	let n = sr + t * cr;
+function dr(e, t) {
+	let n = cr + t * lr;
 	return {
-		height: lr(e, n + 1),
-		width: lr(e, n)
+		height: ur(e, n + 1),
+		width: ur(e, n)
 	};
 }
-var dr = {
+var fr = {
 	validate(e) {
-		let t = B(e, 0), n = B(e, 4);
-		return t !== 0 || n === 0 ? !1 : B(e, 2) === or;
+		let t = z(e, 0), n = z(e, 4);
+		return t !== 0 || n === 0 ? !1 : z(e, 2) === sr;
 	},
 	calculate(e) {
-		let t = B(e, 4);
-		if (sr + t * cr > e.length) throw TypeError("Invalid ICO");
-		let n = ur(e, 0);
+		let t = z(e, 4);
+		if (cr + t * lr > e.length) throw TypeError("Invalid ICO");
+		let n = dr(e, 0);
 		if (t === 1) return n;
 		let r = [];
-		for (let n = 0; n < t; n += 1) r.push(ur(e, n));
+		for (let n = 0; n < t; n += 1) r.push(dr(e, n));
 		return {
 			width: n.width,
 			height: n.height,
 			images: r
 		};
 	}
-}, fr = 2, pr = {
+}, pr = 2, mr = {
 	validate(e) {
-		let t = B(e, 0), n = B(e, 4);
-		return t !== 0 || n === 0 ? !1 : B(e, 2) === fr;
+		let t = z(e, 0), n = z(e, 4);
+		return t !== 0 || n === 0 ? !1 : z(e, 2) === pr;
 	},
-	calculate: (e) => dr.calculate(e)
-}, mr = {
-	validate: (e) => H(e, 0) === 542327876,
+	calculate: (e) => fr.calculate(e)
+}, hr = {
+	validate: (e) => V(e, 0) === 542327876,
 	calculate: (e) => ({
-		height: H(e, 12),
-		width: H(e, 16)
+		height: V(e, 12),
+		width: V(e, 16)
 	})
-}, hr = /^GIF8[79]a/, gr = {
-	validate: (e) => hr.test(L(e, 0, 6)),
+}, gr = /^GIF8[79]a/, _r = {
+	validate: (e) => gr.test(I(e, 0, 6)),
 	calculate: (e) => ({
-		height: B(e, 8),
-		width: B(e, 6)
+		height: z(e, 8),
+		width: z(e, 6)
 	})
-}, _r = {
+}, vr = {
 	avif: "avif",
 	mif1: "heif",
 	msf1: "heif",
@@ -2075,22 +2075,22 @@ var dr = {
 	heix: "heic",
 	hevc: "heic",
 	hevx: "heic"
-}, vr = {
+}, yr = {
 	validate(e) {
-		if (L(e, 4, 8) !== "ftyp") return !1;
-		let t = W(e, "ftyp", 0);
-		return t ? L(e, t.offset + 8, t.offset + 12) in _r : !1;
+		if (I(e, 4, 8) !== "ftyp") return !1;
+		let t = U(e, "ftyp", 0);
+		return t ? I(e, t.offset + 8, t.offset + 12) in vr : !1;
 	},
 	calculate(e) {
-		let t = W(e, "meta", 0), n = t && W(e, "iprp", t.offset + 12), r = n && W(e, "ipco", n.offset + 8);
+		let t = U(e, "meta", 0), n = t && U(e, "iprp", t.offset + 12), r = n && U(e, "ipco", n.offset + 8);
 		if (!r) throw TypeError("Invalid HEIF, no ipco box found");
-		let i = L(e, 8, 12), a = [], o = r.offset + 8;
+		let i = I(e, 8, 12), a = [], o = r.offset + 8;
 		for (; o < r.offset + r.size;) {
-			let t = W(e, "ispe", o);
+			let t = U(e, "ispe", o);
 			if (!t) break;
 			if (t.size < 20) throw TypeError("Invalid HEIF");
-			let n = V(e, t.offset + 12), i = V(e, t.offset + 16), s = W(e, "clap", o), c = n, l = i;
-			s && s.size >= 16 && s.offset < r.offset + r.size && (c = n - V(e, s.offset + 12)), a.push({
+			let n = B(e, t.offset + 12), i = B(e, t.offset + 16), s = U(e, "clap", o), c = n, l = i;
+			s && s.size >= 16 && s.offset < r.offset + r.size && (c = n - B(e, s.offset + 12)), a.push({
 				height: l,
 				width: c
 			});
@@ -2106,7 +2106,7 @@ var dr = {
 			...a.length > 1 ? { images: a } : {}
 		};
 	}
-}, yr = 8, br = 4, xr = 4, Sr = {
+}, br = 8, xr = 4, Sr = 4, Cr = {
 	ICON: 32,
 	"ICN#": 32,
 	"icm#": 16,
@@ -2139,27 +2139,27 @@ var dr = {
 	ic14: 512,
 	ic10: 1024
 };
-function Cr(e, t) {
-	let n = t + xr;
+function wr(e, t) {
+	let n = t + Sr;
 	if (n + 4 > e.length) throw TypeError("Invalid ICNS");
-	return [L(e, t, n), V(e, n)];
+	return [I(e, t, n), B(e, n)];
 }
-function wr(e) {
-	let t = Sr[e];
+function Tr(e) {
+	let t = Cr[e];
 	return {
 		width: t,
 		height: t,
 		type: e
 	};
 }
-var Tr = {
-	validate: (e) => L(e, 0, 4) === "icns",
+var Er = {
+	validate: (e) => I(e, 0, 4) === "icns",
 	calculate(e) {
-		let t = e.length, n = V(e, br), r = yr, i = [];
+		let t = e.length, n = B(e, xr), r = br, i = [];
 		for (; r < n && r < t;) {
-			let t = Cr(e, r), n = t[1];
+			let t = wr(e, r), n = t[1];
 			if (n < 8) throw TypeError("Invalid ICNS");
-			let a = wr(t[0]);
+			let a = Tr(t[0]);
 			i.push(a), r += n;
 		}
 		if (i.length === 0) throw TypeError("Invalid ICNS, no sizes found");
@@ -2169,64 +2169,64 @@ var Tr = {
 			...i.length > 1 ? { images: i } : {}
 		};
 	}
-}, Er = {
-	validate: (e) => V(e, 0) === 4283432785,
+}, Dr = {
+	validate: (e) => B(e, 0) === 4283432785,
 	calculate: (e) => ({
-		height: V(e, 12),
-		width: V(e, 8)
+		height: B(e, 12),
+		width: B(e, 8)
 	})
-}, Dr = {
+}, Or = {
 	validate(e) {
-		if (L(e, 4, 8) !== "jP  ") return !1;
-		let t = W(e, "ftyp", 0);
-		return t ? L(e, t.offset + 8, t.offset + 12) === "jp2 " : !1;
+		if (I(e, 4, 8) !== "jP  ") return !1;
+		let t = U(e, "ftyp", 0);
+		return t ? I(e, t.offset + 8, t.offset + 12) === "jp2 " : !1;
 	},
 	calculate(e) {
-		let t = W(e, "jp2h", 0), n = t && W(e, "ihdr", t.offset + 8);
+		let t = U(e, "jp2h", 0), n = t && U(e, "ihdr", t.offset + 8);
 		if (n) return {
-			height: V(e, n.offset + 8),
-			width: V(e, n.offset + 12)
+			height: B(e, n.offset + 8),
+			width: B(e, n.offset + 12)
 		};
 		throw TypeError("Unsupported JPEG 2000 format");
 	}
-}, Or = "45786966", kr = 2, Ar = 6, jr = "4d4d", Mr = "4949", Nr = 12;
-function Pr(e) {
-	return R(e, 2, 6) === Or;
+}, kr = "45786966", Ar = 2, jr = 6, Mr = "4d4d", Nr = "4949", Pr = 12;
+function Fr(e) {
+	return L(e, 2, 6) === kr;
 }
-function Fr(e, t) {
+function Ir(e, t) {
 	return {
-		height: Qn(e, t),
-		width: Qn(e, t + 2)
+		height: $n(e, t),
+		width: $n(e, t + 2)
 	};
 }
-function Ir(e, t) {
-	let n = U(e, 16, 14, t);
+function Lr(e, t) {
+	let n = H(e, 16, 14, t);
 	for (let r = 0; r < n; r++) {
-		let n = 16 + r * Nr, i = n + Nr;
+		let n = 16 + r * Pr, i = n + Pr;
 		if (n > e.length) return;
 		let a = e.slice(n, i);
-		if (U(a, 16, 0, t) === 274) return U(a, 16, 2, t) !== 3 || U(a, 32, 4, t) !== 1 ? void 0 : U(a, 16, 8, t);
+		if (H(a, 16, 0, t) === 274) return H(a, 16, 2, t) !== 3 || H(a, 32, 4, t) !== 1 ? void 0 : H(a, 16, 8, t);
 	}
 }
-function Lr(e, t) {
-	let n = e.slice(kr, t), r = R(n, Ar, 8), i = r === jr;
-	if (i || r === Mr) return Ir(n, i);
-}
 function Rr(e, t) {
+	let n = e.slice(Ar, t), r = L(n, jr, 8), i = r === Mr;
+	if (i || r === Nr) return Lr(n, i);
+}
+function zr(e, t) {
 	if (t > e.length) throw TypeError("Corrupt JPG, exceeded buffer limits");
 }
-var zr = {
-	validate: (e) => R(e, 0, 2) === "ffd8",
+var Br = {
+	validate: (e) => L(e, 0, 2) === "ffd8",
 	calculate(e) {
 		let t = e.slice(4), n, r;
 		for (; t.length;) {
-			let e = Qn(t, 0);
-			if (Rr(t, e), t[e] !== 255) {
+			let e = $n(t, 0);
+			if (zr(t, e), t[e] !== 255) {
 				t = t.slice(1);
 				continue;
 			}
-			if (Pr(t) && (n = Lr(t, e)), r = t[e + 1], r === 192 || r === 193 || r === 194) {
-				let r = Fr(t, e + 5);
+			if (Fr(t) && (n = Rr(t, e)), r = t[e + 1], r === 192 || r === 193 || r === 194) {
+				let r = Ir(t, e + 5);
 				return n ? {
 					height: r.height,
 					orientation: n,
@@ -2237,7 +2237,7 @@ var zr = {
 		}
 		throw TypeError("Invalid JPG, no size found");
 	}
-}, Br = class {
+}, Vr = class {
 	input;
 	endianness;
 	byteOffset = 2;
@@ -2264,7 +2264,7 @@ var zr = {
 };
 //#endregion
 //#region ../../node_modules/image-size/dist/esm/types/jxl-stream.js
-function Vr(e, t) {
+function Hr(e, t) {
 	if (t) return 8 * (1 + e.getBits(5));
 	let n = [
 		9,
@@ -2274,8 +2274,8 @@ function Vr(e, t) {
 	][e.getBits(2)];
 	return 1 + e.getBits(n);
 }
-function Hr(e, t, n, r) {
-	return t && n === 0 ? 8 * (1 + e.getBits(5)) : n === 0 ? Vr(e, !1) : Math.floor(r * [
+function Ur(e, t, n, r) {
+	return t && n === 0 ? 8 * (1 + e.getBits(5)) : n === 0 ? Hr(e, !1) : Math.floor(r * [
 		1,
 		1.2,
 		4 / 3,
@@ -2285,82 +2285,82 @@ function Hr(e, t, n, r) {
 		2
 	][n - 1]);
 }
-var Ur = {
-	validate: (e) => R(e, 0, 2) === "ff0a",
+var Wr = {
+	validate: (e) => L(e, 0, 2) === "ff0a",
 	calculate(e) {
-		let t = new Br(e, "little-endian"), n = t.getBits(1) === 1, r = Vr(t, n);
+		let t = new Vr(e, "little-endian"), n = t.getBits(1) === 1, r = Hr(t, n);
 		return {
-			width: Hr(t, n, t.getBits(3), r),
+			width: Ur(t, n, t.getBits(3), r),
 			height: r
 		};
 	}
 };
 //#endregion
 //#region ../../node_modules/image-size/dist/esm/types/jxl.js
-function Wr(e) {
-	let t = W(e, "jxlc", 0);
+function Gr(e) {
+	let t = U(e, "jxlc", 0);
 	if (t) return e.slice(t.offset + 8, t.offset + t.size);
-	let n = Gr(e);
-	if (n.length > 0) return Kr(n);
+	let n = Kr(e);
+	if (n.length > 0) return qr(n);
 }
-function Gr(e) {
+function Kr(e) {
 	let t = [], n = 0;
 	for (; n < e.length;) {
-		let r = W(e, "jxlp", n);
+		let r = U(e, "jxlp", n);
 		if (!r) break;
 		if (r.size < 12) throw TypeError("Invalid JXL");
 		t.push(e.slice(r.offset + 12, r.offset + r.size)), n = r.offset + r.size;
 	}
 	return t;
 }
-function Kr(e) {
+function qr(e) {
 	let t = e.reduce((e, t) => e + t.length, 0), n = new Uint8Array(t), r = 0;
 	for (let t of e) n.set(t, r), r += t.length;
 	return n;
 }
-var qr = {
+var Jr = {
 	validate: (e) => {
-		if (L(e, 4, 8) !== "JXL ") return !1;
-		let t = W(e, "ftyp", 0);
-		return t ? L(e, t.offset + 8, t.offset + 12) === "jxl " : !1;
+		if (I(e, 4, 8) !== "JXL ") return !1;
+		let t = U(e, "ftyp", 0);
+		return t ? I(e, t.offset + 8, t.offset + 12) === "jxl " : !1;
 	},
 	calculate(e) {
-		let t = Wr(e);
-		if (t) return Ur.calculate(t);
+		let t = Gr(e);
+		if (t) return Wr.calculate(t);
 		throw TypeError("Invalid JXL");
 	}
-}, Jr = {
+}, Yr = {
 	validate: (e) => {
-		let t = L(e, 1, 7);
+		let t = I(e, 1, 7);
 		return ["KTX 11", "KTX 20"].includes(t);
 	},
 	calculate: (e) => {
 		let t = e[5] === 49 ? "ktx" : "ktx2", n = t === "ktx" ? 36 : 20;
 		return {
-			height: H(e, n + 4),
-			width: H(e, n),
+			height: V(e, n + 4),
+			width: V(e, n),
 			type: t
 		};
 	}
-}, Yr = "PNG\r\n\n", Xr = "IHDR", Zr = "CgBI", Qr = {
+}, Xr = "PNG\r\n\n", Zr = "IHDR", Qr = "CgBI", $r = {
 	validate(e) {
-		if (Yr === L(e, 1, 8)) {
-			let t = L(e, 12, 16);
-			if (t === Zr && (t = L(e, 28, 32)), t !== Xr) throw TypeError("Invalid PNG");
+		if (Xr === I(e, 1, 8)) {
+			let t = I(e, 12, 16);
+			if (t === Qr && (t = I(e, 28, 32)), t !== Zr) throw TypeError("Invalid PNG");
 			return !0;
 		}
 		return !1;
 	},
 	calculate(e) {
-		return L(e, 12, 16) === Zr ? {
-			height: V(e, 36),
-			width: V(e, 32)
+		return I(e, 12, 16) === Qr ? {
+			height: B(e, 36),
+			width: B(e, 32)
 		} : {
-			height: V(e, 20),
-			width: V(e, 16)
+			height: B(e, 20),
+			width: B(e, 16)
 		};
 	}
-}, $r = {
+}, ei = {
 	P1: "pbm/ascii",
 	P2: "pgm/ascii",
 	P3: "ppm/ascii",
@@ -2369,7 +2369,7 @@ var qr = {
 	P6: "ppm",
 	P7: "pam",
 	PF: "pfm"
-}, ei = {
+}, ti = {
 	default: (e) => {
 		let t = [];
 		for (; e.length > 0;) {
@@ -2399,60 +2399,60 @@ var qr = {
 		};
 		throw TypeError("Invalid PAM");
 	}
-}, ti = {
-	validate: (e) => L(e, 0, 2) in $r,
+}, ni = {
+	validate: (e) => I(e, 0, 2) in ei,
 	calculate(e) {
-		let t = $r[L(e, 0, 2)], n = L(e, 3).split(/[\r\n]+/);
-		return (ei[t] || ei.default)(n);
+		let t = ei[I(e, 0, 2)], n = I(e, 3).split(/[\r\n]+/);
+		return (ti[t] || ti.default)(n);
 	}
-}, ni = {
-	validate: (e) => L(e, 0, 4) === "8BPS",
+}, ri = {
+	validate: (e) => I(e, 0, 4) === "8BPS",
 	calculate: (e) => ({
-		height: V(e, 14),
-		width: V(e, 18)
+		height: B(e, 14),
+		width: B(e, 18)
 	})
-}, ri = /<svg\s([^>"']|"[^"]*"|'[^']*')*>/, ii = {
+}, ii = /<svg\s([^>"']|"[^"]*"|'[^']*')*>/, ai = {
 	height: /\sheight=(['"])([^%]+?)\1/,
-	root: ri,
+	root: ii,
 	viewbox: /\sviewBox=(['"])(.+?)\1/i,
 	width: /\swidth=(['"])([^%]+?)\1/
-}, ai = 2.54, oi = {
+}, oi = 2.54, si = {
 	in: 96,
-	cm: 96 / ai,
+	cm: 96 / oi,
 	em: 16,
 	ex: 8,
-	m: 96 / ai * 100,
-	mm: 96 / ai / 10,
+	m: 96 / oi * 100,
+	mm: 96 / oi / 10,
 	pc: 96 / 72 / 12,
 	pt: 96 / 72,
 	px: 1
-}, si = RegExp(`^([0-9.]+(?:e\\d+)?)(${Object.keys(oi).join("|")})?$`);
-function ci(e) {
-	let t = si.exec(e);
-	if (t) return Math.round(Number(t[1]) * (oi[t[2]] || 1));
-}
+}, ci = RegExp(`^([0-9.]+(?:e\\d+)?)(${Object.keys(si).join("|")})?$`);
 function li(e) {
+	let t = ci.exec(e);
+	if (t) return Math.round(Number(t[1]) * (si[t[2]] || 1));
+}
+function ui(e) {
 	let t = e.split(" ");
 	return {
-		height: ci(t[3]),
-		width: ci(t[2])
+		height: li(t[3]),
+		width: li(t[2])
 	};
 }
-function ui(e) {
-	let t = e.match(ii.width), n = e.match(ii.height), r = e.match(ii.viewbox);
+function di(e) {
+	let t = e.match(ai.width), n = e.match(ai.height), r = e.match(ai.viewbox);
 	return {
-		height: n && ci(n[2]),
-		viewbox: r && li(r[2]),
-		width: t && ci(t[2])
+		height: n && li(n[2]),
+		viewbox: r && ui(r[2]),
+		width: t && li(t[2])
 	};
 }
-function di(e) {
+function fi(e) {
 	return {
 		height: e.height,
 		width: e.width
 	};
 }
-function fi(e, t) {
+function pi(e, t) {
 	let n = t.width / t.height;
 	return e.width ? {
 		height: Math.floor(e.width / n),
@@ -2465,28 +2465,28 @@ function fi(e, t) {
 		width: t.width
 	};
 }
-var pi = {
-	validate: (e) => ri.test(L(e, 0, 1e3)),
+var mi = {
+	validate: (e) => ii.test(I(e, 0, 1e3)),
 	calculate(e) {
-		let t = L(e).match(ii.root);
+		let t = I(e).match(ai.root);
 		if (t) {
-			let e = ui(t[0]);
-			if (e.width && e.height) return di(e);
-			if (e.viewbox) return fi(e, e.viewbox);
+			let e = di(t[0]);
+			if (e.width && e.height) return fi(e);
+			if (e.viewbox) return pi(e, e.viewbox);
 		}
 		throw TypeError("Invalid SVG");
 	}
-}, mi = {
+}, hi = {
 	validate(e) {
-		return B(e, 0) === 0 && B(e, 4) === 0;
+		return z(e, 0) === 0 && z(e, 4) === 0;
 	},
 	calculate(e) {
 		return {
-			height: B(e, 14),
-			width: B(e, 12)
+			height: z(e, 14),
+			width: z(e, 12)
 		};
 	}
-}, G = {
+}, W = {
 	TAG: {
 		WIDTH: 256,
 		HEIGHT: 257,
@@ -2506,129 +2506,129 @@ var pi = {
 		BIG: 8
 	}
 };
-function hi(e, { isBigEndian: t, isBigTiff: n }) {
-	let r = n ? Number(tr(e, 8, t)) : U(e, 32, 4, t), i = n ? G.COUNT_SIZE.BIG : G.COUNT_SIZE.STANDARD;
+function gi(e, { isBigEndian: t, isBigTiff: n }) {
+	let r = n ? Number(nr(e, 8, t)) : H(e, 32, 4, t), i = n ? W.COUNT_SIZE.BIG : W.COUNT_SIZE.STANDARD;
 	return e.slice(r + i);
 }
-function gi(e, t, n, r) {
+function _i(e, t, n, r) {
 	switch (t) {
-		case G.TYPE.SHORT: return U(e, 16, n, r);
-		case G.TYPE.LONG: return U(e, 32, n, r);
-		case G.TYPE.LONG8: {
-			let t = Number(tr(e, n, r));
+		case W.TYPE.SHORT: return H(e, 16, n, r);
+		case W.TYPE.LONG: return H(e, 32, n, r);
+		case W.TYPE.LONG8: {
+			let t = Number(nr(e, n, r));
 			if (t > 2 ** 53 - 1) throw TypeError("Value too large");
 			return t;
 		}
 		default: return 0;
 	}
 }
-function _i(e, t) {
-	let n = t ? G.ENTRY_SIZE.BIG : G.ENTRY_SIZE.STANDARD;
+function vi(e, t) {
+	let n = t ? W.ENTRY_SIZE.BIG : W.ENTRY_SIZE.STANDARD;
 	if (e.length > n) return e.slice(n);
 }
-function vi(e, { isBigEndian: t, isBigTiff: n }) {
+function yi(e, { isBigEndian: t, isBigTiff: n }) {
 	let r = {}, i = e;
 	for (; i?.length;) {
-		let e = U(i, 16, 0, t), a = U(i, 16, 2, t), o = n ? Number(tr(i, 4, t)) : U(i, 32, 4, t);
+		let e = H(i, 16, 0, t), a = H(i, 16, 2, t), o = n ? Number(nr(i, 4, t)) : H(i, 32, 4, t);
 		if (e === 0) break;
-		o === 1 && (a === G.TYPE.SHORT || a === G.TYPE.LONG || n && a === G.TYPE.LONG8) && (r[e] = gi(i, a, n ? 12 : 8, t)), i = _i(i, n);
+		o === 1 && (a === W.TYPE.SHORT || a === W.TYPE.LONG || n && a === W.TYPE.LONG8) && (r[e] = _i(i, a, n ? 12 : 8, t)), i = vi(i, n);
 	}
 	return r;
 }
-function yi(e) {
-	let t = L(e, 0, 2), n = U(e, 16, 2, t === "MM");
+function bi(e) {
+	let t = I(e, 0, 2), n = H(e, 16, 2, t === "MM");
 	return {
 		isBigEndian: t === "MM",
 		isBigTiff: n === 43
 	};
 }
-function bi(e, t) {
-	let n = U(e, 16, 4, t), r = U(e, 16, 6, t);
+function xi(e, t) {
+	let n = H(e, 16, 4, t), r = H(e, 16, 6, t);
 	if (n !== 8 || r !== 0) throw TypeError("Invalid BigTIFF header");
 }
-var xi = /* @__PURE__ */ new Set([
+var Si = /* @__PURE__ */ new Set([
 	"49492a00",
 	"4d4d002a",
 	"49492b00",
 	"4d4d002b"
-]), Si = {
+]), Ci = {
 	validate: (e) => {
-		let t = R(e, 0, 4);
-		return xi.has(t);
+		let t = L(e, 0, 4);
+		return Si.has(t);
 	},
 	calculate(e) {
-		let t = yi(e);
-		t.isBigTiff && bi(e, t.isBigEndian);
-		let n = vi(hi(e, t), t), r = {
-			height: n[G.TAG.HEIGHT],
-			width: n[G.TAG.WIDTH],
+		let t = bi(e);
+		t.isBigTiff && xi(e, t.isBigEndian);
+		let n = yi(gi(e, t), t), r = {
+			height: n[W.TAG.HEIGHT],
+			width: n[W.TAG.WIDTH],
 			type: t.isBigTiff ? "bigtiff" : "tiff"
 		};
-		if (n[G.TAG.COMPRESSION] && (r.compression = n[G.TAG.COMPRESSION]), !r.width || !r.height) throw TypeError("Invalid Tiff. Missing tags");
+		if (n[W.TAG.COMPRESSION] && (r.compression = n[W.TAG.COMPRESSION]), !r.width || !r.height) throw TypeError("Invalid Tiff. Missing tags");
 		return r;
 	}
 };
 //#endregion
 //#region ../../node_modules/image-size/dist/esm/types/webp.js
-function Ci(e) {
+function wi(e) {
 	return {
-		height: 1 + $n(e, 7),
-		width: 1 + $n(e, 4)
+		height: 1 + er(e, 7),
+		width: 1 + er(e, 4)
 	};
 }
-function wi(e) {
+function Ti(e) {
 	return {
 		height: 1 + ((e[4] & 15) << 10 | e[3] << 2 | (e[2] & 192) >> 6),
 		width: 1 + ((e[2] & 63) << 8 | e[1])
 	};
 }
-function Ti(e) {
+function Ei(e) {
 	return {
-		height: Zn(e, 8) & 16383,
-		width: Zn(e, 6) & 16383
+		height: Qn(e, 8) & 16383,
+		width: Qn(e, 6) & 16383
 	};
 }
 //#endregion
 //#region ../../node_modules/image-size/dist/esm/types/index.js
-var Ei = /* @__PURE__ */ new Map([
-	["bmp", ar],
-	["cur", pr],
-	["dds", mr],
-	["gif", gr],
-	["heif", vr],
-	["icns", Tr],
-	["ico", dr],
-	["j2c", Er],
-	["jp2", Dr],
-	["jpg", zr],
-	["jxl", qr],
-	["jxl-stream", Ur],
-	["ktx", Jr],
-	["png", Qr],
-	["pnm", ti],
-	["psd", ni],
-	["svg", pi],
-	["tga", mi],
-	["tiff", Si],
+var Di = /* @__PURE__ */ new Map([
+	["bmp", or],
+	["cur", mr],
+	["dds", hr],
+	["gif", _r],
+	["heif", yr],
+	["icns", Er],
+	["ico", fr],
+	["j2c", Dr],
+	["jp2", Or],
+	["jpg", Br],
+	["jxl", Jr],
+	["jxl-stream", Wr],
+	["ktx", Yr],
+	["png", $r],
+	["pnm", ni],
+	["psd", ri],
+	["svg", mi],
+	["tga", hi],
+	["tiff", Ci],
 	["webp", {
 		validate(e) {
-			let t = L(e, 0, 4) === "RIFF", n = L(e, 8, 12) === "WEBP", r = L(e, 12, 15) === "VP8";
+			let t = I(e, 0, 4) === "RIFF", n = I(e, 8, 12) === "WEBP", r = I(e, 12, 15) === "VP8";
 			return t && n && r;
 		},
 		calculate(e) {
-			let t = L(e, 12, 16), n = e.slice(20, 30);
+			let t = I(e, 12, 16), n = e.slice(20, 30);
 			if (t === "VP8X") {
 				let e = n[0], t = (e & 192) == 0, r = (e & 1) == 0;
-				if (t && r) return Ci(n);
+				if (t && r) return wi(n);
 				throw TypeError("Invalid WebP");
 			}
-			if (t === "VP8 " && n[0] !== 47) return Ti(n);
-			let r = R(n, 3, 6);
-			if (t === "VP8L" && r !== "9d012a") return wi(n);
+			if (t === "VP8 " && n[0] !== 47) return Ei(n);
+			let r = L(n, 3, 6);
+			if (t === "VP8L" && r !== "9d012a") return Ti(n);
 			throw TypeError("Invalid WebP");
 		}
 	}]
-]), Di = Array.from(Ei.keys()), Oi = /* @__PURE__ */ new Map([
+]), Oi = Array.from(Di.keys()), ki = /* @__PURE__ */ new Map([
 	[0, "heif"],
 	[56, "psd"],
 	[66, "bmp"],
@@ -2641,18 +2641,18 @@ var Ei = /* @__PURE__ */ new Map([
 	[137, "png"],
 	[255, "jpg"]
 ]);
-function ki(e) {
-	let t = e[0], n = Oi.get(t);
-	return n && Ei.get(n)?.validate(e) ? n : Di.find((t) => Ei.get(t)?.validate(e));
+function Ai(e) {
+	let t = e[0], n = ki.get(t);
+	return n && Di.get(n)?.validate(e) ? n : Oi.find((t) => Di.get(t)?.validate(e));
 }
 //#endregion
 //#region ../../node_modules/image-size/dist/esm/lookup.js
-var Ai = { disabledTypes: [] };
-function ji(e) {
-	let t = ki(e);
+var ji = { disabledTypes: [] };
+function Mi(e) {
+	let t = Ai(e);
 	if (t !== void 0) {
-		if (Ai.disabledTypes.indexOf(t) > -1) throw TypeError(`disabled file type: ${t}`);
-		let n = Ei.get(t)?.calculate(e);
+		if (ji.disabledTypes.indexOf(t) > -1) throw TypeError(`disabled file type: ${t}`);
+		let n = Di.get(t)?.calculate(e);
 		if (n !== void 0) {
 			if (n.type = n.type ?? t, n.images && n.images.length > 1) {
 				let e = n.images.reduce((e, t) => t.width * t.height > e.width * e.height ? t : e, n.images[0]);
@@ -2665,7 +2665,7 @@ function ji(e) {
 }
 //#endregion
 //#region src/node/conversation-content-transport.ts
-var Mi = class {
+var Ni = class {
 	conversationId;
 	cache = /* @__PURE__ */ new WeakMap();
 	constructor(e) {
@@ -2680,7 +2680,7 @@ var Mi = class {
 		if (!Number.isSafeInteger(n) || n < 0 || n >= r.byteLength) throw Error("Invalid content offset.");
 		let i = Math.min(r.byteLength, n + 64 * 1024);
 		return {
-			data: Ni(r, n, i).toString("base64"),
+			data: Pi(r, n, i).toString("base64"),
 			totalBytes: r.byteLength,
 			nextOffset: i < r.byteLength ? i : null
 		};
@@ -2699,13 +2699,13 @@ var Mi = class {
 			].includes(a ?? "") && /^data:image\/[a-z0-9.+-]+;base64,[a-z\d+/]+=*$/i.test(e)) {
 				let i = n.get(e);
 				if (!i) {
-					let a = Fi(e);
+					let a = Ii(e);
 					t.set(a, {
 						text: e,
 						byteLength: e.length,
 						charOffset: 0,
 						byteOffset: 0
-					}), i = `conversation-image:${encodeURIComponent(this.conversationId)}:${a}`, n.set(e, i), r.set(i, Ii(e));
+					}), i = `conversation-image:${encodeURIComponent(this.conversationId)}:${a}`, n.set(e, i), r.set(i, Li(e));
 				}
 				return i;
 			}
@@ -2716,7 +2716,7 @@ var Mi = class {
 				"update",
 				"delete"
 			].includes(String(o.kind?.type)) && typeof o.diff == "string" && o.diff.length > 0) {
-				let n = Buffer.byteLength(o.diff), r = Fi(o.diff);
+				let n = Buffer.byteLength(o.diff), r = Ii(o.diff);
 				return t.set(r, {
 					text: o.diff,
 					byteLength: n,
@@ -2748,32 +2748,32 @@ var Mi = class {
 		return e && typeof e == "object" && this.cache.set(e, a), a;
 	}
 };
-function Ni(e, t, n) {
+function Pi(e, t, n) {
 	if (e.byteLength === e.text.length) return Buffer.from(e.text.slice(t, n));
 	t < e.byteOffset && (e.charOffset = 0, e.byteOffset = 0);
 	let r = [];
 	for (; e.byteOffset < n;) {
-		let i = Pi(e.text, e.charOffset), a = e.text.slice(e.charOffset, i), o = e.byteOffset + Buffer.byteLength(a);
+		let i = Fi(e.text, e.charOffset), a = e.text.slice(e.charOffset, i), o = e.byteOffset + Buffer.byteLength(a);
 		if (o > t && r.push(Buffer.from(a).subarray(Math.max(0, t - e.byteOffset), Math.min(o, n) - e.byteOffset)), o >= n) break;
 		e.charOffset = i, e.byteOffset = o;
 	}
 	return Buffer.concat(r, n - t);
 }
-function Pi(e, t) {
+function Fi(e, t) {
 	let n = Math.min(e.length, t + 16 * 1024), r = e.charCodeAt(n - 1);
 	return n < e.length && r >= 55296 && r <= 56319 ? n - 1 : n;
 }
-function Fi(e) {
-	let t = S("sha256");
+function Ii(e) {
+	let t = ee("sha256");
 	for (let n = 0; n < e.length;) {
-		let r = Pi(e, n);
+		let r = Fi(e, n);
 		t.update(e.slice(n, r)), n = r;
 	}
 	return t.digest("hex");
 }
-function Ii(e) {
+function Li(e) {
 	try {
-		let t = e.indexOf(",") + 1, { width: n, height: r, orientation: i } = ji(Buffer.from(e.slice(t, t + 64 * 1024), "base64"));
+		let t = e.indexOf(",") + 1, { width: n, height: r, orientation: i } = Mi(Buffer.from(e.slice(t, t + 64 * 1024), "base64"));
 		return !Number.isSafeInteger(n) || !Number.isSafeInteger(r) || n <= 0 || r <= 0 ? void 0 : i && i >= 5 && i <= 8 ? {
 			width: r,
 			height: n
@@ -2787,7 +2787,7 @@ function Ii(e) {
 }
 //#endregion
 //#region src/node/codex-original-history-images.ts
-var Li = 32 * 1024 * 1024, Ri = 20 * 1024 * 1024, zi = 2048, Bi = class {
+var Ri = 32 * 1024 * 1024, zi = 20 * 1024 * 1024, Bi = 2048, Vi = class {
 	client;
 	paths = /* @__PURE__ */ new Map();
 	indexes = /* @__PURE__ */ new Map();
@@ -2844,13 +2844,13 @@ var Li = 32 * 1024 * 1024, Ri = 20 * 1024 * 1024, zi = 2048, Bi = class {
 		let r = await this.index(e), i = r.images.get(t);
 		if (!i) throw Error("Original conversation image is no longer available.");
 		if (!Number.isSafeInteger(n) || n < 0 || n >= i.byteLength) throw Error("Invalid content offset.");
-		let a = Wi(await ce(r.path));
+		let a = Gi(await ce(r.path));
 		if (this.disposed || this.paths.get(e) !== r.path) throw Error("Conversation image reader was released.");
 		let o = this.images.get(t), s = o?.signature === a ? o.url : void 0;
 		if (this.images.delete(t), !s) {
 			let t = await oe(r.path, "r");
 			try {
-				await Gi(t, e);
+				await Ki(t, e);
 				let n = Buffer.alloc(i.length);
 				for (let e = 0; e < n.length;) {
 					let r = await t.read(n, e, Math.min(64 * 1024, n.length - e), i.offset + e);
@@ -2858,9 +2858,9 @@ var Li = 32 * 1024 * 1024, Ri = 20 * 1024 * 1024, zi = 2048, Bi = class {
 					e += r.bytesRead;
 				}
 				let a = JSON.parse(n.toString("utf8")), o = a.payload;
-				if (a.type !== "response_item" || o?.type !== "custom_tool_call_output" || o.call_id !== i.callId || Vi(o) !== i.turnId || !Array.isArray(o.output)) throw Error("Original image identity changed.");
-				let c = o.output[i.imageIndex], l = Hi(c);
-				if (!l || Ui(l) !== i.hash) throw Error("Original image bytes changed.");
+				if (a.type !== "response_item" || o?.type !== "custom_tool_call_output" || o.call_id !== i.callId || Hi(o) !== i.turnId || !Array.isArray(o.output)) throw Error("Original image identity changed.");
+				let c = o.output[i.imageIndex], l = Ui(c);
+				if (!l || Wi(l) !== i.hash) throw Error("Original image bytes changed.");
 				if (s = l, this.disposed || this.paths.get(e) !== r.path) throw Error("Conversation image reader was released.");
 			} finally {
 				await t.close();
@@ -2869,7 +2869,7 @@ var Li = 32 * 1024 * 1024, Ri = 20 * 1024 * 1024, zi = 2048, Bi = class {
 		for (this.images.set(t, {
 			signature: a,
 			url: s
-		}); this.images.size > 2 || [...this.images.values()].reduce((e, t) => e + t.url.length, 0) > Ri;) this.images.delete(this.images.keys().next().value);
+		}); this.images.size > 2 || [...this.images.values()].reduce((e, t) => e + t.url.length, 0) > zi;) this.images.delete(this.images.keys().next().value);
 		let c = Math.min(s.length, n + 64 * 1024);
 		return {
 			data: Buffer.from(s.slice(n, c)).toString("base64"),
@@ -2891,14 +2891,14 @@ var Li = 32 * 1024 * 1024, Ri = 20 * 1024 * 1024, zi = 2048, Bi = class {
 		}
 		let n = await ce(t);
 		if (!n.isFile()) throw Error("Original history is not a file.");
-		let r = Wi(n), i = this.indexes.get(e);
+		let r = Gi(n), i = this.indexes.get(e);
 		if (i?.signature === r) return i;
 		let a = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map(), s = await oe(t, "r");
 		try {
-			await Gi(s, e);
+			await Ki(s, e);
 			let t = 0;
-			for await (let r of Ki(s, n.size)) {
-				if (++t > 1e5 || a.size >= zi) break;
+			for await (let r of qi(s, n.size)) {
+				if (++t > 1e5 || a.size >= Bi) break;
 				let n;
 				try {
 					n = JSON.parse(r.text);
@@ -2907,7 +2907,7 @@ var Li = 32 * 1024 * 1024, Ri = 20 * 1024 * 1024, zi = 2048, Bi = class {
 				}
 				let i = n?.payload;
 				if (n?.type !== "response_item" || !i || typeof i.call_id != "string" || !i.call_id || i.call_id.length > 256) continue;
-				let s = Vi(i);
+				let s = Hi(i);
 				if (s) {
 					if (i.type === "custom_tool_call") {
 						o.size < 4096 && o.set(i.call_id, s);
@@ -2915,10 +2915,10 @@ var Li = 32 * 1024 * 1024, Ri = 20 * 1024 * 1024, zi = 2048, Bi = class {
 					}
 					if (!(i.type !== "custom_tool_call_output" || o.get(i.call_id) !== s || !Array.isArray(i.output))) {
 						o.delete(i.call_id);
-						for (let t = 0; t < Math.min(i.output.length, 256) && a.size < zi; t++) {
-							let n = Hi(i.output[t]);
+						for (let t = 0; t < Math.min(i.output.length, 256) && a.size < Bi; t++) {
+							let n = Ui(i.output[t]);
 							if (!n) continue;
-							let o = Ui(n), c = Ui(JSON.stringify([
+							let o = Wi(n), c = Wi(JSON.stringify([
 								e,
 								s,
 								i.call_id,
@@ -2942,7 +2942,7 @@ var Li = 32 * 1024 * 1024, Ri = 20 * 1024 * 1024, zi = 2048, Bi = class {
 										mimeType: n.slice(5, n.indexOf(";")),
 										title: "Recorded tool image",
 										alt: "Recorded tool image",
-										...Ii(n)
+										...Li(n)
 									}
 								}
 							});
@@ -2963,24 +2963,24 @@ var Li = 32 * 1024 * 1024, Ri = 20 * 1024 * 1024, zi = 2048, Bi = class {
 		return c;
 	}
 };
-function Vi(e) {
+function Hi(e) {
 	let t = e.internal_chat_message_metadata_passthrough;
 	return t && typeof t == "object" && "turn_id" in t && typeof t.turn_id == "string" && t.turn_id.length <= 256 ? t.turn_id : void 0;
 }
-function Hi(e) {
-	if (!(!e || typeof e != "object" || !("type" in e) || e.type !== "input_image" || !("image_url" in e) || typeof e.image_url != "string" || e.image_url.length > Ri)) return Wn(e.image_url)?.url;
-}
 function Ui(e) {
-	return S("sha256").update(e).digest("hex");
+	if (!(!e || typeof e != "object" || !("type" in e) || e.type !== "input_image" || !("image_url" in e) || typeof e.image_url != "string" || e.image_url.length > zi)) return Gn(e.image_url)?.url;
 }
 function Wi(e) {
+	return ee("sha256").update(e).digest("hex");
+}
+function Gi(e) {
 	return `${e.dev}:${e.ino}:${e.size}:${e.mtimeMs}`;
 }
-async function Gi(e, t) {
+async function Ki(e, t) {
 	let n = Buffer.alloc(64 * 1024), { bytesRead: r } = await e.read(n, 0, n.length, 0), i = n.subarray(0, r).toString("utf8").split("\n", 1)[0], a = JSON.parse(i);
 	if (a?.type !== "session_meta" || a.payload?.id !== t) throw Error("Original history belongs to a different conversation.");
 }
-async function* Ki(e, t) {
+async function* qi(e, t) {
 	let n = 0, r = 0, i = 0, a = [];
 	for (; n < t;) {
 		let o = Buffer.alloc(Math.min(64 * 1024, t - n)), { bytesRead: s } = await e.read(o, 0, o.length, n);
@@ -2988,7 +2988,7 @@ async function* Ki(e, t) {
 		let c = 0;
 		for (; c < s;) {
 			let e = o.indexOf(10, c), t = e < 0 || e >= s ? s : e, l = o.subarray(c, t);
-			i += l.length, i <= Li ? a.push(l) : a = [], e >= 0 && e < s && (i <= Li && (yield {
+			i += l.length, i <= Ri ? a.push(l) : a = [], e >= 0 && e < s && (i <= Ri && (yield {
 				offset: r,
 				length: i,
 				text: Buffer.concat(a, i).toString("utf8")
@@ -2997,7 +2997,7 @@ async function* Ki(e, t) {
 		n += s;
 	}
 }
-function qi(e) {
+function Ji(e) {
 	return e.map((e) => {
 		let t = new Set(e.parts.filter((e) => e.type === "tool" && e.title === "view_image").map((e) => e.type === "tool" ? e.id : ""));
 		return t.size ? {
@@ -3008,7 +3008,7 @@ function qi(e) {
 }
 //#endregion
 //#region src/node/codex-surface-usage-controller.ts
-var Ji = {
+var Yi = {
 	status: "unavailable",
 	reason: "public-runtime-request-evidence-unavailable",
 	unavailableFields: [
@@ -3026,7 +3026,7 @@ var Ji = {
 		"finality"
 	],
 	requests: null
-}, Yi = class {
+}, Xi = class {
 	threads = /* @__PURE__ */ new Map();
 	clear() {
 		this.threads.clear();
@@ -3034,7 +3034,7 @@ var Ji = {
 	recover(e, t, n) {
 		let r = this.threads.get(e)?.executions.get(t);
 		if (!r) return;
-		let i = r.latest ? Qi(n.total, r.latest.total) : null, a = i ? $i(n.execution, i) ?? n.execution : n.execution, o = i ? r.latest.total : n.total, s = i ? r.latest.last : n.last;
+		let i = r.latest ? $i(n.total, r.latest.total) : null, a = i ? ea(n.execution, i) ?? n.execution : n.execution, o = i ? r.latest.total : n.total, s = i ? r.latest.last : n.last;
 		r.native = structuredClone({
 			total: o,
 			execution: a
@@ -3047,7 +3047,7 @@ var Ji = {
 			}),
 			observedStart: !0,
 			model: r.latest?.model ?? null,
-			requestUsage: structuredClone(Ji)
+			requestUsage: structuredClone(Yi)
 		};
 		return r.latest = structuredClone(c), c;
 	}
@@ -3088,16 +3088,16 @@ var Ji = {
 			let e = r.executions.get(r.activeTurnId);
 			e && (e.baseline = null, e.native = void 0), i && (i.baseline = null, i.native = void 0);
 		}
-		i && (!K(a.total) || i.latest && !Zi(i.latest.total, a.total)) && (i.baseline = null, i.native = void 0);
-		let s = i?.native ? Qi(i.native.total, a.total) : null, c = i?.native && s ? $i(i.native.execution, s) : i?.baseline ? Qi(i.baseline, a.total) : null;
+		i && (!G(a.total) || i.latest && !Qi(i.latest.total, a.total)) && (i.baseline = null, i.native = void 0);
+		let s = i?.native ? $i(i.native.total, a.total) : null, c = i?.native && s ? ea(i.native.execution, s) : i?.baseline ? $i(i.baseline, a.total) : null;
 		i && c === null && (i.baseline = null);
 		let l = {
 			...a,
 			execution: c,
 			observedStart: !!i,
-			requestUsage: structuredClone(Ji)
+			requestUsage: structuredClone(Yi)
 		};
-		return i && (i.latest = structuredClone(l)), r.total = !o && K(a.total) ? structuredClone(a.total) : null, r.lastUsageTurnId = t.turnId, {
+		return i && (i.latest = structuredClone(l)), r.total = !o && G(a.total) ? structuredClone(a.total) : null, r.lastUsageTurnId = t.turnId, {
 			...t,
 			payload: { usage: l }
 		};
@@ -3111,21 +3111,21 @@ var Ji = {
 			executions: /* @__PURE__ */ new Map()
 		}, this.threads.set(e, t)), t;
 	}
-}, Xi = [
+}, Zi = [
 	"totalTokens",
 	"inputTokens",
 	"cachedInputTokens",
 	"outputTokens",
 	"reasoningOutputTokens"
 ];
-function K(e) {
-	return Xi.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 Zi(e, t) {
-	return Xi.every((n) => t[n] >= e[n]) && (e.cacheWriteInputTokens === null || t.cacheWriteInputTokens === null || t.cacheWriteInputTokens >= e.cacheWriteInputTokens);
+function G(e) {
+	return Zi.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 Qi(e, t) {
-	if (!K(e) || !K(t) || !Zi(e, t)) return null;
+	return Zi.every((n) => t[n] >= e[n]) && (e.cacheWriteInputTokens === null || t.cacheWriteInputTokens === null || t.cacheWriteInputTokens >= e.cacheWriteInputTokens);
+}
+function $i(e, t) {
+	if (!G(e) || !G(t) || !Qi(e, t)) return null;
 	let n = {
 		totalTokens: t.totalTokens - e.totalTokens,
 		inputTokens: t.inputTokens - e.inputTokens,
@@ -3134,15 +3134,15 @@ function Qi(e, t) {
 		outputTokens: t.outputTokens - e.outputTokens,
 		reasoningOutputTokens: t.reasoningOutputTokens - e.reasoningOutputTokens
 	};
-	return K(n) ? n : null;
+	return G(n) ? n : null;
 }
-function $i(e, t) {
-	let n = Object.fromEntries(Xi.map((n) => [n, e[n] + t[n]]));
-	return n.cacheWriteInputTokens = e.cacheWriteInputTokens === null || t.cacheWriteInputTokens === null ? null : e.cacheWriteInputTokens + t.cacheWriteInputTokens, K(n) ? n : null;
+function ea(e, t) {
+	let n = Object.fromEntries(Zi.map((n) => [n, e[n] + t[n]]));
+	return n.cacheWriteInputTokens = e.cacheWriteInputTokens === null || t.cacheWriteInputTokens === null ? null : e.cacheWriteInputTokens + t.cacheWriteInputTokens, G(n) ? n : null;
 }
 //#endregion
 //#region src/node/codex-original-history-usage.ts
-var ea = 1024 * 1024, ta = class {
+var ta = 1024 * 1024, na = class {
 	client;
 	indexes = /* @__PURE__ */ new Map();
 	work = Promise.resolve();
@@ -3198,10 +3198,10 @@ var ea = 1024 * 1024, ta = class {
 					for (let n = 0; n < s; n++) {
 						if (o[n] !== 10) continue;
 						let r = o.subarray(c, n);
-						!a && i.length + r.length <= ea && this.record(l, e, Buffer.concat([i, r]).toString("utf8")), i = Buffer.alloc(0), a = !1, c = n + 1, l.offset = t + c;
+						!a && i.length + r.length <= ta && this.record(l, e, Buffer.concat([i, r]).toString("utf8")), i = Buffer.alloc(0), a = !1, c = n + 1, l.offset = t + c;
 					}
 					let u = o.subarray(c, s);
-					i.length + u.length > ea ? (a = !0, i = Buffer.alloc(0)) : a || (i = Buffer.concat([i, u])), t += s;
+					i.length + u.length > ta ? (a = !0, i = Buffer.alloc(0)) : a || (i = Buffer.concat([i, u])), t += s;
 				}
 				l.size = r.size, l.mtimeMs = r.mtimeMs;
 			}
@@ -3228,7 +3228,7 @@ var ea = 1024 * 1024, ta = class {
 			return;
 		}
 		if (r?.type !== "token_usage_record" || i?.thread_id !== t || typeof i.turn_id != "string" || !i.turn_id || i.turn_id.length > 256 || typeof r.timestamp != "string" || !Number.isFinite(Date.parse(r.timestamp))) return;
-		let a = na(i.turn_token_usage), o = na(i.thread_token_usage), s = na(i.usage);
+		let a = ra(i.turn_token_usage), o = ra(i.thread_token_usage), s = ra(i.usage);
 		!a || !o || !s || (e.turns.set(i.turn_id, {
 			turnId: i.turn_id,
 			recordedAt: r.timestamp,
@@ -3238,7 +3238,7 @@ var ea = 1024 * 1024, ta = class {
 		}), e.turns.size > 5e4 && e.turns.delete(e.turns.keys().next().value));
 	}
 };
-function na(e) {
+function ra(e) {
 	if (!e || typeof e != "object") return;
 	let t = {
 		totalTokens: e.total_tokens,
@@ -3248,26 +3248,26 @@ function na(e) {
 		outputTokens: e.output_tokens,
 		reasoningOutputTokens: e.reasoning_output_tokens
 	};
-	return K(t) ? t : void 0;
+	return G(t) ? t : void 0;
 }
 //#endregion
 //#region src/node/codex-surface-realtime.ts
-function ra(e, t) {
+function ia(e, t) {
 	if (e === void 0) return;
 	if (typeof e != "string") throw TypeError(`Realtime ${t} must be a string`);
 	let n = e.trim();
 	if (!n) throw TypeError(`Realtime ${t} cannot be empty`);
 	return n;
 }
-function ia(e, t) {
+function aa(e, t) {
 	if (typeof e != "string") throw TypeError(`Realtime ${t} must be a string`);
 	let n = e.trim();
 	if (!n) throw TypeError(`Realtime ${t} cannot be empty`);
 	return n;
 }
-function aa(e) {
+function oa(e) {
 	if (!(e.data instanceof Uint8Array)) throw TypeError("Realtime audio data must be a Uint8Array");
-	let t = sa(e.sampleRate, "sampleRate"), n = sa(e.numChannels, "numChannels"), r = e.samplesPerChannel === void 0 ? Math.floor(e.data.byteLength / 2 / n) : ca(e.samplesPerChannel, "samplesPerChannel"), i = e.itemId === void 0 ? null : e.itemId;
+	let t = ca(e.sampleRate, "sampleRate"), n = ca(e.numChannels, "numChannels"), r = e.samplesPerChannel === void 0 ? Math.floor(e.data.byteLength / 2 / n) : la(e.samplesPerChannel, "samplesPerChannel"), i = e.itemId === void 0 ? null : e.itemId;
 	if (i !== null && (typeof i != "string" || !i.trim())) throw TypeError("Realtime audio itemId must be a non-empty string or null");
 	return {
 		data: Buffer.from(e.data.buffer, e.data.byteOffset, e.data.byteLength).toString("base64"),
@@ -3277,7 +3277,7 @@ function aa(e) {
 		itemId: i
 	};
 }
-function oa(e) {
+function sa(e) {
 	return {
 		data: new Uint8Array(Buffer.from(e.data, "base64")),
 		sampleRate: e.sampleRate,
@@ -3286,28 +3286,28 @@ function oa(e) {
 		itemId: e.itemId
 	};
 }
-function sa(e, t) {
+function ca(e, t) {
 	if (!Number.isSafeInteger(e) || e <= 0) throw TypeError(`Realtime audio ${t} must be a positive integer`);
 	return e;
 }
-function ca(e, t) {
+function la(e, t) {
 	if (e === null) return null;
 	if (!Number.isSafeInteger(e) || e < 0) throw TypeError(`Realtime audio ${t} must be a non-negative integer or null`);
 	return e;
 }
 //#endregion
 //#region src/node/codex-surface-realtime-session.ts
-async function la(e) {
+async function ua(e) {
 	let { client: t, ensureThreadReady: n, onConversationEvent: r, options: i, threadId: a } = e;
 	await n();
 	let o = i.outputModality;
 	if (o !== "text" && o !== "audio") throw TypeError(`Invalid realtime output modality '${String(o)}'`);
 	let s = i.version;
 	if (s !== void 0 && s !== "v1" && s !== "v2" && s !== "v3") throw TypeError(`Invalid realtime version '${String(s)}'`);
-	let c = ra(i.model, "model"), l = ra(i.voice, "voice"), u = i.transport ?? { type: "websocket" };
+	let c = ia(i.model, "model"), l = ia(i.voice, "voice"), u = i.transport ?? { type: "websocket" };
 	if (u.type !== "websocket" && u.type !== "webrtc") throw TypeError(`Invalid realtime transport '${String(u.type)}'`);
 	if (u.type === "webrtc" && !u.sdp.trim()) throw TypeError("WebRTC realtime transport requires a non-empty SDP offer");
-	let d = u.type === "webrtc" ? ua(r) : null, f;
+	let d = u.type === "webrtc" ? da(r) : null, f;
 	try {
 		let [, e] = await Promise.all([t.request("thread/realtime/start", {
 			threadId: a,
@@ -3338,12 +3338,12 @@ async function la(e) {
 			if (m(), u.type === "webrtc") throw Error("WebRTC realtime audio must be sent through its negotiated media track");
 			await t.request("thread/realtime/appendAudio", {
 				threadId: a,
-				audio: aa(e)
+				audio: oa(e)
 			});
 		},
 		appendText: async (e, n = "user") => {
 			m();
-			let r = ia(e, "text");
+			let r = aa(e, "text");
 			if (n !== "user" && n !== "developer" && n !== "assistant") throw TypeError(`Invalid realtime text role '${String(n)}'`);
 			await t.request("thread/realtime/appendText", {
 				threadId: a,
@@ -3354,7 +3354,7 @@ async function la(e) {
 		appendSpeech: async (e) => {
 			m(), await t.request("thread/realtime/appendSpeech", {
 				threadId: a,
-				text: ia(e, "speech")
+				text: aa(e, "speech")
 			});
 		},
 		stop: async () => {
@@ -3365,7 +3365,7 @@ async function la(e) {
 		})
 	};
 }
-function ua(e) {
+function da(e) {
 	let t = () => void 0, n, r = !1, i = () => {
 		r || (r = !0, clearTimeout(n), t());
 	};
@@ -3382,7 +3382,7 @@ function ua(e) {
 }
 //#endregion
 //#region src/node/codex-surface-runtime.ts
-function da(e) {
+function fa(e) {
 	return {
 		status: "idle",
 		authentication: e,
@@ -3425,7 +3425,7 @@ function da(e) {
 		error: null
 	};
 }
-function fa(e, t, n = {}) {
+function pa(e, t, n = {}) {
 	return {
 		threadId: e,
 		cwd: null,
@@ -3465,7 +3465,7 @@ function fa(e, t, n = {}) {
 		...n
 	};
 }
-function pa(e, t, n) {
+function ma(e, t, n) {
 	let r = [...n], i = new Set(r.map((e) => e.id)), a = new Set(e.answeredClientRequestIds);
 	for (let t of e.messages) {
 		let e = t.metadata?.asyncQuestionRequestIds;
@@ -3508,7 +3508,7 @@ function pa(e, t, n) {
 }
 //#endregion
 //#region src/node/codex-surface-authentication.ts
-function ma() {
+function ha() {
 	return {
 		status: "notLoaded",
 		account: null,
@@ -3522,7 +3522,7 @@ function ma() {
 		}
 	};
 }
-function ha(e) {
+function ga(e) {
 	return e.type === "chatgpt" ? {
 		type: "chatgpt",
 		email: e.email,
@@ -3532,13 +3532,13 @@ function ha(e) {
 		credentialSource: e.usesCodexManagedCredentials ? "codexManaged" : "awsManaged"
 	} : { type: "apiKey" };
 }
-function ga(e) {
+function _a(e) {
 	return JSON.stringify({
 		account: e.account,
 		requiresOpenaiAuth: e.requiresOpenaiAuth
 	});
 }
-function _a(e) {
+function va(e) {
 	let t = e.account;
 	return t ? t.type === "chatgpt" ? JSON.stringify({
 		type: t.type,
@@ -3551,12 +3551,12 @@ function _a(e) {
 		requiresOpenaiAuth: e.requiresOpenaiAuth
 	});
 }
-function va(e) {
+function ya(e) {
 	let t = e.trim();
 	if (!t) throw Error("Codex login id cannot be empty");
 	return t;
 }
-function ya(e) {
+function ba(e) {
 	let t;
 	try {
 		t = new URL(e);
@@ -3568,41 +3568,41 @@ function ya(e) {
 }
 //#endregion
 //#region src/node/codex-surface-settings.ts
-function q(e, t) {
+function K(e, t) {
 	return e.find((e) => e.id === t || e.model === t) ?? e.find((e) => e.isDefault) ?? e[0] ?? null;
 }
-function ba(e, t) {
+function xa(e, t) {
 	let n = e.find((e) => e.id === t || e.model === t);
 	if (!n) throw Error(`Unknown model '${t}'`);
 	return n;
 }
-function xa(e, t) {
+function Sa(e, t) {
 	if (!t) return;
 	if (!e) throw Error(`Cannot select reasoning effort '${t}' without a model`);
 	let n = e.supportedReasoningEfforts?.map((e) => e.reasoningEffort) ?? [];
 	if (n.length > 0 && !n.includes(t)) throw Error(`Reasoning effort '${t}' is not available for '${e.displayName}'`);
 }
-function Sa(e) {
+function Ca(e) {
 	return e.defaultReasoningEffort ?? e.supportedReasoningEfforts?.[0]?.reasoningEffort ?? null;
 }
-function Ca(e) {
+function wa(e) {
 	return e.defaultServiceTier ?? null;
 }
-function wa(e, t) {
+function Ta(e, t) {
 	if (!t) return;
 	if (!e) throw Error(`Cannot select service tier '${t}' without a model`);
 	if (t === "default" || t === e.defaultServiceTier) return;
 	let n = e.serviceTiers?.map((e) => e.id) ?? [];
 	if (n.length > 0 && !n.includes(t)) throw Error(`Service tier '${t}' is not available for '${e.displayName}'`);
 }
-function Ta(e, t) {
+function Ea(e, t) {
 	let n = new Set(e.filter((e) => e.allowed).map((e) => e.id)), r = [];
-	return n.has(":workspace") && Ea(t?.allowedApprovalPolicies, "on-request") && Ea(t?.allowedApprovalsReviewers, "user") && r.push("ask-for-approval"), n.has(":workspace") && Ea(t?.allowedApprovalPolicies, "on-request") && Ea(t?.allowedApprovalsReviewers, "auto_review") && r.push("approve-for-me"), (n.has(":danger-full-access") || n.has(":danger-no-sandbox")) && Ea(t?.allowedApprovalPolicies, "never") && Ea(t?.allowedApprovalsReviewers, "user") && r.push("full-access"), r;
+	return n.has(":workspace") && Da(t?.allowedApprovalPolicies, "on-request") && Da(t?.allowedApprovalsReviewers, "user") && r.push("ask-for-approval"), n.has(":workspace") && Da(t?.allowedApprovalPolicies, "on-request") && Da(t?.allowedApprovalsReviewers, "auto_review") && r.push("approve-for-me"), (n.has(":danger-full-access") || n.has(":danger-no-sandbox")) && Da(t?.allowedApprovalPolicies, "never") && Da(t?.allowedApprovalsReviewers, "user") && r.push("full-access"), r;
 }
-function Ea(e, t) {
+function Da(e, t) {
 	return !Array.isArray(e) || e.length === 0 || e.includes(t);
 }
-function Da(e) {
+function Oa(e) {
 	return e === "full-access" ? {
 		approvalPolicy: "never",
 		approvalsReviewer: "user",
@@ -3613,39 +3613,39 @@ function Da(e) {
 		permissions: ":workspace"
 	};
 }
-function Oa(e) {
-	return Da(e);
+function ka(e) {
+	return Oa(e);
 }
-function ka(e, t, n, r) {
+function Aa(e, t, n, r) {
 	let i = r?.id;
 	return e === "never" && (n.type === "dangerFullAccess" || i === ":danger-full-access" || i === ":danger-no-sandbox") ? "full-access" : e === "on-request" && (t === "auto_review" || t === "guardian_subagent") ? "approve-for-me" : e === "on-request" ? "ask-for-approval" : null;
 }
-function Aa(e, t, n) {
-	let r = q(t, e.model);
+function ja(e, t, n) {
+	let r = K(t, e.model);
 	return {
-		approvalPreset: ka(e.approvalPolicy, e.approvalsReviewer, e.sandbox, e.activePermissionProfile) ?? n.approvalPreset,
+		approvalPreset: Aa(e.approvalPolicy, e.approvalsReviewer, e.sandbox, e.activePermissionProfile) ?? n.approvalPreset,
 		planMode: n.planMode,
 		selectedModelId: r?.id ?? n.selectedModelId,
-		selectedReasoningEffort: e.reasoningEffort ?? (r ? Sa(r) : null),
-		selectedServiceTier: e.serviceTier === void 0 ? r ? Ca(r) : null : e.serviceTier
+		selectedReasoningEffort: e.reasoningEffort ?? (r ? Ca(r) : null),
+		selectedServiceTier: e.serviceTier === void 0 ? r ? wa(r) : null : e.serviceTier
 	};
 }
-function ja(e, t, n) {
-	let r = q(t, e.model);
+function Ma(e, t, n) {
+	let r = K(t, e.model);
 	return {
-		approvalPreset: ka(e.approvalPolicy, e.approvalsReviewer, e.sandboxPolicy, e.activePermissionProfile) ?? n.approvalPreset,
+		approvalPreset: Aa(e.approvalPolicy, e.approvalsReviewer, e.sandboxPolicy, e.activePermissionProfile) ?? n.approvalPreset,
 		planMode: e.collaborationMode.mode === "plan",
 		selectedModelId: r?.id ?? n.selectedModelId,
-		selectedReasoningEffort: e.effort ?? (r ? Sa(r) : null),
-		selectedServiceTier: e.serviceTier === void 0 ? r ? Ca(r) : null : e.serviceTier
+		selectedReasoningEffort: e.effort ?? (r ? Ca(r) : null),
+		selectedServiceTier: e.serviceTier === void 0 ? r ? wa(r) : null : e.serviceTier
 	};
 }
-function Ma(e, t) {
-	let n = q(e.models, e.selectedModelId);
+function Na(e, t) {
+	let n = K(e.models, e.selectedModelId);
 	if (t.modelId && (n = e.models.find((e) => e.id === t.modelId) ?? null, !n)) throw Error(`Unknown model '${t.modelId}'`);
 	let r = t.reasoningEffort ?? e.selectedReasoningEffort, i = t.serviceTier === void 0 ? e.selectedServiceTier ?? null : t.serviceTier, a = n?.supportedReasoningEfforts?.map((e) => e.reasoningEffort) ?? [];
 	if (t.reasoningEffort && a.length > 0 && !a.includes(t.reasoningEffort)) throw Error(`Reasoning effort '${t.reasoningEffort}' is not available for '${n.displayName}'`);
-	return t.modelId && a.length > 0 && (!r || !a.includes(r)) && (r = n ? Sa(n) : null), t.serviceTier !== void 0 && wa(n, i), t.serviceTier === void 0 && t.modelId && i && !n.serviceTiers?.some((e) => e.id === i) && (i = n ? Ca(n) : null), {
+	return t.modelId && a.length > 0 && (!r || !a.includes(r)) && (r = n ? Ca(n) : null), t.serviceTier !== void 0 && Ta(n, i), t.serviceTier === void 0 && t.modelId && i && !n.serviceTiers?.some((e) => e.id === i) && (i = n ? wa(n) : null), {
 		approvalPreset: t.approvalPreset ?? e.approvalPreset,
 		planMode: t.planMode ?? e.planMode,
 		selectedModelId: n?.id ?? null,
@@ -3653,7 +3653,7 @@ function Ma(e, t) {
 		selectedServiceTier: i
 	};
 }
-function Na(e, t, n) {
+function Pa(e, t, n) {
 	return {
 		mode: e ? "plan" : "default",
 		settings: {
@@ -3663,18 +3663,18 @@ function Na(e, t, n) {
 		}
 	};
 }
-function Pa(e, t) {
-	let n = q(e.models, e.selectedModelId), r = t.model ?? n?.model, i = t.reasoningEffort ?? e.selectedReasoningEffort, a = t.planMode ?? e.planMode;
+function Fa(e, t) {
+	let n = K(e.models, e.selectedModelId), r = t.model ?? n?.model, i = t.reasoningEffort ?? e.selectedReasoningEffort, a = t.planMode ?? e.planMode;
 	return {
 		...r ? { model: r } : {},
 		...i ? { effort: i } : {},
-		...r ? { collaborationMode: Na(a, r, i) } : {},
+		...r ? { collaborationMode: Pa(a, r, i) } : {},
 		...t.serviceTier === void 0 ? e.selectedServiceTier ? { serviceTier: e.selectedServiceTier } : {} : { serviceTier: t.serviceTier }
 	};
 }
 //#endregion
 //#region src/node/codex-surface-data.ts
-function J(e) {
+function q(e) {
 	let t = e.preview.trim(), n = t.split("\n")[0];
 	return {
 		id: e.id,
@@ -3691,25 +3691,25 @@ function J(e) {
 		updatedAt: (/* @__PURE__ */ new Date((e.recencyAt ?? e.updatedAt) * 1e3)).toISOString()
 	};
 }
-function Fa(e, t) {
+function Ia(e, t) {
 	let n = new Map(e.map((e) => [e.id, e])), r = t.map((e) => {
 		let t = n.get(e.id);
 		return t && he(t, e) ? t : e;
 	});
 	return r.length === e.length && r.every((t, n) => t === e[n]) ? e : r;
 }
-function Y(e, t) {
+function J(e, t) {
 	return [t, ...e.filter((e) => e.id !== t.id)].sort((e, t) => t.updatedAt.localeCompare(e.updatedAt));
 }
-function Ia(e, t) {
-	let n = t.model ? ba(e.models, t.model) : q(e.models, e.selectedModelId);
-	return xa(n, t.reasoningEffort), wa(n, t.serviceTier), {
+function La(e, t) {
+	let n = t.model ? xa(e.models, t.model) : K(e.models, e.selectedModelId);
+	return Sa(n, t.reasoningEffort), Ta(n, t.serviceTier), {
 		...t,
-		...t.attachments ? { attachments: La(t.attachments) } : {},
+		...t.attachments ? { attachments: Ra(t.attachments) } : {},
 		...t.model && n ? { model: n.model } : {}
 	};
 }
-function La(e) {
+function Ra(e) {
 	return e.map((e) => {
 		let t = e.path.trim();
 		if (!t) throw Error("Attachment paths cannot be empty");
@@ -3726,14 +3726,14 @@ function La(e) {
 		};
 	});
 }
-function Ra(e) {
+function za(e) {
 	return e.type === "image" ? {
 		type: "localImage",
 		path: e.path,
 		...e.detail === void 0 ? {} : { detail: e.detail }
 	} : st(e.name ?? g(e.path), e.path);
 }
-function za(e) {
+function Ba(e) {
 	let t = e.name?.trim() || g(e.path);
 	return e.type === "image" ? {
 		type: "attachment",
@@ -3754,14 +3754,14 @@ function za(e) {
 		}
 	};
 }
-function Ba(e) {
+function Va(e) {
 	let t = e.metadata?.turnId;
 	return e.turnId ?? (typeof t == "string" ? t : null);
 }
-function Va(e) {
+function Ha(e) {
 	return e.parts.filter((e) => e.type === "text").map((e) => e.text).join("\n").trim();
 }
-function Ha(e) {
+function Ua(e) {
 	return e.parts.flatMap((e) => {
 		if (e.type !== "attachment") return [];
 		let t = e.attachment, n = t.path;
@@ -3779,7 +3779,7 @@ function Ha(e) {
 		}] : [];
 	});
 }
-function Ua(e) {
+function Wa(e) {
 	return {
 		totalTokens: e.totalTokens,
 		inputTokens: e.inputTokens,
@@ -3789,7 +3789,7 @@ function Ua(e) {
 		reasoningOutputTokens: e.reasoningOutputTokens
 	};
 }
-function Wa(e) {
+function Ga(e) {
 	let t = e.modelContextWindow, n = e.last.totalTokens, r = typeof t == "number" && t > 0 ? Math.min(100, Math.max(0, n / t * 100)) : null;
 	return {
 		totalTokens: e.total.totalTokens,
@@ -3802,34 +3802,34 @@ function Wa(e) {
 		usedPercent: r
 	};
 }
-function Ga(e) {
+function Ka(e) {
 	return e.type === "active" ? {
 		type: "active",
 		activeFlags: [...e.activeFlags]
 	} : { type: e.type };
 }
-function Ka(e) {
+function qa(e) {
 	return e.type === "active" ? "active" : e.type === "systemError" ? "error" : "idle";
 }
-function qa(e) {
-	let t = e.rateLimitsByLimitId ? Object.fromEntries(Object.entries(e.rateLimitsByLimitId).filter((e) => !!e[1]).map(([e, t]) => [e, Xa(t)])) : null;
+function Ja(e) {
+	let t = e.rateLimitsByLimitId ? Object.fromEntries(Object.entries(e.rateLimitsByLimitId).filter((e) => !!e[1]).map(([e, t]) => [e, Za(t)])) : null;
 	return {
-		rateLimits: Xa(e.rateLimits),
+		rateLimits: Za(e.rateLimits),
 		rateLimitsByLimitId: t,
 		rateLimitResetCredits: e.rateLimitResetCredits ? {
-			availableCount: Ja(e.rateLimitResetCredits.availableCount),
+			availableCount: Ya(e.rateLimitResetCredits.availableCount),
 			credits: e.rateLimitResetCredits.credits?.map((e) => ({ ...e })) ?? null
 		} : null
 	};
 }
-function Ja(e) {
+function Ya(e) {
 	if (typeof e == "bigint" && e >= 0n) return e.toString();
 	if (typeof e == "number" && Number.isSafeInteger(e) && e >= 0) return String(e);
 	if (typeof e == "string" && /^(0|[1-9][0-9]*)$/.test(e)) return e;
 	throw Error("Invalid account count: expected an exact nonnegative integer");
 }
-function Ya(e) {
-	let t = (e) => e === null ? null : Ja(e);
+function Xa(e) {
+	let t = (e) => e === null ? null : Ya(e);
 	return {
 		summary: {
 			lifetimeTokens: t(e.summary.lifetimeTokens),
@@ -3840,11 +3840,11 @@ function Ya(e) {
 		},
 		dailyUsageBuckets: e.dailyUsageBuckets?.map((e) => ({
 			startDate: e.startDate,
-			tokens: Ja(e.tokens)
+			tokens: Ya(e.tokens)
 		})) ?? null
 	};
 }
-function Xa(e) {
+function Za(e) {
 	return {
 		limitId: e.limitId,
 		limitName: e.limitName,
@@ -3856,21 +3856,21 @@ function Xa(e) {
 		rateLimitReachedType: e.rateLimitReachedType
 	};
 }
-function Za(e, t) {
-	let n = Xa(t);
+function Qa(e, t) {
+	let n = Za(t);
 	if (!e) return {
 		rateLimits: n,
 		rateLimitsByLimitId: n.limitId ? { [n.limitId]: n } : null,
 		rateLimitResetCredits: null
 	};
-	let r = Qa(e.rateLimits, n), i = e.rateLimitsByLimitId ? { ...e.rateLimitsByLimitId } : {};
-	return r.limitId && (i[r.limitId] = Qa(i[r.limitId] ?? r, n)), {
+	let r = $a(e.rateLimits, n), i = e.rateLimitsByLimitId ? { ...e.rateLimitsByLimitId } : {};
+	return r.limitId && (i[r.limitId] = $a(i[r.limitId] ?? r, n)), {
 		...e,
 		rateLimits: r,
 		rateLimitsByLimitId: Object.keys(i).length > 0 ? i : null
 	};
 }
-function Qa(e, t) {
+function $a(e, t) {
 	return {
 		limitId: t.limitId ?? e.limitId,
 		limitName: t.limitName ?? e.limitName,
@@ -3896,18 +3896,18 @@ function Qa(e, t) {
 }
 //#endregion
 //#region src/node/codex-surface-transport-options.ts
-function $a(e) {
+function eo(e) {
 	return "type" in e && e.type === "unixSocket";
 }
-function eo(e) {
-	let t = e.codexHome === void 0 ? void 0 : to(e.codexHome), n = e.transport?.codexHome;
+function to(e) {
+	let t = e.codexHome === void 0 ? void 0 : no(e.codexHome), n = e.transport?.codexHome;
 	if (t !== void 0 && n !== void 0 && t !== n) throw Error("Codex surface codexHome conflicts with transport.codexHome");
 	return {
 		...e.transport ?? {},
 		...t === void 0 ? {} : { codexHome: t }
 	};
 }
-function to(e) {
+function no(e) {
 	let t = e.trim();
 	if (!t) throw Error("Codex surface codexHome cannot be empty");
 	if (!v(t)) throw Error("Codex surface codexHome must be an absolute path");
@@ -3915,7 +3915,7 @@ function to(e) {
 }
 //#endregion
 //#region src/node/codex-surface-authentication-controller.ts
-var no = class {
+var ro = class {
 	client;
 	host;
 	accountRefreshPromise = null;
@@ -3949,7 +3949,7 @@ var no = class {
 			try {
 				let e = await this.client.request("account/login/start", { type: "chatgpt" });
 				if (e.type !== "chatgpt") throw Error(`Codex account/login/start returned unexpected login type '${e.type}'`);
-				let t = va(e.loginId), n = ya(e.authUrl);
+				let t = ya(e.loginId), n = ba(e.authUrl);
 				return this.host.patchAuthentication({ login: {
 					status: "pending",
 					loginId: t,
@@ -3964,7 +3964,7 @@ var no = class {
 					status: "error",
 					loginId: null,
 					authUrl: null,
-					error: j(e)
+					error: k(e)
 				} }, "action"), e;
 			}
 		})();
@@ -3986,7 +3986,7 @@ var no = class {
 			try {
 				let e = await this.client.request("account/login/start", { type: "chatgptDeviceCode" });
 				if (e.type !== "chatgptDeviceCode") throw Error(`Codex account/login/start returned unexpected login type '${e.type}'`);
-				let t = va(e.loginId), n = ya(e.verificationUrl), r = e.userCode.trim();
+				let t = ya(e.loginId), n = ba(e.verificationUrl), r = e.userCode.trim();
 				if (!r) throw Error("Codex account/login/start returned an empty device user code");
 				this.host.patchAuthentication({ login: {
 					status: "pending",
@@ -4005,7 +4005,7 @@ var no = class {
 					status: "error",
 					loginId: null,
 					authUrl: null,
-					error: j(e)
+					error: k(e)
 				} }, "action"), e;
 			}
 		})();
@@ -4014,7 +4014,7 @@ var no = class {
 		}).catch(() => void 0), t;
 	}
 	async cancelLogin(e) {
-		let t = va(e), n = await this.client.request("account/login/cancel", { loginId: t });
+		let t = ya(e), n = await this.client.request("account/login/cancel", { loginId: t });
 		return this.host.patchAuthentication({ login: {
 			status: n.status === "canceled" ? "cancelled" : "idle",
 			loginId: null,
@@ -4056,7 +4056,7 @@ var no = class {
 			error: null
 		}, e);
 		try {
-			let n = await this.client.request("account/read", { refreshToken: !1 }), r = n.account ? ha(n.account) : null, i = _a({
+			let n = await this.client.request("account/read", { refreshToken: !1 }), r = n.account ? ga(n.account) : null, i = va({
 				...this.host.getSnapshot().authentication,
 				account: r,
 				requiresOpenaiAuth: n.requiresOpenaiAuth
@@ -4070,7 +4070,7 @@ var no = class {
 		} catch (t) {
 			throw this.host.patchAuthentication({
 				status: "error",
-				error: j(t)
+				error: k(t)
 			}, e), t;
 		}
 	}
@@ -4099,7 +4099,7 @@ var no = class {
 };
 //#endregion
 //#region src/node/codex-conversation-handle.ts
-function ro(e, t) {
+function io(e, t) {
 	let n = async (e) => (await e(), t.getSnapshot());
 	return {
 		id: e,
@@ -4144,36 +4144,36 @@ function ro(e, t) {
 }
 //#endregion
 //#region src/node/codex-raw-response-item-adapter.ts
-function io(e) {
-	if (!mo(e) || typeof e.type != "string") return null;
+function ao(e) {
+	if (!ho(e) || typeof e.type != "string") return null;
 	if (e.type === "local_shell_call") {
-		let t = w(ao(e));
+		let t = w(oo(e));
 		return {
-			type: lo(e.status) ? "item.completed" : "item.started",
+			type: uo(e.status) ? "item.completed" : "item.started",
 			payload: { toolPart: t }
 		};
 	}
 	return e.type === "function_call" ? {
 		type: "item.started",
-		payload: { toolPart: w(oo(e)) }
-	} : e.type === "function_call_output" ? so(e.call_id, e.output) : e.type === "custom_tool_call" ? {
+		payload: { toolPart: w(so(e)) }
+	} : e.type === "function_call_output" ? co(e.call_id, e.output) : e.type === "custom_tool_call" ? {
 		type: "item.started",
 		payload: { toolPart: w({
 			type: "dynamicToolCall",
-			id: Z(e.call_id) ?? X(e),
+			id: X(e.call_id) ?? Y(e),
 			namespace: null,
-			tool: Z(e.name) ?? "custom_tool",
+			tool: X(e.name) ?? "custom_tool",
 			status: e.status,
-			arguments: Z(e.input) ?? "",
+			arguments: X(e.input) ?? "",
 			contentItems: null,
 			success: null,
 			durationMs: null
 		}) }
-	} : e.type === "custom_tool_call_output" ? so(e.call_id, e.output, Z(e.name) ?? void 0) : e.type === "tool_search_call" ? {
+	} : e.type === "custom_tool_call_output" ? co(e.call_id, e.output, X(e.name) ?? void 0) : e.type === "tool_search_call" ? {
 		type: "item.started",
 		payload: { toolPart: w({
 			type: "dynamicToolCall",
-			id: Z(e.call_id) ?? X(e),
+			id: X(e.call_id) ?? Y(e),
 			namespace: "codex",
 			tool: "tool_search",
 			status: e.status,
@@ -4185,20 +4185,20 @@ function io(e) {
 		}) }
 	} : e.type === "tool_search_output" ? {
 		type: "item.updated",
-		payload: bt(Z(e.call_id) ?? X(e), e.tools, "tool_search", e.status)
+		payload: bt(X(e.call_id) ?? Y(e), e.tools, "tool_search", e.status)
 	} : e.type === "web_search_call" ? {
 		type: "item.completed",
 		payload: { toolPart: w({
 			type: "webSearch",
-			id: X(e),
-			query: fo(e.action),
+			id: Y(e),
+			query: po(e.action),
 			action: e.action
 		}) }
 	} : e.type === "image_generation_call" ? {
 		type: "item.completed",
 		payload: { toolPart: w({
 			type: "dynamicToolCall",
-			id: Z(e.id) ?? X(e),
+			id: X(e.id) ?? Y(e),
 			namespace: null,
 			tool: "image_generation",
 			status: e.status,
@@ -4209,29 +4209,29 @@ function io(e) {
 		}) }
 	} : null;
 }
-function ao(e) {
-	let t = mo(e.action) ? e.action : {}, n = Array.isArray(t.command) ? po(t.command) : Z(t.command) ?? "local shell";
+function oo(e) {
+	let t = ho(e.action) ? e.action : {}, n = Array.isArray(t.command) ? mo(t.command) : X(t.command) ?? "local shell";
 	return {
 		type: "commandExecution",
-		id: Z(e.call_id) ?? X(e),
+		id: X(e.call_id) ?? Y(e),
 		command: n,
-		cwd: Z(t.working_directory) ?? "",
+		cwd: X(t.working_directory) ?? "",
 		processId: null,
 		source: "agent",
-		status: co(e.status),
+		status: lo(e.status),
 		commandActions: [],
 		aggregatedOutput: null,
 		exitCode: null,
 		durationMs: null
 	};
 }
-function oo(e) {
-	let t = Z(e.name) ?? "function_call", n = uo(e.arguments), r = Z(e.call_id) ?? X(e);
-	return t === "shell_command" && mo(n) ? {
+function so(e) {
+	let t = X(e.name) ?? "function_call", n = fo(e.arguments), r = X(e.call_id) ?? Y(e);
+	return t === "shell_command" && ho(n) ? {
 		type: "commandExecution",
 		id: r,
-		command: Z(n.command) ?? t,
-		cwd: Z(n.workdir) ?? Z(n.cwd) ?? "",
+		command: X(n.command) ?? t,
+		cwd: X(n.workdir) ?? X(n.cwd) ?? "",
 		processId: null,
 		source: "agent",
 		status: "inProgress",
@@ -4242,7 +4242,7 @@ function oo(e) {
 	} : {
 		type: "dynamicToolCall",
 		id: r,
-		namespace: Z(e.namespace),
+		namespace: X(e.namespace),
 		tool: t,
 		status: "inProgress",
 		arguments: n,
@@ -4251,19 +4251,19 @@ function oo(e) {
 		durationMs: null
 	};
 }
-function so(e, t, n) {
+function co(e, t, n) {
 	return {
 		type: "item.updated",
-		payload: bt(Z(e) ?? "raw-response-output", t, n)
+		payload: bt(X(e) ?? "raw-response-output", t, n)
 	};
 }
-function co(e) {
+function lo(e) {
 	return e === "completed" ? "completed" : e === "incomplete" || e === "failed" || e === "error" ? "failed" : "inProgress";
 }
-function lo(e) {
+function uo(e) {
 	return e === "completed" || e === "failed" || e === "error" || e === "incomplete";
 }
-function uo(e) {
+function fo(e) {
 	if (typeof e != "string") return e;
 	try {
 		return JSON.parse(e);
@@ -4271,55 +4271,55 @@ function uo(e) {
 		return e;
 	}
 }
-function fo(e) {
-	return mo(e) ? Z(e.query) ?? Z(e.searchTerm) ?? "web search" : "web search";
-}
 function po(e) {
+	return ho(e) ? X(e.query) ?? X(e.searchTerm) ?? "web search" : "web search";
+}
+function mo(e) {
 	return e.map((e) => {
 		let t = String(e);
 		return /\s/.test(t) ? JSON.stringify(t) : t;
 	}).join(" ");
 }
-function X(e) {
-	return (Z(e.call_id) ?? Z(e.id)) || `raw-${e.type}`;
+function Y(e) {
+	return (X(e.call_id) ?? X(e.id)) || `raw-${e.type}`;
 }
-function Z(e) {
+function X(e) {
 	return typeof e == "string" && e.length > 0 ? e : null;
 }
-function mo(e) {
+function ho(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
 //#endregion
 //#region src/node/codex-surface-events.ts
-function ho(e, t) {
+function go(e, t) {
 	return `${e}\u0000${t}`;
 }
-function go(e) {
+function _o(e) {
 	return typeof e == "number" && Number.isFinite(e) ? (/* @__PURE__ */ new Date(e * 1e3)).toISOString() : (/* @__PURE__ */ new Date()).toISOString();
 }
-function _o(e) {
+function vo(e) {
 	return typeof e == "number" && Number.isFinite(e) ? (/* @__PURE__ */ new Date(e * 1e3)).toISOString() : null;
 }
-function vo(e) {
+function yo(e) {
 	return e ? {
 		message: e.message,
 		additionalDetails: e.additionalDetails,
 		codexErrorInfo: e.codexErrorInfo
 	} : null;
 }
-function Q(e, t = !1) {
+function Z(e, t = !1) {
 	return {
 		id: e.id,
 		...e.itemsView === "summary" || e.itemsView === "notLoaded" ? { itemsView: "summary" } : {},
 		status: e.status,
-		error: vo(e.error),
+		error: yo(e.error),
 		willRetry: t,
-		startedAt: _o(e.startedAt),
-		completedAt: _o(e.completedAt),
+		startedAt: vo(e.startedAt),
+		completedAt: vo(e.completedAt),
 		durationMs: e.durationMs ?? null
 	};
 }
-function $(e, t) {
+function Q(e, t) {
 	let n = e.findIndex((e) => e.id === t.id);
 	if (n < 0) return [...e, t];
 	let r = [...e];
@@ -4328,18 +4328,18 @@ function $(e, t) {
 		startedAt: t.startedAt ?? e[n].startedAt
 	}), r;
 }
-function yo(e, t) {
+function bo(e, t) {
 	return JSON.stringify(e) === JSON.stringify(t);
 }
-function bo() {
+function xo() {
 	return `user-${globalThis.crypto.randomUUID()}`;
 }
-function xo() {
+function So() {
 	return `queued-prompt-${globalThis.crypto.randomUUID()}`;
 }
 //#endregion
 //#region src/node/codex-surface-subagents.ts
-function So(e) {
+function Co(e) {
 	let t = {};
 	for (let [n, r] of Object.entries(e.agentsStates)) r && (t[n] = {
 		status: r.status,
@@ -4359,7 +4359,7 @@ function So(e) {
 }
 //#endregion
 //#region src/node/codex-surface-items-controller.ts
-var Co = class {
+var wo = class {
 	host;
 	commandOutputForwardItemIds = /* @__PURE__ */ new Set();
 	fileActivityKeys = /* @__PURE__ */ new Set();
@@ -4377,14 +4377,14 @@ var Co = class {
 		for (let e of this.reviewOutputByTurn.keys()) e.startsWith(t) && this.reviewOutputByTurn.delete(e);
 	}
 	isForwardingCommandOutput(e, t) {
-		return this.commandOutputForwardItemIds.has(ho(e, t));
+		return this.commandOutputForwardItemIds.has(go(e, t));
 	}
 	applyAgentDelta(e) {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
-		let n = un(t.messages, e.turnId, e.itemId)?.parts.find((t) => t.type === "text" && t.itemId === e.itemId)?.phase;
-		this.host.patchRuntime(e.threadId, { messages: dn(t.messages, e.threadId, e.turnId, e.itemId, e.delta, n) });
-		let r = un(t.messages, e.turnId, e.itemId) ?? this.host.assistantMessageForTurn(e.threadId, e.turnId);
+		let n = fn(t.messages, e.turnId, e.itemId)?.parts.find((t) => t.type === "text" && t.itemId === e.itemId)?.phase;
+		this.host.patchRuntime(e.threadId, { messages: pn(t.messages, e.threadId, e.turnId, e.itemId, e.delta, n) });
+		let r = fn(t.messages, e.turnId, e.itemId) ?? this.host.assistantMessageForTurn(e.threadId, e.turnId);
 		r && this.host.emitEvent("notification", {
 			type: "message.delta",
 			conversationId: e.threadId,
@@ -4401,7 +4401,7 @@ var Co = 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: N(t.messages, e.threadId, e.turnId, Tn(e.turnId, n, "running")) }), this.host.emitEvent("notification", {
+		t.planMarkdownByTurn.set(e.turnId, n), this.host.patchRuntime(e.threadId, { messages: j(t.messages, e.threadId, e.turnId, Dn(e.turnId, n, "running")) }), this.host.emitEvent("notification", {
 			type: "plan.delta",
 			conversationId: e.threadId,
 			turnId: e.turnId,
@@ -4415,7 +4415,7 @@ var Co = class {
 	applyPlanUpdated(e) {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
-		let n = wn(e.explanation, e.plan), r = (/* @__PURE__ */ new Date()).toISOString();
+		let n = En(e.explanation, e.plan), r = (/* @__PURE__ */ new Date()).toISOString();
 		t.planMarkdownByTurn.set(e.turnId, n), this.host.patchRuntime(e.threadId, {
 			executionPlan: {
 				turnId: e.turnId,
@@ -4424,7 +4424,7 @@ var Co = class {
 				markdown: n,
 				updatedAt: r
 			},
-			messages: N(t.messages, e.threadId, e.turnId, Tn(e.turnId, n, "completed"))
+			messages: j(t.messages, e.threadId, e.turnId, Dn(e.turnId, n, "completed"))
 		}), this.host.emitEvent("notification", {
 			type: "plan.updated",
 			conversationId: e.threadId,
@@ -4440,13 +4440,13 @@ var Co = class {
 	applyRawResponseItem(e) {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
-		let n = io(e.item);
+		let n = ao(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: N(t.messages, e.threadId, e.turnId, n.payload.toolPart) });
+		this.host.patchRuntime(e.threadId, { messages: j(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",
@@ -4467,7 +4467,7 @@ var Co = class {
 			startedAt: ("startedAtMs" in e ? e.startedAtMs : e.completedAtMs) / 1e3
 		};
 		if (e.item.type === "userMessage") {
-			let t = Mn(e.threadId, i, e.item);
+			let t = Nn(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) {
@@ -4493,7 +4493,7 @@ var Co = class {
 				...t,
 				kind: "steer"
 			} : t, c = [...n.messages, s];
-			this.host.patchRuntime(e.threadId, { messages: a ? M(c, e.threadId, e.turnId, { forceSegment: !0 }) : c }), this.host.emitEvent("notification", {
+			this.host.patchRuntime(e.threadId, { messages: a ? A(c, e.threadId, e.turnId, { forceSegment: !0 }) : c }), this.host.emitEvent("notification", {
 				type: "message.appended",
 				conversationId: e.threadId,
 				turnId: e.turnId,
@@ -4503,7 +4503,7 @@ var Co = class {
 		}
 		if (e.item.type === "reasoning") {
 			let t = this.host.assistantMessageForTurn(e.threadId, e.turnId), r = t ? JSON.stringify(t.parts) : null;
-			this.host.patchRuntime(e.threadId, { messages: fn(n.messages, e.threadId, e.turnId, e.item.id, e.item.summary) });
+			this.host.patchRuntime(e.threadId, { messages: mn(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", {
@@ -4515,10 +4515,10 @@ var Co = class {
 			return;
 		}
 		if (e.item.type === "agentMessage" && t && n.planMode && e.item.phase === "final_answer") {
-			let t = hn(e.item.text);
+			let t = _n(e.item.text);
 			if (t) {
-				let r = this.host.assistantMessageForTurn(e.threadId, e.turnId), i = mn(n.messages, e.threadId, e.turnId, e.item.id);
-				t.visibleText && (i = pn(i, e.threadId, e.turnId, e.item.id, t.visibleText, e.item.phase)), i = N(i, e.threadId, e.turnId, Tn(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 = gn(n.messages, e.threadId, e.turnId, e.item.id);
+				t.visibleText && (i = hn(i, e.threadId, e.turnId, e.item.id, t.visibleText, e.item.phase)), i = j(i, e.threadId, e.turnId, Dn(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",
@@ -4540,12 +4540,12 @@ var Co = 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 = ho(e.threadId, e.turnId);
+			let i = go(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 = un(n.messages, e.turnId, e.item.id) ?? 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 = o?.parts.find((t) => t.type === "text" && t.itemId === e.item.id)?.text ?? "", u = e.item.type === "agentMessage" ? Nn(e.threadId, e.turnId, e.item) : null, d = u ? "" : t, f = u ? mn(n.messages, e.threadId, e.turnId, e.item.id) : pn(n.messages, e.threadId, e.turnId, e.item.id, t, r);
-			if (u && (f = _n(f, e.threadId, e.turnId, u)), this.host.patchRuntime(e.threadId, { messages: f }), !d && !u && !r) return;
-			let p = (u ? void 0 : un(n.messages, e.turnId, e.item.id)) ?? this.host.assistantMessageForTurn(e.threadId, e.turnId);
+			let a = new Set(n.messages.map((e) => e.id)), o = fn(n.messages, e.turnId, e.item.id) ?? 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 = o?.parts.find((t) => t.type === "text" && t.itemId === e.item.id)?.text ?? "", u = e.item.type === "agentMessage" ? Pn(e.threadId, e.turnId, e.item) : null, d = u ? "" : t, f = u ? gn(n.messages, e.threadId, e.turnId, e.item.id) : hn(n.messages, e.threadId, e.turnId, e.item.id, t, r);
+			if (u && (f = yn(f, e.threadId, e.turnId, u)), this.host.patchRuntime(e.threadId, { messages: f }), !d && !u && !r) return;
+			let p = (u ? void 0 : fn(n.messages, e.turnId, e.item.id)) ?? this.host.assistantMessageForTurn(e.threadId, e.turnId);
 			if (p && !a.has(p.id)) this.host.emitEvent("notification", {
 				type: "message.appended",
 				conversationId: e.threadId,
@@ -4588,7 +4588,7 @@ var Co = 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: N(n.messages, e.threadId, e.turnId, Tn(e.turnId, r, "completed")) }), this.host.emitEvent("notification", {
+			n.planMarkdownByTurn.set(e.turnId, r), this.host.patchRuntime(e.threadId, { messages: j(n.messages, e.threadId, e.turnId, Dn(e.turnId, r, "completed")) }), this.host.emitEvent("notification", {
 				type: "plan.completed",
 				conversationId: e.threadId,
 				turnId: e.turnId,
@@ -4600,7 +4600,7 @@ var Co = class {
 			return;
 		}
 		if (e.item.type === "contextCompaction") {
-			if (this.host.patchRuntime(e.threadId, { messages: bn(n.messages, e.threadId, e.turnId, t ? "complete" : "streaming") }), t) {
+			if (this.host.patchRuntime(e.threadId, { messages: Sn(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",
@@ -4626,7 +4626,7 @@ var Co = class {
 				turnId: e.turnId,
 				payload: {
 					lifecycle: t ? "completed" : "started",
-					toolCall: So(e.item)
+					toolCall: Co(e.item)
 				}
 			});
 			return;
@@ -4651,10 +4651,10 @@ var Co = class {
 		let a = this.shouldForwardCommandOutput(e.threadId, t, e.item), o = w(e.item, {
 			includeCommandOutput: a,
 			cwd: n.cwd
-		}), s = Fn(e.item);
+		}), s = In(e.item);
 		if (!o && !s.length) return;
-		let c = s.some((e) => !n.messages.some((t) => t.parts.some((t) => t.type === "media" && vn(t, e)))), l = o ? N(n.messages, e.threadId, e.turnId, o) : [...n.messages];
-		for (let t of s) l = gn(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" && bn(t, e)))), l = o ? j(n.messages, e.threadId, e.turnId, o) : [...n.messages];
+		for (let t of s) l = vn(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", {
@@ -4675,7 +4675,7 @@ var Co = class {
 	shouldForwardCommandOutput(e, t, n) {
 		let r = "id" in n && typeof n.id == "string" ? n.id : null;
 		if (!r) return !1;
-		let i = ho(e, r);
+		let i = go(e, r);
 		if (!t) {
 			let e = gt(n);
 			return e ? this.commandOutputForwardItemIds.add(i) : this.commandOutputForwardItemIds.delete(i), e;
@@ -4686,14 +4686,14 @@ var Co = class {
 	applyToolUpdate(e, t, n) {
 		let r = this.host.requireRuntime(e);
 		this.host.markRuntimeTurnActive(r, t);
-		let i = r.cwd && wo(n) ? {
+		let i = r.cwd && To(n) ? {
 			...n,
 			metadata: {
 				...n.metadata,
 				cwd: r.cwd
 			}
 		} : n;
-		this.host.patchRuntime(e, { messages: yn(r.messages, e, t, i) });
+		this.host.patchRuntime(e, { messages: xn(r.messages, e, t, i) });
 		let a = this.host.messageContainingTool(e, t, n.itemId);
 		a && this.host.emitEvent("notification", {
 			type: "tool.updated",
@@ -4729,7 +4729,7 @@ var Co = 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 = xn(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 = Cn(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));
@@ -4741,7 +4741,7 @@ var Co = class {
 			},
 			turnStartPending: n,
 			messages: a,
-			turns: $(t.turns, Q(e.turn))
+			turns: Q(t.turns, Z(e.turn))
 		}), this.host.patch({ conversations: this.host.getState().conversations.map((n) => n.id === e.threadId ? {
 			...n,
 			status: r ? "active" : e.turn.status === "failed" ? "error" : "idle",
@@ -4755,26 +4755,26 @@ var Co = class {
 			turnId: e.turn.id,
 			payload: {
 				status: e.turn.status,
-				error: vo(e.turn.error),
+				error: yo(e.turn.error),
 				willRetry: !1,
-				startedAt: _o(e.turn.startedAt),
-				completedAt: _o(e.turn.completedAt),
+				startedAt: vo(e.turn.startedAt),
+				completedAt: vo(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 wo(e) {
+function To(e) {
 	if (e.fallbackToolPart?.kind === "fileChange") return !0;
 	let t = e.input, n = e.metadata;
-	return To(t) && Array.isArray(t.changes) || To(n) && Array.isArray(n.changes);
+	return Eo(t) && Array.isArray(t.changes) || Eo(n) && Array.isArray(n.changes);
 }
-function To(e) {
+function Eo(e) {
 	return typeof e == "object" && !!e;
 }
 //#endregion
 //#region src/node/codex-surface-client-requests-controller.ts
-var Eo = class {
+var Do = class {
 	host;
 	pending = /* @__PURE__ */ new Map();
 	constructor(e) {
@@ -4823,12 +4823,12 @@ var Eo = 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 = Cn(i.answeredClientRequestIds, t.id);
+		let i = this.host.requireRuntime(n.threadId), a = Tn(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: yn(i.messages, n.threadId, n.turnId, {
+				messages: xn(i.messages, n.threadId, n.turnId, {
 					itemId: n.itemId,
 					output: { answers: e }
 				})
@@ -4837,7 +4837,7 @@ var Eo = class {
 			let e = r;
 			n.responder.resolve(Yt(e)), this.host.patchRuntime(n.threadId, {
 				answeredClientRequestIds: a,
-				messages: yn(i.messages, n.threadId, n.displayTurnId, {
+				messages: xn(i.messages, n.threadId, n.displayTurnId, {
 					itemId: n.itemId,
 					output: { decision: e }
 				})
@@ -4855,7 +4855,7 @@ var Eo = class {
 		}), this.host.emitConversationActivity(n.threadId, "action");
 	}
 	async respondToAsyncQuestion(e, t) {
-		let n = e ?? this.host.activeConversationId(), r = n === null ? null : this.host.requireRuntime(n), i = r && pa(r, [], []).clientRequests.find((e) => e.kind === "ask_user" && e.id === t.id), a = r && i ? {
+		let n = e ?? this.host.activeConversationId(), r = n === null ? null : this.host.requireRuntime(n), i = r && ma(r, [], []).clientRequests.find((e) => e.kind === "ask_user" && e.id === t.id), a = r && i ? {
 			request: i,
 			runtime: r
 		} : null;
@@ -4874,7 +4874,7 @@ var Eo = 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: Cn(a.runtime.answeredClientRequestIds, t.id) }), this.host.emitEvent("action", {
+		this.host.patchRuntime(a.runtime.threadId, { answeredClientRequestIds: Tn(a.runtime.answeredClientRequestIds, t.id) }), this.host.emitEvent("action", {
 			type: "clientRequest.resolved",
 			conversationId: a.runtime.threadId,
 			...a.request.turnId ? { turnId: a.request.turnId } : {},
@@ -4889,7 +4889,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: Cn(t.answeredClientRequestIds, e) });
+			this.host.patchRuntime(n.threadId, { answeredClientRequestIds: Tn(t.answeredClientRequestIds, e) });
 		}
 		this.maybeClearWaitingBusy(t), n && this.host.emitEvent("notification", {
 			type: "clientRequest.resolved",
@@ -4937,7 +4937,7 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 			responder: t
 		}), this.host.patchRuntime(n, {
 			busy: !0,
-			messages: N(o.messages, n, r, {
+			messages: j(o.messages, n, r, {
 				type: "tool",
 				id: i,
 				kind: "generic",
@@ -4979,23 +4979,23 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 		let n = e.params;
 		if (n.mode !== "form") return !1;
 		let r = n._meta;
-		if (!cn(r) || r.codex_approval_kind !== "mcp_tool_call") return !1;
-		let i = String(e.id), a = k(r.tool_name) ?? k(r.tool_title) ?? "tool", o = this.host.requireRuntime(n.threadId);
+		if (!un(r) || r.codex_approval_kind !== "mcp_tool_call") return !1;
+		let i = String(e.id), a = ln(r.tool_name) ?? ln(r.tool_title) ?? "tool", o = this.host.requireRuntime(n.threadId);
 		n.turnId && this.host.markRuntimeTurnActive(o, n.turnId);
-		let s = n.turnId ?? o.activeTurnId ?? `client-request-${i}`, c = an(o.messages, s, n.serverName, a), l = c?.id ?? `approval-${i}`, u = n.message.trim() || `Allow ${n.serverName} to run ${a}?`, d = {
+		let s = n.turnId ?? o.activeTurnId ?? `client-request-${i}`, c = on(o.messages, s, n.serverName, a), l = c?.id ?? `approval-${i}`, u = n.message.trim() || `Allow ${n.serverName} to run ${a}?`, d = {
 			id: i,
 			kind: "confirm_tool",
 			conversationId: n.threadId,
 			turnId: n.turnId,
 			itemId: l,
 			payload: { confirmation: {
-				argumentsPreview: on(r),
+				argumentsPreview: sn(r),
 				integrationId: n.serverName,
-				integrationName: k(r.connector_name) ?? n.serverName,
+				integrationName: ln(r.connector_name) ?? n.serverName,
 				summary: u,
 				toolName: a,
-				...sn(r.persist, "session") ? { allowConversation: !0 } : {},
-				...sn(r.persist, "always") ? { allowAlways: !0 } : {}
+				...cn(r.persist, "session") ? { allowConversation: !0 } : {},
+				...cn(r.persist, "always") ? { allowAlways: !0 } : {}
 			} }
 		};
 		this.pending.set(i, {
@@ -5020,9 +5020,9 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 				params: {
 					requestId: i,
 					confirmationSummary: u,
-					argumentsPreview: on(r),
-					allowConversation: sn(r.persist, "session"),
-					allowAlways: sn(r.persist, "always")
+					argumentsPreview: sn(r),
+					allowConversation: cn(r.persist, "session"),
+					allowAlways: cn(r.persist, "always")
 				}
 			}),
 			input: r.tool_params,
@@ -5036,7 +5036,7 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 		};
 		this.host.patchRuntime(n.threadId, {
 			busy: !0,
-			messages: N(o.messages, n.threadId, s, f)
+			messages: j(o.messages, n.threadId, s, f)
 		});
 		let p = this.host.messageContainingTool(n.threadId, s, l);
 		return p && this.host.emitEvent("notification", {
@@ -5054,8 +5054,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;
 	}
-}, Do = 256 * 1024;
-function Oo(e) {
+}, Oo = 256 * 1024;
+function ko(e) {
 	return {
 		id: e.id,
 		model: e.model,
@@ -5080,11 +5080,11 @@ function Oo(e) {
 		}
 	};
 }
-async function ko(e, t) {
-	return Promise.all(e.filter((e) => e.enabled).map((e) => Ao(e, t)));
-}
 async function Ao(e, t) {
-	let n = Io(e.interface?.brandColor), r = Lo(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) => jo(e, t)));
+}
+async function jo(e, t) {
+	let n = $(e.interface?.brandColor), r = Lo(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,
@@ -5099,8 +5099,8 @@ async function Ao(e, t) {
 		enabled: e.enabled
 	};
 }
-async function jo(e, t) {
-	let n = e.interface, r = No(n?.composerIconUrl), i = No(n?.logoUrl), a = No(n?.logoUrlDark), o = Io(n?.displayName) ?? e.name, s = Io(n?.shortDescription), c = Io(n?.longDescription), l = Io(n?.brandColor), u = r ?? i ?? await Mo([n?.composerIcon, n?.logo], t), d = r ?? a ?? i ?? await Mo([
+async function Mo(e, t) {
+	let n = e.interface, r = Po(n?.composerIconUrl), i = Po(n?.logoUrl), a = Po(n?.logoUrlDark), o = $(n?.displayName) ?? e.name, s = $(n?.shortDescription), c = $(n?.longDescription), l = $(n?.brandColor), u = r ?? i ?? await No([n?.composerIcon, n?.logo], t), d = r ?? a ?? i ?? await No([
 		n?.composerIcon,
 		n?.logoDark,
 		n?.logo
@@ -5117,20 +5117,20 @@ async function jo(e, t) {
 		enabled: e.enabled
 	};
 }
-async function Mo(e, t) {
+async function No(e, t) {
 	for (let n of e) {
 		if (!n) continue;
 		let e = await t(n);
 		if (e) return e;
 	}
 }
-function No(e) {
-	let t = Io(e);
+function Po(e) {
+	let t = $(e);
 	try {
 		return new URL(t).protocol === "https:" ? t : void 0;
 	} catch {}
 }
-function Po(e) {
+function Fo(e) {
 	switch (_(e).toLowerCase()) {
 		case ".avif": return "image/avif";
 		case ".bmp": return "image/bmp";
@@ -5143,15 +5143,15 @@ function Po(e) {
 		case ".webp": return "image/webp";
 	}
 }
-function Fo(e, t) {
+function Io(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) > Do)) return `data:${e};base64,${`${r}${"=".repeat((4 - r.length % 4) % 4)}`}`;
+	if (!(i !== 0 && i !== a) && !(Math.floor(r.length * 3 / 4) > Oo)) return `data:${e};base64,${`${r}${"=".repeat((4 - r.length % 4) % 4)}`}`;
 }
-function Io(e) {
+function $(e) {
 	return (typeof e == "string" ? e.trim() : void 0) || void 0;
 }
 function Lo(e) {
@@ -5164,6 +5164,9 @@ var Ro = class {
 	cwd;
 	host;
 	iconDataUrls = /* @__PURE__ */ new Map();
+	skillsByCwd = /* @__PURE__ */ new Map();
+	skillRequests = /* @__PURE__ */ new Map();
+	skillRevision = 0;
 	pluginPromise = null;
 	pluginLastAttemptedCwdsKey = null;
 	pluginRefreshRequested = !1;
@@ -5171,7 +5174,7 @@ var Ro = class {
 		this.client = e, this.cwd = t, this.host = n;
 	}
 	reset(e) {
-		this.iconDataUrls.clear(), this.pluginLastAttemptedCwdsKey = null, this.pluginRefreshRequested = e;
+		this.iconDataUrls.clear(), this.skillsByCwd.clear(), this.skillRequests.clear(), this.skillRevision += 1, this.pluginLastAttemptedCwdsKey = null, this.pluginRefreshRequested = e;
 	}
 	async listModels(e = {}) {
 		await this.host.ensureConnected();
@@ -5194,13 +5197,16 @@ var Ro = 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 ko((await this.client.request("skills/list", {
+			let n = await Ao((await this.client.request("skills/list", {
 				...this.cwd ? { cwds: [this.cwd] } : {},
 				forceReload: e
 			})).data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e));
 			this.host.patch({
 				skills: n,
 				skillCatalogStatus: "loaded"
+			}), this.skillsByCwd.set(this.cwd ?? null, {
+				skills: n,
+				skillCatalogStatus: "loaded"
 			}), this.emitSkills(this.cwd ?? null, n, "loaded", t);
 		} catch {
 			this.host.patch({
@@ -5210,20 +5216,54 @@ var Ro = class {
 		}
 	}
 	async listSkills(e = {}) {
-		await this.host.ensureConnected(), e.forceReload && this.iconDataUrls.clear();
-		let t = await ko((await this.client.request("skills/list", {
-			...e.cwd ? { cwds: [e.cwd] } : {},
-			forceReload: e.forceReload ?? !1
-		})).data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e));
-		for (let n of this.host.runtimes()) n.cwd === (e.cwd ?? null) && (this.host.patchRuntime(n.threadId, {
-			skills: t,
-			skillCatalogStatus: "loaded"
-		}), this.host.emitConversationSkills(n.threadId, "action"));
-		return this.emitSkills(e.cwd ?? null, t, "loaded", "action"), structuredClone(t);
+		await this.host.ensureConnected();
+		let t = e.cwd ?? null, n = this.skillRequests.get(t);
+		if (n) return structuredClone(await n);
+		let r = this.skillsByCwd.get(t);
+		if (!e.forceReload && r?.skillCatalogStatus === "loaded") return structuredClone(r.skills);
+		e.forceReload && this.iconDataUrls.clear();
+		let i = this.skillRevision;
+		this.publishSkills(t, [], "loading", "action");
+		let a = (async () => {
+			try {
+				let n = await Ao((await this.client.request("skills/list", {
+					...e.cwd ? { cwds: [e.cwd] } : {},
+					forceReload: e.forceReload ?? !1
+				})).data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e));
+				if (i !== this.skillRevision) throw Error("Skill discovery was invalidated; retry the request");
+				return this.skillsByCwd.set(t, {
+					skills: n,
+					skillCatalogStatus: "loaded"
+				}), this.publishSkills(t, n, "loaded", "action"), n;
+			} catch (e) {
+				throw i === this.skillRevision && this.publishSkills(t, [], "error", "action"), e;
+			}
+		})();
+		this.skillRequests.set(t, a);
+		try {
+			return structuredClone(await a);
+		} finally {
+			this.skillRequests.get(t) === a && this.skillRequests.delete(t);
+		}
+	}
+	invalidateSkills() {
+		let e = /* @__PURE__ */ new Set([...this.skillsByCwd.keys(), ...this.skillRequests.keys()]);
+		this.skillRevision += 1, this.skillsByCwd.clear(), this.skillRequests.clear(), this.iconDataUrls.clear(), this.host.patch({
+			skills: [],
+			skillCatalogStatus: "notLoaded"
+		}), this.emitSkills(this.cwd ?? null, [], "notLoaded", "notification");
+		for (let e of this.host.runtimes()) this.host.patchRuntime(e.threadId, {
+			skills: [],
+			skillCatalogStatus: "notLoaded"
+		}), this.host.emitConversationSkills(e.threadId, "notification");
+		for (let t of e) this.listSkills({
+			...t ? { cwd: t } : {},
+			forceReload: !0
+		}).catch(() => void 0);
 	}
 	async loadPermissionProfiles() {
 		try {
-			let e = await this.requestPermissionProfiles(this.cwd), t = (await this.client.request("configRequirements/read", void 0)).requirements, n = Ta(e, t), r = this.host.preferredApprovalPreset();
+			let e = await this.requestPermissionProfiles(this.cwd), t = (await this.client.request("configRequirements/read", void 0)).requirements, n = Ea(e, t), r = this.host.preferredApprovalPreset();
 			this.host.patch({
 				permissionProfiles: e,
 				approvalPresets: n,
@@ -5239,7 +5279,7 @@ var Ro = class {
 	}
 	async loadRateLimits() {
 		try {
-			let e = qa(await this.client.request("account/rateLimits/read", void 0));
+			let e = Ja(await this.client.request("account/rateLimits/read", void 0));
 			this.host.patch({ rateLimits: e }), this.host.emitEvent("action", {
 				type: "rateLimits.changed",
 				payload: { rateLimits: structuredClone(e) }
@@ -5252,25 +5292,23 @@ var Ro = class {
 		}
 	}
 	async loadConversationCatalogs(e, t = !1) {
-		let n = this.host.getState();
-		if (!t && e === this.cwd && n.skillCatalogStatus !== "notLoaded") return {
-			skills: [...n.skills],
-			skillCatalogStatus: n.skillCatalogStatus,
+		let n = this.host.getState(), r = this.skillsByCwd.get(e ?? null) ?? {
+			skills: [],
+			skillCatalogStatus: "notLoaded"
+		};
+		if (!t && e === this.cwd) return {
+			...structuredClone(r),
 			permissionProfiles: [...n.permissionProfiles],
 			approvalPresets: [...n.approvalPresets]
 		};
-		let [r, i] = await Promise.allSettled([this.client.request("skills/list", {
-			...e ? { cwds: [e] } : {},
-			forceReload: t
-		}), (async () => ({
+		let [i] = await Promise.allSettled([(async () => ({
 			profiles: await this.requestPermissionProfiles(e),
 			requirements: (await this.client.request("configRequirements/read", void 0)).requirements
-		}))()]), a = r.status === "fulfilled" ? await ko(r.value.data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e)) : [], o = i.status === "fulfilled" ? i.value.profiles : [];
+		}))()]), a = i.status === "fulfilled" ? i.value.profiles : [];
 		return {
-			skills: a,
-			skillCatalogStatus: r.status === "fulfilled" ? "loaded" : "error",
-			permissionProfiles: o,
-			approvalPresets: i.status === "fulfilled" ? Ta(o, i.value.requirements) : []
+			...structuredClone(r),
+			permissionProfiles: a,
+			approvalPresets: i.status === "fulfilled" ? Ea(a, i.value.requirements) : []
 		};
 	}
 	schedulePluginRefresh(e = !1) {
@@ -5297,18 +5335,18 @@ var Ro = class {
 				cursor: n,
 				includeHidden: e
 			});
-			t.push(...r.data.map(Oo)), n = r.nextCursor;
+			t.push(...r.data.map(ko)), n = r.nextCursor;
 		} while (n);
 		return t;
 	}
 	applyModels(e, t) {
-		let n = q(e, this.host.getState().selectedModelId);
+		let n = K(e, this.host.getState().selectedModelId);
 		this.host.patch({
 			models: e,
 			modelCatalogStatus: "loaded",
 			selectedModelId: n?.id ?? null,
-			selectedReasoningEffort: n ? Sa(n) : null,
-			selectedServiceTier: n ? Ca(n) : null
+			selectedReasoningEffort: n ? Ca(n) : null,
+			selectedServiceTier: n ? wa(n) : null
 		}), this.emitModels(e, "loaded", t);
 	}
 	emitModels(e, t, n = "action") {
@@ -5320,6 +5358,17 @@ var Ro = class {
 			}
 		});
 	}
+	publishSkills(e, t, n, r) {
+		this.host.getState().activeConversationId || this.host.patch({
+			skills: t,
+			skillCatalogStatus: n
+		});
+		for (let i of this.host.runtimes()) i.cwd === e && (this.host.patchRuntime(i.threadId, {
+			skills: t,
+			skillCatalogStatus: n
+		}), this.host.emitConversationSkills(i.threadId, r));
+		this.emitSkills(e, t, n, r);
+	}
 	emitSkills(e, t, n, r) {
 		this.host.emitEvent(r, {
 			type: "catalog.skillsChanged",
@@ -5367,7 +5416,7 @@ var Ro = 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 = Fa(this.host.getState().plugins, await Promise.all([...n.values()].map((e) => jo(e, (e) => this.iconDataUrl(e)))));
+			let r = Ia(this.host.getState().plugins, await Promise.all([...n.values()].map((e) => Mo(e, (e) => this.iconDataUrl(e)))));
 			if (this.host.isClosed() || this.host.authenticationBlocksBootstrap()) return;
 			this.host.patch({
 				plugins: r,
@@ -5398,9 +5447,9 @@ var Ro = class {
 	}
 	async readIconDataUrl(e) {
 		if (!v(e)) return;
-		let t = Po(e);
+		let t = Fo(e);
 		if (t) try {
-			return Fo(t, (await this.client.request("fs/readFile", { path: e })).dataBase64);
+			return Io(t, (await this.client.request("fs/readFile", { path: e })).dataBase64);
 		} catch {
 			return;
 		}
@@ -5835,7 +5884,7 @@ var es = class {
 				success: !1,
 				contentItems: [{
 					type: "inputText",
-					text: j(e)
+					text: k(e)
 				}]
 			});
 		}
@@ -5894,8 +5943,8 @@ var es = class {
 						startedAt: i.startedAt ? Date.parse(i.startedAt) / 1e3 : null,
 						completedAt: i.completedAt ? Date.parse(i.completedAt) / 1e3 : null,
 						durationMs: i.durationMs
-					}, o = An(n.messages, jn(e, a));
-					this.originalImages && (o = qi(o));
+					}, o = Mn(n.messages, P(e, a));
+					this.originalImages && (o = Ji(o));
 					let s = n.messages.findIndex((e) => e.turnId === t), c = n.messages.filter((e) => e.turnId !== t);
 					c.splice(s < 0 ? c.length : s, 0, ...o), this.host.patchRuntime(e, { messages: c });
 				}
@@ -5907,7 +5956,7 @@ var es = class {
 			} catch (t) {
 				throw this.host.runtime(e) === n && o({
 					detailsLoading: !1,
-					detailsError: j(t)
+					detailsError: k(t)
 				}), t;
 			} finally {
 				this.turnLoads.get(e) === i && i.delete(t);
@@ -5938,7 +5987,7 @@ var es = class {
 		return await this.host.ensureConnected(), this.load();
 	}
 	async load() {
-		let e = Fa(this.host.getState().conversations, await this.requestConversations({ limit: this.conversationLimit }));
+		let e = Ia(this.host.getState().conversations, await this.requestConversations({ limit: this.conversationLimit }));
 		this.host.patch({ conversations: e }), this.host.schedulePluginRefresh(!0);
 		for (let t of e) this.host.emitSummaryUpserted(t, "listed", "action");
 		return this.host.getSnapshot();
@@ -5947,7 +5996,7 @@ var es = class {
 		return await this.host.ensureConnected(), structuredClone(await this.requestConversations(e));
 	}
 	async readSummary(e) {
-		let t = A(e);
+		let t = O(e);
 		await this.host.ensureConnected();
 		let n = await this.client.request("thread/read", {
 			threadId: t,
@@ -5958,20 +6007,20 @@ var es = class {
 		return structuredClone(r);
 	}
 	async archive(e) {
-		let t = A(e);
+		let t = O(e);
 		return await this.host.ensureConnected(), await this.client.request("thread/archive", { threadId: t }), this.host.removeThread(t, "archived", "action"), this.host.getSnapshot();
 	}
 	async delete(e) {
-		let t = A(e);
+		let t = O(e);
 		return await this.host.ensureConnected(), await this.client.request("thread/delete", { threadId: t }), this.host.removeThread(t, "deleted", "action"), this.host.getSnapshot();
 	}
 	async unarchive(e) {
-		let t = A(e);
+		let t = O(e);
 		await this.host.ensureConnected();
 		let n = await this.client.request("thread/unarchive", { threadId: t });
 		if (n.thread.id !== t) throw Error(`Codex thread/unarchive returned '${n.thread.id}' for requested thread '${t}'`);
 		let r = this.summaryWithKnownTurnCount(n.thread);
-		return this.host.patch({ conversations: Y(this.host.getState().conversations, r) }), this.host.emitSummaryUpserted(r, "updated", "action"), this.host.getSnapshot();
+		return this.host.patch({ conversations: J(this.host.getState().conversations, r) }), this.host.emitSummaryUpserted(r, "updated", "action"), this.host.getSnapshot();
 	}
 	hydrateCompleteHistory(e, t = {}) {
 		if (this.host.requireRuntime(e).fullHistoryHydrated && !t.restart) return Promise.resolve();
@@ -6008,7 +6057,7 @@ var es = class {
 					historyHasOlder: !1
 				});
 			} catch (t) {
-				throw this.host.runtime(e) && this.host.patchRuntime(e, { error: `Could not load complete conversation history: ${j(t)}` }), t;
+				throw this.host.runtime(e) && this.host.patchRuntime(e, { error: `Could not load complete conversation history: ${k(t)}` }), t;
 			}
 		})();
 		return this.historyHydrations.set(e, r), r.finally(() => {
@@ -6060,7 +6109,7 @@ var es = class {
 					hasOlder: this.host.requireRuntime(e).historyHasOlder
 				};
 			} catch (t) {
-				throw this.host.runtime(e) && this.host.patchRuntime(e, { error: j(t) }), t;
+				throw this.host.runtime(e) && this.host.patchRuntime(e, { error: k(t) }), t;
 			} finally {
 				this.host.runtime(e) && this.host.patchRuntime(e, { historyLoadingOlder: !1 });
 			}
@@ -6115,10 +6164,10 @@ var es = class {
 		let a = /* @__PURE__ */ new Set();
 		i.activeTurnId && a.add(i.activeTurnId);
 		for (let e of t) (e.status === "inProgress" || e.itemsView === "summary" && i.turns.find((t) => t.id === e.id)?.itemsView !== "summary") && i.turnIds.includes(e.id) && a.add(e.id);
-		let o = new Set(t.filter((e) => !a.has(e.id)).map((e) => e.id)), s = t.filter((e) => o.has(e.id)), c = i.turnIds.filter((e) => !o.has(e)), l = i.turns.filter((e) => !o.has(e.id)), u = i.messages.filter((e) => e.turnId === void 0 || !o.has(e.turnId)), d = An(i.messages, s.flatMap((t) => jn(e, t)));
-		r ? d = r(d) : this.originalImages && (d = qi(d)), this.host.patchRuntime(e, {
+		let o = new Set(t.filter((e) => !a.has(e.id)).map((e) => e.id)), s = t.filter((e) => o.has(e.id)), c = i.turnIds.filter((e) => !o.has(e)), l = i.turns.filter((e) => !o.has(e.id)), u = i.messages.filter((e) => e.turnId === void 0 || !o.has(e.turnId)), d = Mn(i.messages, s.flatMap((t) => P(e, t)));
+		r ? d = r(d) : this.originalImages && (d = Ji(d)), this.host.patchRuntime(e, {
 			turnIds: [...s.map((e) => e.id), ...c],
-			turns: [...s.map((e) => Q(e)), ...l],
+			turns: [...s.map((e) => Z(e)), ...l],
 			messages: [...d, ...u]
 		}), i.historyItemsView === "summary" && this.hydrateOriginalImages(e);
 		let f = this.host.requireRuntime(e).turnIds.length, p = this.host.getState();
@@ -6130,7 +6179,7 @@ var es = class {
 		return m && this.host.emitSummaryUpserted(m, "updated", "action"), d.filter((e) => e.turnId !== void 0 && n.has(e.turnId));
 	}
 	summaryWithKnownTurnCount(e) {
-		let t = J(e), n = this.host.runtime(e.id);
+		let t = q(e), n = this.host.runtime(e.id);
 		if (n?.hydrated) return {
 			...t,
 			turnCount: n.turnIds.length
@@ -6176,7 +6225,7 @@ var ss = class {
 	}
 	threadStartSettings(e, t) {
 		let n = this.preferredApprovalPreset(), r = e.approvalPreset ?? (e.approvalMode === void 0 && e.permissionMode === void 0 ? t.includes(n ?? "ask-for-approval") ? n : t[0] ?? null : null);
-		if (r) return Da(r);
+		if (r) return Oa(r);
 		let i = e.approvalMode ?? this.defaults.approvalMode, a = e.permissionMode ?? this.defaults.permissionMode ?? "read-only";
 		return {
 			approvalPolicy: i === "ask" ? "on-request" : "never",
@@ -6202,23 +6251,23 @@ var ss = class {
 	async update(e) {
 		let t = this.host.getState(), n = t.activeConversationId;
 		if (!n) {
-			let n = Ma(t, e);
+			let n = Na(t, e);
 			if (e.approvalPreset && !t.approvalPresets.includes(e.approvalPreset)) throw Error(`Approval preset '${e.approvalPreset}' is not available`);
 			return this.host.patch(n), this.host.getSnapshot();
 		}
 		return await this.updateForThread(n, e), this.host.getSnapshot();
 	}
 	async updateForThread(e, t) {
-		let n = await this.host.ensureThreadReady(e), r = this.host.snapshotForRuntime(n), i = Ma(r, t), a = n.approvalPreset !== i.approvalPreset || n.selectedModelId !== i.selectedModelId || n.selectedReasoningEffort !== i.selectedReasoningEffort || n.selectedServiceTier !== i.selectedServiceTier || n.planMode !== i.planMode;
+		let n = await this.host.ensureThreadReady(e), r = this.host.snapshotForRuntime(n), i = Na(r, t), a = n.approvalPreset !== i.approvalPreset || n.selectedModelId !== i.selectedModelId || n.selectedReasoningEffort !== i.selectedReasoningEffort || n.selectedServiceTier !== i.selectedServiceTier || n.planMode !== i.planMode;
 		if (t.approvalPreset && !r.approvalPresets.includes(t.approvalPreset)) throw Error(`Approval preset '${t.approvalPreset}' is not available`);
-		let o = q(this.host.getState().models, i.selectedModelId);
+		let o = K(this.host.getState().models, i.selectedModelId);
 		await this.client.request("thread/settings/update", {
 			threadId: e,
-			...t.approvalPreset ? Oa(t.approvalPreset) : {},
+			...t.approvalPreset ? ka(t.approvalPreset) : {},
 			...t.modelId && o ? { model: o.model } : {},
 			...t.reasoningEffort || t.modelId ? { effort: i.selectedReasoningEffort } : {},
 			...t.serviceTier !== void 0 || t.modelId ? { serviceTier: i.selectedServiceTier } : {},
-			...o && (typeof t.planMode == "boolean" || t.modelId || t.reasoningEffort) ? { collaborationMode: Na(i.planMode, o.model, i.selectedReasoningEffort) } : {}
+			...o && (typeof t.planMode == "boolean" || t.modelId || t.reasoningEffort) ? { collaborationMode: Pa(i.planMode, o.model, i.selectedReasoningEffort) } : {}
 		}), this.host.patchRuntime(e, i), a && this.host.emitConversationSettings(e, "action");
 	}
 	async setGoal(e, t) {
@@ -6237,7 +6286,7 @@ var ss = 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 = !yo(r.goal, a.goal);
+		let o = !bo(r.goal, a.goal);
 		this.host.patchRuntime(e, { goal: { ...a.goal } }), o && this.host.emitEvent("action", {
 			type: "conversation.goalChanged",
 			conversationId: e,
@@ -6296,7 +6345,7 @@ var ss = 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 = jn(e, i.turn).filter((e) => !n.messages.some((t) => t.id === e.id)).map((e) => e.role === "user" ? {
+			let o = P(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,
@@ -6310,8 +6359,8 @@ var ss = class {
 			this.host.patchRuntime(e, {
 				busy: n.activeTurnId !== null,
 				turnStartPending: !1,
-				turns: $(n.turns, Q(i.turn)),
-				messages: n.activeTurnId ? M(s, e, i.turn.id) : s
+				turns: Q(n.turns, Z(i.turn)),
+				messages: n.activeTurnId ? A(s, e, i.turn.id) : s
 			});
 			for (let t of o) this.host.emitEvent("action", {
 				type: "message.appended",
@@ -6323,13 +6372,13 @@ var ss = class {
 				type: "turn.started",
 				conversationId: e,
 				turnId: i.turn.id,
-				payload: { startedAt: go(i.turn.startedAt) }
+				payload: { startedAt: _o(i.turn.startedAt) }
 			}), this.host.emitConversationActivity(e, "action");
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
 				busy: !1,
 				turnStartPending: !1,
-				error: j(t)
+				error: k(t)
 			}), this.host.patchConversationStatus(e, "error", "action"), this.host.emitConversationActivity(e, "action"), t;
 		}
 	}
@@ -6358,11 +6407,11 @@ var ss = class {
 	async editTurnForThread(e, t, n, r) {
 		let i = await this.host.ensureThreadReady(e);
 		i.turns.find((e) => e.id === t)?.itemsView === "summary" && await this.host.loadTurnHistory?.(e, t);
-		let a = i.messages.find((e) => e.role === "user" && e.kind !== "steer" && Ba(e) === t);
+		let a = i.messages.find((e) => e.role === "user" && e.kind !== "steer" && Va(e) === t);
 		if (!a) throw Error(`Could not find the user prompt for Codex turn '${t}'`);
 		let o = n.trim();
 		if (!o) throw Error("Cannot replace a turn prompt with empty content");
-		let s = Ha(a);
+		let s = Ua(a);
 		await this.rollbackToTurn(e, t), await this.host.sendMessageToThread(e, o, {
 			...r,
 			...s.length > 0 ? { attachments: s } : {}
@@ -6375,11 +6424,11 @@ var ss = class {
 	async retryTurnForThread(e, t) {
 		let n = await this.host.ensureThreadReady(e);
 		n.turns.find((e) => e.id === t)?.itemsView === "summary" && await this.host.loadTurnHistory?.(e, t);
-		let r = n.messages.find((e) => e.role === "user" && e.kind !== "steer" && Ba(e) === t);
+		let r = n.messages.find((e) => e.role === "user" && e.kind !== "steer" && Va(e) === t);
 		if (!r) throw Error("Could not find the user prompt for this turn");
-		let i = Va(r);
+		let i = Ha(r);
 		if (!i) throw Error("Could not find the user prompt for this turn");
-		let a = Ha(r);
+		let a = Ua(r);
 		await this.rollbackToTurn(e, t), await this.host.sendMessageToThread(e, i, {
 			...r.metadata?.promptContent ? { content: le(r.metadata.promptContent) } : {},
 			...a.length > 0 ? { attachments: a } : {}
@@ -6400,15 +6449,15 @@ var ss = class {
 		});
 		if (i.thread.id !== e) throw Error(`Codex thread/revert returned '${i.thread.id}' for requested thread '${e}'`);
 		let a = r.turnIds.slice(0, n), o = new Set(a), s = r.messages.filter((e) => {
-			let t = Ba(e);
+			let t = Va(e);
 			return t === null || o.has(t);
 		});
 		r.turnIds = a, r.turns = r.turns.filter((e) => o.has(e.id)), r.activeTurnId = null;
 		let c = {
-			...J(i.thread),
+			...q(i.thread),
 			turnCount: a.length
 		};
-		this.host.patch({ conversations: Y(this.host.getState().conversations, c) }), this.host.patchRuntime(e, {
+		this.host.patch({ conversations: J(this.host.getState().conversations, c) }), this.host.patchRuntime(e, {
 			messages: s,
 			answeredClientRequestIds: [],
 			busy: !1,
@@ -6493,8 +6542,8 @@ var ds = class {
 		let s = Qt(i);
 		if (s) return this.host.startReviewForThread(e, { target: s });
 		n = {
-			...Ia(this.host.snapshotForRuntime(r), n),
-			...n.skills ? { skills: O(n.skills, r.skills) } : {}
+			...La(this.host.snapshotForRuntime(r), n),
+			...n.skills ? { skills: await this.validatedSkills(r, n.skills) } : {}
 		}, await this.sendPromptToThread(e, i, n);
 	}
 	async continueInterruptedTurn() {
@@ -6517,49 +6566,49 @@ var ds = class {
 			let n = await this.client.request("turn/start", {
 				threadId: e,
 				input: [],
-				...Pa(this.host.snapshotForRuntime(t), {})
+				...Fa(this.host.snapshotForRuntime(t), {})
 			}), r = t.turnIds.includes(n.turn.id);
 			t.activeTurnId = n.turn.status === "inProgress" ? n.turn.id : null, r || t.turnIds.push(n.turn.id), this.host.patchConversationTurnCount(e, t.turnIds.length, "action");
 			let i = n.turn.status === "inProgress";
 			this.host.patchRuntime(e, {
 				busy: i,
 				turnStartPending: !1,
-				turns: $(t.turns, Q(n.turn)),
-				messages: i ? M(t.messages, e, n.turn.id) : t.messages
+				turns: Q(t.turns, Z(n.turn)),
+				messages: i ? A(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: go(n.turn.startedAt) }
+				payload: { startedAt: _o(n.turn.startedAt) }
 			}), this.host.emitConversationActivity(e, "action");
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
 				busy: !1,
 				turnStartPending: !1,
-				error: j(t)
+				error: k(t)
 			}), this.host.patchConversationStatus(e, "error", "action"), this.host.emitConversationActivity(e, "action"), t;
 		}
 	}
 	async sendPromptToThread(e, t, n = {}, r) {
-		let i = this.host.requireRuntime(e), a = Ia(this.host.snapshotForRuntime(i), n), o = en(a.content);
+		let i = this.host.requireRuntime(e), a = La(this.host.snapshotForRuntime(i), n), o = en(a.content);
 		o && (a.content = o);
-		let s = o ? de(o) : r?.trim() || t, c = rn(O(tn(o), i.skills), O(a.skills ?? [], i.skills)), l = La(a.attachments ?? []);
+		let s = o ? de(o) : r?.trim() || t, c = await this.validatedSkills(i, an(tn(o), a.skills ?? [])), l = Ra(a.attachments ?? []);
 		if (i.busy) {
 			this.host.patchRuntime(e, { queuedPrompts: [...i.queuedPrompts, {
-				id: xo(),
+				id: So(),
 				text: s,
 				...Object.keys(a).length > 0 ? { options: a } : {}
 			}] }), this.emitQueuedPrompts(e);
 			return;
 		}
-		let u = bo(), d = {
+		let u = xo(), d = {
 			id: u,
 			role: "user",
 			status: "complete",
 			parts: [{
 				type: "text",
 				text: s
-			}, ...l.map(za)],
+			}, ...l.map(Ba)],
 			createdAt: (/* @__PURE__ */ new Date()).toISOString(),
 			metadata: {
 				conversationId: e,
@@ -6587,7 +6636,7 @@ var ds = class {
 						text: ue(o ?? [], t),
 						text_elements: []
 					},
-					...l.map(Ra),
+					...l.map(za),
 					...nn(o),
 					...c.map((e) => ({
 						type: "skill",
@@ -6595,7 +6644,7 @@ var ds = class {
 						path: e.path
 					}))
 				],
-				...Pa(this.host.snapshotForRuntime(i), a),
+				...Fa(this.host.snapshotForRuntime(i), a),
 				...a.outputSchema === void 0 ? {} : { outputSchema: a.outputSchema }
 			}), r = i.turnIds.includes(n.turn.id);
 			i.activeTurnId = n.turn.status === "inProgress" ? n.turn.id : null, i.turnIds.includes(n.turn.id) || i.turnIds.push(n.turn.id), this.host.patchConversationTurnCount(e, i.turnIds.length, "action");
@@ -6610,8 +6659,8 @@ var ds = class {
 			this.host.patchRuntime(e, {
 				busy: s,
 				turnStartPending: !1,
-				turns: $(i.turns, Q(n.turn)),
-				messages: s ? M(d, e, n.turn.id) : d
+				turns: Q(i.turns, Z(n.turn)),
+				messages: s ? A(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", {
@@ -6623,13 +6672,13 @@ var ds = class {
 				type: "turn.started",
 				conversationId: e,
 				turnId: n.turn.id,
-				payload: { startedAt: go(n.turn.startedAt) }
+				payload: { startedAt: _o(n.turn.startedAt) }
 			}), this.host.emitConversationActivity(e, "action");
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
 				busy: !1,
 				turnStartPending: !1,
-				error: j(t)
+				error: k(t)
 			}), this.host.patchConversationStatus(e, "error", "action"), this.host.emitConversationActivity(e, "action"), t;
 		}
 	}
@@ -6638,10 +6687,10 @@ var ds = class {
 		return await this.steerForThread(n, e, t), this.host.getSnapshot();
 	}
 	async steerForThread(e, t, n = {}, r) {
-		let i = await this.host.ensureThreadReady(e), a = t.trim(), o = en(n.content), s = rn(O(tn(o), i.skills), O(n.skills ?? [], i.skills)), c = o ? de(o) : r?.trim() || a;
+		let i = await this.host.ensureThreadReady(e), a = t.trim(), o = en(n.content), s = await this.validatedSkills(i, an(tn(o), n.skills ?? [])), c = o ? de(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 = La(n.attachments ?? []), u = bo(), d = {
+		let l = Ra(n.attachments ?? []), u = xo(), d = {
 			id: u,
 			kind: "steer",
 			role: "user",
@@ -6649,7 +6698,7 @@ var ds = class {
 			parts: [{
 				type: "text",
 				text: c
-			}, ...l.map(za)],
+			}, ...l.map(Ba)],
 			createdAt: (/* @__PURE__ */ new Date()).toISOString(),
 			turnId: i.activeTurnId,
 			metadata: {
@@ -6661,7 +6710,7 @@ var ds = class {
 		};
 		this.host.patchRuntime(e, {
 			error: null,
-			messages: M([...i.messages, d], e, i.activeTurnId, { forceSegment: !0 })
+			messages: A([...i.messages, d], e, i.activeTurnId, { forceSegment: !0 })
 		}), this.host.emitEvent("action", {
 			type: "message.appended",
 			conversationId: e,
@@ -6679,7 +6728,7 @@ var ds = class {
 						text: ue(o ?? [], a),
 						text_elements: []
 					},
-					...l.map(Ra),
+					...l.map(za),
 					...nn(o),
 					...s.map((e) => ({
 						type: "skill",
@@ -6688,7 +6737,7 @@ var ds = class {
 					}))
 				]
 			}), n = i.turnIds.includes(t.turnId);
-			i.activeTurnId = t.turnId, i.turnIds.includes(t.turnId) || i.turnIds.push(t.turnId), i.turns = $(i.turns, {
+			i.activeTurnId = t.turnId, i.turnIds.includes(t.turnId) || i.turnIds.push(t.turnId), i.turns = Q(i.turns, {
 				id: t.turnId,
 				status: "inProgress",
 				error: null,
@@ -6705,14 +6754,14 @@ var ds = class {
 					turnId: t.turnId
 				}
 			} : e);
-			this.host.patchRuntime(e, { messages: P(M(r, e, t.turnId), e) }), n || this.host.emitEvent("action", {
+			this.host.patchRuntime(e, { messages: M(A(r, e, t.turnId), e) }), n || this.host.emitEvent("action", {
 				type: "turn.started",
 				conversationId: e,
 				turnId: t.turnId,
 				payload: { startedAt: (/* @__PURE__ */ new Date()).toISOString() }
 			});
 		} catch (t) {
-			throw this.host.patchRuntime(e, { error: j(t) }), t;
+			throw this.host.patchRuntime(e, { error: k(t) }), t;
 		}
 	}
 	async answerAsyncQuestion(e, t, n) {
@@ -6738,23 +6787,23 @@ var ds = class {
 	async updateQueuedPromptForThread(e, t, n, r) {
 		let i = await this.host.ensureThreadReady(e), a = n.trim();
 		if (!a) throw Error("Cannot update a queued prompt with empty content");
-		let o = !1, s = i.queuedPrompts.map((e) => {
+		let o = en(r?.content);
+		i.queuedPrompts.some((e) => e.id === t) && await this.validatedSkills(i, tn(o));
+		let s = !1, c = i.queuedPrompts.map((e) => {
 			if (e.id !== t) return e;
-			o = !0;
-			let n = en(r?.content);
-			O(tn(n), i.skills);
-			let s = {
+			s = !0;
+			let n = {
 				...e.options,
 				...r
 			};
-			return n ? s.content = n : delete s.content, {
+			return o ? n.content = o : delete n.content, {
 				...e,
 				text: a,
-				options: s
+				options: n
 			};
 		});
-		if (!o) throw Error(`Unknown queued prompt '${t}'`);
-		this.host.patchRuntime(i.threadId, { queuedPrompts: s }), this.emitQueuedPrompts(i.threadId);
+		if (!s) throw Error(`Unknown queued prompt '${t}'`);
+		this.host.patchRuntime(i.threadId, { queuedPrompts: c }), this.emitQueuedPrompts(i.threadId);
 	}
 	async steerQueuedPrompt(e, t, n) {
 		let r = this.requiredActiveConversation();
@@ -6780,7 +6829,7 @@ var ds = class {
 			await this.sendPromptToThread(e, n.text, n.options);
 		} catch (r) {
 			this.host.patchRuntime(e, {
-				error: j(r),
+				error: k(r),
 				queuedPrompts: [n, ...t.queuedPrompts]
 			}), this.emitQueuedPrompts(e, "notification");
 		}
@@ -6798,6 +6847,9 @@ var ds = class {
 		if (!e) throw Error("There is no active conversation");
 		return e;
 	}
+	async validatedSkills(e, t) {
+		return t.length > 0 && e.skillCatalogStatus !== "loaded" && await this.host.loadSkillsForThread(e.threadId), rn(t, e.skills);
+	}
 }, fs = 5, ps = class {
 	client;
 	options;
@@ -6837,8 +6889,8 @@ var ds = class {
 		let i = this.host.getState(), a = e.approvalPreset ?? (e.approvalMode === void 0 && e.permissionMode === void 0 && i.approvalPreset && r.approvalPresets.includes(i.approvalPreset) ? i.approvalPreset : void 0), o = this.settings.threadStartSettings({
 			...e,
 			...a ? { approvalPreset: a } : {}
-		}, r.approvalPresets), s = q(i.models, i.selectedModelId), c = e.model ? ba(i.models, e.model) : s, l = c?.model, u = e.reasoningEffort ?? (c?.id === s?.id ? i.selectedReasoningEffort : c ? Sa(c) : null) ?? void 0, d = e.serviceTier === void 0 ? c?.id === s?.id ? i.selectedServiceTier ?? null : c?.defaultServiceTier ?? null : e.serviceTier;
-		xa(c, u), wa(c, d);
+		}, r.approvalPresets), s = K(i.models, i.selectedModelId), c = e.model ? xa(i.models, e.model) : s, l = c?.model, u = e.reasoningEffort ?? (c?.id === s?.id ? i.selectedReasoningEffort : c ? Ca(c) : null) ?? void 0, d = e.serviceTier === void 0 ? c?.id === s?.id ? i.selectedServiceTier ?? null : c?.defaultServiceTier ?? null : e.serviceTier;
+		Sa(c, u), Ta(c, d);
 		let f = t.mcpServers === void 0 ? this.extensions.defaultMcpServers : qo(t.mcpServers), p = await this.extensions.conversationExtension({
 			operation: "start",
 			conversationId: null,
@@ -6858,11 +6910,11 @@ var ds = class {
 			serviceName: "codex_app_sdk"
 		});
 		this.host.observeEmptyConversation(m.thread.id);
-		let h = Aa(m, i.models, i);
+		let h = ja(m, i.models, i);
 		u && (await this.client.request("thread/settings/update", {
 			threadId: m.thread.id,
 			effort: u,
-			...c ? { collaborationMode: Na(i.planMode, c.model, u) } : {}
+			...c ? { collaborationMode: Pa(i.planMode, c.model, u) } : {}
 		}), h.selectedReasoningEffort = u), d !== void 0 && (h.selectedServiceTier = d), c && (h.selectedModelId = c.id), a && (h.approvalPreset = a);
 		let g = this.host.createRuntime(m.thread.id, {
 			hydrated: !0,
@@ -6873,7 +6925,7 @@ var ds = class {
 			turnIds: [],
 			messages: [],
 			answeredClientRequestIds: [],
-			threadStatus: Ga(m.thread.status),
+			threadStatus: Ka(m.thread.status),
 			...r,
 			...h
 		});
@@ -6882,10 +6934,10 @@ var ds = class {
 			...t,
 			mcpServers: f
 		});
-		let _ = J(m.thread);
+		let _ = q(m.thread);
 		return this.host.patch({
 			activeConversationId: m.thread.id,
-			conversations: Y(i.conversations, _),
+			conversations: J(i.conversations, _),
 			...this.host.runtimeProjection(g)
 		}), this.host.emitSummaryUpserted(_, "created", "action"), this.host.emitSelected(m.thread.id), this.emitConversationState(m.thread.id), this.host.getSnapshot();
 	}
@@ -6941,19 +6993,19 @@ var ds = class {
 				historyLoadingOlder: !1,
 				fullHistoryHydrated: !0,
 				busy: !!n.activeTurnId,
-				threadStatus: Ga(t.thread.status)
+				threadStatus: Ka(t.thread.status)
 			}), i = {
-				...J(t.thread),
+				...q(t.thread),
 				turnCount: r.turnIds.length
 			}, a = this.host.getState();
 			return this.host.patch({
-				conversations: Y(a.conversations, i),
+				conversations: J(a.conversations, i),
 				...a.activeConversationId === e ? this.host.runtimeProjection(r) : {}
 			}), this.host.emitSummaryUpserted(i, "updated", "action"), this.host.emitHistoryReplaced(e, "resync", "action"), this.host.emitConversationActivity(e, "action"), this.historySnapshot(e, r);
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
 				historyLoading: !1,
-				error: j(t)
+				error: k(t)
 			}), t;
 		}
 	}
@@ -6961,21 +7013,35 @@ var ds = class {
 		let i = {
 			...this.hostOptionsByThread.get(e),
 			...n
-		}, a = {
+		}, a = performance.now(), o = a, s = (t) => {
+			let n = performance.now();
+			process.env.CODEX_APP_SDK_TRACE_CONVERSATION_LOAD === "1" && console.warn("[conversation-load] " + JSON.stringify({
+				layer: "codex-sdk",
+				stage: t,
+				threadId: e,
+				at: performance.timeOrigin + n,
+				stageMs: n - o,
+				elapsedMs: n - a
+			})), o = n;
+		};
+		s("resume.begin");
+		let c = {
 			...i,
 			mcpServers: i.mcpServers === void 0 ? this.extensions.defaultMcpServers : qo(i.mcpServers)
 		};
-		this.hostOptionsByThread.set(e, a);
-		let o = await this.extensions.conversationExtension({
+		this.hostOptionsByThread.set(e, c);
+		let l = await this.extensions.conversationExtension({
 			operation: "resume",
 			conversationId: e,
-			cwd: a.cwd,
-			extensionContext: a.extensionContext
-		}, {}, a.mcpServers), s = a.historyItemsView ?? this.options.historyItemsView ?? "full", c = this.host.createRuntime(e, {
+			cwd: c.cwd,
+			extensionContext: c.extensionContext
+		}, {}, c.mcpServers);
+		s("extensions.ready");
+		let u = c.historyItemsView ?? this.options.historyItemsView ?? "full", d = this.host.createRuntime(e, {
 			historyLoading: !0,
 			error: null
-		}), l = new Map(c.turns.map((e) => [e.id, e])), u = new Map(c.messages.map((e) => [e.id, e])), d = c.threadStatus;
-		t && this.host.activateRuntime(c);
+		}), f = new Map(d.turns.map((e) => [e.id, e])), p = new Map(d.messages.map((e) => [e.id, e])), m = d.threadStatus;
+		t && this.host.activateRuntime(d);
 		try {
 			let [t, n] = await Promise.all([this.client.request("thread/resume", {
 				threadId: e,
@@ -6983,72 +7049,82 @@ var ds = class {
 				initialTurnsPage: {
 					limit: fs,
 					sortDirection: "desc",
-					itemsView: s
+					itemsView: u
 				},
-				...a.cwd ? { cwd: a.cwd } : {},
-				...o.baseInstructions === void 0 ? {} : { baseInstructions: o.baseInstructions },
-				...o.developerInstructions === void 0 ? {} : { developerInstructions: o.developerInstructions },
-				...o.config === void 0 ? {} : { config: o.config }
+				...c.cwd ? { cwd: c.cwd } : {},
+				...l.baseInstructions === void 0 ? {} : { baseInstructions: l.baseInstructions },
+				...l.developerInstructions === void 0 ? {} : { developerInstructions: l.developerInstructions },
+				...l.config === void 0 ? {} : { config: l.config }
 			}), this.client.request("thread/goal/get", { threadId: e }).then((e) => e.goal).catch(() => null)]);
-			if (t.thread.id !== e) throw Error(`Codex thread/resume returned '${t.thread.id}' for requested thread '${e}'`);
+			if (s("resume-and-goal.ready"), t.thread.id !== e) throw Error(`Codex thread/resume returned '${t.thread.id}' for requested thread '${e}'`);
 			let i = t.initialTurnsPage ?? await this.client.request("thread/turns/list", {
 				threadId: t.thread.id,
 				cursor: null,
 				limit: fs,
 				sortDirection: "desc",
-				itemsView: s
-			}), f = await Promise.all([...i.data].reverse().map(async (e) => e.status === "inProgress" && (e.itemsView === "summary" || e.itemsView === "notLoaded") ? {
+				itemsView: u
+			}), a = await Promise.all([...i.data].reverse().map(async (e) => e.status === "inProgress" && (e.itemsView === "summary" || e.itemsView === "notLoaded") ? {
 				...e,
 				items: await os(this.client, t.thread.id, e.id),
 				itemsView: "full"
-			} : e)), p = t.cwd ?? t.thread.cwd ?? a.cwd, m = await this.catalog.loadConversationCatalogs(p), h = s === "full" ? await this.originalImages?.prepare(t.thread.id, t.thread.path) : void 0, g = c.turns.filter((e) => l.get(e.id) !== e), _ = c.threadStatus !== d && c.threadStatus ? c.threadStatus : Ga(t.thread.status), v = f.map((e) => _.type === "idle" && e.status === "inProgress" ? {
+			} : e));
+			s("initial-page-and-active-items.ready");
+			let o = t.cwd ?? t.thread.cwd ?? c.cwd, h = await this.catalog.loadConversationCatalogs(o);
+			s("permission-catalog.ready");
+			let g = u === "full" ? await this.originalImages?.prepare(t.thread.id, t.thread.path) : void 0;
+			s("original-images.ready");
+			let _ = d.turns.filter((e) => f.get(e.id) !== e), v = d.threadStatus !== m && d.threadStatus ? d.threadStatus : Ka(t.thread.status), y = a.map((e) => v.type === "idle" && e.status === "inProgress" ? {
 				...e,
 				status: "interrupted"
-			} : e), y = new Set(c.turns.filter((e) => e.itemsView !== "summary").map((e) => e.id)), b = new Map(v.map((e) => [e.id, e.itemsView === "summary" && y.has(e.id) ? {
-				...c.turns.find((t) => t.id === e.id),
-				...Q(e),
+			} : e), b = new Set(d.turns.filter((e) => e.itemsView !== "summary").map((e) => e.id)), x = new Map(y.map((e) => [e.id, e.itemsView === "summary" && b.has(e.id) ? {
+				...d.turns.find((t) => t.id === e.id),
+				...Z(e),
 				itemsView: "full"
-			} : Q(e)]));
-			for (let e of g) b.set(e.id, e);
-			let x = g.length > 0 ? c.activeTurnId : _.type === "active" ? ln(f) : null, ee = An(c.messages, v.flatMap((e) => e.itemsView === "summary" && y.has(e.id) ? c.messages.filter((t) => t.turnId === e.id) : jn(t.thread.id, e))), S = new Map(ee.map((e) => [e.id, e]));
-			for (let e of c.messages) u.get(e.id) !== e && S.set(e.id, e);
-			let te = x ? M([...S.values()], t.thread.id, x) : [...S.values()];
-			h && (te = h(te));
-			let ne = this.host.createRuntime(t.thread.id, {
+			} : Z(e)]));
+			for (let e of _) x.set(e.id, e);
+			let S = _.length > 0 ? d.activeTurnId : v.type === "active" ? dn(a) : null, ee = Mn(d.messages, y.flatMap((e) => e.itemsView === "summary" && b.has(e.id) ? d.messages.filter((t) => t.turnId === e.id) : P(t.thread.id, e))), te = new Map(ee.map((e) => [e.id, e]));
+			for (let e of d.messages) p.get(e.id) !== e && te.set(e.id, e);
+			let ne = S ? A([...te.values()], t.thread.id, S) : [...te.values()];
+			g && (ne = g(ne)), s("messages.projected");
+			let re = this.host.createRuntime(t.thread.id, {
 				hydrated: !0,
 				historyMode: t.thread.historyMode ?? "legacy",
-				loadingStrategy: a.loadingStrategy ?? this.options.loadingStrategy ?? "lazy",
-				historyItemsView: s,
+				loadingStrategy: c.loadingStrategy ?? this.options.loadingStrategy ?? "lazy",
+				historyItemsView: u,
 				historyCursor: i.nextCursor,
 				historyHasOlder: i.nextCursor !== null,
 				historyLoadingOlder: !1,
 				fullHistoryHydrated: i.nextCursor === null,
-				cwd: p ?? null,
+				cwd: o ?? null,
 				historyLoading: !1,
-				activeTurnId: x,
-				turns: [...b.values()],
-				turnIds: [...b.keys()],
-				messages: te,
-				busy: g.length > 0 ? c.busy : !!x || _.type === "active",
+				activeTurnId: S,
+				turns: [...x.values()],
+				turnIds: [...x.keys()],
+				messages: ne,
+				busy: _.length > 0 ? d.busy : !!S || v.type === "active",
 				goal: n ? { ...n } : null,
-				threadStatus: _,
-				...m,
-				...Aa(t, this.host.getState().models, this.host.snapshotForRuntime(c))
-			}), re = {
-				...J(t.thread),
-				turnCount: f.length
-			}, ie = this.host.getState();
-			return this.host.patch({
-				conversations: Y(ie.conversations, re),
-				...ie.activeConversationId === t.thread.id ? this.host.runtimeProjection(ne) : {}
-			}), this.host.emitSummaryUpserted(re, "resumed", "action"), this.host.emitHistoryReplaced(t.thread.id, r, "action"), this.emitConversationState(t.thread.id), s === "summary" && this.conversations.hydrateOriginalImages(t.thread.id, t.thread.path), ne.loadingStrategy === "eager" && i.nextCursor !== null && this.conversations.hydrateCompleteHistory(t.thread.id, {
+				threadStatus: v,
+				...h,
+				...ja(t, this.host.getState().models, this.host.snapshotForRuntime(d))
+			}), ie = {
+				...q(t.thread),
+				turnCount: a.length
+			};
+			s("runtime.created");
+			let ae = this.host.getState();
+			this.host.patch({
+				conversations: J(ae.conversations, ie),
+				...ae.activeConversationId === t.thread.id ? this.host.runtimeProjection(re) : {}
+			}), this.host.emitSummaryUpserted(ie, "resumed", "action"), this.host.emitHistoryReplaced(t.thread.id, r, "action"), this.emitConversationState(t.thread.id), s("events.published"), u === "summary" && this.conversations.hydrateOriginalImages(t.thread.id, t.thread.path), re.loadingStrategy === "eager" && i.nextCursor !== null && this.conversations.hydrateCompleteHistory(t.thread.id, {
 				cursor: i.nextCursor,
 				initialPageLoaded: !0
-			}).catch(() => void 0), this.host.getSnapshot();
+			}).catch(() => void 0);
+			let oe = this.host.getSnapshot();
+			return s("snapshot.cloned"), oe;
 		} catch (t) {
-			throw this.host.patchRuntime(e, {
+			throw s("resume.failed"), this.host.patchRuntime(e, {
 				historyLoading: !1,
-				error: j(t)
+				error: k(t)
 			}), t;
 		}
 	}
@@ -7078,16 +7154,16 @@ var ds = class {
 			case "thread/started": {
 				this.host.createRuntime(e.params.thread.id, {
 					historyMode: e.params.thread.historyMode ?? "legacy",
-					threadStatus: Ga(e.params.thread.status)
+					threadStatus: Ka(e.params.thread.status)
 				});
-				let t = J(e.params.thread);
-				this.host.patch({ conversations: Y(this.host.getState().conversations, t) }), this.host.emitSummaryUpserted(t, "started", "notification"), this.host.emitConversationActivity(e.params.thread.id, "notification");
+				let t = q(e.params.thread);
+				this.host.patch({ conversations: J(this.host.getState().conversations, t) }), this.host.emitSummaryUpserted(t, "started", "notification"), this.host.emitConversationActivity(e.params.thread.id, "notification");
 				return;
 			}
 			case "thread/status/changed": {
 				let { threadId: t, status: n } = e.params, r = this.host.requireRuntime(t), i = n.type === "systemError";
 				(i || n.type === "idle" && !r.turnStartPending) && (r.activeTurnId = null), this.host.patchRuntime(t, {
-					threadStatus: Ga(n),
+					threadStatus: Ka(n),
 					busy: i ? !1 : r.turnStartPending || n.type === "active" || r.activeTurnId !== null,
 					...i ? {
 						turnStartPending: !1,
@@ -7097,7 +7173,7 @@ var ds = class {
 				let a = this.host.getState();
 				this.host.patch({ conversations: a.conversations.map((e) => e.id === t ? {
 					...e,
-					status: Ka(n)
+					status: qa(n)
 				} : e) });
 				let o = this.host.getState().conversations.find((e) => e.id === t);
 				o && this.host.emitSummaryUpserted(o, "updated", "notification"), this.host.emitConversationActivity(t, "notification"), n.type === "idle" && this.host.sendNextQueuedPrompt(t);
@@ -7109,7 +7185,7 @@ var ds = class {
 				return;
 			case "thread/unarchived":
 				this.conversations.load().catch((e) => {
-					this.host.patch({ error: j(e) });
+					this.host.patch({ error: k(e) });
 				});
 				return;
 			case "thread/closed": {
@@ -7122,10 +7198,7 @@ var ds = class {
 				return;
 			}
 			case "skills/changed":
-				this.catalog.loadSkills(!0, "notification");
-				for (let e of this.host.runtimes()) this.catalog.loadConversationCatalogs(e.cwd ?? void 0, !0).then((t) => {
-					this.host.patchRuntime(e.threadId, t), this.host.emitConversationSkills(e.threadId, "notification"), this.host.emitConversationPermissions(e.threadId, "notification");
-				});
+				this.catalog.invalidateSkills();
 				return;
 			case "thread/name/updated": {
 				let t = this.host.getState(), n = t.conversations.find((t) => t.id === e.params.threadId), r = e.params.threadName?.trim() || n?.preview || "Untitled conversation";
@@ -7139,12 +7212,12 @@ var ds = class {
 				return;
 			}
 			case "thread/settings/updated": {
-				let t = this.host.requireRuntime(e.params.threadId), n = this.host.getState(), r = ja(e.params.threadSettings, n.models, this.host.snapshotForRuntime(t)), i = t.approvalPreset !== r.approvalPreset || t.selectedModelId !== r.selectedModelId || t.selectedReasoningEffort !== r.selectedReasoningEffort || t.selectedServiceTier !== r.selectedServiceTier || t.planMode !== r.planMode;
+				let t = this.host.requireRuntime(e.params.threadId), n = this.host.getState(), r = Ma(e.params.threadSettings, n.models, this.host.snapshotForRuntime(t)), i = t.approvalPreset !== r.approvalPreset || t.selectedModelId !== r.selectedModelId || t.selectedReasoningEffort !== r.selectedReasoningEffort || t.selectedServiceTier !== r.selectedServiceTier || t.planMode !== r.planMode;
 				this.host.patchRuntime(e.params.threadId, r), i && this.host.emitConversationSettings(e.params.threadId, "notification");
 				return;
 			}
 			case "thread/goal/updated":
-				if (yo(this.host.requireRuntime(e.params.threadId).goal, e.params.goal)) return;
+				if (bo(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,
@@ -7161,7 +7234,7 @@ var ds = class {
 				});
 				return;
 			case "thread/tokenUsage/updated": {
-				let t = Wa(e.params.tokenUsage);
+				let t = Ga(e.params.tokenUsage);
 				this.host.patchRuntime(e.params.threadId, { contextUsage: t }), this.host.emitEvent("notification", {
 					type: "conversation.contextUsageChanged",
 					conversationId: e.params.threadId,
@@ -7172,8 +7245,8 @@ var ds = class {
 					conversationId: e.params.threadId,
 					turnId: e.params.turnId,
 					payload: { usage: {
-						last: Ua(e.params.tokenUsage.last),
-						total: Ua(e.params.tokenUsage.total),
+						last: Wa(e.params.tokenUsage.last),
+						total: Wa(e.params.tokenUsage.total),
 						execution: null,
 						model: null,
 						observedStart: !1
@@ -7200,13 +7273,13 @@ var ds = class {
 					turnStartPending: !1,
 					error: null,
 					turnGitDiff: null,
-					turns: $(t.turns, Q(e.params.turn)),
-					messages: M(t.messages, e.params.threadId, e.params.turn.id, { createdAt: go(e.params.turn.startedAt) })
+					turns: Q(t.turns, Z(e.params.turn)),
+					messages: A(t.messages, e.params.threadId, e.params.turn.id, { createdAt: _o(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: go(e.params.turn.startedAt) }
+					payload: { startedAt: _o(e.params.turn.startedAt) }
 				}), this.host.emitConversationActivity(e.params.threadId, "notification");
 				return;
 			}
@@ -7258,7 +7331,7 @@ var ds = class {
 			}
 			case "thread/compacted": {
 				let t = this.host.requireRuntime(e.params.threadId);
-				this.host.patchRuntime(e.params.threadId, { messages: bn(t.messages, e.params.threadId, e.params.turnId, "complete") });
+				this.host.patchRuntime(e.params.threadId, { messages: Sn(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",
@@ -7278,7 +7351,7 @@ var ds = 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: $(t.turns, {
+					turns: Q(t.turns, {
 						...t.turns.find((t) => t.id === e.params.turnId) ?? {
 							id: e.params.turnId,
 							status: "inProgress",
@@ -7287,7 +7360,7 @@ var ds = class {
 							durationMs: null
 						},
 						status: e.params.willRetry ? "inProgress" : "failed",
-						error: vo(e.params.error),
+						error: yo(e.params.error),
 						willRetry: e.params.willRetry
 					}),
 					...n ? {
@@ -7299,7 +7372,7 @@ var ds = class {
 					conversationId: e.params.threadId,
 					turnId: e.params.turnId,
 					payload: {
-						error: vo(e.params.error),
+						error: yo(e.params.error),
 						willRetry: e.params.willRetry
 					}
 				}), this.host.emitConversationActivity(e.params.threadId, "notification");
@@ -7307,14 +7380,14 @@ var ds = class {
 			}
 			case "account/rateLimits/updated": {
 				let t = this.host.getState();
-				this.host.patch({ rateLimits: Za(t.rateLimits, e.params.rateLimits) }), this.host.emitEvent("notification", {
+				this.host.patch({ rateLimits: Qa(t.rateLimits, e.params.rateLimits) }), this.host.emitEvent("notification", {
 					type: "rateLimits.changed",
 					payload: { rateLimits: structuredClone(this.host.getState().rateLimits) }
 				});
 				return;
 			}
 			case "account/updated":
-				this.authentication.refresh("notification").catch((e) => this.host.patch({ error: j(e) }));
+				this.authentication.refresh("notification").catch((e) => this.host.patch({ error: k(e) }));
 				return;
 			case "account/login/completed":
 				this.authentication.handleLoginCompleted(e.params);
@@ -7378,7 +7451,7 @@ var ds = class {
 				this.host.emitEvent("notification", {
 					type: "realtime.audioDelta",
 					conversationId: e.params.threadId,
-					payload: { audio: oa(e.params.audio) }
+					payload: { audio: sa(e.params.audio) }
 				});
 				return;
 			case "thread/realtime/sdp":
@@ -7469,14 +7542,14 @@ var ds = class {
 	create(e, t = {}) {
 		let n = this.runtimes.get(e);
 		if (n) return Object.assign(n, t), n;
-		let r = fa(e, this.host.getState(), t);
+		let r = pa(e, this.host.getState(), t);
 		return this.runtimes.set(e, r), r;
 	}
 	require(e) {
 		return this.runtimes.get(e) ?? this.create(e);
 	}
 	projection(e) {
-		return pa(e, this.approvals.approvalsForThread(e.threadId), this.clientRequests.requestsForThread(e.threadId));
+		return ma(e, this.approvals.approvalsForThread(e.threadId), this.clientRequests.requestsForThread(e.threadId));
 	}
 	snapshot(e) {
 		return {
@@ -7625,7 +7698,7 @@ var ds = class {
 	}
 	markTurnActive(e, t) {
 		let n = e.turnIds.includes(t) ? [] : this.projection(e).clientRequests.filter((e) => e.kind === "ask_user" && e.payload.request.delivery === "async" && e.turnId && e.turnId !== t);
-		if (e.activeTurnId = t, e.busy = !0, e.turnStartPending = !1, e.turnIds.includes(t) || e.turnIds.push(t), e.turns = $(e.turns, {
+		if (e.activeTurnId = t, e.busy = !0, e.turnStartPending = !1, e.turnIds.includes(t) || e.turnIds.push(t), e.turns = Q(e.turns, {
 			id: t,
 			status: "inProgress",
 			error: null,
@@ -7749,7 +7822,7 @@ var ys = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			} catch (e) {
 				throw this.host.patch({
 					status: "error",
-					error: j(e)
+					error: k(e)
 				}), this.host.emitSurfaceStatus("lifecycle"), e;
 			} finally {
 				this.connectPromise = null;
@@ -7782,13 +7855,12 @@ var ys = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 		}
 	}
 	bootstrapSurfaceData(e = !1) {
-		let t = ga(this.host.getState().authentication);
+		let t = _a(this.host.getState().authentication);
 		if (!e && this.bootstrappedAuthenticationKey === t) return Promise.resolve();
 		if (this.surfaceBootstrapPromise) return this.surfaceBootstrapPromise.then(() => this.bootstrapSurfaceData(e));
 		let n = (async () => {
 			await Promise.all([
 				this.catalog.loadModels(),
-				this.catalog.loadSkills(e),
 				this.catalog.loadPermissionProfiles(),
 				this.catalog.loadRateLimits(),
 				this.conversations.load()
@@ -7912,8 +7984,8 @@ var ys = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 	async fork(e, t = {}, n = {}, r = {}) {
 		let i = this.host.requireRuntime(e);
 		if ((i.busy || i.activeTurnId) && !r.beforeTurnId && (!r.lastTurnId || r.lastTurnId === i.activeTurnId)) throw Error("Cannot fork a conversation while its current turn is still active");
-		let a = t.cwd ?? i.cwd ?? n.cwd, o = await this.catalog.loadConversationCatalogs(a ?? void 0), s = this.host.getState(), c = t.model ? ba(s.models, t.model) : q(s.models, i.selectedModelId);
-		xa(c, t.reasoningEffort), wa(c, t.serviceTier);
+		let a = t.cwd ?? i.cwd ?? n.cwd, o = await this.catalog.loadConversationCatalogs(a ?? void 0), s = this.host.getState(), c = t.model ? xa(s.models, t.model) : K(s.models, i.selectedModelId);
+		Sa(c, t.reasoningEffort), Ta(c, t.serviceTier);
 		let l = n.mcpServers === void 0 ? this.extensions.defaultMcpServers : qo(n.mcpServers), u = await this.extensions.conversationExtension({
 			operation: "start",
 			conversationId: null,
@@ -7938,7 +8010,7 @@ var ys = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 		t.reasoningEffort && await this.client.request("thread/settings/update", {
 			threadId: d.thread.id,
 			effort: t.reasoningEffort,
-			...c ? { collaborationMode: Na(i.planMode, c.model, t.reasoningEffort) } : {}
+			...c ? { collaborationMode: Pa(i.planMode, c.model, t.reasoningEffort) } : {}
 		});
 		let f = n.historyItemsView ?? i.historyItemsView ?? "full", [p, m] = await Promise.all([this.client.request("thread/turns/list", {
 			threadId: d.thread.id,
@@ -7950,10 +8022,10 @@ var ys = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			...e,
 			items: await os(this.client, d.thread.id, e.id),
 			itemsView: "full"
-		} : e)), g = f === "full" ? await this.originalImages?.prepare(d.thread.id, d.thread.path) : void 0, _ = ln(h), v = On({
+		} : e)), g = f === "full" ? await this.originalImages?.prepare(d.thread.id, d.thread.path) : void 0, _ = dn(h), v = An({
 			...d.thread,
 			turns: h
-		}), y = _ ? M(v, d.thread.id, _) : v;
+		}), y = _ ? A(v, d.thread.id, _) : v;
 		g && (y = g(y));
 		let b = n.loadingStrategy ?? this.loadingStrategy ?? "lazy", x = this.host.createRuntime(d.thread.id, {
 			hydrated: !0,
@@ -7966,14 +8038,14 @@ var ys = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			fullHistoryHydrated: p.nextCursor === null,
 			cwd: d.cwd ?? d.thread.cwd ?? a ?? null,
 			activeTurnId: _,
-			turns: h.map((e) => Q(e)),
+			turns: h.map((e) => Z(e)),
 			turnIds: h.map((e) => e.id),
 			messages: y,
 			busy: !!_,
 			goal: m ? { ...m } : null,
-			threadStatus: Ga(d.thread.status),
+			threadStatus: Ka(d.thread.status),
 			...o,
-			...Aa(d, s.models, this.host.snapshotForRuntime(i))
+			...ja(d, s.models, this.host.snapshotForRuntime(i))
 		});
 		t.reasoningEffort && (x.selectedReasoningEffort = t.reasoningEffort), t.serviceTier !== void 0 && (x.selectedServiceTier = t.serviceTier), t.model && c && (x.selectedModelId = c.id), this.host.rememberHostOptions(d.thread.id, {
 			...n,
@@ -7982,11 +8054,11 @@ var ys = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			historyItemsView: f,
 			mcpServers: l
 		});
-		let ee = {
-			...J(d.thread),
+		let S = {
+			...q(d.thread),
 			turnCount: h.length
 		};
-		return this.host.patch({ conversations: Y(this.host.getState().conversations, ee) }), this.host.emitSummaryUpserted(ee), this.host.emitHistoryReplaced(d.thread.id), this.host.emitConversationActivity(d.thread.id), this.host.emitConversationSettings(d.thread.id), this.host.emitConversationSkills(d.thread.id), this.host.emitConversationPermissions(d.thread.id), f === "summary" && this.host.hydrateOriginalImages?.(d.thread.id, d.thread.path), b === "eager" && p.nextCursor !== null && this.host.hydrateCompleteHistory(d.thread.id).catch(() => void 0), d.thread.id;
+		return this.host.patch({ conversations: J(this.host.getState().conversations, S) }), this.host.emitSummaryUpserted(S), this.host.emitHistoryReplaced(d.thread.id), this.host.emitConversationActivity(d.thread.id), this.host.emitConversationSettings(d.thread.id), this.host.emitConversationSkills(d.thread.id), this.host.emitConversationPermissions(d.thread.id), f === "summary" && this.host.hydrateOriginalImages?.(d.thread.id, d.thread.path), b === "eager" && p.nextCursor !== null && this.host.hydrateCompleteHistory(d.thread.id).catch(() => void 0), d.thread.id;
 	}
 	async forkTurn(e, t, n = {}, r = {}) {
 		if (!this.host.requireRuntime(e).turnIds.includes(t)) throw Error(`Cannot fork at unknown Codex turn '${t}'`);
@@ -7996,7 +8068,7 @@ var ys = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 function Cs(e, t) {
 	if (e.approvalPreset) {
 		if (!t.includes(e.approvalPreset)) throw Error(`Approval preset '${e.approvalPreset}' is not available`);
-		return Da(e.approvalPreset);
+		return Oa(e.approvalPreset);
 	}
 	return {
 		...e.approvalMode === void 0 ? {} : { approvalPolicy: e.approvalMode === "ask" ? "on-request" : "never" },
@@ -8025,7 +8097,7 @@ var ws = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, Ts = /* @
 			let i = e[2], a = Ds(i, t);
 			if (!a) return null;
 			try {
-				let t = Wn((await this.client.request("fs/readFile", { path: a })).dataBase64);
+				let t = Gn((await this.client.request("fs/readFile", { path: a })).dataBase64);
 				if (!t) return null;
 				let n = e[0].indexOf("](") + 2;
 				return {
@@ -8058,7 +8130,7 @@ function Ds(e, t) {
 	if (v(r)) return r;
 	if (!t || !v(t)) return null;
 	let i = x(t, r), a = b(t, i);
-	return a === ".." || a.startsWith(`..${ee}`) || v(a) ? null : i;
+	return a === ".." || a.startsWith(`..${S}`) || v(a) ? null : i;
 }
 function Os(e, t) {
 	let n = e;
@@ -8091,7 +8163,7 @@ function As(e, t) {
 }
 var js = /<context>[\s\S]*?<\/context>\s*/g, Ms = /<in-app-browser-context(?:\s[^>]*)?>[\s\S]*?<\/in-app-browser-context>\s*/g, Ns = /^[ \t]*## My request for Codex:[ \t]*$/m;
 async function Ps(e, t) {
-	let n = A(t);
+	let n = O(t);
 	return {
 		conversationId: n,
 		prompts: Fs((await e.request("thread/turns/list", {
@@ -8137,10 +8209,10 @@ var Ls = 12e4, Rs = class {
 		if (!n) throw Error("Generation prompt cannot be empty");
 		if (t.signal?.aborted) throw Us();
 		if (t.attachments?.some((e) => e.type !== "image")) throw Error("Utility generation accepts image attachments only");
-		let r = La(t.attachments ?? []), i = qo(t.mcpServers ?? []);
+		let r = Ra(t.attachments ?? []), i = qo(t.mcpServers ?? []);
 		await this.host.ensureConnected();
-		let a = this.host.getSnapshot(), o = q(a.models, a.selectedModelId), s = t.model ? ba(a.models, t.model) : o, c = s?.model, l = t.reasoningEffort ?? (s?.id === o?.id ? a.selectedReasoningEffort : s ? Sa(s) : null) ?? void 0, u = t.serviceTier === void 0 ? s?.id === o?.id ? a.selectedServiceTier : s?.defaultServiceTier ?? null : t.serviceTier;
-		xa(s, l), wa(s, u);
+		let a = this.host.getSnapshot(), o = K(a.models, a.selectedModelId), s = t.model ? xa(a.models, t.model) : o, c = s?.model, l = t.reasoningEffort ?? (s?.id === o?.id ? a.selectedReasoningEffort : s ? Ca(s) : null) ?? void 0, u = t.serviceTier === void 0 ? s?.id === o?.id ? a.selectedServiceTier : s?.defaultServiceTier ?? null : t.serviceTier;
+		Sa(s, l), Ta(s, u);
 		let d = await this.client.request("thread/start", {
 			approvalPolicy: "never",
 			approvalsReviewer: "user",
@@ -8173,7 +8245,7 @@ var Ls = 12e4, Rs = class {
 					type: "text",
 					text: n,
 					text_elements: []
-				}, ...r.map(Ra)],
+				}, ...r.map(za)],
 				...t.tools === "read-only" ? {} : { environments: [] },
 				permissions: ":read-only",
 				...c ? { model: c } : {},
@@ -8306,21 +8378,21 @@ var Ws = class {
 	unsubscribeToolInputRequests;
 	unsubscribeMcpElicitationRequests;
 	eventSequence = 0;
-	usage = new Yi();
+	usage = new Xi();
 	accountGeneration = 0;
 	pendingMarkdownImageHydrations = /* @__PURE__ */ new Set();
 	closed = !1;
-	state = da(ma());
+	state = fa(ha());
 	constructor(e = {}) {
 		this.options = e, this.extensions = new es(e.extensions ?? [], e.mcpServers ?? [], (e) => this.lifecycle.hostOptions(e));
-		let n = eo(e);
-		this.client = e.client ?? new t($a(n) ? new et(n) : new Ye(n), e.onListenerError ? { onListenerError: e.onListenerError } : {}), this.originalImages = e.originalHistoryImages ? new Bi(this.client) : void 0, this.originalUsage = e.originalHistoryUsage ? new ta(this.client) : void 0, this.markdownImages = new Es(this.client), this.authentication = new no(this.client, {
+		let n = to(e);
+		this.client = e.client ?? new t(eo(n) ? new et(n) : new Ye(n), e.onListenerError ? { onListenerError: e.onListenerError } : {}), this.originalImages = e.originalHistoryImages ? new Vi(this.client) : void 0, this.originalUsage = e.originalHistoryUsage ? new na(this.client) : void 0, this.markdownImages = new Es(this.client), this.authentication = new ro(this.client, {
 			bootstrapSurfaceData: (e) => this.connection.bootstrapSurfaceData(e),
 			clearAuthenticatedSurfaceData: () => this.connection.clearAuthenticatedSurfaceData(),
 			getSnapshot: () => this.getSnapshot(),
 			patchAuthentication: (e, t) => this.connection.patchAuthentication(e, t),
-			reportError: (e) => this.patch({ error: j(e) })
-		}), this.items = new Co({
+			reportError: (e) => this.patch({ error: k(e) })
+		}), this.items = new wo({
 			assistantMessageForTurn: (e, t) => this.assistantMessageForTurn(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
 			emitEvent: (e, t) => this.emitEvent(e, t),
@@ -8344,7 +8416,7 @@ var Ws = class {
 			patch: (e) => this.patch(e),
 			patchConversationStatus: (e, t) => this.patchConversationStatus(e, t),
 			patchRuntime: (e, t) => this.patchRuntime(e, t)
-		}), this.clientRequests = new Eo({
+		}), this.clientRequests = new Do({
 			activeConversationId: () => this.state.activeConversationId,
 			answerAsyncQuestion: (e, t, n) => this.messagesController.answerAsyncQuestion(e, t, n),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -8397,6 +8469,10 @@ var Ws = class {
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			sendMessageToThread: (e, t, n) => this.messagesController.sendToThread(e, t, n)
 		}), this.messagesController = new ds(this.client, {
+			loadSkillsForThread: async (e) => {
+				let t = this.requireRuntime(e);
+				await this.catalog.listSkills({ ...t.cwd ? { cwd: t.cwd } : {} });
+			},
 			clearGoalForThread: (e) => this.conversationSettings.clearGoalForThread(e),
 			compactForThread: (e) => this.turnActions.compactForThread(e),
 			createConversation: async () => {
@@ -8551,7 +8627,7 @@ var Ws = class {
 	}
 	async readRateLimits(e) {
 		return this.requestForAccount(() => this.client.request("account/rateLimits/read", e), (e) => {
-			let t = qa(e);
+			let t = Ja(e);
 			return this.patch({ rateLimits: t }), this.emitEvent("action", {
 				type: "rateLimits.changed",
 				payload: { rateLimits: structuredClone(t) }
@@ -8559,7 +8635,7 @@ var Ws = class {
 		});
 	}
 	async readAccountUsage() {
-		return this.requestForAccount(() => this.client.request("account/usage/read", {}), Ya);
+		return this.requestForAccount(() => this.client.request("account/usage/read", {}), Xa);
 	}
 	async consumeRateLimitResetCredit(e) {
 		if (!e || typeof e.idempotencyKey != "string" || !e.idempotencyKey.trim() || e.creditId !== void 0 && (typeof e.creditId != "string" || !e.creditId.trim())) throw TypeError("Reset-credit options require non-empty identifiers");
@@ -8641,7 +8717,7 @@ var Ws = class {
 		return this.lifecycle.create(e, t);
 	}
 	async forkConversation(e, t = {}, n = {}) {
-		let r = A(e);
+		let r = O(e);
 		await this.ensureThreadReady(r);
 		let i = this.lifecycle.hostOptions(r) ?? {}, a = await this.forks.fork(r, t, {
 			...i,
@@ -8650,7 +8726,7 @@ var Ws = class {
 		return this.conversationForkResult(a);
 	}
 	async forkConversationAtTurn(e, t, n = {}, r = {}) {
-		let i = A(e);
+		let i = O(e);
 		await this.ensureThreadReady(i);
 		let a = this.lifecycle.hostOptions(i) ?? {}, o = await this.forks.forkTurn(i, t, n, {
 			...a,
@@ -8662,7 +8738,7 @@ var Ws = class {
 		return this.lifecycle.select(e);
 	}
 	forgetConversation(e) {
-		let t = A(e), n = this.state.activeConversationId === t;
+		let t = O(e), n = this.state.activeConversationId === t;
 		this.runtimeState.forget(t), this.lifecycle.forget(t), this.originalImages?.forget(t), this.conversations.forget(t), this.items.forget(t), this.conversationHandles.delete(t), this.conversationListeners.delete(t), n && this.patch({
 			activeConversationId: null,
 			activeTurnId: null,
@@ -8696,7 +8772,7 @@ var Ws = class {
 			if (!a()) throw Error("Conversation content is no longer available.");
 			return r;
 		}
-		return new Mi(e).read({ messages: r.messages }, t, n);
+		return new Ni(e).read({ messages: r.messages }, t, n);
 	}
 	async readConversationHistory(e = this.state.activeConversationId ?? "") {
 		return this.lifecycle.readHistory(e);
@@ -8708,7 +8784,7 @@ var Ws = class {
 		return await this.ensureThreadReady(t), await this.conversations.loadTurnHistory(t, e), this.getConversationSnapshot(t);
 	}
 	async loadOlderConversationHistory(e = this.state.activeConversationId ?? "") {
-		return this.conversations.loadOlderHistory(A(e));
+		return this.conversations.loadOlderHistory(O(e));
 	}
 	async renameConversation(e) {
 		let t = this.state.activeConversationId;
@@ -8772,9 +8848,9 @@ var Ws = class {
 		return await this.approvals.resolve(void 0, e, t, n), this.getSnapshot();
 	}
 	conversation(e) {
-		let t = A(e), n = this.conversationHandles.get(t);
+		let t = O(e), n = this.conversationHandles.get(t);
 		if (n) return n;
-		let r = ro(t, {
+		let r = io(t, {
 			clearGoal: () => this.conversationSettings.clearGoalForThread(t),
 			compact: () => this.turnActions.compactForThread(t),
 			continueInterruptedTurn: () => this.messagesController.continueInterruptedTurnForThread(t),
@@ -8831,7 +8907,7 @@ var Ws = class {
 		await this.client.request("thread/realtime/stop", { threadId: e });
 	}
 	startRealtimeForThread(e, t) {
-		return la({
+		return ua({
 			client: this.client,
 			ensureThreadReady: async () => {
 				await this.ensureThreadReady(e);
@@ -9052,8 +9128,8 @@ var Ws = class {
 	}
 	async requestForAccount(e, t) {
 		await this.ensureConnected(), await this.authentication.pendingRefresh();
-		let n = this.accountGeneration, r = _a(this.state.authentication), i = await e();
-		if (this.closed || n !== this.accountGeneration || r !== _a(this.state.authentication)) throw Error("Account changed during account operation");
+		let n = this.accountGeneration, r = va(this.state.authentication), i = await e();
+		if (this.closed || n !== this.accountGeneration || r !== va(this.state.authentication)) throw Error("Account changed during account operation");
 		return t(i);
 	}
 	emitEvent(e, t, n = !1) {
@@ -9410,7 +9486,7 @@ async function nc(e, t, n = {}) {
 		_ = e;
 	}), y = setTimeout(() => x("Speech recognition took too long to start."), 12e4), b = async () => {
 		if (a) return;
-		a = !0, clearTimeout(y), n.signal?.removeEventListener("abort", S);
+		a = !0, clearTimeout(y), n.signal?.removeEventListener("abort", ee);
 		let e = c ?? {
 			text: "",
 			error: d.trim() || "Speech helper stopped without a final transcript."
@@ -9429,24 +9505,24 @@ async function nc(e, t, n = {}) {
 		a || c?.error || (c = {
 			text: "",
 			error: t
-		}, p(Error(t)), ee({
+		}, p(Error(t)), S({
 			type: "error",
 			sessionId: e.sessionId,
 			error: t
 		}), i.kill("SIGKILL"), b());
 	}
-	function ee(e) {
+	function S(e) {
 		try {
 			t(e);
 		} catch {}
 	}
-	function S() {
+	function ee() {
 		a || (c = {
 			text: "",
 			error: "Speech recording cancelled."
 		}, i.kill("SIGKILL"), b());
 	}
-	return n.signal?.addEventListener("abort", S, { once: !0 }), i.stderr.on("data", (e) => {
+	return n.signal?.addEventListener("abort", ee, { once: !0 }), i.stderr.on("data", (e) => {
 		d = (d + e.toString()).slice(-4096);
 	}), i.on("error", (e) => x(e.message)), i.stdin.on("error", (e) => x(e.message)), i.on("close", (e) => {
 		e !== 0 && !c?.error && x(d.trim() || `Speech helper exited with code ${e}.`), b();
@@ -9462,7 +9538,7 @@ async function nc(e, t, n = {}) {
 			l = l.slice(n + 1);
 			try {
 				let n = JSON.parse(t);
-				n.type === "ready" ? (clearTimeout(y), f()) : n.type === "transcript" && typeof n.finalText == "string" && typeof n.partialText == "string" ? ee({
+				n.type === "ready" ? (clearTimeout(y), f()) : n.type === "transcript" && typeof n.finalText == "string" && typeof n.partialText == "string" ? S({
 					type: "transcript",
 					sessionId: e.sessionId,
 					finalText: n.finalText,
@@ -9472,7 +9548,7 @@ async function nc(e, t, n = {}) {
 				x("Invalid speech helper output.");
 			}
 		}
-	}), n.signal?.aborted && S(), await g, {
+	}), n.signal?.aborted && ee(), await g, {
 		append: (e) => new Promise((t, n) => {
 			if (a || s) {
 				n(/* @__PURE__ */ Error("Speech session is no longer recording."));
@@ -9494,6 +9570,6 @@ async function nc(e, t, n = {}) {
 	};
 }
 //#endregion
-export { Js as CodexAppBackend, qs as CodexAppBackendTtlCache, Ye as CodexAppServerStdioTransport, et as CodexAppServerUnixSocketTransport, ta as CodexOriginalHistoryUsage, Ws as CodexSurface, Mi as ConversationContentTransport, Pn as codexItemToMediaPart, Mn as codexItemToSurfaceMessage, w as codexItemToToolPart, xe as codexRuntimePathEntries, On as codexThreadToSurfaceMessages, jn as codexTurnToSurfaceMessages, Ys as createCodexAppBackend, Gs as createCodexSurface, be as discoverCodexExecutable, kn as preserveHistoricalAttachmentPreviews, Zs as resolveAppleSpeechAnalyzerPath, Ce as resolveCodexRuntime, nc as startAppleSpeechSession, Xs as transcribeWithAppleSpeechAnalyzer, Se as withCodexRuntimePath };
+export { Js as CodexAppBackend, qs as CodexAppBackendTtlCache, Ye as CodexAppServerStdioTransport, et as CodexAppServerUnixSocketTransport, na as CodexOriginalHistoryUsage, Ws as CodexSurface, Ni as ConversationContentTransport, Fn as codexItemToMediaPart, Nn as codexItemToSurfaceMessage, w as codexItemToToolPart, xe as codexRuntimePathEntries, An as codexThreadToSurfaceMessages, P as codexTurnToSurfaceMessages, Ys as createCodexAppBackend, Gs as createCodexSurface, be as discoverCodexExecutable, jn as preserveHistoricalAttachmentPreviews, Zs as resolveAppleSpeechAnalyzerPath, Ce as resolveCodexRuntime, nc as startAppleSpeechSession, Xs as transcribeWithAppleSpeechAnalyzer, Se as withCodexRuntimePath };
 
 //# sourceMappingURL=index.js.map