@openclaw/codex 2026.9.6 → 2026.9.7

package/dist/.setup/{session-catalog-Pno1xGcl.mjs → session-catalog-4sCdv5qx.mjs}

@@ -1,18 +1,22 @@
-import { m as sessionBindingIdentity } from "./session-binding-record-BGoz8wOK.mjs";
-import { d as resolveCodexAppServerHomeDir, f as resolveCodexAppServerLocalHomeDir, p as resolveCodexAppServerUserHomeDir } from "./config-security-BEReZ6go.mjs";
-import { d as readCodexPluginConfig } from "./config-parsing-CcB9iPoq.mjs";
-import { A as parseCatalogPage, D as filterCatalogPageByTitle, F as readGatewayParams, H as unwrapNodeInvokePayload, I as readPageParams, M as parseTranscriptPage, N as readBoundedOptionalString, O as isInteractiveThreadSource, P as readControlCursor, R as requireOnlyKeys, S as NODE_INVOKE_TIMEOUT_MS, _ as CODEX_LOCAL_SESSION_HOST_ID, g as CODEX_CATALOG_TRANSCRIPT_READ_COMMAND, h as CODEX_APP_SERVER_THREAD_TURNS_LIST_COMMAND, j as parseJsonParams, m as CODEX_APP_SERVER_THREADS_LIST_COMMAND, p as CODEX_APP_SERVER_THREADS_CAPABILITY, v as CatalogParamsError, w as catalogError, x as MAX_TRANSCRIPT_PAGE_BYTES, y as MAX_CURSOR_LENGTH } from "./session-catalog-native-projection-DowriLid.mjs";
+import { A as unwrapNodeInvokePayload, C as readGatewayParams, E as requireOnlyKeys, S as readControlCursor, _ as normalizeLimit, a as CODEX_LOCAL_SESSION_HOST_ID, b as parseTranscriptPage, f as catalogError, g as isInteractiveThreadSource, h as filterCatalogPageByTitle, i as CODEX_CATALOG_TRANSCRIPT_READ_COMMAND, l as MAX_TRANSCRIPT_PAGE_BYTES, n as CODEX_APP_SERVER_THREADS_LIST_COMMAND, o as CatalogParamsError, r as CODEX_APP_SERVER_THREAD_TURNS_LIST_COMMAND, s as MAX_CURSOR_LENGTH, t as CODEX_APP_SERVER_THREADS_CAPABILITY, u as NODE_INVOKE_TIMEOUT_MS, v as parseCatalogPage, w as readPageParams, x as readBoundedOptionalString, y as parseJsonParams } from "./session-catalog-parsing-CPGaPYr-.mjs";
 import { n as assertCodexThreadForkParams } from "./protocol-CANUwXJ3.mjs";
-import { c as codexCatalogHomeIdFromCanonicalPath, m as hasActiveSharedCodexAppServerWork, o as readCodexSessionMeta, p as getSharedCodexAppServerClientState, t as codexCatalogResidentHomeKey } from "./session-catalog-events-Bj6j94E_.mjs";
-import { i as withTimeout, o as CodexAppServerRpcError, s as isCodexThreadReadMissingError } from "./timeout-C910MdAB.mjs";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-CDXOOFdZ.mjs";
-import { r as compareCodexCatalogRows } from "./session-catalog-index-order-hcdz07yN.mjs";
-import { n as readLegacyCodexHistoryPage, t as readCodexThreadHistoryPage } from "./thread-history-page-DoVpnHim.mjs";
-import { i as projectCodexUserItemText } from "./transcript-history-projection-ZZpkFkJ_.mjs";
+import { v as sessionBindingIdentity } from "./session-binding-record-Oe9L-CNY.mjs";
+import { d as readCodexPluginConfig } from "./config-parsing-b088LyhT.mjs";
+import { n as resolveCodexAppServerLocalHomeDir, r as resolveCodexAppServerUserHomeDir, t as resolveCodexAppServerHomeDir } from "./auth-start-options-BPIPeEX8.mjs";
+import { i as hasActiveSharedCodexAppServerWork, r as getSharedCodexAppServerClientState } from "./shared-client-lifecycle-DJIgqgMw.mjs";
+import { n as CodexAppServerRpcError, r as isCodexThreadReadMissingError } from "./rpc-error-BlD2vuzn.mjs";
+import { t as CODEX_CONTROL_METHODS } from "./capabilities-B3WEZl4e.mjs";
+import { n as codexCatalogHomeIdFromCanonicalPath } from "./session-catalog-home-id-vlih0B_g.mjs";
+import { i as withTimeout } from "./timeout-CXOfNoaX.mjs";
+import { a as CodexCatalogLoadingError, n as currentCodexCatalogListRequest, r as withCodexCatalogListRequest, t as CodexCatalogListRequest } from "./session-catalog-list-request-CvtxrYSe.mjs";
+import { t as lookupNodeCodexCatalogRecord } from "./session-catalog-node-lookup-CtAXI5W5.mjs";
+import { r as projectCodexUserItemText } from "./transcript-history-projection-DRSifI-1.mjs";
 import { r as codexUpstreamContinueResult } from "./session-upstream-marker-D15C9NHp.mjs";
-import { t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-B2CsSdnV.mjs";
+import { t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-BL9B5H0L.mjs";
 import { n as findCodexAppServerSpawnError } from "./spawn-error-CL3n6MAa.mjs";
-import { a as setCodexCatalogConnectionHomeResolver } from "./binding-connection-ThoatDcb.mjs";
+import { n as readCodexSessionMeta } from "./session-catalog-provenance-DoAvktcj.mjs";
+import { t as codexCatalogResidentHomeKey } from "./session-catalog-events-DePDzzjc.mjs";
+import { a as setCodexCatalogConnectionHomeResolver } from "./binding-connection-DTtN1KrX.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { randomUUID } from "node:crypto";
 import { embeddedAgentLog, resolveDefaultAgentDir } from "openclaw/plugin-sdk/agent-harness-registration";
@@ -204,6 +208,14 @@ function currentCodexCatalogListDiagnostics() {
 	const observation = listScope.getStore();
 	return observation?.closed ? void 0 : observation;
 }
+function startCodexCatalogListTiming(field, counter) {
+	const observation = currentCodexCatalogListDiagnostics();
+	const started = observation ? performance.now() : 0;
+	if (observation && counter) observation.fields[counter]++;
+	return () => {
+		if (observation && !observation.closed) observation.fields[field] = (observation.fields[field] ?? 0) + performance.now() - started;
+	};
+}
 /** One logical list scope survives admission pauses; finishing drops its captured context. */
 function createCodexCatalogListScope() {
 	const observation = start("list phases", {
@@ -290,56 +302,6 @@ function startCodexCatalogControlRequestDiagnostics(page) {
 	return observation;
 }
 //#endregion
-//#region extensions/codex/src/session-catalog-availability.ts
-var CodexCatalogLoadingError = class extends Error {
-	constructor() {
-		super("Codex session catalog is still loading. Retry shortly.");
-		this.code = "APP_SERVER_UNAVAILABLE";
-	}
-};
-/** One generation promise wakes cold callers; native pages remain owned by the index. */
-var CodexCatalogAvailability = class {
-	constructor() {
-		this.complete = false;
-		this.changed = createDeferred();
-	}
-	begin() {
-		this.failure = void 0;
-	}
-	publish(frontier, complete = false) {
-		if (this.complete) return;
-		if (frontier && (!this.frontier || compareCodexCatalogRows(frontier, this.frontier) > 0)) {
-			const { threadId, updatedAt, recencyAt, sourceOrder } = frontier;
-			this.frontier = {
-				threadId,
-				updatedAt,
-				recencyAt,
-				sourceOrder
-			};
-		}
-		this.complete = complete;
-		this.notify();
-	}
-	fail(error) {
-		this.failure = { error };
-		this.notify();
-	}
-	notify() {
-		const previous = this.changed;
-		this.changed = createDeferred();
-		previous.resolve();
-	}
-	async until(promise, deadline) {
-		const remaining = deadline - performance.now();
-		if (remaining <= 0) throw new CodexCatalogLoadingError();
-		return await withTimeout(promise, remaining, "Codex session catalog is still loading", () => new CodexCatalogLoadingError());
-	}
-	async next(deadline) {
-		if (this.failure) throw this.failure.error;
-		await this.until(this.changed.promise, deadline);
-	}
-};
-//#endregion
 //#region extensions/codex/src/session-catalog-node-snapshot.ts
 /** One query-compatible native page per node, owned by the registered catalog provider. */
 var CodexCatalogNodeSnapshots = class {
@@ -444,58 +406,6 @@ function createNodeHostPublication(publication, adopted, sourceKey, onHost, sign
 	};
 }
 //#endregion
-//#region extensions/codex/src/session-catalog-node-lookup.ts
-async function lookupNodeCodexCatalogRecord(params) {
-	const deadline = performance.now() + NODE_INVOKE_TIMEOUT_MS;
-	const unverified = () => new CatalogParamsError("Codex session eligibility could not be verified");
-	const remaining = () => {
-		const timeoutMs = Math.ceil(deadline - performance.now());
-		if (timeoutMs <= 0) throw unverified();
-		return timeoutMs;
-	};
-	let cursor;
-	let sourceHomeId = params.sourceHomeId;
-	let firstPage = true;
-	const seenCursors = /* @__PURE__ */ new Set();
-	for (;;) {
-		const timeoutMs = remaining();
-		const raw = await withTimeout(params.runtime.nodes.invoke({
-			nodeId: params.nodeId,
-			command: CODEX_APP_SERVER_THREADS_LIST_COMMAND,
-			params: {
-				agentId: params.agentId,
-				...sourceHomeId ? { sourceHomeId } : {},
-				limit: 100,
-				...cursor ? { cursor } : {}
-			},
-			timeoutMs,
-			scopes: ["operator.write"]
-		}), timeoutMs, "Codex session eligibility could not be verified", unverified);
-		remaining();
-		const page = parseCatalogPage(unwrapNodeInvokePayload(raw));
-		if ((!firstPage || sourceHomeId !== void 0) && page.sourceHomeId !== sourceHomeId) throw new CatalogParamsError("Codex session source home changed; refresh the catalog and retry");
-		sourceHomeId = page.sourceHomeId;
-		firstPage = false;
-		const record = page.sessions.find((candidate) => candidate.threadId === params.threadId);
-		if (record) return {
-			kind: "found",
-			record,
-			sourceHomeId,
-			canContinueCodex: page.canContinueCodex
-		};
-		const nextCursor = page.nextCursor?.trim();
-		if (!nextCursor) break;
-		if (seenCursors.has(nextCursor)) return { kind: "cursor-cycle" };
-		seenCursors.add(nextCursor);
-		if (seenCursors.size > 2e4) {
-			const oldest = seenCursors.values().next().value;
-			if (oldest !== void 0) seenCursors.delete(oldest);
-		}
-		cursor = nextCursor;
-	}
-	return { kind: "missing" };
-}
-//#endregion
 //#region extensions/codex/src/session-catalog-terminal.ts
 const CODEX_TERMINAL_RESUME_COMMAND = "codex.terminal.resume.v1";
 const CODEX_TERMINAL_START_COMMAND = "codex.terminal.start.v1";
@@ -665,120 +575,6 @@ async function startCodexCatalogTerminal(params) {
 	};
 }
 //#endregion
-//#region extensions/codex/src/session-catalog-list-request.ts
-const listRequest = new AsyncLocalStorage();
-function currentCodexCatalogListRequest() {
-	return listRequest.getStore();
-}
-/** One foreground request owns its native read budget and source-health outcome. */
-var CodexCatalogListRequest = class {
-	constructor() {
-		this.pages = 0;
-		this.closed = false;
-		this.attempts = /* @__PURE__ */ new Map();
-	}
-	get hasPages() {
-		return this.pages < 20;
-	}
-	deadline(timeoutMs) {
-		this.assertActive();
-		return this.deadlineAt ??= performance.now() + timeoutMs;
-	}
-	constrainDeadline(absolute) {
-		this.assertActive();
-		this.deadlineAt = Math.min(this.deadlineAt ?? absolute, absolute);
-		return this.deadlineAt;
-	}
-	remaining(timeoutMs) {
-		const remaining = Math.min(timeoutMs, this.deadline(timeoutMs) - performance.now());
-		if (remaining <= 0) throw new CodexCatalogLoadingError();
-		return remaining;
-	}
-	assertActive() {
-		if (this.closed) throw new DOMException("Codex session catalog request is closed", "AbortError");
-		if (this.deadlineAt !== void 0 && this.deadlineAt <= performance.now()) throw new CodexCatalogLoadingError();
-	}
-	async run(run) {
-		this.assertActive();
-		const pending = listRequest.run(this, run);
-		const remaining = this.deadlineAt === void 0 ? void 0 : this.deadlineAt - performance.now();
-		if (remaining !== void 0 && remaining <= 0) {
-			pending.catch(() => {});
-			throw new CodexCatalogLoadingError();
-		}
-		const result = remaining === void 0 ? await pending : await withTimeout(pending, remaining, "Codex session catalog is still loading", () => new CodexCatalogLoadingError());
-		this.assertActive();
-		return result;
-	}
-	async read(timeoutMs, read) {
-		const remaining = this.remaining(timeoutMs);
-		if (!this.hasPages) throw new CatalogParamsError("Codex catalog native page budget is exhausted");
-		this.pages++;
-		try {
-			const result = await withTimeout(read(remaining), remaining, "Codex session catalog is still loading", () => new CodexCatalogLoadingError());
-			this.assertActive();
-			return result;
-		} catch (error) {
-			if (!this.closed) this.failure ??= { error };
-			throw error;
-		}
-	}
-	attempt(owner, key, start) {
-		this.assertActive();
-		let attempts = this.attempts.get(owner);
-		const existing = attempts?.get(key);
-		if (existing) return existing;
-		const attempt = start();
-		if (!attempts) {
-			attempts = /* @__PURE__ */ new Map();
-			this.attempts.set(owner, attempts);
-		}
-		attempts.set(key, attempt);
-		return attempt;
-	}
-	resolved() {
-		if (this.failure) {
-			this.rejected(this.failure.error);
-			return;
-		}
-		this.settle((attempt) => attempt.resolved());
-	}
-	rejected(error) {
-		if (error instanceof Error && error.name === "AbortError") {
-			this.close();
-			return;
-		}
-		const reason = this.failure?.error ?? error;
-		this.settle((attempt) => attempt.rejected(reason));
-	}
-	close() {
-		this.settle((attempt) => attempt.abandoned());
-	}
-	settle(settle) {
-		if (this.closed) return;
-		this.closed = true;
-		for (const attempts of this.attempts.values()) for (const attempt of attempts.values()) if (attempt.allowed) settle(attempt);
-		this.attempts.clear();
-		this.failure = void 0;
-	}
-};
-async function withCodexCatalogListRequest(run) {
-	const current = currentCodexCatalogListRequest();
-	if (current) {
-		current.assertActive();
-		return await run(current);
-	}
-	const scope = new CodexCatalogListRequest();
-	try {
-		const result = await scope.run(() => run(scope));
-		scope.resolved();
-		return result;
-	} catch (error) {
-		scope.rejected(error);
-		throw error;
-	}
-}
-//#endregion
 //#region extensions/codex/src/session-catalog-visible-page.ts
 /** Fill exclusions from bounded resident pages. */
 var CodexCatalogVisiblePage = class {
@@ -810,9 +606,7 @@ var CodexCatalogVisiblePage = class {
 		if (this.complete) throw new Error("Codex catalog page is already complete");
 		const params = this.params;
 		params.signal?.throwIfAborted();
-		const diagnostics = currentCodexCatalogListDiagnostics();
-		const started = diagnostics ? performance.now() : 0;
-		if (diagnostics) diagnostics.fields.controlPageCalls++;
+		const finishTiming = startCodexCatalogListTiming("controlWaitSumMs", "controlPageCalls");
 		let rawPage;
 		try {
 			rawPage = await params.control.listPage({
@@ -822,7 +616,7 @@ var CodexCatalogVisiblePage = class {
 				...params.cwd ? { cwd: params.cwd } : {}
 			});
 		} finally {
-			if (diagnostics && !diagnostics.closed) diagnostics.fields.controlWaitSumMs = (diagnostics.fields.controlWaitSumMs ?? 0) + performance.now() - started;
+			finishTiming();
 		}
 		this.request.assertActive();
 		params.signal?.throwIfAborted();
@@ -908,12 +702,10 @@ function hostFailure(source, error) {
 }
 async function projectLocalHost(params, agentId, source, page) {
 	params.signal?.throwIfAborted();
-	const { listAdoptedSessionEntries } = await import("./session-catalog-adoption-BI6UTDZT.mjs");
+	const { listAdoptedSessionEntries } = await import("./session-catalog-adoption-BU_pHWG7.mjs");
 	const { sessionCatalogAdoptedSourceKey } = await import("openclaw/plugin-sdk/session-catalog");
 	params.signal?.throwIfAborted();
-	const diagnostics = currentCodexCatalogListDiagnostics();
-	const started = diagnostics ? performance.now() : 0;
-	if (diagnostics) diagnostics.fields.adoptionCalls++;
+	const finishTiming = startCodexCatalogListTiming("adoptionSumMs", "adoptionCalls");
 	let adopted;
 	try {
 		adopted = await listAdoptedSessionEntries({
@@ -924,7 +716,7 @@ async function projectLocalHost(params, agentId, source, page) {
 			sessionEntries: params.sessionEntries
 		});
 	} finally {
-		if (diagnostics && !diagnostics.closed) diagnostics.fields.adoptionSumMs = (diagnostics.fields.adoptionSumMs ?? 0) + performance.now() - started;
+		finishTiming();
 	}
 	const hostId = source?.hostId ?? "gateway:local";
 	const sourceHomeId = source?.sourceHomeId ?? "gateway:local";
@@ -950,9 +742,7 @@ async function projectLocalHost(params, agentId, source, page) {
 function managedMarker(store, sourceHomeId, managed) {
 	return async ({ threadId, rolloutPath }) => {
 		if (managed?.has(threadId)) return;
-		const diagnostics = currentCodexCatalogListDiagnostics();
-		const started = diagnostics ? performance.now() : 0;
-		if (diagnostics) diagnostics.fields.exclusionMarkCalls++;
+		const finishTiming = startCodexCatalogListTiming("exclusionMarkSumMs", "exclusionMarkCalls");
 		try {
 			await store.mark({
 				sourceHomeId,
@@ -960,7 +750,7 @@ function managedMarker(store, sourceHomeId, managed) {
 				...rolloutPath ? { rolloutPath } : {}
 			});
 		} finally {
-			if (diagnostics && !diagnostics.closed) diagnostics.fields.exclusionMarkSumMs = (diagnostics.fields.exclusionMarkSumMs ?? 0) + performance.now() - started;
+			finishTiming();
 		}
 	};
 }
@@ -1135,8 +925,8 @@ var CodexCatalogListDriver = class {
 		}
 		params.signal?.throwIfAborted();
 		this.nodeSnapshots.observe(this.nodeGeneration, inventory);
-		const { listNodeAdoptedSessionEntries, nodeAdoptedSourceKey } = await import("./session-catalog-node-adoption-ITddWx_X.mjs");
-		const { compareNodeLabels, listPairedNode, nodeLabel } = await import("./session-catalog-node-continue-6g6qi4A9.mjs");
+		const { listNodeAdoptedSessionEntries, nodeAdoptedSourceKey } = await import("./session-catalog-node-adoption-DgXvSGu0.mjs");
+		const { compareNodeLabels, listPairedNode, nodeLabel } = await import("./session-catalog-node-continue-DjKXHBbi.mjs");
 		params.signal?.throwIfAborted();
 		const adopted = listNodeAdoptedSessionEntries({
 			agentId,
@@ -1206,7 +996,7 @@ var CodexCatalogListDriver = class {
 			});
 		});
 		try {
-			return (await Promise.all(pendingHosts)).filter((host) => host !== void 0);
+			return await Promise.all(pendingHosts);
 		} catch (error) {
 			await Promise.allSettled(pendingHosts);
 			throw error;
@@ -1299,6 +1089,87 @@ async function listCodexSessionCatalog(params) {
 	return { hosts: await runCatalogListInline(createCodexSessionCatalogListOperation(params)) };
 }
 //#endregion
+//#region extensions/codex/src/app-server/thread-history-page.ts
+const TURN_ITEM_CURSOR_PREFIX = "turn-item:";
+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]
+	};
+}
+/** Legacy stores expose only turn cursors; an item identity preserves paging across appends. */
+async function readLegacyCodexHistoryPage(readTurns, request, projection) {
+	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(({ items, ...turn }) => items.toReversed().map((item) => ({
+		turnId: turn.id,
+		item,
+		turn
+	})));
+	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 = projection.project(remaining.slice(0, request.limit), 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.item.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 (!projection.fits(bounded)) {
+		if (items.length <= 1) throw new Error("Codex transcript item exceeds the safe response size");
+		items.pop();
+		bounded = result();
+	}
+	return bounded;
+}
+/** Callers authorize the thread; this reader owns native cursor and response-size semantics. */
+async function readCodexThreadHistoryPage(control, thread, request, projection) {
+	if (thread.historyMode !== "paginated") return readLegacyCodexHistoryPage((params) => control.listTurnPage(params), request, projection);
+	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 = projection.project(page.data, limit);
+		const result = {
+			items,
+			...nextCursor ? { nextCursor } : {}
+		};
+		const fittingCount = items.length - (projection.fits(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-transcript-item.ts
 const CODEX_MESSAGE_TYPES = /* @__PURE__ */ new Map([
 	["userMessage", "userMessage"],
@@ -1352,8 +1223,8 @@ const transcriptPageSchema = z.strictObject({
 function parseCodexCatalogTranscriptPage(value) {
 	return transcriptPageSchema.parse(value);
 }
-function projectTranscriptPage(items, limit) {
-	const projected = items.map(toGenericTranscriptItem);
+function projectTranscriptPage(entries, limit) {
+	const projected = entries.map(({ item }) => toGenericTranscriptItem(item));
 	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;
@@ -1364,15 +1235,14 @@ function pageFitsNodeTransport(page) {
 /** The legacy API can anchor a turn, but cannot continue within that turn. */
 async function readLegacyCodexTranscriptPage(readTurns, request) {
 	return readLegacyCodexHistoryPage(readTurns, request, {
-		project: (entries, limit) => projectTranscriptPage(entries.map(({ item }) => item), limit),
+		project: projectTranscriptPage,
 		fits: pageFitsNodeTransport
 	});
 }
 /** Uses the native store's item cursor whenever that store supports item history. */
 async function readCodexCatalogTranscriptPage(control, request) {
-	const thread = await control.requireEligibleThread(request.threadId);
-	return readCodexThreadHistoryPage(control, thread, request, {
-		project: (entries, limit) => projectTranscriptPage(entries.map(({ item }) => item), limit),
+	return readCodexThreadHistoryPage(control, await control.requireEligibleThread(request.threadId), request, {
+		project: projectTranscriptPage,
 		fits: pageFitsNodeTransport
 	});
 }
@@ -1396,6 +1266,23 @@ function createCodexSessionCatalogNodeHostCommands(controlFactory, bindingStore)
 			paramsJSON: JSON.stringify(request)
 		};
 	};
+	const transcriptCommand = (command, read) => ({
+		command,
+		cap: CODEX_APP_SERVER_THREADS_CAPABILITY,
+		dangerous: false,
+		hasActiveWork: controlFactory.hasActiveWork,
+		onDisconnect: controlFactory.disconnect,
+		handle: async (paramsJSON) => {
+			const request = await bindRequest(paramsJSON);
+			const action = readNodeTranscriptParams(request.params);
+			try {
+				return JSON.stringify(await read(request.control, action));
+			} catch (error) {
+				if (error instanceof CatalogParamsError) throw error;
+				throw new Error("Codex app-server transcript is unavailable", { cause: error });
+			}
+		}
+	});
 	const commands = [
 		{
 			command: CODEX_APP_SERVER_THREADS_LIST_COMMAND,
@@ -1435,48 +1322,17 @@ function createCodexSessionCatalogNodeHostCommands(controlFactory, bindingStore)
 				}
 			}
 		},
-		{
-			command: CODEX_APP_SERVER_THREAD_TURNS_LIST_COMMAND,
-			cap: CODEX_APP_SERVER_THREADS_CAPABILITY,
-			dangerous: false,
-			hasActiveWork: controlFactory.hasActiveWork,
-			onDisconnect: controlFactory.disconnect,
-			handle: async (paramsJSON) => {
-				const request = await bindRequest(paramsJSON);
-				const action = readNodeTranscriptParams(request.params);
-				try {
-					await request.control.requireEligibleThread(action.threadId);
-					const page = parseTranscriptPage(await request.control.listTurnPage({
-						threadId: action.threadId,
-						limit: action.limit,
-						sortDirection: "desc",
-						itemsView: "full",
-						...action.cursor ? { cursor: action.cursor } : {}
-					}));
-					return JSON.stringify(page);
-				} catch (error) {
-					if (error instanceof CatalogParamsError) throw error;
-					throw new Error("Codex app-server transcript is unavailable", { cause: error });
-				}
-			}
-		},
-		{
-			command: CODEX_CATALOG_TRANSCRIPT_READ_COMMAND,
-			cap: CODEX_APP_SERVER_THREADS_CAPABILITY,
-			dangerous: false,
-			hasActiveWork: controlFactory.hasActiveWork,
-			onDisconnect: controlFactory.disconnect,
-			handle: async (paramsJSON) => {
-				const request = await 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 });
-				}
-			}
-		},
+		transcriptCommand(CODEX_APP_SERVER_THREAD_TURNS_LIST_COMMAND, async (control, action) => {
+			await control.requireEligibleThread(action.threadId);
+			return parseTranscriptPage(await control.listTurnPage({
+				threadId: action.threadId,
+				limit: action.limit,
+				sortDirection: "desc",
+				itemsView: "full",
+				...action.cursor ? { cursor: action.cursor } : {}
+			}));
+		}),
+		transcriptCommand(CODEX_CATALOG_TRANSCRIPT_READ_COMMAND, readCodexCatalogTranscriptPage),
 		createCodexTerminalNodeHostCommand(bindRequest),
 		createCodexTerminalStartNodeHostCommand()
 	];
@@ -1494,19 +1350,14 @@ function readNodeTranscriptParams(value) {
 	const cursor = readBoundedOptionalString(value, "cursor", MAX_CURSOR_LENGTH);
 	return {
 		threadId,
-		limit: readBoundedLimit(value.limit, "limit", 20, 50),
+		limit: normalizeLimit(value.limit, "limit", 20, 50),
 		...cursor ? { cursor } : {}
 	};
 }
-function readBoundedLimit(value, key, fallback, max) {
-	if (value === void 0) return fallback;
-	if (!Number.isInteger(value) || value < 1 || value > max) throw new CatalogParamsError(`${key} must be an integer from 1 to ${max}`);
-	return value;
-}
 /** 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);
+	const limit = normalizeLimit(params.limit, "limit", 20, 50);
 	if (params.source || params.hostId === "gateway:local") {
 		const page = await readCodexCatalogTranscriptPage(params.control, {
 			threadId: params.threadId,
@@ -1546,7 +1397,7 @@ async function readCodexSessionTranscript(params) {
 		cursor,
 		limit
 	});
-	const { nodeLabel } = await import("./session-catalog-node-continue-6g6qi4A9.mjs");
+	const { nodeLabel } = await import("./session-catalog-node-continue-DjKXHBbi.mjs");
 	return {
 		hostId: params.hostId,
 		label: nodeLabel(node),
@@ -1562,7 +1413,7 @@ function readMarker(probe) {
 	const turnId = probe.marker.turnId;
 	if (turnId !== null && typeof turnId !== "string") return;
 	const count = probe.marker.userMessageCount;
-	if (count !== void 0 && (!Number.isSafeInteger(count) || count < 0)) return;
+	if (count !== void 0 && (typeof count !== "number" || !Number.isSafeInteger(count) || count < 0)) return;
 	return {
 		turnId,
 		...count === void 0 ? {} : { userMessageCount: count }
@@ -1578,7 +1429,7 @@ function classifyCodexUpstreamTurns(params) {
 	if (!newest?.id) return;
 	const markerIndex = marker.turnId === null ? -1 : params.turns.findIndex((turn) => turn.id === marker.turnId);
 	const candidateTurns = markerIndex < 0 ? params.turns : params.turns.slice(0, markerIndex + 1);
-	const newestUserMessageCount = countUserMessages(newest);
+	const newestUserMessageCount = newest.items.filter((item) => item.type === "userMessage").length;
 	if (!(marker.turnId !== newest.id || marker.userMessageCount === void 0 || newestUserMessageCount > marker.userMessageCount)) return;
 	const ownTexts = new Set(params.probe.ownRecentUserTexts);
 	let humanTurns = 0;
@@ -1611,9 +1462,6 @@ function classifyCodexUpstreamTurns(params) {
 		} : {}
 	};
 }
-function countUserMessages(turn) {
-	return turn.items.filter((item) => item.type === "userMessage").length;
-}
 function normalizeUserMessageTexts(item) {
 	const typed = item;
 	const contentTexts = typed.content?.filter((input) => input.type === "text").map((input) => input.text.trim().replace(/\s+/g, " ")).filter(Boolean);
@@ -1713,8 +1561,8 @@ async function requireEligibleCodexThread(params) {
 		remaining();
 		if (thread.id !== threadId || thread.ephemeral === true || !isInteractiveThreadSource(thread.source)) throw unverified();
 		if (!root) {
-			const { CODEX_CATALOG_NATIVE_PAGE_LIMIT } = await import("./session-catalog-native-projection-DowriLid.mjs").then((n) => n.a);
-			const { CODEX_CATALOG_MAX_ROWS } = await import("./session-catalog-native-projection-DowriLid.mjs").then((n) => n.G);
+			const { CODEX_CATALOG_NATIVE_PAGE_LIMIT } = await import("./session-catalog-native-projection-DjhwGL6x.mjs").then((n) => n.a);
+			const { CODEX_CATALOG_MAX_ROWS } = await import("./session-catalog-limits-DDxOsQeC.mjs").then((n) => n.r);
 			let cursor;
 			const seenCursors = /* @__PURE__ */ new Set();
 			for (;;) {
@@ -2096,7 +1944,6 @@ function createCodexSessionCatalogControl(params) {
 	const now = params.now ?? Date.now;
 	const sourceBackoff = new CodexCatalogSourceBackoff(now);
 	const noConfig = {};
-	const getPluginConfig = () => params.getPluginConfig();
 	const resolveRuntimeOptions = (options) => {
 		const runtime = params.resolveRuntimeOptions(options);
 		return runtime.start.transport === "stdio" && runtime.start.commandSource === "managed" ? {
@@ -2151,7 +1998,7 @@ function createCodexSessionCatalogControl(params) {
 			retireIndexes();
 		}
 		const epoch = residentEpoch;
-		const runtime = source?.appServer ?? resolveRuntimeOptions({ pluginConfig: getPluginConfig() });
+		const runtime = source?.appServer ?? resolveRuntimeOptions({ pluginConfig: params.getPluginConfig() });
 		const requestOptions = resolveRequestOptions(runtime.start, agentId, source);
 		const key = source?.sourceHomeId ?? agentId ?? "";
 		let home = directHomes.get(key);
@@ -2168,7 +2015,7 @@ function createCodexSessionCatalogControl(params) {
 		if (closed || generation !== config || residentEpoch !== epoch) throw new Error("Codex catalog configuration changed");
 		let index = indexes.get(homeId);
 		if (!index) {
-			const [{ CodexCatalogIndex }, { canReuseCodexCatalogPreview, projectCodexCatalogDeltaPage, projectCodexCatalogPage }] = await Promise.all([import("./session-catalog-index-B9_VQIUz.mjs"), import("./session-catalog-projection-zK_PUsiE.mjs")]);
+			const [{ CodexCatalogIndex }, { canReuseCodexCatalogPreview, projectCodexCatalogDeltaPage, projectCodexCatalogPage }] = await Promise.all([import("./session-catalog-index-CZvDzC6z.mjs"), import("./session-catalog-projection-Cr5qP5Dj.mjs")]);
 			source?.assertCurrent();
 			if (closed || generation !== config || residentEpoch !== epoch) throw new Error("Codex catalog configuration changed");
 			index = indexes.get(homeId);
@@ -2289,11 +2136,11 @@ function createCodexSessionCatalogControl(params) {
 		return resolved;
 	};
 	const createRequestSnapshot = (agentId, source, catalogPreview, catalogPreviewCache, catalogRows) => {
-		const pluginConfig = getPluginConfig();
+		const pluginConfig = params.getPluginConfig();
 		const runtime = source?.appServer ?? resolveRuntimeOptions({ pluginConfig });
 		const requestOptions = resolveRequestOptions(runtime.start, agentId, source);
 		return createCodexCatalogRequestSnapshot(runtime.requestTimeoutMs, async (method, requestParams, timeoutMs, assertCurrent, observation) => {
-			const { codexControlRequest } = await import("./command-rpc-DixIj3HW.mjs").then((n) => n.n);
+			const { codexControlRequest } = await import("./command-rpc-CGJGUQ6Y.mjs").then((n) => n.n);
 			return await codexControlRequest(pluginConfig, method, requestParams, {
 				...requestOptions,
 				authProfileId: null,
@@ -2311,13 +2158,13 @@ function createCodexSessionCatalogControl(params) {
 	const forRequest = (agentId, source) => {
 		source?.assertCurrent();
 		const withPinnedConnection = async (run) => {
-			const pluginConfig = getPluginConfig();
+			const pluginConfig = params.getPluginConfig();
 			const runtime = source?.appServer ?? resolveRuntimeOptions({ pluginConfig });
 			const { agentDir, config: runtimeConfig, startOptions } = resolveRequestOptions(runtime.start, agentId, source);
 			let catalogIndex;
-			const { getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient, retireSharedCodexAppServerClientIfCurrent } = await import("./shared-client-DA4VR4Eb.mjs").then((n) => n.y);
-			const { resolveCodexAppServerClientInstanceId } = await import("./client-Cs08OXVQ.mjs").then((n) => n.n);
-			const { requestCodexAppServerClientJson } = await import("./request-D2L0zMrq.mjs").then((n) => n.a);
+			const { getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient, retireSharedCodexAppServerClientIfCurrent } = await import("./shared-client-DqyTMYug.mjs").then((n) => n.v);
+			const { resolveCodexAppServerClientInstanceId } = await import("./client-N0JpgSzF.mjs").then((n) => n.n);
+			const { requestCodexAppServerClientJson } = await import("./request-BHZ1nz8d.mjs").then((n) => n.a);
 			const client = await getLeasedSharedCodexAppServerClient({
 				agentDir,
 				config: runtimeConfig,
@@ -2386,7 +2233,7 @@ function createCodexSessionCatalogControl(params) {
 			await Promise.allSettled(residentRequests);
 			const clients = getSharedCodexAppServerClientState();
 			if (clients.liveClients.size > 0 || clients.startup.pending.size > 0) {
-				const { clearSharedCodexAppServerClientAndWait } = await import("./shared-client-DA4VR4Eb.mjs").then((n) => n.y);
+				const { clearSharedCodexAppServerClientAndWait } = await import("./shared-client-DqyTMYug.mjs").then((n) => n.v);
 				await clearSharedCodexAppServerClientAndWait();
 			}
 		},
@@ -2548,8 +2395,7 @@ function withCatalogListScope(initialize) {
 }
 function catalogHostMapper(localTerminalAvailable, localHomes) {
 	return (host) => {
-		const diagnostics = currentCodexCatalogListDiagnostics();
-		const started = diagnostics ? performance.now() : 0;
+		const finishTiming = startCodexCatalogListTiming("mappingMs");
 		try {
 			const localSourceAvailable = localTerminalAvailable && localHomes.some((home) => home.hostId === host.hostId && home.appServer.start.transport === "stdio");
 			return {
@@ -2557,7 +2403,7 @@ function catalogHostMapper(localTerminalAvailable, localHomes) {
 				canStartTerminal: host.kind === "gateway" ? localSourceAvailable && host.hostId === "gateway:local" : host.canStartTerminal === true
 			};
 		} finally {
-			if (diagnostics && !diagnostics.closed) diagnostics.fields.mappingMs = (diagnostics.fields.mappingMs ?? 0) + performance.now() - started;
+			finishTiming();
 		}
 	};
 }
@@ -2749,16 +2595,16 @@ const codexSessionCatalogRuntime = {
 	archiveLocal: archiveLocalCodexSession
 };
 async function continueLocalCodexSession(...args) {
-	const { continueLocalCodexSession: run } = await import("./session-catalog-adoption-BI6UTDZT.mjs");
+	const { continueLocalCodexSession: run } = await import("./session-catalog-adoption-BU_pHWG7.mjs");
 	return run(...args);
 }
 async function archiveLocalCodexSession(...args) {
-	const { archiveLocalCodexSession: run } = await import("./session-catalog-archive-lHBqzhaO.mjs");
+	const { archiveLocalCodexSession: run } = await import("./session-catalog-archive-spHfihri.mjs");
 	return run(...args);
 }
 async function continueNodeCodexSession(...args) {
-	const { continueNodeCodexSession: run } = await import("./session-catalog-node-continue-6g6qi4A9.mjs");
+	const { continueNodeCodexSession: run } = await import("./session-catalog-node-continue-DjKXHBbi.mjs");
 	return run(...args);
 }
 //#endregion
-export { withCodexCatalogListRequest as a, createCodexSessionCatalogNodeHostCommands as i, createCodexSessionCatalogNodeInvokePolicies as n, lookupNodeCodexCatalogRecord as o, createCodexSessionCatalogControl as r, CodexCatalogAvailability as s, codexSessionCatalogRuntime as t };
+export { createCodexSessionCatalogNodeHostCommands as i, createCodexSessionCatalogNodeInvokePolicies as n, createCodexSessionCatalogControl as r, codexSessionCatalogRuntime as t };