@openclaw/codex 2026.10.1 → 2026.10.5-beta.1

package/dist/.setup/{transport-stdio-a0HDa2Mj.mjs → transport-stdio-CRWTkKOn.mjs}

@@ -1,5 +1,6 @@
+import { t as appendCodexGitConfigParameters } from "./config-utils-DN_YT7dE.mjs";
 import { r as normalizeCodexAppServerArgs } from "./launch-args-DbFCehO7.mjs";
-import { i as resolveManagedCodexNativeCommand } from "./managed-binary-C1VFoVPf.mjs";
+import { i as resolveManagedCodexNativeCommand } from "./managed-binary-BtIjV7yN.mjs";
 import { i as recordCodexAppServerSpawnFailure, r as getCodexAppServerSpawnFailure } from "./spawn-error-CL3n6MAa.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { stripVTControlCharacters } from "node:util";
@@ -62,36 +63,34 @@ var ProcessInspectionError = class extends Error {
 		this.name = "ProcessInspectionError";
 	}
 };
+function remainingInspectionTime(deadline) {
+	const remainingMs = deadline - Date.now();
+	if (remainingMs <= 0) throw new ProcessInspectionError("deadline");
+	return remainingMs;
+}
 function inspectionFailure(error) {
 	if (error instanceof ProcessInspectionError) return error;
 	const code = error && typeof error === "object" && "code" in error ? error.code : void 0;
 	return new ProcessInspectionError(code === "ABORT_ERR" ? "deadline" : code === "EACCES" || code === "EPERM" || code === "ERR_ACCESS_DENIED" ? "permission" : "unavailable");
 }
+function isMissingProcess(error) {
+	return error !== null && typeof error === "object" && "code" in error && (error.code === "ENOENT" || error.code === "ESRCH");
+}
 async function readCodexAppServerProcessSnapshot(deadline = Date.now() + MAX_PROCESS_CONTAINMENT_MS$1, pids) {
 	const selected = pids === void 0 ? void 0 : [.../* @__PURE__ */ new Set([process.pid, ...pids])];
-	const rows = process.platform === "linux" ? await readLinuxProcesses(selected, deadline) : await readProcesses(selected ? [
-		"-o",
-		PROCESS_COLUMNS,
-		"-p",
-		selected.join(",")
-	] : ["-axo", PROCESS_COLUMNS], deadline, selected !== void 0);
+	const rows = await readProcesses(selected, deadline, selected !== void 0);
 	if (selected && !rows.some((row) => row.pid === process.pid)) throw new ProcessInspectionError("unavailable");
 	return rows;
 }
 async function readCodexAppServerProcess(pid, deadline) {
-	return (process.platform === "linux" ? await readLinuxProcesses([pid], deadline) : await readProcesses([
-		"-o",
-		PROCESS_COLUMNS,
-		"-p",
-		String(pid)
-	], deadline)).find((row) => row.pid === pid);
+	return (await readProcesses([pid], deadline)).find((row) => row.pid === pid);
 }
 async function readCodexAppServerProcessCommand(observed, deadline) {
 	let output;
 	if (process.platform === "linux") {
 		let pending = false;
 		do {
-			if (deadline - Date.now() <= 0) throw new ProcessInspectionError("deadline");
+			remainingInspectionTime(deadline);
 			const command = await readProcessOutput({
 				kind: "procfs-command",
 				pid: observed.pid
@@ -113,19 +112,24 @@ async function readCodexAppServerProcessCommand(observed, deadline) {
 			String(observed.pid)
 		]
 	}, deadline)).split("\n")[0]?.trim() ?? "";
-	if (Date.now() >= deadline) throw new ProcessInspectionError("deadline");
+	remainingInspectionTime(deadline);
 	if (!output) throw new ProcessInspectionError("unavailable");
 	return output;
 }
-async function readProcesses(args, deadline, selected = false) {
-	return parseProcesses(await readProcessOutput({
+function readProcesses(pids, deadline, selected = false) {
+	if (process.platform === "linux") return readLinuxProcesses(pids, deadline);
+	return readProcessOutput({
 		kind: "ps",
-		args
-	}, deadline), selected);
+		args: pids ? [
+			"-o",
+			PROCESS_COLUMNS,
+			"-p",
+			pids.join(",")
+		] : ["-axo", PROCESS_COLUMNS]
+	}, deadline).then((output) => parseProcesses(output, selected));
 }
 async function readProcessOutput(command, deadline) {
-	const remainingMs = deadline - Date.now();
-	if (remainingMs <= 0) throw new ProcessInspectionError("deadline");
+	const remainingMs = remainingInspectionTime(deadline);
 	return await new Promise((resolve, reject) => {
 		let settled = false;
 		const settle = (output) => {
@@ -198,8 +202,7 @@ function parseProcesses(output, selected) {
 }
 async function readLinuxProcesses(selected, deadline) {
 	if (selected !== void 0) return readSelectedLinuxProcesses(selected, deadline);
-	const remainingMs = deadline - Date.now();
-	if (remainingMs <= 0) throw new ProcessInspectionError("deadline");
+	const remainingMs = remainingInspectionTime(deadline);
 	const options = {
 		encoding: "utf8",
 		signal: AbortSignal.timeout(remainingMs)
@@ -211,9 +214,9 @@ async function readLinuxProcesses(selected, deadline) {
 		let bytes = 0;
 		for (const entry of pids) {
 			if (!/^\d+$/.test(entry)) continue;
-			if (Date.now() >= deadline) throw new ProcessInspectionError("deadline");
+			remainingInspectionTime(deadline);
 			const stat = await readFile(`/proc/${entry}/stat`, options).catch((error) => {
-				if (error && typeof error === "object" && "code" in error && (error.code === "ENOENT" || error.code === "ESRCH")) return;
+				if (isMissingProcess(error)) return;
 				throw error;
 			});
 			if (stat === void 0) continue;
@@ -222,7 +225,7 @@ async function readLinuxProcesses(selected, deadline) {
 			const row = parseLinuxProcess(stat, entry, bootId, false);
 			if (row) rows.push(row);
 		}
-		if (Date.now() >= deadline) throw new ProcessInspectionError("deadline");
+		remainingInspectionTime(deadline);
 		return rows;
 	} catch (error) {
 		throw inspectionFailure(error);
@@ -254,20 +257,20 @@ function parseLinuxProcess(stat, entry, bootId, selected) {
 }
 /** Known procfs identities must not queue behind unrelated libuv filesystem work. */
 function readSelectedProcFile(file, deadline, maxBytes = PROCESS_INSPECTION_MAX_BYTES) {
-	if (Date.now() >= deadline) throw new ProcessInspectionError("deadline");
+	remainingInspectionTime(deadline);
 	const fd = openSync(file, constants.O_RDONLY | constants.O_NONBLOCK);
 	const chunks = [];
 	const buffer = Buffer.alloc(Math.min(4096, maxBytes + 1));
 	let bytes = 0;
 	try {
 		for (;;) {
-			if (Date.now() >= deadline) throw new ProcessInspectionError("deadline");
+			remainingInspectionTime(deadline);
 			const count = readSync(fd, buffer, {
 				offset: 0,
 				length: Math.min(buffer.length, maxBytes - bytes + 1),
 				position: null
 			});
-			if (Date.now() >= deadline) throw new ProcessInspectionError("deadline");
+			remainingInspectionTime(deadline);
 			if (count === 0) return Buffer.concat(chunks, bytes);
 			bytes += count;
 			if (bytes > maxBytes) throw new ProcessInspectionError("unavailable");
@@ -288,14 +291,14 @@ function readSelectedLinuxProcesses(selected, deadline) {
 			try {
 				stat = readSelectedProcFile(`/proc/${entry}/stat`, deadline, PROCESS_INSPECTION_MAX_BYTES - bytes);
 			} catch (error) {
-				if (error && typeof error === "object" && "code" in error && (error.code === "ENOENT" || error.code === "ESRCH")) continue;
+				if (isMissingProcess(error)) continue;
 				throw error;
 			}
 			bytes += stat.length;
 			const row = parseLinuxProcess(stat.toString("utf8"), entry, bootId, true);
 			if (row) rows.push(row);
 		}
-		if (Date.now() >= deadline) throw new ProcessInspectionError("deadline");
+		remainingInspectionTime(deadline);
 		return rows;
 	} catch (error) {
 		throw inspectionFailure(error);
@@ -337,12 +340,12 @@ async function terminateCodexAppServerOrphan(expected) {
 		}
 		return false;
 	} finally {
-		if (contained && !gone) await signalSameRoot(contained.root, "SIGCONT", Date.now() + MAX_PROCESS_CONTAINMENT_MS);
+		if (contained && !gone) await signalSameProcess(contained.root, "SIGCONT", Date.now() + MAX_PROCESS_CONTAINMENT_MS, "root");
 	}
 }
 async function terminateCodexAppServerDescendants(child, expected, deadline = Date.now() + MAX_PROCESS_CONTAINMENT_MS) {
 	const rootPid = child.pid;
-	if (hasExited(child)) return "exited";
+	if (child.exitCode != null || child.signalCode != null) return "exited";
 	if (process.platform === "win32" || !rootPid || !child.kill) return;
 	const snapshot = await readCodexAppServerProcessSnapshot(deadline).catch(() => void 0);
 	if (!snapshot || Date.now() >= deadline) return;
@@ -352,7 +355,7 @@ async function terminateCodexAppServerDescendants(child, expected, deadline = Da
 	const initialDescendants = collectDescendants(snapshot, [rootPid]);
 	if (initialDescendants.length > MAX_CONTAINED_PROCESSES) return;
 	const stoppedDescendants = /* @__PURE__ */ new Map();
-	if (!await signalSameRoot(root, "SIGSTOP", deadline)) return;
+	if (!await signalSameProcess(root, "SIGSTOP", deadline, "root")) return;
 	let resumeRootOnUnwind = true;
 	try {
 		const descendants = await quiesceDescendants(root, initialDescendants, stoppedDescendants, deadline);
@@ -393,7 +396,7 @@ async function terminateCodexAppServerDescendants(child, expected, deadline = Da
 			if (expected) {
 				const releaseDeadline = Date.now() + MAX_PROCESS_CONTAINMENT_MS;
 				for (const descendant of stoppedDescendants.values()) await signalSameProcess(descendant, "SIGCONT", releaseDeadline);
-				await signalSameRoot(root, "SIGCONT", releaseDeadline);
+				await signalSameProcess(root, "SIGCONT", releaseDeadline, "root");
 			} else {
 				for (const descendant of stoppedDescendants.values()) signalProcess(descendant.pid, "SIGCONT");
 				resumeTransportRoot(child, root, true);
@@ -411,11 +414,10 @@ async function quiesceDescendants(root, initialDescendants, stopped, deadline) {
 		const currentRoot = snapshot.find((row) => row.pid === root.pid);
 		if (!currentRoot || !isSameLiveRoot(currentRoot, root)) return;
 		if (!isSameLiveRoot(currentRoot, root, true)) {
-			if (!await signalSameRoot(root, "SIGSTOP", deadline) || Date.now() >= deadline) return;
+			if (!await signalSameProcess(root, "SIGSTOP", deadline, "root") || Date.now() >= deadline) return;
 			continue;
 		}
 		const snapshotByPid = new Map(snapshot.map((process) => [process.pid, process]));
-		const liveProven = [];
 		for (const proven of provenByPid.values()) {
 			const current = snapshotByPid.get(proven.pid);
 			if (!current) {
@@ -427,19 +429,16 @@ async function quiesceDescendants(root, initialDescendants, stopped, deadline) {
 			provenByPid.set(current.pid, current);
 			const key = identityKey(current);
 			if (stopped.has(key)) stopped.set(key, current);
-			liveProven.push(current);
 		}
-		const descendants = collectDescendants(snapshot, [root.pid, ...liveProven.map(({ pid }) => pid)]);
+		const descendants = collectDescendants(snapshot, [root.pid, ...provenByPid.keys()]);
 		for (const descendant of descendants) {
 			const proven = provenByPid.get(descendant.pid);
 			if (proven && !hasSameIdentity(proven, descendant)) return;
 			provenByPid.set(descendant.pid, descendant);
 		}
 		if (provenByPid.size > MAX_CONTAINED_PROCESSES) return;
-		const quiescenceTargets = new Map(liveProven.map((process) => [process.pid, process]));
-		for (const descendant of descendants) quiescenceTargets.set(descendant.pid, descendant);
 		let allStopped = true;
-		for (const descendant of quiescenceTargets.values()) {
+		for (const descendant of provenByPid.values()) {
 			if (Date.now() >= deadline) return;
 			if (isStoppedState(descendant.state)) continue;
 			const stopQueued = await signalSameProcess(descendant, "SIGSTOP", deadline);
@@ -491,10 +490,6 @@ function isSameLiveProcess(current, expected) {
 function isSameLiveRoot(current, expected, requireStopped = false) {
 	return current.ppid === expected.ppid && (!requireStopped || isQuiescedState(current.state)) && isSameLiveProcess(current, expected);
 }
-async function signalSameRoot(root, signal, deadline) {
-	const current = await readCodexAppServerProcess(root.pid, deadline).catch(() => void 0);
-	return Boolean(current && isSameLiveRoot(current, root) && signalProcess(current.pid, signal));
-}
 function resumeTransportRoot(child, root, allowSynchronousPidFallback) {
 	try {
 		if (child.kill) {
@@ -506,9 +501,9 @@ function resumeTransportRoot(child, root, allowSynchronousPidFallback) {
 	}
 	if (allowSynchronousPidFallback) signalProcess(root.pid, "SIGCONT");
 }
-async function signalSameProcess(expected, signal, deadline) {
+async function signalSameProcess(expected, signal, deadline, identity = "descendant") {
 	const current = await readCodexAppServerProcess(expected.pid, deadline).catch(() => void 0);
-	return Boolean(current && isSameLiveProcess(current, expected) && signalProcess(current.pid, signal));
+	return Boolean(current && (identity === "root" ? isSameLiveRoot : isSameLiveProcess)(current, expected) && signalProcess(current.pid, signal));
 }
 function hasSameIdentity(left, right) {
 	return identityKey(left) === identityKey(right);
@@ -516,9 +511,6 @@ function hasSameIdentity(left, right) {
 function identityKey(row) {
 	return `${row.pid}\0${row.startedAt}`;
 }
-function hasExited(child) {
-	return child.exitCode != null || child.signalCode != null;
-}
 function signalProcess(pid, signal) {
 	try {
 		process.kill(pid, signal);
@@ -620,12 +612,10 @@ function createCodexAppServerProcessReaperService() {
 }
 /** Reap previous owners before spawn; commit this child's identity before initialization. */
 async function prepareCodexAppServerProcessRegistration() {
-	if (process.platform === "win32") return async (child) => {
-		await once(child, "spawn");
-	};
-	const store = await reapRegisteredCodexAppServerOrphans();
+	const store = process.platform === "win32" ? void 0 : await reapRegisteredCodexAppServerOrphans();
 	return async (child) => {
 		await once(child, "spawn");
+		if (!store) return;
 		if (!child.pid) throw new ProcessInspectionError("unavailable");
 		const deadline = Date.now() + PROCESS_REGISTRATION_INSPECTION_MS;
 		const snapshot = await readCodexAppServerProcessSnapshot(deadline, [child.pid]);
@@ -707,10 +697,6 @@ function observeManagedCodexLauncherFailure(child, nativeCommand) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/transport.ts
-/**
-* Shared transport lifecycle helpers for stdio and WebSocket Codex app-server
-* connections.
-*/
 const CODEX_APP_SERVER_TRANSPORT_CLOSES = /* @__PURE__ */ new WeakMap();
 /** True only after bounded settlement proves an exit that cleanup did not cause. */
 function hasCodexAppServerNaturalExit(child) {
@@ -868,25 +854,29 @@ function resolveCodexAppServerSpawnInvocation(options, env) {
 /** Merges app-server environment overrides while honoring clearEnv and unsafe key filtering. */
 function resolveCodexAppServerSpawnEnv(options, baseEnv = process.env, platform = process.platform) {
 	const env = Object.create(null);
-	copySafeEnvironmentEntries(env, baseEnv);
-	copySafeEnvironmentEntries(env, options.env ?? {});
-	const keysToClear = (options.clearEnv ?? []).map((key) => key.trim()).filter(Boolean);
-	if (platform === "win32") {
-		const lowerCaseKeysToClear = new Set(keysToClear.map((key) => key.toLowerCase()));
-		for (const candidate of Object.keys(env)) if (lowerCaseKeysToClear.has(candidate.toLowerCase())) delete env[candidate];
-	} else for (const key of keysToClear) delete env[key];
-	for (const key of Object.keys(env)) if (isCodexRuntimeInjectionEnvironmentKey(key)) delete env[key];
+	for (const source of [baseEnv, options.env ?? {}]) for (const [key, value] of Object.entries(source)) if (!UNSAFE_ENVIRONMENT_KEYS.has(key)) env[key] = value;
+	const normalizeKey = (key) => platform === "win32" ? key.toLowerCase() : key;
+	const keysToClear = new Set((options.clearEnv ?? []).map((key) => normalizeKey(key.trim())).filter(Boolean));
+	for (const key of Object.keys(env)) {
+		const upperKey = key.toUpperCase();
+		const runtimeInjection = RUNTIME_INJECTION_ENVIRONMENT_KEYS.has(upperKey) || upperKey.startsWith("DYLD_");
+		if (keysToClear.has(normalizeKey(key)) || runtimeInjection) delete env[key];
+	}
 	return env;
 }
-function isCodexRuntimeInjectionEnvironmentKey(rawKey) {
-	const key = rawKey.toUpperCase();
-	return RUNTIME_INJECTION_ENVIRONMENT_KEYS.has(key) || key.startsWith("DYLD_");
-}
-function copySafeEnvironmentEntries(target, source) {
-	for (const [key, value] of Object.entries(source)) {
-		if (UNSAFE_ENVIRONMENT_KEYS.has(key)) continue;
-		target[key] = value;
-	}
+/** Keep inherited Git settings in the private process environment, outside thread config. */
+function withCodexAppServerGitConfig(options, parameters) {
+	const env = resolveCodexAppServerSpawnEnv(options);
+	const key = process.platform === "win32" ? Object.keys(env).toSorted().find((name) => name.toUpperCase() === "GIT_CONFIG_PARAMETERS") : "GIT_CONFIG_PARAMETERS";
+	const inherited = key === void 0 ? void 0 : env[key];
+	return {
+		...options,
+		env: {
+			...options.env,
+			GIT_CONFIG_PARAMETERS: appendCodexGitConfigParameters(inherited, parameters)
+		},
+		...options.clearEnv ? { clearEnv: options.clearEnv.filter((name) => (process.platform === "win32" ? name.trim().toUpperCase() : name.trim()) !== "GIT_CONFIG_PARAMETERS") } : {}
+	};
 }
 /** Spawns the Codex app-server process and returns the shared transport interface. */
 async function createStdioTransport(options, baseEnv = process.env, assertCurrent, onSpawn) {
@@ -942,4 +932,4 @@ async function createStdioTransport(options, baseEnv = process.env, assertCurren
 	}
 }
 //#endregion
-export { closeCodexAppServerTransportAndWait as a, getCodexAppServerRegisteredTransportIdentity as c, closeCodexAppServerTransport as i, resolveCodexAppServerSpawnEnv as n, hasCodexAppServerNaturalExit as o, resolveCodexAppServerSpawnInvocation as r, createCodexAppServerProcessReaperService as s, createStdioTransport as t };
+export { closeCodexAppServerTransport as a, createCodexAppServerProcessReaperService as c, withCodexAppServerGitConfig as i, getCodexAppServerRegisteredTransportIdentity as l, resolveCodexAppServerSpawnEnv as n, closeCodexAppServerTransportAndWait as o, resolveCodexAppServerSpawnInvocation as r, hasCodexAppServerNaturalExit as s, createStdioTransport as t };

package/dist/.setup/{transport-websocket-zqJ0Cmtn.mjs → transport-websocket-DIyPfkHo.mjs}

@@ -1,5 +1,5 @@
 import { r as resolveCodexAppServerUserHomeDir } from "./auth-start-options-BPIPeEX8.mjs";
-import "./config-0Gxk3_eq.mjs";
+import "./config-C1YVVLEA.mjs";
 import { t as codexWebSocketDataToBuffer } from "./websocket-data-XlRvt8Ys.mjs";
 import path from "node:path";
 import { EventEmitter } from "node:events";
@@ -58,14 +58,10 @@ function createWebSocketTransport(options) {
 	let consecutiveMissedPongs = 0;
 	let heartbeatSequence = 0;
 	const clearConnectionHealthTimers = () => {
-		if (pingTimeout) {
-			clearTimeout(pingTimeout);
-			pingTimeout = void 0;
-		}
-		if (pongTimeout) {
-			clearTimeout(pongTimeout);
-			pongTimeout = void 0;
-		}
+		clearTimeout(pingTimeout);
+		pingTimeout = void 0;
+		clearTimeout(pongTimeout);
+		pongTimeout = void 0;
 		expectedPong = void 0;
 	};
 	const sendHeartbeatPing = () => {
@@ -97,10 +93,8 @@ function createWebSocketTransport(options) {
 	};
 	const recordConnectionActivity = () => {
 		consecutiveMissedPongs = 0;
-		if (pongTimeout) {
-			clearTimeout(pongTimeout);
-			pongTimeout = void 0;
-		}
+		clearTimeout(pongTimeout);
+		pongTimeout = void 0;
 		expectedPong = void 0;
 		scheduleHeartbeatPing();
 	};
@@ -155,8 +149,7 @@ function createWebSocketTransport(options) {
 			callback();
 		},
 		final(callback) {
-			pendingLine += stdinDecoder.end();
-			if (pendingLine) sendFrame(pendingLine);
+			sendFrame(pendingLine + stdinDecoder.end());
 			pendingLine = "";
 			callback();
 		}
@@ -192,7 +185,6 @@ function createWebSocketTransport(options) {
 function connectCodexAppServerUnixSocket(socketPath) {
 	return net.createConnection(socketPath);
 }
-/** Resolves the canonical or explicitly configured Codex control socket. */
 function resolveCodexAppServerUnixSocketPath(options) {
 	if (options.transport !== "unix") {
 		if (options.url?.startsWith("unix://")) throw new Error("codex app-server unix URL requires unix transport");

package/dist/.setup/{turn-router-BWhX_SBh.mjs → turn-router-DKDAziUW.mjs}

@@ -1,6 +1,6 @@
 import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { n as waitForPromiseOrAbort, t as abortReason } from "./timeout-CXOfNoaX.mjs";
-import { x as readCodexTurnCompletedNotification } from "./client-BIRVBXXb.mjs";
+import { n as waitForPromiseOrAbort, t as abortReason } from "./timeout-D0mEWSGG.mjs";
+import { x as readCodexTurnCompletedNotification } from "./client-y7nO6X9c.mjs";
 import { normalizeOptionalString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { AsyncResource } from "node:async_hooks";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
@@ -18,7 +18,7 @@ const itemStatuses = /* @__PURE__ */ new Map([
 	["in_progress", "running"],
 	["running", "running"]
 ]);
-const itemPresentations = /* @__PURE__ */ new Map([
+const itemMetadata = /* @__PURE__ */ new Map([
 	["dynamicToolCall", {
 		kind: "tool",
 		title: "Tool"
@@ -53,17 +53,27 @@ const itemPresentations = /* @__PURE__ */ new Map([
 	["reasoning", {
 		kind: "analysis",
 		title: "Reasoning"
-	}]
+	}],
+	["collabAgentToolCall", { clearsTerminal: true }],
+	["imageGeneration", {
+		auditName: "image_generation",
+		clearsTerminal: true
+	}],
+	["imageView", {
+		auditName: "image_view",
+		clearsTerminal: true
+	}],
+	["sleep", { auditName: "sleep" }]
 ]);
 function matchesCodexSnapshotTurn(item, turnId) {
 	const itemTurnId = readStringField(item, "turnId");
 	return itemTurnId === void 0 || itemTurnId === turnId;
 }
 function itemKind(item) {
-	return itemPresentations.get(item.type)?.kind;
+	return itemMetadata.get(item.type)?.kind;
 }
 function itemTitle(item) {
-	return itemPresentations.get(item.type)?.title ?? item.type;
+	return itemMetadata.get(item.type)?.title ?? item.type;
 }
 function itemStatus(item) {
 	return itemStatuses.get(readStringField(item, "status") ?? "") ?? "completed";
@@ -89,44 +99,36 @@ function itemName(item) {
 		const server = typeof item.server === "string" ? item.server : void 0;
 		return server ? `${server}.${item.tool}` : item.tool;
 	}
-	return itemPresentations.get(item.type)?.toolName;
+	return itemMetadata.get(item.type)?.toolName;
 }
 function auditNativeToolName(item) {
 	if (item.type === "dynamicToolCall") return;
 	const progressName = itemName(item);
 	if (progressName) return progressName;
 	if (item.type === "collabAgentToolCall") return typeof item.tool === "string" && item.tool.trim() ? `collab.${item.tool.trim()}` : "collab_agent";
-	if (item.type === "imageGeneration") return "image_generation";
-	if (item.type === "imageView") return "image_view";
-	if (item.type === "sleep") return "sleep";
+	return itemMetadata.get(item.type)?.auditName;
 }
 function isSideEffectingNativeToolItem(item) {
 	return itemStatus(item) !== "blocked" && (isMutatingNativeToolItem(item) || item.type === "mcpToolCall");
 }
 function isProjectedNativeToolItem(item) {
-	return itemPresentations.get(item.type)?.projectedTool === true;
+	return itemMetadata.get(item.type)?.projectedTool === true;
 }
 function isMutatingNativeToolItem(item) {
 	if (item.type === "commandExecution") return true;
 	return item.type === "fileChange" || item.type === "collabAgentToolCall" || item.type === "imageGeneration";
 }
 function shouldClearTerminalPresentationForNativeItem(item) {
-	switch (item.type) {
-		case "collabAgentToolCall":
-		case "commandExecution":
-		case "fileChange":
-		case "imageGeneration":
-		case "imageView":
-		case "mcpToolCall":
-		case "webSearch": return true;
-		default: return false;
-	}
+	const metadata = itemMetadata.get(item.type);
+	return metadata?.projectedTool === true || metadata?.clearsTerminal === true;
+}
+function shouldAdvancePersistableAssistantBarrier(item) {
+	return shouldClearTerminalPresentationForNativeItem(item) || item.type === "dynamicToolCall" || item.type === "sleep";
 }
 //#endregion
 //#region extensions/codex/src/app-server/notification-correlation.ts
 function isCodexNotificationForTurn(value, threadId, turnId) {
-	if (!isJsonObject(value)) return false;
-	return readCodexNotificationThreadId(value) === threadId && readCodexNotificationTurnId(value) === turnId;
+	return isJsonObject(value) && readCodexNotificationThreadId(value) === threadId && readCodexNotificationTurnId(value) === turnId;
 }
 /**
 * Reads a thread id from canonical top-level or nested thread payloads.
@@ -136,7 +138,7 @@ function isCodexNotificationForTurn(value, threadId, turnId) {
 */
 function readCodexNotificationThreadId(record) {
 	const thread = isJsonObject(record.thread) ? record.thread : void 0;
-	return normalizeOptionalString(record.threadId) ?? (thread ? normalizeOptionalString(thread.id) : void 0);
+	return normalizeOptionalString(record.threadId) ?? (thread && normalizeOptionalString(thread.id));
 }
 function readCodexNotificationTurnId(record) {
 	return (isJsonObject(record.turn) ? normalizeOptionalString(record.turn.id) : void 0) ?? normalizeOptionalString(record.turnId);
@@ -512,17 +514,14 @@ var ClientTurnRouter = class {
 		if (!route) return;
 		const requestSignal = AbortSignal.any([signal, route.controller.signal]);
 		if (!route.handlers && !await waitForPromiseOrAbort(route.activated.promise, requestSignal)) return;
-		if (requestSignal.aborted || !route.handlers) return;
-		const handler = route.handlers.onRequest;
+		const handler = !requestSignal.aborted && route.handlers?.onRequest;
 		if (!handler) return;
 		while (route.gate === "armed") {
 			const binding = route.binding?.promise;
-			if (!binding || !await waitForPromiseOrAbort(binding, requestSignal)) return;
-			if (requestSignal.aborted) return;
+			if (!binding || !await waitForPromiseOrAbort(binding, requestSignal) || requestSignal.aborted) return;
 		}
 		if (route.gate === "bound" && scope.turnId && scope.turnId !== route.turnId) return;
-		if (!await waitForPromiseOrAbort(this.waitForNotifications(route), requestSignal)) return;
-		if (requestSignal.aborted) return;
+		if (!await waitForPromiseOrAbort(this.waitForNotifications(route), requestSignal) || requestSignal.aborted) return;
 		try {
 			const result = await handler(request, {
 				threadId: scope.threadId,
@@ -631,4 +630,4 @@ function requireId(value, label) {
 	return normalized;
 }
 //#endregion
-export { itemStatus as _, isCodexNotificationForTurn as a, shouldClearTerminalPresentationForNativeItem as b, auditNativeToolName as c, isMutatingNativeToolItem as d, isNonSuccessItemStatus as f, itemName as g, itemKind as h, CodexProjectionDiagnostics as i, auditNativeToolTerminalStatus as l, isSideEffectingNativeToolItem as m, getCodexAppServerTurnRouter as n, readCodexNotificationThreadId as o, isProjectedNativeToolItem as p, hasCodexAppServerSiblingRouteWork as r, readCodexNotificationTurnId as s, CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS as t, auditNativeToolUnfinishedStatus as u, itemTitle as v, unknownItemStatus as x, matchesCodexSnapshotTurn as y };
+export { unknownItemStatus as C, shouldClearTerminalPresentationForNativeItem as S, itemName as _, isCodexNotificationForTurn as a, matchesCodexSnapshotTurn as b, readCodexNotificationTurnId as c, auditNativeToolUnfinishedStatus as d, isMutatingNativeToolItem as f, itemKind as g, isSideEffectingNativeToolItem as h, CodexProjectionDiagnostics as i, auditNativeToolName as l, isProjectedNativeToolItem as m, getCodexAppServerTurnRouter as n, readCodexNotificationScope as o, isNonSuccessItemStatus as p, hasCodexAppServerSiblingRouteWork as r, readCodexNotificationThreadId as s, CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS as t, auditNativeToolTerminalStatus as u, itemStatus as v, shouldAdvancePersistableAssistantBarrier as x, itemTitle as y };

package/dist/.setup/upstream-prompt-provenance-Ccd9MFRJ.mjs

@@ -0,0 +1,44 @@
+import { asOptionalRecord, readNonEmptyStringPreservingWhitespace } from "openclaw/plugin-sdk/string-coerce-runtime";
+//#region extensions/codex/src/app-server/upstream-prompt-provenance.ts
+const UPSTREAM_USER_TEXT_META_KEY = "upstreamUserText";
+const MIRROR_IDENTITY_META_KEY = "mirrorIdentity";
+const CODEX_META_KEY = "__openclaw";
+function readCodexMeta(message) {
+	return message && CODEX_META_KEY in message ? asOptionalRecord(message[CODEX_META_KEY]) : void 0;
+}
+const ASSISTANT_ITEM_IDS = Symbol("codexAssistantItemIds");
+/** Follow snapshot copies without adding provider identities to durable messages. */
+function attachCodexAssistantItemIds(message, itemIds) {
+	return {
+		...message,
+		[ASSISTANT_ITEM_IDS]: itemIds
+	};
+}
+function takeCodexAssistantItemIds(message) {
+	const itemIds = message[ASSISTANT_ITEM_IDS];
+	delete message[ASSISTANT_ITEM_IDS];
+	return itemIds;
+}
+function attachCodexMeta(message, key, value) {
+	return {
+		...message,
+		__openclaw: {
+			...readCodexMeta(message),
+			[key]: value
+		}
+	};
+}
+function attachCodexMirrorIdentity(message, identity) {
+	return attachCodexMeta(message, MIRROR_IDENTITY_META_KEY, identity);
+}
+function readMirrorIdentity(message) {
+	return readNonEmptyStringPreservingWhitespace(readCodexMeta(message)?.[MIRROR_IDENTITY_META_KEY]);
+}
+function attachUpstreamUserText(message, text) {
+	return attachCodexMeta(message, UPSTREAM_USER_TEXT_META_KEY, text);
+}
+function readUpstreamUserText(message) {
+	return readNonEmptyStringPreservingWhitespace(readCodexMeta(message)?.[UPSTREAM_USER_TEXT_META_KEY]);
+}
+//#endregion
+export { readUpstreamUserText as a, readMirrorIdentity as i, attachCodexMirrorIdentity as n, takeCodexAssistantItemIds as o, attachUpstreamUserText as r, attachCodexAssistantItemIds as t };