@openclaw/codex 2026.9.6 → 2026.9.8

package/dist/.setup/{session-catalog-adoption-BI6UTDZT.mjs → session-catalog-adoption-BU_pHWG7.mjs}

@@ -1,12 +1,13 @@
-import { m as sessionBindingIdentity } from "./session-binding-record-BGoz8wOK.mjs";
-import { C as boundedCatalogString, L as requireBoundThread, v as CatalogParamsError } from "./session-catalog-native-projection-DowriLid.mjs";
+import { T as requireBoundThread, d as boundedCatalogString, o as CatalogParamsError } from "./session-catalog-parsing-CPGaPYr-.mjs";
+import { v as sessionBindingIdentity } from "./session-binding-record-Oe9L-CNY.mjs";
 import { n as codexUpstreamBaseline, t as codexLastTerminalTurnId } from "./session-upstream-marker-D15C9NHp.mjs";
-import { i as reclaimCurrentCodexSessionGeneration } from "./session-binding-Cm0apEbd.mjs";
-import { adoptionSessionKeyRest, continueOperations, runSessionActionExclusive } from "./session-catalog-node-adoption-ITddWx_X.mjs";
+import { i as reclaimCurrentCodexSessionGeneration } from "./session-binding-DGCYAfvD.mjs";
+import { adoptionSessionKeyRest, catalogSessionActions } from "./session-catalog-node-adoption-DgXvSGu0.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { listSessionCatalogEntries, sessionCatalogAdoptedSessionKey, sessionCatalogAdoptedSourceKey } from "openclaw/plugin-sdk/session-catalog";
 //#region extensions/codex/src/session-catalog-adoption.ts
 const CODEX_SUPERVISION_SESSION_KEY_PREFIX = "harness:codex:supervision:";
+const continueOperations = /* @__PURE__ */ new Map();
 const boundCatalogSessionId = (value) => boundedCatalogString(value, 256);
 function requireIdleThread(thread, action) {
 	if (thread.status?.type === "idle" || action === "archive" && thread.status?.type === "notLoaded") return;
@@ -151,7 +152,7 @@ async function createOrReuseAdoptedSession(params) {
 			sourceThreadId: params.sourceThread.id,
 			...params.sourceHomeId ? { sourceHomeId: params.sourceHomeId } : {}
 		};
-		const { createImportedCodexSession } = await import("./session-history-import-D-3wAgOP.mjs");
+		const { createImportedCodexSession } = await import("./session-history-import-WhX-X33a.mjs");
 		const created = await createImportedCodexSession({
 			runtime: params.api.runtime,
 			bindingStore: params.bindingStore,
@@ -271,7 +272,7 @@ async function continueLocalCodexSession(params) {
 		...params,
 		control
 	});
-	const operation = runSessionActionExclusive(sourceKey, async () => params.control.withPinnedConnection(run));
+	const operation = catalogSessionActions.enqueue(sourceKey, async () => params.control.withPinnedConnection(run));
 	continueOperations.set(operationKey, operation);
 	try {
 		return await operation;

package/dist/.setup/{session-catalog-archive-lHBqzhaO.mjs → session-catalog-archive-spHfihri.mjs}

@@ -1,9 +1,9 @@
-import { m as sessionBindingIdentity } from "./session-binding-record-BGoz8wOK.mjs";
-import { v as CatalogParamsError } from "./session-catalog-native-projection-DowriLid.mjs";
+import { o as CatalogParamsError } from "./session-catalog-parsing-CPGaPYr-.mjs";
+import { v as sessionBindingIdentity } from "./session-binding-record-Oe9L-CNY.mjs";
 import { t as assertCodexArchiveDescendantsUnowned } from "./thread-archive-guard-C9frICzX.mjs";
-import "./session-binding-Cm0apEbd.mjs";
-import { runSessionActionExclusive } from "./session-catalog-node-adoption-ITddWx_X.mjs";
-import { isAdoptionSessionKeyForThread, requireIdleThread } from "./session-catalog-adoption-BI6UTDZT.mjs";
+import "./session-binding-DGCYAfvD.mjs";
+import { catalogSessionActions } from "./session-catalog-node-adoption-DgXvSGu0.mjs";
+import { isAdoptionSessionKeyForThread, requireIdleThread } from "./session-catalog-adoption-BU_pHWG7.mjs";
 import { listAgentIds } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { sessionCatalogAdoptedSourceKey } from "openclaw/plugin-sdk/session-catalog";
 //#region extensions/codex/src/session-catalog-archive.ts
@@ -26,7 +26,7 @@ function assertNoPendingSupervisionBranch(params) {
 }
 /** Archives one inactive Gateway-local Codex thread after a fresh status read. */
 async function archiveLocalCodexSession(params) {
-	return await runSessionActionExclusive(sessionCatalogAdoptedSourceKey(params.hostId ?? "gateway:local", params.threadId), async () => {
+	return await catalogSessionActions.enqueue(sessionCatalogAdoptedSourceKey(params.hostId ?? "gateway:local", params.threadId), async () => {
 		return await params.bindingStore.withThreadArchiveFence(async () => {
 			const run = async (control) => {
 				assertNoPendingSupervisionBranch(params);

package/dist/.setup/session-catalog-events-BMCFMZw-.mjs

@@ -0,0 +1,139 @@
+import { c as MAX_CWD_LENGTH, d as boundedCatalogString } from "./session-catalog-parsing-CPGaPYr-.mjs";
+import { n as defineCodexBuildState } from "./build-state-DIQ5O_-S.mjs";
+import { r as inferCodexAppServerConnectionClass } from "./config-security-CE-FcGw9.mjs";
+import { n as resolveCodexAppServerLocalHomeDir } from "./auth-start-options-BPIPeEX8.mjs";
+import { n as codexCatalogHomeIdFromCanonicalPath } from "./session-catalog-home-id-vlih0B_g.mjs";
+import { t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-BL9B5H0L.mjs";
+import { d as observeCodexCatalogEphemeralThreads, r as projectCodexCatalogNativeThread, s as codexCatalogSourceForClient } from "./session-catalog-native-projection-CuaFZuQE.mjs";
+import { createHash } from "node:crypto";
+import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-registration";
+import path from "node:path";
+import fs from "node:fs/promises";
+//#region extensions/codex/src/session-catalog-events.ts
+const getCatalogEvents = defineCodexBuildState("openclaw.codexCatalogEvents", () => ({
+	listeners: /* @__PURE__ */ new Map(),
+	clients: /* @__PURE__ */ new WeakMap()
+}));
+const CATALOG_NOTIFICATION_METHODS = /* @__PURE__ */ new Set([
+	"thread/started",
+	"turn/started",
+	"turn/completed",
+	"thread/archived",
+	"thread/deleted",
+	"thread/unarchived",
+	"thread/reverted",
+	"thread/name/updated",
+	"thread/status/changed",
+	"thread/settings/updated"
+]);
+function notifyEphemeralThread(homeKey, rawId) {
+	const id = boundedCatalogString(rawId, 256);
+	if (!id) return;
+	for (const listener of getCatalogEvents().listeners.get(homeKey) ?? []) try {
+		listener.onEphemeralThread?.(id);
+	} catch (error) {
+		embeddedAgentLog.warn("Codex catalog ephemeral observer failed", { error });
+	}
+}
+/** Uses prepared local identity or resolves it once during client/index startup. */
+async function codexCatalogResidentHomeKey(params) {
+	if (inferCodexAppServerConnectionClass(params.startOptions) === "remote") {
+		const fingerprint = buildCodexAppServerConnectionFingerprint({
+			start: params.startOptions,
+			connectionClass: "remote"
+		}, params.agentDir);
+		return `remote:${createHash("sha256").update(fingerprint).digest("hex")}`;
+	}
+	if (params.sourceHomeId) return params.sourceHomeId;
+	const home = path.resolve(params.runtimeIdentity?.codexHome ?? resolveCodexAppServerLocalHomeDir(params.startOptions, params.agentDir));
+	return codexCatalogHomeIdFromCanonicalPath(await fs.realpath(home).catch(() => home));
+}
+function subscribeCodexCatalogEvents(homeKey, listener, callbacks = {}) {
+	const { listeners } = getCatalogEvents();
+	let homeListeners = listeners.get(homeKey);
+	if (!homeListeners) {
+		homeListeners = /* @__PURE__ */ new Set();
+		listeners.set(homeKey, homeListeners);
+	}
+	const subscription = {
+		notify: listener,
+		...callbacks
+	};
+	homeListeners.add(subscription);
+	return () => {
+		homeListeners.delete(subscription);
+		if (homeListeners.size === 0 && listeners.get(homeKey) === homeListeners) listeners.delete(homeKey);
+	};
+}
+/** Observes physical clients without extending their lease or native thread lifetime. */
+function observeCodexCatalogClient(client, params) {
+	const state = getCatalogEvents();
+	const existing = state.clients.get(client);
+	if (existing) return existing.then(() => void 0);
+	const observing = (async () => {
+		const homeKey = await codexCatalogResidentHomeKey({
+			...params,
+			runtimeIdentity: client.getRuntimeIdentity()
+		});
+		if (client.getCloseError()) return;
+		const source = codexCatalogSourceForClient(client);
+		observeCodexCatalogEphemeralThreads(source, notifyEphemeralThread.bind(void 0, homeKey));
+		const notifyLifecycle = (callback) => {
+			for (const listener of state.listeners.get(homeKey) ?? []) try {
+				listener[callback]?.(source);
+			} catch (error) {
+				embeddedAgentLog.warn("Codex catalog lifecycle observer failed", {
+					callback,
+					error
+				});
+			}
+		};
+		const readThread = async (threadId) => (await client.request("thread/read", {
+			threadId,
+			includeTurns: false
+		}, {
+			timeoutMs: 6e4,
+			catalogPreview: true
+		})).thread;
+		const stopNotifications = client.addNotificationHandler((event) => {
+			if (!CATALOG_NOTIFICATION_METHODS.has(event.method)) return;
+			for (const listener of state.listeners.get(homeKey) ?? []) listener.notify(event, readThread, source);
+		});
+		const stopClose = client.addCloseHandler(() => {
+			stopNotifications();
+			stopClose();
+			notifyLifecycle("onClose");
+		});
+		if (inferCodexAppServerConnectionClass(params.startOptions) === "remote") notifyLifecycle("onRemoteReady");
+		return {
+			homeKey,
+			source
+		};
+	})();
+	state.clients.set(client, observing);
+	return observing.then(() => void 0);
+}
+/** Acknowledged resume settings may differ from the response thread's persisted metadata. */
+async function publishCodexCatalogResume(client, response, sanitize) {
+	try {
+		const prepared = {
+			thread: projectCodexCatalogNativeThread(response.thread, sanitize),
+			cwd: boundedCatalogString(response.cwd, MAX_CWD_LENGTH),
+			modelProvider: boundedCatalogString(response.modelProvider, 500, "truncate")
+		};
+		const state = getCatalogEvents();
+		const binding = await state.clients.get(client);
+		if (!binding || binding.source.closed) return;
+		await Promise.all(Array.from(state.listeners.get(binding.homeKey) ?? [], async (listener) => {
+			try {
+				await listener.onResume?.(prepared, binding.source);
+			} catch (error) {
+				embeddedAgentLog.warn("Codex catalog resume observer failed", { error });
+			}
+		}));
+	} catch (error) {
+		embeddedAgentLog.warn("Codex catalog resume publication failed", { error });
+	}
+}
+//#endregion
+export { subscribeCodexCatalogEvents as i, observeCodexCatalogClient as n, publishCodexCatalogResume as r, codexCatalogResidentHomeKey as t };

package/dist/.setup/session-catalog-home-id-vlih0B_g.mjs

@@ -0,0 +1,22 @@
+import { createHash } from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+//#region extensions/codex/src/session-catalog-home-id.ts
+function canonicalCodexCatalogHome(value) {
+	const resolved = path.resolve(value);
+	try {
+		return fs.realpathSync.native(resolved);
+	} catch {
+		return resolved;
+	}
+}
+/** One canonical identity for catalog discovery and durable ownership rows. */
+function codexCatalogHomeId(codexHome) {
+	return codexCatalogHomeIdFromCanonicalPath(canonicalCodexCatalogHome(codexHome));
+}
+/** Hashes lifecycle-prepared paths without repeating filesystem discovery. */
+function codexCatalogHomeIdFromCanonicalPath(codexHome) {
+	return createHash("sha256").update("openclaw:codex-session-catalog-home:v1\0").update(codexHome).digest("hex");
+}
+//#endregion
+export { codexCatalogHomeIdFromCanonicalPath as n, codexCatalogHomeId as t };

package/dist/.setup/{session-catalog-index-B9_VQIUz.mjs → session-catalog-index-DwJjnF5k.mjs}

@@ -1,16 +1,18 @@
-import { C as boundedCatalogString, D as filterCatalogPageByTitle, E as codexCatalogThreadStatus, P as readControlCursor, T as codexCatalogThreadName, U as CODEX_CATALOG_MAX_ROWS, b as MAX_CWD_LENGTH, f as setCodexCatalogSource, k as normalizeLimit, l as getCodexCatalogSource, r as projectCodexCatalogNativeThread, v as CatalogParamsError } from "./session-catalog-native-projection-DowriLid.mjs";
-import { i as subscribeCodexCatalogEvents } from "./session-catalog-events-Bj6j94E_.mjs";
-import { i as retainCodexCatalogRow, n as codexCatalogRowRecency, r as compareCodexCatalogRows, t as CodexCatalogOrdering } from "./session-catalog-index-order-hcdz07yN.mjs";
-import { n as CodexCatalogPersistence, r as codexCatalogMetadataPage } from "./session-catalog-index-state-Dgh8ORJm.mjs";
-import { a as withCodexCatalogListRequest, s as CodexCatalogAvailability } from "./session-catalog-Pno1xGcl.mjs";
+import { S as readControlCursor, _ as normalizeLimit, c as MAX_CWD_LENGTH, d as boundedCatalogString, h as filterCatalogPageByTitle, m as codexCatalogThreadStatus, o as CatalogParamsError, p as codexCatalogThreadName } from "./session-catalog-parsing-CPGaPYr-.mjs";
+import { t as CODEX_CATALOG_MAX_ROWS } from "./session-catalog-limits-DDxOsQeC.mjs";
+import { i as retainCodexCatalogRow, n as codexCatalogRowRecency, r as compareCodexCatalogRows, t as CodexCatalogOrdering } from "./session-catalog-index-order-BcQpHks3.mjs";
+import { n as CodexCatalogPersistence, r as codexCatalogMetadataPage } from "./session-catalog-index-state-TeO7EyO-.mjs";
+import { i as CodexCatalogAvailability, r as withCodexCatalogListRequest } from "./session-catalog-list-request-CvtxrYSe.mjs";
+import { l as getCodexCatalogSource, p as setCodexCatalogSource, r as projectCodexCatalogNativeThread, u as hasLiveCodexCatalogSource } from "./session-catalog-native-projection-CuaFZuQE.mjs";
+import { i as subscribeCodexCatalogEvents } from "./session-catalog-events-BMCFMZw-.mjs";
 import { a as reportCodexCatalogSpawnFailure, n as findCodexAppServerSpawnError } from "./spawn-error-CL3n6MAa.mjs";
-import { CodexCatalogProjectionCapacityError, CodexCatalogProjections, a as resolveCodexCatalogRolloutFingerprint, i as readCodexCatalogRollout, mergeCodexCatalogRolloutRow, n as indexCodexCatalogRowsByRollout, o as scanCodexCatalogRollouts, projectCodexCatalogThread, r as isCodexCatalogRolloutPathCovered, t as codexCatalogRolloutLogicalPath } from "./session-catalog-projection-zK_PUsiE.mjs";
+import { CodexCatalogProjectionCapacityError, CodexCatalogProjections, a as resolveCodexCatalogRolloutFingerprint, i as readCodexCatalogRollout, mergeCodexCatalogRolloutRow, n as indexCodexCatalogRowsByRollout, o as scanCodexCatalogRollouts, projectCodexCatalogThread, r as isCodexCatalogRolloutPathCovered, t as codexCatalogRolloutLogicalPath } from "./session-catalog-projection-CGfzfP93.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-registration";
-import { setImmediate as setImmediate$1 } from "node:timers/promises";
 import { coerceErrorMessage, toErrorObject } from "openclaw/plugin-sdk/error-runtime";
+import { setImmediate as setImmediate$1 } from "node:timers/promises";
 import { sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
 //#region extensions/codex/src/session-catalog-currency.ts
 const SAFETY_INTERVAL_MS = 9e5;
@@ -24,7 +26,7 @@ var CodexCatalogCurrency = class {
 		this.nextFilesAt = 0;
 	}
 	hasActiveWork() {
-		return this.hydration !== void 0 || this.initial !== void 0 || this.running !== void 0;
+		return this.hydration !== void 0 || this.initial !== void 0 || this.running !== void 0 || this.safetyRefresh !== void 0;
 	}
 	assertRunnable() {
 		if (this.terminalFailure) throw this.terminalFailure;
@@ -54,6 +56,24 @@ var CodexCatalogCurrency = class {
 	requestNativeRefresh() {
 		this.nativeDirty = true;
 	}
+	/** Full safety walks serve catalog demand; an idle resident index does not start one. */
+	refreshNativeIfDue() {
+		if (this.closed || !this.timer || Date.now() < this.nextNativeAt) return Promise.resolve();
+		if (this.safetyRefresh) return this.safetyRefresh;
+		const refresh = async () => {
+			if (this.running) await this.running;
+			if (this.closed || Date.now() < this.nextNativeAt) return;
+			const run = () => this.options.reconcileNative(true);
+			await Promise.resolve().then(() => this.options.runBackground ? this.options.runBackground(run) : run()).catch((error) => {
+				this.options.report(new Error(`Codex catalog reconciliation failed; waiting for the next safety interval and catalog demand: ${coerceErrorMessage(error)}`, { cause: error }));
+			});
+			this.nextNativeAt = Date.now() + SAFETY_INTERVAL_MS;
+		};
+		this.safetyRefresh = refresh().finally(() => {
+			this.safetyRefresh = void 0;
+		});
+		return this.safetyRefresh;
+	}
 	start() {
 		if (this.closed || this.timer) return;
 		this.nextNativeAt = Date.now() + SAFETY_INTERVAL_MS;
@@ -61,19 +81,17 @@ var CodexCatalogCurrency = class {
 		this.timer = setInterval(() => {
 			if (this.running) return;
 			const startedAt = Date.now();
-			const full = startedAt >= this.nextNativeAt;
 			const filesDue = this.options.local && startedAt >= this.nextFilesAt;
-			if (!full && !filesDue && !this.nativeDirty) return;
-			const nativeDue = full || this.nativeDirty;
-			this.nativeDirty = false;
-			if (full) this.nextNativeAt = startedAt + SAFETY_INTERVAL_MS;
+			const nativeDue = this.nativeDirty && !this.safetyRefresh;
+			if (!filesDue && !nativeDue) return;
+			if (nativeDue) this.nativeDirty = false;
 			if (filesDue) this.nextFilesAt = startedAt + SAFETY_INTERVAL_MS;
 			const run = async () => {
 				if (filesDue) await this.options.reconcileFiles();
-				if (nativeDue) await this.options.reconcileNative(full);
+				if (nativeDue) await this.options.reconcileNative(false);
 			};
 			this.running = (this.options.runBackground ? this.options.runBackground(run) : run()).catch((error) => {
-				this.options.report(new Error(`Codex catalog reconciliation failed; waiting for new activity or the next safety cycle: ${coerceErrorMessage(error)}`, { cause: error }));
+				this.options.report(new Error(`Codex catalog reconciliation failed; waiting for new activity or the next file safety cycle: ${coerceErrorMessage(error)}`, { cause: error }));
 			}).finally(() => {
 				this.running = void 0;
 			});
@@ -94,7 +112,8 @@ var CodexCatalogCurrency = class {
 		this.timer = void 0;
 		clearTimeout(this.initial);
 		this.initial = void 0;
-		return this.running;
+		if (this.running && this.safetyRefresh) return Promise.allSettled([this.running, this.safetyRefresh]).then(() => {});
+		return this.running ?? this.safetyRefresh;
 	}
 };
 //#endregion
@@ -258,7 +277,7 @@ var CodexCatalogIndexEvents = class {
 					} catch (error) {
 						if (observedSource.closed) {
 							if (pending.source === observedSource) pending.dirty = false;
-							this.owner.report(new Error("Codex catalog observation interrupted by client closure; metadata refresh deferred to the current catalog owner", { cause: error }));
+							this.owner.report(new Error("Codex catalog observation interrupted by client closure; metadata refresh deferred to the current catalog owner", { cause: error }), "deferred");
 						} else this.owner.report(error);
 					}
 				}
@@ -386,6 +405,83 @@ var CodexCatalogObservations = class {
 	}
 };
 //#endregion
+//#region extensions/codex/src/session-catalog-status.ts
+function applyCodexCatalogLiveFields({ status: _storedStatus, activeFlags: _storedFlags, ...session }, live, settings) {
+	return {
+		...session,
+		...settings,
+		status: live?.status ?? "notLoaded",
+		...live?.activeFlags ? { activeFlags: [...live.activeFlags] } : {}
+	};
+}
+const MAX_STATUS_SOURCE_WITNESSES = 64;
+/** Equivalent broadcasts retain at most 64 source witnesses for each bounded resident row. */
+var CodexCatalogStatusIndex = class {
+	constructor() {
+		this.values = new CodexCatalogField();
+	}
+	capture() {
+		return this.values.capture();
+	}
+	update(threadId, status, source) {
+		const next = this.next(threadId, status, source);
+		if (next) this.values.update(threadId, next);
+	}
+	observe(row, revision) {
+		const session = row.page.sessions[0];
+		const source = getCodexCatalogSource(row);
+		if (session && source) {
+			const next = this.next(row.threadId, {
+				status: session.status,
+				...session.activeFlags ? { activeFlags: session.activeFlags } : {}
+			}, source);
+			if (next) this.values.observe(row.threadId, next, revision);
+		}
+	}
+	get(threadId) {
+		const current = this.values.get(threadId);
+		return current && hasLiveCodexCatalogSource(current.sources) ? current.status : void 0;
+	}
+	delete(threadId) {
+		this.values.delete(threadId);
+	}
+	invalidate(source) {
+		if (!source) {
+			this.values.invalidate();
+			return;
+		}
+		this.values.deleteWhere((entry) => {
+			entry.sources.delete(source);
+			return !hasLiveCodexCatalogSource(entry.sources);
+		});
+	}
+	next(threadId, status, source) {
+		if (source.closed) return;
+		const current = this.values.get(threadId);
+		const sources = new Set([...current?.sources ?? []].filter((witness) => !witness.closed));
+		if (status.status === "notLoaded" && current && current.status.status !== "notLoaded" && sources.size) {
+			sources.delete(source);
+			if (sources.size) return {
+				status: current.status,
+				sources
+			};
+		}
+		const flags = status.activeFlags ?? [];
+		const previousFlags = current?.status.activeFlags ?? [];
+		if (current?.status.status === status.status && flags.length === previousFlags.length && flags.every((flag, index) => flag === previousFlags[index])) {
+			if (sources.size < MAX_STATUS_SOURCE_WITNESSES) sources.add(source);
+			return {
+				status,
+				sources
+			};
+		}
+		return {
+			status,
+			sources: /* @__PURE__ */ new Set([source])
+		};
+	}
+};
+//#endregion
 //#region extensions/codex/src/session-catalog-index-query.ts
 /** Keyset pagination remains valid when the anchor row is archived or deleted. */
 function prepareCodexCatalogQuery(params, prepared) {
@@ -427,15 +523,7 @@ function prepareCodexCatalogQuery(params, prepared) {
 			continuation = frontier && (!last || compareCodexCatalogRows(frontier, last) > 0) ? frontier : last;
 		}
 		return {
-			sessions: page.flatMap((row) => row.page.sessions.map(({ status: _storedStatus, activeFlags: _storedFlags, ...session }) => {
-				const live = liveStatus.get(row.threadId);
-				return {
-					...session,
-					...liveSettings.get(row.threadId),
-					status: live?.status ?? "notLoaded",
-					...live?.activeFlags ? { activeFlags: [...live.activeFlags] } : {}
-				};
-			})),
+			sessions: page.flatMap((row) => row.page.sessions.map((session) => applyCodexCatalogLiveFields(session, liveStatus.get(row.threadId), liveSettings.get(row.threadId)))),
 			...continuation ? { nextCursor: cursor(continuation, false) } : {},
 			...first && start > 0 ? { backwardsCursor: cursor(first, true) } : {}
 		};
@@ -542,13 +630,7 @@ var CodexCatalogNativePages = class {
 				}
 				rows = selected;
 			} else if (!position.cursor && !position.backwards) previous = void 0;
-			const projected = filterCatalogPageByTitle({ sessions: rows.flatMap((row) => row.page.sessions).map(({ status: _storedStatus, activeFlags: _storedFlags, ...session }) => {
-				const live = this.status.get(session.threadId);
-				return Object.assign(session, this.settings.get(session.threadId), {
-					status: live?.status ?? "notLoaded",
-					...live?.activeFlags ? { activeFlags: [...live.activeFlags] } : {}
-				});
-			}).filter((session) => !cwd || session.cwd === cwd) }, params.searchTerm);
+			const projected = filterCatalogPageByTitle({ sessions: rows.flatMap((row) => row.page.sessions).map((session) => applyCodexCatalogLiveFields(session, this.status.get(session.threadId), this.settings.get(session.threadId))).filter((session) => !cwd || session.cwd === cwd) }, params.searchTerm);
 			const continuation = position.backwards ? previous : next;
 			if ((params.searchTerm || filterCwdLocally) && !projected.sessions.length && continuation) {
 				if (encodeCodexNativeCursor(continuation) === encodeCodexNativeCursor(position)) throw new CatalogParamsError("Codex catalog repeated a native continuation");
@@ -600,17 +682,10 @@ var CodexCatalogSettingsIndex = class {
 	}
 	get(threadId) {
 		const current = this.values.get(threadId);
-		if (current) {
-			for (const source of current.sources) if (!source.closed) return current.settings;
-		}
+		return current && hasLiveCodexCatalogSource(current.sources) ? current.settings : void 0;
 	}
 	hasLiveCwd() {
-		return this.values.some(({ settings, sources }) => {
-			if (settings.cwd) {
-				for (const source of sources) if (!source.closed) return true;
-			}
-			return false;
-		});
+		return this.values.some(({ settings, sources }) => Boolean(settings.cwd) && hasLiveCodexCatalogSource(sources));
 	}
 	delete(threadId) {
 		this.values.delete(threadId);
@@ -618,8 +693,7 @@ var CodexCatalogSettingsIndex = class {
 	withdraw(threadId, source) {
 		const current = this.values.get(threadId);
 		if (!current?.sources.delete(source)) return;
-		for (const witness of current.sources) if (!witness.closed) return;
-		this.values.delete(threadId);
+		if (!hasLiveCodexCatalogSource(current.sources)) this.values.delete(threadId);
 	}
 	invalidate(source) {
 		if (!source) {
@@ -628,84 +702,11 @@ var CodexCatalogSettingsIndex = class {
 		}
 		this.values.deleteWhere((entry) => {
 			entry.sources.delete(source);
-			for (const witness of entry.sources) if (!witness.closed) return false;
-			return true;
+			return !hasLiveCodexCatalogSource(entry.sources);
 		});
 	}
 };
 //#endregion
-//#region extensions/codex/src/session-catalog-status.ts
-const MAX_STATUS_SOURCE_WITNESSES = 64;
-/** Equivalent broadcasts retain at most 64 source witnesses for each bounded resident row. */
-var CodexCatalogStatusIndex = class {
-	constructor() {
-		this.values = new CodexCatalogField();
-	}
-	capture() {
-		return this.values.capture();
-	}
-	update(threadId, status, source) {
-		const next = this.next(threadId, status, source);
-		if (next) this.values.update(threadId, next);
-	}
-	observe(row, revision) {
-		const session = row.page.sessions[0];
-		const source = getCodexCatalogSource(row);
-		if (session && source) {
-			const next = this.next(row.threadId, {
-				status: session.status,
-				...session.activeFlags ? { activeFlags: session.activeFlags } : {}
-			}, source);
-			if (next) this.values.observe(row.threadId, next, revision);
-		}
-	}
-	get(threadId) {
-		const current = this.values.get(threadId);
-		if (current) {
-			for (const source of current.sources) if (!source.closed) return current.status;
-		}
-	}
-	delete(threadId) {
-		this.values.delete(threadId);
-	}
-	invalidate(source) {
-		if (!source) {
-			this.values.invalidate();
-			return;
-		}
-		this.values.deleteWhere((entry) => {
-			entry.sources.delete(source);
-			for (const witness of entry.sources) if (!witness.closed) return false;
-			return true;
-		});
-	}
-	next(threadId, status, source) {
-		if (source.closed) return;
-		const current = this.values.get(threadId);
-		const sources = new Set([...current?.sources ?? []].filter((witness) => !witness.closed));
-		if (status.status === "notLoaded" && current && current.status.status !== "notLoaded" && sources.size) {
-			sources.delete(source);
-			if (sources.size) return {
-				status: current.status,
-				sources
-			};
-		}
-		const flags = status.activeFlags ?? [];
-		const previousFlags = current?.status.activeFlags ?? [];
-		if (current?.status.status === status.status && flags.length === previousFlags.length && flags.every((flag, index) => flag === previousFlags[index])) {
-			if (sources.size < MAX_STATUS_SOURCE_WITNESSES) sources.add(source);
-			return {
-				status,
-				sources
-			};
-		}
-		return {
-			status,
-			sources: /* @__PURE__ */ new Set([source])
-		};
-	}
-};
-//#endregion
 //#region extensions/codex/src/session-catalog-index.ts
 /** One home owns resident queries and authoritative overflow discovery. */
 var CodexCatalogIndex = class {
@@ -758,7 +759,7 @@ var CodexCatalogIndex = class {
 				this.currency.requestNativeRefresh();
 				this.remove(id);
 			},
-			report: (error) => this.report(error)
+			report: (error, disposition) => this.report(error, disposition)
 		});
 		this.unsubscribe = subscribeCodexCatalogEvents(options.homeId, (event, readThread, source) => this.events.handle(event, readThread, source), {
 			onEphemeralThread: (id) => this.remove(id),
@@ -789,8 +790,8 @@ var CodexCatalogIndex = class {
 			throw error;
 		}
 	}
-	report(error) {
-		if (!this.closed && !this.currency.stopForTerminalFailure(error)) embeddedAgentLog.warn("Codex resident catalog background update failed", { error });
+	report(error, disposition) {
+		if (!this.closed && !this.currency.stopForTerminalFailure(error)) embeddedAgentLog.warn(disposition === "deferred" ? "Codex resident catalog metadata refresh interrupted; deferred for automatic recovery" : "Codex resident catalog background update failed", { error });
 	}
 	withName(row) {
 		const known = this.names.get(row.threadId);
@@ -1135,7 +1136,10 @@ var CodexCatalogIndex = class {
 				const ordered = this.ordering.read(this.rows);
 				const page = query?.(ordered, this.liveStatus, this.liveSettings, this.availability);
 				if (cursor.kind === "native" || this.overflow && (params.cwd || params.searchTerm || page && !page.nextCursor)) return await this.nativePages.list(params, cursor, this.options, request);
-				if (page) return page;
+				if (page) {
+					this.currency.refreshNativeIfDue();
+					return page;
+				}
 				await this.availability.next(expiresAt);
 			}
 		});

package/dist/.setup/{session-catalog-index-order-hcdz07yN.mjs → session-catalog-index-order-BcQpHks3.mjs}

@@ -1,4 +1,4 @@
-import { U as CODEX_CATALOG_MAX_ROWS } from "./session-catalog-native-projection-DowriLid.mjs";
+import { t as CODEX_CATALOG_MAX_ROWS } from "./session-catalog-limits-DDxOsQeC.mjs";
 //#region extensions/codex/src/session-catalog-index-order.ts
 function codexCatalogRowRecency(row) {
 	return row.recencyAt ?? row.updatedAt ?? 0;

package/dist/.setup/{session-catalog-index-state-Dgh8ORJm.mjs → session-catalog-index-state-TeO7EyO-.mjs}

@@ -1,5 +1,6 @@
-import { A as parseCatalogPage, W as detachCodexCatalogString } from "./session-catalog-native-projection-DowriLid.mjs";
-import { i as retainCodexCatalogRow } from "./session-catalog-index-order-hcdz07yN.mjs";
+import { v as parseCatalogPage } from "./session-catalog-parsing-CPGaPYr-.mjs";
+import { n as detachCodexCatalogString } from "./session-catalog-limits-DDxOsQeC.mjs";
+import { i as retainCodexCatalogRow } from "./session-catalog-index-order-BcQpHks3.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import { setImmediate } from "node:timers/promises";

package/dist/.setup/session-catalog-limits-DDxOsQeC.mjs

@@ -0,0 +1,14 @@
+import { t as __exportAll } from "./session-binding-sidecars-jo6H8dFr.mjs";
+//#region extensions/codex/src/session-catalog-limits.ts
+var session_catalog_limits_exports = /* @__PURE__ */ __exportAll({
+	CODEX_CATALOG_MAX_ROWS: () => CODEX_CATALOG_MAX_ROWS,
+	CODEX_CATALOG_MAX_STATE_KEY_BYTES: () => 512,
+	detachCodexCatalogString: () => detachCodexCatalogString
+});
+const CODEX_CATALOG_MAX_ROWS = 2e4;
+/** Preserve UTF-16 code units without retaining an oversized source string. */
+function detachCodexCatalogString(value) {
+	return Buffer.from(value, "utf16le").toString("utf16le");
+}
+//#endregion
+export { detachCodexCatalogString as n, session_catalog_limits_exports as r, CODEX_CATALOG_MAX_ROWS as t };