@openclaw/codex 2026.9.1 → 2026.9.2

package/dist/{session-catalog-yyvTWFOw.js → session-catalog-B47uwekb.js}

@@ -1,30 +1,32 @@
-import { $t as isJsonObject, Jt as readCodexSessionMeta, K as resolveCodexAppServerClientInstanceId, Nt as withTimeout, Vt as resolveCodexAppServerAuthProfileStore, Wt as resolveCodexAppServerPreparedAuthHandoff, Xt as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, Yt as CODEX_INTERACTIVE_CUSTOM_THREAD_SOURCES, Z as assertCodexThreadForkParams, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient, q as CodexAppServerRpcError, qt as isOpenClawManagedCodexThread, y as retireSharedCodexAppServerClientIfCurrent, zt as resolveCodexAppServerAuthProfileId } from "./shared-client-DxcfF9KX.js";
-import { E as readCodexPluginConfig, F as resolveCodexAppServerHomeDir, I as resolveCodexAppServerLocalHomeDir, L as resolveCodexAppServerUserHomeDir, i as resolveCodexAppServerRuntimeOptions, s as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-BhmfC1s6.js";
-import { c as reclaimCurrentCodexSessionGeneration, d as sessionBindingIdentity } from "./session-binding-BHuTCRZQ.js";
-import { a as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-DYHcRQAa.js";
-import { n as listCodexAppServerModels } from "./models-sYnEc0gd.js";
-import { a as replaceCodexCatalogConnectionHomes, n as buildCodexAppServerConnectionFingerprint, t as resumeCodexAppServerThread } from "./thread-resume-C7pyVKeW.js";
-import { g as codexCatalogHomeId, h as canonicalCodexCatalogHome, m as projectCodexUserItemText, r as importCodexThreadHistoryToTranscript } from "./transcript-mirror-DTUxFWa_.js";
-import { i as requestCodexAppServerJson, o as withCodexAppServerJsonClient, r as requestCodexAppServerClientJson } from "./request-DYAI5FQE.js";
-import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-dIjNVCYH.js";
-import { a as formatCodexDisplayText } from "./command-formatters-CLHhEB1Q.js";
+import { l as sessionBindingIdentity } from "./session-binding-record-CyaXZvTe.js";
+import { B as isJsonObject, I as CODEX_INTERACTIVE_CUSTOM_THREAD_SOURCES, L as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, M as resolveCodexAppServerHomeDir, N as resolveCodexAppServerLocalHomeDir, O as readCodexPluginConfig, P as resolveCodexAppServerUserHomeDir, i as resolveCodexAppServerRuntimeOptions, s as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-CyapYSji.js";
+import { $ as assertCodexThreadForkParams, Ft as withTimeout, J as isCodexThreadReadMissingError, K as resolveCodexAppServerClientInstanceId, Kt as resolveCodexAppServerPreparedAuthHandoff, Ut as resolveCodexAppServerAuthProfileStore, Vt as resolveCodexAppServerAuthProfileId, Xt as readCodexSessionMeta, Yt as isOpenClawManagedCodexThread, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient, y as retireSharedCodexAppServerClientIfCurrent } from "./shared-client-CKhX2kFt.js";
+import { r as createCodexSessionGenerationSupersededError, s as reclaimCurrentCodexSessionGeneration } from "./session-binding-4Ki04sW-.js";
+import { a as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-Bp1ZOnk2.js";
+import { n as listCodexAppServerModels } from "./models-CcrgSMQR.js";
+import { a as replaceCodexCatalogConnectionHomes, n as buildCodexAppServerConnectionFingerprint, t as resumeCodexAppServerThread } from "./thread-resume-BLgqkUc1.js";
+import { d as codexCatalogHomeId, l as projectCodexUserItemText, r as importCodexThreadHistoryToTranscript, u as canonicalCodexCatalogHome } from "./transcript-mirror-_njEB84z.js";
+import { i as requestCodexAppServerJson, o as withCodexAppServerJsonClient, r as requestCodexAppServerClientJson } from "./request-C8H22rPi.js";
+import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-B1mgvpP8.js";
+import { a as formatCodexDisplayText } from "./command-formatters-DSbGMXA0.js";
 import { n as createCodexCliNodeConversationBindingData } from "./conversation-binding-data-BiodpIzq.js";
 import { n as prepareCodexAppServerAuthBinding } from "./auth-binding-Ds_QVm-X.js";
-import { i as createImportedCodexSession, n as codexUpstreamBaseline, r as codexUpstreamContinueResult, t as codexLastTerminalTurnId } from "./session-upstream-marker-C351-5Qw.js";
+import { i as createImportedCodexSession, n as codexUpstreamBaseline, r as codexUpstreamContinueResult, t as codexLastTerminalTurnId } from "./session-upstream-marker-DReTpGz6.js";
 import { asFiniteNumber, isRecord, normalizeBoundedOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
+import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
+import { z } from "zod";
+import { timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
+import { runCommandBuffered } from "openclaw/plugin-sdk/process-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
 import { resolvePreferredOpenClawTmpDir } from "openclaw/plugin-sdk/temp-path";
 import { prepareAgentRuntimeAuth } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
 import fsSync from "node:fs";
 import os from "node:os";
-import { listAgentIds, resolveAgentDir as resolveAgentDir$1, resolveAgentWorkspaceDir, resolveAllowedModelRef, resolveDefaultAgentDir, resolveDefaultAgentId, resolveDefaultModelForAgent } from "openclaw/plugin-sdk/agent-runtime";
-import { runCommandBuffered } from "openclaw/plugin-sdk/process-runtime";
-import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
+import { listAgentIds as listAgentIds$1, resolveAgentDir as resolveAgentDir$2, resolveAgentWorkspaceDir, resolveAllowedModelRef, resolveDefaultAgentDir, resolveDefaultAgentId as resolveDefaultAgentId$1, resolveDefaultModelForAgent } from "openclaw/plugin-sdk/agent-runtime";
 import { materializeWindowsSpawnProgram, resolveWindowsSpawnProgram } from "openclaw/plugin-sdk/windows-spawn";
-import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
@@ -32,7 +34,7 @@ import { parseAgentSessionKey } from "openclaw/plugin-sdk/routing";
 import process$1 from "node:process";
 import { resolveSessionModelRef } from "openclaw/plugin-sdk/model-session-runtime";
 import { resolveApiKeyForProvider } from "openclaw/plugin-sdk/provider-auth-runtime";
-import { createSessionCatalogAdoptionCoordinator, listSessionCatalogEntries, sessionCatalogAdoptedSessionKey, sessionCatalogAdoptedSourceKey } from "openclaw/plugin-sdk/session-catalog";
+import { createSessionCatalogAdoptionCoordinator, listSessionCatalogEntries, publishSessionCatalogHost, sessionCatalogAdoptedSessionKey, sessionCatalogAdoptedSourceKey, sessionCatalogPaging } from "openclaw/plugin-sdk/session-catalog";
 import { decodeNodePtyResumeParams, decodeNodePtyStartParams, resolveNodeHostExecutable, runNodePtyCommand } from "openclaw/plugin-sdk/node-host";
 //#region extensions/codex/src/jsonl-lines.ts
 const JSONL_STREAM_THRESHOLD_BYTES = 4194304;
@@ -550,29 +552,37 @@ function formatNodeLabel(node) {
 //#endregion
 //#region extensions/codex/src/command-rpc.ts
 async function prepareControlAuth(options, startOptions) {
-	if (!options.onResponse || !options.config || !options.sessionKey || options.authProfileId === null || startOptions.homeScope === "user") return {
+	if (!options.onResponse) return {
 		authProfileId: options.authProfileId ?? void 0,
 		clientOptions: { authProfileId: options.authProfileId }
 	};
+	if (!options.config || !options.sessionKey || !options.sessionId) throw new Error("Codex control subscription requires admitted session authority.");
 	const config = options.config;
 	const { sessionAgentId } = resolveSessionAgentIdsStrict({
 		config,
 		sessionKey: options.sessionKey,
 		agentId: options.agentId
 	});
-	const agentDir = options.agentDir ?? resolveAgentDir$1(config, sessionAgentId);
+	const agentDir = options.agentDir ?? resolveAgentDir$2(config, sessionAgentId);
 	const workspaceDir = resolveAgentWorkspaceDir(config, sessionAgentId);
 	const entry = getSessionEntry({
 		agentId: sessionAgentId,
-		storePath: resolveStorePath(config.session?.store, { agentId: sessionAgentId }),
+		storePath: options.storePath?.trim() || resolveStorePath(config.session?.store, { agentId: sessionAgentId }),
 		sessionKey: options.sessionKey,
 		hydrateSkillPromptRefs: false,
 		readConsistency: "latest"
 	});
+	if (entry?.sessionId !== options.sessionId) throw createCodexSessionGenerationSupersededError(options.sessionId);
+	if (options.authProfileId === null || startOptions.homeScope === "user") return {
+		authProfileId: options.authProfileId ?? void 0,
+		clientOptions: { authProfileId: options.authProfileId }
+	};
 	const model = resolveSessionModelRef(config, entry, sessionAgentId);
+	const authProfileId = entry?.authProfileOverride ?? options.authProfileId;
 	const store = resolveCodexAppServerAuthProfileStore({
 		agentDir,
-		config
+		config,
+		authProfileId
 	});
 	const { plan, attempts } = prepareAgentRuntimeAuth({
 		provider: model.provider,
@@ -581,7 +591,7 @@ async function prepareControlAuth(options, startOptions) {
 		agentDir,
 		workspaceDir,
 		authProfileStore: store,
-		sessionAuthProfileId: entry?.authProfileOverride ?? options.authProfileId,
+		sessionAuthProfileId: authProfileId,
 		sessionAuthProfileSource: entry?.authProfileOverrideSource,
 		harnessId: "codex",
 		harnessAuthBootstrap: "harness"
@@ -795,6 +805,7 @@ const DEFAULT_PAGE_LIMIT = 50;
 const CODEX_APP_SERVER_THREADS_CAPABILITY = "codex-app-server-threads";
 const CODEX_APP_SERVER_THREADS_LIST_COMMAND = "codex.appServer.threads.list.v1";
 const CODEX_APP_SERVER_THREAD_TURNS_LIST_COMMAND = "codex.appServer.thread.turns.list.v1";
+const CODEX_CATALOG_TRANSCRIPT_READ_COMMAND = "codex.sessionCatalog.transcript.read.v1";
 const CODEX_LOCAL_SESSION_HOST_ID = "gateway:local";
 const NODE_INVOKE_TIMEOUT_MS = 65e3;
 const MAX_SEARCH_LENGTH = 500;
@@ -1057,7 +1068,7 @@ function parseTranscriptPage(value) {
 		...nextCursor ? { nextCursor } : {},
 		...backwardsCursor ? { backwardsCursor } : {}
 	};
-	if (Buffer.byteLength(JSON.stringify(page), "utf8") > MAX_TRANSCRIPT_PAGE_BYTES) throw new Error("Codex app-server transcript page exceeds the safe response size");
+	if (Buffer.byteLength(JSON.stringify(page), "utf8") > 20971520) throw new Error("Codex app-server transcript page exceeds the safe response size");
 	return page;
 }
 function requireBoundThread(entry) {
@@ -1142,10 +1153,16 @@ async function finalizeNodeAdoptedSession(params) {
 			update: (entry) => {
 				const current = readNodeSessionMarker(entry);
 				if (entry.sessionId?.trim() !== params.adopted.sessionId || entry.initializationPending === true || entry.agentHarnessId !== "codex" || entry.modelSelectionLocked !== true || !current || current.sourceHostId !== params.marker.sourceHostId || current.sourceThreadId !== params.marker.sourceThreadId || current.nodeId !== params.marker.nodeId) throw changedError();
-				if (current.initializing !== true) return { archivedAt: void 0 };
+				if (current.initializing !== true) return {
+					archivedAt: void 0,
+					archivedBy: void 0,
+					archiveReason: void 0
+				};
 				const codex = isRecord(entry.pluginExtensions?.codex) ? entry.pluginExtensions.codex : {};
 				return {
 					archivedAt: void 0,
+					archivedBy: void 0,
+					archiveReason: void 0,
 					pluginExtensions: {
 						...entry.pluginExtensions,
 						codex: {
@@ -1273,7 +1290,7 @@ async function listAdoptedSessionEntries(params) {
 		if (!sessionKeyRest.startsWith(CODEX_SUPERVISION_SESSION_KEY_PREFIX) || !marker || entry.initializationPending === true || entry.agentHarnessId !== "codex" || entry.modelSelectionLocked !== true) continue;
 		const sessionId = entry.sessionId?.trim();
 		if (!sessionId) continue;
-		const binding = await params.bindingStore.read(sessionBindingIdentity({
+		const binding = params.bindingStore.read(sessionBindingIdentity({
 			sessionId,
 			sessionKey,
 			config: params.config
@@ -1314,7 +1331,7 @@ async function ensurePendingAdoptionBinding(params) {
 	});
 	params.initialization.assertCurrent();
 	if (!ownsGeneration) throw new Error(`failed to claim the OpenClaw session generation for ${params.sourceThreadId}`);
-	const existing = await params.bindingStore.read(params.identity);
+	const existing = params.bindingStore.read(params.identity);
 	params.initialization.assertCurrent();
 	if (existing) {
 		if (matchesPendingAdoptionBinding(existing, params)) return;
@@ -1418,7 +1435,11 @@ async function continueLocalCodexSessionInner(params) {
 			preserveActivity: true,
 			update: (entry) => {
 				if (entry.sessionId?.trim() !== existing.sessionId || entry.initializationPending === true || entry.agentHarnessId !== "codex" || entry.modelSelectionLocked !== true) throw changedError();
-				return { archivedAt: void 0 };
+				return {
+					archivedAt: void 0,
+					archivedBy: void 0,
+					archiveReason: void 0
+				};
 			}
 		})) throw changedError();
 		const connectionFingerprint = params.control.connectionFingerprint;
@@ -1473,8 +1494,8 @@ async function continueLocalCodexSession(params) {
 }
 //#endregion
 //#region extensions/codex/src/session-catalog-archive.ts
-async function assertNoPendingSupervisionBranch(params) {
-	const adoptedEntries = [params.agentId, ...listAgentIds(params.config).filter((agentId) => agentId !== params.agentId)].flatMap((agentId) => params.runtime.agent.session.listSessionEntries({
+function assertNoPendingSupervisionBranch(params) {
+	const adoptedEntries = [params.agentId, ...listAgentIds$1(params.config).filter((agentId) => agentId !== params.agentId)].flatMap((agentId) => params.runtime.agent.session.listSessionEntries({
 		agentId,
 		readOnly: true
 	})).filter((candidate) => isAdoptionSessionKeyForThread(candidate.sessionKey, params.threadId, params.sourceHomeId) || params.sourceHomeId !== void 0 && params.allowLegacy === true && isAdoptionSessionKeyForThread(candidate.sessionKey, params.threadId));
@@ -1482,7 +1503,7 @@ async function assertNoPendingSupervisionBranch(params) {
 		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();
 		if (!sessionId) continue;
-		const binding = await params.bindingStore.read(sessionBindingIdentity({
+		const binding = params.bindingStore.read(sessionBindingIdentity({
 			sessionId,
 			sessionKey: adopted.sessionKey,
 			config: params.config
@@ -1495,7 +1516,7 @@ async function archiveLocalCodexSession(params) {
 	return await runSessionActionExclusive(sessionCatalogAdoptedSourceKey(params.hostId ?? "gateway:local", params.threadId), async () => {
 		return await params.bindingStore.withThreadArchiveFence(async () => {
 			const run = async (control) => {
-				await assertNoPendingSupervisionBranch(params);
+				assertNoPendingSupervisionBranch(params);
 				await control.requireEligibleThread(params.threadId);
 				const thread = await control.readThread(params.threadId, false);
 				if (thread.id !== params.threadId) throw new Error("Codex app-server returned a different thread than requested");
@@ -1524,7 +1545,7 @@ 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 agentId = requestedAgentId ?? resolveDefaultAgentId$1(config);
 	const defaultModel = resolveDefaultModelForAgent({
 		cfg: config,
 		agentId
@@ -1606,7 +1627,8 @@ async function listPairedNode(params) {
 				searchTerm: params.query.search
 			},
 			timeoutMs: NODE_INVOKE_TIMEOUT_MS,
-			scopes: ["operator.write"]
+			scopes: ["operator.write"],
+			signal: params.signal
 		}))), params.query.search);
 		return {
 			...common,
@@ -1623,7 +1645,7 @@ async function listPairedNode(params) {
 		sessions: [],
 		error: catalogError("NODE_INVOKE_FAILED", error)
 	}));
-	if (params.onHost) eventualHost.then(params.onHost).catch(() => void 0);
+	publishSessionCatalogHost(params, eventualHost);
 	try {
 		return await withTimeout(eventualHost, NODE_CATALOG_LIST_RESPONSE_TIMEOUT_MS, "paired node Codex session catalog timed out");
 	} catch (error) {
@@ -1822,7 +1844,7 @@ function createCodexTerminalStartNodeHostCommand() {
 function resolveCodexCatalogTerminalHome(sources) {
 	const runtimeConfig = sources.getRuntimeConfig();
 	if (!runtimeConfig) throw new Error("OpenClaw runtime config is unavailable");
-	const agentDir = sources.source?.agentDir ?? (sources.agentId ? resolveAgentDir$1(runtimeConfig, sources.agentId) : resolveDefaultAgentDir(runtimeConfig));
+	const agentDir = sources.source?.agentDir ?? (sources.agentId ? resolveAgentDir$2(runtimeConfig, sources.agentId) : resolveDefaultAgentDir(runtimeConfig));
 	const startOptions = sources.source?.appServer.start ?? resolveCodexSupervisionAppServerRuntimeOptions({ pluginConfig: sources.getPluginConfig() }).start;
 	return resolveCodexAppServerLocalHomeDir(startOptions, agentDir);
 }
@@ -1978,6 +2000,144 @@ async function startCodexCatalogTerminal(params) {
 	};
 }
 //#endregion
+//#region extensions/codex/src/session-catalog-transcript-item.ts
+const CODEX_MESSAGE_TYPES = /* @__PURE__ */ new Map([
+	["userMessage", "userMessage"],
+	["agentMessage", "agentMessage"],
+	["reasoning", "reasoning"]
+]);
+const CODEX_TOOL_TYPES = /* @__PURE__ */ new Set([
+	"commandExecution",
+	"fileChange",
+	"mcpToolCall",
+	"dynamicToolCall",
+	"collabAgentToolCall",
+	"webSearch",
+	"imageView",
+	"imageGeneration"
+]);
+function toGenericTranscriptItem(item) {
+	let type = CODEX_MESSAGE_TYPES.get(item.type);
+	if (!type && CODEX_TOOL_TYPES.has(item.type)) type = item.result !== void 0 || Boolean(item.aggregatedOutput) ? "toolResult" : "toolCall";
+	type ??= "other";
+	const fallback = item.title ?? item.name ?? item.tool ?? item.command ?? item.query ?? void 0;
+	const resultText = item.aggregatedOutput || (item.result === void 0 ? void 0 : JSON.stringify(item.result, null, 2));
+	const changesText = Array.isArray(item.changes) ? item.changes.map((change) => `${change.kind}: ${change.path}`).join("\n") || void 0 : void 0;
+	const text = item.type === "userMessage" ? projectCodexUserItemText(item) : item.text || resultText || changesText || fallback;
+	return {
+		id: item.id,
+		type,
+		...text ? { text } : {},
+		raw: item
+	};
+}
+//#endregion
+//#region extensions/codex/src/session-catalog-transcript.ts
+const TURN_ITEM_CURSOR_PREFIX = "turn-item:";
+const transcriptPageSchema = z.strictObject({
+	items: z.array(z.strictObject({
+		id: z.string(),
+		type: z.enum([
+			"userMessage",
+			"agentMessage",
+			"reasoning",
+			"toolCall",
+			"toolResult",
+			"other"
+		]),
+		text: z.string().optional(),
+		raw: z.record(z.string(), z.json()).optional(),
+		truncated: z.boolean().optional()
+	})),
+	nextCursor: z.string().optional()
+});
+function parseCodexCatalogTranscriptPage(value) {
+	return transcriptPageSchema.parse(value);
+}
+function encodeTurnItemCursor(turnCursor, itemId) {
+	return TURN_ITEM_CURSOR_PREFIX + Buffer.from(JSON.stringify([turnCursor, itemId])).toString("base64url");
+}
+function decodeTurnItemCursor(cursor) {
+	if (!cursor?.startsWith(TURN_ITEM_CURSOR_PREFIX)) return { turnCursor: cursor };
+	let value;
+	try {
+		value = JSON.parse(Buffer.from(cursor.slice(10), "base64url").toString());
+	} catch {
+		throw new CatalogParamsError("invalid Codex transcript item cursor");
+	}
+	if (!Array.isArray(value) || value.length !== 2 || typeof value[0] !== "string" || !value[0] || typeof value[1] !== "string" || !value[1]) throw new CatalogParamsError("invalid Codex transcript item cursor");
+	return {
+		turnCursor: value[0],
+		itemId: value[1]
+	};
+}
+function projectTranscriptPage(items, limit) {
+	const projected = items.map(toGenericTranscriptItem);
+	const page = sessionCatalogPaging.boundTranscriptPage(projected.toReversed(), limit, 0).items;
+	for (const [index, item] of page.entries()) if (item.text !== projected[index]?.text && projected[index]?.text) item.truncated = true;
+	return page;
+}
+function pageFitsNodeTransport(page) {
+	return Buffer.byteLength(JSON.stringify({ payloadJSON: JSON.stringify(page) }), "utf8") <= MAX_TRANSCRIPT_PAGE_BYTES;
+}
+/** The legacy API can anchor a turn, but cannot continue within that turn. */
+async function readLegacyCodexTranscriptPage(readTurns, request) {
+	const { turnCursor, itemId } = decodeTurnItemCursor(request.cursor);
+	const page = parseTranscriptPage(await readTurns({
+		threadId: request.threadId,
+		limit: 1,
+		sortDirection: "desc",
+		itemsView: "full",
+		...turnCursor ? { cursor: turnCursor } : {}
+	}));
+	const source = page.data.flatMap((turn) => turn.items.toReversed());
+	const anchorIndex = itemId ? source.findIndex((item) => item.id === itemId) : -1;
+	if (itemId && anchorIndex < 0) throw new CatalogParamsError("Codex transcript changed; refresh the session before loading older items");
+	const remaining = source.slice(anchorIndex + 1);
+	const items = projectTranscriptPage(remaining, request.limit);
+	const result = () => {
+		const lastSource = remaining[items.length - 1];
+		const partial = lastSource !== void 0 && items.length < remaining.length;
+		const nativeCursor = partial ? page.backwardsCursor : page.nextCursor;
+		const cursor = nativeCursor ? partial ? encodeTurnItemCursor(nativeCursor, lastSource.id) : nativeCursor : void 0;
+		if (partial && !cursor) throw new Error("Codex app-server did not provide a transcript continuation anchor");
+		return {
+			items,
+			...cursor ? { nextCursor: cursor } : {}
+		};
+	};
+	let bounded = result();
+	while (!pageFitsNodeTransport(bounded)) {
+		if (items.length <= 1) throw new Error("Codex transcript item exceeds the safe response size");
+		items.pop();
+		bounded = result();
+	}
+	return bounded;
+}
+/** Uses the native store's item cursor whenever that store supports item history. */
+async function readCodexCatalogTranscriptPage(control, request) {
+	if ((await control.requireEligibleThread(request.threadId)).historyMode !== "paginated") return readLegacyCodexTranscriptPage((params) => control.listTurnPage(params), request);
+	let limit = request.limit;
+	for (;;) {
+		const page = await control.listItemPage({
+			threadId: request.threadId,
+			limit,
+			sortDirection: "desc",
+			...request.cursor ? { cursor: request.cursor } : {}
+		});
+		const nextCursor = readControlCursor(page.nextCursor, "transcript next response");
+		const items = projectTranscriptPage(page.data.map(({ item }) => item), limit);
+		const result = {
+			items,
+			...nextCursor ? { nextCursor } : {}
+		};
+		const fittingCount = items.length - (pageFitsNodeTransport(result) ? 0 : 1);
+		if (fittingCount === page.data.length) return result;
+		if (fittingCount < 1) throw new Error("Codex transcript item exceeds the safe response size");
+		limit = fittingCount;
+	}
+}
+//#endregion
 //#region extensions/codex/src/session-catalog-listing.ts
 async function listVisiblePage(params) {
 	const excluded = params.excludedThreadIds;
@@ -1987,6 +2147,7 @@ async function listVisiblePage(params) {
 	let backwardsCursor;
 	const seenCursors = /* @__PURE__ */ new Set();
 	for (let pageIndex = 0; pageIndex < 20; pageIndex += 1) {
+		params.signal?.throwIfAborted();
 		let excludedFromPage = false;
 		const rawPage = await params.control.listPage({
 			limit: params.limit - sessions.length,
@@ -1994,10 +2155,12 @@ async function listVisiblePage(params) {
 			...params.searchTerm ? { searchTerm: params.searchTerm } : {},
 			...params.cwd ? { cwd: params.cwd } : {}
 		});
+		params.signal?.throwIfAborted();
 		const page = filterCatalogPageByTitle(parseCatalogPage(rawPage), params.searchTerm);
 		if (pageIndex === 0) backwardsCursor = page.backwardsCursor;
 		for (const managed of rawPage.managedThreads ?? []) {
 			excludedFromPage = true;
+			params.signal?.throwIfAborted();
 			await params.onExcludedThread?.(managed);
 		}
 		for (const session of page.sessions) {
@@ -2006,6 +2169,7 @@ async function listVisiblePage(params) {
 				continue;
 			}
 			excludedFromPage = true;
+			params.signal?.throwIfAborted();
 			await params.onExcludedThread?.({ threadId: session.threadId });
 		}
 		nextCursor = page.nextCursor;
@@ -2031,8 +2195,10 @@ async function listGatewayHost(params) {
 			excludedThreadIds: params.excludedThreadIds,
 			limit: params.query.limitPerHost,
 			onExcludedThread: params.onExcludedThread,
-			searchTerm: params.query.search
+			searchTerm: params.query.search,
+			signal: params.signal
 		});
+		params.signal?.throwIfAborted();
 		const adoptedSessions = await listAdoptedSessionEntries({
 			agentId: params.agentId,
 			bindingStore: params.bindingStore,
@@ -2073,6 +2239,7 @@ async function listCodexSessionCatalog(params) {
 	const requestedHostIds = query.hostIds ? new Set(query.hostIds) : void 0;
 	const localSources = params.localHomes?.filter((source) => !requestedHostIds || requestedHostIds.has(source.hostId)) ?? (params.includeLocal !== false && (!requestedHostIds || requestedHostIds.has("gateway:local")) ? [void 0] : []);
 	const managedThreads = await params.bindingStore.managedThreads?.snapshot();
+	params.signal?.throwIfAborted();
 	const fallbackSource = params.control.homesForAgent(agentId)[0];
 	const localHosts = localSources.map((source) => (() => {
 		const ownershipSource = source ?? fallbackSource;
@@ -2085,6 +2252,7 @@ async function listCodexSessionCatalog(params) {
 			query,
 			runtime: params.runtime,
 			sessionEntries: params.sessionEntries,
+			signal: params.signal,
 			excludedThreadIds: managedThreadIds,
 			...ownershipSource && params.bindingStore.managedThreads ? { onExcludedThread: async ({ threadId, rolloutPath }) => {
 				if (!managedThreadIds?.has(threadId)) await params.bindingStore.managedThreads?.mark({
@@ -2096,7 +2264,7 @@ async function listCodexSessionCatalog(params) {
 			...source ? { source } : {}
 		});
 	})());
-	for (const host of localHosts) if (params.onHost) host.then(params.onHost).catch(() => void 0);
+	for (const host of localHosts) publishSessionCatalogHost(params, host);
 	if (!(!requestedHostIds || query.hostIds?.some((hostId) => hostId.startsWith("node:")))) return { hosts: await Promise.all(localHosts) };
 	let nodes;
 	try {
@@ -2114,6 +2282,7 @@ async function listCodexSessionCatalog(params) {
 		params.onHost?.(registryHost);
 		return { hosts: [...await Promise.all(localHosts), registryHost] };
 	}
+	params.signal?.throwIfAborted();
 	const adoptedNodeSessions = listNodeAdoptedSessionEntries({
 		agentId,
 		config: params.config,
@@ -2127,6 +2296,8 @@ async function listCodexSessionCatalog(params) {
 		query,
 		adoptedSessions: adoptedNodeSessions,
 		terminalCapabilities: codexNodeTerminalCapability(node),
+		waitUntil: params.waitUntil,
+		signal: params.signal,
 		...params.onHost ? { onHost: params.onHost } : {}
 	}));
 	return { hosts: await Promise.all([...localHosts, ...nodeHosts]) };
@@ -2142,7 +2313,7 @@ function createCodexSessionCatalogNodeHostCommands(controlFactory, configSources
 			config,
 			agentId: requestedAgentId
 		}).sessionAgentId;
-		if (!listAgentIds(config).includes(agentId)) throw new CatalogParamsError(`unknown Codex session catalog agent: ${agentId}`);
+		if (!listAgentIds$1(config).includes(agentId)) throw new CatalogParamsError(`unknown Codex session catalog agent: ${agentId}`);
 		const request = { ...parsed };
 		delete request.agentId;
 		const source = controlFactory.homesForAgent(agentId)[0];
@@ -2154,7 +2325,7 @@ function createCodexSessionCatalogNodeHostCommands(controlFactory, configSources
 			paramsJSON: JSON.stringify(request)
 		};
 	};
-	return [
+	const commands = [
 		{
 			command: CODEX_APP_SERVER_THREADS_LIST_COMMAND,
 			cap: CODEX_APP_SERVER_THREADS_CAPABILITY,
@@ -2210,9 +2381,25 @@ function createCodexSessionCatalogNodeHostCommands(controlFactory, configSources
 				}
 			}
 		},
+		{
+			command: CODEX_CATALOG_TRANSCRIPT_READ_COMMAND,
+			cap: CODEX_APP_SERVER_THREADS_CAPABILITY,
+			dangerous: false,
+			handle: async (paramsJSON) => {
+				const request = bindRequest(paramsJSON);
+				const action = readNodeTranscriptParams(request.params);
+				try {
+					return JSON.stringify(await readCodexCatalogTranscriptPage(request.control, action));
+				} catch (error) {
+					if (error instanceof CatalogParamsError) throw error;
+					throw new Error("Codex app-server transcript is unavailable", { cause: error });
+				}
+			}
+		},
 		createCodexTerminalNodeHostCommand(bindRequest, configSources),
 		createCodexTerminalStartNodeHostCommand()
 	];
+	return process.env.OPENCLAW_NODE_EXEC_HOST?.trim().toLowerCase() === "app" ? commands.filter(({ command }) => command !== CODEX_CATALOG_TRANSCRIPT_READ_COMMAND) : commands;
 }
 function readNodeTranscriptParams(value) {
 	if (!isRecord(value)) throw new CatalogParamsError("Codex session read parameters must be an object");
@@ -2235,94 +2422,58 @@ function readBoundedLimit(value, key, fallback, max) {
 	if (!Number.isInteger(value) || value < 1 || value > max) throw new CatalogParamsError(`${key} must be an integer from 1 to ${max}`);
 	return value;
 }
-function flattenTranscriptPageDesc(page) {
-	return page.data.flatMap((turn) => turn.items.toReversed());
-}
 /** Reads the persisted transcript for a Gateway-local or paired-node Codex session. */
 async function readCodexSessionTranscript(params) {
+	const cursor = readControlCursor(params.cursor, "transcript request");
+	const limit = readBoundedLimit(params.limit, "limit", 20, 50);
 	if (params.source || params.hostId === "gateway:local") {
-		await params.control.requireEligibleThread(params.threadId);
-		const listParams = {
+		const page = await readCodexCatalogTranscriptPage(params.control, {
 			threadId: params.threadId,
-			limit: params.limit,
-			sortDirection: "desc",
-			itemsView: "full",
-			...params.cursor ? { cursor: params.cursor } : {}
-		};
-		const page = parseTranscriptPage(await params.control.listTurnPage(listParams));
+			limit,
+			cursor
+		});
 		return {
 			hostId: params.hostId,
 			label: params.source?.label ?? "Local Codex",
 			threadId: params.threadId,
-			items: flattenTranscriptPageDesc(page),
-			...page.nextCursor ? { nextCursor: page.nextCursor } : {},
-			...page.backwardsCursor ? { backwardsCursor: page.backwardsCursor } : {}
+			...page
 		};
 	}
 	const nodeId = params.hostId.slice(5);
 	const node = (await params.runtime.nodes.list()).nodes.find((candidate) => candidate.nodeId === nodeId && candidate.connected === true && candidate.commands?.includes("codex.appServer.thread.turns.list.v1"));
 	if (!node) throw new CatalogParamsError("paired-node Codex session host is offline or unavailable");
-	const page = parseTranscriptPage(unwrapNodeInvokePayload(await params.runtime.nodes.invoke({
+	const invoke = async (command, request) => unwrapNodeInvokePayload(await params.runtime.nodes.invoke({
 		nodeId,
-		command: CODEX_APP_SERVER_THREAD_TURNS_LIST_COMMAND,
+		command,
 		params: {
 			agentId: params.agentId,
 			threadId: params.threadId,
-			limit: params.limit,
-			...params.cursor ? { cursor: params.cursor } : {}
+			...request
 		},
 		timeoutMs: NODE_INVOKE_TIMEOUT_MS,
 		scopes: ["operator.write"]
-	})));
+	}));
+	const page = node.commands?.includes("codex.sessionCatalog.transcript.read.v1") ? parseCodexCatalogTranscriptPage(await invoke(CODEX_CATALOG_TRANSCRIPT_READ_COMMAND, {
+		cursor,
+		limit
+	})) : await readLegacyCodexTranscriptPage(async ({ cursor: turnCursor, limit: turnLimit }) => parseTranscriptPage(await invoke(CODEX_APP_SERVER_THREAD_TURNS_LIST_COMMAND, {
+		cursor: turnCursor,
+		limit: turnLimit
+	})), {
+		threadId: params.threadId,
+		cursor,
+		limit
+	});
 	return {
 		hostId: params.hostId,
 		label: nodeLabel(node),
 		threadId: params.threadId,
-		items: flattenTranscriptPageDesc(page),
-		...page.nextCursor ? { nextCursor: page.nextCursor } : {},
-		...page.backwardsCursor ? { backwardsCursor: page.backwardsCursor } : {}
-	};
-}
-//#endregion
-//#region extensions/codex/src/session-catalog-transcript-item.ts
-const CODEX_MESSAGE_TYPES = /* @__PURE__ */ new Map([
-	["userMessage", "userMessage"],
-	["agentMessage", "agentMessage"],
-	["reasoning", "reasoning"]
-]);
-const CODEX_TOOL_TYPES = /* @__PURE__ */ new Set([
-	"commandExecution",
-	"fileChange",
-	"mcpToolCall",
-	"dynamicToolCall",
-	"collabAgentToolCall",
-	"webSearch",
-	"imageView",
-	"imageGeneration"
-]);
-function toGenericTranscriptItem(item) {
-	let type = CODEX_MESSAGE_TYPES.get(item.type);
-	if (!type && CODEX_TOOL_TYPES.has(item.type)) type = item.result !== void 0 || Boolean(item.aggregatedOutput) ? "toolResult" : "toolCall";
-	type ??= "other";
-	const fallback = item.title ?? item.name ?? item.tool ?? item.command ?? item.query ?? void 0;
-	const resultText = item.aggregatedOutput || (item.result === void 0 ? void 0 : JSON.stringify(item.result, null, 2));
-	const changesText = Array.isArray(item.changes) ? item.changes.map((change) => `${change.kind}: ${change.path}`).join("\n") || void 0 : void 0;
-	const text = item.type === "userMessage" ? projectCodexUserItemText(item) : item.text || resultText || changesText || fallback;
-	return {
-		id: item.id,
-		type,
-		...text ? { text } : {},
-		raw: item
+		...page
 	};
 }
 //#endregion
 //#region extensions/codex/src/session-upstream-activity.ts
 const CODEX_UPSTREAM_TURN_LIMIT = 100;
-const CODEX_APP_SERVER_INVALID_REQUEST_CODE = -32600;
-const CODEX_THREAD_NOT_LOADED_MESSAGE_PREFIX = "thread not loaded:";
-function isCodexThreadGoneError(error) {
-	return error instanceof CodexAppServerRpcError && error.code === CODEX_APP_SERVER_INVALID_REQUEST_CODE && error.message.startsWith(CODEX_THREAD_NOT_LOADED_MESSAGE_PREFIX);
-}
 function readMarker(probe) {
 	if (!isRecord(probe.marker)) return;
 	const turnId = probe.marker.turnId;
@@ -2385,14 +2536,14 @@ function normalizeUserMessageTexts(item) {
 	const contentTexts = typed.content?.filter((input) => input.type === "text").map((input) => input.text.trim().replace(/\s+/g, " ")).filter(Boolean);
 	return contentTexts?.length ? contentTexts : [(typed.text ?? "").trim().replace(/\s+/g, " ")];
 }
-async function checkCodexUpstreamActivity(probes, control, resolveThreadId = async (probe) => probe.threadId) {
+async function checkCodexUpstreamActivity(probes, control, resolveThreadId = (probe) => probe.threadId) {
 	return await control.withPinnedConnection(async (pinned) => {
 		const activities = [];
 		for (const probe of probes) {
 			const fingerprint = upstreamConnectionFingerprint(probe);
 			if (probe.upstreamKind !== "codex-app-server" || !fingerprint || fingerprint !== pinned.connectionFingerprint) continue;
 			try {
-				const threadId = await resolveThreadId(probe);
+				const threadId = resolveThreadId(probe);
 				const page = await pinned.listTurnPage({
 					threadId,
 					limit: CODEX_UPSTREAM_TURN_LIMIT,
@@ -2404,7 +2555,7 @@ async function checkCodexUpstreamActivity(probes, control, resolveThreadId = asy
 					try {
 						await pinned.readThread(threadId, false);
 					} catch (error) {
-						if (isCodexThreadGoneError(error)) activities.push({
+						if (isCodexThreadReadMissingError(error, threadId)) activities.push({
 							kind: "missing",
 							sessionKey: probe.sessionKey
 						});
@@ -2422,7 +2573,7 @@ async function checkCodexUpstreamActivity(probes, control, resolveThreadId = asy
 	});
 }
 function createChecker(params) {
-	const resolveThreadId = async (probe) => {
+	const resolveThreadId = (probe) => {
 		const config = params.getRuntimeConfig();
 		const sessionId = params.api.runtime.agent.session.getSessionEntry({
 			agentId: probe.agentId,
@@ -2430,7 +2581,7 @@ function createChecker(params) {
 			readConsistency: "latest"
 		})?.sessionId?.trim();
 		if (!sessionId) return probe.threadId;
-		const binding = await params.bindingStore.read(sessionBindingIdentity({
+		const binding = params.bindingStore.read(sessionBindingIdentity({
 			sessionId,
 			sessionKey: probe.sessionKey,
 			config
@@ -2472,7 +2623,7 @@ function existingCatalogHomeCandidates(value, label) {
 /** Resolves every local Codex store the operator already owns, without path disclosure. */
 function resolveCodexCatalogHomes(params) {
 	const { config, env, ownerAgentId, pluginConfig } = params;
-	const ownerAgentDir = resolveAgentDir$1(config, ownerAgentId, env);
+	const ownerAgentDir = resolveAgentDir$2(config, ownerAgentId, env);
 	const configuredHomes = readCodexPluginConfig(pluginConfig).sessionCatalog?.homes ?? [];
 	const base = resolveCodexSupervisionAppServerRuntimeOptions({
 		pluginConfig,
@@ -2494,8 +2645,8 @@ function resolveCodexCatalogHomes(params) {
 			label: "Local Codex · user",
 			usesProcessHomeFallback: !processHomeConfigured
 		});
-		const agentIds = listAgentIds(config).toSorted((left, right) => left === ownerAgentId ? -1 : right === ownerAgentId ? 1 : left.localeCompare(right));
-		candidates.push(...agentIds.flatMap((agentId) => existingCatalogHomeCandidates(resolveCodexAppServerHomeDir(resolveAgentDir$1(config, agentId, env)), agentId)), ...configuredHomes.flatMap((entry) => {
+		const agentIds = listAgentIds$1(config).toSorted((left, right) => left === ownerAgentId ? -1 : right === ownerAgentId ? 1 : left.localeCompare(right));
+		candidates.push(...agentIds.flatMap((agentId) => existingCatalogHomeCandidates(resolveCodexAppServerHomeDir(resolveAgentDir$2(config, agentId, env)), agentId)), ...configuredHomes.flatMap((entry) => {
 			const { path: home, label } = typeof entry === "string" ? { path: entry } : entry;
 			return existingCatalogHomeCandidates(home, label);
 		}));
@@ -2536,7 +2687,7 @@ function createCodexCatalogHomeResolver(params) {
 	const homesByConfig = /* @__PURE__ */ new WeakMap();
 	const buildSnapshot = (config) => {
 		const pluginConfig = params.getPluginConfig();
-		const homesByAgent = new Map(listAgentIds(config).map((agentId) => [agentId, resolveCodexCatalogHomes({
+		const homesByAgent = new Map(listAgentIds$1(config).map((agentId) => [agentId, resolveCodexCatalogHomes({
 			config,
 			pluginConfig,
 			ownerAgentId: agentId,
@@ -2579,6 +2730,7 @@ function createCodexCatalogRequestSnapshot(requestTimeoutMs, request) {
 		requestTimeoutMs,
 		listThreads: (params, timeoutMs) => request(CODEX_CONTROL_METHODS.listThreads, params, timeoutMs),
 		listThreadTurns: (params) => request(CODEX_CONTROL_METHODS.listThreadTurns, params),
+		listThreadItems: (params) => request(CODEX_CONTROL_METHODS.listThreadItems, params),
 		forkThread: (params, assertCurrent) => request(CODEX_CONTROL_METHODS.forkThread, assertCodexThreadForkParams(params), void 0, assertCurrent),
 		readThread: async (threadId, includeTurns, timeoutMs) => (await request(CODEX_CONTROL_METHODS.readThread, {
 			threadId,
@@ -2709,6 +2861,7 @@ function createCodexSessionCatalogControlFromRequests(params) {
 		async listTurnPage(listParams) {
 			return await params.createRequestSnapshot().listThreadTurns(listParams);
 		},
+		listItemPage: (listParams) => params.createRequestSnapshot().listThreadItems(listParams),
 		async forkThread(forkParams, assertCurrent) {
 			return await params.createRequestSnapshot().forkThread(forkParams, assertCurrent);
 		},
@@ -2731,7 +2884,7 @@ function createCodexSessionCatalogControl(params) {
 	const catalogPagesByConfig = /* @__PURE__ */ new WeakMap();
 	const resolveRequestOptions = (startOptions, agentId, source) => {
 		const runtimeConfig = params.getRuntimeConfig();
-		const agentDir = source?.agentDir ?? resolveAgentDir$1(runtimeConfig ?? {}, agentId);
+		const agentDir = source?.agentDir ?? resolveAgentDir$2(runtimeConfig ?? {}, agentId);
 		const resolvedStartOptions = source?.appServer.start ?? startOptions;
 		if (!runtimeConfig) return {
 			agentDir,
@@ -2891,6 +3044,7 @@ function createCodexSessionCatalogNodeInvokePolicies() {
 		commands: [
 			CODEX_APP_SERVER_THREADS_LIST_COMMAND,
 			CODEX_APP_SERVER_THREAD_TURNS_LIST_COMMAND,
+			CODEX_CATALOG_TRANSCRIPT_READ_COMMAND,
 			CODEX_TERMINAL_RESUME_COMMAND,
 			CODEX_TERMINAL_START_COMMAND
 		],
@@ -2993,7 +3147,7 @@ function registerCodexSessionCatalog(params) {
 		resolveCreateSession: ({ agentId }) => resolveCodexCatalogCreateSession(params.getRuntimeConfig() ?? params.api.config, agentId),
 		list: async (query) => {
 			const localTerminalAvailable = resolveLocalCodexTerminalExecutable() !== void 0;
-			const { agentId: requestedAgentId, allowProcessHomeFallback, listNodes, onHost, sessionEntries, ...gatewayQuery } = query;
+			const { agentId: requestedAgentId, allowProcessHomeFallback, listNodes, onHost, waitUntil, signal, sessionEntries, ...gatewayQuery } = query;
 			const agentId = resolveRequestAgentId(requestedAgentId);
 			const localHomes = [...catalogHomes(agentId, allowProcessHomeFallback)];
 			const mapHost = (host) => ({
@@ -3008,6 +3162,8 @@ function registerCodexSessionCatalog(params) {
 				control: params.control,
 				query: gatewayQuery,
 				listNodes,
+				waitUntil,
+				signal,
 				sessionEntries,
 				localHomes,
 				...onHost ? { onHost: (host) => onHost(mapHost(host)) } : {}
@@ -3015,7 +3171,7 @@ function registerCodexSessionCatalog(params) {
 		},
 		read: async (request) => {
 			const { agentId, source, control } = bindRequest(request);
-			const page = await readCodexSessionTranscript({
+			return await readCodexSessionTranscript({
 				agentId,
 				runtime: params.api.runtime,
 				control,
@@ -3025,10 +3181,6 @@ function registerCodexSessionCatalog(params) {
 				limit: request.limit ?? 20,
 				...source ? { source } : {}
 			});
-			return {
-				...page,
-				items: page.items.map(toGenericTranscriptItem)
-			};
 		},
 		continueSession: async (request) => {
 			const config = params.getRuntimeConfig();