@codex-app-sdk/backend 0.14.3 → 0.15.0

package/dist/index.js

@@ -2,82 +2,84 @@ import { i as e, n as t, r as n, s as r } from "./chunks/codex-DzX6RrF2.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 } from "node:os";
-import m, { basename as h, extname as g, isAbsolute as _, join as v, relative as y, resolve as b, sep as ee } from "node:path";
-import { randomBytes as x } from "node:crypto";
-import { createConnection as te } from "node:net";
-import { diffCodexSurfaceState as ne } from "@codex-app-sdk/core/surface-bridge";
-import { fileURLToPath as re, pathToFileURL as ie } from "node:url";
-import { isDeepStrictEqual as ae } from "node:util";
+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 S } from "node:path";
+import { randomBytes as C } from "node:crypto";
+import { createConnection as ee } from "node:net";
+import { diffCodexSurfaceState as te } from "@codex-app-sdk/core/surface-bridge";
+import { fileURLToPath as ne, pathToFileURL as re } from "node:url";
+import { isDeepStrictEqual as ie } from "node:util";
+import { chmod as ae, copyFile as oe, mkdtemp as se, rm as ce } from "node:fs/promises";
+import { StringDecoder as le } from "node:string_decoder";
 //#region src/node/codex-executable.ts
-var oe = 5e3, se = {
+var ue = 5e3, de = {
 	path: null,
 	nvmNodePath: null
-}, ce = /* @__PURE__ */ new Map();
-function le(e = {}) {
-	return ge("codex", ue(e), e);
+}, fe = /* @__PURE__ */ new Map();
+function pe(e = {}) {
+	return be("codex", me(e), e);
 }
-function ue(e = {}) {
-	return pe(_e(e), e);
+function me(e = {}) {
+	return _e(xe(e), e);
 }
-function de(e, t = {}) {
+function he(e, t = {}) {
 	let n = {
 		...process.env,
 		...e
 	};
-	return me(n, ue({
+	return ve(n, me({
 		...t,
 		env: n
 	}), t);
 }
-async function fe(e = {}) {
+async function ge(e = {}) {
 	let t = {
 		...process.env,
 		...e.env
 	}, n = {
 		...e.discovery,
 		env: t
-	}, r = pe(await ve(n), n);
+	}, r = _e(await Se(n), n);
 	return {
-		command: e.command?.trim() || ge("codex", r, n) || "codex",
-		env: me(t, r, n)
+		command: e.command?.trim() || be("codex", r, n) || "codex",
+		env: ve(t, r, n)
 	};
 }
-function pe(e, t) {
-	let n = Me(t), r = t.env ?? process.env;
-	return Ae([
-		...he(t),
-		...ke(r.PATH, n),
-		...ke(e.path, n),
-		...Te(t),
-		...Ee(e, t)
+function _e(e, t) {
+	let n = Ie(t), r = t.env ?? process.env;
+	return Pe([
+		...ye(t),
+		...Ne(r.PATH, n),
+		...Ne(e.path, n),
+		...ke(t),
+		...Ae(e, t)
 	]);
 }
-function me(e, t, n) {
+function ve(e, t, n) {
 	return {
 		...e,
-		PATH: t.join(Me(n))
+		PATH: t.join(Ie(n))
 	};
 }
-function he(e) {
-	return (e.platform ?? process.platform) === "darwin" ? ["/Applications/ChatGPT.app/Contents/Resources", "/Applications/Codex.app/Contents/Resources"].filter((t) => C(m.join(t, "codex"), e)) : [];
+function ye(e) {
+	return (e.platform ?? process.platform) === "darwin" ? ["/Applications/ChatGPT.app/Contents/Resources", "/Applications/Codex.app/Contents/Resources"].filter((t) => T(h.join(t, "codex"), e)) : [];
 }
-function ge(e, t, n) {
-	for (let r of t) for (let t of Oe(e, n)) {
-		let e = m.join(r, t);
-		if (C(e, n)) return e;
+function be(e, t, n) {
+	for (let r of t) for (let t of Me(e, n)) {
+		let e = h.join(r, t);
+		if (T(e, n)) return e;
 	}
 	return null;
 }
-function _e(e) {
-	if (S(e)) return se;
+function xe(e) {
+	if (w(e)) return de;
 	let t = (t) => {
 		try {
-			return (e.execFileSync ?? a)(Ce(e), t, {
+			return (e.execFileSync ?? a)(De(e), t, {
 				encoding: "utf8",
 				env: e.env ?? process.env,
 				stdio: "pipe",
-				timeout: we(e)
+				timeout: Oe(e)
 			}).toString();
 		} catch {
 			return null;
@@ -87,7 +89,7 @@ function _e(e) {
 		path: t([
 			"-l",
 			"-c",
-			Se(e)
+			Ee(e)
 		]),
 		nvmNodePath: t([
 			"-l",
@@ -96,22 +98,22 @@ function _e(e) {
 		])?.trim() || null
 	};
 }
-function ve(e) {
-	if (S(e)) return Promise.resolve(se);
-	if (e.execFile || e.execFileSync) return ye(e);
+function Se(e) {
+	if (w(e)) return Promise.resolve(de);
+	if (e.execFile || e.execFileSync) return Ce(e);
 	let t = e.env ?? process.env, n = [
-		Ce(e),
+		De(e),
 		t.PATH ?? "",
-		je(e)
-	].join("\0"), r = ce.get(n);
-	return r || (r = ye(e), ce.set(n, r)), r;
+		Fe(e)
+	].join("\0"), r = fe.get(n);
+	return r || (r = Ce(e), fe.set(n, r)), r;
 }
-async function ye(e) {
-	if (!e.execFile && e.execFileSync) return _e(e);
-	let t = be(e), [n, r] = await Promise.all([t([
+async function Ce(e) {
+	if (!e.execFile && e.execFileSync) return xe(e);
+	let t = we(e), [n, r] = await Promise.all([t([
 		"-l",
 		"-c",
-		Se(e)
+		Ee(e)
 	]), t([
 		"-l",
 		"-c",
@@ -122,17 +124,17 @@ async function ye(e) {
 		nvmNodePath: r?.trim() || null
 	};
 }
-function be(e) {
-	let t = Ce(e), n = e.env ?? process.env, r = we(e);
+function we(e) {
+	let t = De(e), n = e.env ?? process.env, r = Oe(e);
 	if (e.execFile) {
 		let i = e.execFile;
-		return (e) => xe(i(t, e, {
+		return (e) => Te(i(t, e, {
 			encoding: "utf8",
 			env: n,
 			timeout: r
 		}), r);
 	}
-	return (e) => xe(new Promise((a, o) => {
+	return (e) => Te(new Promise((a, o) => {
 		i(t, e, {
 			encoding: "utf8",
 			env: n,
@@ -143,7 +145,7 @@ function be(e) {
 		});
 	}), r);
 }
-function xe(e, t) {
+function Te(e, t) {
 	return new Promise((n) => {
 		let r = setTimeout(() => n(null), t + 100);
 		r.unref?.(), e.then((e) => {
@@ -153,65 +155,65 @@ function xe(e, t) {
 		});
 	});
 }
-function Se(e) {
-	let t = Ce(e);
+function Ee(e) {
+	let t = De(e);
 	return t.endsWith("/nu") || t === "nu" ? "print $env.PATH" : "printf \"%s\" \"$PATH\"";
 }
-function Ce(e) {
+function De(e) {
 	return e.shell ?? e.env?.SHELL ?? process.env.SHELL ?? "/bin/bash";
 }
-function we(e) {
-	return e.shellTimeoutMs ?? oe;
+function Oe(e) {
+	return e.shellTimeoutMs ?? ue;
 }
-function Te(e) {
-	if (S(e)) return [];
-	let t = je(e);
+function ke(e) {
+	if (w(e)) return [];
+	let t = Fe(e);
 	return [
-		m.join(t, ".local/bin"),
-		m.join(t, "bin"),
+		h.join(t, ".local/bin"),
+		h.join(t, "bin"),
 		"/opt/homebrew/bin",
 		"/usr/local/bin"
-	].filter((t) => C(t, e));
+	].filter((t) => T(t, e));
 }
-function Ee(e, t) {
-	return S(t) ? [] : Ae([e.nvmNodePath && C(e.nvmNodePath, t) ? m.dirname(e.nvmNodePath) : null, De(t)]);
+function Ae(e, t) {
+	return w(t) ? [] : Pe([e.nvmNodePath && T(e.nvmNodePath, t) ? h.dirname(e.nvmNodePath) : null, je(t)]);
 }
-function De(e) {
-	let t = je(e), n = m.join(t, ".nvm/alias/default"), r = m.join(t, ".nvm/versions/node");
-	if (!C(n, e) || !C(r, e)) return null;
+function je(e) {
+	let t = Fe(e), n = h.join(t, ".nvm/alias/default"), r = h.join(t, ".nvm/versions/node");
+	if (!T(n, e) || !T(r, e)) return null;
 	try {
 		let t = (e.readFileSync ?? u)(n, "utf8").trim();
 		if (!t) return null;
 		t.startsWith("v") || (t = `v${t}`);
 		let i = (e.readdirSync ?? d)(r).filter((e) => e.startsWith(t)).sort().at(-1);
-		return i ? m.join(r, i, "bin") : null;
+		return i ? h.join(r, i, "bin") : null;
 	} catch {}
 	return null;
 }
-function Oe(e, t) {
-	return !S(t) || m.extname(e) ? [e] : [e, ...(t.env?.PATHEXT ?? process.env.PATHEXT ?? ".EXE;.CMD;.BAT;.COM").split(";").filter(Boolean).map((t) => `${e}${t.toLowerCase()}`)];
+function Me(e, t) {
+	return !w(t) || h.extname(e) ? [e] : [e, ...(t.env?.PATHEXT ?? process.env.PATHEXT ?? ".EXE;.CMD;.BAT;.COM").split(";").filter(Boolean).map((t) => `${e}${t.toLowerCase()}`)];
 }
-function S(e) {
+function w(e) {
 	return (e.platform ?? process.platform) === "win32";
 }
-function ke(e, t) {
+function Ne(e, t) {
 	return e ? e.split(t).map((e) => e.trim()) : [];
 }
-function Ae(e) {
+function Pe(e) {
 	return [...new Set(e.filter((e) => !!e))];
 }
-function C(e, t) {
+function T(e, t) {
 	return (t.existsSync ?? c)(e);
 }
-function je(e) {
+function Fe(e) {
 	return e.homedir?.() ?? e.env?.HOME ?? process.env.HOME ?? p();
 }
-function Me(e) {
-	return e.pathDelimiter ?? m.delimiter;
+function Ie(e) {
+	return e.pathDelimiter ?? h.delimiter;
 }
 //#endregion
 //#region src/node/codex-stdio-transport.ts
-var Ne = 64 * 1024, Pe = ["features.default_mode_request_user_input=true"], Fe = Math.min(256 * 1024 * 1024, Math.floor(s.MAX_STRING_LENGTH / 2)), Ie = 12e3, Le = class {
+var Le = 64 * 1024, Re = ["features.default_mode_request_user_input=true"], ze = Math.min(256 * 1024 * 1024, Math.floor(s.MAX_STRING_LENGTH / 2)), Be = 12e3, Ve = class {
 	options;
 	child = null;
 	expectedExits = /* @__PURE__ */ new WeakSet();
@@ -228,14 +230,14 @@ var Ne = 64 * 1024, Pe = ["features.default_mode_request_user_input=true"], Fe =
 		}), this.starting);
 	}
 	async spawnAppServer() {
-		let t = this.generation, { command: n, env: r } = await fe({
+		let t = this.generation, { command: n, env: r } = await ge({
 			command: this.options.command,
 			env: this.options.env,
 			discovery: this.options.executableDiscovery
 		});
 		if (t !== this.generation) throw Error("Codex app-server transport was closed while starting");
 		let i = [
-			...[...Pe, ...this.options.configOverrides ?? []].flatMap((e) => ["-c", e]),
+			...[...Re, ...this.options.configOverrides ?? []].flatMap((e) => ["-c", e]),
 			"app-server",
 			"--listen",
 			"stdio://"
@@ -248,7 +250,7 @@ var Ne = 64 * 1024, Pe = ["features.default_mode_request_user_input=true"], Fe =
 			stdio: "pipe"
 		}, c = (this.options.spawnProcess ?? o)(n, i, s);
 		this.child = c;
-		let l = "", u = !1, d = "", f = Math.max(1, this.options.maxDiagnosticBufferChars ?? Ne), p = Math.max(1, this.options.maxOutputLineChars ?? Fe);
+		let l = "", u = !1, d = "", f = Math.max(1, this.options.maxDiagnosticBufferChars ?? Le), p = Math.max(1, this.options.maxOutputLineChars ?? ze);
 		c.stdout.setEncoding("utf8"), c.stderr.setEncoding("utf8"), c.stdout.on("data", (t) => {
 			let n = t.toString();
 			if (u) {
@@ -260,15 +262,15 @@ var Ne = 64 * 1024, Pe = ["features.default_mode_request_user_input=true"], Fe =
 			let r = l.indexOf("\n");
 			for (; r >= 0;) {
 				let t = l.slice(0, r).trim();
-				l = l.slice(r + 1), r = l.indexOf("\n"), t && (t.length > p ? this.emitError(new e("Codex app-server output line exceeded the configured limit", { requestId: ze(t) })) : this.parseLine(t));
+				l = l.slice(r + 1), r = l.indexOf("\n"), t && (t.length > p ? this.emitError(new e("Codex app-server output line exceeded the configured limit", { requestId: Ue(t) })) : this.parseLine(t));
 			}
 			if (l.length > p) {
-				let t = ze(l);
+				let t = Ue(l);
 				l = "", u = !0, this.emitError(new e("Codex app-server output line exceeded the configured limit", { requestId: t }));
 			}
 		}), c.stderr.on("data", (e) => {
 			let t = e.toString();
-			d = Re(d, t, f), this.options.onStderr?.(t);
+			d = He(d, t, f), this.options.onStderr?.(t);
 		}), c.stdin.on("error", (e) => {
 			this.child !== c || this.expectedExits.has(c) || (this.child = null, this.expectedExits.add(c), c.kill(), this.emitError(e));
 		}), c.once("error", (e) => {
@@ -295,11 +297,11 @@ var Ne = 64 * 1024, Pe = ["features.default_mode_request_user_input=true"], Fe =
 		let e = this.child;
 		if (this.child = null, !e) return;
 		this.expectedExits.add(e);
-		let t = this.options.shutdownTimeoutMs ?? Ie, n = Be(e, t);
+		let t = this.options.shutdownTimeoutMs ?? Be, n = We(e, t);
 		if (e.stdin.end(), await n) return;
-		let r = Math.min(t, 1e3), i = Be(e, r);
+		let r = Math.min(t, 1e3), i = We(e, r);
 		if (e.kill(), await i) return;
-		let a = Be(e, r);
+		let a = We(e, r);
 		if (e.kill("SIGKILL"), !await a) throw Error("Codex app-server did not exit after SIGKILL");
 	}
 	onMessage(e) {
@@ -322,10 +324,10 @@ var Ne = 64 * 1024, Pe = ["features.default_mode_request_user_input=true"], Fe =
 		for (let t of this.errorListeners) t(e);
 	}
 };
-function Re(e, t, n) {
+function He(e, t, n) {
 	return (e + t).slice(-n);
 }
-function ze(e) {
+function Ue(e) {
 	let t = /^\s*\{\s*"id"\s*:\s*(?:(-?\d+)|("(?:\\.|[^"\\])*"))/.exec(e);
 	if (t) {
 		if (t[1] !== void 0) {
@@ -337,7 +339,7 @@ function ze(e) {
 		} catch {}
 	}
 }
-function Be(e, t) {
+function We(e, t) {
 	return e.exitCode !== null || e.signalCode !== null ? Promise.resolve(!0) : new Promise((n) => {
 		let r = () => {
 			clearTimeout(i), n(!0);
@@ -349,7 +351,7 @@ function Be(e, t) {
 }
 //#endregion
 //#region src/node/codex-unix-socket-transport.ts
-var Ve = 64 * 1024 * 1024, He = class {
+var Ge = 64 * 1024 * 1024, Ke = class {
 	options;
 	socket = null;
 	messageListeners = /* @__PURE__ */ new Set();
@@ -366,12 +368,12 @@ var Ve = 64 * 1024 * 1024, He = class {
 	async start() {
 		if (this.started) return;
 		this.closed = !1;
-		let e = te(this.socketPath());
+		let e = ee(this.socketPath());
 		this.socket = e, await new Promise((t, n) => {
 			let r = (t) => {
 				o(), this.socket = null, e.destroy(), n(t);
 			}, i = () => {
-				e.write(Ue());
+				e.write(qe());
 			}, a = (n) => {
 				this.handshakeBuffer = Buffer.concat([this.handshakeBuffer, n]);
 				let i = this.handshakeBuffer.indexOf("\r\n\r\n");
@@ -408,13 +410,13 @@ var Ve = 64 * 1024 * 1024, He = class {
 		return this.errorListeners.add(e), () => this.errorListeners.delete(e);
 	}
 	socketPath() {
-		return this.options.socketPath?.trim() || v(this.options.codexHome?.trim() || process.env.CODEX_HOME?.trim() || v(p(), ".codex"), "app-server-control", "app-server-control.sock");
+		return this.options.socketPath?.trim() || y(this.options.codexHome?.trim() || process.env.CODEX_HOME?.trim() || y(p(), ".codex"), "app-server-control", "app-server-control.sock");
 	}
 	handleFrameData(e) {
 		this.frameBuffer = Buffer.concat([this.frameBuffer, e]);
 		try {
 			for (;;) {
-				let e = Ke(this.frameBuffer, this.options.maxFrameBytes ?? Ve);
+				let e = Xe(this.frameBuffer, this.options.maxFrameBytes ?? Ge);
 				if (!e) return;
 				this.frameBuffer = this.frameBuffer.subarray(e.bytesRead), this.handleFrame(e.fin, e.opcode, e.payload);
 			}
@@ -453,7 +455,7 @@ var Ve = 64 * 1024 * 1024, He = class {
 		r(this.messageListeners, a);
 	}
 	writeFrame(e, t, n) {
-		n.write(We(e, t));
+		n.write(Je(e, t));
 	}
 	handleSocketError(e) {
 		this.closed || this.emitError(e);
@@ -465,20 +467,20 @@ var Ve = 64 * 1024 * 1024, He = class {
 		for (let t of this.errorListeners) t(e);
 	}
 };
-function Ue() {
+function qe() {
 	return [
 		"GET /rpc HTTP/1.1",
 		"Host: localhost",
 		"Upgrade: websocket",
 		"Connection: Upgrade",
-		`Sec-WebSocket-Key: ${x(16).toString("base64")}`,
+		`Sec-WebSocket-Key: ${C(16).toString("base64")}`,
 		"Sec-WebSocket-Version: 13",
 		"",
 		""
 	].join("\r\n");
 }
-function We(e, t) {
-	let n = x(4), r = Ge(e, t.length, !0), i = Buffer.from(t);
+function Je(e, t) {
+	let n = C(4), r = Ye(e, t.length, !0), i = Buffer.from(t);
 	for (let e = 0; e < i.length; e += 1) i[e] = (i[e] ?? 0) ^ (n[e % 4] ?? 0);
 	return Buffer.concat([
 		r,
@@ -486,7 +488,7 @@ function We(e, t) {
 		i
 	]);
 }
-function Ge(e, t, n) {
+function Ye(e, t, n) {
 	let r = n ? 128 : 0;
 	if (t < 126) return Buffer.from([128 | e, r | t]);
 	if (t <= 65535) {
@@ -496,7 +498,7 @@ function Ge(e, t, n) {
 	let i = Buffer.alloc(10);
 	return i[0] = 128 | e, i[1] = r | 127, i.writeBigUInt64BE(BigInt(t), 2), i;
 }
-function Ke(t, n) {
+function Xe(t, n) {
 	if (t.length < 2) return null;
 	let r = t[0] ?? 0, i = t[1] ?? 0, a = (r & 128) != 0, o = r & 15, s = (i & 128) != 0, c = i & 127, l = 2;
 	if (c === 126) {
@@ -524,7 +526,7 @@ function Ke(t, n) {
 }
 //#endregion
 //#region src/node/codex-surface-prompts.ts
-function qe(e) {
+function Ze(e) {
 	switch (e) {
 		case "allow": return {
 			action: "accept",
@@ -548,11 +550,11 @@ function qe(e) {
 		};
 	}
 }
-function Je(e) {
+function Qe(e) {
 	let t = /^\/plan(?:\s(.*))?$/s.exec(e.trim());
 	return t ? { prompt: (t[1]?.trim() ?? "") || null } : null;
 }
-function Ye(e) {
+function $e(e) {
 	let t = /^\/goal(?:\s(.*))?$/s.exec(e.trim());
 	if (!t) return null;
 	let n = t[1]?.trim() ?? "";
@@ -561,7 +563,7 @@ function Ye(e) {
 		objective: n
 	} : { action: "show" };
 }
-function Xe(e) {
+function et(e) {
 	let t = /^\/review(?:\s(.*))?$/s.exec(e.trim());
 	if (!t) return null;
 	let n = t[1]?.trim() ?? "";
@@ -570,13 +572,13 @@ function Xe(e) {
 		instructions: n
 	} : { type: "uncommittedChanges" };
 }
-function Ze(e) {
+function tt(e) {
 	return e.type === "commit" ? {
 		...e,
 		title: e.title ?? null
 	} : { ...e };
 }
-function Qe(e, t) {
+function nt(e, t) {
 	let n = /* @__PURE__ */ new Set(), r = /(?:^|[^\w.%+-])[$/]([A-Za-z0-9_.-]+)/g, i;
 	for (; (i = r.exec(e)) !== null;) n.add(i[1]);
 	return t.filter((e) => e.enabled && n.has(e.name) && !!e.path).map((e) => ({
@@ -584,7 +586,7 @@ function Qe(e, t) {
 		path: e.path
 	}));
 }
-function $e(e, t) {
+function rt(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`);
@@ -594,62 +596,62 @@ function $e(e, t) {
 		};
 	});
 }
-function et(...e) {
+function it(...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 tt(e, t, n, r) {
+function at(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 = w(e.metadata?.server), i = w(e.metadata?.tool);
+		let t = E(e.metadata?.server), i = E(e.metadata?.tool);
 		return t === n && i === r || e.title.endsWith(`.${r}`);
 	}) ?? (i.length === 1 ? i[0] ?? null : null);
 }
-function nt(e) {
+function ot(e) {
 	if (Array.isArray(e.tool_params_display)) {
-		let t = e.tool_params_display.map((e) => !it(e) || typeof e.name != "string" ? "" : `${w(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) => !ct(e) || typeof e.name != "string" ? "" : `${E(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 rt(e, t) {
+function st(e, t) {
 	return e === t || Array.isArray(e) && e.includes(t);
 }
-function w(e) {
+function E(e) {
 	return typeof e == "string" && e.trim() ? e.trim() : null;
 }
-function T(e) {
+function D(e) {
 	let t = e.trim();
 	if (!t) throw Error("Conversation id cannot be empty");
 	return t;
 }
-function it(e) {
+function ct(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
-function E(e) {
+function O(e) {
 	return e instanceof Error ? e.message : String(e);
 }
 //#endregion
 //#region src/node/codex-surface-realtime.ts
-function at(e, t) {
+function lt(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 ot(e, t) {
+function ut(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 st(e) {
+function dt(e) {
 	if (!(e.data instanceof Uint8Array)) throw TypeError("Realtime audio data must be a Uint8Array");
-	let t = lt(e.sampleRate, "sampleRate"), n = lt(e.numChannels, "numChannels"), r = e.samplesPerChannel === void 0 ? Math.floor(e.data.byteLength / 2 / n) : ut(e.samplesPerChannel, "samplesPerChannel"), i = e.itemId === void 0 ? null : e.itemId;
+	let t = pt(e.sampleRate, "sampleRate"), n = pt(e.numChannels, "numChannels"), r = e.samplesPerChannel === void 0 ? Math.floor(e.data.byteLength / 2 / n) : mt(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"),
@@ -659,7 +661,7 @@ function st(e) {
 		itemId: i
 	};
 }
-function ct(e) {
+function ft(e) {
 	return {
 		data: new Uint8Array(Buffer.from(e.data, "base64")),
 		sampleRate: e.sampleRate,
@@ -668,28 +670,28 @@ function ct(e) {
 		itemId: e.itemId
 	};
 }
-function lt(e, t) {
+function pt(e, t) {
 	if (!Number.isSafeInteger(e) || e <= 0) throw TypeError(`Realtime audio ${t} must be a positive integer`);
 	return e;
 }
-function ut(e, t) {
+function mt(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 dt(e) {
+async function ht(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 = at(i.model, "model"), l = at(i.voice, "voice"), u = i.transport ?? { type: "websocket" };
+	let c = lt(i.model, "model"), l = lt(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" ? ft(r) : null, f;
+	let d = u.type === "webrtc" ? gt(r) : null, f;
 	try {
 		let [, e] = await Promise.all([t.request("thread/realtime/start", {
 			threadId: a,
@@ -720,12 +722,12 @@ async function dt(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: st(e)
+				audio: dt(e)
 			});
 		},
 		appendText: async (e, n = "user") => {
 			m();
-			let r = ot(e, "text");
+			let r = ut(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,
@@ -736,7 +738,7 @@ async function dt(e) {
 		appendSpeech: async (e) => {
 			m(), await t.request("thread/realtime/appendSpeech", {
 				threadId: a,
-				text: ot(e, "speech")
+				text: ut(e, "speech")
 			});
 		},
 		stop: async () => {
@@ -747,7 +749,7 @@ async function dt(e) {
 		})
 	};
 }
-function ft(e) {
+function gt(e) {
 	let t = () => void 0, n, r = !1, i = () => {
 		r || (r = !0, clearTimeout(n), t());
 	};
@@ -764,7 +766,7 @@ function ft(e) {
 }
 //#endregion
 //#region src/node/codex-surface-runtime.ts
-function pt(e) {
+function _t(e) {
 	return {
 		status: "idle",
 		authentication: e,
@@ -807,7 +809,7 @@ function pt(e) {
 		error: null
 	};
 }
-function mt(e, t, n = {}) {
+function vt(e, t, n = {}) {
 	return {
 		threadId: e,
 		cwd: null,
@@ -846,7 +848,7 @@ function mt(e, t, n = {}) {
 		...n
 	};
 }
-function ht(e, t, n) {
+function yt(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;
@@ -888,7 +890,7 @@ function ht(e, t, n) {
 }
 //#endregion
 //#region src/node/codex-surface-authentication.ts
-function gt() {
+function bt() {
 	return {
 		status: "notLoaded",
 		account: null,
@@ -902,7 +904,7 @@ function gt() {
 		}
 	};
 }
-function _t(e) {
+function xt(e) {
 	return e.type === "chatgpt" ? {
 		type: "chatgpt",
 		email: e.email,
@@ -912,13 +914,13 @@ function _t(e) {
 		credentialSource: e.usesCodexManagedCredentials ? "codexManaged" : "awsManaged"
 	} : { type: "apiKey" };
 }
-function vt(e) {
+function St(e) {
 	return JSON.stringify({
 		account: e.account,
 		requiresOpenaiAuth: e.requiresOpenaiAuth
 	});
 }
-function yt(e) {
+function Ct(e) {
 	let t = e.account;
 	return t ? t.type === "chatgpt" ? JSON.stringify({
 		type: t.type,
@@ -931,12 +933,12 @@ function yt(e) {
 		requiresOpenaiAuth: e.requiresOpenaiAuth
 	});
 }
-function bt(e) {
+function wt(e) {
 	let t = e.trim();
 	if (!t) throw Error("Codex login id cannot be empty");
 	return t;
 }
-function xt(e) {
+function Tt(e) {
 	let t;
 	try {
 		t = new URL(e);
@@ -948,26 +950,26 @@ function xt(e) {
 }
 //#endregion
 //#region src/node/codex-surface-transport-options.ts
-function St(e) {
+function Et(e) {
 	return "type" in e && e.type === "unixSocket";
 }
-function Ct(e) {
-	let t = e.codexHome === void 0 ? void 0 : wt(e.codexHome), n = e.transport?.codexHome;
+function Dt(e) {
+	let t = e.codexHome === void 0 ? void 0 : Ot(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 wt(e) {
+function Ot(e) {
 	let t = e.trim();
 	if (!t) throw Error("Codex surface codexHome cannot be empty");
-	if (!_(t)) throw Error("Codex surface codexHome must be an absolute path");
+	if (!v(t)) throw Error("Codex surface codexHome must be an absolute path");
 	return t;
 }
 //#endregion
 //#region src/node/codex-surface-authentication-controller.ts
-var Tt = class {
+var kt = class {
 	client;
 	host;
 	accountRefreshPromise = null;
@@ -1001,7 +1003,7 @@ var Tt = 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 = bt(e.loginId), n = xt(e.authUrl);
+				let t = wt(e.loginId), n = Tt(e.authUrl);
 				return this.host.patchAuthentication({ login: {
 					status: "pending",
 					loginId: t,
@@ -1016,7 +1018,7 @@ var Tt = class {
 					status: "error",
 					loginId: null,
 					authUrl: null,
-					error: E(e)
+					error: O(e)
 				} }, "action"), e;
 			}
 		})();
@@ -1038,7 +1040,7 @@ var Tt = 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 = bt(e.loginId), n = xt(e.verificationUrl), r = e.userCode.trim();
+				let t = wt(e.loginId), n = Tt(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",
@@ -1057,7 +1059,7 @@ var Tt = class {
 					status: "error",
 					loginId: null,
 					authUrl: null,
-					error: E(e)
+					error: O(e)
 				} }, "action"), e;
 			}
 		})();
@@ -1066,7 +1068,7 @@ var Tt = class {
 		}).catch(() => void 0), t;
 	}
 	async cancelLogin(e) {
-		let t = bt(e), n = await this.client.request("account/login/cancel", { loginId: t });
+		let t = wt(e), n = await this.client.request("account/login/cancel", { loginId: t });
 		return this.host.patchAuthentication({ login: {
 			status: n.status === "canceled" ? "cancelled" : "idle",
 			loginId: null,
@@ -1108,7 +1110,7 @@ var Tt = class {
 			error: null
 		}, e);
 		try {
-			let n = await this.client.request("account/read", { refreshToken: !1 }), r = n.account ? _t(n.account) : null, i = yt({
+			let n = await this.client.request("account/read", { refreshToken: !1 }), r = n.account ? xt(n.account) : null, i = Ct({
 				...this.host.getSnapshot().authentication,
 				account: r,
 				requiresOpenaiAuth: n.requiresOpenaiAuth
@@ -1122,7 +1124,7 @@ var Tt = class {
 		} catch (t) {
 			throw this.host.patchAuthentication({
 				status: "error",
-				error: E(t)
+				error: O(t)
 			}, e), t;
 		}
 	}
@@ -1151,7 +1153,7 @@ var Tt = class {
 };
 //#endregion
 //#region src/node/codex-conversation-handle.ts
-function Et(e, t) {
+function At(e, t) {
 	let n = async (e) => (await e(), t.getSnapshot());
 	return {
 		id: e,
@@ -1192,19 +1194,19 @@ function Et(e, t) {
 }
 //#endregion
 //#region src/node/codex-file-attachment.ts
-var Dt = "<attached_file>\n", Ot = "\n</attached_file>";
-function kt(e, t) {
+var jt = "<attached_file>\n", Mt = "\n</attached_file>";
+function Nt(e, t) {
 	return {
 		type: "text",
-		text: `${Dt}${JSON.stringify({
+		text: `${jt}${JSON.stringify({
 			name: e,
 			path: t
-		}).replaceAll("<", "\\u003c")}${Ot}`,
+		}).replaceAll("<", "\\u003c")}${Mt}`,
 		text_elements: []
 	};
 }
-function At(e) {
-	if (!e.startsWith(Dt) || !e.endsWith(Ot)) return null;
+function Pt(e) {
+	if (!e.startsWith(jt) || !e.endsWith(Mt)) return null;
 	try {
 		let t = JSON.parse(e.slice(16, -17));
 		if (typeof t != "object" || !t || Array.isArray(t)) return null;
@@ -1219,36 +1221,36 @@ function At(e) {
 }
 //#endregion
 //#region src/node/tool-output.ts
-var jt = "Result returned in structuredContent.";
-function D(e) {
+var Ft = "Result returned in structuredContent.";
+function k(e) {
 	if (typeof e == "string") return e;
-	if (Array.isArray(e)) return e.map((e) => D(e)).filter(Boolean).join("\n\n") || void 0;
-	if (!Nt(e)) return JSON.stringify(e);
-	let t = "structuredContent" in e ? D(e.structuredContent) : void 0;
+	if (Array.isArray(e)) return e.map((e) => k(e)).filter(Boolean).join("\n\n") || void 0;
+	if (!Lt(e)) return JSON.stringify(e);
+	let t = "structuredContent" in e ? k(e.structuredContent) : void 0;
 	if (t) {
-		let n = Mt(e);
-		return !n || n.trim() === jt ? t : `${n}\n\n${t}`;
+		let n = It(e);
+		return !n || n.trim() === Ft ? t : `${n}\n\n${t}`;
 	}
-	return Mt(e) ?? JSON.stringify(e);
+	return It(e) ?? JSON.stringify(e);
 }
-function Mt(e) {
+function It(e) {
 	if (typeof e.text == "string") return e.text;
 	if (typeof e.content == "string") return e.content;
-	if (Array.isArray(e.content)) return D(e.content);
+	if (Array.isArray(e.content)) return k(e.content);
 }
-function Nt(e) {
+function Lt(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
 //#endregion
 //#region src/node/codex-tool-part-adapter.ts
-var Pt = "Result returned in structuredContent.", Ft = 32 * 1024;
-function It(e, t) {
+var Rt = "Result returned in structuredContent.", zt = 32 * 1024;
+function Bt(e, t) {
 	let n = e.status;
 	if (e.kind === "command") {
-		let r = M(e.input) ? e.input : {}, i = typeof r.cwd == "string" ? r.cwd : t ?? void 0;
-		return Gt(r.commandActions).flatMap((e) => {
+		let r = P(e.input) ? e.input : {}, i = typeof r.cwd == "string" ? r.cwd : t ?? void 0;
+		return Yt(r.commandActions).flatMap((e) => {
 			if (e.type !== "read") return [];
-			let t = rn(e.path ?? e.name, i);
+			let t = cn(e.path ?? e.name, i);
 			return t ? [{
 				action: "read",
 				path: t,
@@ -1257,12 +1259,12 @@ function It(e, t) {
 		});
 	}
 	if (e.kind !== "fileChange") return [];
-	let r = M(e.input) ? e.input : {}, i = e.metadata ?? {};
+	let r = P(e.input) ? e.input : {}, i = e.metadata ?? {};
 	return (Array.isArray(i.changes) ? i.changes : Array.isArray(r.changes) ? r.changes : []).flatMap((e) => {
-		if (!M(e) || typeof e.path != "string") return [];
-		let r = j(e.kind);
+		if (!P(e) || typeof e.path != "string") return [];
+		let r = N(e.kind);
 		if (r === "delete") return [];
-		let i = rn(e.path, t ?? void 0);
+		let i = cn(e.path, t ?? void 0);
 		return i ? [{
 			action: r === "add" ? "create" : "edit",
 			path: i,
@@ -1270,10 +1272,10 @@ function It(e, t) {
 		}] : [];
 	});
 }
-function O(e, t = {}) {
-	if (!M(e) || typeof e.id != "string") return null;
+function A(e, t = {}) {
+	if (!P(e) || typeof e.id != "string") return null;
 	if (e.type === "commandExecution") {
-		let n = typeof e.command == "string" ? e.command : "command", r = k(e.status), i = Ht(r, e.commandActions, n), a = t.includeCommandOutput && typeof e.aggregatedOutput == "string" ? e.aggregatedOutput : void 0;
+		let n = typeof e.command == "string" ? e.command : "command", r = j(e.status), i = Kt(r, e.commandActions, n), a = t.includeCommandOutput && typeof e.aggregatedOutput == "string" ? e.aggregatedOutput : void 0;
 		return {
 			type: "tool",
 			id: e.id,
@@ -1298,14 +1300,14 @@ function O(e, t = {}) {
 		};
 	}
 	if (e.type === "mcpToolCall") {
-		let t = typeof e.server == "string" ? e.server : "mcp", n = typeof e.tool == "string" ? e.tool : "tool", r = fn(sn(e.error)), i = N(e.arguments), a = N(e.result);
+		let t = typeof e.server == "string" ? e.server : "mcp", n = typeof e.tool == "string" ? e.tool : "tool", r = gn(dn(e.error)), i = F(e.arguments), a = F(e.result);
 		return {
 			type: "tool",
 			id: e.id,
 			kind: "mcp",
 			title: `${t}.${n}`,
-			status: k(e.status),
-			body: r ?? fn(cn(a)),
+			status: j(e.status),
+			body: r ?? gn(fn(a)),
 			...i === void 0 ? {} : { input: i },
 			...a === void 0 ? {} : { output: a },
 			metadata: {
@@ -1318,14 +1320,14 @@ function O(e, t = {}) {
 		};
 	}
 	if (e.type === "dynamicToolCall") {
-		let t = typeof e.tool == "string" ? e.tool : "tool", n = typeof e.namespace == "string" ? e.namespace : null, r = N(e.arguments), i = N(e.contentItems);
+		let t = typeof e.tool == "string" ? e.tool : "tool", n = typeof e.namespace == "string" ? e.namespace : null, r = F(e.arguments), i = F(e.contentItems);
 		return {
 			type: "tool",
 			id: e.id,
 			kind: "dynamic",
 			title: n ? `${n}.${t}` : t,
-			status: k(e.status),
-			body: fn(un(i)),
+			status: j(e.status),
+			body: gn(mn(i)),
 			...r === void 0 ? {} : { input: r },
 			...i === void 0 ? {} : { output: i },
 			metadata: {
@@ -1337,7 +1339,7 @@ function O(e, t = {}) {
 		};
 	}
 	if (e.type === "fileChange") {
-		let n = Array.isArray(e.changes) ? e.changes : [], r = k(e.status), i = Qt(r, n);
+		let n = Array.isArray(e.changes) ? e.changes : [], r = j(e.status), i = nn(r, n);
 		return {
 			type: "tool",
 			id: e.id,
@@ -1345,7 +1347,7 @@ function O(e, t = {}) {
 			title: n.length === 1 ? "1 file change" : `${n.length} file changes`,
 			status: r,
 			...i ? { statusText: i } : {},
-			body: dn(n),
+			body: hn(n),
 			input: { changes: n },
 			metadata: {
 				changes: n,
@@ -1374,19 +1376,19 @@ function O(e, t = {}) {
 		id: e.id,
 		kind: "dynamic",
 		title: "image_generation",
-		status: k(e.status),
+		status: j(e.status),
 		body: typeof e.revisedPrompt == "string" ? e.revisedPrompt : void 0,
 		input: { revisedPrompt: e.revisedPrompt },
 		output: e.savedPath,
 		metadata: { savedPath: e.savedPath }
 	} : null;
 }
-function Lt(e) {
-	if (!M(e) || e.type !== "commandExecution" || typeof e.command != "string") return !1;
+function Vt(e) {
+	if (!P(e) || e.type !== "commandExecution" || typeof e.command != "string") return !1;
 	let t = e.command;
-	return Kt(t) || qt(t) || Jt(t);
+	return Xt(t) || Zt(t) || Qt(t);
 }
-function Rt(e, t) {
+function Ht(e, t) {
 	return {
 		itemId: e,
 		bodyDelta: t,
@@ -1399,11 +1401,11 @@ function Rt(e, t) {
 		}
 	};
 }
-function zt(e, t) {
-	let n = Qt("running", t);
+function Ut(e, t) {
+	let n = nn("running", t);
 	return {
 		itemId: e,
-		body: dn(t),
+		body: hn(t),
 		...n ? { statusText: n } : {},
 		input: { changes: t },
 		metadata: { changes: t },
@@ -1414,13 +1416,13 @@ function zt(e, t) {
 			title: t.length === 1 ? "1 file change" : `${t.length} file changes`,
 			status: "running",
 			...n ? { statusText: n } : {},
-			body: dn(t),
+			body: hn(t),
 			input: { changes: t },
 			metadata: { changes: t }
 		}
 	};
 }
-function Bt(e, t) {
+function Wt(e, t) {
 	return {
 		itemId: e,
 		bodyAppend: t,
@@ -1433,12 +1435,12 @@ function Bt(e, t) {
 		}
 	};
 }
-function Vt(e, t, n, r = "completed") {
-	let i = N(t), a = fn(D(i));
+function Gt(e, t, n, r = "completed") {
+	let i = F(t), a = gn(k(i));
 	return {
 		itemId: e,
 		title: n && n.trim() ? n : void 0,
-		status: k(r),
+		status: j(r),
 		body: a,
 		...i === void 0 ? {} : { output: i },
 		fallbackToolPart: {
@@ -1446,21 +1448,21 @@ function Vt(e, t, n, r = "completed") {
 			id: e,
 			kind: "generic",
 			title: n && n.trim() ? n : "Tool output",
-			status: k(r),
+			status: j(r),
 			body: a,
 			...i === void 0 ? {} : { output: i }
 		}
 	};
 }
-function k(e) {
+function j(e) {
 	return e === "completed" || e === "succeeded" || e === "success" ? "completed" : e === "failed" || e === "error" || e === "declined" || e === "incomplete" || e === "canceled" || e === "cancelled" ? "failed" : "running";
 }
-function Ht(e, t, n) {
-	let r = Ut(e, t, n);
+function Kt(e, t, n) {
+	let r = qt(e, t, n);
 	return r ? JSON.stringify(r) : void 0;
 }
-function Ut(e, t, n) {
-	let r = Gt(t), i = new Set(r.map((e) => e.type));
+function qt(e, t, n) {
+	let r = Yt(t), i = new Set(r.map((e) => e.type));
 	if (r.length === 0) return {
 		action: "run",
 		phase: e,
@@ -1468,37 +1470,37 @@ function Ut(e, t, n) {
 		source: "codex"
 	};
 	if (i.size === 1 && i.has("read")) {
-		let t = A(r.map((e) => e.name ?? e.path));
+		let t = M(r.map((e) => e.name ?? e.path));
 		return {
 			action: "read",
 			phase: e,
 			params: {
 				names: t,
-				target: Xt(t, n)
+				target: en(t, n)
 			},
 			source: "codex"
 		};
 	}
 	if (i.size === 1 && i.has("listFiles")) {
-		let t = A(r.map((e) => e.path ?? e.command));
+		let t = M(r.map((e) => e.path ?? e.command));
 		return {
 			action: "list",
 			phase: e,
 			params: {
 				targets: t,
-				target: Yt(t, n)
+				target: $t(t, n)
 			},
 			source: "codex"
 		};
 	}
 	if (i.size === 1 && i.has("search")) {
-		let t = A(r.map((e) => e.query && e.path ? `"${e.query}" in ${e.path}` : e.query ?? e.path ?? e.command));
+		let t = M(r.map((e) => e.query && e.path ? `"${e.query}" in ${e.path}` : e.query ?? e.path ?? e.command));
 		return {
 			action: "search",
 			phase: e,
 			params: {
 				targets: t,
-				target: Yt(t, n)
+				target: $t(t, n)
 			},
 			source: "codex"
 		};
@@ -1508,16 +1510,16 @@ function Ut(e, t, n) {
 		phase: e,
 		params: {
 			actions: r.map((e) => e.type),
-			target: Yt(A(r.map(Wt)), n)
+			target: $t(M(r.map(Jt)), n)
 		},
 		source: "codex"
 	};
 }
-function Wt(e) {
+function Jt(e) {
 	return e.path ?? e.name ?? e.query ?? e.command;
 }
-function Gt(e) {
-	return Array.isArray(e) ? e.flatMap((e) => !M(e) || e.type !== "read" && e.type !== "listFiles" && e.type !== "search" ? [] : [{
+function Yt(e) {
+	return Array.isArray(e) ? e.flatMap((e) => !P(e) || e.type !== "read" && e.type !== "listFiles" && e.type !== "search" ? [] : [{
 		command: typeof e.command == "string" ? e.command : void 0,
 		name: typeof e.name == "string" ? e.name : void 0,
 		path: typeof e.path == "string" ? e.path : void 0,
@@ -1525,35 +1527,35 @@ function Gt(e) {
 		type: e.type
 	}]) : [];
 }
-function Kt(e) {
+function Xt(e) {
 	return /(?:^|[\s;"'(|&])apply_patch(?:\s|$)/u.test(e);
 }
-function qt(e) {
+function Zt(e) {
 	return /(?:^|[\s;"'(|&])(?:cat|printf|echo)\b[\s\S]*>>?\s*(?:"[^"]+"|'[^']+'|[^\s;"'&|]+)(?=$|[\s;&|])/u.test(e);
 }
-function Jt(e) {
+function Qt(e) {
 	return /(?:^|[\s;"'(|&])tee(?:\s+-a)?\s+(?!-)(?:"[^"]+"|'[^']+'|[^\s;"'&|]+)(?=$|[\s;&|])/u.test(e);
 }
-function A(e) {
+function M(e) {
 	return [...new Set(e.map((e) => e?.trim()).filter((e) => !!e))];
 }
-function Yt(e, t) {
+function $t(e, t) {
 	return e.length === 0 ? t : e.length <= 3 ? e.join(", ") : `${e.slice(0, 3).join(", ")} and ${e.length - 3} more`;
 }
-function Xt(e, t) {
-	return Zt(e, t);
+function en(e, t) {
+	return tn(e, t);
 }
-function Zt(e, t) {
-	return Yt(A(e.map(on)), t);
+function tn(e, t) {
+	return $t(M(e.map(un)), t);
 }
-function Qt(e, t) {
-	let n = $t(e, t);
+function nn(e, t) {
+	let n = rn(e, t);
 	return n ? JSON.stringify(n) : void 0;
 }
-function $t(e, t) {
+function rn(e, t) {
 	let n = t.flatMap((e) => {
-		if (!M(e)) return [];
-		let t = typeof e.path == "string" ? e.path : void 0, n = j(e.kind), r = tn(e);
+		if (!P(e)) return [];
+		let t = typeof e.path == "string" ? e.path : void 0, n = N(e.kind), r = on(e);
 		return [{
 			addedLines: r.addedLines,
 			kind: n,
@@ -1562,9 +1564,9 @@ function $t(e, t) {
 		}];
 	});
 	if (!n.length) return;
-	let r = n.reduce((e, t) => e + t.addedLines, 0), i = n.reduce((e, t) => e + t.removedLines, 0), a = A(n.map((e) => e.path)), o = Zt(a, `${n.length} files`);
+	let r = n.reduce((e, t) => e + t.addedLines, 0), i = n.reduce((e, t) => e + t.removedLines, 0), a = M(n.map((e) => e.path)), o = tn(a, `${n.length} files`);
 	return {
-		action: en(n.map((e) => e.kind)),
+		action: an(n.map((e) => e.kind)),
 		phase: e,
 		params: {
 			addedLines: r,
@@ -1575,20 +1577,20 @@ function $t(e, t) {
 		source: "codex"
 	};
 }
-function en(e) {
+function an(e) {
 	return e.every((e) => e === "add") ? "create" : e.every((e) => e === "delete") ? "delete" : "edit";
 }
-function tn(e) {
-	let t = typeof e.diff == "string" ? e.diff : void 0, n = j(e.kind);
+function on(e) {
+	let t = typeof e.diff == "string" ? e.diff : void 0, n = N(e.kind);
 	return n === "add" ? {
-		addedLines: an(t),
+		addedLines: ln(t),
 		removedLines: 0
 	} : n === "delete" ? {
 		addedLines: 0,
-		removedLines: an(t)
-	} : nn(t);
+		removedLines: ln(t)
+	} : sn(t);
 }
-function nn(e) {
+function sn(e) {
 	if (!e) return {
 		addedLines: 0,
 		removedLines: 0
@@ -1600,54 +1602,54 @@ function nn(e) {
 		removedLines: n
 	};
 }
-function j(e) {
+function N(e) {
 	if (e === "add" || e === "delete") return e;
-	if (M(e) && typeof e.type == "string") return j(e.type);
+	if (P(e) && typeof e.type == "string") return N(e.type);
 }
-function rn(e, t) {
+function cn(e, t) {
 	let n = e?.trim();
 	if (n) {
-		if (_(n)) return n;
-		if (!(!t || !_(t))) return b(t, n);
+		if (v(n)) return n;
+		if (!(!t || !v(t))) return x(t, n);
 	}
 }
-function an(e) {
+function ln(e) {
 	if (!e) return 0;
 	let t = e.split(/\r\n|\r|\n/);
 	for (; t.at(-1) === "";) t.pop();
 	return t.length;
 }
-function on(e) {
+function un(e) {
 	return e.split(/[\\/]/).filter(Boolean).at(-1) ?? e;
 }
-function sn(e) {
-	if (M(e)) return typeof e.message == "string" ? e.message : void 0;
+function dn(e) {
+	if (P(e)) return typeof e.message == "string" ? e.message : void 0;
 }
-function cn(e) {
-	if (!M(e)) return;
-	let t = ln(e.content), n = "structuredContent" in e ? D(e.structuredContent) : void 0;
-	return n ? !t || t.trim() === Pt ? n : `${t}\n\n${n}` : t;
+function fn(e) {
+	if (!P(e)) return;
+	let t = pn(e.content), n = "structuredContent" in e ? k(e.structuredContent) : void 0;
+	return n ? !t || t.trim() === Rt ? n : `${t}\n\n${n}` : t;
 }
-function ln(e) {
-	if (Array.isArray(e)) return e.map((e) => M(e) ? typeof e.text == "string" ? e.text : JSON.stringify(e) : "").filter(Boolean).join("\n\n") || void 0;
+function pn(e) {
+	if (Array.isArray(e)) return e.map((e) => P(e) ? typeof e.text == "string" ? e.text : JSON.stringify(e) : "").filter(Boolean).join("\n\n") || void 0;
 }
-function un(e) {
-	if (Array.isArray(e)) return e.map((e) => M(e) && typeof e.text == "string" ? e.text : JSON.stringify(e)).filter(Boolean).join("\n\n") || void 0;
+function mn(e) {
+	if (Array.isArray(e)) return e.map((e) => P(e) && typeof e.text == "string" ? e.text : JSON.stringify(e)).filter(Boolean).join("\n\n") || void 0;
 }
-function dn(e) {
-	return e.map((e) => M(e) ? `${j(e.kind) ?? "update"} ${typeof e.path == "string" ? e.path : "unknown"}` : JSON.stringify(e)).join("\n") || void 0;
+function hn(e) {
+	return e.map((e) => P(e) ? `${N(e.kind) ?? "update"} ${typeof e.path == "string" ? e.path : "unknown"}` : JSON.stringify(e)).join("\n") || void 0;
 }
-function M(e) {
+function P(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
-function fn(e) {
-	return e !== void 0 && Buffer.byteLength(e) <= Ft ? e : void 0;
+function gn(e) {
+	return e !== void 0 && Buffer.byteLength(e) <= zt ? e : void 0;
 }
-function N(e) {
-	if (!(e === void 0 || !pn(e, Ft))) return e;
+function F(e) {
+	if (!(e === void 0 || !_n(e, zt))) return e;
 }
-function pn(e, t) {
-	if (mn(e, t, /* @__PURE__ */ new Set())) return !1;
+function _n(e, t) {
+	if (vn(e, t, /* @__PURE__ */ new Set())) return !1;
 	try {
 		let n = JSON.stringify(e);
 		return n !== void 0 && Buffer.byteLength(n) <= t;
@@ -1655,28 +1657,28 @@ function pn(e, t) {
 		return !1;
 	}
 }
-function mn(e, t, n) {
+function vn(e, t, n) {
 	if (typeof e == "string") return Buffer.byteLength(e) > t;
 	if (typeof e != "object" || !e) return !1;
 	if (n.has(e)) return !0;
 	n.add(e);
-	let r = (Array.isArray(e) ? e : Object.values(e)).some((e) => mn(e, t, n));
+	let r = (Array.isArray(e) ? e : Object.values(e)).some((e) => vn(e, t, n));
 	return n.delete(e), r;
 }
 //#endregion
 //#region src/node/codex-surface-message-state.ts
-function hn(e) {
+function yn(e) {
 	for (let t = e.length - 1; t >= 0; --t) {
 		let n = e[t];
 		if (n?.status === "inProgress") return n.id;
 	}
 	return null;
 }
-function P(e, t, n, r = {}) {
-	let i = [...e], a = L(i, (e) => e.metadata?.turnId === n), o = a >= 0 ? i[a] : void 0;
+function I(e, t, n, r = {}) {
+	let i = [...e], a = z(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 = L(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), t = e >= 0 ? i[e] : void 0;
+		let e = z(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"
@@ -1696,9 +1698,9 @@ function P(e, t, n, r = {}) {
 		}
 	}), i;
 }
-function gn(e, t, n, r, i, a) {
+function bn(e, t, n, r, i, a) {
 	if (!i) return [...e];
-	let o = P(e, t, n), s = L(o, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), c = s >= 0 ? o[s] : void 0;
+	let o = I(e, t, n), s = z(o, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), c = s >= 0 ? o[s] : void 0;
 	if (!c) return o;
 	let l = [...c.parts], u = l.at(-1);
 	return u?.type === "text" && u.itemId === r ? l.splice(l.length - 1, 1, {
@@ -1714,9 +1716,9 @@ function gn(e, t, n, r, i, a) {
 		...c,
 		status: "streaming",
 		parts: l
-	}), I(o, t);
+	}), R(o, t);
 }
-function _n(e, t, n, r, i) {
+function xn(e, t, n, r, i) {
 	let a = i.map((e, t) => {
 		let n = e.trim();
 		return n ? {
@@ -1727,16 +1729,16 @@ function _n(e, t, n, r, i) {
 		} : null;
 	}).filter((e) => e !== null);
 	if (a.length === 0) return [...e];
-	let o = P(e, t, n), s = L(o, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), c = s >= 0 ? o[s] : void 0;
+	let o = I(e, t, n), s = z(o, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), c = s >= 0 ? o[s] : void 0;
 	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
-	}), I(o, t);
+	}), R(o, t);
 }
-function vn(e, t, n, r, i, a) {
+function Sn(e, t, n, r, i, a) {
 	let o = [...e];
 	for (let e = o.length - 1; e >= 0; --e) {
 		let s = o[e];
@@ -1752,9 +1754,9 @@ function vn(e, t, n, r, i, a) {
 		}), o.splice(e, 1, {
 			...s,
 			parts: l
-		}), I(o, t);
+		}), R(o, t);
 	}
-	let s = P(o, t, n), c = L(s, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), l = c >= 0 ? s[c] : void 0;
+	let s = I(o, t, n), c = z(s, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), l = c >= 0 ? s[c] : void 0;
 	if (!l) return s;
 	let u = {
 		type: "text",
@@ -1765,10 +1767,10 @@ function vn(e, t, n, r, i, a) {
 	return s.splice(c, 1, {
 		...l,
 		parts: [...l.parts, u]
-	}), I(s, t);
+	}), R(s, t);
 }
-function yn(e, t, n, r) {
-	return I(e.map((e) => {
+function Cn(e, t, n, r) {
+	return R(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 : {
@@ -1777,16 +1779,16 @@ function yn(e, t, n, r) {
 		};
 	}), t);
 }
-function bn(e) {
+function wn(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 F(e, t, n, r) {
+function L(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 = P(i, t, n), a = L(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
+	a < 0 && (i = I(i, t, n), a = z(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);
@@ -1798,7 +1800,7 @@ function F(e, t, n, r) {
 			body: r.body ?? e.body,
 			input: r.input ?? e.input,
 			output: r.output ?? e.output,
-			statusText: r.statusText ?? Dn(e.statusText, r.status),
+			statusText: r.statusText ?? jn(e.statusText, r.status),
 			metadata: {
 				...e.metadata ?? {},
 				...r.metadata ?? {}
@@ -1807,13 +1809,12 @@ function F(e, t, n, r) {
 	} else s.push(r);
 	return i.splice(a, 1, {
 		...o,
-		status: "streaming",
 		parts: s
-	}), I(i, t);
+	}), R(i, t);
 }
-function xn(e, t, n, r) {
+function Tn(e, t, n, r) {
 	let i = [...e], a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "media" && e.itemId === r.itemId));
-	a < 0 && r.itemId && (a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "tool" && e.id === r.itemId))), a < 0 && (i = P(i, t, n), a = L(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
+	a < 0 && r.itemId && (a = i.findIndex((e) => e.role === "assistant" && e.metadata?.turnId === n && e.parts.some((e) => e.type === "tool" && e.id === r.itemId))), a < 0 && (i = I(i, t, n), a = z(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
 	let o = a >= 0 ? i[a] : void 0;
 	if (!o) return i;
 	let s = [...o.parts], c = s.findIndex((e) => e.type === "media" && e.itemId === r.itemId);
@@ -1821,25 +1822,25 @@ function xn(e, t, n, r) {
 		...o,
 		status: "streaming",
 		parts: s
-	}), I(i, t);
+	}), R(i, t);
 }
-function Sn(e, t, n, r) {
+function En(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 = P(i, t, n), a = L(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n));
+	a < 0 && (i = I(i, t, n), a = z(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
-	}), I(i, t);
+	}), R(i, t);
 }
-function Cn(e, t) {
+function Dn(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 wn(e, t, n, r) {
+function On(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 ? wn(F(i, t, n, r.fallbackToolPart), t, n, {
+	if (a < 0) return r.fallbackToolPart ? On(L(i, t, n, r.fallbackToolPart), t, n, {
 		...r,
 		fallbackToolPart: void 0
 	}) : i;
@@ -1865,12 +1866,12 @@ function wn(e, t, n, r) {
 		parts: s
 	}), i) : i;
 }
-function Tn(e, t, n, r = "streaming") {
+function kn(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 = L(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), o = a >= 0 ? i[a] : void 0;
+	let i = [...e], a = z(i, (e) => e.role === "assistant" && e.kind === void 0 && e.metadata?.turnId === n), o = a >= 0 ? i[a] : void 0;
 	return o?.parts.length === 0 ? i.splice(a, 1) : o && i.splice(a, 1, {
 		...o,
 		status: "complete"
@@ -1886,16 +1887,16 @@ function Tn(e, t, n, r = "streaming") {
 			conversationId: t,
 			turnId: n
 		}
-	}), I(i, t);
+	}), R(i, t);
 }
-function En(e, t, n) {
+function An(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: Dn(e.statusText, r)
+			statusText: jn(e.statusText, r)
 		}));
 		return n ? {
 			...e,
@@ -1903,11 +1904,11 @@ function En(e, t, n) {
 		} : e;
 	});
 }
-function Dn(e, t) {
+function jn(e, t) {
 	if (t === "running" || !e) return e;
 	try {
 		let n = JSON.parse(e);
-		return it(n) ? JSON.stringify({
+		return ct(n) ? JSON.stringify({
 			...n,
 			phase: t
 		}) : e;
@@ -1915,27 +1916,27 @@ function Dn(e, t) {
 		return e;
 	}
 }
-function I(e, t) {
+function R(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 L(e, t) {
+function z(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 On(e, t) {
+function Mn(e, t) {
 	return e.includes(t) ? [...e] : [...e, t];
 }
-function kn(e, t) {
+function Nn(e, t) {
 	return [e?.trim() ?? "", ...t.map((e) => `${e.status === "completed" ? "- [x]" : "- [ ]"} ${e.step}`)].filter(Boolean).join("\n");
 }
-function An(e, t, n) {
+function Pn(e, t, n) {
 	return {
 		type: "tool",
 		id: `plan-progress-${e}`,
@@ -1958,19 +1959,19 @@ function An(e, t, n) {
 }
 //#endregion
 //#region src/node/codex-conversation-history.ts
-var jn = 16 * 1024 * 1024, Mn = /* @__PURE__ */ new Set([
+var Fn = 16 * 1024 * 1024, In = /* @__PURE__ */ new Set([
 	"image/avif",
 	"image/gif",
 	"image/jpeg",
 	"image/png",
 	"image/webp"
 ]);
-function Nn(e) {
-	return (Array.isArray(e.turns) ? e.turns : []).flatMap((t) => Fn(e.id, t));
+function Ln(e) {
+	return (Array.isArray(e.turns) ? e.turns : []).flatMap((t) => zn(e.id, t));
 }
-function Pn(e, t) {
+function Rn(e, t) {
 	let n = /* @__PURE__ */ new Map();
-	for (let t of e) for (let e of t.parts) e.type !== "attachment" || e.attachment.kind !== "image" || !e.attachment.path || qn(e.attachment.url) && n.set(e.attachment.path, e.attachment.url);
+	for (let t of e) for (let e of t.parts) e.type !== "attachment" || e.attachment.kind !== "image" || !e.attachment.path || Qn(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;
@@ -1989,14 +1990,14 @@ function Pn(e, t) {
 		} : e;
 	});
 }
-function Fn(e, t) {
-	let n = [], r = [], i = Xn(t.startedAt ?? t.completedAt), a = 0, o = !1, s = /* @__PURE__ */ new Set(), c = () => {
+function zn(e, t) {
+	let n = [], r = [], i = nr(t.startedAt ?? t.completedAt), a = 0, o = !1, s = /* @__PURE__ */ new Set(), c = () => {
 		if (r.length === 0) return;
 		let o = a === 0 ? "" : `-segment-${a}`;
 		n.push({
 			id: `assistant-${t.id}${o}`,
 			role: "assistant",
-			status: z(t.status),
+			status: tr(t.status),
 			turnId: t.id,
 			parts: [...r],
 			createdAt: i,
@@ -2008,7 +2009,7 @@ function Fn(e, t) {
 	};
 	for (let a of Array.isArray(t.items) ? t.items : []) {
 		if (a.type === "userMessage") {
-			let r = zn(a), l = Vn(a);
+			let r = Un(a), l = Gn(a);
 			if (r.length > 0) {
 				let u = o, d = u ? null : JSON.stringify(r);
 				if (d && s.has(d)) continue;
@@ -2025,7 +2026,7 @@ function Fn(e, t) {
 						turnId: t.id,
 						...l.length > 0 ? {
 							asyncQuestionRequestIds: l,
-							asyncQuestionAnswers: Hn(a)
+							asyncQuestionAnswers: Kn(a)
 						} : {}
 					}
 				});
@@ -2051,7 +2052,7 @@ function Fn(e, t) {
 			continue;
 		}
 		if (a.type === "agentMessage") {
-			let n = typeof a.text == "string" ? a.text : "", i = Ln(e, t.id, a, !0), s = a.phase === "final_answer" ? bn(n) : null;
+			let n = typeof a.text == "string" ? a.text : "", i = Vn(e, t.id, a, !0), s = a.phase === "final_answer" ? wn(n) : null;
 			s && !i ? s.visibleText && (o = !0, r.push({
 				type: "text",
 				text: s.visibleText,
@@ -2087,17 +2088,17 @@ function Fn(e, t) {
 			}));
 			continue;
 		}
-		let l = O(a);
+		let l = A(a);
 		l && (o = !0, r.push(l));
-		let u = Rn(a);
+		let u = Hn(a);
 		u && (o = !0, r.push(u));
 	}
-	return c(), t.status === "inProgress" ? n : En(n, t.id, t.status);
+	return c(), t.status === "inProgress" ? n : An(n, t.id, t.status);
 }
-function In(e, t, n) {
-	let r = Xn(t.startedAt);
+function Bn(e, t, n) {
+	let r = nr(t.startedAt);
 	if (n.type === "userMessage") {
-		let i = zn(n), a = Vn(n);
+		let i = Un(n), a = Gn(n);
 		return i.length > 0 ? {
 			id: n.clientId ?? `user-${e}-${t.id}-${n.id}`,
 			role: "user",
@@ -2111,13 +2112,13 @@ function In(e, t, n) {
 				itemId: n.id,
 				...a.length > 0 ? {
 					asyncQuestionRequestIds: a,
-					asyncQuestionAnswers: Hn(n)
+					asyncQuestionAnswers: Kn(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" ? bn(i) : null, o = n.type === "agentMessage" ? Ln(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" ? wn(i) : null, o = n.type === "agentMessage" ? Vn(e, t.id, n, !0) : null, s = [...!o && (a?.visibleText || !a && i) ? [{
 			type: "text",
 			text: a?.visibleText ?? i,
 			itemId: n.id,
@@ -2126,7 +2127,7 @@ function In(e, t, n) {
 		return s.length > 0 ? {
 			id: `assistant-${n.id}`,
 			role: "assistant",
-			status: z(t.status),
+			status: tr(t.status),
 			turnId: t.id,
 			parts: s,
 			createdAt: r,
@@ -2150,7 +2151,7 @@ function In(e, t, n) {
 		return i.length > 0 ? {
 			id: `assistant-${n.id}`,
 			role: "assistant",
-			status: z(t.status),
+			status: tr(t.status),
 			turnId: t.id,
 			parts: i,
 			createdAt: r,
@@ -2161,14 +2162,14 @@ function In(e, t, n) {
 			}
 		} : null;
 	}
-	let i = [], a = O(n);
+	let i = [], a = A(n);
 	a && i.push(a);
-	let o = Rn(n);
+	let o = Hn(n);
 	o && i.push(o);
 	let s = i.length > 0 ? {
 		id: `assistant-${n.id}`,
 		role: "assistant",
-		status: z(t.status),
+		status: tr(t.status),
 		turnId: t.id,
 		parts: i,
 		createdAt: r,
@@ -2178,9 +2179,9 @@ function In(e, t, n) {
 			itemId: n.id
 		}
 	} : null;
-	return !s || t.status === "inProgress" ? s : En([s], t.id, t.status)[0] ?? null;
+	return !s || t.status === "inProgress" ? s : An([s], t.id, t.status)[0] ?? null;
 }
-function Ln(e, t, n, r = !1) {
+function Vn(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([
@@ -2222,9 +2223,9 @@ function Ln(e, t, n, r = !1) {
 		...r ? { historical: !0 } : {}
 	};
 }
-function Rn(e) {
-	if (e.type !== "imageGeneration" || O(e)?.status !== "completed") return null;
-	let t = typeof e.savedPath == "string" && _(e.savedPath) ? e.savedPath : null, n = t ? R(t) : void 0, r = n && Mn.has(n) ? t : null, i = Kn(typeof e.result == "string" ? e.result.trim() : ""), a = i?.url ?? (r ? ie(r).href : void 0);
+function Hn(e) {
+	if (e.type !== "imageGeneration" || A(e)?.status !== "completed") return null;
+	let t = typeof e.savedPath == "string" && v(e.savedPath) ? e.savedPath : null, n = t ? Xn(t) : void 0, r = n && In.has(n) ? t : null, i = Zn(typeof e.result == "string" ? e.result.trim() : ""), a = i?.url ?? (r ? re(r).href : void 0);
 	if (!a) return null;
 	let o = typeof e.revisedPrompt == "string" ? e.revisedPrompt.trim() : "";
 	return {
@@ -2239,7 +2240,7 @@ function Rn(e) {
 		}
 	};
 }
-function zn(e) {
+function Un(e) {
 	let t = Array.isArray(e.content) ? e.content : [], n = t.some((e) => B(e) && e.type === "text" && typeof e.text == "string" && e.text.length > 0), r = [], i = [], a = /* @__PURE__ */ new Set(), o = () => {
 		i.length > 0 && r.push({
 			type: "text",
@@ -2253,7 +2254,7 @@ function zn(e) {
 			if (a.has(t)) continue;
 			a.add(t);
 		}
-		let t = Bn(e), s = At(t);
+		let t = Wn(e), s = Pt(t);
 		if (s) {
 			o(), r.push({
 				type: "attachment",
@@ -2268,7 +2269,7 @@ function zn(e) {
 			i.push(t);
 			continue;
 		}
-		let c = Wn(e);
+		let c = Jn(e);
 		c && (o(), r.push({
 			type: "attachment",
 			attachment: c
@@ -2276,20 +2277,20 @@ function zn(e) {
 	}
 	return o(), r;
 }
-function Bn(e) {
-	return !B(e) || typeof e.type != "string" ? "" : e.type === "text" && typeof e.text == "string" ? Un(e.text)?.displayText ?? e.text : e.type === "skill" && typeof e.name == "string" ? `$${e.name}` : "";
+function Wn(e) {
+	return !B(e) || typeof e.type != "string" ? "" : e.type === "text" && typeof e.text == "string" ? qn(e.text)?.displayText ?? e.text : e.type === "skill" && typeof e.name == "string" ? `$${e.name}` : "";
 }
-function Vn(e) {
+function Gn(e) {
 	let t = /* @__PURE__ */ new Set();
-	for (let n of Array.isArray(e.content) ? e.content : []) if (!(!B(n) || n.type !== "text" || typeof n.text != "string")) for (let e of Un(n.text)?.requestIds ?? []) t.add(e);
+	for (let n of Array.isArray(e.content) ? e.content : []) if (!(!B(n) || n.type !== "text" || typeof n.text != "string")) for (let e of qn(n.text)?.requestIds ?? []) t.add(e);
 	return [...t];
 }
-function Hn(e) {
+function Kn(e) {
 	let t = {};
-	for (let n of Array.isArray(e.content) ? e.content : []) !B(n) || n.type !== "text" || typeof n.text != "string" || Object.assign(t, Un(n.text)?.answers);
+	for (let n of Array.isArray(e.content) ? e.content : []) !B(n) || n.type !== "text" || typeof n.text != "string" || Object.assign(t, qn(n.text)?.answers);
 	return t;
 }
-function Un(e) {
+function qn(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 {
@@ -2313,10 +2314,10 @@ function Un(e) {
 		return null;
 	}
 }
-function Wn(e) {
+function Jn(e) {
 	if (!B(e) || typeof e.type != "string") return null;
 	if (e.type === "mention" && typeof e.path == "string") {
-		let t = typeof e.name == "string" && e.name.trim() ? e.name.trim() : Gn(e.path, "File"), n = R(e.path);
+		let t = typeof e.name == "string" && e.name.trim() ? e.name.trim() : Yn(e.path, "File"), n = Xn(e.path);
 		return {
 			kind: "file",
 			name: t,
@@ -2325,41 +2326,41 @@ function Wn(e) {
 		};
 	}
 	if (e.type === "image" && typeof e.url == "string") {
-		let t = R(e.url);
+		let t = Xn(e.url);
 		return {
 			kind: "image",
-			name: Gn(e.url, "Image"),
+			name: Yn(e.url, "Image"),
 			url: e.url,
 			...t ? { mimeType: t } : {}
 		};
 	}
 	if (e.type === "localImage" && typeof e.path == "string") {
-		let t = R(e.path);
+		let t = Xn(e.path);
 		return {
 			kind: "image",
-			name: Gn(e.path, "Image"),
+			name: Yn(e.path, "Image"),
 			path: e.path,
 			...t ? { mimeType: t } : {}
 		};
 	}
 	return null;
 }
-function Gn(e, t) {
+function Yn(e, t) {
 	try {
 		let n = /^[a-z][a-z\d+.-]*:/i.test(e) ? new URL(e).pathname : e;
-		return h(decodeURIComponent(n)).trim() || t;
+		return g(decodeURIComponent(n)).trim() || t;
 	} catch {
-		return h(e).trim() || t;
+		return g(e).trim() || t;
 	}
 }
-function R(e) {
+function Xn(e) {
 	let t = /^data:([^;,]+)/i.exec(e)?.[1]?.toLowerCase();
 	if (t) return t;
 	let n = "";
 	try {
-		n = g(/^[a-z][a-z\d+.-]*:/i.test(e) ? new URL(e).pathname : e).slice(1).toLowerCase();
+		n = _(/^[a-z][a-z\d+.-]*:/i.test(e) ? new URL(e).pathname : e).slice(1).toLowerCase();
 	} catch {
-		n = g(e).slice(1).toLowerCase();
+		n = _(e).slice(1).toLowerCase();
 	}
 	return {
 		avif: "image/avif",
@@ -2374,23 +2375,23 @@ function R(e) {
 		webp: "image/webp"
 	}[n];
 }
-function Kn(e) {
+function Zn(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(jn / 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(Fn / 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 > jn) return null;
-	let i = Jn(r);
+	if (r.byteLength === 0 || r.byteLength > Fn) return null;
+	let i = $n(r);
 	return i ? {
 		url: `data:${i};base64,${t}`,
 		mimeType: i
 	} : null;
 }
-function qn(e) {
+function Qn(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 Jn(e) {
-	if (Yn(e, [
+function $n(e) {
+	if (er(e, [
 		137,
 		80,
 		78,
@@ -2400,7 +2401,7 @@ function Jn(e) {
 		26,
 		10
 	])) return "image/png";
-	if (Yn(e, [
+	if (er(e, [
 		255,
 		216,
 		255
@@ -2408,13 +2409,13 @@ function Jn(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 Yn(e, t) {
+function er(e, t) {
 	return t.every((t, n) => e[n] === t);
 }
-function z(e) {
+function tr(e) {
 	return e === "inProgress" ? "streaming" : e === "failed" ? "error" : "complete";
 }
-function Xn(e) {
+function nr(e) {
 	return typeof e != "number" || !Number.isFinite(e) ? (/* @__PURE__ */ new Date(0)).toISOString() : (/* @__PURE__ */ new Date(e * 1e3)).toISOString();
 }
 function B(e) {
@@ -2422,21 +2423,21 @@ function B(e) {
 }
 //#endregion
 //#region src/node/codex-raw-response-item-adapter.ts
-function Zn(e) {
-	if (!or(e) || typeof e.type != "string") return null;
+function rr(e) {
+	if (!fr(e) || typeof e.type != "string") return null;
 	if (e.type === "local_shell_call") {
-		let t = O(Qn(e));
+		let t = A(ir(e));
 		return {
-			type: nr(e.status) ? "item.completed" : "item.started",
+			type: cr(e.status) ? "item.completed" : "item.started",
 			payload: { toolPart: t }
 		};
 	}
 	return e.type === "function_call" ? {
 		type: "item.started",
-		payload: { toolPart: O($n(e)) }
-	} : e.type === "function_call_output" ? er(e.call_id, e.output) : e.type === "custom_tool_call" ? {
+		payload: { toolPart: A(ar(e)) }
+	} : e.type === "function_call_output" ? or(e.call_id, e.output) : e.type === "custom_tool_call" ? {
 		type: "item.started",
-		payload: { toolPart: O({
+		payload: { toolPart: A({
 			type: "dynamicToolCall",
 			id: H(e.call_id) ?? V(e),
 			namespace: null,
@@ -2447,9 +2448,9 @@ function Zn(e) {
 			success: null,
 			durationMs: null
 		}) }
-	} : e.type === "custom_tool_call_output" ? er(e.call_id, e.output, H(e.name) ?? void 0) : e.type === "tool_search_call" ? {
+	} : e.type === "custom_tool_call_output" ? or(e.call_id, e.output, H(e.name) ?? void 0) : e.type === "tool_search_call" ? {
 		type: "item.started",
-		payload: { toolPart: O({
+		payload: { toolPart: A({
 			type: "dynamicToolCall",
 			id: H(e.call_id) ?? V(e),
 			namespace: "codex",
@@ -2463,18 +2464,18 @@ function Zn(e) {
 		}) }
 	} : e.type === "tool_search_output" ? {
 		type: "item.updated",
-		payload: Vt(H(e.call_id) ?? V(e), e.tools, "tool_search", e.status)
+		payload: Gt(H(e.call_id) ?? V(e), e.tools, "tool_search", e.status)
 	} : e.type === "web_search_call" ? {
 		type: "item.completed",
-		payload: { toolPart: O({
+		payload: { toolPart: A({
 			type: "webSearch",
 			id: V(e),
-			query: ir(e.action),
+			query: ur(e.action),
 			action: e.action
 		}) }
 	} : e.type === "image_generation_call" ? {
 		type: "item.completed",
-		payload: { toolPart: O({
+		payload: { toolPart: A({
 			type: "dynamicToolCall",
 			id: H(e.id) ?? V(e),
 			namespace: null,
@@ -2487,8 +2488,8 @@ function Zn(e) {
 		}) }
 	} : null;
 }
-function Qn(e) {
-	let t = or(e.action) ? e.action : {}, n = Array.isArray(t.command) ? ar(t.command) : H(t.command) ?? "local shell";
+function ir(e) {
+	let t = fr(e.action) ? e.action : {}, n = Array.isArray(t.command) ? dr(t.command) : H(t.command) ?? "local shell";
 	return {
 		type: "commandExecution",
 		id: H(e.call_id) ?? V(e),
@@ -2496,16 +2497,16 @@ function Qn(e) {
 		cwd: H(t.working_directory) ?? "",
 		processId: null,
 		source: "agent",
-		status: tr(e.status),
+		status: sr(e.status),
 		commandActions: [],
 		aggregatedOutput: null,
 		exitCode: null,
 		durationMs: null
 	};
 }
-function $n(e) {
-	let t = H(e.name) ?? "function_call", n = rr(e.arguments), r = H(e.call_id) ?? V(e);
-	return t === "shell_command" && or(n) ? {
+function ar(e) {
+	let t = H(e.name) ?? "function_call", n = lr(e.arguments), r = H(e.call_id) ?? V(e);
+	return t === "shell_command" && fr(n) ? {
 		type: "commandExecution",
 		id: r,
 		command: H(n.command) ?? t,
@@ -2529,19 +2530,19 @@ function $n(e) {
 		durationMs: null
 	};
 }
-function er(e, t, n) {
+function or(e, t, n) {
 	return {
 		type: "item.updated",
-		payload: Vt(H(e) ?? "raw-response-output", t, n)
+		payload: Gt(H(e) ?? "raw-response-output", t, n)
 	};
 }
-function tr(e) {
+function sr(e) {
 	return e === "completed" ? "completed" : e === "incomplete" || e === "failed" || e === "error" ? "failed" : "inProgress";
 }
-function nr(e) {
+function cr(e) {
 	return e === "completed" || e === "failed" || e === "error" || e === "incomplete";
 }
-function rr(e) {
+function lr(e) {
 	if (typeof e != "string") return e;
 	try {
 		return JSON.parse(e);
@@ -2549,10 +2550,10 @@ function rr(e) {
 		return e;
 	}
 }
-function ir(e) {
-	return or(e) ? H(e.query) ?? H(e.searchTerm) ?? "web search" : "web search";
+function ur(e) {
+	return fr(e) ? H(e.query) ?? H(e.searchTerm) ?? "web search" : "web search";
 }
-function ar(e) {
+function dr(e) {
 	return e.map((e) => {
 		let t = String(e);
 		return /\s/.test(t) ? JSON.stringify(t) : t;
@@ -2564,21 +2565,21 @@ function V(e) {
 function H(e) {
 	return typeof e == "string" && e.length > 0 ? e : null;
 }
-function or(e) {
+function fr(e) {
 	return !!(e && typeof e == "object" && !Array.isArray(e));
 }
 //#endregion
 //#region src/node/codex-surface-events.ts
-function sr(e, t) {
+function pr(e, t) {
 	return `${e}\u0000${t}`;
 }
 function U(e) {
 	return typeof e == "number" && Number.isFinite(e) ? (/* @__PURE__ */ new Date(e * 1e3)).toISOString() : (/* @__PURE__ */ new Date()).toISOString();
 }
-function cr(e) {
+function mr(e) {
 	return typeof e == "number" && Number.isFinite(e) ? (/* @__PURE__ */ new Date(e * 1e3)).toISOString() : null;
 }
-function lr(e) {
+function hr(e) {
 	return e ? {
 		message: e.message,
 		additionalDetails: e.additionalDetails,
@@ -2589,10 +2590,10 @@ function W(e, t = !1) {
 	return {
 		id: e.id,
 		status: e.status,
-		error: lr(e.error),
+		error: hr(e.error),
 		willRetry: t,
-		startedAt: cr(e.startedAt),
-		completedAt: cr(e.completedAt),
+		startedAt: mr(e.startedAt),
+		completedAt: mr(e.completedAt),
 		durationMs: e.durationMs ?? null
 	};
 }
@@ -2602,18 +2603,18 @@ function G(e, t) {
 	let r = [...e];
 	return r.splice(n, 1, t), r;
 }
-function ur(e, t) {
+function gr(e, t) {
 	return JSON.stringify(e) === JSON.stringify(t);
 }
-function dr() {
+function _r() {
 	return `user-${globalThis.crypto.randomUUID()}`;
 }
-function fr() {
+function vr() {
 	return `queued-prompt-${globalThis.crypto.randomUUID()}`;
 }
 //#endregion
 //#region src/node/codex-surface-subagents.ts
-function pr(e) {
+function yr(e) {
 	let t = {};
 	for (let [n, r] of Object.entries(e.agentsStates)) r && (t[n] = {
 		status: r.status,
@@ -2633,7 +2634,7 @@ function pr(e) {
 }
 //#endregion
 //#region src/node/codex-surface-items-controller.ts
-var mr = class {
+var br = class {
 	host;
 	commandOutputForwardItemIds = /* @__PURE__ */ new Set();
 	fileActivityKeys = /* @__PURE__ */ new Set();
@@ -2651,13 +2652,13 @@ var mr = class {
 		for (let e of this.reviewOutputByTurn.keys()) e.startsWith(t) && this.reviewOutputByTurn.delete(e);
 	}
 	isForwardingCommandOutput(e, t) {
-		return this.commandOutputForwardItemIds.has(sr(e, t));
+		return this.commandOutputForwardItemIds.has(pr(e, t));
 	}
 	applyAgentDelta(e) {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
 		let n = t.messages.flatMap((e) => e.parts).find((t) => t.type === "text" && t.itemId === e.itemId)?.phase;
-		this.host.patchRuntime(e.threadId, { messages: gn(t.messages, e.threadId, e.turnId, e.itemId, e.delta, n) });
+		this.host.patchRuntime(e.threadId, { messages: bn(t.messages, e.threadId, e.turnId, e.itemId, e.delta, n) });
 		let r = this.host.assistantMessageForTurn(e.threadId, e.turnId);
 		r && this.host.emitEvent("notification", {
 			type: "message.delta",
@@ -2675,7 +2676,7 @@ var mr = 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: F(t.messages, e.threadId, e.turnId, An(e.turnId, n, "running")) }), this.host.emitEvent("notification", {
+		t.planMarkdownByTurn.set(e.turnId, n), this.host.patchRuntime(e.threadId, { messages: L(t.messages, e.threadId, e.turnId, Pn(e.turnId, n, "running")) }), this.host.emitEvent("notification", {
 			type: "plan.delta",
 			conversationId: e.threadId,
 			turnId: e.turnId,
@@ -2689,7 +2690,7 @@ var mr = class {
 	applyPlanUpdated(e) {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
-		let n = kn(e.explanation, e.plan), r = (/* @__PURE__ */ new Date()).toISOString();
+		let n = Nn(e.explanation, e.plan), r = (/* @__PURE__ */ new Date()).toISOString();
 		t.planMarkdownByTurn.set(e.turnId, n), this.host.patchRuntime(e.threadId, {
 			executionPlan: {
 				turnId: e.turnId,
@@ -2698,7 +2699,7 @@ var mr = class {
 				markdown: n,
 				updatedAt: r
 			},
-			messages: F(t.messages, e.threadId, e.turnId, An(e.turnId, n, "completed"))
+			messages: L(t.messages, e.threadId, e.turnId, Pn(e.turnId, n, "completed"))
 		}), this.host.emitEvent("notification", {
 			type: "plan.updated",
 			conversationId: e.threadId,
@@ -2714,13 +2715,13 @@ var mr = class {
 	applyRawResponseItem(e) {
 		let t = this.host.requireRuntime(e.threadId);
 		this.host.markRuntimeTurnActive(t, e.turnId);
-		let n = Zn(e.item);
+		let n = rr(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: F(t.messages, e.threadId, e.turnId, n.payload.toolPart) });
+		this.host.patchRuntime(e.threadId, { messages: L(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",
@@ -2741,7 +2742,7 @@ var mr = class {
 			startedAt: ("startedAtMs" in e ? e.startedAtMs : e.completedAtMs) / 1e3
 		};
 		if (e.item.type === "userMessage") {
-			let t = In(e.threadId, i, e.item);
+			let t = Bn(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) {
@@ -2767,7 +2768,7 @@ var mr = class {
 				...t,
 				kind: "steer"
 			} : t, c = [...n.messages, s];
-			this.host.patchRuntime(e.threadId, { messages: a ? P(c, e.threadId, e.turnId, { forceSegment: !0 }) : c }), this.host.emitEvent("notification", {
+			this.host.patchRuntime(e.threadId, { messages: a ? I(c, e.threadId, e.turnId, { forceSegment: !0 }) : c }), this.host.emitEvent("notification", {
 				type: "message.appended",
 				conversationId: e.threadId,
 				turnId: e.turnId,
@@ -2778,7 +2779,7 @@ var mr = class {
 		if (e.item.type === "reasoning") {
 			if (e.item.summary.filter((e) => e.trim().length > 0).length === 0) return;
 			let t = this.host.assistantMessageForTurn(e.threadId, e.turnId), r = t ? JSON.stringify(t.parts) : null;
-			this.host.patchRuntime(e.threadId, { messages: _n(n.messages, e.threadId, e.turnId, e.item.id, e.item.summary) });
+			this.host.patchRuntime(e.threadId, { messages: xn(n.messages, e.threadId, e.turnId, e.item.id, e.item.summary) });
 			let i = this.host.assistantMessageForTurn(e.threadId, e.turnId);
 			if (!i || JSON.stringify(i.parts) === r) return;
 			this.host.emitEvent("notification", {
@@ -2790,10 +2791,10 @@ var mr = class {
 			return;
 		}
 		if (e.item.type === "agentMessage" && t && n.planMode && e.item.phase === "final_answer") {
-			let t = bn(e.item.text);
+			let t = wn(e.item.text);
 			if (t) {
-				let r = this.host.assistantMessageForTurn(e.threadId, e.turnId), i = yn(n.messages, e.threadId, e.turnId, e.item.id);
-				t.visibleText && (i = vn(i, e.threadId, e.turnId, e.item.id, t.visibleText, e.item.phase)), i = F(i, e.threadId, e.turnId, An(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 = Cn(n.messages, e.threadId, e.turnId, e.item.id);
+				t.visibleText && (i = Sn(i, e.threadId, e.turnId, e.item.id, t.visibleText, e.item.phase)), i = L(i, e.threadId, e.turnId, Pn(e.turnId, t.markdown, "completed")), n.planMarkdownByTurn.set(e.turnId, t.markdown), this.host.patchRuntime(e.threadId, { messages: i });
 				let a = this.host.assistantMessageForTurn(e.threadId, e.turnId);
 				a && this.host.emitEvent("notification", {
 					type: r ? "message.updated" : "message.appended",
@@ -2815,11 +2816,11 @@ var mr = 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 = sr(e.threadId, e.turnId);
+			let i = pr(e.threadId, e.turnId);
 			if (e.item.type === "agentMessage" && this.reviewOutputByTurn.get(i) === t) return;
 			e.item.type === "exitedReviewMode" && this.reviewOutputByTurn.set(i, t);
-			let a = new Set(n.messages.map((e) => e.id)), o = this.host.assistantMessageForTurn(e.threadId, e.turnId), s = o ? JSON.stringify(o.parts) : null, c = new Set(o?.parts.flatMap((e) => e.type === "question" ? [e.request.id] : []) ?? []), l = n.messages.flatMap((e) => e.parts).find((t) => t.type === "text" && t.itemId === e.item.id)?.text ?? "", u = e.item.type === "agentMessage" ? Ln(e.threadId, e.turnId, e.item) : null, d = u ? "" : t, f = u ? yn(n.messages, e.threadId, e.turnId, e.item.id) : vn(n.messages, e.threadId, e.turnId, e.item.id, t, r);
-			if (u && (f = Sn(f, e.threadId, e.turnId, u)), this.host.patchRuntime(e.threadId, { messages: f }), !d && !u) return;
+			let a = new Set(n.messages.map((e) => e.id)), o = this.host.assistantMessageForTurn(e.threadId, e.turnId), s = o ? JSON.stringify(o.parts) : null, c = new Set(o?.parts.flatMap((e) => e.type === "question" ? [e.request.id] : []) ?? []), l = n.messages.flatMap((e) => e.parts).find((t) => t.type === "text" && t.itemId === e.item.id)?.text ?? "", u = e.item.type === "agentMessage" ? Vn(e.threadId, e.turnId, e.item) : null, d = u ? "" : t, f = u ? Cn(n.messages, e.threadId, e.turnId, e.item.id) : Sn(n.messages, e.threadId, e.turnId, e.item.id, t, r);
+			if (u && (f = En(f, e.threadId, e.turnId, u)), this.host.patchRuntime(e.threadId, { messages: f }), !d && !u) return;
 			let p = this.host.assistantMessageForTurn(e.threadId, e.turnId);
 			if (p && !a.has(p.id)) this.host.emitEvent("notification", {
 				type: "message.appended",
@@ -2863,7 +2864,7 @@ var mr = 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: F(n.messages, e.threadId, e.turnId, An(e.turnId, r, "completed")) }), this.host.emitEvent("notification", {
+			n.planMarkdownByTurn.set(e.turnId, r), this.host.patchRuntime(e.threadId, { messages: L(n.messages, e.threadId, e.turnId, Pn(e.turnId, r, "completed")) }), this.host.emitEvent("notification", {
 				type: "plan.completed",
 				conversationId: e.threadId,
 				turnId: e.turnId,
@@ -2875,7 +2876,7 @@ var mr = class {
 			return;
 		}
 		if (e.item.type === "contextCompaction") {
-			if (this.host.patchRuntime(e.threadId, { messages: Tn(n.messages, e.threadId, e.turnId, t ? "complete" : "streaming") }), t) {
+			if (this.host.patchRuntime(e.threadId, { messages: kn(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",
@@ -2901,7 +2902,7 @@ var mr = class {
 				turnId: e.turnId,
 				payload: {
 					lifecycle: t ? "completed" : "started",
-					toolCall: pr(e.item)
+					toolCall: yr(e.item)
 				}
 			});
 			return;
@@ -2923,13 +2924,13 @@ var mr = class {
 			});
 			return;
 		}
-		let a = this.shouldForwardCommandOutput(e.threadId, t, e.item), o = O(e.item, {
+		let a = this.shouldForwardCommandOutput(e.threadId, t, e.item), o = A(e.item, {
 			includeCommandOutput: a,
 			cwd: n.cwd
-		}), s = Rn(e.item);
+		}), s = Hn(e.item);
 		if (!o && !s) return;
-		let c = s ? !n.messages.some((e) => e.parts.some((e) => e.type === "media" && Cn(e, s))) : !1, l = o ? F(n.messages, e.threadId, e.turnId, o) : [...n.messages];
-		s && (l = xn(l, e.threadId, e.turnId, s)), this.host.patchRuntime(e.threadId, { messages: l });
+		let c = s ? !n.messages.some((e) => e.parts.some((e) => e.type === "media" && Dn(e, s))) : !1, l = o ? L(n.messages, e.threadId, e.turnId, o) : [...n.messages];
+		s && (l = Tn(l, e.threadId, e.turnId, s)), this.host.patchRuntime(e.threadId, { messages: l });
 		let u = o ? this.host.messageContainingTool(e.threadId, e.turnId, o.id) : this.host.assistantMessageForTurn(e.threadId, e.turnId);
 		u && o && this.host.emitEvent("notification", {
 			type: t ? "tool.completed" : "tool.started",
@@ -2949,25 +2950,25 @@ var mr = class {
 	shouldForwardCommandOutput(e, t, n) {
 		let r = "id" in n && typeof n.id == "string" ? n.id : null;
 		if (!r) return !1;
-		let i = sr(e, r);
+		let i = pr(e, r);
 		if (!t) {
-			let e = Lt(n);
+			let e = Vt(n);
 			return e ? this.commandOutputForwardItemIds.add(i) : this.commandOutputForwardItemIds.delete(i), e;
 		}
-		let a = this.commandOutputForwardItemIds.has(i) || Lt(n);
+		let a = this.commandOutputForwardItemIds.has(i) || Vt(n);
 		return this.commandOutputForwardItemIds.delete(i), a;
 	}
 	applyToolUpdate(e, t, n) {
 		let r = this.host.requireRuntime(e);
 		this.host.markRuntimeTurnActive(r, t);
-		let i = r.cwd && hr(n) ? {
+		let i = r.cwd && xr(n) ? {
 			...n,
 			metadata: {
 				...n.metadata,
 				cwd: r.cwd
 			}
 		} : n;
-		this.host.patchRuntime(e, { messages: wn(r.messages, e, t, i) });
+		this.host.patchRuntime(e, { messages: On(r.messages, e, t, i) });
 		let a = this.host.messageContainingTool(e, t, n.itemId);
 		a && this.host.emitEvent("notification", {
 			type: "tool.updated",
@@ -2982,7 +2983,7 @@ var mr = class {
 		a && o && this.emitFileActivities(e, t, a.id, o.id, o, r.cwd);
 	}
 	emitFileActivities(e, t, n, r, i, a) {
-		for (let o of It(i, a)) {
+		for (let o of Bt(i, a)) {
 			let i = `${e}\u0000${r}\u0000${o.action}\u0000${o.path}\u0000${o.status}`;
 			this.fileActivityKeys.has(i) || (this.fileActivityKeys.add(i), this.host.emitEvent("notification", {
 				type: "file.activity",
@@ -3003,7 +3004,7 @@ var mr = 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 = En(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 = An(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));
@@ -3029,26 +3030,26 @@ var mr = class {
 			turnId: e.turn.id,
 			payload: {
 				status: e.turn.status,
-				error: lr(e.turn.error),
+				error: hr(e.turn.error),
 				willRetry: !1,
-				startedAt: cr(e.turn.startedAt),
-				completedAt: cr(e.turn.completedAt),
+				startedAt: mr(e.turn.startedAt),
+				completedAt: mr(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 hr(e) {
+function xr(e) {
 	if (e.fallbackToolPart?.kind === "fileChange") return !0;
 	let t = e.input, n = e.metadata;
-	return gr(t) && Array.isArray(t.changes) || gr(n) && Array.isArray(n.changes);
+	return Sr(t) && Array.isArray(t.changes) || Sr(n) && Array.isArray(n.changes);
 }
-function gr(e) {
+function Sr(e) {
 	return typeof e == "object" && !!e;
 }
 //#endregion
 //#region src/node/codex-surface-client-requests-controller.ts
-var _r = class {
+var Cr = class {
 	host;
 	pending = /* @__PURE__ */ new Map();
 	constructor(e) {
@@ -3097,21 +3098,21 @@ var _r = 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 = On(i.answeredClientRequestIds, t.id);
+		let i = this.host.requireRuntime(n.threadId), a = Mn(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: wn(i.messages, n.threadId, n.turnId, {
+				messages: On(i.messages, n.threadId, n.turnId, {
 					itemId: n.itemId,
 					output: { answers: e }
 				})
 			});
 		} else {
 			let e = r;
-			n.responder.resolve(qe(e)), this.host.patchRuntime(n.threadId, {
+			n.responder.resolve(Ze(e)), this.host.patchRuntime(n.threadId, {
 				answeredClientRequestIds: a,
-				messages: wn(i.messages, n.threadId, n.displayTurnId, {
+				messages: On(i.messages, n.threadId, n.displayTurnId, {
 					itemId: n.itemId,
 					output: { decision: e }
 				})
@@ -3150,7 +3151,7 @@ var _r = 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: On(a.runtime.answeredClientRequestIds, t.id) }), this.host.emitEvent("action", {
+		this.host.patchRuntime(a.runtime.threadId, { answeredClientRequestIds: Mn(a.runtime.answeredClientRequestIds, t.id) }), this.host.emitEvent("action", {
 			type: "clientRequest.resolved",
 			conversationId: a.runtime.threadId,
 			...a.request.turnId ? { turnId: a.request.turnId } : {},
@@ -3165,7 +3166,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: On(t.answeredClientRequestIds, e) });
+			this.host.patchRuntime(n.threadId, { answeredClientRequestIds: Mn(t.answeredClientRequestIds, e) });
 		}
 		this.maybeClearWaitingBusy(t), n && this.host.emitEvent("notification", {
 			type: "clientRequest.resolved",
@@ -3213,7 +3214,7 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 			responder: t
 		}), this.host.patchRuntime(n, {
 			busy: !0,
-			messages: F(o.messages, n, r, {
+			messages: L(o.messages, n, r, {
 				type: "tool",
 				id: i,
 				kind: "generic",
@@ -3255,23 +3256,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 (!it(r) || r.codex_approval_kind !== "mcp_tool_call") return !1;
-		let i = String(e.id), a = w(r.tool_name) ?? w(r.tool_title) ?? "tool", o = this.host.requireRuntime(n.threadId);
+		if (!ct(r) || r.codex_approval_kind !== "mcp_tool_call") return !1;
+		let i = String(e.id), a = E(r.tool_name) ?? E(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 = tt(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 = at(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: nt(r),
+				argumentsPreview: ot(r),
 				integrationId: n.serverName,
-				integrationName: w(r.connector_name) ?? n.serverName,
+				integrationName: E(r.connector_name) ?? n.serverName,
 				summary: u,
 				toolName: a,
-				...rt(r.persist, "session") ? { allowConversation: !0 } : {},
-				...rt(r.persist, "always") ? { allowAlways: !0 } : {}
+				...st(r.persist, "session") ? { allowConversation: !0 } : {},
+				...st(r.persist, "always") ? { allowAlways: !0 } : {}
 			} }
 		};
 		this.pending.set(i, {
@@ -3296,9 +3297,9 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 				params: {
 					requestId: i,
 					confirmationSummary: u,
-					argumentsPreview: nt(r),
-					allowConversation: rt(r.persist, "session"),
-					allowAlways: rt(r.persist, "always")
+					argumentsPreview: ot(r),
+					allowConversation: st(r.persist, "session"),
+					allowAlways: st(r.persist, "always")
 				}
 			}),
 			input: r.tool_params,
@@ -3312,7 +3313,7 @@ ${JSON.stringify(s)}\n</send_user_message_question_reply>`, t = s.length === 1 ?
 		};
 		this.host.patchRuntime(n.threadId, {
 			busy: !0,
-			messages: F(o.messages, n.threadId, s, f)
+			messages: L(o.messages, n.threadId, s, f)
 		});
 		let p = this.host.messageContainingTool(n.threadId, s, l);
 		return p && this.host.emitEvent("notification", {
@@ -3330,8 +3331,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;
 	}
-}, vr = 256 * 1024;
-function yr(e) {
+}, wr = 256 * 1024;
+function Tr(e) {
 	return {
 		id: e.id,
 		model: e.model,
@@ -3356,11 +3357,11 @@ function yr(e) {
 		}
 	};
 }
-async function br(e, t) {
-	return Promise.all(e.filter((e) => e.enabled).map((e) => xr(e, t)));
+async function Er(e, t) {
+	return Promise.all(e.filter((e) => e.enabled).map((e) => Dr(e, t)));
 }
-async function xr(e, t) {
-	let n = K(e.interface?.brandColor), r = Dr(e.interface?.defaultPrompt), [i, a] = await Promise.all([e.interface?.iconSmall ? t(e.interface.iconSmall) : void 0, e.interface?.iconLarge ? t(e.interface.iconLarge) : void 0]);
+async function Dr(e, t) {
+	let n = K(e.interface?.brandColor), r = Nr(e.interface?.defaultPrompt), [i, a] = await Promise.all([e.interface?.iconSmall ? t(e.interface.iconSmall) : void 0, e.interface?.iconLarge ? t(e.interface.iconLarge) : void 0]);
 	return {
 		name: e.name,
 		description: e.description,
@@ -3375,8 +3376,8 @@ async function xr(e, t) {
 		enabled: e.enabled
 	};
 }
-async function Sr(e, t) {
-	let n = e.interface, r = wr(n?.composerIconUrl), i = wr(n?.logoUrl), a = wr(n?.logoUrlDark), o = K(n?.displayName) ?? e.name, s = K(n?.shortDescription), c = K(n?.longDescription), l = K(n?.brandColor), u = r ?? i ?? await Cr([n?.composerIcon, n?.logo], t), d = r ?? a ?? i ?? await Cr([
+async function Or(e, t) {
+	let n = e.interface, r = Ar(n?.composerIconUrl), i = Ar(n?.logoUrl), a = Ar(n?.logoUrlDark), o = K(n?.displayName) ?? e.name, s = K(n?.shortDescription), c = K(n?.longDescription), l = K(n?.brandColor), u = r ?? i ?? await kr([n?.composerIcon, n?.logo], t), d = r ?? a ?? i ?? await kr([
 		n?.composerIcon,
 		n?.logoDark,
 		n?.logo
@@ -3393,21 +3394,21 @@ async function Sr(e, t) {
 		enabled: e.enabled
 	};
 }
-async function Cr(e, t) {
+async function kr(e, t) {
 	for (let n of e) {
 		if (!n) continue;
 		let e = await t(n);
 		if (e) return e;
 	}
 }
-function wr(e) {
+function Ar(e) {
 	let t = K(e);
 	try {
 		return new URL(t).protocol === "https:" ? t : void 0;
 	} catch {}
 }
-function Tr(e) {
-	switch (g(e).toLowerCase()) {
+function jr(e) {
+	switch (_(e).toLowerCase()) {
 		case ".avif": return "image/avif";
 		case ".bmp": return "image/bmp";
 		case ".gif": return "image/gif";
@@ -3419,18 +3420,18 @@ function Tr(e) {
 		case ".webp": return "image/webp";
 	}
 }
-function Er(e, t) {
+function Mr(e, t) {
 	let n = t.trim();
 	if (!/^[a-z\d+/]+={0,2}$/i.test(n)) return;
 	let r = n.replace(/=+$/, "");
 	if (r.length % 4 == 1) return;
 	let i = n.length - r.length, a = (4 - r.length % 4) % 4;
-	if (!(i !== 0 && i !== a) && !(Math.floor(r.length * 3 / 4) > vr)) return `data:${e};base64,${`${r}${"=".repeat((4 - r.length % 4) % 4)}`}`;
+	if (!(i !== 0 && i !== a) && !(Math.floor(r.length * 3 / 4) > wr)) return `data:${e};base64,${`${r}${"=".repeat((4 - r.length % 4) % 4)}`}`;
 }
 function K(e) {
 	return (typeof e == "string" ? e.trim() : void 0) || void 0;
 }
-function Dr(e) {
+function Nr(e) {
 	return typeof e == "string" ? e : void 0;
 }
 //#endregion
@@ -3438,12 +3439,12 @@ function Dr(e) {
 function q(e, t) {
 	return e.find((e) => e.id === t || e.model === t) ?? e.find((e) => e.isDefault) ?? e[0] ?? null;
 }
-function Or(e, t) {
+function Pr(e, t) {
 	let n = e.find((e) => e.id === t || e.model === t);
 	if (!n) throw Error(`Unknown model '${t}'`);
 	return n;
 }
-function kr(e, t) {
+function Fr(e, t) {
 	if (!t) return;
 	if (!e) throw Error(`Cannot select reasoning effort '${t}' without a model`);
 	let n = e.supportedReasoningEfforts?.map((e) => e.reasoningEffort) ?? [];
@@ -3452,7 +3453,7 @@ function kr(e, t) {
 function J(e) {
 	return e.defaultReasoningEffort ?? e.supportedReasoningEfforts?.[0]?.reasoningEffort ?? null;
 }
-function Ar(e) {
+function Ir(e) {
 	return e.defaultServiceTier ?? null;
 }
 function Y(e, t) {
@@ -3462,14 +3463,14 @@ function Y(e, t) {
 	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 jr(e, t) {
+function Lr(e, t) {
 	let n = new Set(e.filter((e) => e.allowed).map((e) => e.id)), r = [];
 	return n.has(":workspace") && X(t?.allowedApprovalPolicies, "on-request") && X(t?.allowedApprovalsReviewers, "user") && r.push("ask-for-approval"), n.has(":workspace") && X(t?.allowedApprovalPolicies, "on-request") && X(t?.allowedApprovalsReviewers, "auto_review") && r.push("approve-for-me"), (n.has(":danger-full-access") || n.has(":danger-no-sandbox")) && X(t?.allowedApprovalPolicies, "never") && X(t?.allowedApprovalsReviewers, "user") && r.push("full-access"), r;
 }
 function X(e, t) {
 	return !Array.isArray(e) || e.length === 0 || e.includes(t);
 }
-function Mr(e) {
+function Rr(e) {
 	return e === "full-access" ? {
 		approvalPolicy: "never",
 		approvalsReviewer: "user",
@@ -3480,39 +3481,39 @@ function Mr(e) {
 		permissions: ":workspace"
 	};
 }
-function Nr(e) {
-	return Mr(e);
+function zr(e) {
+	return Rr(e);
 }
-function Pr(e, t, n, r) {
+function Br(e, t, n, r) {
 	let i = r?.id;
 	return e === "never" && (n.type === "dangerFullAccess" || i === ":danger-full-access" || i === ":danger-no-sandbox") ? "full-access" : e === "on-request" && (t === "auto_review" || t === "guardian_subagent") ? "approve-for-me" : e === "on-request" ? "ask-for-approval" : null;
 }
-function Fr(e, t, n) {
+function Vr(e, t, n) {
 	let r = q(t, e.model);
 	return {
-		approvalPreset: Pr(e.approvalPolicy, e.approvalsReviewer, e.sandbox, e.activePermissionProfile) ?? n.approvalPreset,
+		approvalPreset: Br(e.approvalPolicy, e.approvalsReviewer, e.sandbox, e.activePermissionProfile) ?? n.approvalPreset,
 		planMode: n.planMode,
 		selectedModelId: r?.id ?? n.selectedModelId,
 		selectedReasoningEffort: e.reasoningEffort ?? (r ? J(r) : null),
-		selectedServiceTier: e.serviceTier === void 0 ? r ? Ar(r) : null : e.serviceTier
+		selectedServiceTier: e.serviceTier === void 0 ? r ? Ir(r) : null : e.serviceTier
 	};
 }
-function Ir(e, t, n) {
+function Hr(e, t, n) {
 	let r = q(t, e.model);
 	return {
-		approvalPreset: Pr(e.approvalPolicy, e.approvalsReviewer, e.sandboxPolicy, e.activePermissionProfile) ?? n.approvalPreset,
+		approvalPreset: Br(e.approvalPolicy, e.approvalsReviewer, e.sandboxPolicy, e.activePermissionProfile) ?? n.approvalPreset,
 		planMode: e.collaborationMode.mode === "plan",
 		selectedModelId: r?.id ?? n.selectedModelId,
 		selectedReasoningEffort: e.effort ?? (r ? J(r) : null),
-		selectedServiceTier: e.serviceTier === void 0 ? r ? Ar(r) : null : e.serviceTier
+		selectedServiceTier: e.serviceTier === void 0 ? r ? Ir(r) : null : e.serviceTier
 	};
 }
-function Lr(e, t) {
+function Ur(e, t) {
 	let n = q(e.models, e.selectedModelId);
 	if (t.modelId && (n = e.models.find((e) => e.id === t.modelId) ?? null, !n)) throw Error(`Unknown model '${t.modelId}'`);
 	let r = t.reasoningEffort ?? e.selectedReasoningEffort, i = t.serviceTier === void 0 ? e.selectedServiceTier ?? null : t.serviceTier, a = n?.supportedReasoningEfforts?.map((e) => e.reasoningEffort) ?? [];
 	if (t.reasoningEffort && a.length > 0 && !a.includes(t.reasoningEffort)) throw Error(`Reasoning effort '${t.reasoningEffort}' is not available for '${n.displayName}'`);
-	return t.modelId && a.length > 0 && (!r || !a.includes(r)) && (r = n ? J(n) : null), t.serviceTier !== void 0 && Y(n, i), t.serviceTier === void 0 && t.modelId && i && !n.serviceTiers?.some((e) => e.id === i) && (i = n ? Ar(n) : null), {
+	return t.modelId && a.length > 0 && (!r || !a.includes(r)) && (r = n ? J(n) : null), t.serviceTier !== void 0 && Y(n, i), t.serviceTier === void 0 && t.modelId && i && !n.serviceTiers?.some((e) => e.id === i) && (i = n ? Ir(n) : null), {
 		approvalPreset: t.approvalPreset ?? e.approvalPreset,
 		planMode: t.planMode ?? e.planMode,
 		selectedModelId: n?.id ?? null,
@@ -3520,7 +3521,7 @@ function Lr(e, t) {
 		selectedServiceTier: i
 	};
 }
-function Rr(e, t, n) {
+function Wr(e, t, n) {
 	return {
 		mode: e ? "plan" : "default",
 		settings: {
@@ -3530,12 +3531,12 @@ function Rr(e, t, n) {
 		}
 	};
 }
-function zr(e, t) {
+function Gr(e, t) {
 	let n = q(e.models, e.selectedModelId), r = t.model ?? n?.model, i = t.reasoningEffort ?? e.selectedReasoningEffort, a = t.planMode ?? e.planMode;
 	return {
 		...r ? { model: r } : {},
 		...i ? { effort: i } : {},
-		...r ? { collaborationMode: Rr(a, r, i) } : {},
+		...r ? { collaborationMode: Wr(a, r, i) } : {},
 		...t.serviceTier === void 0 ? e.selectedServiceTier ? { serviceTier: e.selectedServiceTier } : {} : { serviceTier: t.serviceTier }
 	};
 }
@@ -3558,29 +3559,29 @@ function Z(e) {
 		updatedAt: (/* @__PURE__ */ new Date((e.recencyAt ?? e.updatedAt) * 1e3)).toISOString()
 	};
 }
-function Br(e, t) {
+function Kr(e, t) {
 	let n = new Map(e.map((e) => [e.id, e])), r = t.map((e) => {
 		let t = n.get(e.id);
-		return t && ae(t, e) ? t : e;
+		return t && ie(t, e) ? t : e;
 	});
 	return r.length === e.length && r.every((t, n) => t === e[n]) ? e : r;
 }
 function Q(e, t) {
 	return [t, ...e.filter((e) => e.id !== t.id)].sort((e, t) => t.updatedAt.localeCompare(e.updatedAt));
 }
-function Vr(e, t) {
-	let n = t.model ? Or(e.models, t.model) : q(e.models, e.selectedModelId);
-	return kr(n, t.reasoningEffort), Y(n, t.serviceTier), {
+function qr(e, t) {
+	let n = t.model ? Pr(e.models, t.model) : q(e.models, e.selectedModelId);
+	return Fr(n, t.reasoningEffort), Y(n, t.serviceTier), {
 		...t,
-		...t.attachments ? { attachments: Hr(t.attachments) } : {},
+		...t.attachments ? { attachments: Jr(t.attachments) } : {},
 		...t.model && n ? { model: n.model } : {}
 	};
 }
-function Hr(e) {
+function Jr(e) {
 	return e.map((e) => {
 		let t = e.path.trim();
 		if (!t) throw Error("Attachment paths cannot be empty");
-		if (!_(t)) throw Error(`Attachment path must be absolute: '${t}'`);
+		if (!v(t)) throw Error(`Attachment path must be absolute: '${t}'`);
 		if (e.type === "image") return {
 			...e,
 			path: t
@@ -3593,22 +3594,22 @@ function Hr(e) {
 		};
 	});
 }
-function Ur(e) {
+function Yr(e) {
 	return e.type === "image" ? {
 		type: "localImage",
 		path: e.path,
 		...e.detail === void 0 ? {} : { detail: e.detail }
-	} : kt(e.name ?? h(e.path), e.path);
+	} : Nt(e.name ?? g(e.path), e.path);
 }
-function Wr(e) {
-	let t = e.name?.trim() || h(e.path);
+function Xr(e) {
+	let t = e.name?.trim() || g(e.path);
 	return e.type === "image" ? {
 		type: "attachment",
 		attachment: {
 			kind: "image",
 			name: t,
 			path: e.path,
-			url: e.previewUrl ?? ie(e.path).href,
+			url: e.previewUrl ?? re(e.path).href,
 			...e.mimeType ? { mimeType: e.mimeType } : {}
 		}
 	} : {
@@ -3621,14 +3622,14 @@ function Wr(e) {
 		}
 	};
 }
-function Gr(e) {
+function Zr(e) {
 	let t = e.metadata?.turnId;
 	return e.turnId ?? (typeof t == "string" ? t : null);
 }
-function Kr(e) {
+function Qr(e) {
 	return e.parts.filter((e) => e.type === "text").map((e) => e.text).join("\n").trim();
 }
-function qr(e) {
+function $r(e) {
 	return e.parts.flatMap((e) => {
 		if (e.type !== "attachment") return [];
 		let t = e.attachment, n = t.path;
@@ -3646,7 +3647,7 @@ function qr(e) {
 		}] : [];
 	});
 }
-function Jr(e) {
+function ei(e) {
 	let t = e.modelContextWindow, n = e.last.totalTokens, r = typeof t == "number" && t > 0 ? Math.min(100, Math.max(0, n / t * 100)) : null;
 	return {
 		totalTokens: e.total.totalTokens,
@@ -3665,13 +3666,13 @@ function $(e) {
 		activeFlags: [...e.activeFlags]
 	} : { type: e.type };
 }
-function Yr(e) {
+function ti(e) {
 	return e.type === "active" ? "active" : e.type === "systemError" ? "error" : "idle";
 }
-function Xr(e) {
-	let t = e.rateLimitsByLimitId ? Object.fromEntries(Object.entries(e.rateLimitsByLimitId).filter((e) => !!e[1]).map(([e, t]) => [e, Zr(t)])) : null;
+function ni(e) {
+	let t = e.rateLimitsByLimitId ? Object.fromEntries(Object.entries(e.rateLimitsByLimitId).filter((e) => !!e[1]).map(([e, t]) => [e, ri(t)])) : null;
 	return {
-		rateLimits: Zr(e.rateLimits),
+		rateLimits: ri(e.rateLimits),
 		rateLimitsByLimitId: t,
 		rateLimitResetCredits: e.rateLimitResetCredits ? {
 			availableCount: String(e.rateLimitResetCredits.availableCount),
@@ -3679,7 +3680,7 @@ function Xr(e) {
 		} : null
 	};
 }
-function Zr(e) {
+function ri(e) {
 	return {
 		limitId: e.limitId,
 		limitName: e.limitName,
@@ -3691,21 +3692,21 @@ function Zr(e) {
 		rateLimitReachedType: e.rateLimitReachedType
 	};
 }
-function Qr(e, t) {
-	let n = Zr(t);
+function ii(e, t) {
+	let n = ri(t);
 	if (!e) return {
 		rateLimits: n,
 		rateLimitsByLimitId: n.limitId ? { [n.limitId]: n } : null,
 		rateLimitResetCredits: null
 	};
-	let r = $r(e.rateLimits, n), i = e.rateLimitsByLimitId ? { ...e.rateLimitsByLimitId } : {};
-	return r.limitId && (i[r.limitId] = $r(i[r.limitId] ?? r, n)), {
+	let r = ai(e.rateLimits, n), i = e.rateLimitsByLimitId ? { ...e.rateLimitsByLimitId } : {};
+	return r.limitId && (i[r.limitId] = ai(i[r.limitId] ?? r, n)), {
 		...e,
 		rateLimits: r,
 		rateLimitsByLimitId: Object.keys(i).length > 0 ? i : null
 	};
 }
-function $r(e, t) {
+function ai(e, t) {
 	return {
 		limitId: t.limitId ?? e.limitId,
 		limitName: t.limitName ?? e.limitName,
@@ -3731,7 +3732,7 @@ function $r(e, t) {
 }
 //#endregion
 //#region src/node/codex-surface-catalog-controller.ts
-var ei = class {
+var oi = class {
 	client;
 	cwd;
 	host;
@@ -3766,7 +3767,7 @@ var ei = 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 br((await this.client.request("skills/list", {
+			let n = await Er((await this.client.request("skills/list", {
 				...this.cwd ? { cwds: [this.cwd] } : {},
 				forceReload: e
 			})).data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e));
@@ -3783,7 +3784,7 @@ var ei = class {
 	}
 	async listSkills(e = {}) {
 		await this.host.ensureConnected(), e.forceReload && this.iconDataUrls.clear();
-		let t = await br((await this.client.request("skills/list", {
+		let t = await Er((await this.client.request("skills/list", {
 			...e.cwd ? { cwds: [e.cwd] } : {},
 			forceReload: e.forceReload ?? !1
 		})).data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e));
@@ -3795,7 +3796,7 @@ var ei = class {
 	}
 	async loadPermissionProfiles() {
 		try {
-			let e = await this.requestPermissionProfiles(this.cwd), t = (await this.client.request("configRequirements/read", void 0)).requirements, n = jr(e, t), r = this.host.preferredApprovalPreset();
+			let e = await this.requestPermissionProfiles(this.cwd), t = (await this.client.request("configRequirements/read", void 0)).requirements, n = Lr(e, t), r = this.host.preferredApprovalPreset();
 			this.host.patch({
 				permissionProfiles: e,
 				approvalPresets: n,
@@ -3811,7 +3812,7 @@ var ei = class {
 	}
 	async loadRateLimits() {
 		try {
-			let e = Xr(await this.client.request("account/rateLimits/read", void 0));
+			let e = ni(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) }
@@ -3837,12 +3838,12 @@ var ei = class {
 		}), (async () => ({
 			profiles: await this.requestPermissionProfiles(e),
 			requirements: (await this.client.request("configRequirements/read", void 0)).requirements
-		}))()]), a = r.status === "fulfilled" ? await br(r.value.data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e)) : [], o = i.status === "fulfilled" ? i.value.profiles : [];
+		}))()]), a = r.status === "fulfilled" ? await Er(r.value.data.flatMap((e) => e.skills), (e) => this.iconDataUrl(e)) : [], o = i.status === "fulfilled" ? i.value.profiles : [];
 		return {
 			skills: a,
 			skillCatalogStatus: r.status === "fulfilled" ? "loaded" : "error",
 			permissionProfiles: o,
-			approvalPresets: i.status === "fulfilled" ? jr(o, i.value.requirements) : []
+			approvalPresets: i.status === "fulfilled" ? Lr(o, i.value.requirements) : []
 		};
 	}
 	schedulePluginRefresh(e = !1) {
@@ -3869,7 +3870,7 @@ var ei = class {
 				cursor: n,
 				includeHidden: e
 			});
-			t.push(...r.data.map(yr)), n = r.nextCursor;
+			t.push(...r.data.map(Tr)), n = r.nextCursor;
 		} while (n);
 		return t;
 	}
@@ -3880,7 +3881,7 @@ var ei = class {
 			modelCatalogStatus: "loaded",
 			selectedModelId: n?.id ?? null,
 			selectedReasoningEffort: n ? J(n) : null,
-			selectedServiceTier: n ? Ar(n) : null
+			selectedServiceTier: n ? Ir(n) : null
 		}), this.emitModels(e, "loaded", t);
 	}
 	emitModels(e, t, n = "action") {
@@ -3939,7 +3940,7 @@ var ei = 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 = Br(this.host.getState().plugins, await Promise.all([...n.values()].map((e) => Sr(e, (e) => this.iconDataUrl(e)))));
+			let r = Kr(this.host.getState().plugins, await Promise.all([...n.values()].map((e) => Or(e, (e) => this.iconDataUrl(e)))));
 			if (this.host.isClosed() || this.host.authenticationBlocksBootstrap()) return;
 			this.host.patch({
 				plugins: r,
@@ -3969,10 +3970,10 @@ var ei = class {
 		return this.iconDataUrls.set(e, n), n;
 	}
 	async readIconDataUrl(e) {
-		if (!_(e)) return;
-		let t = Tr(e);
+		if (!v(e)) return;
+		let t = jr(e);
 		if (t) try {
-			return Er(t, (await this.client.request("fs/readFile", { path: e })).dataBase64);
+			return Mr(t, (await this.client.request("fs/readFile", { path: e })).dataBase64);
 		} catch {
 			return;
 		}
@@ -3980,18 +3981,18 @@ var ei = class {
 };
 //#endregion
 //#region src/node/codex-approvals.ts
-function ti(e, t) {
+function si(e, t) {
 	let n = [
 		e.onServerRequest("item/commandExecution/requestApproval", (e, n) => (t({
-			approval: ni(e.id, e.params),
-			resolve: (t, r) => n.resolve({ decision: ai(e.params, t, r) })
+			approval: ci(e.id, e.params),
+			resolve: (t, r) => n.resolve({ decision: di(e.params, t, r) })
 		}), !0)),
 		e.onServerRequest("item/fileChange/requestApproval", (e, n) => (t({
-			approval: ri(e.id, e.params),
+			approval: li(e.id, e.params),
 			resolve: (e, t) => n.resolve({ decision: e === "deny" ? "decline" : t === "session" ? "acceptForSession" : "accept" })
 		}), !0)),
 		e.onServerRequest("item/permissions/requestApproval", (e, n) => (t({
-			approval: ii(e.id, e.params),
+			approval: ui(e.id, e.params),
 			resolve: (t, r) => n.resolve({
 				permissions: t === "deny" ? {} : {
 					...e.params.permissions.fileSystem ? { fileSystem: e.params.permissions.fileSystem } : {},
@@ -4029,8 +4030,8 @@ function ti(e, t) {
 		for (let e of n) e();
 	};
 }
-function ni(e, t) {
-	let n = t.availableDecisions, r = oi(t.additionalPermissions), i = [...t.networkApprovalContext ? [{
+function ci(e, t) {
+	let n = t.availableDecisions, r = fi(t.additionalPermissions), i = [...t.networkApprovalContext ? [{
 		kind: "network",
 		enabled: !0,
 		host: t.networkApprovalContext.host,
@@ -4053,7 +4054,7 @@ function ni(e, t) {
 		} : {}
 	};
 }
-function ri(e, t) {
+function li(e, t) {
 	return {
 		id: String(e),
 		kind: "file-change",
@@ -4064,8 +4065,8 @@ function ri(e, t) {
 		...t.reason || t.grantRoot ? { description: t.reason ?? `Write under ${t.grantRoot}` } : {}
 	};
 }
-function ii(e, t) {
-	let n = oi(t.permissions);
+function ui(e, t) {
+	let n = fi(t.permissions);
 	return {
 		id: String(e),
 		kind: "permissions",
@@ -4078,13 +4079,13 @@ function ii(e, t) {
 		...n.length ? { requestedPermissions: n } : {}
 	};
 }
-function ai(e, t, n) {
+function di(e, t, n) {
 	let r = e.availableDecisions, i = t === "deny" ? "decline" : n === "session" ? "acceptForSession" : "accept";
 	if (!r || r.includes(i)) return i;
 	if (t === "deny" && r.includes("cancel")) return "cancel";
 	throw Error(`Approval decision '${t}:${n}' is not available for this command`);
 }
-function oi(e) {
+function fi(e) {
 	if (!e) return [];
 	let t = [];
 	if (e.network && t.push({
@@ -4104,12 +4105,12 @@ function oi(e) {
 		for (let n of e.fileSystem.entries ?? []) t.push({
 			kind: "filesystem",
 			access: n.access,
-			path: si(n.path)
+			path: pi(n.path)
 		});
 	}
 	return t;
 }
-function si(e) {
+function pi(e) {
 	if (e.type === "path") return e.path;
 	if (e.type === "glob_pattern") return e.pattern;
 	let t = e.value;
@@ -4124,12 +4125,12 @@ function si(e) {
 }
 //#endregion
 //#region src/node/codex-surface-approvals-controller.ts
-var ci = class {
+var mi = class {
 	host;
 	pending = /* @__PURE__ */ new Map();
 	unsubscribeHandler;
 	constructor(e, t) {
-		this.host = t, this.unsubscribeHandler = ti(e, (e) => this.add(e));
+		this.host = t, this.unsubscribeHandler = si(e, (e) => this.add(e));
 	}
 	close() {
 		this.unsubscribeHandler(), this.pending.clear();
@@ -4210,7 +4211,7 @@ var ci = class {
 };
 //#endregion
 //#region src/node/codex-surface-mcp.ts
-function li(e) {
+function hi(e) {
 	if (!Array.isArray(e)) throw TypeError("Codex MCP servers must be an array");
 	let t = /* @__PURE__ */ new Set();
 	return e.map((e, n) => {
@@ -4219,10 +4220,10 @@ function li(e) {
 		if (!r || !/^[A-Za-z0-9][A-Za-z0-9_-]*$/.test(r)) throw TypeError(`Codex MCP server ${n + 1} name must match ^[A-Za-z0-9][A-Za-z0-9_-]*$`);
 		if (t.has(r)) throw Error(`Duplicate Codex MCP server '${r}'`);
 		t.add(r);
-		let i = ui(e.transport, r), a = e.toolApprovalMode;
+		let i = gi(e.transport, r), a = e.toolApprovalMode;
 		if (a !== void 0 && a !== "auto" && a !== "prompt" && a !== "writes" && a !== "approve") throw TypeError(`Codex MCP server '${r}' tool approval mode is invalid`);
 		if (e.required !== void 0 && typeof e.required != "boolean") throw TypeError(`Codex MCP server '${r}' required flag must be a boolean`);
-		let o = e.enabledTools === void 0 ? void 0 : di(e.enabledTools, `Codex MCP server '${r}' enabled tool`), s = pi(e.startupTimeoutMs, `Codex MCP server '${r}' startup timeout`), c = pi(e.toolTimeoutMs, `Codex MCP server '${r}' tool timeout`);
+		let o = e.enabledTools === void 0 ? void 0 : _i(e.enabledTools, `Codex MCP server '${r}' enabled tool`), s = yi(e.startupTimeoutMs, `Codex MCP server '${r}' startup timeout`), c = yi(e.toolTimeoutMs, `Codex MCP server '${r}' tool timeout`);
 		return {
 			name: r,
 			transport: i,
@@ -4234,7 +4235,7 @@ function li(e) {
 		};
 	});
 }
-function ui(e, t) {
+function gi(e, t) {
 	if (!e || typeof e != "object" || Array.isArray(e)) throw TypeError(`Codex MCP server '${t}' transport must be an object`);
 	if (e.type === "http") {
 		let n = e.url?.trim(), r;
@@ -4252,8 +4253,8 @@ function ui(e, t) {
 	if (e.type !== "stdio") throw TypeError(`Codex MCP server '${t}' transport type is invalid`);
 	let n = e.command?.trim();
 	if (!n) throw TypeError(`Codex MCP server '${t}' command cannot be empty`);
-	let r = e.args === void 0 ? void 0 : di(e.args, `Codex MCP server '${t}' argument`), i = e.cwd?.trim();
-	if (i !== void 0 && (!i || !_(i))) throw TypeError(`Codex MCP server '${t}' cwd must be an absolute path`);
+	let r = e.args === void 0 ? void 0 : _i(e.args, `Codex MCP server '${t}' argument`), i = e.cwd?.trim();
+	if (i !== void 0 && (!i || !v(i))) throw TypeError(`Codex MCP server '${t}' cwd must be an absolute path`);
 	let a;
 	if (e.env !== void 0) {
 		if (!e.env || typeof e.env != "object" || Array.isArray(e.env)) throw TypeError(`Codex MCP server '${t}' env must be an object`);
@@ -4263,7 +4264,7 @@ function ui(e, t) {
 			a[n] = r;
 		}
 	}
-	let o = e.envVars === void 0 ? void 0 : fi(e.envVars, t);
+	let o = e.envVars === void 0 ? void 0 : vi(e.envVars, t);
 	return {
 		type: "stdio",
 		command: n,
@@ -4273,7 +4274,7 @@ function ui(e, t) {
 		...o === void 0 ? {} : { envVars: o }
 	};
 }
-function di(e, t) {
+function _i(e, t) {
 	if (!Array.isArray(e)) throw TypeError(`${t}s must be an array`);
 	let n = e.map((e) => {
 		if (typeof e != "string" || !e.trim()) throw TypeError(`${t} cannot be empty`);
@@ -4281,18 +4282,18 @@ function di(e, t) {
 	});
 	return [...new Set(n)];
 }
-function fi(e, t) {
-	let n = di(e, `Codex MCP server '${t}' environment variable`);
+function vi(e, t) {
+	let n = _i(e, `Codex MCP server '${t}' environment variable`);
 	for (let e of n) if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(e)) throw TypeError(`Codex MCP server '${t}' environment variable '${e}' is invalid`);
 	return n;
 }
-function pi(e, t) {
+function yi(e, t) {
 	if (e !== void 0) {
 		if (!Number.isFinite(e) || e <= 0) throw TypeError(`${t} must be a positive finite number`);
 		return e;
 	}
 }
-function mi(e) {
+function bi(e) {
 	let t = {};
 	for (let n of e) {
 		let e = n.transport.type === "http" ? { url: n.transport.url } : {
@@ -4306,7 +4307,7 @@ function mi(e) {
 	}
 	return t;
 }
-function hi(e, t) {
+function xi(e, t) {
 	if (t.length !== 0) for (let n of Object.keys(e)) {
 		if (n === "mcp_servers") throw Error("Raw mcp_servers config cannot be combined with typed Codex MCP servers");
 		for (let e of t) {
@@ -4317,13 +4318,13 @@ function hi(e, t) {
 }
 //#endregion
 //#region src/node/codex-surface-extensions-controller.ts
-var gi = class {
+var Si = class {
 	extensions;
 	hostOptionsForThread;
 	dynamicTools = /* @__PURE__ */ new Map();
 	defaultMcpServers;
 	constructor(e, t, n) {
-		this.extensions = e, this.hostOptionsForThread = n, this.defaultMcpServers = li(t);
+		this.extensions = e, this.hostOptionsForThread = n, this.defaultMcpServers = hi(t);
 		for (let t of e) for (let e of t.dynamicTools ?? []) {
 			let t = e.name.trim();
 			if (!t) throw Error("Dynamic tool names cannot be empty");
@@ -4347,13 +4348,13 @@ var gi = class {
 		}));
 	}
 	async conversationExtension(e, t = {}, n = this.defaultMcpServers) {
-		let r = mi(n), i = [], a;
+		let r = bi(n), i = [], a;
 		for (let t of this.extensions) {
 			if (!t.configureConversation) continue;
 			let o = await t.configureConversation(e);
-			o.config && (hi(o.config, n), Object.assign(r, o.config)), o.baseInstructions !== void 0 && (a = o.baseInstructions), o.developerInstructions?.trim() && i.push(o.developerInstructions.trim());
+			o.config && (xi(o.config, n), Object.assign(r, o.config)), o.baseInstructions !== void 0 && (a = o.baseInstructions), o.developerInstructions?.trim() && i.push(o.developerInstructions.trim());
 		}
-		return t.config && (hi(t.config, n), Object.assign(r, t.config)), t.baseInstructions !== void 0 && (a = t.baseInstructions), t.developerInstructions?.trim() && i.push(t.developerInstructions.trim()), {
+		return t.config && (xi(t.config, n), Object.assign(r, t.config)), t.baseInstructions !== void 0 && (a = t.baseInstructions), t.developerInstructions?.trim() && i.push(t.developerInstructions.trim()), {
 			...a === void 0 ? {} : { baseInstructions: a },
 			...Object.keys(r).length === 0 ? {} : { config: r },
 			...i.length === 0 ? {} : { developerInstructions: i.join("\n\n") }
@@ -4407,12 +4408,12 @@ var gi = class {
 				success: !1,
 				contentItems: [{
 					type: "inputText",
-					text: E(e)
+					text: O(e)
 				}]
 			});
 		}
 	}
-}, _i = 50, vi = 25, yi = 25, bi = class {
+}, Ci = 50, wi = 25, Ti = 25, Ei = class {
 	client;
 	conversationLimit;
 	host;
@@ -4431,7 +4432,7 @@ var gi = class {
 		return await this.host.ensureConnected(), this.load();
 	}
 	async load() {
-		let e = Br(this.host.getState().conversations, await this.requestConversations({ limit: this.conversationLimit }));
+		let e = Kr(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();
@@ -4440,7 +4441,7 @@ var gi = class {
 		return await this.host.ensureConnected(), structuredClone(await this.requestConversations(e));
 	}
 	async readSummary(e) {
-		let t = T(e);
+		let t = D(e);
 		await this.host.ensureConnected();
 		let n = await this.client.request("thread/read", {
 			threadId: t,
@@ -4451,15 +4452,15 @@ var gi = class {
 		return structuredClone(r);
 	}
 	async archive(e) {
-		let t = T(e);
+		let t = D(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 = T(e);
+		let t = D(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 = T(e);
+		let t = D(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}'`);
@@ -4481,7 +4482,7 @@ var gi = class {
 					let t = await this.client.request("thread/turns/list", {
 						threadId: e,
 						cursor: null,
-						limit: _i,
+						limit: Ci,
 						sortDirection: "desc",
 						itemsView: "full"
 					});
@@ -4501,7 +4502,7 @@ var gi = class {
 					historyHasOlder: !1
 				});
 			} catch (t) {
-				throw this.host.runtime(e) && this.host.patchRuntime(e, { error: `Could not load complete conversation history: ${E(t)}` }), t;
+				throw this.host.runtime(e) && this.host.patchRuntime(e, { error: `Could not load complete conversation history: ${O(t)}` }), t;
 			}
 		})();
 		return this.historyHydrations.set(e, r), r.finally(() => {
@@ -4529,7 +4530,7 @@ var gi = class {
 					let i = new Set(this.host.requireRuntime(e).turnIds), a = await this.client.request("thread/turns/list", {
 						threadId: e,
 						cursor: t,
-						limit: vi,
+						limit: wi,
 						sortDirection: "desc",
 						itemsView: "full"
 					}), o = [...a.data].reverse(), s = new Set(o.map((e) => e.id).filter((e) => !i.has(e)));
@@ -4545,7 +4546,7 @@ var gi = class {
 					hasOlder: this.host.requireRuntime(e).historyHasOlder
 				};
 			} catch (t) {
-				throw this.host.runtime(e) && this.host.patchRuntime(e, { error: E(t) }), t;
+				throw this.host.runtime(e) && this.host.patchRuntime(e, { error: O(t) }), t;
 			} finally {
 				this.host.runtime(e) && this.host.patchRuntime(e, { historyLoadingOlder: !1 });
 			}
@@ -4560,8 +4561,8 @@ var gi = class {
 	}
 	async emitHistoryChunks(e, t) {
 		for (let n = t.length; n > 0;) {
-			let r = Math.max(0, n - yi);
-			this.host.emitHistoryPrepended(e, t.slice(r, n), "lifecycle"), await xi(), n = r;
+			let r = Math.max(0, n - Ti);
+			this.host.emitHistoryPrepended(e, t.slice(r, n), "lifecycle"), await Di(), n = r;
 		}
 	}
 	async refreshCompleteHistory(e) {
@@ -4597,7 +4598,7 @@ var gi = class {
 		let i = /* @__PURE__ */ new Set();
 		r.activeTurnId && i.add(r.activeTurnId);
 		for (let e of t) e.status === "inProgress" && r.turnIds.includes(e.id) && i.add(e.id);
-		let a = new Set(t.filter((e) => !i.has(e.id)).map((e) => e.id)), o = t.filter((e) => a.has(e.id)), s = r.turnIds.filter((e) => !a.has(e)), c = r.turns.filter((e) => !a.has(e.id)), l = r.messages.filter((e) => e.turnId === void 0 || !a.has(e.turnId)), u = Pn(r.messages, o.flatMap((t) => Fn(e, t)));
+		let a = new Set(t.filter((e) => !i.has(e.id)).map((e) => e.id)), o = t.filter((e) => a.has(e.id)), s = r.turnIds.filter((e) => !a.has(e)), c = r.turns.filter((e) => !a.has(e.id)), l = r.messages.filter((e) => e.turnId === void 0 || !a.has(e.turnId)), u = Rn(r.messages, o.flatMap((t) => zn(e, t)));
 		this.host.patchRuntime(e, {
 			turnIds: [...o.map((e) => e.id), ...s],
 			turns: [...o.map((e) => W(e)), ...c],
@@ -4624,12 +4625,12 @@ var gi = class {
 		} : t;
 	}
 };
-function xi() {
+function Di() {
 	return new Promise((e) => setTimeout(e, 0));
 }
 //#endregion
 //#region src/node/codex-surface-conversation-settings-controller.ts
-var Si = class {
+var Oi = class {
 	client;
 	defaults;
 	host;
@@ -4641,7 +4642,7 @@ var Si = 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 Mr(r);
+		if (r) return Rr(r);
 		let i = e.approvalMode ?? this.defaults.approvalMode, a = e.permissionMode ?? this.defaults.permissionMode ?? "read-only";
 		return {
 			approvalPolicy: i === "ask" ? "on-request" : "never",
@@ -4667,23 +4668,23 @@ var Si = class {
 	async update(e) {
 		let t = this.host.getState(), n = t.activeConversationId;
 		if (!n) {
-			let n = Lr(t, e);
+			let n = Ur(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 = Lr(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 = Ur(r, t), a = n.approvalPreset !== i.approvalPreset || n.selectedModelId !== i.selectedModelId || n.selectedReasoningEffort !== i.selectedReasoningEffort || n.selectedServiceTier !== i.selectedServiceTier || n.planMode !== i.planMode;
 		if (t.approvalPreset && !r.approvalPresets.includes(t.approvalPreset)) throw Error(`Approval preset '${t.approvalPreset}' is not available`);
 		let o = q(this.host.getState().models, i.selectedModelId);
 		await this.client.request("thread/settings/update", {
 			threadId: e,
-			...t.approvalPreset ? Nr(t.approvalPreset) : {},
+			...t.approvalPreset ? zr(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: Rr(i.planMode, o.model, i.selectedReasoningEffort) } : {}
+			...o && (typeof t.planMode == "boolean" || t.modelId || t.reasoningEffort) ? { collaborationMode: Wr(i.planMode, o.model, i.selectedReasoningEffort) } : {}
 		}), this.host.patchRuntime(e, i), a && this.host.emitConversationSettings(e, "action");
 	}
 	async setGoal(e, t) {
@@ -4702,7 +4703,7 @@ var Si = 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 = !ur(r.goal, a.goal);
+		let o = !gr(r.goal, a.goal);
 		this.host.patchRuntime(e, { goal: { ...a.goal } }), o && this.host.emitEvent("action", {
 			type: "conversation.goalChanged",
 			conversationId: e,
@@ -4724,7 +4725,7 @@ var Si = class {
 			payload: { goal: null }
 		});
 	}
-}, Ci = "Review the current code changes (staged, unstaged, and untracked files) and provide prioritized findings.", wi = class {
+}, ki = "Review the current code changes (staged, unstaged, and untracked files) and provide prioritized findings.", Ai = class {
 	client;
 	host;
 	constructor(e, t) {
@@ -4753,7 +4754,7 @@ var Si = class {
 			error: null
 		}), this.host.patchConversationStatus(e, "active", "action"), this.host.emitConversationActivity(e, "action");
 		try {
-			let r = Ze(t.target ?? { type: "uncommittedChanges" }), i = await this.client.request("review/start", {
+			let r = tt(t.target ?? { type: "uncommittedChanges" }), i = await this.client.request("review/start", {
 				threadId: e,
 				target: r,
 				delivery: "inline"
@@ -4761,22 +4762,22 @@ var Si = 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 = Fn(e, i.turn).filter((e) => !n.messages.some((t) => t.id === e.id)).map((e) => e.role === "user" ? {
+			let o = zn(e, i.turn).filter((e) => !n.messages.some((t) => t.id === e.id)).map((e) => e.role === "user" ? {
 				...e,
 				parts: r.type === "uncommittedChanges" ? e.parts.map((e) => e.type === "text" && e.text === "current changes" ? {
 					...e,
-					text: Ci
+					text: ki
 				} : e) : e.parts,
 				metadata: {
 					...e.metadata,
 					reviewPrompt: !0
 				}
-			} : e), s = Ti(n.messages, i.turn.id, o);
+			} : e), s = ji(n.messages, i.turn.id, o);
 			this.host.patchRuntime(e, {
 				busy: n.activeTurnId !== null,
 				turnStartPending: !1,
 				turns: G(n.turns, W(i.turn)),
-				messages: n.activeTurnId ? P(s, e, i.turn.id) : s
+				messages: n.activeTurnId ? I(s, e, i.turn.id) : s
 			});
 			for (let t of o) this.host.emitEvent("action", {
 				type: "message.appended",
@@ -4794,7 +4795,7 @@ var Si = class {
 			throw this.host.patchRuntime(e, {
 				busy: !1,
 				turnStartPending: !1,
-				error: E(t)
+				error: O(t)
 			}), this.host.patchConversationStatus(e, "error", "action"), this.host.emitConversationActivity(e, "action"), t;
 		}
 	}
@@ -4821,11 +4822,11 @@ var Si = class {
 		return await this.editTurnForThread(n, e, t), this.host.getSnapshot();
 	}
 	async editTurnForThread(e, t, n) {
-		let r = (await this.host.ensureThreadReady(e)).messages.find((e) => e.role === "user" && e.kind !== "steer" && Gr(e) === t);
+		let r = (await this.host.ensureThreadReady(e)).messages.find((e) => e.role === "user" && e.kind !== "steer" && Zr(e) === t);
 		if (!r) throw Error(`Could not find the user prompt for Codex turn '${t}'`);
 		let i = n.trim();
 		if (!i) throw Error("Cannot replace a turn prompt with empty content");
-		let a = qr(r);
+		let a = $r(r);
 		await this.rollbackToTurn(e, t), await this.host.sendMessageToThread(e, i, a.length > 0 ? { attachments: a } : {});
 	}
 	async retryTurn(e) {
@@ -4833,11 +4834,11 @@ var Si = class {
 		return await this.retryTurnForThread(t, e), this.host.getSnapshot();
 	}
 	async retryTurnForThread(e, t) {
-		let n = (await this.host.ensureThreadReady(e)).messages.find((e) => e.role === "user" && e.kind !== "steer" && Gr(e) === t);
+		let n = (await this.host.ensureThreadReady(e)).messages.find((e) => e.role === "user" && e.kind !== "steer" && Zr(e) === t);
 		if (!n) throw Error("Could not find the user prompt for this turn");
-		let r = Kr(n);
+		let r = Qr(n);
 		if (!r) throw Error("Could not find the user prompt for this turn");
-		let i = qr(n);
+		let i = $r(n);
 		await this.rollbackToTurn(e, t), await this.host.sendMessageToThread(e, r, i.length > 0 ? { attachments: i } : {});
 	}
 	async rollbackToTurn(e, t) {
@@ -4857,7 +4858,7 @@ var Si = class {
 		n.turnIds = i.thread.turns.map((e) => e.id), n.turns = i.thread.turns.map((e) => W(e)), n.activeTurnId = null;
 		let a = Z(i.thread);
 		this.host.patch({ conversations: Q(this.host.getState().conversations, a) }), this.host.patchRuntime(e, {
-			messages: Nn(i.thread),
+			messages: Ln(i.thread),
 			answeredClientRequestIds: [],
 			busy: !1,
 			turnStartPending: !1,
@@ -4873,7 +4874,7 @@ var Si = 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 = Gr(e);
+			let t = Zr(e);
 			return t === null || o.has(t);
 		});
 		r.turnIds = a, r.turns = r.turns.filter((e) => o.has(e.id)), r.activeTurnId = null;
@@ -4900,7 +4901,7 @@ var Si = class {
 		return e;
 	}
 };
-function Ti(e, t, n) {
+function ji(e, t, n) {
 	let r = e.findIndex((e) => e.turnId === t);
 	return r < 0 ? [...e, ...n] : [
 		...e.slice(0, r),
@@ -4910,7 +4911,7 @@ function Ti(e, t, n) {
 }
 //#endregion
 //#region src/node/codex-surface-messages-controller.ts
-var Ei = class {
+var Mi = class {
 	client;
 	host;
 	constructor(e, t) {
@@ -4921,7 +4922,7 @@ var Ei = class {
 		let n = e.trim();
 		if (!n) throw Error("Cannot send an empty message");
 		if (!this.host.getState().activeConversationId) {
-			let e = Je(n);
+			let e = Qe(n);
 			if (e) {
 				if (await this.host.createConversation(), await this.host.updateSettings({ planMode: !0 }), !e.prompt) return this.host.getSnapshot();
 				n = e.prompt, t = {
@@ -4929,14 +4930,14 @@ var Ei = class {
 					planMode: !0
 				};
 			}
-			let r = Ye(n);
+			let r = $e(n);
 			if (r) {
 				if (r.action === "clear" || r.action === "show" || r.action === "edit") return this.host.getSnapshot();
 				if (r.action === "set") return this.host.setGoal(r.objective);
 				throw Error("Pausing and resuming goals is not supported by Codex app-server");
 			}
 			if (n === "/compact") return this.host.getSnapshot();
-			let i = Xe(n);
+			let i = et(n);
 			if (i) return await this.host.createConversation(), this.host.startReview({ target: i });
 			this.host.getState().activeConversationId || await this.host.createConversation();
 		}
@@ -4947,7 +4948,7 @@ var Ei = class {
 	async sendToThread(e, t, n = {}) {
 		let r = await this.host.ensureThreadReady(e), i = t.trim();
 		if (!i) throw Error("Cannot send an empty message");
-		let a = Je(i);
+		let a = Qe(i);
 		if (a) {
 			if (await this.host.updateSettingsForThread(e, { planMode: !0 }), !a.prompt) return;
 			i = a.prompt, n = {
@@ -4955,7 +4956,7 @@ var Ei = class {
 				planMode: !0
 			};
 		}
-		let o = Ye(i);
+		let o = $e(i);
 		if (o) {
 			if (o.action === "clear") return this.host.clearGoalForThread(e);
 			if (o.action === "set") return this.host.setGoalForThread(e, o.objective);
@@ -4963,11 +4964,11 @@ var Ei = class {
 			return;
 		}
 		if (i === "/compact") return this.host.compactForThread(e);
-		let s = Xe(i);
+		let s = et(i);
 		if (s) return this.host.startReviewForThread(e, { target: s });
 		n = {
-			...Vr(this.host.snapshotForRuntime(r), n),
-			...n.skills ? { skills: $e(n.skills, r.skills) } : {}
+			...qr(this.host.snapshotForRuntime(r), n),
+			...n.skills ? { skills: rt(n.skills, r.skills) } : {}
 		}, await this.sendPromptToThread(e, i, n);
 	}
 	async continueInterruptedTurn() {
@@ -4990,7 +4991,7 @@ var Ei = class {
 			let n = await this.client.request("turn/start", {
 				threadId: e,
 				input: [],
-				...zr(this.host.snapshotForRuntime(t), {})
+				...Gr(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";
@@ -4998,7 +4999,7 @@ var Ei = class {
 				busy: i,
 				turnStartPending: !1,
 				turns: G(t.turns, W(n.turn)),
-				messages: i ? P(t.messages, e, n.turn.id) : t.messages
+				messages: i ? I(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,
@@ -5009,28 +5010,28 @@ var Ei = class {
 			throw this.host.patchRuntime(e, {
 				busy: !1,
 				turnStartPending: !1,
-				error: E(t)
+				error: O(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 = Vr(this.host.snapshotForRuntime(i), n), o = r?.trim() || t, s = et(Qe(t, i.skills), $e(a.skills ?? [], i.skills)), c = Hr(a.attachments ?? []);
+		let i = this.host.requireRuntime(e), a = qr(this.host.snapshotForRuntime(i), n), o = r?.trim() || t, s = it(nt(t, i.skills), rt(a.skills ?? [], i.skills)), c = Jr(a.attachments ?? []);
 		if (i.busy) {
 			this.host.patchRuntime(e, { queuedPrompts: [...i.queuedPrompts, {
-				id: fr(),
+				id: vr(),
 				text: o,
 				...Object.keys(a).length > 0 ? { options: a } : {}
 			}] }), this.emitQueuedPrompts(e);
 			return;
 		}
-		let l = dr(), u = {
+		let l = _r(), u = {
 			id: l,
 			role: "user",
 			status: "complete",
 			parts: [{
 				type: "text",
 				text: o
-			}, ...c.map(Wr)],
+			}, ...c.map(Xr)],
 			createdAt: (/* @__PURE__ */ new Date()).toISOString(),
 			metadata: {
 				conversationId: e,
@@ -5057,14 +5058,14 @@ var Ei = class {
 						text: t,
 						text_elements: []
 					},
-					...c.map(Ur),
+					...c.map(Yr),
 					...s.map((e) => ({
 						type: "skill",
 						name: e.name,
 						path: e.path
 					}))
 				],
-				...zr(this.host.snapshotForRuntime(i), a),
+				...Gr(this.host.snapshotForRuntime(i), a),
 				...a.outputSchema === void 0 ? {} : { outputSchema: a.outputSchema }
 			}), r = i.turnIds.includes(n.turn.id);
 			i.activeTurnId = n.turn.status === "inProgress" ? n.turn.id : null, i.turnIds.includes(n.turn.id) || i.turnIds.push(n.turn.id), this.host.patchConversationTurnCount(e, i.turnIds.length, "action");
@@ -5080,7 +5081,7 @@ var Ei = class {
 				busy: o,
 				turnStartPending: !1,
 				turns: G(i.turns, W(n.turn)),
-				messages: o ? P(u, e, n.turn.id) : u
+				messages: o ? I(u, e, n.turn.id) : u
 			}), this.host.patchConversationStatus(e, o ? "active" : "idle", "action");
 			let d = u.find((e) => e.id === l);
 			d && this.host.emitEvent("action", {
@@ -5098,7 +5099,7 @@ var Ei = class {
 			throw this.host.patchRuntime(e, {
 				busy: !1,
 				turnStartPending: !1,
-				error: E(t)
+				error: O(t)
 			}), this.host.patchConversationStatus(e, "error", "action"), this.host.emitConversationActivity(e, "action"), t;
 		}
 	}
@@ -5110,7 +5111,7 @@ var Ei = class {
 		let i = await this.host.ensureThreadReady(e), a = t.trim(), o = r?.trim() || a;
 		if (!a) throw Error("Cannot steer with an empty message");
 		if (!i.activeTurnId) throw Error("There is no active turn to steer");
-		let s = Hr(n.attachments ?? []), c = dr(), l = {
+		let s = Jr(n.attachments ?? []), c = _r(), l = {
 			id: c,
 			kind: "steer",
 			role: "user",
@@ -5118,7 +5119,7 @@ var Ei = class {
 			parts: [{
 				type: "text",
 				text: o
-			}, ...s.map(Wr)],
+			}, ...s.map(Xr)],
 			createdAt: (/* @__PURE__ */ new Date()).toISOString(),
 			turnId: i.activeTurnId,
 			metadata: {
@@ -5129,7 +5130,7 @@ var Ei = class {
 		};
 		this.host.patchRuntime(e, {
 			error: null,
-			messages: P([...i.messages, l], e, i.activeTurnId, { forceSegment: !0 })
+			messages: I([...i.messages, l], e, i.activeTurnId, { forceSegment: !0 })
 		}), this.host.emitEvent("action", {
 			type: "message.appended",
 			conversationId: e,
@@ -5145,7 +5146,7 @@ var Ei = class {
 					type: "text",
 					text: a,
 					text_elements: []
-				}, ...s.map(Ur)]
+				}, ...s.map(Yr)]
 			}), n = i.turnIds.includes(t.turnId);
 			i.activeTurnId = t.turnId, i.turnIds.includes(t.turnId) || i.turnIds.push(t.turnId), i.turns = G(i.turns, {
 				id: t.turnId,
@@ -5164,14 +5165,14 @@ var Ei = class {
 					turnId: t.turnId
 				}
 			} : e);
-			this.host.patchRuntime(e, { messages: I(P(r, e, t.turnId), e) }), n || this.host.emitEvent("action", {
+			this.host.patchRuntime(e, { messages: R(I(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: E(t) }), t;
+			throw this.host.patchRuntime(e, { error: O(t) }), t;
 		}
 	}
 	async answerAsyncQuestion(e, t, n) {
@@ -5224,7 +5225,7 @@ var Ei = class {
 			await this.sendPromptToThread(e, n.text, n.options);
 		} catch (r) {
 			this.host.patchRuntime(e, {
-				error: E(r),
+				error: O(r),
 				queuedPrompts: [n, ...t.queuedPrompts]
 			}), this.emitQueuedPrompts(e, "notification");
 		}
@@ -5242,7 +5243,7 @@ var Ei = class {
 		if (!e) throw Error("There is no active conversation");
 		return e;
 	}
-}, Di = 5, Oi = class {
+}, Ni = 5, Pi = class {
 	client;
 	options;
 	catalog;
@@ -5280,9 +5281,9 @@ var Ei = 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 ? Or(i.models, e.model) : s, l = c?.model, u = e.reasoningEffort ?? (c?.id === s?.id ? i.selectedReasoningEffort : c ? J(c) : null) ?? void 0, d = e.serviceTier === void 0 ? c?.id === s?.id ? i.selectedServiceTier ?? null : c?.defaultServiceTier ?? null : e.serviceTier;
-		kr(c, u), Y(c, d);
-		let f = t.mcpServers === void 0 ? this.extensions.defaultMcpServers : li(t.mcpServers), p = await this.extensions.conversationExtension({
+		}, r.approvalPresets), s = q(i.models, i.selectedModelId), c = e.model ? Pr(i.models, e.model) : s, l = c?.model, u = e.reasoningEffort ?? (c?.id === s?.id ? i.selectedReasoningEffort : c ? J(c) : null) ?? void 0, d = e.serviceTier === void 0 ? c?.id === s?.id ? i.selectedServiceTier ?? null : c?.defaultServiceTier ?? null : e.serviceTier;
+		Fr(c, u), Y(c, d);
+		let f = t.mcpServers === void 0 ? this.extensions.defaultMcpServers : hi(t.mcpServers), p = await this.extensions.conversationExtension({
 			operation: "start",
 			conversationId: null,
 			cwd: n,
@@ -5299,11 +5300,11 @@ var Ei = class {
 			...d === void 0 ? {} : { serviceTier: d },
 			...e.threadSource === void 0 ? {} : { threadSource: e.threadSource },
 			serviceName: "codex_app_sdk"
-		}), h = Fr(m, i.models, i);
+		}), h = Vr(m, i.models, i);
 		u && (await this.client.request("thread/settings/update", {
 			threadId: m.thread.id,
 			effort: u,
-			...c ? { collaborationMode: Rr(i.planMode, c.model, u) } : {}
+			...c ? { collaborationMode: Wr(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,
@@ -5387,7 +5388,7 @@ var Ei = class {
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
 				historyLoading: !1,
-				error: E(t)
+				error: O(t)
 			}), t;
 		}
 	}
@@ -5397,7 +5398,7 @@ var Ei = class {
 			...n
 		}, a = {
 			...i,
-			mcpServers: i.mcpServers === void 0 ? this.extensions.defaultMcpServers : li(i.mcpServers)
+			mcpServers: i.mcpServers === void 0 ? this.extensions.defaultMcpServers : hi(i.mcpServers)
 		};
 		this.hostOptionsByThread.set(e, a);
 		let o = await this.extensions.conversationExtension({
@@ -5415,7 +5416,7 @@ var Ei = class {
 				threadId: e,
 				excludeTurns: !0,
 				initialTurnsPage: {
-					limit: Di,
+					limit: Ni,
 					sortDirection: "desc",
 					itemsView: "full"
 				},
@@ -5428,7 +5429,7 @@ var Ei = class {
 			let i = t.initialTurnsPage ?? await this.client.request("thread/turns/list", {
 				threadId: t.thread.id,
 				cursor: null,
-				limit: Di,
+				limit: Ni,
 				sortDirection: "desc",
 				itemsView: "full"
 			}), d = [...i.data].reverse(), f = t.cwd ?? t.thread.cwd ?? a.cwd, p = await this.catalog.loadConversationCatalogs(f), m = s.turns.filter((e) => c.get(e.id) !== e), h = s.threadStatus !== u && s.threadStatus ? s.threadStatus : $(t.thread.status), g = d.map((e) => h.type === "idle" && e.status === "inProgress" ? {
@@ -5436,12 +5437,12 @@ var Ei = class {
 				status: "interrupted"
 			} : e), _ = new Map(g.map((e) => [e.id, W(e)]));
 			for (let e of m) _.set(e.id, e);
-			let v = m.length > 0 ? s.activeTurnId : h.type === "active" ? hn(d) : null, y = Pn(s.messages, Nn({
+			let v = m.length > 0 ? s.activeTurnId : h.type === "active" ? yn(d) : null, y = Rn(s.messages, Ln({
 				...t.thread,
 				turns: g
 			})), b = new Map(y.map((e) => [e.id, e]));
 			for (let e of s.messages) l.get(e.id) !== e && b.set(e.id, e);
-			let ee = v ? P([...b.values()], t.thread.id, v) : [...b.values()], x = this.host.createRuntime(t.thread.id, {
+			let x = v ? I([...b.values()], t.thread.id, v) : [...b.values()], S = this.host.createRuntime(t.thread.id, {
 				hydrated: !0,
 				historyMode: t.thread.historyMode ?? "legacy",
 				loadingStrategy: a.loadingStrategy ?? this.options.loadingStrategy ?? "lazy",
@@ -5454,27 +5455,27 @@ var Ei = class {
 				activeTurnId: v,
 				turns: [..._.values()],
 				turnIds: [..._.keys()],
-				messages: ee,
+				messages: x,
 				busy: m.length > 0 ? s.busy : !!v || h.type === "active",
 				goal: n ? { ...n } : null,
 				threadStatus: h,
 				...p,
-				...Fr(t, this.host.getState().models, this.host.snapshotForRuntime(s))
-			}), te = {
+				...Vr(t, this.host.getState().models, this.host.snapshotForRuntime(s))
+			}), C = {
 				...Z(t.thread),
 				turnCount: d.length
-			}, ne = this.host.getState();
+			}, ee = this.host.getState();
 			return this.host.patch({
-				conversations: Q(ne.conversations, te),
-				...ne.activeConversationId === t.thread.id ? this.host.runtimeProjection(x) : {}
-			}), this.host.emitSummaryUpserted(te, "resumed", "action"), this.host.emitHistoryReplaced(t.thread.id, r, "action"), this.emitConversationState(t.thread.id), x.loadingStrategy === "eager" && i.nextCursor !== null && this.conversations.hydrateCompleteHistory(t.thread.id, {
+				conversations: Q(ee.conversations, C),
+				...ee.activeConversationId === t.thread.id ? this.host.runtimeProjection(S) : {}
+			}), this.host.emitSummaryUpserted(C, "resumed", "action"), this.host.emitHistoryReplaced(t.thread.id, r, "action"), this.emitConversationState(t.thread.id), S.loadingStrategy === "eager" && i.nextCursor !== null && this.conversations.hydrateCompleteHistory(t.thread.id, {
 				cursor: i.nextCursor,
 				initialPageLoaded: !0
 			}).catch(() => void 0), this.host.getSnapshot();
 		} catch (t) {
 			throw this.host.patchRuntime(e, {
 				historyLoading: !1,
-				error: E(t)
+				error: O(t)
 			}), t;
 		}
 	}
@@ -5488,7 +5489,7 @@ var Ei = class {
 			threadStatus: structuredClone(t.threadStatus)
 		};
 	}
-}, ki = class {
+}, Fi = class {
 	authentication;
 	approvals;
 	catalog;
@@ -5523,7 +5524,7 @@ var Ei = class {
 				let a = this.host.getState();
 				this.host.patch({ conversations: a.conversations.map((e) => e.id === t ? {
 					...e,
-					status: Yr(n)
+					status: ti(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);
@@ -5535,7 +5536,7 @@ var Ei = class {
 				return;
 			case "thread/unarchived":
 				this.conversations.load().catch((e) => {
-					this.host.patch({ error: E(e) });
+					this.host.patch({ error: O(e) });
 				});
 				return;
 			case "thread/closed": {
@@ -5565,12 +5566,12 @@ var Ei = class {
 				return;
 			}
 			case "thread/settings/updated": {
-				let t = this.host.requireRuntime(e.params.threadId), n = this.host.getState(), r = Ir(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 = Hr(e.params.threadSettings, n.models, this.host.snapshotForRuntime(t)), i = t.approvalPreset !== r.approvalPreset || t.selectedModelId !== r.selectedModelId || t.selectedReasoningEffort !== r.selectedReasoningEffort || t.selectedServiceTier !== r.selectedServiceTier || t.planMode !== r.planMode;
 				this.host.patchRuntime(e.params.threadId, r), i && this.host.emitConversationSettings(e.params.threadId, "notification");
 				return;
 			}
 			case "thread/goal/updated":
-				if (ur(this.host.requireRuntime(e.params.threadId).goal, e.params.goal)) return;
+				if (gr(this.host.requireRuntime(e.params.threadId).goal, e.params.goal)) return;
 				this.host.patchRuntime(e.params.threadId, { goal: { ...e.params.goal } }), this.host.emitEvent("notification", {
 					type: "conversation.goalChanged",
 					conversationId: e.params.threadId,
@@ -5587,7 +5588,7 @@ var Ei = class {
 				});
 				return;
 			case "thread/tokenUsage/updated": {
-				let t = Jr(e.params.tokenUsage);
+				let t = ei(e.params.tokenUsage);
 				this.host.patchRuntime(e.params.threadId, { contextUsage: t }), this.host.emitEvent("notification", {
 					type: "conversation.contextUsageChanged",
 					conversationId: e.params.threadId,
@@ -5604,7 +5605,7 @@ var Ei = class {
 					error: null,
 					turnGitDiff: null,
 					turns: G(t.turns, W(e.params.turn)),
-					messages: P(t.messages, e.params.threadId, e.params.turn.id, { createdAt: U(e.params.turn.startedAt) })
+					messages: I(t.messages, e.params.threadId, e.params.turn.id, { createdAt: U(e.params.turn.startedAt) })
 				}), this.host.patchConversationStatus(e.params.threadId, "active"), n || this.host.emitEvent("notification", {
 					type: "turn.started",
 					conversationId: e.params.threadId,
@@ -5625,13 +5626,13 @@ var Ei = class {
 				return;
 			case "item/commandExecution/outputDelta":
 				if (!this.items.isForwardingCommandOutput(e.params.threadId, e.params.itemId)) return;
-				this.items.applyToolUpdate(e.params.threadId, e.params.turnId, Rt(e.params.itemId, e.params.delta));
+				this.items.applyToolUpdate(e.params.threadId, e.params.turnId, Ht(e.params.itemId, e.params.delta));
 				return;
 			case "item/fileChange/patchUpdated":
-				this.items.applyToolUpdate(e.params.threadId, e.params.turnId, zt(e.params.itemId, e.params.changes));
+				this.items.applyToolUpdate(e.params.threadId, e.params.turnId, Ut(e.params.itemId, e.params.changes));
 				return;
 			case "item/mcpToolCall/progress":
-				this.items.applyToolUpdate(e.params.threadId, e.params.turnId, Bt(e.params.itemId, e.params.message));
+				this.items.applyToolUpdate(e.params.threadId, e.params.turnId, Wt(e.params.itemId, e.params.message));
 				return;
 			case "rawResponseItem/completed":
 				this.items.applyRawResponseItem(e.params);
@@ -5645,7 +5646,7 @@ var Ei = class {
 				return;
 			}
 			case "turn/diff/updated": {
-				let t = nn(e.params.diff);
+				let t = sn(e.params.diff);
 				this.host.patchRuntime(e.params.threadId, { turnGitDiff: {
 					turnId: e.params.turnId,
 					addedLines: t.addedLines,
@@ -5661,7 +5662,7 @@ var Ei = class {
 			}
 			case "thread/compacted": {
 				let t = this.host.requireRuntime(e.params.threadId);
-				this.host.patchRuntime(e.params.threadId, { messages: Tn(t.messages, e.params.threadId, e.params.turnId, "complete") });
+				this.host.patchRuntime(e.params.threadId, { messages: kn(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",
@@ -5690,7 +5691,7 @@ var Ei = class {
 							durationMs: null
 						},
 						status: e.params.willRetry ? "inProgress" : "failed",
-						error: lr(e.params.error),
+						error: hr(e.params.error),
 						willRetry: e.params.willRetry
 					}),
 					...n ? {
@@ -5702,7 +5703,7 @@ var Ei = class {
 					conversationId: e.params.threadId,
 					turnId: e.params.turnId,
 					payload: {
-						error: lr(e.params.error),
+						error: hr(e.params.error),
 						willRetry: e.params.willRetry
 					}
 				}), this.host.emitConversationActivity(e.params.threadId, "notification");
@@ -5710,14 +5711,14 @@ var Ei = class {
 			}
 			case "account/rateLimits/updated": {
 				let t = this.host.getState();
-				this.host.patch({ rateLimits: Qr(t.rateLimits, e.params.rateLimits) }), this.host.emitEvent("notification", {
+				this.host.patch({ rateLimits: ii(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: E(e) }));
+				this.authentication.refresh("notification").catch((e) => this.host.patch({ error: O(e) }));
 				return;
 			case "account/login/completed":
 				this.authentication.handleLoginCompleted(e.params);
@@ -5781,7 +5782,7 @@ var Ei = class {
 				this.host.emitEvent("notification", {
 					type: "realtime.audioDelta",
 					conversationId: e.params.threadId,
-					payload: { audio: ct(e.params.audio) }
+					payload: { audio: ft(e.params.audio) }
 				});
 				return;
 			case "thread/realtime/sdp":
@@ -5849,7 +5850,7 @@ var Ei = class {
 			default: return this.host.unknownNotification(e);
 		}
 	}
-}, Ai = class {
+}, Ii = class {
 	approvals;
 	clientRequests;
 	host;
@@ -5873,14 +5874,14 @@ var Ei = class {
 	create(e, t = {}) {
 		let n = this.runtimes.get(e);
 		if (n) return Object.assign(n, t), n;
-		let r = mt(e, this.host.getState(), t);
+		let r = vt(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 ht(e, this.approvals.approvalsForThread(e.threadId), this.clientRequests.requestsForThread(e.threadId));
+		return yt(e, this.approvals.approvalsForThread(e.threadId), this.clientRequests.requestsForThread(e.threadId));
 	}
 	snapshot(e) {
 		return {
@@ -5910,7 +5911,7 @@ var Ei = class {
 			conversationId: e,
 			payload: {
 				historyLoading: n.historyLoading,
-				historyState: Ni(n),
+				historyState: zi(n),
 				error: n.error
 			}
 		});
@@ -6004,7 +6005,7 @@ var Ei = class {
 				reason: t,
 				messages: structuredClone(r.messages),
 				threadStatus: structuredClone(r.threadStatus),
-				state: ji(r)
+				state: Li(r)
 			}
 		});
 	}
@@ -6016,7 +6017,7 @@ var Ei = class {
 			conversationId: e,
 			payload: {
 				messages: structuredClone(t.map((e) => r.get(e.id) ?? e)),
-				state: Mi(this.require(e))
+				state: Ri(this.require(e))
 			}
 		});
 	}
@@ -6058,7 +6059,7 @@ var Ei = class {
 		i && this.emitSummaryUpserted(i, "updated", n);
 	}
 };
-function ji(e) {
+function Li(e) {
 	return structuredClone({
 		activeTurnId: e.activeTurnId,
 		answeredClientRequestIds: e.answeredClientRequestIds,
@@ -6067,21 +6068,21 @@ function ji(e) {
 		error: e.error,
 		executionPlan: e.executionPlan,
 		historyLoading: e.historyLoading,
-		historyState: Ni(e),
+		historyState: zi(e),
 		turnGitDiff: e.turnGitDiff,
 		turnIds: e.turnIds,
 		turns: e.turns
 	});
 }
-function Mi(e) {
+function Ri(e) {
 	return structuredClone({
 		historyLoading: e.historyLoading,
-		historyState: Ni(e),
+		historyState: zi(e),
 		turnIds: e.turnIds,
 		turns: e.turns
 	});
 }
-function Ni(e) {
+function zi(e) {
 	return {
 		loadingStrategy: e.loadingStrategy,
 		hasOlder: e.historyHasOlder,
@@ -6091,7 +6092,7 @@ function Ni(e) {
 }
 //#endregion
 //#region src/node/codex-surface-connection-controller.ts
-var Pi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_request_user_input"]), Fi = class {
+var Bi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_request_user_input"]), Vi = class {
 	client;
 	options;
 	authentication;
@@ -6138,7 +6139,7 @@ var Pi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			} catch (e) {
 				throw this.host.patch({
 					status: "error",
-					error: E(e)
+					error: O(e)
 				}), this.host.emitSurfaceStatus("lifecycle"), e;
 			} finally {
 				this.connectPromise = null;
@@ -6154,7 +6155,7 @@ var Pi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 					limit: 100,
 					threadId: null
 				});
-				for (let e of n.data) Pi.has(e.name) && !e.enabled && (t[e.name] = !0);
+				for (let e of n.data) Bi.has(e.name) && !e.enabled && (t[e.name] = !0);
 				e = n.nextCursor;
 			} while (e);
 			Object.keys(t).length > 0 && await this.client.request("experimentalFeature/enablement/set", { enablement: t });
@@ -6171,7 +6172,7 @@ var Pi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 		}
 	}
 	bootstrapSurfaceData(e = !1) {
-		let t = vt(this.host.getState().authentication);
+		let t = St(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 () => {
@@ -6288,7 +6289,7 @@ var Pi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			error: null
 		});
 	}
-}, Ii = 5, Li = class {
+}, Hi = 5, Ui = class {
 	client;
 	loadingStrategy;
 	catalog;
@@ -6300,9 +6301,9 @@ var Pi = /* @__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 ? Or(s.models, t.model) : q(s.models, i.selectedModelId);
-		kr(c, t.reasoningEffort), Y(c, t.serviceTier);
-		let l = n.mcpServers === void 0 ? this.extensions.defaultMcpServers : li(n.mcpServers), u = await this.extensions.conversationExtension({
+		let a = t.cwd ?? i.cwd ?? n.cwd, o = await this.catalog.loadConversationCatalogs(a ?? void 0), s = this.host.getState(), c = t.model ? Pr(s.models, t.model) : q(s.models, i.selectedModelId);
+		Fr(c, t.reasoningEffort), Y(c, t.serviceTier);
+		let l = n.mcpServers === void 0 ? this.extensions.defaultMcpServers : hi(n.mcpServers), u = await this.extensions.conversationExtension({
 			operation: "start",
 			conversationId: null,
 			cwd: a ?? void 0,
@@ -6320,24 +6321,24 @@ var Pi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			...u.baseInstructions === void 0 ? {} : { baseInstructions: u.baseInstructions },
 			...u.developerInstructions === void 0 ? {} : { developerInstructions: u.developerInstructions },
 			...u.config === void 0 ? {} : { config: u.config },
-			...Ri(t, o.approvalPresets)
+			...Wi(t, o.approvalPresets)
 		});
 		if (!d.thread.id || d.thread.id === e) throw Error(`Codex thread/fork returned an invalid new thread id '${d.thread.id}'`);
 		t.reasoningEffort && await this.client.request("thread/settings/update", {
 			threadId: d.thread.id,
 			effort: t.reasoningEffort,
-			...c ? { collaborationMode: Rr(i.planMode, c.model, t.reasoningEffort) } : {}
+			...c ? { collaborationMode: Wr(i.planMode, c.model, t.reasoningEffort) } : {}
 		});
 		let [f, p] = await Promise.all([this.client.request("thread/turns/list", {
 			threadId: d.thread.id,
 			cursor: null,
-			limit: Ii,
+			limit: Hi,
 			sortDirection: "desc",
 			itemsView: "full"
-		}), this.client.request("thread/goal/get", { threadId: d.thread.id }).then((e) => e.goal).catch(() => null)]), m = [...f.data].reverse(), h = hn(m), g = Nn({
+		}), this.client.request("thread/goal/get", { threadId: d.thread.id }).then((e) => e.goal).catch(() => null)]), m = [...f.data].reverse(), h = yn(m), g = Ln({
 			...d.thread,
 			turns: m
-		}), _ = h ? P(g, d.thread.id, h) : g, v = n.loadingStrategy ?? this.loadingStrategy ?? "lazy", y = this.host.createRuntime(d.thread.id, {
+		}), _ = h ? I(g, d.thread.id, h) : g, v = n.loadingStrategy ?? this.loadingStrategy ?? "lazy", y = this.host.createRuntime(d.thread.id, {
 			hydrated: !0,
 			historyMode: d.thread.historyMode ?? "legacy",
 			loadingStrategy: v,
@@ -6354,7 +6355,7 @@ var Pi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 			goal: p ? { ...p } : null,
 			threadStatus: $(d.thread.status),
 			...o,
-			...Fr(d, s.models, this.host.snapshotForRuntime(i))
+			...Vr(d, s.models, this.host.snapshotForRuntime(i))
 		});
 		t.reasoningEffort && (y.selectedReasoningEffort = t.reasoningEffort), t.serviceTier !== void 0 && (y.selectedServiceTier = t.serviceTier), t.model && c && (y.selectedModelId = c.id), this.host.rememberHostOptions(d.thread.id, {
 			...n,
@@ -6373,10 +6374,10 @@ var Pi = /* @__PURE__ */ new Set(["compaction_image_budget", "default_mode_reque
 		return this.fork(e, n, r, { lastTurnId: t });
 	}
 };
-function Ri(e, t) {
+function Wi(e, t) {
 	if (e.approvalPreset) {
 		if (!t.includes(e.approvalPreset)) throw Error(`Approval preset '${e.approvalPreset}' is not available`);
-		return Mr(e.approvalPreset);
+		return Rr(e.approvalPreset);
 	}
 	return {
 		...e.approvalMode === void 0 ? {} : { approvalPolicy: e.approvalMode === "ask" ? "on-request" : "never" },
@@ -6385,27 +6386,27 @@ function Ri(e, t) {
 }
 //#endregion
 //#region src/node/codex-markdown-images.ts
-var zi = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, Bi = /* @__PURE__ */ new Set([
+var Gi = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, Ki = /* @__PURE__ */ new Set([
 	".avif",
 	".gif",
 	".jpeg",
 	".jpg",
 	".png",
 	".webp"
-]), Vi = class {
+]), qi = class {
 	client;
 	constructor(e) {
 		this.client = e;
 	}
 	async hydrate(e, t) {
-		let n = Wi(e);
-		return Ui(e, (await Promise.all(Array.from(e.matchAll(zi), async (e) => {
+		let n = Xi(e);
+		return Yi(e, (await Promise.all(Array.from(e.matchAll(Gi), async (e) => {
 			let r = e.index ?? 0;
-			if (Gi(r, n)) return null;
-			let i = e[2], a = Hi(i, t);
+			if (Zi(r, n)) return null;
+			let i = e[2], a = Ji(i, t);
 			if (!a) return null;
 			try {
-				let t = Kn((await this.client.request("fs/readFile", { path: a })).dataBase64);
+				let t = Zn((await this.client.request("fs/readFile", { path: a })).dataBase64);
 				if (!t) return null;
 				let n = e[0].indexOf("](") + 2;
 				return {
@@ -6419,12 +6420,12 @@ var zi = /(?<!\[)!\[([^\]]*)\]\(([^)\s]+)(?:\s+["']([^"']*)["'])?\)/g, Bi = /* @
 		}))).filter((e) => e !== null));
 	}
 };
-function Hi(e, t) {
+function Ji(e, t) {
 	let n = e.trim();
 	if (!n || /[\u0000-\u001f\u007f]/.test(n)) return null;
 	let r;
 	if (n.startsWith("file://")) try {
-		r = re(n);
+		r = ne(n);
 	} catch {
 		return null;
 	}
@@ -6434,18 +6435,18 @@ function Hi(e, t) {
 	} catch {
 		return null;
 	}
-	if (!Bi.has(g(r).toLowerCase())) return null;
-	if (_(r)) return r;
-	if (!t || !_(t)) return null;
-	let i = b(t, r), a = y(t, i);
-	return a === ".." || a.startsWith(`..${ee}`) || _(a) ? null : i;
+	if (!Ki.has(_(r).toLowerCase())) return null;
+	if (v(r)) return r;
+	if (!t || !v(t)) return null;
+	let i = x(t, r), a = b(t, i);
+	return a === ".." || a.startsWith(`..${S}`) || v(a) ? null : i;
 }
-function Ui(e, t) {
+function Yi(e, t) {
 	let n = e;
 	for (let e of t.sort((e, t) => t.start - e.start)) n = `${n.slice(0, e.start)}${e.value}${n.slice(e.end)}`;
 	return n;
 }
-function Wi(e) {
+function Xi(e) {
 	let t = [], n = /(^|\n)(```|~~~)/g, r;
 	for (; (r = n.exec(e)) !== null;) {
 		let i = r[2], a = r[1], o = r.index + a.length, s = RegExp(`(^|\\n)${i}`, "g");
@@ -6466,15 +6467,15 @@ function Wi(e) {
 	}
 	return t;
 }
-function Gi(e, t) {
+function Zi(e, t) {
 	return t.some((t) => e >= t.start && e <= t.end);
 }
-var Ki = /<context>[\s\S]*?<\/context>\s*/g, qi = /<in-app-browser-context(?:\s[^>]*)?>[\s\S]*?<\/in-app-browser-context>\s*/g, Ji = /^[ \t]*## My request for Codex:[ \t]*$/m;
-async function Yi(e, t) {
-	let n = T(t);
+var Qi = /<context>[\s\S]*?<\/context>\s*/g, $i = /<in-app-browser-context(?:\s[^>]*)?>[\s\S]*?<\/in-app-browser-context>\s*/g, ea = /^[ \t]*## My request for Codex:[ \t]*$/m;
+async function ta(e, t) {
+	let n = D(t);
 	return {
 		conversationId: n,
-		prompts: Xi((await e.request("thread/turns/list", {
+		prompts: na((await e.request("thread/turns/list", {
 			threadId: n,
 			cursor: null,
 			limit: 100,
@@ -6483,20 +6484,20 @@ async function Yi(e, t) {
 		})).data)
 	};
 }
-function Xi(e) {
+function na(e) {
 	return [...e].reverse().flatMap((e) => e.items.flatMap((e) => {
 		if (e.type !== "userMessage") return [];
-		let t = Zi(e.content.flatMap((e) => e.type === "text" ? [e.text] : []).join(""));
+		let t = ra(e.content.flatMap((e) => e.type === "text" ? [e.text] : []).join(""));
 		return t && t !== "(no user instructions)" ? [t] : [];
 	}));
 }
-function Zi(e) {
-	let t = e.replace(Ki, ""), n = t.replace(qi, "");
-	return (n === t ? n : n.replace(Ji, "")).trim();
+function ra(e) {
+	let t = e.replace(Qi, ""), n = t.replace($i, "");
+	return (n === t ? n : n.replace(ea, "")).trim();
 }
 //#endregion
 //#region src/node/codex-surface-text-generation-controller.ts
-var Qi = 12e4, $i = class {
+var ia = 12e4, aa = class {
 	client;
 	defaultCwd;
 	host;
@@ -6507,7 +6508,7 @@ var Qi = 12e4, $i = class {
 	}
 	handleNotification(e) {
 		e.method === "thread/started" && e.params.thread.ephemeral && this.hiddenThreadIds.add(e.params.thread.id);
-		let t = ra(e);
+		let t = la(e);
 		if (!t || !this.hiddenThreadIds.has(t)) return !1;
 		let n = this.pendingByThread.get(t);
 		return n && this.consumeNotification(n, e), (e.method === "thread/closed" || e.method === "thread/deleted") && this.hiddenThreadIds.delete(t), !0;
@@ -6515,10 +6516,10 @@ var Qi = 12e4, $i = class {
 	async generate(e, t = {}) {
 		let n = e.trim();
 		if (!n) throw Error("Generation prompt cannot be empty");
-		if (t.signal?.aborted) throw ia();
+		if (t.signal?.aborted) throw ua();
 		await this.host.ensureConnected();
-		let r = this.host.getSnapshot(), i = q(r.models, r.selectedModelId), a = t.model ? Or(r.models, t.model) : i, o = a?.model, s = t.reasoningEffort ?? (a?.id === i?.id ? r.selectedReasoningEffort : a ? J(a) : null) ?? void 0, c = t.serviceTier === void 0 ? a?.id === i?.id ? r.selectedServiceTier : a?.defaultServiceTier ?? null : t.serviceTier;
-		kr(a, s), Y(a, c);
+		let r = this.host.getSnapshot(), i = q(r.models, r.selectedModelId), a = t.model ? Pr(r.models, t.model) : i, o = a?.model, s = t.reasoningEffort ?? (a?.id === i?.id ? r.selectedReasoningEffort : a ? J(a) : null) ?? void 0, c = t.serviceTier === void 0 ? a?.id === i?.id ? r.selectedServiceTier : a?.defaultServiceTier ?? null : t.serviceTier;
+		Fr(a, s), Y(a, c);
 		let l = await this.client.request("thread/start", {
 			approvalPolicy: "never",
 			approvalsReviewer: "user",
@@ -6534,15 +6535,15 @@ var Qi = 12e4, $i = class {
 			serviceName: "codex_app_sdk",
 			threadSource: "sdk_ephemeral_generation"
 		}), u = l.thread.id;
-		if (!l.thread.ephemeral) throw await ea(() => this.client.request("thread/delete", { threadId: u })), Error("Codex app-server did not create an ephemeral generation thread");
-		if (this.hiddenThreadIds.add(u), t.signal?.aborted) throw await ea(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u), ia();
-		let d = ta();
+		if (!l.thread.ephemeral) throw await oa(() => this.client.request("thread/delete", { threadId: u })), Error("Codex app-server did not create an ephemeral generation thread");
+		if (this.hiddenThreadIds.add(u), t.signal?.aborted) throw await oa(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u), ua();
+		let d = sa();
 		this.pendingByThread.set(u, d);
-		let f = null, p = !1, m = () => d.reject(ia());
+		let f = null, p = !1, m = () => d.reject(ua());
 		t.signal?.addEventListener("abort", m);
 		let h = setTimeout(() => {
 			d.reject(/* @__PURE__ */ Error("Codex ephemeral generation timed out"));
-		}, t.timeoutMs ?? Qi);
+		}, t.timeoutMs ?? ia);
 		try {
 			let e = await this.client.request("turn/start", {
 				threadId: u,
@@ -6558,18 +6559,18 @@ var Qi = 12e4, $i = class {
 				serviceTier: c,
 				...t.outputSchema === void 0 ? {} : { outputSchema: t.outputSchema }
 			});
-			f = e.turn.id, d.turnId = f, na(d, e.turn);
+			f = e.turn.id, d.turnId = f, ca(d, e.turn);
 			let r = await d.promise;
 			return p = !0, r;
 		} finally {
 			if (clearTimeout(h), t.signal?.removeEventListener("abort", m), this.pendingByThread.delete(u), !p && f) {
 				let e = f;
-				await ea(() => this.client.request("turn/interrupt", {
+				await oa(() => this.client.request("turn/interrupt", {
 					threadId: u,
 					turnId: e
 				}));
 			}
-			await ea(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u);
+			await oa(() => this.client.request("thread/unsubscribe", { threadId: u })), this.hiddenThreadIds.delete(u);
 		}
 	}
 	close(e = /* @__PURE__ */ Error("Codex surface closed")) {
@@ -6592,16 +6593,16 @@ var Qi = 12e4, $i = class {
 		}
 		if (t.method === "turn/completed") {
 			if (e.turnId && t.params.turn.id !== e.turnId) return;
-			na(e, t.params.turn);
+			ca(e, t.params.turn);
 		}
 	}
 };
-async function ea(e) {
+async function oa(e) {
 	try {
 		await e();
 	} catch {}
 }
-function ta() {
+function sa() {
 	let e, t, n = {
 		promise: new Promise((n, r) => {
 			e = n, t = r;
@@ -6617,7 +6618,7 @@ function ta() {
 	};
 	return n.promise.catch(() => void 0), n;
 }
-function na(e, t) {
+function ca(e, t) {
 	for (let n of t.items) {
 		if (n.type !== "agentMessage") continue;
 		let t = n.text.trim();
@@ -6639,17 +6640,17 @@ function na(e, t) {
 	}
 	e.resolve({ text: n });
 }
-function ra(e) {
+function la(e) {
 	if (e.method === "thread/started") return e.params.thread.id;
 	let t = e.params;
 	return typeof t.threadId == "string" ? t.threadId : null;
 }
-function ia() {
+function ua() {
 	return /* @__PURE__ */ Error("Codex ephemeral generation was aborted");
 }
 //#endregion
 //#region src/node/codex-surface.ts
-var aa = class {
+var da = class {
 	options;
 	client;
 	listeners = /* @__PURE__ */ new Set();
@@ -6682,17 +6683,17 @@ var aa = class {
 	eventSequence = 0;
 	pendingMarkdownImageHydrations = /* @__PURE__ */ new Set();
 	closed = !1;
-	state = pt(gt());
+	state = _t(bt());
 	constructor(e = {}) {
-		this.options = e, this.extensions = new gi(e.extensions ?? [], e.mcpServers ?? [], (e) => this.lifecycle.hostOptions(e));
-		let n = Ct(e);
-		this.client = e.client ?? new t(St(n) ? new He(n) : new Le(n), e.onListenerError ? { onListenerError: e.onListenerError } : {}), this.markdownImages = new Vi(this.client), this.authentication = new Tt(this.client, {
+		this.options = e, this.extensions = new Si(e.extensions ?? [], e.mcpServers ?? [], (e) => this.lifecycle.hostOptions(e));
+		let n = Dt(e);
+		this.client = e.client ?? new t(Et(n) ? new Ke(n) : new Ve(n), e.onListenerError ? { onListenerError: e.onListenerError } : {}), this.markdownImages = new qi(this.client), this.authentication = new kt(this.client, {
 			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: E(e) })
-		}), this.items = new mr({
+			reportError: (e) => this.patch({ error: O(e) })
+		}), this.items = new br({
 			assistantMessageForTurn: (e, t) => this.assistantMessageForTurn(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
 			emitEvent: (e, t) => this.emitEvent(e, t),
@@ -6706,7 +6707,7 @@ var aa = class {
 			sendNextQueuedPrompt: (e) => {
 				this.messagesController.sendNextQueuedPrompt(e);
 			}
-		}), this.approvals = new ci(this.client, {
+		}), this.approvals = new mi(this.client, {
 			activeConversationId: () => this.state.activeConversationId,
 			createRuntime: (e, t) => this.createRuntime(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -6716,7 +6717,7 @@ var aa = class {
 			patch: (e) => this.patch(e),
 			patchConversationStatus: (e, t) => this.patchConversationStatus(e, t),
 			patchRuntime: (e, t) => this.patchRuntime(e, t)
-		}), this.clientRequests = new _r({
+		}), this.clientRequests = new Cr({
 			activeConversationId: () => this.state.activeConversationId,
 			answerAsyncQuestion: (e, t, n) => this.messagesController.answerAsyncQuestion(e, t, n),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -6726,13 +6727,13 @@ var aa = class {
 			messageContainingTool: (e, t, n) => this.messageContainingTool(e, t, n),
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			requireRuntime: (e) => this.requireRuntime(e)
-		}), this.runtimeState = new Ai(this.approvals, this.clientRequests, {
+		}), this.runtimeState = new Ii(this.approvals, this.clientRequests, {
 			emitEvent: (e, t) => this.emitEvent(e, t),
 			getState: () => this.state,
 			notifyConversationListeners: (e) => this.notifyConversationListeners(e),
 			patch: (e, t) => this.patch(e, t),
 			schedulePluginRefresh: () => this.catalog.schedulePluginRefresh()
-		}), this.conversationSettings = new Si(this.client, {
+		}), this.conversationSettings = new Oi(this.client, {
 			approvalMode: e.approvalMode,
 			approvalPreset: e.approvalPreset,
 			permissionMode: e.permissionMode
@@ -6750,7 +6751,7 @@ var aa = class {
 			patch: (e) => this.patch(e),
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}), this.turnActions = new wi(this.client, {
+		}), this.turnActions = new Ai(this.client, {
 			createConversation: async () => {
 				await this.createConversation();
 			},
@@ -6767,7 +6768,7 @@ var aa = class {
 			patchConversationTurnCount: (e, t, n) => this.patchConversationTurnCount(e, t, n),
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			sendMessageToThread: (e, t, n) => this.messagesController.sendToThread(e, t, n)
-		}), this.messagesController = new Ei(this.client, {
+		}), this.messagesController = new Mi(this.client, {
 			clearGoalForThread: (e) => this.conversationSettings.clearGoalForThread(e),
 			compactForThread: (e) => this.turnActions.compactForThread(e),
 			createConversation: async () => {
@@ -6790,7 +6791,7 @@ var aa = class {
 			startReviewForThread: (e, t) => this.turnActions.startReviewForThread(e, t),
 			updateSettings: (e) => this.conversationSettings.update(e),
 			updateSettingsForThread: (e, t) => this.conversationSettings.updateForThread(e, t)
-		}), this.catalog = new ei(this.client, e.cwd, {
+		}), this.catalog = new oi(this.client, e.cwd, {
 			authenticationBlocksBootstrap: () => this.authentication.blocksBootstrap(),
 			emitConversationSkills: (e, t) => this.emitConversationSkills(e, t),
 			emitEvent: (e, t) => this.emitEvent(e, t),
@@ -6801,7 +6802,7 @@ var aa = class {
 			patchRuntime: (e, t) => this.patchRuntime(e, t),
 			preferredApprovalPreset: () => this.conversationSettings.preferredApprovalPreset(),
 			runtimes: () => this.runtimeState.values()
-		}), this.conversations = new bi(this.client, e.conversationLimit, {
+		}), this.conversations = new Ei(this.client, e.conversationLimit, {
 			emitHistoryPrepended: (e, t, n) => this.emitHistoryPrepended(e, t, n),
 			emitSummaryUpserted: (e, t, n) => this.emitSummaryUpserted(e, t, n),
 			ensureConnected: () => this.ensureConnected(),
@@ -6813,7 +6814,7 @@ var aa = class {
 			requireRuntime: (e) => this.requireRuntime(e),
 			runtime: (e) => this.runtimeState.get(e),
 			schedulePluginRefresh: (e) => this.catalog.schedulePluginRefresh(e)
-		}), this.lifecycle = new Oi(this.client, e, this.catalog, this.extensions, this.conversationSettings, this.conversations, {
+		}), this.lifecycle = new Pi(this.client, e, this.catalog, this.extensions, this.conversationSettings, this.conversations, {
 			activateRuntime: (e) => this.activateRuntime(e),
 			createRuntime: (e, t) => this.createRuntime(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -6835,7 +6836,7 @@ var aa = class {
 			runtime: (e) => this.runtimeState.get(e),
 			runtimeProjection: (e) => this.runtimeProjection(e),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}), this.forks = new Li(this.client, e.loadingStrategy, this.catalog, this.extensions, {
+		}), this.forks = new Ui(this.client, e.loadingStrategy, this.catalog, this.extensions, {
 			createRuntime: (e, t) => this.createRuntime(e, t),
 			emitConversationActivity: (e) => this.emitConversationActivity(e, "action"),
 			emitConversationPermissions: (e) => this.emitConversationPermissions(e, "action"),
@@ -6849,7 +6850,7 @@ var aa = class {
 			rememberHostOptions: (e, t) => this.lifecycle.rememberHostOptions(e, t),
 			requireRuntime: (e) => this.requireRuntime(e),
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e)
-		}), this.connection = new Fi(this.client, e, this.authentication, this.approvals, this.catalog, this.clientRequests, this.conversations, this.items, this.lifecycle, this.runtimeState, {
+		}), this.connection = new Vi(this.client, e, this.authentication, this.approvals, this.catalog, this.clientRequests, this.conversations, this.items, this.lifecycle, this.runtimeState, {
 			clearConversationHandles: () => this.conversationHandles.clear(),
 			clearPendingForThread: (e, t, n) => this.clearPendingForThread(e, t, n),
 			closed: () => this.closed,
@@ -6861,7 +6862,7 @@ var aa = class {
 			getSnapshot: () => this.getSnapshot(),
 			getState: () => this.state,
 			patch: (e) => this.patch(e)
-		}), this.notifications = new ki(this.authentication, this.approvals, this.catalog, this.clientRequests, this.conversations, this.items, {
+		}), this.notifications = new Fi(this.authentication, this.approvals, this.catalog, this.clientRequests, this.conversations, this.items, {
 			clearPendingForThread: (e, t, n) => this.clearPendingForThread(e, t, n),
 			createRuntime: (e, t) => this.createRuntime(e, t),
 			emitConversationActivity: (e, t) => this.emitConversationActivity(e, t),
@@ -6885,7 +6886,7 @@ var aa = class {
 			},
 			snapshotForRuntime: (e) => this.snapshotForRuntime(e),
 			unknownNotification: (e) => this.handleUnknownNotification(e)
-		}), this.textGeneration = new $i(this.client, e.cwd, {
+		}), this.textGeneration = new aa(this.client, e.cwd, {
 			ensureConnected: () => this.ensureConnected(),
 			getSnapshot: () => this.getSnapshot()
 		}), this.unsubscribeNotification = this.client.onNotification((e) => {
@@ -6981,7 +6982,7 @@ var aa = class {
 		return this.lifecycle.create(e, t);
 	}
 	async forkConversation(e, t = {}, n = {}) {
-		let r = T(e);
+		let r = D(e);
 		await this.ensureThreadReady(r);
 		let i = this.lifecycle.hostOptions(r) ?? {}, a = await this.forks.fork(r, t, {
 			...i,
@@ -6990,7 +6991,7 @@ var aa = class {
 		return this.conversationForkResult(a);
 	}
 	async forkConversationAtTurn(e, t, n = {}, r = {}) {
-		let i = T(e);
+		let i = D(e);
 		await this.ensureThreadReady(i);
 		let a = this.lifecycle.hostOptions(i) ?? {}, o = await this.forks.forkTurn(i, t, n, {
 			...a,
@@ -7002,7 +7003,7 @@ var aa = class {
 		return this.lifecycle.select(e);
 	}
 	forgetConversation(e) {
-		let t = T(e), n = this.state.activeConversationId === t;
+		let t = D(e), n = this.state.activeConversationId === t;
 		this.runtimeState.forget(t), this.lifecycle.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,
@@ -7030,10 +7031,10 @@ var aa = class {
 		return this.lifecycle.readHistory(e);
 	}
 	async readConversationPromptHistory(e = this.state.activeConversationId ?? "") {
-		return await this.ensureConnected(), Yi(this.client, e);
+		return await this.ensureConnected(), ta(this.client, e);
 	}
 	async loadOlderConversationHistory(e = this.state.activeConversationId ?? "") {
-		return this.conversations.loadOlderHistory(T(e));
+		return this.conversations.loadOlderHistory(D(e));
 	}
 	async renameConversation(e) {
 		let t = this.state.activeConversationId;
@@ -7097,9 +7098,9 @@ var aa = class {
 		return await this.approvals.resolve(void 0, e, t, n), this.getSnapshot();
 	}
 	conversation(e) {
-		let t = T(e), n = this.conversationHandles.get(t);
+		let t = D(e), n = this.conversationHandles.get(t);
 		if (n) return n;
-		let r = Et(t, {
+		let r = At(t, {
 			clearGoal: () => this.conversationSettings.clearGoalForThread(t),
 			compact: () => this.turnActions.compactForThread(t),
 			continueInterruptedTurn: () => this.messagesController.continueInterruptedTurnForThread(t),
@@ -7152,7 +7153,7 @@ var aa = class {
 		await this.client.request("thread/realtime/stop", { threadId: e });
 	}
 	startRealtimeForThread(e, t) {
-		return dt({
+		return ht({
 			client: this.client,
 			ensureThreadReady: async () => {
 				await this.ensureThreadReady(e);
@@ -7386,7 +7387,7 @@ var aa = class {
 			...this.state,
 			...e
 		};
-		let i = ne(n, this.state);
+		let i = te(n, this.state);
 		if (i.length > 0 && (this.stateVersion += 1, this.patchListeners.size > 0)) {
 			let e = structuredClone({
 				version: this.stateVersion,
@@ -7405,19 +7406,19 @@ var aa = class {
 		for (let e of this.conversationListeners.keys()) this.notifyConversationListeners(e);
 	}
 };
-function oa(e = {}) {
-	return new aa(e);
+function fa(e = {}) {
+	return new da(e);
 }
 //#endregion
 //#region src/node/codex-app-backend-cache.ts
-var sa = {
+var pa = {
 	set(e, t) {
 		return setTimeout(e, t);
 	},
 	clear(e) {
 		clearTimeout(e);
 	}
-}, ca = class {
+}, ma = class {
 	options;
 	records = /* @__PURE__ */ new Map();
 	now;
@@ -7430,7 +7431,7 @@ var sa = {
 	constructor(e) {
 		if (this.options = e, !Number.isFinite(e.ttlMs) || e.ttlMs <= 0) throw Error("Codex backend cache ttlMs must be greater than zero");
 		if (e.sweepIntervalMs !== void 0 && e.sweepIntervalMs !== null && (!Number.isFinite(e.sweepIntervalMs) || e.sweepIntervalMs <= 0)) throw Error("Codex backend cache sweepIntervalMs must be greater than zero");
-		this.now = e.now ?? Date.now, this.scheduler = e.scheduler ?? sa, this.sweepIntervalMs = e.sweepIntervalMs ?? null;
+		this.now = e.now ?? Date.now, this.scheduler = e.scheduler ?? pa, this.sweepIntervalMs = e.sweepIntervalMs ?? null;
 	}
 	get size() {
 		return this.records.size;
@@ -7528,7 +7529,7 @@ var sa = {
 	assertOpen() {
 		if (this.closed) throw Error("Codex backend cache is closed");
 	}
-}, la = class {
+}, ha = class {
 	surface;
 	moduleServices = /* @__PURE__ */ new Map();
 	ttlCaches = /* @__PURE__ */ new Set();
@@ -7544,7 +7545,7 @@ var sa = {
 			if (n.has(e)) throw Error(`Duplicate Codex backend module '${e}'`);
 			n.add(e);
 		}
-		this.surface = e.surface ?? new aa(e.surfaceOptions);
+		this.surface = e.surface ?? new da(e.surfaceOptions);
 		for (let { id: e, module: n } of t) this.moduleServices.set(e, n.create({
 			surface: this.surface,
 			closeBackend: () => this.close(),
@@ -7558,7 +7559,7 @@ var sa = {
 	}
 	createTtlCache(e) {
 		if (this.closePromise) throw Error("Cannot create a cache after the Codex backend is closed");
-		let t = new ca(e);
+		let t = new ma(e);
 		return this.ttlCaches.add(t), t;
 	}
 	close() {
@@ -7568,16 +7569,16 @@ var sa = {
 		await Promise.all([...this.ttlCaches].map((e) => e.close())), await this.surface.close();
 	}
 };
-function ua(e = {}) {
-	return new la(e);
+function ga(e = {}) {
+	return new ha(e);
 }
 //#endregion
 //#region src/node/apple-speech-transcription.ts
-async function da(e, t = {}, n = {}) {
-	let r = n.fs ?? l, i = n.spawn ?? o, a = n.tmpdir ?? f.tmpdir, s = await r.mkdtemp(m.join(a(), "codex-app-sdk-apple-stt-")), c = m.join(s, "input.wav"), u = m.join(s, "output.txt");
+async function _a(e, t = {}, n = {}) {
+	let r = n.fs ?? l, i = n.spawn ?? o, a = n.tmpdir ?? f.tmpdir, s = await r.mkdtemp(h.join(a(), "codex-app-sdk-apple-stt-")), c = h.join(s, "input.wav"), u = h.join(s, "output.txt");
 	try {
-		let a = await ga(fa(n.assetsPath), s, r);
-		return await r.writeFile(c, e), await ma(i, a, pa(c, u, t)), { text: (await r.readFile(u, "utf8")).trim() };
+		let a = await Sa(va(n.assetsPath), s, r);
+		return await r.writeFile(c, e), await ba(i, a, ya(c, u, t)), { text: (await r.readFile(u, "utf8")).trim() };
 	} catch (e) {
 		return {
 			text: "",
@@ -7590,10 +7591,10 @@ async function da(e, t = {}, n = {}) {
 		});
 	}
 }
-function fa(e, t = {}) {
-	return m.join(e ?? ha(t), "apple-speechanalyzer-cli");
+function va(e, t = {}) {
+	return h.join(e ?? xa(t), "apple-speechanalyzer-cli");
 }
-function pa(e, t, n) {
+function ya(e, t, n) {
 	let r = [
 		"--input-audio-path",
 		e,
@@ -7602,7 +7603,7 @@ function pa(e, t, n) {
 	], i = n.locale?.trim();
 	return i && r.push("--locale", i), n.live && r.push("--live"), r;
 }
-function ma(e, t, n) {
+function ba(e, t, n) {
 	return new Promise((r, i) => {
 		let a = e(t, n), o = "";
 		a.stderr?.on("data", (e) => {
@@ -7618,42 +7619,150 @@ function ma(e, t, n) {
 		});
 	});
 }
-function ha(e) {
+function xa(e) {
 	let t = (e.env ?? process.env).CODEX_APP_SDK_ASSETS_PATH?.trim();
 	if (t) return t;
 	let n = process.resourcesPath, r = e.resourcesPath === void 0 ? n : e.resourcesPath ?? void 0, i = e.existsSync ?? c;
 	if (r && !r.endsWith(".vite/build")) {
 		let e = [
 			r,
-			m.join(r, "assets"),
-			m.join(r, "app.asar.unpacked/node_modules/@codex-app-sdk/backend/assets"),
-			m.join(r, "app.asar/node_modules/@codex-app-sdk/backend/assets"),
-			m.join(r, "app.asar.unpacked/node_modules/codex-app-sdk/assets"),
-			m.join(r, "app.asar/node_modules/codex-app-sdk/assets")
-		].find((e) => i(m.join(e, "apple-speechanalyzer-cli")));
+			h.join(r, "assets"),
+			h.join(r, "app.asar.unpacked/node_modules/@codex-app-sdk/backend/assets"),
+			h.join(r, "app.asar/node_modules/@codex-app-sdk/backend/assets"),
+			h.join(r, "app.asar.unpacked/node_modules/codex-app-sdk/assets"),
+			h.join(r, "app.asar/node_modules/codex-app-sdk/assets")
+		].find((e) => i(h.join(e, "apple-speechanalyzer-cli")));
 		if (e) return e;
 	}
 	let a = import.meta.resolve, o = e.packageResolve === void 0 ? a : e.packageResolve ?? void 0;
 	if (o) try {
-		let e = re(o("@codex-app-sdk/backend")), t = m.resolve(m.dirname(e), "../assets");
-		if (i(m.join(t, "apple-speechanalyzer-cli"))) return t;
+		let e = ne(o("@codex-app-sdk/backend")), t = h.resolve(h.dirname(e), "../assets");
+		if (i(h.join(t, "apple-speechanalyzer-cli"))) return t;
 	} catch {}
 	let s = (e.cwd ?? process.cwd)(), l = [
-		m.resolve(s, "node_modules/@codex-app-sdk/backend/assets"),
-		m.resolve(s, "../node_modules/@codex-app-sdk/backend/assets"),
-		m.resolve(s, "node_modules/codex-app-sdk/assets"),
-		m.resolve(s, "../node_modules/codex-app-sdk/assets"),
-		m.resolve(s, "../codex-app-sdk/assets")
-	].find((e) => i(m.join(e, "apple-speechanalyzer-cli")));
+		h.resolve(s, "node_modules/@codex-app-sdk/backend/assets"),
+		h.resolve(s, "../node_modules/@codex-app-sdk/backend/assets"),
+		h.resolve(s, "node_modules/codex-app-sdk/assets"),
+		h.resolve(s, "../node_modules/codex-app-sdk/assets"),
+		h.resolve(s, "../codex-app-sdk/assets")
+	].find((e) => i(h.join(e, "apple-speechanalyzer-cli")));
 	if (l) return l;
-	let u = import.meta.url, d = e.moduleUrl === void 0 ? u : e.moduleUrl ?? void 0, f = d ? m.dirname(re(d)) : s, p = [m.resolve(f, "../assets"), m.resolve(f, "../../assets")];
-	return p.find((e) => i(m.join(e, "apple-speechanalyzer-cli"))) ?? p[0];
+	let u = import.meta.url, d = e.moduleUrl === void 0 ? u : e.moduleUrl ?? void 0, f = d ? h.dirname(ne(d)) : s, p = [h.resolve(f, "../assets"), h.resolve(f, "../../assets")];
+	return p.find((e) => i(h.join(e, "apple-speechanalyzer-cli"))) ?? p[0];
 }
-async function ga(e, t, n) {
-	let r = m.join(t, "apple-speechanalyzer-cli");
+async function Sa(e, t, n) {
+	let r = h.join(t, "apple-speechanalyzer-cli");
 	return await n.copyFile(e, r), await n.chmod(r, 448), r;
 }
 //#endregion
-export { la as CodexAppBackend, ca as CodexAppBackendTtlCache, Le as CodexAppServerStdioTransport, He as CodexAppServerUnixSocketTransport, aa as CodexSurface, Rn as codexItemToMediaPart, In as codexItemToSurfaceMessage, O as codexItemToToolPart, ue as codexRuntimePathEntries, Nn as codexThreadToSurfaceMessages, Fn as codexTurnToSurfaceMessages, ua as createCodexAppBackend, oa as createCodexSurface, le as discoverCodexExecutable, Pn as preserveHistoricalAttachmentPreviews, fa as resolveAppleSpeechAnalyzerPath, fe as resolveCodexRuntime, da as transcribeWithAppleSpeechAnalyzer, de as withCodexRuntimePath };
+//#region src/node/apple-speech-session.ts
+async function Ca(e, t, n = {}) {
+	if (n.signal?.throwIfAborted(), !Number.isInteger(e.sampleRate) || e.sampleRate < 8e3 || e.sampleRate > 96e3) throw Error("Unsupported speech sample rate.");
+	let r = await se(h.join(m(), "codex-sdk-live-speech-")), i;
+	try {
+		let t = h.join(r, "apple-speechanalyzer-cli");
+		await oe(va(n.assetsPath), t), await ae(t, 448), n.signal?.throwIfAborted(), i = (n.spawn ?? o)(t, [
+			"--stream",
+			"--sample-rate",
+			String(e.sampleRate),
+			...e.locale ? ["--locale", e.locale] : []
+		]);
+	} catch (e) {
+		throw await ce(r, {
+			recursive: !0,
+			force: !0
+		}), e;
+	}
+	let a = !1, s = !1, c, l = "", u = new le("utf8"), d = "", f, p, g = new Promise((e, t) => {
+		f = e, p = t;
+	}), _, v = new Promise((e) => {
+		_ = 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", C);
+		let e = c ?? {
+			text: "",
+			error: d.trim() || "Speech helper stopped without a final transcript."
+		};
+		p(Error(e.error ?? "Speech session closed."));
+		try {
+			await ce(r, {
+				recursive: !0,
+				force: !0
+			});
+		} finally {
+			_(e);
+		}
+	};
+	function x(t) {
+		a || c?.error || (c = {
+			text: "",
+			error: t
+		}, p(Error(t)), S({
+			type: "error",
+			sessionId: e.sessionId,
+			error: t
+		}), i.kill("SIGKILL"), b());
+	}
+	function S(e) {
+		try {
+			t(e);
+		} catch {}
+	}
+	function C() {
+		a || (c = {
+			text: "",
+			error: "Speech recording cancelled."
+		}, i.kill("SIGKILL"), b());
+	}
+	return n.signal?.addEventListener("abort", C, { 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();
+	}), i.stdout.on("data", (t) => {
+		if (a) return;
+		if (l += u.write(t), l.length > 1024 * 1024) {
+			x("Speech helper result exceeds the size limit.");
+			return;
+		}
+		let n;
+		for (; (n = l.indexOf("\n")) >= 0 && !a;) {
+			let t = l.slice(0, 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" ? S({
+					type: "transcript",
+					sessionId: e.sessionId,
+					finalText: n.finalText,
+					partialText: n.partialText
+				}) : n.type === "done" && typeof n.text == "string" ? c = { text: n.text } : n.type === "error" && typeof n.message == "string" ? x(n.message) : x("Invalid speech helper event.");
+			} catch {
+				x("Invalid speech helper output.");
+			}
+		}
+	}), n.signal?.aborted && C(), await g, {
+		append: (e) => new Promise((t, n) => {
+			if (a || s) {
+				n(/* @__PURE__ */ Error("Speech session is no longer recording."));
+				return;
+			}
+			if (e.byteLength % 4 || e.byteLength > 256 * 1024) {
+				n(/* @__PURE__ */ Error("Invalid PCM audio chunk."));
+				return;
+			}
+			i.stdin.write(Buffer.from(e), (e) => e ? n(e) : t());
+		}),
+		stop: () => (!a && !s && (s = !0, y = setTimeout(() => x("Speech recognition took too long to finalize."), 3e4), i.stdin.end()), v),
+		cancel: async () => {
+			a || (c = {
+				text: "",
+				error: "Speech recording cancelled."
+			}, i.kill("SIGKILL"), await b());
+		}
+	};
+}
+//#endregion
+export { ha as CodexAppBackend, ma as CodexAppBackendTtlCache, Ve as CodexAppServerStdioTransport, Ke as CodexAppServerUnixSocketTransport, da as CodexSurface, Hn as codexItemToMediaPart, Bn as codexItemToSurfaceMessage, A as codexItemToToolPart, me as codexRuntimePathEntries, Ln as codexThreadToSurfaceMessages, zn as codexTurnToSurfaceMessages, ga as createCodexAppBackend, fa as createCodexSurface, pe as discoverCodexExecutable, Rn as preserveHistoricalAttachmentPreviews, va as resolveAppleSpeechAnalyzerPath, ge as resolveCodexRuntime, Ca as startAppleSpeechSession, _a as transcribeWithAppleSpeechAnalyzer, he as withCodexRuntimePath };
 
 //# sourceMappingURL=index.js.map