@openclaw/codex 2026.7.2-beta.1 → 2026.7.2-beta.3

package/dist/{session-catalog-7H112Tr_.js → session-catalog-CA7R-hX2.js}

@@ -1,14 +1,11 @@
-import { i as isJsonObject, t as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS } from "./protocol-BMifTfdW.js";
-import { f as resolveCodexAppServerRuntimeOptions, v as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-c48K5HP9.js";
-import { n as listCodexAppServerModels } from "./models-DuKzZA6G.js";
-import { t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-BKNjHMEs.js";
-import { O as CodexAppServerRpcError, a as getLeasedSharedCodexAppServerClient, c as releaseLeasedSharedCodexAppServerClient } from "./shared-client-D4mFI9al.js";
-import { c as sessionBindingIdentity, s as reclaimCurrentCodexSessionGeneration } from "./session-binding-BMfX1OX-.js";
-import { r as importCodexThreadHistoryToTranscript } from "./transcript-mirror-DhLwFIL4.js";
-import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-42Dfn2TV.js";
-import { r as formatCodexDisplayText } from "./command-formatters-D6ZlGNmb.js";
+import { J as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, R as CodexAppServerRpcError, Z as isJsonObject, a as getLeasedSharedCodexAppServerClient, c as releaseLeasedSharedCodexAppServerClient, m as withTimeout, q as CODEX_INTERACTIVE_CUSTOM_THREAD_SOURCES } from "./shared-client-CSXLtCLE.js";
+import { E as resolveCodexSupervisionAppServerRuntimeOptions, b as resolveCodexAppServerRuntimeOptions, c as sessionBindingIdentity, s as reclaimCurrentCodexSessionGeneration } from "./session-binding-Bmt20HfB.js";
+import { r as importCodexThreadHistoryToTranscript } from "./transcript-mirror-D9rTxx2P.js";
+import { n as listCodexAppServerModels } from "./models-DD5zBdX5.js";
+import { t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-DJbhLYSK.js";
+import { d as CODEX_CONTROL_METHODS, f as describeControlFailure, r as formatCodexDisplayText } from "./command-formatters-NCTL7A2q.js";
 import { n as createCodexCliNodeConversationBindingData } from "./conversation-binding-data-BHRpYbX3.js";
-import { n as requestCodexAppServerJson, t as requestCodexAppServerClientJson } from "./request-DborTWgw.js";
+import { n as requestCodexAppServerClientJson, r as requestCodexAppServerJson } from "./request-9yf9pZjf.js";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
@@ -24,7 +21,7 @@ import { spawn } from "node:child_process";
 import { resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import process$1 from "node:process";
-import { decodeNodePtyResumeParams, resolveExecutableFromPathEnv, runNodePtyCommand } from "openclaw/plugin-sdk/node-host";
+import { decodeNodePtyResumeParams, resolveNodeHostExecutable, runNodePtyCommand } from "openclaw/plugin-sdk/node-host";
 //#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";
@@ -644,12 +641,16 @@ function boundedCatalogString(value, maxLength, overflow = "omit") {
 	if (normalized.length <= maxLength) return normalized;
 	return overflow === "truncate" ? truncateUtf16Safe(normalized, maxLength) : void 0;
 }
+function normalizeInteractiveThreadSource(source) {
+	if (CODEX_INTERACTIVE_THREAD_SOURCE_KINDS.some((kind) => kind === source) || CODEX_INTERACTIVE_CUSTOM_THREAD_SOURCES.some((kind) => kind === source)) return source;
+	if (isRecord(source) && CODEX_INTERACTIVE_CUSTOM_THREAD_SOURCES.some((kind) => kind === source.custom)) return source.custom;
+}
 function isInteractiveThreadSource(source) {
-	return CODEX_INTERACTIVE_THREAD_SOURCE_KINDS.some((kind) => kind === source);
+	return normalizeInteractiveThreadSource(source) !== void 0;
 }
 function toCatalogSession(thread, archived) {
-	const source = thread.source;
-	if (!isInteractiveThreadSource(source)) return;
+	const source = normalizeInteractiveThreadSource(thread.source);
+	if (!source) return;
 	const record = thread;
 	const threadId = boundedCatalogString(thread.id, 256);
 	if (!threadId) return;
@@ -1062,6 +1063,7 @@ const CODEX_NODE_CONTINUE_COMMANDS = [
 	CODEX_APP_SERVER_THREAD_TURNS_LIST_COMMAND,
 	CODEX_CLI_SESSION_RESUME_COMMAND
 ];
+const NODE_CATALOG_LIST_RESPONSE_TIMEOUT_MS = 8e3;
 function nodeLabel(node) {
 	return node.displayName?.trim() || node.remoteIp?.trim() || node.nodeId;
 }
@@ -1084,16 +1086,20 @@ async function listPairedNode(params) {
 		nodeId: params.node.nodeId,
 		canContinueCodex: canContinueCodexOnNode(params.node)
 	};
-	if (params.node.connected !== true) return {
-		...common,
-		connected: false,
-		sessions: [],
-		error: {
-			code: "NODE_OFFLINE",
-			message: "Paired node is offline"
-		}
-	};
-	try {
+	if (params.node.connected !== true) {
+		const host = {
+			...common,
+			connected: false,
+			sessions: [],
+			error: {
+				code: "NODE_OFFLINE",
+				message: "Paired node is offline"
+			}
+		};
+		params.onHost?.(host);
+		return host;
+	}
+	const eventualHost = Promise.resolve().then(async () => {
 		const page = filterCatalogPageByTitle(parseCatalogPage(unwrapNodeInvokePayload(await params.runtime.nodes.invoke({
 			nodeId: params.node.nodeId,
 			command: CODEX_APP_SERVER_THREADS_LIST_COMMAND,
@@ -1114,6 +1120,15 @@ async function listPairedNode(params) {
 				return adopted ? Object.assign({}, session, { openClawSessionKey: adopted.key }) : session;
 			})
 		};
+	}).catch((error) => ({
+		...common,
+		connected: true,
+		sessions: [],
+		error: catalogError("NODE_INVOKE_FAILED", error)
+	}));
+	if (params.onHost) eventualHost.then(params.onHost).catch(() => void 0);
+	try {
+		return await withTimeout(eventualHost, NODE_CATALOG_LIST_RESPONSE_TIMEOUT_MS, "paired node Codex session catalog timed out");
 	} catch (error) {
 		return {
 			...common,
@@ -1159,7 +1174,7 @@ async function resolveNodeCodexRecord(params) {
 }
 function requireContinuableNodeRecord(record) {
 	if (record.archived) throw new CatalogParamsError("Codex session is archived on the paired node");
-	if (!isInteractiveThreadSource(record.source)) throw new CatalogParamsError("Codex session is not a non-archived interactive CLI or VS Code session");
+	if (!isInteractiveThreadSource(record.source)) throw new CatalogParamsError("Codex session is not a non-archived interactive Codex session");
 	if (record.status === "idle" || record.status === "notLoaded") return;
 	if (record.status === "active") throw new CatalogParamsError("Codex session is active on the paired node; wait for it to finish before continuing");
 	throw new CatalogParamsError("Codex session cannot be continued in its current state");
@@ -1268,8 +1283,15 @@ async function continueNodeCodexSession(params) {
 //#endregion
 //#region extensions/codex/src/session-catalog-terminal.ts
 const CODEX_TERMINAL_RESUME_COMMAND = "codex.terminal.resume.v1";
-function resolveLocalCodexTerminalExecutable(pathEnv = process.env.PATH ?? "") {
-	return resolveExecutableFromPathEnv("codex", pathEnv);
+function resolveLocalCodexTerminalExecutable(env = process.env) {
+	return resolveLocalCodexTerminalResolution(env)?.executable;
+}
+function resolveLocalCodexTerminalResolution(env = process.env) {
+	return resolveNodeHostExecutable("codex", {
+		env,
+		pathEnv: env.PATH ?? env.Path ?? "",
+		strategy: "fallback"
+	});
 }
 function codexNodeTerminalCapability(node) {
 	const commands = node.invocableCommands ?? node.commands;
@@ -1285,11 +1307,11 @@ async function requireCatalogEligibleThread(control, threadId) {
 		});
 		const candidate = page.sessions.find((session) => session.threadId === threadId);
 		if (candidate) {
-			if (candidate.source === "cli" || candidate.source === "vscode") return candidate;
-			throw new CatalogParamsError("Codex session is not a non-archived interactive CLI or VS Code session");
+			if (isInteractiveThreadSource(candidate.source)) return candidate;
+			throw new CatalogParamsError("Codex session is not a non-archived interactive Codex session");
 		}
 		const nextCursor = page.nextCursor?.trim();
-		if (!nextCursor) throw new CatalogParamsError("Codex session is not a non-archived interactive CLI or VS Code session");
+		if (!nextCursor) throw new CatalogParamsError("Codex session is not a non-archived interactive Codex session");
 		if (seenCursors.has(nextCursor)) throw new CatalogParamsError("Codex session eligibility could not be verified");
 		seenCursors.add(nextCursor);
 		cursor = nextCursor;
@@ -1302,7 +1324,11 @@ function createCodexTerminalNodeHostCommand(control) {
 		cap: CODEX_APP_SERVER_THREADS_CAPABILITY,
 		dangerous: false,
 		duplex: true,
-		isAvailable: ({ env }) => Boolean(resolveExecutableFromPathEnv("codex", env.PATH ?? "")),
+		isAvailable: ({ env }) => Boolean(resolveNodeHostExecutable("codex", {
+			env,
+			pathEnv: env.PATH ?? env.Path ?? "",
+			strategy: "direct"
+		})),
 		handle: async (paramsJSON, io) => {
 			if (!io) throw new Error("Codex terminal command requires duplex transport");
 			const resume = decodeNodePtyResumeParams(paramsJSON, (value) => {
@@ -1310,10 +1336,14 @@ function createCodexTerminalNodeHostCommand(control) {
 				return value;
 			});
 			const record = await requireCatalogEligibleThread(control, resume.threadId);
-			const file = resolveExecutableFromPathEnv("codex", process.env.PATH ?? "");
-			if (!file) throw new Error("Codex CLI is unavailable");
+			const resolution = resolveNodeHostExecutable("codex", {
+				env: process.env,
+				pathEnv: process.env.PATH ?? process.env.Path ?? "",
+				strategy: "direct"
+			});
+			if (!resolution) throw new Error("Codex CLI is unavailable");
 			return JSON.stringify(await runNodePtyCommand({
-				file,
+				file: resolution.executable,
 				args: ["resume", resume.threadId],
 				cwd: record.cwd,
 				cols: resume.cols,
@@ -1347,22 +1377,23 @@ async function resolveNodeCatalogEligibleThread(params) {
 		seenCursors.add(nextCursor);
 		cursor = nextCursor;
 	}
-	throw new CatalogParamsError("Codex session is not a non-archived interactive CLI or VS Code session");
+	throw new CatalogParamsError("Codex session is not a non-archived interactive Codex session");
 }
 async function openCodexCatalogTerminal(params) {
 	const title = `codex resume ${params.threadId.slice(0, 8)}…`;
 	if (params.hostId === "gateway:local") {
 		const record = await requireCatalogEligibleThread(params.control, params.threadId);
-		const executable = resolveLocalCodexTerminalExecutable();
-		if (!executable) throw new CatalogParamsError("Codex CLI is unavailable");
+		const resolution = resolveLocalCodexTerminalResolution();
+		if (!resolution) throw new CatalogParamsError("Codex CLI is unavailable");
 		return {
 			kind: "local",
 			argv: [
-				executable,
+				resolution.executable,
 				"resume",
 				params.threadId
 			],
 			...record.cwd ? { cwd: record.cwd } : {},
+			...resolution.pathEnv ? { pathEnv: resolution.pathEnv } : {},
 			title
 		};
 	}
@@ -1615,9 +1646,8 @@ function createCodexSessionCatalogControlFromRequests(params) {
 					archived: false,
 					limit: remaining,
 					modelProviders: [],
-					sortKey: "recency_at",
+					sortKey: "updated_at",
 					sortDirection: "desc",
-					sourceKinds: [...CODEX_INTERACTIVE_THREAD_SOURCE_KINDS],
 					...cwd ? { cwd } : {},
 					...cursor ? { cursor } : {}
 				}, remainingTimeoutMs);
@@ -1787,19 +1817,22 @@ async function listCodexSessionCatalog(params) {
 		query,
 		runtime: params.runtime
 	})] : [];
+	for (const host of localHosts) if (params.onHost) host.then(params.onHost).catch(() => void 0);
 	if (!(!requestedHostIds || query.hostIds?.some((hostId) => hostId.startsWith("node:")))) return { hosts: await Promise.all(localHosts) };
 	let nodes;
 	try {
 		nodes = (await params.runtime.nodes.list()).nodes.filter((node) => node.commands?.includes("codex.appServer.threads.list.v1") && (!requestedHostIds || requestedHostIds.has(`node:${node.nodeId}`))).slice(0, 100 - localHosts.length);
 	} catch (error) {
-		return { hosts: [...await Promise.all(localHosts), {
+		const registryHost = {
 			hostId: "node:registry",
 			label: "Paired nodes",
 			kind: "node",
 			connected: false,
 			sessions: [],
 			error: catalogError("NODE_LIST_FAILED", error)
-		}] };
+		};
+		params.onHost?.(registryHost);
+		return { hosts: [...await Promise.all(localHosts), registryHost] };
 	}
 	const adoptedNodeSessions = listNodeAdoptedSessionEntries({
 		config: params.config,
@@ -1810,7 +1843,8 @@ async function listCodexSessionCatalog(params) {
 			runtime: params.runtime,
 			node,
 			query,
-			adoptedSessions: adoptedNodeSessions
+			adoptedSessions: adoptedNodeSessions,
+			...params.onHost ? { onHost: params.onHost } : {}
 		});
 		return Object.assign(host, codexNodeTerminalCapability(node));
 	});
@@ -2315,13 +2349,16 @@ function registerCodexSessionCatalog(params) {
 		label: "Codex",
 		list: async (query) => {
 			const localTerminalAvailable = resolveLocalCodexTerminalExecutable() !== void 0;
+			const { onHost, ...gatewayQuery } = query;
+			const mapHost = (host) => toGenericCatalogHost(host, localTerminalAvailable);
 			return (await listCodexSessionCatalog({
 				bindingStore: params.bindingStore,
 				config: params.getRuntimeConfig(),
 				runtime: params.api.runtime,
 				control: params.control,
-				query
-			})).hosts.map((host) => toGenericCatalogHost(host, localTerminalAvailable));
+				query: gatewayQuery,
+				...onHost ? { onHost: (host) => onHost(mapHost(host)) } : {}
+			})).hosts.map(mapHost);
 		},
 		read: async (request) => {
 			const page = await readCodexSessionTranscript({

package/dist/{session-cli-B28RhCyp.js → session-cli-Bxk3-Wqz.js}

@@ -1,8 +1,8 @@
-import { a as CODEX_LOCAL_SESSION_HOST_ID } from "./session-catalog-7H112Tr_.js";
+import { a as CODEX_LOCAL_SESSION_HOST_ID } from "./session-catalog-CA7R-hX2.js";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { addGatewayClientOptions, callGatewayFromCli } from "openclaw/plugin-sdk/gateway-runtime";
 import { sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
+import { addGatewayClientOptions, callGatewayFromCli } from "openclaw/plugin-sdk/gateway-runtime";
 //#region extensions/codex/src/session-cli.ts
 const CODEX_SESSION_CATALOG_CLI_TIMEOUT_MS = 75e3;
 function writeLine(value = "") {