@openclaw/codex 2026.5.24-beta.2 → 2026.5.25-beta.1

package/dist/{node-cli-sessions-9CAqnIaA.js → conversation-binding-B-GevkEb.js}

@@ -1,11 +1,13 @@
-import { a as isCodexFastServiceTier, l as resolveCodexAppServerRuntimeOptions, r as codexSandboxPolicyForTurn } from "./config-DDMrwfJl.js";
-import { t as isJsonObject } from "./protocol-oeJQu4rs.js";
-import { i as readCodexAppServerBinding, n as isCodexAppServerNativeAuthProfile, o as writeCodexAppServerBinding, r as normalizeCodexAppServerBindingModelProvider, t as clearCodexAppServerBinding } from "./session-binding-Bw_mfIW2.js";
-import { r as CODEX_CONTROL_METHODS } from "./request-D93E78SA.js";
-import { i as readCodexNotificationTurnId, r as readCodexNotificationThreadId, s as formatCodexDisplayText } from "./notification-correlation-qKY_sgga.js";
-import { i as getSharedCodexAppServerClient, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-CFCUGEVs.js";
+import { a as isCodexFastServiceTier, l as resolveCodexAppServerRuntimeOptions, r as codexSandboxPolicyForTurn } from "./config-D6TUuyo2.js";
+import { l as isJsonObject } from "./client-SrtuTTVa.js";
+import { t as CODEX_NATIVE_PERSONALITY_NONE } from "./thread-lifecycle-CXMd9UgJ.js";
+import { i as readCodexAppServerBinding, n as isCodexAppServerNativeAuthProfile, o as writeCodexAppServerBinding, r as normalizeCodexAppServerBindingModelProvider, t as clearCodexAppServerBinding } from "./session-binding-CwNOIDP2.js";
+import { r as CODEX_CONTROL_METHODS } from "./request-BO0z3vA8.js";
+import { i as readCodexNotificationTurnId, r as readCodexNotificationThreadId, s as formatCodexDisplayText } from "./notification-correlation-D7tJW3FW.js";
+import { i as getSharedCodexAppServerClient, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-CZP1DjaN.js";
 import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-CTnEWuor.js";
 import os from "node:os";
+import { asOptionalRecord, isRecord, normalizeSingleOrTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { materializeWindowsSpawnProgram, resolveWindowsSpawnProgram } from "openclaw/plugin-sdk/windows-spawn";
 import { formatErrorMessage } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { spawn } from "node:child_process";
@@ -63,10 +65,7 @@ function readCodexConversationBindingDataRecord(data) {
 	};
 }
 function resolveCodexDefaultWorkspaceDir(pluginConfig) {
-	return readString$1(readRecord$1(readRecord$1(pluginConfig)?.appServer), "defaultWorkspaceDir") ?? process.cwd();
-}
-function readRecord$1(value) {
-	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+	return readString$1(asOptionalRecord(asOptionalRecord(pluginConfig)?.appServer), "defaultWorkspaceDir") ?? process.cwd();
 }
 function readString$1(record, key) {
 	const value = record?.[key];
@@ -317,7 +316,7 @@ function createCodexConversationTurnCollector(threadId) {
 		}
 		if (notification.method === "turn/completed") {
 			const turn = isJsonObject(params.turn) ? params.turn : void 0;
-			if (readString(turn, "status") === "failed") failedError = readString(readRecord(turn?.error), "message") ?? "codex app-server turn failed";
+			if (readString(turn, "status") === "failed") failedError = readString(asOptionalRecord(turn?.error), "message") ?? "codex app-server turn failed";
 			const items = Array.isArray(turn?.items) ? turn.items : [];
 			for (const item of items) {
 				if (!isJsonObject(item) || item.type !== "agentMessage") continue;
@@ -364,9 +363,6 @@ function isNotificationForTurn(params, threadId, turnId) {
 function readNotificationTurnId(params) {
 	return readCodexNotificationTurnId(params);
 }
-function readRecord(value) {
-	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
-}
 function readString(record, key) {
 	const value = record?.[key];
 	return typeof value === "string" && value.trim() ? value.trim() : void 0;
@@ -394,9 +390,9 @@ function buildCodexConversationTurnInput(params) {
 }
 function extractInboundMedia(event) {
 	const metadata = event.metadata ?? {};
-	const paths = readStringArray(metadata.mediaPaths).concat(readStringArray(metadata.mediaPath));
-	const urls = readStringArray(metadata.mediaUrls).concat(readStringArray(metadata.mediaUrl));
-	const mimeTypes = readStringArray(metadata.mediaTypes).concat(readStringArray(metadata.mediaType));
+	const paths = normalizeSingleOrTrimmedStringList(metadata.mediaPaths).concat(normalizeSingleOrTrimmedStringList(metadata.mediaPath));
+	const urls = normalizeSingleOrTrimmedStringList(metadata.mediaUrls).concat(normalizeSingleOrTrimmedStringList(metadata.mediaUrl));
+	const mimeTypes = normalizeSingleOrTrimmedStringList(metadata.mediaTypes).concat(normalizeSingleOrTrimmedStringList(metadata.mediaType));
 	const count = Math.max(paths.length, urls.length, mimeTypes.length);
 	const media = [];
 	for (let index = 0; index < count; index += 1) media.push({
@@ -442,428 +438,104 @@ function readLocalMediaPath(value) {
 	if (path.isAbsolute(value) || path.win32.isAbsolute(value)) return value;
 	return /^[a-z][a-z0-9+.-]*:/i.test(value) ? void 0 : value;
 }
-function readStringArray(value) {
-	if (typeof value === "string" && value.trim()) return [value.trim()];
-	if (!Array.isArray(value)) return [];
-	return value.map((entry) => typeof entry === "string" ? entry.trim() : "").filter(Boolean);
-}
 //#endregion
-//#region extensions/codex/src/conversation-binding.ts
-const DEFAULT_BOUND_TURN_TIMEOUT_MS = 20 * 6e4;
-const CODEX_CONVERSATION_GLOBAL_STATE = Symbol.for("openclaw.codex.conversationBinding");
-function getGlobalState() {
-	const globalState = globalThis;
-	globalState[CODEX_CONVERSATION_GLOBAL_STATE] ??= { queues: /* @__PURE__ */ new Map() };
-	return globalState[CODEX_CONVERSATION_GLOBAL_STATE];
+//#region extensions/codex/src/node-cli-sessions.ts
+const CODEX_CLI_SESSIONS_LIST_COMMAND = "codex.cli.sessions.list";
+const CODEX_CLI_SESSION_RESUME_COMMAND = "codex.cli.session.resume";
+const DEFAULT_SESSION_LIMIT = 10;
+const MAX_SESSION_LIMIT = 50;
+const DEFAULT_RESUME_TIMEOUT_MS = 20 * 6e4;
+const SESSION_ID_PATTERN = /^[A-Za-z0-9._:-]{1,128}$/;
+const activeResumeSessions = /* @__PURE__ */ new Set();
+const DEFAULT_RESUME_SPAWN_RUNTIME = {
+	platform: process.platform,
+	env: process.env,
+	execPath: process.execPath
+};
+function createCodexCliSessionNodeHostCommands() {
+	return [{
+		command: CODEX_CLI_SESSIONS_LIST_COMMAND,
+		cap: "codex-cli-sessions",
+		handle: listLocalCodexCliSessions
+	}, {
+		command: CODEX_CLI_SESSION_RESUME_COMMAND,
+		cap: "codex-cli-sessions",
+		dangerous: true,
+		handle: resumeLocalCodexCliSession
+	}];
 }
-async function startCodexConversationThread(params) {
-	const workspaceDir = params.workspaceDir?.trim() || resolveCodexDefaultWorkspaceDir(params.pluginConfig);
-	const agentDir = params.agentDir?.trim();
-	const agentLookup = buildAgentLookup({
-		agentDir,
-		config: params.config
-	});
-	const existingBinding = await readCodexAppServerBinding(params.sessionFile, { ...agentLookup });
-	const authProfileId = resolveCodexAppServerAuthProfileIdForAgent({
-		authProfileId: params.authProfileId ?? existingBinding?.authProfileId,
-		...agentLookup
-	});
-	if (params.threadId?.trim()) await attachExistingThread({
-		pluginConfig: params.pluginConfig,
-		sessionFile: params.sessionFile,
-		threadId: params.threadId.trim(),
-		workspaceDir,
-		...agentDir ? { agentDir } : {},
-		model: params.model,
-		modelProvider: params.modelProvider,
-		authProfileId,
-		approvalPolicy: params.approvalPolicy,
-		sandbox: params.sandbox,
-		serviceTier: params.serviceTier,
-		config: params.config
-	});
-	else await createThread({
-		pluginConfig: params.pluginConfig,
-		sessionFile: params.sessionFile,
-		workspaceDir,
-		...agentDir ? { agentDir } : {},
-		model: params.model,
-		modelProvider: params.modelProvider,
-		authProfileId,
-		approvalPolicy: params.approvalPolicy,
-		sandbox: params.sandbox,
-		serviceTier: params.serviceTier,
-		config: params.config
-	});
-	return createCodexConversationBindingData({
-		sessionFile: params.sessionFile,
-		workspaceDir,
-		...agentDir ? { agentDir } : {}
+function createCodexCliSessionNodeInvokePolicies() {
+	return [{
+		commands: [CODEX_CLI_SESSIONS_LIST_COMMAND],
+		defaultPlatforms: [
+			"macos",
+			"linux",
+			"windows"
+		],
+		handle: (ctx) => ctx.invokeNode()
+	}, {
+		commands: [CODEX_CLI_SESSION_RESUME_COMMAND],
+		dangerous: true,
+		handle: (ctx) => ctx.invokeNode()
+	}];
+}
+async function listCodexCliSessionsOnNode(params) {
+	const node = await resolveCodexCliNode({
+		runtime: params.runtime,
+		requestedNode: params.requestedNode,
+		command: CODEX_CLI_SESSIONS_LIST_COMMAND
 	});
+	return {
+		node,
+		result: parseCodexCliSessionsListResult(await params.runtime.nodes.invoke({
+			nodeId: readNodeId(node),
+			command: CODEX_CLI_SESSIONS_LIST_COMMAND,
+			params: {
+				limit: params.limit,
+				filter: params.filter
+			},
+			timeoutMs: 15e3
+		}))
+	};
 }
-async function handleCodexConversationInboundClaim(event, ctx, options = {}) {
-	const data = readCodexConversationBindingData(ctx.pluginBinding);
-	if (!data) return;
-	if (event.commandAuthorized !== true) return { handled: true };
-	const prompt = event.bodyForAgent?.trim() || event.content?.trim() || "";
-	if (!prompt) return { handled: true };
-	const nativeExecutionBlock = data.kind === "codex-cli-node-session" ? resolveCodexNativeSandboxBlock({
-		config: options.config,
-		sessionKey: event.sessionKey ?? ctx.sessionKey,
-		surface: "Codex CLI node conversation binding"
-	}) : resolveCodexNativeExecutionBlock({
-		config: options.config,
-		sessionKey: event.sessionKey ?? ctx.sessionKey,
-		surface: "Codex app-server conversation binding"
+async function resolveCodexCliSessionForBindingOnNode(params) {
+	const listing = await listCodexCliSessionsOnNode({
+		runtime: params.runtime,
+		requestedNode: params.requestedNode,
+		filter: params.sessionId,
+		limit: MAX_SESSION_LIMIT
 	});
-	if (nativeExecutionBlock) return {
-		handled: true,
-		reply: { text: nativeExecutionBlock }
+	if (!listing.node.commands?.includes("codex.cli.session.resume")) throw new Error(`Node ${formatNodeLabel(listing.node)} does not expose ${CODEX_CLI_SESSION_RESUME_COMMAND}.`);
+	return {
+		node: listing.node,
+		session: listing.result.sessions.find((session) => session.sessionId === params.sessionId)
 	};
-	if (data.kind === "codex-cli-node-session") {
-		const resume = options.resumeCodexCliSessionOnNode;
-		if (!resume) return {
-			handled: true,
-			reply: { text: "Codex CLI node binding is unavailable because Gateway node runtime is not attached." }
-		};
-		try {
-			return {
-				handled: true,
-				reply: (await enqueueBoundTurn(`${data.nodeId}:${data.sessionId}`, async () => {
-					return { reply: { text: (await resume({
-						nodeId: data.nodeId,
-						sessionId: data.sessionId,
-						prompt,
-						cwd: data.cwd,
-						timeoutMs: options.timeoutMs
-					})).text.trim() || "Codex completed without a text reply." } };
-				})).reply
-			};
-		} catch (error) {
-			return {
-				handled: true,
-				reply: { text: `Codex CLI node turn failed: ${formatCodexDisplayText(formatErrorMessage(error))}` }
-			};
-		}
-	}
-	try {
-		return {
-			handled: true,
-			reply: (await enqueueBoundTurn(data.sessionFile, () => runBoundTurnWithMissingThreadRecovery({
-				data,
-				prompt,
-				event,
-				pluginConfig: options.pluginConfig,
-				timeoutMs: options.timeoutMs
-			}))).reply
-		};
-	} catch (error) {
-		return {
-			handled: true,
-			reply: { text: `Codex app-server turn failed: ${formatCodexDisplayText(formatErrorMessage(error))}` }
-		};
-	}
 }
-async function handleCodexConversationBindingResolved(event) {
-	if (event.status !== "denied") return;
-	const data = readCodexConversationBindingDataRecord(event.request.data ?? {});
-	if (!data || data.kind !== "codex-app-server-session") return;
-	await clearCodexAppServerBinding(data.sessionFile);
+async function resumeCodexCliSessionOnNode(params) {
+	const payload = unwrapNodeInvokePayload(await params.runtime.nodes.invoke({
+		nodeId: params.nodeId,
+		command: CODEX_CLI_SESSION_RESUME_COMMAND,
+		params: {
+			sessionId: params.sessionId,
+			prompt: params.prompt,
+			cwd: params.cwd,
+			timeoutMs: params.timeoutMs
+		},
+		timeoutMs: (params.timeoutMs ?? DEFAULT_RESUME_TIMEOUT_MS) + 5e3
+	}));
+	if (!isRecord(payload) || payload.ok !== true || typeof payload.text !== "string") throw new Error("Codex CLI resume returned an invalid payload.");
+	return {
+		ok: true,
+		sessionId: typeof payload.sessionId === "string" ? payload.sessionId : params.sessionId,
+		text: payload.text
+	};
 }
-async function attachExistingThread(params) {
-	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.pluginConfig });
-	const agentLookup = buildAgentLookup({
-		agentDir: params.agentDir,
-		config: params.config
-	});
-	const modelProvider = resolveThreadRequestModelProvider({
-		authProfileId: params.authProfileId,
-		modelProvider: params.modelProvider,
-		...agentLookup
-	});
-	const response = await (await getSharedCodexAppServerClient({
-		startOptions: runtime.start,
-		timeoutMs: runtime.requestTimeoutMs,
-		authProfileId: params.authProfileId,
-		...agentLookup
-	})).request(CODEX_CONTROL_METHODS.resumeThread, {
-		threadId: params.threadId,
-		...params.model ? { model: params.model } : {},
-		...modelProvider ? { modelProvider } : {},
-		approvalPolicy: params.approvalPolicy ?? runtime.approvalPolicy,
-		approvalsReviewer: runtime.approvalsReviewer,
-		sandbox: params.sandbox ?? runtime.sandbox,
-		...params.serviceTier ?? runtime.serviceTier ? { serviceTier: params.serviceTier ?? runtime.serviceTier } : {},
-		persistExtendedHistory: true
-	}, { timeoutMs: runtime.requestTimeoutMs });
-	const thread = response.thread;
-	const runtimeApprovalPolicy = typeof runtime.approvalPolicy === "string" ? runtime.approvalPolicy : void 0;
-	await writeCodexAppServerBinding(params.sessionFile, {
-		threadId: thread.id,
-		cwd: thread.cwd ?? params.workspaceDir,
-		authProfileId: params.authProfileId,
-		model: response.model ?? params.model,
-		modelProvider: normalizeCodexAppServerBindingModelProvider({
-			authProfileId: params.authProfileId,
-			modelProvider: response.modelProvider ?? params.modelProvider,
-			...agentLookup
-		}),
-		approvalPolicy: params.approvalPolicy ?? runtimeApprovalPolicy,
-		sandbox: params.sandbox ?? runtime.sandbox,
-		serviceTier: params.serviceTier ?? runtime.serviceTier
-	}, { ...agentLookup });
-}
-async function createThread(params) {
-	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.pluginConfig });
-	const agentLookup = buildAgentLookup({
-		agentDir: params.agentDir,
-		config: params.config
-	});
-	const modelProvider = resolveThreadRequestModelProvider({
-		authProfileId: params.authProfileId,
-		modelProvider: params.modelProvider,
-		...agentLookup
-	});
-	const response = await (await getSharedCodexAppServerClient({
-		startOptions: runtime.start,
-		timeoutMs: runtime.requestTimeoutMs,
-		authProfileId: params.authProfileId,
-		...agentLookup
-	})).request("thread/start", {
-		cwd: params.workspaceDir,
-		...params.model ? { model: params.model } : {},
-		...modelProvider ? { modelProvider } : {},
-		approvalPolicy: params.approvalPolicy ?? runtime.approvalPolicy,
-		approvalsReviewer: runtime.approvalsReviewer,
-		sandbox: params.sandbox ?? runtime.sandbox,
-		...params.serviceTier ?? runtime.serviceTier ? { serviceTier: params.serviceTier ?? runtime.serviceTier } : {},
-		developerInstructions: "This Codex thread is bound to an OpenClaw conversation. Answer normally; OpenClaw will deliver your final response back to the conversation.",
-		experimentalRawEvents: true,
-		persistExtendedHistory: true
-	}, { timeoutMs: runtime.requestTimeoutMs });
-	const runtimeApprovalPolicy = typeof runtime.approvalPolicy === "string" ? runtime.approvalPolicy : void 0;
-	await writeCodexAppServerBinding(params.sessionFile, {
-		threadId: response.thread.id,
-		cwd: response.thread.cwd ?? params.workspaceDir,
-		authProfileId: params.authProfileId,
-		model: response.model ?? params.model,
-		modelProvider: normalizeCodexAppServerBindingModelProvider({
-			authProfileId: params.authProfileId,
-			modelProvider: response.modelProvider ?? params.modelProvider,
-			...agentLookup
-		}),
-		approvalPolicy: params.approvalPolicy ?? runtimeApprovalPolicy,
-		sandbox: params.sandbox ?? runtime.sandbox,
-		serviceTier: params.serviceTier ?? runtime.serviceTier
-	}, { ...agentLookup });
-}
-async function runBoundTurn(params) {
-	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.pluginConfig });
-	const agentLookup = buildAgentLookup({ agentDir: params.data.agentDir });
-	const binding = await readCodexAppServerBinding(params.data.sessionFile, agentLookup);
-	const threadId = binding?.threadId;
-	if (!threadId) throw new Error("bound Codex conversation has no thread binding");
-	const client = await getSharedCodexAppServerClient({
-		startOptions: runtime.start,
-		timeoutMs: runtime.requestTimeoutMs,
-		authProfileId: binding.authProfileId,
-		...agentLookup
-	});
-	const collector = createCodexConversationTurnCollector(threadId);
-	const notificationCleanup = client.addNotificationHandler((notification) => collector.handleNotification(notification));
-	const requestCleanup = client.addRequestHandler(async (request) => {
-		if (request.method === "item/tool/call") return {
-			contentItems: [{
-				type: "inputText",
-				text: "OpenClaw native Codex conversation binding does not expose dynamic OpenClaw tools yet."
-			}],
-			success: false
-		};
-		if (request.method === "item/commandExecution/requestApproval" || request.method === "item/fileChange/requestApproval") return {
-			decision: "decline",
-			reason: "OpenClaw native Codex conversation binding cannot route interactive approvals yet; use the Codex harness or explicit /acp spawn codex for that workflow."
-		};
-		if (request.method === "item/permissions/requestApproval") return {
-			permissions: {},
-			scope: "turn"
-		};
-		if (request.method.includes("requestApproval")) return {
-			decision: "decline",
-			reason: "OpenClaw native Codex conversation binding cannot route interactive approvals yet; use the Codex harness or explicit /acp spawn codex for that workflow."
-		};
-	});
-	try {
-		const turnId = (await client.request("turn/start", {
-			threadId,
-			input: buildCodexConversationTurnInput({
-				prompt: params.prompt,
-				event: params.event
-			}),
-			cwd: binding.cwd || params.data.workspaceDir,
-			approvalPolicy: binding.approvalPolicy ?? runtime.approvalPolicy,
-			approvalsReviewer: runtime.approvalsReviewer,
-			sandboxPolicy: codexSandboxPolicyForTurn(binding.sandbox ?? runtime.sandbox, binding.cwd || params.data.workspaceDir),
-			...binding.model ? { model: binding.model } : {},
-			...binding.serviceTier ?? runtime.serviceTier ? { serviceTier: binding.serviceTier ?? runtime.serviceTier } : {}
-		}, { timeoutMs: runtime.requestTimeoutMs })).turn.id;
-		const activeCleanup = trackCodexConversationActiveTurn({
-			sessionFile: params.data.sessionFile,
-			threadId,
-			turnId
-		});
-		collector.setTurnId(turnId);
-		return { reply: { text: (await collector.wait({ timeoutMs: params.timeoutMs ?? DEFAULT_BOUND_TURN_TIMEOUT_MS }).finally(activeCleanup)).replyText.trim() || "Codex completed without a text reply." } };
-	} finally {
-		notificationCleanup();
-		requestCleanup();
-	}
-}
-async function runBoundTurnWithMissingThreadRecovery(params) {
-	try {
-		return await runBoundTurn(params);
-	} catch (error) {
-		if (!isCodexThreadNotFoundError(error)) throw error;
-		const agentLookup = buildAgentLookup({ agentDir: params.data.agentDir });
-		const binding = await readCodexAppServerBinding(params.data.sessionFile, agentLookup);
-		await startCodexConversationThread({
-			pluginConfig: params.pluginConfig,
-			sessionFile: params.data.sessionFile,
-			workspaceDir: binding?.cwd || params.data.workspaceDir,
-			...agentLookup,
-			model: binding?.model,
-			modelProvider: binding?.modelProvider,
-			authProfileId: binding?.authProfileId,
-			approvalPolicy: binding?.approvalPolicy,
-			sandbox: binding?.sandbox,
-			serviceTier: binding?.serviceTier
-		});
-		return await runBoundTurn(params);
-	}
-}
-function isCodexThreadNotFoundError(error) {
-	return /\bthread not found:/iu.test(formatErrorMessage(error));
-}
-function enqueueBoundTurn(key, run) {
-	const state = getGlobalState();
-	const next = (state.queues.get(key) ?? Promise.resolve()).then(run, run);
-	const queued = next.then(() => void 0, () => void 0);
-	state.queues.set(key, queued);
-	next.finally(() => {
-		if (state.queues.get(key) === queued) state.queues.delete(key);
-	}).catch(() => void 0);
-	return next;
-}
-function resolveThreadRequestModelProvider(params) {
-	const modelProvider = params.modelProvider?.trim();
-	if (!modelProvider || modelProvider.toLowerCase() === "codex") return;
-	if (isCodexAppServerNativeAuthProfile(params) && (modelProvider.toLowerCase() === "openai" || modelProvider.toLowerCase() === "openai-codex")) return;
-	return modelProvider.toLowerCase() === "openai-codex" ? "openai" : modelProvider;
-}
-function buildAgentLookup(params) {
-	const agentDir = params.agentDir?.trim();
-	return {
-		...agentDir ? { agentDir } : {},
-		...params.config ? { config: params.config } : {}
-	};
-}
-//#endregion
-//#region extensions/codex/src/node-cli-sessions.ts
-const CODEX_CLI_SESSIONS_LIST_COMMAND = "codex.cli.sessions.list";
-const CODEX_CLI_SESSION_RESUME_COMMAND = "codex.cli.session.resume";
-const DEFAULT_SESSION_LIMIT = 10;
-const MAX_SESSION_LIMIT = 50;
-const DEFAULT_RESUME_TIMEOUT_MS = 20 * 6e4;
-const SESSION_ID_PATTERN = /^[A-Za-z0-9._:-]{1,128}$/;
-const activeResumeSessions = /* @__PURE__ */ new Set();
-const DEFAULT_RESUME_SPAWN_RUNTIME = {
-	platform: process.platform,
-	env: process.env,
-	execPath: process.execPath
-};
-function createCodexCliSessionNodeHostCommands() {
-	return [{
-		command: CODEX_CLI_SESSIONS_LIST_COMMAND,
-		cap: "codex-cli-sessions",
-		handle: listLocalCodexCliSessions
-	}, {
-		command: CODEX_CLI_SESSION_RESUME_COMMAND,
-		cap: "codex-cli-sessions",
-		dangerous: true,
-		handle: resumeLocalCodexCliSession
-	}];
-}
-function createCodexCliSessionNodeInvokePolicies() {
-	return [{
-		commands: [CODEX_CLI_SESSIONS_LIST_COMMAND],
-		defaultPlatforms: [
-			"macos",
-			"linux",
-			"windows"
-		],
-		handle: (ctx) => ctx.invokeNode()
-	}, {
-		commands: [CODEX_CLI_SESSION_RESUME_COMMAND],
-		dangerous: true,
-		handle: (ctx) => ctx.invokeNode()
-	}];
-}
-async function listCodexCliSessionsOnNode(params) {
-	const node = await resolveCodexCliNode({
-		runtime: params.runtime,
-		requestedNode: params.requestedNode,
-		command: CODEX_CLI_SESSIONS_LIST_COMMAND
-	});
-	return {
-		node,
-		result: parseCodexCliSessionsListResult(await params.runtime.nodes.invoke({
-			nodeId: readNodeId(node),
-			command: CODEX_CLI_SESSIONS_LIST_COMMAND,
-			params: {
-				limit: params.limit,
-				filter: params.filter
-			},
-			timeoutMs: 15e3
-		}))
-	};
-}
-async function resolveCodexCliSessionForBindingOnNode(params) {
-	const listing = await listCodexCliSessionsOnNode({
-		runtime: params.runtime,
-		requestedNode: params.requestedNode,
-		filter: params.sessionId,
-		limit: MAX_SESSION_LIMIT
-	});
-	if (!listing.node.commands?.includes("codex.cli.session.resume")) throw new Error(`Node ${formatNodeLabel(listing.node)} does not expose ${CODEX_CLI_SESSION_RESUME_COMMAND}.`);
-	return {
-		node: listing.node,
-		session: listing.result.sessions.find((session) => session.sessionId === params.sessionId)
-	};
-}
-async function resumeCodexCliSessionOnNode(params) {
-	const payload = unwrapNodeInvokePayload(await params.runtime.nodes.invoke({
-		nodeId: params.nodeId,
-		command: CODEX_CLI_SESSION_RESUME_COMMAND,
-		params: {
-			sessionId: params.sessionId,
-			prompt: params.prompt,
-			cwd: params.cwd,
-			timeoutMs: params.timeoutMs
-		},
-		timeoutMs: (params.timeoutMs ?? DEFAULT_RESUME_TIMEOUT_MS) + 5e3
-	}));
-	if (!isRecord(payload) || payload.ok !== true || typeof payload.text !== "string") throw new Error("Codex CLI resume returned an invalid payload.");
-	return {
-		ok: true,
-		sessionId: typeof payload.sessionId === "string" ? payload.sessionId : params.sessionId,
-		text: payload.text
-	};
-}
-function formatCodexCliSessions(params) {
-	if (params.result.sessions.length === 0) return `No Codex CLI sessions returned from ${formatCodexDisplayText(formatNodeLabel(params.node))}.`;
-	return [`Codex CLI sessions on ${formatCodexDisplayText(formatNodeLabel(params.node))}:`, ...params.result.sessions.map((session) => {
-		const details = [session.cwd, session.updatedAt].filter((value) => Boolean(value));
-		return `- ${formatCodexDisplayText(session.sessionId)}${session.lastMessage ? ` - ${formatCodexDisplayText(session.lastMessage)}` : ""}${details.length > 0 ? ` (${details.map(formatCodexDisplayText).join(", ")})` : ""}\n  Bind: /codex resume ${formatCodexDisplayText(session.sessionId)} --host ${formatCodexDisplayText(readNodeId(params.node))} --bind here`;
-	})].join("\n");
+function formatCodexCliSessions(params) {
+	if (params.result.sessions.length === 0) return `No Codex CLI sessions returned from ${formatCodexDisplayText(formatNodeLabel(params.node))}.`;
+	return [`Codex CLI sessions on ${formatCodexDisplayText(formatNodeLabel(params.node))}:`, ...params.result.sessions.map((session) => {
+		const details = [session.cwd, session.updatedAt].filter((value) => Boolean(value));
+		return `- ${formatCodexDisplayText(session.sessionId)}${session.lastMessage ? ` - ${formatCodexDisplayText(session.lastMessage)}` : ""}${details.length > 0 ? ` (${details.map(formatCodexDisplayText).join(", ")})` : ""}\n  Bind: /codex resume ${formatCodexDisplayText(session.sessionId)} --host ${formatCodexDisplayText(readNodeId(params.node))} --bind here`;
+	})].join("\n");
 }
 async function listLocalCodexCliSessions(paramsJSON) {
 	const params = readRecordParam(paramsJSON);
@@ -1223,8 +895,328 @@ function formatNodeLabel(node) {
 		node.remoteIp
 	].filter(Boolean).join(" / ") || "node";
 }
-function isRecord(value) {
-	return Boolean(value && typeof value === "object" && !Array.isArray(value));
+//#endregion
+//#region extensions/codex/src/conversation-binding.ts
+const DEFAULT_BOUND_TURN_TIMEOUT_MS = 20 * 6e4;
+const CODEX_CONVERSATION_GLOBAL_STATE = Symbol.for("openclaw.codex.conversationBinding");
+function getGlobalState() {
+	const globalState = globalThis;
+	globalState[CODEX_CONVERSATION_GLOBAL_STATE] ??= { queues: /* @__PURE__ */ new Map() };
+	return globalState[CODEX_CONVERSATION_GLOBAL_STATE];
+}
+async function startCodexConversationThread(params) {
+	const workspaceDir = params.workspaceDir?.trim() || resolveCodexDefaultWorkspaceDir(params.pluginConfig);
+	const agentDir = params.agentDir?.trim();
+	const agentLookup = buildAgentLookup({
+		agentDir,
+		config: params.config
+	});
+	const existingBinding = await readCodexAppServerBinding(params.sessionFile, { ...agentLookup });
+	const authProfileId = resolveCodexAppServerAuthProfileIdForAgent({
+		authProfileId: params.authProfileId ?? existingBinding?.authProfileId,
+		...agentLookup
+	});
+	if (params.threadId?.trim()) await attachExistingThread({
+		pluginConfig: params.pluginConfig,
+		sessionFile: params.sessionFile,
+		threadId: params.threadId.trim(),
+		workspaceDir,
+		...agentDir ? { agentDir } : {},
+		model: params.model,
+		modelProvider: params.modelProvider,
+		authProfileId,
+		approvalPolicy: params.approvalPolicy,
+		sandbox: params.sandbox,
+		serviceTier: params.serviceTier,
+		config: params.config
+	});
+	else await createThread({
+		pluginConfig: params.pluginConfig,
+		sessionFile: params.sessionFile,
+		workspaceDir,
+		...agentDir ? { agentDir } : {},
+		model: params.model,
+		modelProvider: params.modelProvider,
+		authProfileId,
+		approvalPolicy: params.approvalPolicy,
+		sandbox: params.sandbox,
+		serviceTier: params.serviceTier,
+		config: params.config
+	});
+	return createCodexConversationBindingData({
+		sessionFile: params.sessionFile,
+		workspaceDir,
+		...agentDir ? { agentDir } : {}
+	});
+}
+async function handleCodexConversationInboundClaim(event, ctx, options = {}) {
+	const data = readCodexConversationBindingData(ctx.pluginBinding);
+	if (!data) return;
+	if (event.commandAuthorized !== true) return { handled: true };
+	const prompt = event.bodyForAgent?.trim() || event.content?.trim() || "";
+	if (!prompt) return { handled: true };
+	const nativeExecutionBlock = data.kind === "codex-cli-node-session" ? resolveCodexNativeSandboxBlock({
+		config: options.config,
+		sessionKey: event.sessionKey ?? ctx.sessionKey,
+		surface: "Codex CLI node conversation binding"
+	}) : resolveCodexNativeExecutionBlock({
+		config: options.config,
+		sessionKey: event.sessionKey ?? ctx.sessionKey,
+		surface: "Codex app-server conversation binding"
+	});
+	if (nativeExecutionBlock) return {
+		handled: true,
+		reply: { text: nativeExecutionBlock }
+	};
+	if (data.kind === "codex-cli-node-session") {
+		const resume = options.resumeCodexCliSessionOnNode;
+		if (!resume) return {
+			handled: true,
+			reply: { text: "Codex CLI node binding is unavailable because Gateway node runtime is not attached." }
+		};
+		try {
+			return {
+				handled: true,
+				reply: (await enqueueBoundTurn(`${data.nodeId}:${data.sessionId}`, async () => {
+					return { reply: { text: (await resume({
+						nodeId: data.nodeId,
+						sessionId: data.sessionId,
+						prompt,
+						cwd: data.cwd,
+						timeoutMs: options.timeoutMs
+					})).text.trim() || "Codex completed without a text reply." } };
+				})).reply
+			};
+		} catch (error) {
+			return {
+				handled: true,
+				reply: { text: `Codex CLI node turn failed: ${formatCodexDisplayText(formatErrorMessage(error))}` }
+			};
+		}
+	}
+	try {
+		return {
+			handled: true,
+			reply: (await enqueueBoundTurn(data.sessionFile, () => runBoundTurnWithMissingThreadRecovery({
+				data,
+				prompt,
+				event,
+				pluginConfig: options.pluginConfig,
+				timeoutMs: options.timeoutMs
+			}))).reply
+		};
+	} catch (error) {
+		return {
+			handled: true,
+			reply: { text: `Codex app-server turn failed: ${formatCodexDisplayText(formatErrorMessage(error))}` }
+		};
+	}
+}
+async function handleCodexConversationBindingResolved(event) {
+	if (event.status !== "denied") return;
+	const data = readCodexConversationBindingDataRecord(event.request.data ?? {});
+	if (!data || data.kind !== "codex-app-server-session") return;
+	await clearCodexAppServerBinding(data.sessionFile);
+}
+async function attachExistingThread(params) {
+	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.pluginConfig });
+	const agentLookup = buildAgentLookup({
+		agentDir: params.agentDir,
+		config: params.config
+	});
+	const modelProvider = resolveThreadRequestModelProvider({
+		authProfileId: params.authProfileId,
+		modelProvider: params.modelProvider,
+		...agentLookup
+	});
+	const response = await (await getSharedCodexAppServerClient({
+		startOptions: runtime.start,
+		timeoutMs: runtime.requestTimeoutMs,
+		authProfileId: params.authProfileId,
+		...agentLookup
+	})).request(CODEX_CONTROL_METHODS.resumeThread, {
+		threadId: params.threadId,
+		...params.model ? { model: params.model } : {},
+		...modelProvider ? { modelProvider } : {},
+		personality: CODEX_NATIVE_PERSONALITY_NONE,
+		approvalPolicy: params.approvalPolicy ?? runtime.approvalPolicy,
+		approvalsReviewer: runtime.approvalsReviewer,
+		sandbox: params.sandbox ?? runtime.sandbox,
+		...params.serviceTier ?? runtime.serviceTier ? { serviceTier: params.serviceTier ?? runtime.serviceTier } : {},
+		persistExtendedHistory: true
+	}, { timeoutMs: runtime.requestTimeoutMs });
+	const thread = response.thread;
+	const runtimeApprovalPolicy = typeof runtime.approvalPolicy === "string" ? runtime.approvalPolicy : void 0;
+	await writeCodexAppServerBinding(params.sessionFile, {
+		threadId: thread.id,
+		cwd: thread.cwd ?? params.workspaceDir,
+		authProfileId: params.authProfileId,
+		model: response.model ?? params.model,
+		modelProvider: normalizeCodexAppServerBindingModelProvider({
+			authProfileId: params.authProfileId,
+			modelProvider: response.modelProvider ?? params.modelProvider,
+			...agentLookup
+		}),
+		approvalPolicy: params.approvalPolicy ?? runtimeApprovalPolicy,
+		sandbox: params.sandbox ?? runtime.sandbox,
+		serviceTier: params.serviceTier ?? runtime.serviceTier
+	}, { ...agentLookup });
+}
+async function createThread(params) {
+	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.pluginConfig });
+	const agentLookup = buildAgentLookup({
+		agentDir: params.agentDir,
+		config: params.config
+	});
+	const modelProvider = resolveThreadRequestModelProvider({
+		authProfileId: params.authProfileId,
+		modelProvider: params.modelProvider,
+		...agentLookup
+	});
+	const response = await (await getSharedCodexAppServerClient({
+		startOptions: runtime.start,
+		timeoutMs: runtime.requestTimeoutMs,
+		authProfileId: params.authProfileId,
+		...agentLookup
+	})).request("thread/start", {
+		cwd: params.workspaceDir,
+		...params.model ? { model: params.model } : {},
+		...modelProvider ? { modelProvider } : {},
+		personality: CODEX_NATIVE_PERSONALITY_NONE,
+		approvalPolicy: params.approvalPolicy ?? runtime.approvalPolicy,
+		approvalsReviewer: runtime.approvalsReviewer,
+		sandbox: params.sandbox ?? runtime.sandbox,
+		...params.serviceTier ?? runtime.serviceTier ? { serviceTier: params.serviceTier ?? runtime.serviceTier } : {},
+		developerInstructions: "This Codex thread is bound to an OpenClaw conversation. Answer normally; OpenClaw will deliver your final response back to the conversation.",
+		experimentalRawEvents: true,
+		persistExtendedHistory: true
+	}, { timeoutMs: runtime.requestTimeoutMs });
+	const runtimeApprovalPolicy = typeof runtime.approvalPolicy === "string" ? runtime.approvalPolicy : void 0;
+	await writeCodexAppServerBinding(params.sessionFile, {
+		threadId: response.thread.id,
+		cwd: response.thread.cwd ?? params.workspaceDir,
+		authProfileId: params.authProfileId,
+		model: response.model ?? params.model,
+		modelProvider: normalizeCodexAppServerBindingModelProvider({
+			authProfileId: params.authProfileId,
+			modelProvider: response.modelProvider ?? params.modelProvider,
+			...agentLookup
+		}),
+		approvalPolicy: params.approvalPolicy ?? runtimeApprovalPolicy,
+		sandbox: params.sandbox ?? runtime.sandbox,
+		serviceTier: params.serviceTier ?? runtime.serviceTier
+	}, { ...agentLookup });
+}
+async function runBoundTurn(params) {
+	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.pluginConfig });
+	const agentLookup = buildAgentLookup({ agentDir: params.data.agentDir });
+	const binding = await readCodexAppServerBinding(params.data.sessionFile, agentLookup);
+	const threadId = binding?.threadId;
+	if (!threadId) throw new Error("bound Codex conversation has no thread binding");
+	const client = await getSharedCodexAppServerClient({
+		startOptions: runtime.start,
+		timeoutMs: runtime.requestTimeoutMs,
+		authProfileId: binding.authProfileId,
+		...agentLookup
+	});
+	const collector = createCodexConversationTurnCollector(threadId);
+	const notificationCleanup = client.addNotificationHandler((notification) => collector.handleNotification(notification));
+	const requestCleanup = client.addRequestHandler(async (request) => {
+		if (request.method === "item/tool/call") return {
+			contentItems: [{
+				type: "inputText",
+				text: "OpenClaw native Codex conversation binding does not expose dynamic OpenClaw tools yet."
+			}],
+			success: false
+		};
+		if (request.method === "item/commandExecution/requestApproval" || request.method === "item/fileChange/requestApproval") return {
+			decision: "decline",
+			reason: "OpenClaw native Codex conversation binding cannot route interactive approvals yet; use the Codex harness or explicit /acp spawn codex for that workflow."
+		};
+		if (request.method === "item/permissions/requestApproval") return {
+			permissions: {},
+			scope: "turn"
+		};
+		if (request.method.includes("requestApproval")) return {
+			decision: "decline",
+			reason: "OpenClaw native Codex conversation binding cannot route interactive approvals yet; use the Codex harness or explicit /acp spawn codex for that workflow."
+		};
+	});
+	try {
+		const turnId = (await client.request("turn/start", {
+			threadId,
+			input: buildCodexConversationTurnInput({
+				prompt: params.prompt,
+				event: params.event
+			}),
+			cwd: binding.cwd || params.data.workspaceDir,
+			approvalPolicy: binding.approvalPolicy ?? runtime.approvalPolicy,
+			approvalsReviewer: runtime.approvalsReviewer,
+			sandboxPolicy: codexSandboxPolicyForTurn(binding.sandbox ?? runtime.sandbox, binding.cwd || params.data.workspaceDir),
+			...binding.model ? { model: binding.model } : {},
+			personality: CODEX_NATIVE_PERSONALITY_NONE,
+			...binding.serviceTier ?? runtime.serviceTier ? { serviceTier: binding.serviceTier ?? runtime.serviceTier } : {}
+		}, { timeoutMs: runtime.requestTimeoutMs })).turn.id;
+		const activeCleanup = trackCodexConversationActiveTurn({
+			sessionFile: params.data.sessionFile,
+			threadId,
+			turnId
+		});
+		collector.setTurnId(turnId);
+		return { reply: { text: (await collector.wait({ timeoutMs: params.timeoutMs ?? DEFAULT_BOUND_TURN_TIMEOUT_MS }).finally(activeCleanup)).replyText.trim() || "Codex completed without a text reply." } };
+	} finally {
+		notificationCleanup();
+		requestCleanup();
+	}
+}
+async function runBoundTurnWithMissingThreadRecovery(params) {
+	try {
+		return await runBoundTurn(params);
+	} catch (error) {
+		if (!isCodexThreadNotFoundError(error)) throw error;
+		const agentLookup = buildAgentLookup({ agentDir: params.data.agentDir });
+		const binding = await readCodexAppServerBinding(params.data.sessionFile, agentLookup);
+		await startCodexConversationThread({
+			pluginConfig: params.pluginConfig,
+			sessionFile: params.data.sessionFile,
+			workspaceDir: binding?.cwd || params.data.workspaceDir,
+			...agentLookup,
+			model: binding?.model,
+			modelProvider: binding?.modelProvider,
+			authProfileId: binding?.authProfileId,
+			approvalPolicy: binding?.approvalPolicy,
+			sandbox: binding?.sandbox,
+			serviceTier: binding?.serviceTier
+		});
+		return await runBoundTurn(params);
+	}
+}
+function isCodexThreadNotFoundError(error) {
+	const message = formatErrorMessage(error);
+	return /\bthread not found:/iu.test(message) || /\bbound Codex conversation has no thread binding\b/u.test(message);
+}
+function enqueueBoundTurn(key, run) {
+	const state = getGlobalState();
+	const next = (state.queues.get(key) ?? Promise.resolve()).then(run, run);
+	const queued = next.then(() => void 0, () => void 0);
+	state.queues.set(key, queued);
+	next.finally(() => {
+		if (state.queues.get(key) === queued) state.queues.delete(key);
+	}).catch(() => void 0);
+	return next;
+}
+function resolveThreadRequestModelProvider(params) {
+	const modelProvider = params.modelProvider?.trim();
+	if (!modelProvider || modelProvider.toLowerCase() === "codex") return;
+	if (isCodexAppServerNativeAuthProfile(params) && (modelProvider.toLowerCase() === "openai" || modelProvider.toLowerCase() === "openai-codex")) return;
+	return modelProvider.toLowerCase() === "openai-codex" ? "openai" : modelProvider;
+}
+function buildAgentLookup(params) {
+	const agentDir = params.agentDir?.trim();
+	return {
+		...agentDir ? { agentDir } : {},
+		...params.config ? { config: params.config } : {}
+	};
 }
 //#endregion
-export { steerCodexConversationTurn as _, resolveCodexCliSessionForBindingOnNode as a, readCodexConversationBindingData as b, handleCodexConversationInboundClaim as c, parseCodexFastModeArg as d, parseCodexPermissionsModeArg as f, setCodexConversationPermissions as g, setCodexConversationModel as h, listCodexCliSessionsOnNode as i, startCodexConversationThread as l, setCodexConversationFastMode as m, createCodexCliSessionNodeInvokePolicies as n, resumeCodexCliSessionOnNode as o, readCodexConversationActiveTurn as p, formatCodexCliSessions as r, handleCodexConversationBindingResolved as s, createCodexCliSessionNodeHostCommands as t, formatPermissionsMode as u, stopCodexConversationTurn as v, resolveCodexDefaultWorkspaceDir as x, createCodexCliNodeConversationBindingData as y };
+export { steerCodexConversationTurn as _, createCodexCliSessionNodeInvokePolicies as a, readCodexConversationBindingData as b, resolveCodexCliSessionForBindingOnNode as c, parseCodexFastModeArg as d, parseCodexPermissionsModeArg as f, setCodexConversationPermissions as g, setCodexConversationModel as h, createCodexCliSessionNodeHostCommands as i, resumeCodexCliSessionOnNode as l, setCodexConversationFastMode as m, handleCodexConversationInboundClaim as n, formatCodexCliSessions as o, readCodexConversationActiveTurn as p, startCodexConversationThread as r, listCodexCliSessionsOnNode as s, handleCodexConversationBindingResolved as t, formatPermissionsMode as u, stopCodexConversationTurn as v, resolveCodexDefaultWorkspaceDir as x, createCodexCliNodeConversationBindingData as y };