@openclaw/codex 2026.10.5-beta.3 → 2026.10.10-beta.1

package/dist/.setup/session-cancellation-DLBSJO5n.mjs

@@ -0,0 +1,43 @@
+import { T as retainSharedCodexAppServerClientByInstanceId } from "./auth-cache-key-CVcYw8HD.mjs";
+import "./shared-client-CE_uY0A1.mjs";
+import { t as isSameCodexAppServerThreadOwner } from "./thread-ownership-t6Y9fLQS.mjs";
+import { t as codexNativeSubagentMonitorRuntime } from "./native-subagent-monitor-CFE7b4oC.mjs";
+//#region extensions/codex/src/app-server/session-cancellation.ts
+/** Stop owns admitted descendants, without retiring the session or its native history. */
+async function withCodexSessionDescendantCancellation(bindingStore, params, run) {
+	const identity = {
+		kind: "session",
+		agentId: params.agentId,
+		sessionKey: params.sessionKey,
+		sessionId: params.sessionId
+	};
+	params.assertCurrent();
+	const binding = await bindingStore.readAsync(identity);
+	params.assertCurrent();
+	if (!binding?.clientId) return run(async () => ({
+		killed: 0,
+		cancelledRequesters: []
+	}));
+	const lease = await retainSharedCodexAppServerClientByInstanceId(binding.clientId, { waitForExit: false });
+	const assertCurrent = () => {
+		params.assertCurrent();
+		const current = bindingStore.read(identity);
+		if (!current || !isSameCodexAppServerThreadOwner(current, binding)) throw new Error("Codex descendant cancellation binding changed");
+	};
+	try {
+		assertCurrent();
+		if (!lease) return run(async () => ({
+			killed: 0,
+			cancelledRequesters: []
+		}));
+		return await codexNativeSubagentMonitorRuntime.withDescendantCancellation(lease.client, {
+			...params,
+			parentThreadId: binding.threadId,
+			assertCurrent
+		}, run);
+	} finally {
+		await lease?.release();
+	}
+}
+//#endregion
+export { withCodexSessionDescendantCancellation };

package/dist/.setup/{session-catalog-adoption-Ca3OYGYM.mjs → session-catalog-adoption-ppsLlVLB.mjs}

@@ -1,8 +1,8 @@
-import { T as requireBoundThread, d as boundedCatalogString, o as CatalogParamsError } from "./session-catalog-parsing-DkeoVn60.mjs";
-import { m as sessionBindingIdentity } from "./session-binding-record-DU_0biMD.mjs";
+import { T as requireBoundThread, d as boundedCatalogString, o as CatalogParamsError } from "./session-catalog-parsing-V6jyFg9g.mjs";
+import { g as sessionBindingIdentity } from "./session-binding-record-C_THntMe.mjs";
 import { n as codexUpstreamBaseline, t as codexLastTerminalTurnId } from "./session-upstream-marker-D15C9NHp.mjs";
-import { r as reclaimCurrentCodexSessionGeneration } from "./session-binding-JEHNMPsr.mjs";
-import { adoptionSessionKeyRest, catalogSessionActions } from "./session-catalog-node-adoption-BdP9Zjqo.mjs";
+import { r as reclaimCurrentCodexSessionGeneration } from "./session-binding-BgsWcbdY.mjs";
+import { adoptionSessionKeyRest, catalogSessionActions } from "./session-catalog-node-adoption-e9v8mGgx.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
@@ -60,17 +60,23 @@ async function listAdoptedSessionEntries(params) {
 			};
 		}
 	}
-	const collect = async (selected, readBinding = async (identity) => {
-		const bindings = params.bindingStore.readMany([identity]);
-		try {
-			return (await bindings.next()).value;
-		} finally {
-			await bindings.return(void 0);
-		}
-	}) => {
+	const revision = params.sessionEntries?.revision;
+	const cached = revision ? adoptionCandidatesByRevision.get(revision) : void 0;
+	let prepared;
+	if (cached && cached.config === params.config && cached.agentId === params.agentId) prepared = cached.candidates;
+	else {
+		prepared = [...candidates()];
+		if (revision) adoptionCandidatesByRevision.set(revision, {
+			config: params.config,
+			agentId: params.agentId,
+			candidates: prepared
+		});
+	}
+	const bindings = params.bindingStore.readMany(prepared.map(({ identity }) => identity));
+	try {
 		const adopted = /* @__PURE__ */ new Map();
-		for (const { agentId, sessionKey, sessionKeyRest, sessionId, marker, identity } of selected) {
-			const binding = await readBinding(identity);
+		for (const { agentId, sessionKey, sessionKeyRest, sessionId, marker } of prepared) {
+			const binding = (await bindings.next()).value;
 			const sourceThreadId = binding?.supervisionSourceThreadId?.trim();
 			const boundThreadId = binding?.threadId.trim();
 			if (binding?.connectionScope !== "supervision" || !sourceThreadId || !boundThreadId || sessionKeyRest !== adoptionSessionKey(sourceThreadId, marker.sourceHomeId)) continue;
@@ -84,26 +90,6 @@ async function listAdoptedSessionEntries(params) {
 			});
 		}
 		return adopted;
-	};
-	const revision = params.sessionEntries?.revision;
-	const cached = revision ? adoptionCandidatesByRevision.get(revision) : void 0;
-	let prepared;
-	try {
-		if (cached && cached.config === params.config && cached.agentId === params.agentId) prepared = cached.candidates;
-		else {
-			prepared = [...candidates()];
-			if (revision) adoptionCandidatesByRevision.set(revision, {
-				config: params.config,
-				agentId: params.agentId,
-				candidates: prepared
-			});
-		}
-	} catch {
-		return collect(candidates());
-	}
-	const bindings = params.bindingStore.readMany(prepared.map(({ identity }) => identity));
-	try {
-		return await collect(prepared, async () => (await bindings.next()).value);
 	} finally {
 		await bindings.return(void 0);
 	}
@@ -130,7 +116,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 = params.bindingStore.read(params.identity);
+	const existing = await params.bindingStore.readAsync(params.identity);
 	params.initialization.assertCurrent();
 	if (existing) {
 		if (matchesPendingAdoptionBinding(existing, params)) return;
@@ -164,7 +150,7 @@ async function createOrReuseAdoptedSession(params) {
 			sourceThreadId: params.sourceThread.id,
 			...params.sourceHomeId ? { sourceHomeId: params.sourceHomeId } : {}
 		};
-		const { createImportedCodexSession } = await import("./session-history-import-CaO8s6ta.mjs");
+		const { createImportedCodexSession } = await import("./session-history-import-BwPKwcNi.mjs");
 		const created = await createImportedCodexSession({
 			runtime: params.api.runtime,
 			bindingStore: params.bindingStore,
@@ -229,11 +215,11 @@ async function continueLocalCodexSessionInner(params) {
 		const boundThread = await params.control.readThread(boundThreadId, true);
 		if (boundThread.id !== boundThreadId) throw new Error("Codex app-server returned a different thread than requested");
 		const changedError = () => new CatalogParamsError("Codex OpenClaw session changed before it could be opened. Retry.");
-		if (!await params.api.runtime.agent.session.patchSessionEntry({
+		if (!await params.api.runtime.agent.session.prepareSessionEntryPatch({
 			sessionKey: existing.key,
 			readConsistency: "latest",
 			preserveActivity: true,
-			update: (entry) => {
+			prepare: (entry) => {
 				if (entry.sessionId?.trim() !== existing.sessionId || entry.initializationPending === true || entry.agentHarnessId !== "codex" || entry.modelSelectionLocked !== true) throw changedError();
 				return {
 					archivedAt: void 0,

package/dist/.setup/{session-catalog-archive-Bv6gV7x9.mjs → session-catalog-archive-CqLRHJ6z.mjs}

@@ -1,22 +1,20 @@
-import { o as CatalogParamsError } from "./session-catalog-parsing-DkeoVn60.mjs";
-import { m as sessionBindingIdentity } from "./session-binding-record-DU_0biMD.mjs";
-import { t as assertCodexArchiveDescendantsUnowned } from "./thread-archive-guard-LKdwQKyr.mjs";
-import "./session-binding-JEHNMPsr.mjs";
-import { catalogSessionActions } from "./session-catalog-node-adoption-BdP9Zjqo.mjs";
-import { isAdoptionSessionKeyForThread, requireIdleThread } from "./session-catalog-adoption-Ca3OYGYM.mjs";
+import { o as CatalogParamsError } from "./session-catalog-parsing-V6jyFg9g.mjs";
+import { g as sessionBindingIdentity } from "./session-binding-record-C_THntMe.mjs";
+import { t as assertCodexArchiveDescendantsUnowned } from "./thread-archive-guard-BWjSsA92.mjs";
+import "./session-binding-BgsWcbdY.mjs";
+import { catalogSessionActions } from "./session-catalog-node-adoption-e9v8mGgx.mjs";
+import { isAdoptionSessionKeyForThread, requireIdleThread } from "./session-catalog-adoption-ppsLlVLB.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
-function assertNoPendingSupervisionBranch(params) {
-	const adoptedEntries = [params.agentId, ...listAgentIds(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));
+async function assertNoPendingSupervisionBranch(params) {
+	const agentIds = [params.agentId, ...listAgentIds(params.config).filter((agentId) => agentId !== params.agentId)];
+	const adoptedEntries = (await Promise.all(agentIds.map((agentId) => params.runtime.agent.session.listSessionEntriesAsync({ agentId })))).flat().filter((candidate) => isAdoptionSessionKeyForThread(candidate.sessionKey, params.threadId, params.sourceHomeId) || params.sourceHomeId !== void 0 && params.allowLegacy === true && isAdoptionSessionKeyForThread(candidate.sessionKey, params.threadId));
 	for (const adopted of adoptedEntries) {
 		if (adopted.entry.initializationPending === true) throw new CatalogParamsError("Codex session cannot be archived while its OpenClaw branch is initializing");
 		const sessionId = adopted.entry.sessionId?.trim();
 		if (!sessionId) continue;
-		const binding = params.bindingStore.read(sessionBindingIdentity({
+		const binding = await params.bindingStore.readAsync(sessionBindingIdentity({
 			sessionId,
 			sessionKey: adopted.sessionKey,
 			config: params.config
@@ -27,7 +25,7 @@ function assertNoPendingSupervisionBranch(params) {
 /** Archives one inactive Gateway-local Codex thread after a fresh status read. */
 async function archiveLocalCodexSession(params) {
 	return await catalogSessionActions.enqueue(sessionCatalogAdoptedSourceKey(params.hostId ?? "gateway:local", params.threadId), () => params.bindingStore.withThreadArchiveFence(() => params.control.withPinnedConnection(async (control) => {
-		assertNoPendingSupervisionBranch(params);
+		await 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");

package/dist/.setup/{session-catalog-events-DujfzcAY.mjs → session-catalog-events-DK0opVp3.mjs}

@@ -1,11 +1,11 @@
-import { c as MAX_CWD_LENGTH, d as boundedCatalogString } from "./session-catalog-parsing-DkeoVn60.mjs";
-import { n as defineCodexBuildState } from "./build-state-sjOWPg_o.mjs";
+import { c as MAX_CWD_LENGTH, d as boundedCatalogString } from "./session-catalog-parsing-V6jyFg9g.mjs";
+import { n as defineCodexBuildState } from "./build-state-VcujMRqP.mjs";
 import { r as inferCodexAppServerConnectionClass } from "./config-security-clxAZYWX.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-Bg9DbDI6.mjs";
-import { n as codexCatalogSourceForClient, o as observeCodexCatalogEphemeralThreads } from "./session-catalog-source-yQpy2Y6b.mjs";
-import { r as projectCodexCatalogNativeThread } from "./session-catalog-native-projection-BY2zMkMO.mjs";
+import { t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-DRb-niJc.mjs";
+import { a as observeCodexCatalogEphemeralThreads, n as codexCatalogSourceForClient } from "./session-catalog-source-DqyuNxCe.mjs";
+import { r as projectCodexCatalogNativeThread } from "./session-catalog-native-projection-G3lSDYYG.mjs";
 import { createHash } from "node:crypto";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-registration";
 import path from "node:path";