@openclaw/codex 2026.9.5 → 2026.9.6

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

@@ -1,8 +1,8 @@
-import { p as sessionBindingIdentity } from "./session-binding-record-TH3xA0zj.mjs";
-import { F as requireBoundThread, g as CatalogParamsError, x as boundedCatalogString } from "./session-catalog-native-projection-ChV3cCtm.mjs";
+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 { n as codexUpstreamBaseline, t as codexLastTerminalTurnId } from "./session-upstream-marker-D15C9NHp.mjs";
-import { i as reclaimCurrentCodexSessionGeneration } from "./session-binding-_0W_fHRr.mjs";
-import { adoptionSessionKeyRest, continueOperations, runSessionActionExclusive } from "./session-catalog-node-adoption-BVRsYOSh.mjs";
+import { i as reclaimCurrentCodexSessionGeneration } from "./session-binding-Cm0apEbd.mjs";
+import { adoptionSessionKeyRest, continueOperations, runSessionActionExclusive } from "./session-catalog-node-adoption-ITddWx_X.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
@@ -32,36 +32,68 @@ function readCodexSupervisionMarker(entry) {
 	};
 }
 async function listAdoptedSessionEntries(params) {
-	const adopted = /* @__PURE__ */ new Map();
-	for (const { agentId, entry, sessionKey } of listSessionCatalogEntries({
+	const entries = listSessionCatalogEntries({
 		...params.agentId ? { agentId: params.agentId } : {},
 		config: params.config ?? {},
 		runtime: params.runtime,
 		sessionEntries: params.sessionEntries
-	})) {
+	});
+	const candidateForEntry = ({ agentId, entry, sessionKey }) => {
 		const sessionKeyRest = adoptionSessionKeyRest(sessionKey);
 		const marker = readCodexSupervisionMarker(entry);
-		if (!sessionKeyRest.startsWith(CODEX_SUPERVISION_SESSION_KEY_PREFIX) || !marker || entry.initializationPending === true || entry.agentHarnessId !== "codex" || entry.modelSelectionLocked !== true) continue;
+		if (!sessionKeyRest.startsWith(CODEX_SUPERVISION_SESSION_KEY_PREFIX) || !marker || entry.initializationPending === true || entry.agentHarnessId !== "codex" || entry.modelSelectionLocked !== true) return;
 		const sessionId = entry.sessionId?.trim();
-		if (!sessionId) continue;
-		const binding = params.bindingStore.read(sessionBindingIdentity({
-			sessionId,
+		if (!sessionId) return;
+		return {
+			agentId,
 			sessionKey,
-			config: params.config
-		}));
-		const sourceThreadId = binding?.supervisionSourceThreadId?.trim();
-		const boundThreadId = binding?.threadId.trim();
-		if (binding?.connectionScope !== "supervision" || !sourceThreadId || !boundThreadId || sessionKeyRest !== adoptionSessionKey(sourceThreadId, marker.sourceHomeId)) continue;
-		const sourceKey = sessionCatalogAdoptedSourceKey(marker.sourceHomeId ?? "gateway:local", sourceThreadId);
-		if (adopted.has(sourceKey)) throw new Error(`multiple OpenClaw sessions adopt Codex thread ${sourceThreadId} from the same home`);
-		adopted.set(sourceKey, {
-			key: sessionKey,
+			sessionKeyRest,
 			sessionId,
-			agentId,
-			boundThreadId
-		});
+			marker,
+			identity: sessionBindingIdentity({
+				sessionId,
+				sessionKey,
+				config: params.config
+			})
+		};
+	};
+	function* candidates() {
+		for (const entry of entries) {
+			const candidate = candidateForEntry(entry);
+			if (candidate) yield candidate;
+		}
+	}
+	const collect = (selected, readBinding = (identity) => params.bindingStore.read(identity)) => {
+		const adopted = /* @__PURE__ */ new Map();
+		for (const { agentId, sessionKey, sessionKeyRest, sessionId, marker, identity } of selected) {
+			const binding = readBinding(identity);
+			const sourceThreadId = binding?.supervisionSourceThreadId?.trim();
+			const boundThreadId = binding?.threadId.trim();
+			if (binding?.connectionScope !== "supervision" || !sourceThreadId || !boundThreadId || sessionKeyRest !== adoptionSessionKey(sourceThreadId, marker.sourceHomeId)) continue;
+			const sourceKey = sessionCatalogAdoptedSourceKey(marker.sourceHomeId ?? "gateway:local", sourceThreadId);
+			if (adopted.has(sourceKey)) throw new Error(`multiple OpenClaw sessions adopt Codex thread ${sourceThreadId} from the same home`);
+			adopted.set(sourceKey, {
+				key: sessionKey,
+				sessionId,
+				agentId,
+				boundThreadId
+			});
+		}
+		return adopted;
+	};
+	if (!params.bindingStore.readMany) return collect(candidates());
+	let prepared;
+	try {
+		prepared = [...candidates()];
+	} catch {
+		return collect(candidates());
+	}
+	const bindings = params.bindingStore.readMany(prepared.map(({ identity }) => identity));
+	try {
+		return collect(prepared, () => bindings.next().value);
+	} finally {
+		bindings.return(void 0);
 	}
-	return adopted;
 }
 async function findAdoptedSessionEntry(params) {
 	const adopted = await listAdoptedSessionEntries(params);
@@ -119,7 +151,7 @@ async function createOrReuseAdoptedSession(params) {
 			sourceThreadId: params.sourceThread.id,
 			...params.sourceHomeId ? { sourceHomeId: params.sourceHomeId } : {}
 		};
-		const { createImportedCodexSession } = await import("./session-history-import-JHXT5Xfi.mjs");
+		const { createImportedCodexSession } = await import("./session-history-import-D-3wAgOP.mjs");
 		const created = await createImportedCodexSession({
 			runtime: params.api.runtime,
 			bindingStore: params.bindingStore,

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

@@ -1,9 +1,9 @@
-import { p as sessionBindingIdentity } from "./session-binding-record-TH3xA0zj.mjs";
-import { g as CatalogParamsError } from "./session-catalog-native-projection-ChV3cCtm.mjs";
-import { t as assertCodexArchiveDescendantsUnowned } from "./thread-archive-guard-jmecf6OJ.mjs";
-import "./session-binding-_0W_fHRr.mjs";
-import { runSessionActionExclusive } from "./session-catalog-node-adoption-BVRsYOSh.mjs";
-import { isAdoptionSessionKeyForThread, requireIdleThread } from "./session-catalog-adoption-CR_whkEW.mjs";
+import { m as sessionBindingIdentity } from "./session-binding-record-BGoz8wOK.mjs";
+import { v as CatalogParamsError } from "./session-catalog-native-projection-DowriLid.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 { listAgentIds } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { sessionCatalogAdoptedSourceKey } from "openclaw/plugin-sdk/session-catalog";
 //#region extensions/codex/src/session-catalog-archive.ts

package/dist/.setup/{session-catalog-events-jMcYfQyd.mjs → session-catalog-events-Bj6j94E_.mjs}

@@ -1,14 +1,116 @@
-import { n as defineCodexBuildState } from "./build-state-Xx9ybZqa.mjs";
-import { g as resolveCodexAppServerLocalHomeDir, m as isJsonObject, r as inferCodexAppServerConnectionClass } from "./config-security-BRQ2mgW9.mjs";
-import { o as codexCatalogSourceForClient, r as projectCodexCatalogNativeThread, v as MAX_CWD_LENGTH, x as boundedCatalogString } from "./session-catalog-native-projection-ChV3cCtm.mjs";
-import { t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-BOxKP7db.mjs";
+import { n as defineCodexBuildState } from "./build-state-C7EnDVgr.mjs";
+import { f as resolveCodexAppServerLocalHomeDir, r as inferCodexAppServerConnectionClass } from "./config-security-BEReZ6go.mjs";
+import { C as boundedCatalogString, b as MAX_CWD_LENGTH, r as projectCodexCatalogNativeThread, s as codexCatalogSourceForClient, u as observeCodexCatalogEphemeralThreads } from "./session-catalog-native-projection-DowriLid.mjs";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
+import { t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-B2CsSdnV.mjs";
 import { createHash } from "node:crypto";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-registration";
 import fs from "node:fs";
 import path from "node:path";
 import fs$1 from "node:fs/promises";
-import { createZstdDecompress } from "node:zlib";
 import { root } from "openclaw/plugin-sdk/file-access-runtime";
+import { createZstdDecompress } from "node:zlib";
+//#region extensions/codex/src/app-server/shared-client-lifecycle.ts
+/** Client ownership and synchronous retirement, independent of startup/auth execution. */
+const createCodexAppServerStartupLifetime = () => ({
+	controller: new AbortController(),
+	pending: /* @__PURE__ */ new Set()
+});
+const getSharedCodexAppServerClientState = defineCodexBuildState("openclaw.codexAppServerClientState", () => ({
+	clients: /* @__PURE__ */ new Map(),
+	liveClients: /* @__PURE__ */ new Set(),
+	isolatedClients: /* @__PURE__ */ new Set(),
+	entriesByClient: /* @__PURE__ */ new WeakMap(),
+	desktopGenerationDrainChecks: /* @__PURE__ */ new Set(),
+	startup: createCodexAppServerStartupLifetime(),
+	startMetadata: /* @__PURE__ */ new WeakMap()
+}));
+function hasActiveSharedCodexAppServerWork() {
+	const state = getSharedCodexAppServerClientState();
+	if (state.startup.pending.size > 0 || state.startup.controller.signal.aborted) return true;
+	for (const entry of state.clients.values()) if (entry.activeLeases > 0 || entry.pendingAcquires > 0) return true;
+	for (const client of state.liveClients) {
+		const entry = state.entriesByClient.get(client);
+		if (entry && (entry.activeLeases > 0 || entry.pendingAcquires > 0)) return true;
+	}
+	return false;
+}
+function getCurrentSharedClientEntry(client) {
+	const state = getSharedCodexAppServerClientState();
+	const entry = client ? state.entriesByClient.get(client) : void 0;
+	return entry && entry.client === client && state.clients.get(entry.key) === entry ? entry : void 0;
+}
+/**
+* Retires a matching shared client. Default is graceful: detach from the map
+* (future acquisitions get a fresh client) and close once leases drain.
+* `failActiveLeases` is for suspect clients only (timed-out turns): it closes
+* the physical connection immediately so co-leased attempts hit the normal
+* client-closed retry path, and pending acquires reject instead of leasing
+* the poisoned process. Routine cleanup must NOT use it — it would abort
+* healthy sibling turns on a working client.
+*/
+function retireSharedCodexAppServerClientIfCurrent(client, opts) {
+	if (!client) return;
+	const state = getSharedCodexAppServerClientState();
+	const currentEntry = getCurrentSharedClientEntry(client);
+	const entry = currentEntry ?? state.entriesByClient.get(client);
+	if (!entry || entry.client !== client && !entry.closeError) return;
+	if (currentEntry) {
+		state.clients.delete(entry.key);
+		entry.closeWhenIdle = true;
+	}
+	if (opts?.failActiveLeases && (currentEntry || !entry.closeError)) {
+		entry.closeError = /* @__PURE__ */ new Error("codex app-server client is closed");
+		return {
+			activeLeases: entry.activeLeases,
+			closed: closeRetiredSharedClientEntry(entry)
+		};
+	}
+	return {
+		activeLeases: entry.activeLeases,
+		closed: currentEntry ? closeRetiredSharedClientEntryIfIdle(entry) : false
+	};
+}
+/** Gracefully retires exact clients attached to an older desktop generation. */
+function retireSharedCodexAppServerClientsBeforeDesktopGeneration(generation) {
+	const state = getSharedCodexAppServerClientState();
+	for (const entry of state.clients.values()) {
+		const client = entry.client;
+		const attached = client ? state.startMetadata.get(client) : void 0;
+		if (client && attached?.desktopGeneration && attached.desktopGeneration.epoch < generation.epoch) retireSharedCodexAppServerClientIfCurrent(client);
+	}
+}
+function closeRetiredSharedClientEntryIfIdle(entry) {
+	if (!entry.closeWhenIdle || entry.activeLeases > 0 || entry.pendingAcquires > 0 || !entry.client) return false;
+	entry.closeWhenIdle = false;
+	return closeRetiredSharedClientEntry(entry);
+}
+function closeRetiredSharedClientEntry(entry) {
+	const client = entry.client;
+	if (!client) return false;
+	entry.client = void 0;
+	client.close();
+	return true;
+}
+//#endregion
+//#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
 //#region extensions/codex/src/session-catalog-provenance.ts
 const MAX_SESSION_META_BYTES = 1048576;
 const SESSION_META_READ_CHUNK_BYTES = 65536;
@@ -108,24 +210,6 @@ async function isOpenClawManagedCodexThread(thread, localSessionsRoot, diagnosti
 	}
 }
 //#endregion
-//#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
 //#region extensions/codex/src/session-catalog-events.ts
 const getCatalogEvents = defineCodexBuildState("openclaw.codexCatalogEvents", () => ({
 	listeners: /* @__PURE__ */ new Map(),
@@ -143,6 +227,15 @@ const CATALOG_NOTIFICATION_METHODS = /* @__PURE__ */ new Set([
 	"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") {
@@ -185,6 +278,7 @@ function observeCodexCatalogClient(client, params) {
 		});
 		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);
@@ -198,7 +292,10 @@ function observeCodexCatalogClient(client, params) {
 		const readThread = async (threadId) => (await client.request("thread/read", {
 			threadId,
 			includeTurns: false
-		}, { timeoutMs: 6e4 })).thread;
+		}, {
+			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);
@@ -247,4 +344,4 @@ async function publishPreparedResume(client, response) {
 	}
 }
 //#endregion
-export { codexCatalogHomeId as a, readCodexSessionMeta as c, subscribeCodexCatalogEvents as i, observeCodexCatalogClient as n, codexCatalogHomeIdFromCanonicalPath as o, publishCodexCatalogResume as r, isOpenClawManagedCodexThread as s, codexCatalogResidentHomeKey as t };
+export { isOpenClawManagedCodexThread as a, codexCatalogHomeIdFromCanonicalPath as c, createCodexAppServerStartupLifetime as d, getCurrentSharedClientEntry as f, retireSharedCodexAppServerClientsBeforeDesktopGeneration as g, retireSharedCodexAppServerClientIfCurrent as h, subscribeCodexCatalogEvents as i, closeRetiredSharedClientEntry as l, hasActiveSharedCodexAppServerWork as m, observeCodexCatalogClient as n, readCodexSessionMeta as o, getSharedCodexAppServerClientState as p, publishCodexCatalogResume as r, codexCatalogHomeId as s, codexCatalogResidentHomeKey as t, closeRetiredSharedClientEntryIfIdle as u };