@openclaw/codex 2026.8.1-beta.2 → 2026.9.1-beta.1

package/dist/{thread-ownership-6kOQHlyC.js → thread-ownership-DZeuKH1j.js}

@@ -1,5 +1,5 @@
-import { K as releaseCodexAppServerLiveThread, W as isCodexAppServerLiveThreadClaimed, d as retainSharedCodexAppServerClientByInstanceId, q as retainCodexAppServerLiveThread } from "./shared-client-kIBbGjk4.js";
-import { a as closeCodexStartupClientBestEffort, d as unsubscribeCodexThreadBestEffort, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-DMLXUfa8.js";
+import { $ as releaseCodexAppServerLiveThread, Z as isCodexAppServerLiveThreadClaimed, et as retainCodexAppServerLiveThread, h as retainSharedCodexAppServerClientByInstanceId } from "./shared-client-DKz23hHY.js";
+import { a as closeCodexStartupClientBestEffort, d as unsubscribeCodexThreadBestEffort, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-bfsmcQ6m.js";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 //#region extensions/codex/src/app-server/thread-ownership.ts
 const nativeThreadOwners = new KeyedAsyncQueue();

package/dist/{thread-resume-CPrJNQVM.js → thread-resume-BE9qNEW0.js}

@@ -1,6 +1,6 @@
-import { F as isCodexAppServerPrewriteRequestCancellationError, s as isCodexAppServerStartSelectionChangedError, z as CodexAppServerRpcError } from "./shared-client-kIBbGjk4.js";
-import { i as assertCodexThreadResumeSubscription, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-DMLXUfa8.js";
-import { i as assertCodexThreadResumeResponse } from "./protocol-validators-B4F7L8Rf.js";
+import { B as isCodexAppServerPrewriteRequestCancellationError, G as CodexAppServerRpcError, c as isCodexAppServerStartSelectionChangedError } from "./shared-client-DKz23hHY.js";
+import { i as assertCodexThreadResumeSubscription, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-bfsmcQ6m.js";
+import { i as assertCodexThreadResumeResponse } from "./protocol-validators-VeJxxJ0U.js";
 //#region extensions/codex/src/app-server/thread-resume.ts
 /** Owns Codex thread/resume subscription safety. */
 /** Resumes one thread and retires the physical client when acceptance is indeterminate. */

package/dist/{transcript-mirror-B9gGgnJS.js → transcript-mirror-DsCMWBca.js}

@@ -1,7 +1,8 @@
-import { i as readUpstreamUserText, n as attachUpstreamUserText, r as readMirrorIdentity, t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-ClRBije0.js";
-import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { embeddedAgentLog, formatErrorMessage, projectAgentHarnessTranscriptMessageForDisplay, runAgentHarnessBeforeMessageWriteHook } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { i as readUpstreamUserText, n as attachUpstreamUserText, r as readMirrorIdentity, t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-CFmsKwr9.js";
+import { asOptionalRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { deliverAgentHarnessUserInputPrompt, embeddedAgentLog, formatErrorMessage, projectAgentHarnessTranscriptMessageForDisplay, runAgentHarnessBeforeMessageWriteHook } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { createHash } from "node:crypto";
+import { truncateUtf8Prefix } from "openclaw/plugin-sdk/text-utility-runtime";
 import { withCodexSessionTranscriptMirrorWriteLock } from "openclaw/plugin-sdk/codex-session-transcript-runtime";
 import { publishSessionTranscriptUpdateByIdentity } from "openclaw/plugin-sdk/session-transcript-runtime";
 import { Buffer } from "node:buffer";
@@ -27,16 +28,6 @@ const CODEX_HISTORY_ZERO_USAGE = {
 		total: 0
 	}
 };
-function isUtf8ContinuationByte(byte) {
-	return byte !== void 0 && (byte & 192) === 128;
-}
-function truncateUtf8Prefix(value, maxBytes) {
-	const bytes = Buffer.from(value);
-	if (bytes.byteLength <= maxBytes) return value;
-	let end = Math.max(0, maxBytes);
-	while (end > 0 && isUtf8ContinuationByte(bytes[end])) end -= 1;
-	return bytes.subarray(0, end).toString("utf8");
-}
 function normalizeImportedHistoryText(value) {
 	if (typeof value !== "string") return;
 	const text = value.trim();
@@ -91,6 +82,8 @@ function projectCodexThreadHistory(params) {
 		const role = item.type === "userMessage" ? "user" : item.type === "agentMessage" ? "assistant" : void 0;
 		itemOffset += 1;
 		if (!text || !role) continue;
+		const phase = item.phase === "commentary" || item.phase === "final_answer" ? item.phase : void 0;
+		const asyncDelivery = item.delivery === "async";
 		const message = role === "assistant" ? attachCodexMirrorIdentity({
 			role,
 			content: [{
@@ -103,13 +96,14 @@ function projectCodexThreadHistory(params) {
 			usage: CODEX_HISTORY_ZERO_USAGE,
 			stopReason: turn.status === "interrupted" ? "aborted" : turn.status === "failed" ? "error" : "stop",
 			...turn.status === "failed" && turn.error?.message ? { errorMessage: turn.error.message } : {},
+			...phase ? { phase } : {},
+			...asyncDelivery && itemId ? { openclawAsyncDelivery: { itemId } } : {},
 			timestamp
 		}, identity) : attachCodexMirrorIdentity({
 			role,
 			content: text,
 			timestamp
 		}, identity);
-		const phase = item.phase === "commentary" || item.phase === "final_answer" ? item.phase : void 0;
 		projected.push({
 			message,
 			responseItem: {
@@ -150,7 +144,7 @@ function projectBoundedCodexThreadHistory(params) {
 	return {
 		importedMessages: selected.length,
 		omittedMessages: projected.length - selected.length,
-		responseItems: selected.filter(({ message }) => message.role !== "assistant" || message.stopReason !== "aborted" && message.stopReason !== "error").map(({ responseItem }) => responseItem),
+		responseItems: selected.filter(({ message }) => message.role !== "assistant" || message.stopReason !== "aborted" && message.stopReason !== "error" && !("openclawAsyncDelivery" in message)).map(({ responseItem }) => responseItem),
 		transcriptMessages: selected.map(({ message }) => message)
 	};
 }
@@ -159,7 +153,7 @@ function projectBoundedCodexVisibleSessionHistory(entries) {
 	const projected = [];
 	for (const entry of entries) {
 		if (entry.role !== "user" && entry.role !== "assistant" || !("content" in entry.message)) continue;
-		if (entry.role === "assistant" && "stopReason" in entry.message && (entry.message.stopReason === "aborted" || entry.message.stopReason === "error")) continue;
+		if (entry.role === "assistant" && ("stopReason" in entry.message && (entry.message.stopReason === "aborted" || entry.message.stopReason === "error") || "openclawAsyncDelivery" in entry.message)) continue;
 		const content = entry.message.content;
 		const text = normalizeImportedHistoryText(typeof content === "string" ? content : Array.isArray(content) ? content.flatMap((part) => part && typeof part === "object" && "text" in part && typeof part.text === "string" ? [part.text] : []).join("\n") : void 0);
 		if (!text) continue;
@@ -183,35 +177,46 @@ function projectBoundedCodexVisibleSessionHistory(entries) {
 const MIRROR_ORIGIN_META_KEY = "mirrorOrigin";
 const MIRROR_SOURCE_FINGERPRINT_META_KEY = "mirrorSourceFingerprint";
 const CODEX_APP_SERVER_MIRROR_ORIGIN = "codex-app-server";
+const CODEX_META_KEY = "__openclaw";
 function attachCodexMirrorAttestation(message, sourceFingerprint) {
-	const record = message;
-	const existing = record["__openclaw"];
+	const existing = CODEX_META_KEY in message ? message[CODEX_META_KEY] : void 0;
 	const baseMeta = existing && typeof existing === "object" && !Array.isArray(existing) ? existing : {};
 	return {
-		...record,
-		__openclaw: {
+		...message,
+		[CODEX_META_KEY]: {
 			...baseMeta,
 			[MIRROR_ORIGIN_META_KEY]: CODEX_APP_SERVER_MIRROR_ORIGIN,
 			...sourceFingerprint ? { [MIRROR_SOURCE_FINGERPRINT_META_KEY]: sourceFingerprint } : {}
 		}
 	};
 }
+function attachCodexMirrorRunId(message, runId, terminal = false) {
+	const { runTerminal: _staleTerminal, ...current } = asOptionalRecord(CODEX_META_KEY in message ? message[CODEX_META_KEY] : void 0) ?? {};
+	return {
+		...message,
+		[CODEX_META_KEY]: {
+			...current,
+			runId,
+			...terminal ? { runTerminal: true } : {}
+		}
+	};
+}
 function readCodexMirrorSourceFingerprint(message) {
-	const meta = message["__openclaw"];
+	const meta = CODEX_META_KEY in message ? message[CODEX_META_KEY] : void 0;
 	if (!meta || typeof meta !== "object" || Array.isArray(meta)) return;
 	const value = meta[MIRROR_SOURCE_FINGERPRINT_META_KEY];
 	return typeof value === "string" && value ? value : void 0;
 }
 function serializeCodexMirrorSourceEvidence(message) {
-	const record = message;
+	const content = "content" in message ? message.content : void 0;
 	return JSON.stringify({
 		role: message.role,
-		content: record.content,
+		content,
 		...message.role === "user" ? { upstreamUserText: readUpstreamUserText(message) } : {},
 		...message.role === "toolResult" ? {
-			toolCallId: record.toolCallId,
-			toolName: record.toolName,
-			isError: record.isError === true
+			toolCallId: message.toolCallId,
+			toolName: message.toolName,
+			isError: message.isError
 		} : {}
 	});
 }
@@ -247,7 +252,7 @@ function buildFromPrepared(params, preparedUserMessage) {
 		...senderUsername ? { senderUsername } : {},
 		...senderE164 ? { senderE164 } : {},
 		...senderLabel ? { senderLabel } : {},
-		...preparedUserMessage ? preparedUserMessage : { content: params.prompt }
+		...preparedUserMessage ?? { content: params.transcriptPrompt ?? params.prompt }
 	};
 }
 function buildCodexUserPromptMessage(params) {
@@ -268,6 +273,10 @@ async function buildResolvedCodexUserPromptMessage(params) {
 function isMirroredAgentMessage(message) {
 	return message.role === "user" || message.role === "assistant" || message.role === "toolResult";
 }
+function readMirroredAssistantText(message) {
+	if (message?.role !== "assistant") return;
+	return message.content.flatMap((part) => part.type === "text" ? [part.text] : []).join("\n") || void 0;
+}
 /** Imports a bounded, user-visible Codex history tail into a new OpenClaw transcript. */
 async function importCodexThreadHistoryToTranscript(params) {
 	const projection = projectBoundedCodexThreadHistory({
@@ -310,6 +319,12 @@ async function mirrorBestEffort(params) {
 			cwd: params.cwd,
 			messages,
 			idempotencyScope: `codex-app-server:${params.threadId}`,
+			runId: params.params.runId,
+			runMirrorIdentityPrefix: `${params.turnId}:`,
+			terminalAssistantOwner: {
+				mirrorIdentity: `${params.turnId}:assistant`,
+				runId: params.params.runId
+			},
 			config: params.params.config
 		});
 		for (const receipt of mirrorResult.userMessageReceipts) try {
@@ -327,8 +342,9 @@ async function mirrorBestEffort(params) {
 			return identity !== void 0 && readCodexMirrorSourceFingerprint(message) === expectedFingerprints.get(identity);
 		});
 		const assistantMirrorIdentity = `${params.turnId}:assistant`;
-		const assistantTranscriptOwned = mirrorResult.assistantMirrorIdentitiesOwned.includes(assistantMirrorIdentity);
-		const assistantTranscriptIdempotencyKey = normalizeOptionalString((assistantTranscriptOwned ? mirroredMessages.find((message) => readMirrorIdentity(message) === assistantMirrorIdentity) : void 0)?.idempotencyKey);
+		const assistantTranscriptMessage = mirroredMessages.find((message) => readMirrorIdentity(message) === assistantMirrorIdentity);
+		const assistantTranscriptOwned = Boolean(assistantTranscriptMessage && mirrorResult.assistantMirrorIdentitiesOwned.includes(assistantMirrorIdentity));
+		const assistantTranscriptIdempotencyKey = normalizeOptionalString(assistantTranscriptMessage?.idempotencyKey);
 		const terminalMessage = mirroredMessages.at(-1);
 		const terminalMirrorIdentity = terminalMessage ? readMirrorIdentity(terminalMessage) : void 0;
 		const terminalAnchor = (terminalMirrorIdentity ? mirrorResult.anchorsByMirrorIdentity.get(terminalMirrorIdentity) : void 0) ?? params.params.userTurnTranscriptRecorder?.getAdmissionReceipt();
@@ -391,6 +407,8 @@ async function mirrorPromptAtTurnStartBestEffort(params) {
 				cwd: params.cwd,
 				messages: [userPromptMessage],
 				idempotencyScope: `codex-app-server:${params.threadId}`,
+				runId: params.params.runId,
+				runMirrorIdentityPrefix: `${params.turnId}:`,
 				config: params.params.config
 			});
 			for (const receipt of mirrorResult.userMessageReceipts) params.notifyUserMessagePersisted(receipt.message, receipt.anchor);
@@ -420,6 +438,7 @@ function buildMirrorDedupeIdentity(message) {
 async function mirror(params) {
 	const messages = params.messages.filter(isMirroredAgentMessage);
 	if (messages.length === 0) return {
+		assistantMirrorIdentitiesAppended: [],
 		assistantMirrorIdentitiesOwned: [],
 		anchorsByMirrorIdentity: /* @__PURE__ */ new Map(),
 		messagesPresent: [],
@@ -431,18 +450,19 @@ async function mirror(params) {
 		const sourceFingerprint = fingerprintCodexMirrorSourceMessage(message);
 		return {
 			dedupeIdentity,
-			idempotencyKey: (message.role === "user" ? normalizeOptionalString(message.idempotencyKey) : void 0) ?? (params.idempotencyScope ? `${params.idempotencyScope}:${dedupeIdentity}` : void 0),
+			idempotencyKey: (message.role === "user" ? normalizeOptionalString("idempotencyKey" in message ? message.idempotencyKey : void 0) : void 0) ?? (params.idempotencyScope ? `${params.idempotencyScope}:${dedupeIdentity}` : void 0),
 			message,
 			sourceFingerprint
 		};
 	});
 	const candidateIdempotencyKeys = candidates.flatMap(({ idempotencyKey }) => idempotencyKey ? [idempotencyKey] : []);
 	const transcriptTarget = resolveCodexMirrorTranscriptTarget(params);
-	const { appendedUpdates, assistantMirrorIdentitiesOwned, anchorsByMirrorIdentity, messagesPresent, userMessageReceipts, userMessagesPresent } = await withCodexSessionTranscriptMirrorWriteLock({
+	const { appendedUpdates, assistantMirrorIdentitiesAppended, assistantMirrorIdentitiesOwned, anchorsByMirrorIdentity, messagesPresent, userMessageReceipts, userMessagesPresent } = await withCodexSessionTranscriptMirrorWriteLock({
 		...transcriptTarget,
 		config: params.config
 	}, async (transcript) => {
 		const nextAppendedUpdates = [];
+		const nextAssistantMirrorIdentitiesAppended = /* @__PURE__ */ new Set();
 		const nextAssistantMirrorIdentitiesOwned = /* @__PURE__ */ new Set();
 		const nextAnchorsByMirrorIdentity = /* @__PURE__ */ new Map();
 		const nextMessagesPresent = [];
@@ -450,8 +470,12 @@ async function mirror(params) {
 		const nextUserMessagesPresent = [];
 		const mirrorFacts = await transcript.readMessageFacts({ idempotencyKeys: candidateIdempotencyKeys });
 		for (const { dedupeIdentity, idempotencyKey, message, sourceFingerprint } of candidates) {
+			const mirrorIdentity = readMirrorIdentity(message);
+			const ownsRun = Boolean(params.runId && (!params.runMirrorIdentityPrefix || mirrorIdentity?.startsWith(params.runMirrorIdentityPrefix)));
+			const terminalOwner = params.terminalAssistantOwner;
+			const ownsTerminal = Boolean(ownsRun && terminalOwner && mirrorIdentity === terminalOwner.mirrorIdentity);
 			const transcriptMessage = {
-				...attachCodexMirrorAttestation(message, sourceFingerprint),
+				...attachCodexMirrorAttestation(ownsRun && params.runId ? attachCodexMirrorRunId(message, params.runId, ownsTerminal) : message, sourceFingerprint),
 				...idempotencyKey ? { idempotencyKey } : {}
 			};
 			if (idempotencyKey && mirrorFacts.existingIdempotencyKeys.has(idempotencyKey)) {
@@ -484,8 +508,9 @@ async function mirror(params) {
 				...attachCodexMirrorAttestation(nextMessage, sourceFingerprint),
 				idempotencyKey
 			} : attachCodexMirrorAttestation(nextMessage, sourceFingerprint);
-			const mirrorIdentity = readMirrorIdentity(message);
 			if (mirrorIdentity) messageToAppend = attachCodexMirrorIdentity(messageToAppend, mirrorIdentity);
+			if (ownsRun && params.runId) messageToAppend = attachCodexMirrorRunId(messageToAppend, params.runId, ownsTerminal);
+			if (message.role === "assistant" && message.openclawAsyncDelivery) messageToAppend = Object.assign(messageToAppend, { openclawAsyncDelivery: { itemId: message.openclawAsyncDelivery.itemId } });
 			messageToAppend = projectAgentHarnessTranscriptMessageForDisplay({
 				hidden: message.display === false,
 				message: messageToAppend
@@ -510,11 +535,14 @@ async function mirror(params) {
 					message: appendedMessage
 				});
 			}
-			if (appended.appended) nextAppendedUpdates.push({
-				messageId,
-				message: appendedMessage,
-				...messageSeq !== void 0 ? { messageSeq } : {}
-			});
+			if (appended.appended) {
+				if (message.role === "assistant") nextAssistantMirrorIdentitiesAppended.add(dedupeIdentity);
+				nextAppendedUpdates.push({
+					messageId,
+					message: appendedMessage,
+					...messageSeq !== void 0 ? { messageSeq } : {}
+				});
+			}
 			if (idempotencyKey) {
 				mirrorFacts.existingIdempotencyKeys.add(idempotencyKey);
 				if (appended.anchor) mirrorFacts.anchorsByIdempotencyKey.set(idempotencyKey, appended.anchor);
@@ -522,6 +550,7 @@ async function mirror(params) {
 		}
 		return {
 			appendedUpdates: nextAppendedUpdates,
+			assistantMirrorIdentitiesAppended: [...nextAssistantMirrorIdentitiesAppended],
 			assistantMirrorIdentitiesOwned: [...nextAssistantMirrorIdentitiesOwned],
 			anchorsByMirrorIdentity: nextAnchorsByMirrorIdentity,
 			messagesPresent: nextMessagesPresent,
@@ -530,6 +559,8 @@ async function mirror(params) {
 		};
 	});
 	for (const update of appendedUpdates) try {
+		const terminalOwner = params.terminalAssistantOwner;
+		const terminalRunId = update.message.role === "assistant" && terminalOwner && readMirrorIdentity(update.message) === terminalOwner.mirrorIdentity ? terminalOwner.runId : void 0;
 		await publishSessionTranscriptUpdateByIdentity({
 			...transcriptTarget,
 			update: {
@@ -537,6 +568,7 @@ async function mirror(params) {
 				message: update.message,
 				messageId: update.messageId,
 				...update.messageSeq !== void 0 ? { messageSeq: update.messageSeq } : {},
+				...terminalRunId ? { runId: terminalRunId } : {},
 				sessionKey: transcriptTarget.sessionKey
 			}
 		});
@@ -544,6 +576,7 @@ async function mirror(params) {
 		embeddedAgentLog.warn("failed to publish codex app-server transcript update", { error: formatErrorMessage(error) });
 	}
 	return {
+		assistantMirrorIdentitiesAppended,
 		assistantMirrorIdentitiesOwned,
 		anchorsByMirrorIdentity,
 		messagesPresent,
@@ -551,10 +584,76 @@ async function mirror(params) {
 		userMessagesPresent
 	};
 }
+async function deliverAsyncMessageBestEffort(params) {
+	const mirrorIdentity = `${params.turnId}:async:${params.itemId}`;
+	const deliveryIntentId = `block-reply:v1:codex-app-server:${[
+		params.threadId,
+		params.turnId,
+		params.itemId
+	].map(encodeURIComponent).join(":")}`;
+	const target = params.params.sessionTarget;
+	if (!target) {
+		if (!params.params.onBlockReply) return "retry";
+		try {
+			await deliverAsyncBlockReply(params.params.onBlockReply, params.text, deliveryIntentId);
+			return "settled";
+		} catch (error) {
+			embeddedAgentLog.warn("failed to deliver codex async agent message", {
+				error: formatErrorMessage(error),
+				itemId: params.itemId,
+				runId: params.params.runId,
+				threadId: params.threadId,
+				turnId: params.turnId
+			});
+			return "retry";
+		}
+	}
+	let result;
+	try {
+		result = await mirror({
+			agentId: target.agentId ?? params.params.agentId,
+			sessionId: target.sessionId ?? params.params.sessionId,
+			sessionKey: target.sessionKey ?? params.params.sessionKey,
+			storePath: target.storePath,
+			cwd: params.cwd,
+			config: params.params.config,
+			messages: [attachCodexMirrorIdentity(params.message, mirrorIdentity)],
+			idempotencyScope: `codex-app-server:${params.threadId}`
+		});
+	} catch (error) {
+		embeddedAgentLog.warn("failed to persist codex async agent message", {
+			error: formatErrorMessage(error),
+			itemId: params.itemId,
+			runId: params.params.runId,
+			threadId: params.threadId,
+			turnId: params.turnId
+		});
+		return "retry";
+	}
+	if (!result.assistantMirrorIdentitiesOwned.includes(mirrorIdentity)) return "retry";
+	const persistedText = readMirroredAssistantText(result.messagesPresent.find((message) => readMirrorIdentity(message) === mirrorIdentity));
+	if (params.params.onBlockReply && persistedText !== void 0) try {
+		await deliverAsyncBlockReply(params.params.onBlockReply, persistedText, deliveryIntentId);
+	} catch (error) {
+		embeddedAgentLog.warn("failed to deliver persisted codex async agent message", {
+			error: formatErrorMessage(error),
+			itemId: params.itemId,
+			runId: params.params.runId,
+			threadId: params.threadId,
+			turnId: params.turnId
+		});
+		return "retry";
+	}
+	return "settled";
+}
 const codexTranscriptMirrorRuntime = {
+	deliverAsyncMessageBestEffort,
 	mirror,
 	mirrorBestEffort
 };
+async function deliverAsyncBlockReply(onBlockReply, text, deliveryIntentId) {
+	await deliverAgentHarnessUserInputPrompt({ onBlockReply: (payload) => onBlockReply(payload, { deliveryIntentId }) }, [], { intro: text });
+}
 function resolveCodexMirrorTranscriptTarget(params) {
 	const sessionKey = params.sessionKey?.trim();
 	const storePath = params.storePath?.trim();

package/dist/{transport-stdio-DIImwDVS.js → transport-stdio-DhoGy33Z.js}

@@ -75,8 +75,8 @@ function copySafeEnvironmentEntries(target, source) {
 	}
 }
 /** Spawns the Codex app-server process and returns the shared transport interface. */
-function createStdioTransport(options) {
-	const env = resolveCodexAppServerSpawnEnv(options);
+function createStdioTransport(options, baseEnv = process.env) {
+	const env = resolveCodexAppServerSpawnEnv(options, baseEnv);
 	const invocation = resolveCodexAppServerSpawnInvocation(options, {
 		platform: process.platform,
 		env,

package/dist/{upstream-prompt-provenance-ClRBije0.js → upstream-prompt-provenance-CFmsKwr9.js}

@@ -1,12 +1,12 @@
+import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/app-server/upstream-prompt-provenance.ts
 const UPSTREAM_USER_TEXT_META_KEY = "upstreamUserText";
 const MIRROR_IDENTITY_META_KEY = "mirrorIdentity";
+const CODEX_META_KEY = "__openclaw";
 function attachCodexMirrorIdentity(message, identity) {
-	const record = message;
-	const existing = record["__openclaw"];
-	const baseMeta = existing && typeof existing === "object" && !Array.isArray(existing) ? existing : {};
+	const baseMeta = asOptionalRecord(CODEX_META_KEY in message ? message[CODEX_META_KEY] : void 0) ?? {};
 	return {
-		...record,
+		...message,
 		__openclaw: {
 			...baseMeta,
 			[MIRROR_IDENTITY_META_KEY]: identity
@@ -14,17 +14,15 @@ function attachCodexMirrorIdentity(message, identity) {
 	};
 }
 function readMirrorIdentity(message) {
-	const meta = message["__openclaw"];
-	if (!meta || typeof meta !== "object" || Array.isArray(meta)) return;
-	const id = meta[MIRROR_IDENTITY_META_KEY];
+	const record = asOptionalRecord(CODEX_META_KEY in message ? message[CODEX_META_KEY] : void 0);
+	if (!record) return;
+	const id = record[MIRROR_IDENTITY_META_KEY];
 	return typeof id === "string" && id ? id : void 0;
 }
 function attachUpstreamUserText(message, text) {
-	const record = message;
-	const existing = record["__openclaw"];
-	const baseMeta = existing && typeof existing === "object" && !Array.isArray(existing) ? existing : {};
+	const baseMeta = asOptionalRecord(CODEX_META_KEY in message ? message[CODEX_META_KEY] : void 0) ?? {};
 	return {
-		...record,
+		...message,
 		__openclaw: {
 			...baseMeta,
 			[UPSTREAM_USER_TEXT_META_KEY]: text
@@ -32,9 +30,9 @@ function attachUpstreamUserText(message, text) {
 	};
 }
 function readUpstreamUserText(message) {
-	const meta = message?.["__openclaw"];
-	if (!meta || typeof meta !== "object" || Array.isArray(meta)) return;
-	const text = meta[UPSTREAM_USER_TEXT_META_KEY];
+	const record = asOptionalRecord(message && CODEX_META_KEY in message ? message[CODEX_META_KEY] : void 0);
+	if (!record) return;
+	const text = record[UPSTREAM_USER_TEXT_META_KEY];
 	return typeof text === "string" && text ? text : void 0;
 }
 //#endregion

package/dist/{upstream-session-fork-CE-_LdnP.js → upstream-session-fork-DlaHxSLC.js}

@@ -1,7 +1,7 @@
-import { d as sessionBindingIdentity } from "./session-binding-DPxIvMgE.js";
-import { r as assertCodexThreadForkResponse } from "./protocol-validators-B4F7L8Rf.js";
+import { d as sessionBindingIdentity } from "./session-binding-Bcynfd-_.js";
+import { r as assertCodexThreadForkResponse } from "./protocol-validators-VeJxxJ0U.js";
 import { t as isIncognitoSessionKey } from "./incognito-session-ET_ufDH-.js";
-import { i as createImportedCodexSession, n as codexUpstreamBaseline, t as codexLastTerminalTurnId } from "./session-upstream-marker-CrIFX06J.js";
+import { i as createImportedCodexSession, n as codexUpstreamBaseline, t as codexLastTerminalTurnId } from "./session-upstream-marker-BIkusb95.js";
 import { isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { readVisibleSessionTranscriptMessageEntries } from "openclaw/plugin-sdk/session-transcript-runtime";
 import { deleteSessionUpstreamLink, upsertSessionUpstreamLink } from "openclaw/plugin-sdk/session-catalog";
@@ -171,7 +171,14 @@ function normalizeTurnId(value) {
 }
 async function forkCodexUpstreamSession(params, options) {
 	try {
-		return await options.control.withPinnedConnection(async (control) => {
+		const sourceFingerprint = params.upstream.kind === "codex-app-server" ? readConnectionFingerprint(params.upstream.ref) : void 0;
+		const requestControl = sourceFingerprint ? options.controlFactory.forUpstream(params.source.agentId, sourceFingerprint) : void 0;
+		if (!sourceFingerprint || !requestControl) return {
+			status: "failed",
+			code: "upstream-unavailable",
+			message: "This Codex thread is not available on the current connection. Reconnect to its host and try again."
+		};
+		return await requestControl.withPinnedConnection(async (control) => {
 			const incognito = isIncognitoSessionKey(params.targetKey);
 			const clientId = control.clientId?.trim();
 			if (incognito && !clientId) throw new Error("Incognito Codex forks require the live pinned app-server client");
@@ -185,8 +192,7 @@ async function forkCodexUpstreamSession(params, options) {
 				if (linked) deleteSessionUpstreamLink(params.targetKey, params.source.agentId);
 				await control.archiveThread(forkedThreadId).catch(() => void 0);
 			};
-			const sourceFingerprint = readConnectionFingerprint(params.upstream.ref);
-			if (params.upstream.kind !== "codex-app-server" || !sourceFingerprint || sourceFingerprint !== control.connectionFingerprint) return {
+			if (sourceFingerprint !== control.connectionFingerprint) return {
 				status: "failed",
 				code: "upstream-unavailable",
 				message: "This Codex thread is not available on the current connection. Reconnect to its host and try again."

package/dist/{usage-CHlV0e-o.js → usage-ROIaW3wo.js}

@@ -1,6 +1,6 @@
-import { g as resolveCodexAppServerRuntimeOptions } from "./session-binding-DPxIvMgE.js";
-import { t as buildCodexAppServerUsageSnapshot } from "./rate-limits-DZXmOL8-.js";
-import { t as readCodexAppServerUsage } from "./request-BRl5_UfX.js";
+import { i as resolveCodexAppServerRuntimeOptions } from "./config-giW8X0QA.js";
+import { t as buildCodexAppServerUsageSnapshot } from "./rate-limits-C5_D8Gmb.js";
+import { t as readCodexAppServerUsage } from "./request-DXXGHko0.js";
 import { CODEX_APP_SERVER_AUTH_MARKER } from "openclaw/plugin-sdk/agent-runtime";
 //#region extensions/codex/src/app-server/usage.ts
 /** Handles the synthetic usage credential for a Codex-backed OpenAI route. */

package/dist/{web-search-provider.runtime-DRw2Vl42.js → web-search-provider.runtime-ClaNPV7N.js}

@@ -1,6 +1,6 @@
-import { ct as isJsonObject } from "./shared-client-kIBbGjk4.js";
-import { d as buildCodexNativeWebSearchThreadConfig } from "./thread-lifecycle-Bu1BTDXr.js";
-import { t as runBoundedCodexAppServerTurn } from "./bounded-turn-qgZmzy_4.js";
+import { vt as isJsonObject } from "./shared-client-DKz23hHY.js";
+import { P as buildCodexNativeWebSearchThreadConfig } from "./thread-lifecycle-L7oEkTlq.js";
+import { t as runBoundedCodexAppServerTurn } from "./bounded-turn-B7iBUcuP.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { readStringParam, resolveSearchTimeoutSeconds, wrapWebContent } from "openclaw/plugin-sdk/provider-web-search";
 //#region extensions/codex/src/web-search-provider.runtime.ts

package/openclaw.plugin.json

@@ -1,5 +1,22 @@
 {
   "id": "codex",
+  "backupResources": [
+    {
+      "disposition": "regenerable",
+      "scope": "agent",
+      "relativePath": "codex-home/tmp/arg0"
+    },
+    {
+      "disposition": "regenerable",
+      "scope": "agent",
+      "relativePath": "codex-home/.tmp/plugins"
+    },
+    {
+      "disposition": "regenerable",
+      "scope": "agent",
+      "relativePath": "codex-home/.tmp/bundled-marketplaces"
+    }
+  ],
   "doctorContract": {
     "configRepair": true,
     "stateMigrations": true
@@ -16,6 +33,13 @@
   ],
   "name": "Codex",
   "description": "Codex app-server harness and native session catalog.",
+  "cliCommands": [
+    {
+      "name": "codex",
+      "description": "Inspect and branch from Codex sessions through the Gateway",
+      "hasSubcommands": true
+    }
+  ],
   "contracts": {
     "mediaUnderstandingProviders": ["codex"],
     "migrationProviders": ["codex"],
@@ -45,6 +69,7 @@
     "onConfigPaths": [
       "plugins.entries.codex.config.appServer.transport",
       "plugins.entries.codex.config.sessionCatalog.enabled",
+      "plugins.entries.codex.config.sessionCatalog.homes",
       "plugins.entries.codex.config.supervision.enabled"
     ]
   },
@@ -73,7 +98,24 @@
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "enabled": { "type": "boolean", "default": true }
+          "enabled": { "type": "boolean", "default": true },
+          "homes": {
+            "type": "array",
+            "items": {
+              "anyOf": [
+                { "type": "string", "minLength": 1, "pattern": "\\S" },
+                {
+                  "type": "object",
+                  "additionalProperties": false,
+                  "required": ["path"],
+                  "properties": {
+                    "path": { "type": "string", "minLength": 1, "pattern": "\\S" },
+                    "label": { "type": "string", "minLength": 1, "pattern": "\\S" }
+                  }
+                }
+              ]
+            }
+          }
         }
       },
       "discovery": {
@@ -392,6 +434,11 @@
       "label": "Discover Codex Sessions",
       "help": "List native Codex sessions in the sidebar from this Gateway and eligible paired nodes."
     },
+    "sessionCatalog.homes": {
+      "label": "Additional Codex Homes",
+      "help": "Existing local Codex home directories to include in native session discovery. String paths use the canonical directory basename as their label; object entries can override it with label. Paths are canonicalized and deduplicated. Requires appServer.transport=stdio and a Gateway restart.",
+      "advanced": true
+    },
     "codexDynamicToolsLoading": {
       "label": "Dynamic Tools Loading",
       "help": "Use searchable to defer OpenClaw dynamic tools behind Codex tool search, or direct to expose them in the initial context.",
@@ -467,7 +514,7 @@
     },
     "computerUse.autoRepair": {
       "label": "Auto Repair",
-      "help": "When true, failed Computer Use live tests repair stale scoped Computer Use MCP children before retrying once.",
+      "help": "When true, failed Computer Use live tests reload the Codex-owned MCP runtime before retrying once.",
       "advanced": true
     },
     "computerUse.marketplaceSource": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.8.1-beta.2",
+  "version": "2026.9.1-beta.1",
   "description": "OpenClaw Codex app-server harness and native session supervision plugin.",
   "repository": {
     "type": "git",
@@ -8,10 +8,11 @@
   },
   "type": "module",
   "dependencies": {
-    "@openai/codex": "0.147.0",
-    "smol-toml": "1.7.1",
-    "typebox": "1.3.6",
-    "ws": "8.21.1",
+    "@openai/codex": "0.150.1",
+    "semver": "7.8.5",
+    "smol-toml": "1.8.0",
+    "typebox": "1.3.16",
+    "ws": "8.21.3",
     "zod": "4.4.3"
   },
   "devDependencies": {
@@ -35,10 +36,10 @@
       ]
     },
     "compat": {
-      "pluginApi": ">=2026.8.1-beta.2"
+      "pluginApi": ">=2026.9.1-beta.1"
     },
     "build": {
-      "openclawVersion": "2026.8.1-beta.2"
+      "openclawVersion": "2026.9.1-beta.1"
     },
     "release": {
       "publishToClawHub": true,
@@ -58,7 +59,7 @@
     "README.md"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.8.1-beta.2"
+    "openclaw": ">=2026.9.1-beta.1"
   },
   "peerDependenciesMeta": {
     "openclaw": {