@openclaw/codex 2026.7.2-beta.2 → 2026.7.2-beta.4

package/dist/{session-binding-h1mmCGnl.js → session-binding-ZSMX1omP.js}

@@ -13,7 +13,7 @@ import { normalizeTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-ru
 import { detectWindowsSpawnCommandInlineArgs } from "openclaw/plugin-sdk/windows-spawn";
 import { parse } from "smol-toml";
 import { z } from "zod";
-import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { AgentHarnessSessionSupersededError, embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 //#region extensions/codex/src/app-server/session-discovery-config.ts
@@ -171,6 +171,7 @@ const codexPluginConfigSchema = z.object({
 		loopDetectionPreToolUseRelay: z.boolean().optional(),
 		requestTimeoutMs: z.number().positive().optional(),
 		turnCompletionIdleTimeoutMs: z.number().positive().optional(),
+		turnAssistantCompletionIdleTimeoutMs: z.number().positive().optional(),
 		postToolRawAssistantCompletionIdleTimeoutMs: z.number().positive().optional(),
 		approvalPolicy: codexAppServerApprovalPolicySchema.optional(),
 		sandbox: codexAppServerSandboxSchema.optional(),
@@ -367,6 +368,7 @@ function resolveCodexAppServerRuntimeOptions(params = {}) {
 		loopDetectionPreToolUseRelay: config.loopDetectionPreToolUseRelay !== false,
 		requestTimeoutMs: normalizePositiveNumber(config.requestTimeoutMs, 6e4),
 		turnCompletionIdleTimeoutMs: normalizePositiveNumber(config.turnCompletionIdleTimeoutMs, 6e4),
+		turnAssistantCompletionIdleTimeoutMs: normalizePositiveNumber(config.turnAssistantCompletionIdleTimeoutMs, 1e4),
 		...config.postToolRawAssistantCompletionIdleTimeoutMs !== void 0 ? { postToolRawAssistantCompletionIdleTimeoutMs: normalizePositiveNumber(config.postToolRawAssistantCompletionIdleTimeoutMs, 6e4) } : {},
 		approvalPolicy: forcedPolicy?.approvalPolicy ?? approvalPolicy,
 		approvalPolicySource,
@@ -1323,6 +1325,7 @@ var session_binding_exports = /* @__PURE__ */ __exportAll({
 	assertCodexBindingMayBeReplaced: () => assertCodexBindingMayBeReplaced,
 	bindingStoreKey: () => bindingStoreKey,
 	createCodexAppServerBindingStore: () => createCodexAppServerBindingStore,
+	createCodexSessionGenerationSupersededError: () => createCodexSessionGenerationSupersededError,
 	createStoredCodexAppServerBinding: () => createStoredCodexAppServerBinding,
 	hashCodexAppServerBindingFingerprint: () => hashCodexAppServerBindingFingerprint,
 	isCodexAppServerNativeAuthProfile: () => isCodexAppServerNativeAuthProfile,
@@ -1354,6 +1357,10 @@ function sessionBindingIdentity(params) {
 		...sessionKey ? { sessionKey } : {}
 	};
 }
+/** Builds the terminal coordination error used when a newer OpenClaw session owns the binding. */
+function createCodexSessionGenerationSupersededError(sessionId) {
+	return new AgentHarnessSessionSupersededError(`Codex session generation is no longer current: ${sessionId}`);
+}
 const optionalStringSchema = z.string().optional().catch(void 0);
 const optionalBooleanSchema = z.boolean().optional().catch(void 0);
 const optionalNonBlankStringSchema = z.string().refine((value) => Boolean(value.trim())).optional().catch(void 0);
@@ -2089,4 +2096,4 @@ function resolveCodexAppServerBindingModelProvider(params) {
 	return params.modelProvider?.trim() || (isCodexAppServerNativeAuthProfile(params) ? PUBLIC_OPENAI_MODEL_PROVIDER : void 0);
 }
 //#endregion
-export { resolveCodexComputerUseConfig as C, resolveOpenClawExecPolicyForCodexAppServer as D, resolveCodexSupervisionAppServerRuntimeOptions as E, shouldAutoApproveCodexAppServerApprovals as O, resolveCodexAppServerUserHomeDir as S, resolveCodexPluginsPolicy as T, isCodexFastServiceTier as _, isCodexAppServerNativeAuthProfile as a, resolveCodexAppServerRuntimeOptions as b, sessionBindingIdentity as c, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME as d, assertCodexAppServerConnectionSecurity as f, isCodexAppServerApprovalPolicyAllowedByRequirements as g, codexSandboxPolicyForTurn as h, hashCodexAppServerBindingFingerprint as i, withMcpElicitationsApprovalPolicy as k, session_binding_exports as l, codexAppServerStartOptionsKey as m, assertCodexBindingMayBeReplaced as n, normalizeCodexAppServerBindingModelProvider as o, canUseCodexModelBackedApprovalsReviewerForModel as p, bindingStoreKey as r, reclaimCurrentCodexSessionGeneration as s, CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS as t, CODEX_PLUGINS_MARKETPLACE_NAME as u, isCodexSandboxExecServerEnabled as v, resolveCodexModelBackedReviewerPolicyContext as w, resolveCodexAppServerStartOptionsForAgent as x, readCodexPluginConfig as y };
+export { withMcpElicitationsApprovalPolicy as A, resolveCodexAppServerUserHomeDir as C, resolveCodexSupervisionAppServerRuntimeOptions as D, resolveCodexPluginsPolicy as E, resolveOpenClawExecPolicyForCodexAppServer as O, resolveCodexAppServerStartOptionsForAgent as S, resolveCodexModelBackedReviewerPolicyContext as T, isCodexAppServerApprovalPolicyAllowedByRequirements as _, hashCodexAppServerBindingFingerprint as a, readCodexPluginConfig as b, reclaimCurrentCodexSessionGeneration as c, CODEX_PLUGINS_MARKETPLACE_NAME as d, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME as f, codexSandboxPolicyForTurn as g, codexAppServerStartOptionsKey as h, createCodexSessionGenerationSupersededError as i, shouldAutoApproveCodexAppServerApprovals as k, sessionBindingIdentity as l, canUseCodexModelBackedApprovalsReviewerForModel as m, assertCodexBindingMayBeReplaced as n, isCodexAppServerNativeAuthProfile as o, assertCodexAppServerConnectionSecurity as p, bindingStoreKey as r, normalizeCodexAppServerBindingModelProvider as s, CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS as t, session_binding_exports as u, isCodexFastServiceTier as v, resolveCodexComputerUseConfig as w, resolveCodexAppServerRuntimeOptions as x, isCodexSandboxExecServerEnabled as y };

package/dist/{session-catalog-CEvoXWHA.js → session-catalog-DsKaezgR.js}

@@ -1,11 +1,13 @@
-import { J as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, R as CodexAppServerRpcError, Z as isJsonObject, a as getLeasedSharedCodexAppServerClient, c as releaseLeasedSharedCodexAppServerClient, q as CODEX_INTERACTIVE_CUSTOM_THREAD_SOURCES } from "./shared-client-JiAnW6pc.js";
-import { E as resolveCodexSupervisionAppServerRuntimeOptions, b as resolveCodexAppServerRuntimeOptions, c as sessionBindingIdentity, s as reclaimCurrentCodexSessionGeneration } from "./session-binding-h1mmCGnl.js";
-import { r as importCodexThreadHistoryToTranscript } from "./transcript-mirror-D9rTxx2P.js";
-import { n as listCodexAppServerModels } from "./models-uh26C8QU.js";
-import { t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-Ceb-lm2c.js";
-import { d as CODEX_CONTROL_METHODS, f as describeControlFailure, r as formatCodexDisplayText } from "./command-formatters-Dq9InZUK.js";
+import { J as CODEX_INTERACTIVE_CUSTOM_THREAD_SOURCES, Q as isJsonObject, R as CodexAppServerRpcError, Y as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, a as getLeasedSharedCodexAppServerClient, c as releaseLeasedSharedCodexAppServerClient, m as withTimeout, q as resolveCodexAppServerClientInstanceId } from "./shared-client-wmgNFNYp.js";
+import { D as resolveCodexSupervisionAppServerRuntimeOptions, c as reclaimCurrentCodexSessionGeneration, l as sessionBindingIdentity, x as resolveCodexAppServerRuntimeOptions } from "./session-binding-ZSMX1omP.js";
+import { m as assertCodexThreadForkParams, r as importCodexThreadHistoryToTranscript } from "./transcript-mirror-2p7kl6e4.js";
+import { n as listCodexAppServerModels } from "./models-BNeMlHgg.js";
+import { t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-CvzvmBRz.js";
+import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-CLICvTxf.js";
+import { r as formatCodexDisplayText } from "./command-formatters-DgADqnHa.js";
 import { n as createCodexCliNodeConversationBindingData } from "./conversation-binding-data-BHRpYbX3.js";
-import { n as requestCodexAppServerClientJson, r as requestCodexAppServerJson } from "./request-B_oQsCXy.js";
+import { n as requestCodexAppServerClientJson, r as requestCodexAppServerJson } from "./request-BTccUTD3.js";
+import { i as createImportedCodexSession, n as codexUpstreamBaseline, r as codexUpstreamContinueResult, t as codexLastTerminalTurnId } from "./session-upstream-marker-D7XlI9us.js";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
@@ -13,7 +15,7 @@ import { resolvePreferredOpenClawTmpDir } from "openclaw/plugin-sdk/temp-path";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { createHash } from "node:crypto";
 import os from "node:os";
-import { listAgentIds, resolveDefaultAgentDir, resolveDefaultAgentId } from "openclaw/plugin-sdk/agent-runtime";
+import { listAgentIds, resolveAllowedModelRef, resolveDefaultAgentDir, resolveDefaultAgentId, resolveDefaultModelForAgent } from "openclaw/plugin-sdk/agent-runtime";
 import { parseAgentSessionKey } from "openclaw/plugin-sdk/routing";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { materializeWindowsSpawnProgram, resolveWindowsSpawnProgram } from "openclaw/plugin-sdk/windows-spawn";
@@ -21,6 +23,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 { sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
 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";
@@ -611,6 +614,29 @@ async function safeValue(read) {
 	}
 }
 //#endregion
+//#region extensions/codex/src/session-catalog-create.ts
+const CODEX_AGENT_RUNTIME_ID = "codex";
+const CODEX_CATALOG_DEFAULT_MODEL_REF = "openai/gpt-5.6-sol";
+function resolveCodexCatalogCreateSession(config, requestedAgentId) {
+	if (!config) return;
+	const agentId = requestedAgentId ?? resolveDefaultAgentId(config);
+	const defaultModel = resolveDefaultModelForAgent({
+		cfg: config,
+		agentId
+	});
+	return "error" in resolveAllowedModelRef({
+		cfg: config,
+		catalog: [],
+		raw: CODEX_CATALOG_DEFAULT_MODEL_REF,
+		defaultProvider: defaultModel.provider,
+		defaultModel: defaultModel.model,
+		agentId
+	}) ? void 0 : {
+		model: CODEX_CATALOG_DEFAULT_MODEL_REF,
+		agentRuntime: CODEX_AGENT_RUNTIME_ID
+	};
+}
+//#endregion
 //#region extensions/codex/src/session-catalog-parsing.ts
 const DEFAULT_PAGE_LIMIT = 50;
 const CODEX_APP_SERVER_THREADS_CAPABILITY = "codex-app-server-threads";
@@ -624,6 +650,7 @@ const MAX_CURSOR_COUNT = 100;
 const MAX_HOST_ID_LENGTH = 256;
 const MAX_CWD_LENGTH = 4096;
 const MAX_SESSION_NAME_LENGTH = 500;
+const MAX_SESSION_PREVIEW_LENGTH = 500;
 const MAX_SESSION_KEY_LENGTH = 1024;
 const MAX_METADATA_LENGTH = 500;
 const MAX_ACTIVE_FLAGS = 16;
@@ -641,6 +668,10 @@ function boundedCatalogString(value, maxLength, overflow = "omit") {
 	if (normalized.length <= maxLength) return normalized;
 	return overflow === "truncate" ? truncateUtf16Safe(normalized, maxLength) : void 0;
 }
+function catalogPreview(value) {
+	if (typeof value !== "string") return;
+	return boundedCatalogString(sanitizeTerminalText(value.replace(/\s+/g, " ")), MAX_SESSION_PREVIEW_LENGTH, "truncate");
+}
 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;
@@ -661,6 +692,7 @@ function toCatalogSession(thread, archived) {
 	const gitInfo = isRecord(record.gitInfo) ? record.gitInfo : void 0;
 	const sessionId = boundedCatalogString(thread.sessionId, 256);
 	const name = boundedCatalogString(thread.name, MAX_SESSION_NAME_LENGTH, "truncate");
+	const fallbackName = name ? void 0 : catalogPreview(thread.preview);
 	const cwd = boundedCatalogString(thread.cwd, MAX_CWD_LENGTH);
 	const modelProvider = boundedCatalogString(record.modelProvider, MAX_METADATA_LENGTH, "truncate");
 	const cliVersion = boundedCatalogString(record.cliVersion, MAX_METADATA_LENGTH, "truncate");
@@ -671,6 +703,7 @@ function toCatalogSession(thread, archived) {
 		archived,
 		...sessionId ? { sessionId } : {},
 		...thread.name === null ? { name: null } : name ? { name } : {},
+		...fallbackName ? { fallbackName } : {},
 		...cwd ? { cwd } : {},
 		...activeFlags?.length ? { activeFlags } : {},
 		...typeof thread.createdAt === "number" && Number.isFinite(thread.createdAt) ? { createdAt: thread.createdAt } : {},
@@ -789,12 +822,13 @@ function parseCatalogSession(value, options = {}) {
 	}) : void 0;
 	const sessionId = parseOptionalCatalogString(value.sessionId, "session id", 256);
 	const name = value.name === null ? null : parseOptionalCatalogString(value.name, "session name", MAX_SESSION_NAME_LENGTH);
+	const fallbackName = parseOptionalCatalogString(value.fallbackName, "session fallback name", MAX_SESSION_PREVIEW_LENGTH);
 	const cwd = parseOptionalCatalogString(value.cwd, "cwd", MAX_CWD_LENGTH);
 	const source = parseOptionalCatalogString(value.source, "source", MAX_METADATA_LENGTH);
 	const modelProvider = parseOptionalCatalogString(value.modelProvider, "model provider", MAX_METADATA_LENGTH);
 	const cliVersion = parseOptionalCatalogString(value.cliVersion, "CLI version", MAX_METADATA_LENGTH);
 	const gitBranch = parseOptionalCatalogString(value.gitBranch, "Git branch", MAX_METADATA_LENGTH);
-	const openClawSessionKey = options.allowOpenClawSessionKey ? parseOptionalCatalogString(value.openClawSessionKey, "OpenClaw session key", MAX_SESSION_KEY_LENGTH) : void 0;
+	const sessionKey = options.allowSessionKey ? parseOptionalCatalogString(value.sessionKey, "OpenClaw session key", MAX_SESSION_KEY_LENGTH) : void 0;
 	const createdAt = readFiniteNumber(value.createdAt);
 	const updatedAt = readFiniteNumber(value.updatedAt);
 	const recencyAt = value.recencyAt === null ? null : readFiniteNumber(value.recencyAt);
@@ -804,6 +838,7 @@ function parseCatalogSession(value, options = {}) {
 		archived: value.archived,
 		...sessionId !== void 0 ? { sessionId } : {},
 		...name !== void 0 ? { name } : {},
+		...fallbackName !== void 0 ? { fallbackName } : {},
 		...cwd !== void 0 ? { cwd } : {},
 		...activeFlags && activeFlags.length > 0 ? { activeFlags } : {},
 		...createdAt !== void 0 ? { createdAt } : {},
@@ -813,7 +848,7 @@ function parseCatalogSession(value, options = {}) {
 		...modelProvider !== void 0 ? { modelProvider } : {},
 		...cliVersion !== void 0 ? { cliVersion } : {},
 		...gitBranch !== void 0 ? { gitBranch } : {},
-		...openClawSessionKey !== void 0 ? { openClawSessionKey } : {}
+		...sessionKey !== void 0 ? { sessionKey } : {}
 	};
 }
 function parseCatalogPage(value, options = {}) {
@@ -930,7 +965,10 @@ function readNodeSessionMarker(entry) {
 }
 function listNodeAdoptedSessionEntries(params) {
 	const adopted = /* @__PURE__ */ new Map();
-	for (const agentId of listSupervisionAgentIds(params.config ?? {})) for (const { entry, sessionKey } of params.runtime.agent.session.listSessionEntries({ agentId })) {
+	for (const agentId of listSupervisionAgentIds(params.config ?? {})) for (const { entry, sessionKey } of params.runtime.agent.session.listSessionEntries({
+		agentId,
+		readOnly: true
+	})) {
 		const marker = readNodeSessionMarker(entry);
 		const sessionId = entry.sessionId?.trim();
 		if (!marker || marker.initializing === true && params.includeInitializing !== true || entry.initializationPending === true || entry.agentHarnessId !== "codex" || entry.modelSelectionLocked !== true || !sessionId || adoptionSessionKeyRest(sessionKey) !== nodeAdoptionSessionKey(marker.sourceHostId, marker.sourceThreadId) || marker.sourceHostId !== `node:${marker.nodeId}`) continue;
@@ -1063,6 +1101,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;
 }
@@ -1085,16 +1124,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,
@@ -1112,9 +1155,18 @@ async function listPairedNode(params) {
 			...page,
 			sessions: page.sessions.map((session) => {
 				const adopted = params.adoptedSessions.get(adoptedSourceKey(hostId, session.threadId));
-				return adopted ? Object.assign({}, session, { openClawSessionKey: adopted.key }) : session;
+				return adopted ? Object.assign({}, session, { sessionKey: 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,
@@ -1560,56 +1612,12 @@ function createChecker(params) {
 	});
 }
 //#endregion
-//#region extensions/codex/src/session-upstream-marker.ts
-function lastIdentifiableTurn(thread, normalizeTurnId) {
-	for (let index = (thread.turns?.length ?? 0) - 1; index >= 0; index -= 1) {
-		const turn = thread.turns?.[index];
-		const turnId = normalizeTurnId(turn?.id);
-		if (turn && turnId) return {
-			...turn,
-			id: turnId
-		};
-	}
-}
-function codexUpstreamBaseline(thread, normalizeTurnId) {
-	const turn = lastIdentifiableTurn(thread, normalizeTurnId);
-	return {
-		turnId: turn?.id ?? null,
-		userMessageCount: turn?.items.filter((item) => item.type === "userMessage").length ?? 0
-	};
-}
-function codexLastTerminalTurnId(thread, normalizeTurnId) {
-	for (let index = (thread.turns?.length ?? 0) - 1; index >= 0; index -= 1) {
-		const turn = thread.turns?.[index];
-		const turnId = normalizeTurnId(turn?.id);
-		if (!turn || !turnId) continue;
-		if (turn.status === "completed" || turn.status === "interrupted" || turn.status === "failed") return turnId;
-	}
-}
-/** Build the upstream link seed for a continued Codex session, if a baseline exists. */
-function codexUpstreamContinueResult(sessionKey, threadId, baseline) {
-	if (!baseline) return { sessionKey };
-	return {
-		sessionKey,
-		upstream: {
-			kind: "codex-app-server",
-			ref: {
-				connectionFingerprint: baseline.connectionFingerprint,
-				threadId
-			},
-			marker: {
-				turnId: baseline.turnId,
-				userMessageCount: baseline.userMessageCount
-			}
-		}
-	};
-}
-//#endregion
 //#region extensions/codex/src/session-catalog.ts
 const boundCatalogSessionId = (value) => boundedCatalogString(value, 256);
 const CODEX_SUPERVISION_SESSION_KEY_PREFIX = "harness:codex:supervision:";
 function createCodexSessionCatalogControlFromRequests(params) {
 	return {
+		...params.clientId ? { clientId: params.clientId } : {},
 		...params.connectionFingerprint ? { connectionFingerprint: params.connectionFingerprint } : {},
 		withPinnedConnection: params.withPinnedConnection,
 		async listPage(pageParams) {
@@ -1632,7 +1640,7 @@ function createCodexSessionCatalogControlFromRequests(params) {
 					archived: false,
 					limit: remaining,
 					modelProviders: [],
-					sortKey: "recency_at",
+					sortKey: "updated_at",
 					sortDirection: "desc",
 					...cwd ? { cwd } : {},
 					...cursor ? { cursor } : {}
@@ -1664,6 +1672,9 @@ function createCodexSessionCatalogControlFromRequests(params) {
 		async listTurnPage(listParams) {
 			return await params.createRequestSnapshot().listThreadTurns(listParams);
 		},
+		async forkThread(forkParams) {
+			return await params.createRequestSnapshot().forkThread(forkParams);
+		},
 		async archiveThread(threadId) {
 			await params.createRequestSnapshot().archiveThread(threadId);
 		}
@@ -1691,6 +1702,7 @@ function createCodexSessionCatalogControl(params) {
 				includeTurns
 			}, requestOptions)).thread,
 			listThreadTurns: async (listParams) => await codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.listThreadTurns, listParams, requestOptions),
+			forkThread: async (forkParams) => await codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.forkThread, assertCodexThreadForkParams(forkParams), requestOptions),
 			archiveThread: async (threadId) => {
 				await codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.archiveThread, { threadId }, requestOptions);
 			}
@@ -1731,6 +1743,13 @@ function createCodexSessionCatalogControl(params) {
 					config: runtimeConfig,
 					timeoutMs: runtime.requestTimeoutMs
 				}),
+				forkThread: async (forkParams) => await requestCodexAppServerClientJson({
+					client,
+					method: CODEX_CONTROL_METHODS.forkThread,
+					requestParams: assertCodexThreadForkParams(forkParams),
+					config: runtimeConfig,
+					timeoutMs: runtime.requestTimeoutMs
+				}),
 				archiveThread: async (threadId) => {
 					await requestCodexAppServerClientJson({
 						client,
@@ -1742,6 +1761,7 @@ function createCodexSessionCatalogControl(params) {
 				}
 			};
 			const pinnedControl = createCodexSessionCatalogControlFromRequests({
+				clientId: resolveCodexAppServerClientInstanceId(client),
 				connectionFingerprint: buildCodexAppServerConnectionFingerprint(runtime, resolveDefaultAgentDir(runtimeConfig ?? {})),
 				createRequestSnapshot: () => requests,
 				now,
@@ -1778,7 +1798,7 @@ async function listGatewayHost(params) {
 			...page,
 			sessions: page.sessions.map((session) => {
 				const adopted = adoptedSessions.get(session.threadId);
-				return adopted ? Object.assign({}, session, { openClawSessionKey: adopted.key }) : session;
+				return adopted ? Object.assign({}, session, { sessionKey: adopted.key }) : session;
 			})
 		};
 	} catch (error) {
@@ -1803,19 +1823,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,
@@ -1826,7 +1849,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));
 	});
@@ -1955,7 +1979,10 @@ function isAdoptionSessionKeyForThread(sessionKey, threadId) {
 }
 async function listAdoptedSessionEntries(params) {
 	const adopted = /* @__PURE__ */ new Map();
-	for (const agentId of listSupervisionAgentIds(params.config ?? {})) for (const { entry, sessionKey } of params.runtime.agent.session.listSessionEntries({ agentId })) {
+	for (const agentId of listSupervisionAgentIds(params.config ?? {})) for (const { entry, sessionKey } of params.runtime.agent.session.listSessionEntries({
+		agentId,
+		readOnly: true
+	})) {
 		const sessionKeyRest = adoptionSessionKeyRest(sessionKey);
 		if (!sessionKeyRest.startsWith(CODEX_SUPERVISION_SESSION_KEY_PREFIX) || entry.initializationPending === true || entry.agentHarnessId !== "codex" || entry.modelSelectionLocked !== true) continue;
 		const sessionId = entry.sessionId?.trim();
@@ -2069,17 +2096,17 @@ async function createOrReuseAdoptedSession(params) {
 	let createdBindingIdentity;
 	let createdPendingBinding;
 	try {
-		const label = params.sourceThread.name?.trim() || void 0;
 		const spawnedCwd = params.sourceThread.cwd?.trim() || void 0;
 		const pendingLastTurnId = codexLastTerminalTurnId(params.sourceThread, boundCatalogSessionId);
 		const marker = { sourceThreadId: params.sourceThread.id };
-		const created = await params.api.runtime.agent.session.createSessionEntry({
-			cfg: params.config,
+		const created = await createImportedCodexSession({
+			runtime: params.api.runtime,
+			config: params.config,
 			key: adoptionSessionKey(params.sourceThread.id),
 			agentId: resolveDefaultAgentId(params.config),
+			thread: params.sourceThread,
+			throughTurnId: pendingLastTurnId ?? null,
 			recoverMatchingInitialEntry: true,
-			...label ? { label } : {},
-			...spawnedCwd ? { spawnedCwd } : {},
 			initialEntry: {
 				agentHarnessId: "codex",
 				modelSelectionLocked: true,
@@ -2089,24 +2116,12 @@ async function createOrReuseAdoptedSession(params) {
 					modelLocked: true
 				} } }
 			},
-			afterCreate: async (entry) => {
+			afterImport: async (entry) => {
 				createdBindingIdentity = sessionBindingIdentity({
 					sessionId: entry.sessionId,
 					sessionKey: entry.key,
 					config: params.config
 				});
-				const storePath = resolveStorePath(params.config.session?.store, { agentId: entry.agentId });
-				await importCodexThreadHistoryToTranscript({
-					thread: params.sourceThread,
-					throughTurnId: pendingLastTurnId ?? null,
-					storePath,
-					sessionId: entry.sessionId,
-					sessionKey: entry.key,
-					agentId: entry.agentId,
-					...spawnedCwd ? { cwd: spawnedCwd } : {},
-					modelProvider: params.sourceThread.modelProvider,
-					config: params.config
-				});
 				createdPendingBinding = {
 					sourceThreadId: params.sourceThread.id,
 					connectionFingerprint: params.connectionFingerprint,
@@ -2233,7 +2248,10 @@ async function continueLocalCodexSession(params) {
 	}
 }
 async function assertNoPendingSupervisionBranch(params) {
-	const adoptedEntries = listSupervisionAgentIds(params.config).flatMap((agentId) => params.runtime.agent.session.listSessionEntries({ agentId })).filter((candidate) => isAdoptionSessionKeyForThread(candidate.sessionKey, params.threadId));
+	const adoptedEntries = listSupervisionAgentIds(params.config).flatMap((agentId) => params.runtime.agent.session.listSessionEntries({
+		agentId,
+		readOnly: true
+	})).filter((candidate) => isAdoptionSessionKeyForThread(candidate.sessionKey, params.threadId));
 	for (const adopted of adoptedEntries) {
 		if (adopted.entry.initializationPending === true) throw new CatalogParamsError("Codex session cannot be archived while its OpenClaw branch is initializing");
 		const sessionId = adopted.entry.sessionId?.trim();
@@ -2302,9 +2320,10 @@ function toGenericCatalogHost(host, localTerminalAvailable) {
 			const canContinue = (local || host.canContinueCodex === true) && continuableStatus && isInteractiveThreadSource(session.source);
 			const canArchive = local && continuableStatus && isInteractiveThreadSource(session.source);
 			const canOpenTerminal = isInteractiveThreadSource(session.source) && (local ? localTerminalAvailable : host.canOpenTerminalCodex === true);
+			const name = session.name ?? session.fallbackName;
 			return {
 				threadId: session.threadId,
-				...session.name != null ? { name: session.name } : {},
+				...name ? { name } : {},
 				...session.cwd ? { cwd: session.cwd } : {},
 				status: session.status,
 				...session.createdAt != null ? { createdAt: session.createdAt } : {},
@@ -2315,7 +2334,7 @@ function toGenericCatalogHost(host, localTerminalAvailable) {
 				...session.cliVersion ? { cliVersion: session.cliVersion } : {},
 				...session.gitBranch ? { gitBranch: session.gitBranch } : {},
 				archived: session.archived,
-				...session.openClawSessionKey ? { openClawSessionKey: session.openClawSessionKey } : {},
+				...session.sessionKey ? { sessionKey: session.sessionKey } : {},
 				canContinue,
 				canArchive,
 				canOpenTerminal
@@ -2329,15 +2348,19 @@ function registerCodexSessionCatalog(params) {
 	const provider = {
 		id: "codex",
 		label: "Codex",
+		resolveCreateSession: ({ agentId }) => resolveCodexCatalogCreateSession(params.getRuntimeConfig() ?? params.api.config, agentId),
 		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-XsEuWb_C.js → session-cli-CYJTfRLG.js}

@@ -1,8 +1,8 @@
-import { a as CODEX_LOCAL_SESSION_HOST_ID } from "./session-catalog-CEvoXWHA.js";
+import { a as CODEX_LOCAL_SESSION_HOST_ID } from "./session-catalog-DsKaezgR.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 = "") {

package/dist/session-upstream-marker-D7XlI9us.js

@@ -0,0 +1,82 @@
+import { r as importCodexThreadHistoryToTranscript } from "./transcript-mirror-2p7kl6e4.js";
+import { resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
+//#region extensions/codex/src/app-server/session-history-import.ts
+/** Creates a session whose transcript is derived from one verified Codex thread snapshot. */
+async function createImportedCodexSession(params) {
+	const label = params.thread.name?.trim() || void 0;
+	const spawnedCwd = params.thread.cwd?.trim() || void 0;
+	const createParams = {
+		cfg: params.config,
+		key: params.key,
+		agentId: params.agentId,
+		...label ? { label } : {},
+		...spawnedCwd ? { spawnedCwd } : {},
+		initialEntry: params.initialEntry,
+		afterCreate: async (entry) => {
+			const storePath = resolveStorePath(params.config.session?.store, { agentId: entry.agentId });
+			await importCodexThreadHistoryToTranscript({
+				thread: params.thread,
+				throughTurnId: params.throughTurnId,
+				storePath,
+				sessionId: entry.sessionId,
+				sessionKey: entry.key,
+				agentId: entry.agentId,
+				...spawnedCwd ? { cwd: spawnedCwd } : {},
+				modelProvider: params.thread.modelProvider,
+				config: params.config
+			});
+			return await params.afterImport(entry);
+		}
+	};
+	return params.recoverMatchingInitialEntry ? await params.runtime.agent.session.createSessionEntry({
+		...createParams,
+		recoverMatchingInitialEntry: true
+	}) : await params.runtime.agent.session.createSessionEntry(createParams);
+}
+//#endregion
+//#region extensions/codex/src/session-upstream-marker.ts
+function lastIdentifiableTurn(thread, normalizeTurnId) {
+	for (let index = (thread.turns?.length ?? 0) - 1; index >= 0; index -= 1) {
+		const turn = thread.turns?.[index];
+		const turnId = normalizeTurnId(turn?.id);
+		if (turn && turnId) return {
+			...turn,
+			id: turnId
+		};
+	}
+}
+function codexUpstreamBaseline(thread, normalizeTurnId) {
+	const turn = lastIdentifiableTurn(thread, normalizeTurnId);
+	return {
+		turnId: turn?.id ?? null,
+		userMessageCount: turn?.items.filter((item) => item.type === "userMessage").length ?? 0
+	};
+}
+function codexLastTerminalTurnId(thread, normalizeTurnId) {
+	for (let index = (thread.turns?.length ?? 0) - 1; index >= 0; index -= 1) {
+		const turn = thread.turns?.[index];
+		const turnId = normalizeTurnId(turn?.id);
+		if (!turn || !turnId) continue;
+		if (turn.status === "completed" || turn.status === "interrupted" || turn.status === "failed") return turnId;
+	}
+}
+/** Build the upstream link seed for a continued Codex session, if a baseline exists. */
+function codexUpstreamContinueResult(sessionKey, threadId, baseline) {
+	if (!baseline) return { sessionKey };
+	return {
+		sessionKey,
+		upstream: {
+			kind: "codex-app-server",
+			ref: {
+				connectionFingerprint: baseline.connectionFingerprint,
+				threadId
+			},
+			marker: {
+				turnId: baseline.turnId,
+				userMessageCount: baseline.userMessageCount
+			}
+		}
+	};
+}
+//#endregion
+export { createImportedCodexSession as i, codexUpstreamBaseline as n, codexUpstreamContinueResult as r, codexLastTerminalTurnId as t };