@openclaw/codex 2026.8.1-beta.2 → 2026.8.1-beta.3

package/dist/{shared-client-kIBbGjk4.js → shared-client-Dw-rzii0.js}

@@ -1,32 +1,34 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { A as resolveCodexAppServerUserHomeDir, _ as resolveCodexAppServerStartOptionsForAgent, g as resolveCodexAppServerRuntimeOptions, o as isCodexAppServerNativeAuthProfile, p as codexAppServerStartOptionsKey, v as resolveCodexComputerUseConfig } from "./session-binding-DPxIvMgE.js";
-import { n as resolveCodexAppServerSpawnEnv, t as createStdioTransport } from "./transport-stdio-DIImwDVS.js";
-import { createRequire } from "node:module";
+import { a as resolveCodexAppServerStartOptionsForAgent, i as resolveCodexAppServerRuntimeOptions, o as resolveCodexComputerUseConfig, t as codexAppServerStartOptionsKey, x as resolveCodexAppServerUserHomeDir } from "./config-CpNeo5AE.js";
+import { o as isCodexAppServerNativeAuthProfile } from "./session-binding-BTrLf9Qm.js";
+import { n as resolveCodexAppServerSpawnEnv, t as createStdioTransport } from "./transport-stdio-DhoGy33Z.js";
+import { a as CODEX_APP_SERVER_VERSION, n as resolveManagedCodexAppServerStartOptions, o as MIN_SUPPORTED_CODEX_APP_SERVER_VERSION, r as resolveManagedCodexNativeCommand } from "./managed-binary-By4FZC6i.js";
 import { isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import fs, { access } from "node:fs/promises";
+import fs from "node:fs/promises";
 import path from "node:path";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { addTimerTimeoutGraceMs, resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { AgentHarnessPreflightError, OPENCLAW_VERSION, embeddedAgentLog, formatErrorMessage } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { createHash, randomUUID } from "node:crypto";
-import fsSync, { constants, existsSync, readFileSync, realpathSync } from "node:fs";
+import fsSync, { constants, existsSync } from "node:fs";
 import os from "node:os";
 import { isDeepStrictEqual } from "node:util";
 import { ensureAuthProfileStore, findPersistedAuthProfileCredential, loadAuthProfileStoreForSecretsRuntime, refreshOAuthCredentialForRuntime, resolveApiKeyForProfile, resolveAuthProfileOrder, resolveDefaultAgentDir, resolvePersistedAuthProfileOwnerAgentDir, resolveProviderIdForAuth } from "openclaw/plugin-sdk/agent-runtime";
 import { hasUsableOAuthCredential } from "openclaw/plugin-sdk/provider-auth";
 import { readSecretFile } from "openclaw/plugin-sdk/secret-file";
+import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
 import { runExec } from "openclaw/plugin-sdk/process-runtime";
+import { assertNoSymlinkParents, withTimeout } from "openclaw/plugin-sdk/security-runtime";
+import { execFile } from "node:child_process";
 import { createInterface } from "node:readline";
 import { coerceErrorMessage, toStringifiedError } from "openclaw/plugin-sdk/error-runtime";
 import { sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
+import { parse } from "semver";
 import { EventEmitter } from "node:events";
 import net from "node:net";
 import { PassThrough, Writable } from "node:stream";
 import { StringDecoder } from "node:string_decoder";
 import WebSocket from "ws";
-import { fileURLToPath } from "node:url";
-import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
-import { withTimeout } from "openclaw/plugin-sdk/security-runtime";
 //#region extensions/codex/src/app-server/auth-start-options.ts
 const CODEX_APP_SERVER_HOME_DIRNAME = "codex-home";
 const CODEX_EPHEMERAL_AUTH_STORE_OVERRIDE = "cli_auth_credentials_store=\"ephemeral\"";
@@ -179,108 +181,385 @@ function skippedCacheResult(status, message) {
 	};
 }
 //#endregion
+//#region extensions/codex/src/app-server/computer-use-service-path.ts
+/** Filesystem ownership guards for isolated Computer Use service provisioning. */
+async function assertOwnedServicePath(params) {
+	await assertOwnedCodexHomePath({
+		ownershipRoot: params.ownershipRoot,
+		codexHome: params.codexHome,
+		allowMissing: true
+	});
+	assertPathAtOrInside(params.ownershipRoot, params.targetParent, "Computer Use service parent");
+	await assertNoSymlinkParents({
+		rootDir: params.ownershipRoot,
+		targetPath: params.targetParent,
+		allowMissing: true,
+		requireDirectories: true,
+		messagePrefix: "Computer Use service path"
+	});
+	await assertNotSymlink(params.targetPath, "Computer Use service target");
+}
+async function ensureOwnedCodexHome(codexHomeInput, ownershipRootInput = path.dirname(path.resolve(codexHomeInput))) {
+	const codexHome = path.resolve(codexHomeInput);
+	const ownershipRoot = path.resolve(ownershipRootInput);
+	await fs.mkdir(ownershipRoot, {
+		recursive: true,
+		mode: 448
+	});
+	await assertOwnedCodexHomePath({
+		ownershipRoot,
+		codexHome,
+		allowMissing: true
+	});
+	await ensureRealDirectoryTree(ownershipRoot, codexHome, "isolated Codex home");
+	await assertOwnedCodexHomePath({
+		ownershipRoot,
+		codexHome,
+		allowMissing: false
+	});
+}
+async function prepareOwnedServiceParent(params) {
+	await ensureOwnedCodexHome(params.codexHome, params.ownershipRoot);
+	await ensureRealDirectoryTree(params.ownershipRoot, params.targetParent, "Computer Use service parent");
+	await assertNoSymlinkParents({
+		rootDir: params.ownershipRoot,
+		targetPath: params.targetParent,
+		allowMissing: false,
+		requireDirectories: true,
+		messagePrefix: "Computer Use service path"
+	});
+	const [rootIdentity, parentIdentity] = await Promise.all([readRealDirectoryIdentity(params.ownershipRoot, "Computer Use ownership root"), readRealDirectoryIdentity(params.targetParent, "Computer Use service parent")]);
+	assertPathAtOrInside(rootIdentity.realPath, parentIdentity.realPath, "canonical Computer Use service parent");
+	return parentIdentity;
+}
+async function assertOwnedCodexHomePath(params) {
+	await readRealDirectoryIdentity(params.ownershipRoot, "Computer Use ownership root");
+	assertPathAtOrInside(params.ownershipRoot, params.codexHome, "isolated Codex home");
+	await assertNoSymlinkParents({
+		rootDir: params.ownershipRoot,
+		targetPath: params.codexHome,
+		allowMissing: params.allowMissing,
+		requireDirectories: true,
+		messagePrefix: "Computer Use service path"
+	});
+}
+async function readRealDirectoryIdentity(directoryPath, label) {
+	const logicalPath = path.resolve(directoryPath);
+	const before = await fs.lstat(logicalPath);
+	if (before.isSymbolicLink() || !before.isDirectory()) throw new Error(`${label} must be a real directory: ${logicalPath}`);
+	const realPath = await fs.realpath(logicalPath);
+	const [after, resolved] = await Promise.all([fs.lstat(logicalPath), fs.lstat(realPath)]);
+	if (after.isSymbolicLink() || !after.isDirectory() || !resolved.isDirectory() || before.dev !== after.dev || before.ino !== after.ino || after.dev !== resolved.dev || after.ino !== resolved.ino) throw new Error(`${label} changed while its ownership boundary was being established.`);
+	return {
+		logicalPath,
+		realPath,
+		dev: after.dev,
+		ino: after.ino
+	};
+}
+async function assertOwnedServiceParentStable(parent) {
+	await assertDirectoryIdentityStable(parent, "Computer Use service parent");
+}
+async function assertDirectoryIdentityStable(expected, label) {
+	if (!await directoryIdentityIsStable(expected)) throw new Error(`${label} changed during refresh; refusing to mutate the replacement path.`);
+}
+async function ownedServiceParentIsStable(parent) {
+	return await directoryIdentityIsStable(parent);
+}
+async function directoryIdentityIsStable(expected) {
+	try {
+		const current = await fs.lstat(expected.logicalPath);
+		if (current.isSymbolicLink() || !current.isDirectory() || current.dev !== expected.dev || current.ino !== expected.ino) return false;
+		return await fs.realpath(expected.logicalPath) === expected.realPath;
+	} catch {
+		return false;
+	}
+}
+async function assertNotSymlink(filePath, label) {
+	try {
+		if ((await fs.lstat(filePath)).isSymbolicLink()) throw new Error(`${label} must not be a symbolic link: ${filePath}`);
+	} catch (error) {
+		if (hasNodeErrorCode(error, "ENOENT")) return;
+		throw error;
+	}
+}
+async function ensureRealDirectoryTree(ownershipRoot, directoryPath, label) {
+	const root = path.resolve(ownershipRoot);
+	const target = path.resolve(directoryPath);
+	assertPathAtOrInside(root, target, label);
+	const relative = path.relative(root, target);
+	let current = root;
+	for (const segment of relative.split(path.sep).filter(Boolean)) {
+		current = path.join(current, segment);
+		const existing = await fs.lstat(current).catch((error) => {
+			if (hasNodeErrorCode(error, "ENOENT")) return;
+			throw error;
+		});
+		if (!existing) {
+			try {
+				await fs.mkdir(current, { mode: 448 });
+			} catch (error) {
+				if (!hasNodeErrorCode(error, "EEXIST")) throw error;
+			}
+			const created = await fs.lstat(current);
+			if (created.isSymbolicLink() || !created.isDirectory()) throw new Error(`${label} changed while its directory tree was being created: ${current}`);
+		} else if (existing.isSymbolicLink() || !existing.isDirectory()) throw new Error(`${label} must traverse real directories: ${current}`);
+	}
+	await assertNoSymlinkParents({
+		rootDir: root,
+		targetPath: target,
+		allowMissing: false,
+		requireDirectories: true,
+		messagePrefix: "Computer Use service path"
+	});
+	await readRealDirectoryIdentity(target, label);
+}
+function assertPathAtOrInside(rootPath, candidatePath, label) {
+	const relative = path.relative(path.resolve(rootPath), path.resolve(candidatePath));
+	if (relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) throw new Error(`${label} must remain inside ${path.resolve(rootPath)}.`);
+}
+function hasNodeErrorCode(error, code) {
+	return Boolean(error && typeof error === "object" && "code" in error && error.code === code);
+}
+//#endregion
 //#region extensions/codex/src/app-server/computer-use-service.ts
 /** Native Computer Use service provisioning for isolated Codex homes. */
 const SERVICE_APP_NAME = "Codex Computer Use.app";
-const CLIENT_RELATIVE_PATH = path.join("Contents", "SharedSupport", "SkyComputerUseClient.app", "Contents", "MacOS", "SkyComputerUseClient");
+const SERVICE_BUNDLE_ID = "com.openai.sky.CUAService";
+const CLIENT_BUNDLE_ID = "com.openai.sky.CUAService.cli";
+const OPENAI_TEAM_ID = "2DC432GLL2";
+const CLIENT_APP_RELATIVE_PATH = path.join("Contents", "SharedSupport", "SkyComputerUseClient.app");
+const CLIENT_RELATIVE_PATH = path.join(CLIENT_APP_RELATIVE_PATH, "Contents", "MacOS", "SkyComputerUseClient");
 const COPY_TIMEOUT_MS = 12e4;
+const INSPECT_TIMEOUT_MS = 3e4;
+const COMPLETED_SYNC_CACHE_MAX_ENTRIES = 64;
 const activeInstalls = /* @__PURE__ */ new Map();
-/** Ensures the official native client exists beneath the CODEX_HOME used by its launcher. */
+const completedSyncs = /* @__PURE__ */ new Map();
+/** Synchronizes the CODEX_HOME native client with the selected signed desktop distribution. */
 async function ensureCodexComputerUseServiceApp(params) {
 	const platform = params.platform ?? process.platform;
 	if (platform !== "darwin") return {
 		status: "unsupported",
 		changed: false
 	};
-	const targetPath = path.join(path.resolve(params.codexHome), "computer-use", SERVICE_APP_NAME);
+	const codexHome = path.resolve(params.codexHome);
+	const ownershipRoot = path.resolve(params.ownershipRoot ?? path.dirname(codexHome));
+	const targetParent = path.join(codexHome, "computer-use");
+	const targetPath = path.join(targetParent, SERVICE_APP_NAME);
+	await ensureOwnedCodexHome(codexHome, ownershipRoot);
+	await assertOwnedServicePath({
+		ownershipRoot,
+		codexHome,
+		targetParent,
+		targetPath
+	});
+	const candidates = params.sourceAppCandidates ?? resolveMacOSDesktopCodexComputerUseServiceAppCandidates(platform, params.appServerCommand);
+	const syncKey = [targetPath, ...candidates].join("\0");
+	const completed = completedSyncs.get(targetPath);
+	if (completed?.syncKey === syncKey) {
+		completedSyncs.delete(targetPath);
+		completedSyncs.set(targetPath, completed);
+		return {
+			status: "already_current",
+			changed: false,
+			targetPath: completed.targetPath,
+			sourcePath: completed.sourcePath,
+			sourceBuild: completed.sourceBuild
+		};
+	}
 	const active = activeInstalls.get(targetPath);
-	if (active) return await active;
+	if (active) {
+		if (active.syncKey === syncKey) return await active.promise;
+		await active.promise.catch(() => void 0);
+		return await ensureCodexComputerUseServiceApp(params);
+	}
+	if (completed) completedSyncs.delete(targetPath);
 	const install = ensureCodexComputerUseServiceAppOnce({
 		...params,
+		codexHome,
+		ownershipRoot,
+		targetParent,
 		targetPath,
-		platform
+		platform,
+		sourceAppCandidates: candidates
+	}).then((result) => {
+		if (isCompletedSyncStatus(result.status)) {
+			completedSyncs.delete(targetPath);
+			completedSyncs.set(targetPath, {
+				syncKey,
+				targetPath: result.targetPath,
+				sourcePath: result.sourcePath,
+				sourceBuild: result.sourceBuild
+			});
+			pruneMapToMaxSize(completedSyncs, COMPLETED_SYNC_CACHE_MAX_ENTRIES);
+		}
+		return result;
 	});
-	activeInstalls.set(targetPath, install);
-	try {
-		return await install;
-	} finally {
-		if (activeInstalls.get(targetPath) === install) activeInstalls.delete(targetPath);
-	}
+	const activeEntry = {
+		syncKey,
+		promise: install
+	};
+	activeInstalls.set(targetPath, activeEntry);
+	const clearActive = () => {
+		if (activeInstalls.get(targetPath) === activeEntry) activeInstalls.delete(targetPath);
+	};
+	install.then(clearActive, clearActive);
+	return await install;
+}
+function isCompletedSyncStatus(status) {
+	return status === "installed" || status === "refreshed" || status === "already_current";
 }
 async function ensureCodexComputerUseServiceAppOnce(params) {
-	if (await hasExecutableClient(params.targetPath)) return {
-		status: "already_installed",
+	const inspectServiceApp = params.inspectServiceApp ?? inspectTrustedServiceApp;
+	const source = await findUsableServiceApp(params.sourceAppCandidates ?? [], inspectServiceApp);
+	if (!source) return {
+		status: "source_missing",
 		changed: false,
 		targetPath: params.targetPath
 	};
-	const sourcePath = await findUsableServiceApp(params.sourceAppCandidates ?? resolveMacOSDesktopCodexComputerUseServiceAppCandidates(params.platform, params.appServerCommand));
-	if (!sourcePath) return {
-		status: "source_missing",
+	const { path: sourcePath, identity: sourceIdentity } = source;
+	const ownedParent = await prepareOwnedServiceParent({
+		ownershipRoot: params.ownershipRoot,
+		codexHome: params.codexHome,
+		targetParent: params.targetParent
+	});
+	const operationTargetPath = path.join(ownedParent.realPath, SERVICE_APP_NAME);
+	await assertNotSymlink(operationTargetPath, "Computer Use service target");
+	const initialTarget = await readServiceAppSnapshot(operationTargetPath, inspectServiceApp);
+	if (initialTarget.identity && identitiesMatch(initialTarget.identity, sourceIdentity)) return {
+		status: "already_current",
 		changed: false,
-		targetPath: params.targetPath
+		targetPath: params.targetPath,
+		sourcePath,
+		sourceBuild: sourceIdentity.build
 	};
-	const targetParent = path.dirname(params.targetPath);
-	await fs.mkdir(targetParent, { recursive: true });
-	const stagingRoot = await fs.mkdtemp(path.join(targetParent, ".service-app.staging-"));
+	await assertOwnedServiceParentStable(ownedParent);
+	const stagingRoot = await fs.mkdtemp(path.join(ownedParent.realPath, ".service-app.staging-"));
+	const stagingRootIdentity = await readRealDirectoryIdentity(stagingRoot, "Computer Use service staging directory");
 	const stagedPath = path.join(stagingRoot, SERVICE_APP_NAME);
-	const backupPath = path.join(targetParent, `.service-app.backup-${process.pid}-${Date.now()}`);
+	const backupPath = path.join(ownedParent.realPath, `.service-app.backup-${process.pid}-${Date.now()}`);
 	let backupCreated = false;
 	try {
 		await (params.copyServiceApp ?? copyServiceAppWithDitto)(sourcePath, stagedPath);
-		if (!await hasExecutableClient(stagedPath)) throw new Error(`Copied Computer Use service app is incomplete at ${stagedPath}.`);
-		if (await pathExists$1(params.targetPath)) {
-			await fs.rename(params.targetPath, backupPath);
+		await assertOwnedServiceParentStable(ownedParent);
+		await assertDirectoryIdentityStable(stagingRootIdentity, "Computer Use service staging directory");
+		await assertNotSymlink(stagedPath, "Copied Computer Use service app");
+		const stagedIdentity = await inspectServiceApp(stagedPath);
+		if (!stagedIdentity || !identitiesMatch(stagedIdentity, sourceIdentity)) throw new Error(`Copied Computer Use service app at ${stagedPath} does not match its selected signed source.`);
+		const stagedSnapshot = await readServiceAppSnapshot(stagedPath, inspectServiceApp);
+		const currentSourceIdentity = await inspectServiceApp(sourcePath);
+		await assertOwnedServiceParentStable(ownedParent);
+		if (!currentSourceIdentity || !identitiesMatch(currentSourceIdentity, sourceIdentity)) throw new Error("Selected Computer Use service source changed during refresh.");
+		await assertNotSymlink(operationTargetPath, "Computer Use service target");
+		if (await pathExists$1(operationTargetPath)) {
+			await assertOwnedServiceParentStable(ownedParent);
+			await fs.rename(operationTargetPath, backupPath);
+			await assertOwnedServiceParentStable(ownedParent);
 			backupCreated = true;
-			if (await hasExecutableClient(backupPath)) {
-				await fs.rename(backupPath, params.targetPath);
+			const movedTarget = await readServiceAppSnapshot(backupPath, inspectServiceApp);
+			if (movedTarget.identity && identitiesMatch(movedTarget.identity, sourceIdentity)) {
+				await assertOwnedServiceParentStable(ownedParent);
+				await fs.rename(backupPath, operationTargetPath);
+				await assertOwnedServiceParentStable(ownedParent);
 				backupCreated = false;
 				return {
-					status: "already_installed",
+					status: "already_current",
 					changed: false,
 					targetPath: params.targetPath,
-					sourcePath
+					sourcePath,
+					sourceBuild: sourceIdentity.build
 				};
 			}
+			if (!snapshotsMatch(initialTarget, movedTarget)) {
+				await assertOwnedServiceParentStable(ownedParent);
+				await fs.rename(backupPath, operationTargetPath);
+				await assertOwnedServiceParentStable(ownedParent);
+				backupCreated = false;
+				throw new Error("Computer Use service target changed to an unexpected generation during refresh.");
+			}
 		}
 		try {
-			await fs.rename(stagedPath, params.targetPath);
+			await assertOwnedServiceParentStable(ownedParent);
+			await fs.rename(stagedPath, operationTargetPath);
+			await assertOwnedServiceParentStable(ownedParent);
 		} catch (error) {
-			if (!await hasExecutableClient(params.targetPath)) {
+			await assertOwnedServiceParentStable(ownedParent);
+			await assertNotSymlink(operationTargetPath, "Computer Use service target");
+			const winnerIdentity = await inspectServiceApp(operationTargetPath);
+			if (!winnerIdentity || !identitiesMatch(winnerIdentity, sourceIdentity)) {
 				if (backupCreated) {
-					await fs.rename(backupPath, params.targetPath);
-					backupCreated = false;
+					if (!await pathExists$1(operationTargetPath)) {
+						await assertOwnedServiceParentStable(ownedParent);
+						await fs.rename(backupPath, operationTargetPath);
+						await assertOwnedServiceParentStable(ownedParent);
+						backupCreated = false;
+					}
 				}
 				throw error;
 			}
 			if (backupCreated) {
+				await assertOwnedServiceParentStable(ownedParent);
+				await assertNotSymlink(backupPath, "Computer Use service backup");
 				await fs.rm(backupPath, {
 					recursive: true,
 					force: true
 				});
+				await assertOwnedServiceParentStable(ownedParent);
 				backupCreated = false;
 			}
 			return {
-				status: "already_installed",
+				status: "already_current",
 				changed: false,
 				targetPath: params.targetPath,
-				sourcePath
+				sourcePath,
+				sourceBuild: sourceIdentity.build
 			};
 		}
+		await assertNotSymlink(operationTargetPath, "Installed Computer Use service app");
+		const installedSnapshot = await readServiceAppSnapshot(operationTargetPath, inspectServiceApp);
+		if (!installedSnapshot.identity || !identitiesMatch(installedSnapshot.identity, sourceIdentity)) {
+			if (filesystemSnapshotsMatch(installedSnapshot, stagedSnapshot)) {
+				await assertOwnedServiceParentStable(ownedParent);
+				await fs.rm(operationTargetPath, {
+					recursive: true,
+					force: true
+				});
+				await assertOwnedServiceParentStable(ownedParent);
+				if (backupCreated) {
+					await fs.rename(backupPath, operationTargetPath);
+					await assertOwnedServiceParentStable(ownedParent);
+					backupCreated = false;
+				}
+			}
+			throw new Error("Installed Computer Use service app failed post-install identity verification.");
+		}
 		if (backupCreated) {
+			await assertOwnedServiceParentStable(ownedParent);
+			await assertNotSymlink(backupPath, "Computer Use service backup");
 			await fs.rm(backupPath, {
 				recursive: true,
 				force: true
 			});
+			await assertOwnedServiceParentStable(ownedParent);
 			backupCreated = false;
 		}
 		return {
-			status: "installed",
+			status: initialTarget.exists ? "refreshed" : "installed",
 			changed: true,
 			targetPath: params.targetPath,
-			sourcePath
+			sourcePath,
+			sourceBuild: sourceIdentity.build,
+			...initialTarget.identity ? { previousBuild: initialTarget.identity.build } : {}
 		};
+	} catch (error) {
+		if (backupCreated && await ownedServiceParentIsStable(ownedParent) && !await pathExists$1(operationTargetPath)) {
+			await assertOwnedServiceParentStable(ownedParent);
+			await fs.rename(backupPath, operationTargetPath);
+			backupCreated = false;
+		}
+		throw error;
 	} finally {
-		await fs.rm(stagingRoot, {
+		if (await ownedServiceParentIsStable(ownedParent) && await directoryIdentityIsStable(stagingRootIdentity)) await fs.rm(stagingRoot, {
 			recursive: true,
 			force: true
 		});
@@ -289,8 +568,43 @@ async function ensureCodexComputerUseServiceAppOnce(params) {
 async function pathExists$1(filePath) {
 	return await fs.lstat(filePath).then(() => true, () => false);
 }
-async function findUsableServiceApp(candidates) {
-	for (const candidate of candidates) if (await hasExecutableClient(candidate)) return candidate;
+async function findUsableServiceApp(candidates, inspectServiceApp) {
+	for (const candidate of candidates) {
+		const identity = await inspectServiceApp(candidate);
+		if (identity) return {
+			path: candidate,
+			identity
+		};
+	}
+}
+async function readServiceAppSnapshot(appPath, inspectServiceApp) {
+	if (!await pathExists$1(appPath)) return { exists: false };
+	return {
+		exists: true,
+		identity: await inspectServiceApp(appPath),
+		filesystemKey: await readServiceAppFilesystemKey(appPath)
+	};
+}
+async function readServiceAppFilesystemKey(appPath) {
+	const paths = [
+		appPath,
+		path.join(appPath, "Contents", "Info.plist"),
+		path.join(appPath, CLIENT_RELATIVE_PATH)
+	];
+	return (await Promise.all(paths.map(async (entryPath) => await fs.stat(entryPath).then((stat) => `${stat.dev}:${stat.ino}:${stat.size}:${stat.mtimeMs}`, () => "missing")))).join("|");
+}
+function snapshotsMatch(left, right) {
+	if (left.exists !== right.exists) return false;
+	if (!left.exists) return true;
+	if (left.filesystemKey && right.filesystemKey && left.filesystemKey !== right.filesystemKey) return false;
+	if (left.identity || right.identity) return Boolean(left.identity && right.identity && identitiesMatch(left.identity, right.identity));
+	return left.filesystemKey !== void 0 && left.filesystemKey === right.filesystemKey;
+}
+function filesystemSnapshotsMatch(left, right) {
+	return Boolean(left.exists && right.exists && left.filesystemKey && right.filesystemKey && left.filesystemKey === right.filesystemKey);
+}
+function identitiesMatch(left, right) {
+	return left.bundleId === right.bundleId && left.version === right.version && left.build === right.build && left.cdHash === right.cdHash && left.teamId === right.teamId && left.clientBundleId === right.clientBundleId && left.clientCdHash === right.clientCdHash && left.clientTeamId === right.clientTeamId;
 }
 async function hasExecutableClient(appPath) {
 	try {
@@ -300,6 +614,90 @@ async function hasExecutableClient(appPath) {
 		return false;
 	}
 }
+async function inspectTrustedServiceApp(appPath) {
+	if (!await hasExecutableClient(appPath)) return;
+	const clientAppPath = path.join(appPath, CLIENT_APP_RELATIVE_PATH);
+	try {
+		await verifyTrustedBundle(appPath, SERVICE_BUNDLE_ID, true);
+		await verifyTrustedBundle(clientAppPath, CLIENT_BUNDLE_ID, false);
+		const [info, serviceSignature, clientSignature] = await Promise.all([
+			readBundleInfo(appPath),
+			readCodeSignature(appPath),
+			readCodeSignature(clientAppPath)
+		]);
+		if (!info || serviceSignature.identifier !== SERVICE_BUNDLE_ID || serviceSignature.teamId !== OPENAI_TEAM_ID || clientSignature.identifier !== CLIENT_BUNDLE_ID || clientSignature.teamId !== OPENAI_TEAM_ID) return;
+		return {
+			bundleId: serviceSignature.identifier,
+			version: info.version,
+			build: info.build,
+			cdHash: serviceSignature.cdHash,
+			teamId: serviceSignature.teamId,
+			clientBundleId: clientSignature.identifier,
+			clientCdHash: clientSignature.cdHash,
+			clientTeamId: clientSignature.teamId
+		};
+	} catch {
+		return;
+	}
+}
+async function verifyTrustedBundle(appPath, bundleId, deep) {
+	const requirement = `anchor apple generic and certificate leaf[subject.OU] = "${OPENAI_TEAM_ID}" and identifier "${bundleId}"`;
+	await runExec("/usr/bin/codesign", [
+		"--verify",
+		"--strict",
+		...deep ? ["--deep"] : [],
+		`-R=${requirement}`,
+		appPath
+	], {
+		logOutput: false,
+		timeoutMs: INSPECT_TIMEOUT_MS
+	});
+}
+async function readBundleInfo(appPath) {
+	const result = await runExec("/usr/bin/plutil", [
+		"-convert",
+		"json",
+		"-o",
+		"-",
+		"--",
+		path.join(appPath, "Contents", "Info.plist")
+	], {
+		logOutput: false,
+		timeoutMs: INSPECT_TIMEOUT_MS
+	});
+	const parsed = JSON.parse(result.stdout);
+	if (!isRecord(parsed)) return;
+	const version = parsed.CFBundleShortVersionString;
+	const build = parsed.CFBundleVersion;
+	return typeof version === "string" && version && typeof build === "string" && build ? {
+		version,
+		build
+	} : void 0;
+}
+async function readCodeSignature(appPath) {
+	const result = await runExec("/usr/bin/codesign", [
+		"-d",
+		"--verbose=4",
+		appPath
+	], {
+		logOutput: false,
+		timeoutMs: INSPECT_TIMEOUT_MS
+	});
+	const output = `${result.stdout}\n${result.stderr}`;
+	const identifier = readCodeSignField(output, "Identifier");
+	const teamId = readCodeSignField(output, "TeamIdentifier");
+	const cdHash = readCodeSignField(output, "CDHash").toLowerCase();
+	if (!identifier || !teamId || !/^[a-f0-9]+$/.test(cdHash)) throw new Error(`Could not inspect the signed identity at ${appPath}.`);
+	return {
+		identifier,
+		teamId,
+		cdHash
+	};
+}
+function readCodeSignField(output, field) {
+	const prefix = `${field}=`;
+	return output.split(/\r?\n/u).find((candidate) => candidate.startsWith(prefix))?.slice(prefix.length).trim() ?? "";
+}
 async function copyServiceAppWithDitto(sourcePath, targetPath) {
 	await runExec("/usr/bin/ditto", [
 		"--noqtn",
@@ -458,7 +856,8 @@ async function resolveCodexAppServerPreparedAuthProfileSnapshot(params) {
 async function resolveCodexAppServerPreparedAuthHandoff(params) {
 	const usesNativeHome = params.homeScope === "user";
 	if (params.requirePreparedAuth && usesNativeHome) throw createCodexAppServerAuthError("Codex remote-exec cloud placement requires prepared OpenAI auth. Configure an OpenAI API-key, OAuth, or token profile and use appServer.homeScope=\"agent\"; ambient credentials and native Codex auth are not allowed.");
-	if (params.authRequirement === "api-key" && !usesNativeHome) {
+	if (usesNativeHome) return { nativeAuthProfile: true };
+	if (params.authRequirement === "api-key") {
 		const apiKey = params.resolvedApiKey?.trim();
 		if (!apiKey) throw new Error("Prepared Codex API-key route is missing its resolved API key.");
 		return {
@@ -476,7 +875,7 @@ async function resolveCodexAppServerPreparedAuthHandoff(params) {
 		agentDir: params.agentDir,
 		config: params.config
 	});
-	if (usesNativeHome || params.authRequirement !== "subscription" && !params.requirePreparedAuth) return {
+	if (params.authRequirement !== "subscription" && !params.requirePreparedAuth) return {
 		authProfileId,
 		nativeAuthProfile
 	};
@@ -584,9 +983,11 @@ async function withCodexHomeEnvironment(startOptions, agentDir, pluginConfig) {
 		codexHome,
 		config: computerUseConfig
 	});
-	if (computerUseConfig.enabled && computerUseConfig.autoInstall) try {
+	const ownsIsolatedCodexHome = startOptions.homeScope !== "user" && !startOptions.env?.[CODEX_HOME_ENV_VAR]?.trim();
+	if (computerUseConfig.enabled && computerUseConfig.autoInstall && ownsIsolatedCodexHome) try {
 		await ensureCodexComputerUseServiceApp({
 			codexHome,
+			ownershipRoot: agentDir,
 			appServerCommand: startOptions.command
 		});
 	} catch (error) {
@@ -1105,12 +1506,12 @@ function ensureCodexAppServerClientRuntime(client, context) {
 	client.addRequestHandler(async (request) => {
 		if (request.method !== "account/chatgptAuthTokens/refresh") return;
 		if (runtime.context.authMode === "prepared-api-key") throw new Error("ChatGPT token refresh is unavailable for prepared Codex API-key auth.");
-		return await refreshCodexAppServerAuthTokens({
+		return { ...await refreshCodexAppServerAuthTokens({
 			agentDir: runtime.context.agentDir,
 			authProfileId: runtime.context.authProfileId,
 			...runtime.context.authProfileStore ? { authProfileStore: runtime.context.authProfileStore } : {},
 			config: runtime.context.config
-		});
+		}) };
 	});
 	client.addNotificationHandler((notification) => {
 		if (notification.method === "account/rateLimits/updated") {
@@ -1362,6 +1763,15 @@ function protectCodexAppServerLiveThread(client, threadId) {
 	};
 }
 //#endregion
+//#region extensions/codex/src/app-server/elicitation-response.ts
+function createCodexElicitationResponse(action, content = null, meta = null) {
+	return {
+		action,
+		content,
+		_meta: meta
+	};
+}
+//#endregion
 //#region extensions/codex/src/app-server/rpc-error.ts
 /** RPC error wrapper that preserves app-server error code and data. */
 var CodexAppServerRpcError = class extends Error {
@@ -1558,11 +1968,273 @@ function websocketFrameToText(data) {
 	return Buffer.from(data).toString("utf8");
 }
 //#endregion
+//#region extensions/codex/src/app-server/transport-process-containment.ts
+const PROCESS_COLUMNS = "pid=,ppid=,pgid=,stat=,lstart=";
+const MAX_CONTAINED_PROCESSES = 512;
+const MAX_PROCESS_CONTAINMENT_MS = 2e3;
+const MAX_PROCESS_QUIESCE_PASSES = 16;
+const PROCESS_INSPECTION_MAX_BYTES = 8 * 1024 * 1024;
+async function terminateCodexAppServerDescendants(child) {
+	const rootPid = child.pid;
+	if (process.platform === "win32" || !rootPid || !child.kill || hasExited(child)) return;
+	const deadline = Date.now() + MAX_PROCESS_CONTAINMENT_MS;
+	const snapshot = await readProcessSnapshot(deadline);
+	if (!snapshot || Date.now() >= deadline) return;
+	const root = snapshot.find((row) => row.pid === rootPid);
+	if (!root || !isSameLiveRoot(root, root)) return;
+	const initialDescendants = collectDescendants(snapshot, [rootPid]);
+	if (initialDescendants.length > MAX_CONTAINED_PROCESSES) return;
+	const stoppedDescendants = /* @__PURE__ */ new Map();
+	if (!await signalSameRoot(root, "SIGSTOP", deadline)) return;
+	let resumeRootOnUnwind = true;
+	try {
+		const descendants = await quiesceDescendants(root, initialDescendants, stoppedDescendants, deadline);
+		if (!descendants) return;
+		for (const descendant of descendants.toReversed()) {
+			if (Date.now() >= deadline) return;
+			if (!descendant.state.startsWith("Z")) {
+				if (!await signalSameProcess(descendant, "SIGKILL", deadline) || Date.now() >= deadline) return;
+			}
+		}
+		resumeRootOnUnwind = false;
+		let resumed = false;
+		return () => {
+			if (resumed) return;
+			resumed = true;
+			resumeTransportRoot(child, root, false);
+		};
+	} finally {
+		if (resumeRootOnUnwind) {
+			for (const descendant of stoppedDescendants.values()) signalProcess(descendant.pid, "SIGCONT");
+			resumeTransportRoot(child, root, true);
+		}
+	}
+}
+async function quiesceDescendants(root, initialDescendants, stopped, deadline) {
+	const provenByPid = new Map(initialDescendants.map((descendant) => [descendant.pid, descendant]));
+	const stopFailures = /* @__PURE__ */ new Map();
+	for (let pass = 0; pass < MAX_PROCESS_QUIESCE_PASSES; pass += 1) {
+		if (Date.now() >= deadline) return;
+		const snapshot = await readProcessSnapshot(deadline);
+		if (!snapshot || Date.now() >= deadline) return;
+		const currentRoot = snapshot.find((row) => row.pid === root.pid);
+		if (!currentRoot || !isSameLiveRoot(currentRoot, root)) return;
+		if (!isSameLiveRoot(currentRoot, root, true)) {
+			if (!await signalSameRoot(root, "SIGSTOP", deadline) || Date.now() >= deadline) return;
+			continue;
+		}
+		const snapshotByPid = new Map(snapshot.map((process) => [process.pid, process]));
+		const liveProven = [];
+		for (const proven of provenByPid.values()) {
+			const current = snapshotByPid.get(proven.pid);
+			if (!current) {
+				provenByPid.delete(proven.pid);
+				stopped.delete(identityKey(proven));
+				continue;
+			}
+			if (!hasSameIdentity(proven, current)) return;
+			provenByPid.set(current.pid, current);
+			const key = identityKey(current);
+			if (stopped.has(key)) stopped.set(key, current);
+			liveProven.push(current);
+		}
+		const descendants = collectDescendants(snapshot, [root.pid, ...liveProven.map(({ pid }) => pid)]);
+		for (const descendant of descendants) {
+			const proven = provenByPid.get(descendant.pid);
+			if (proven && !hasSameIdentity(proven, descendant)) return;
+			provenByPid.set(descendant.pid, descendant);
+		}
+		if (provenByPid.size > MAX_CONTAINED_PROCESSES) return;
+		const quiescenceTargets = new Map(liveProven.map((process) => [process.pid, process]));
+		for (const descendant of descendants) quiescenceTargets.set(descendant.pid, descendant);
+		let allStopped = true;
+		for (const descendant of quiescenceTargets.values()) {
+			if (Date.now() >= deadline) return;
+			if (isStoppedState(descendant.state)) continue;
+			const stopQueued = await signalSameProcess(descendant, "SIGSTOP", deadline);
+			if (Date.now() >= deadline) return;
+			if (stopQueued) {
+				stopFailures.delete(identityKey(descendant));
+				stopped.set(identityKey(descendant), descendant);
+			} else {
+				const key = identityKey(descendant);
+				const failures = (stopFailures.get(key) ?? 0) + 1;
+				if (failures >= 2) return;
+				stopFailures.set(key, failures);
+			}
+			if (!isUninterruptibleState(descendant.state) || !stopQueued) allStopped = false;
+		}
+		if (allStopped) return [...provenByPid.values()];
+	}
+}
+async function readProcessSnapshot(deadline) {
+	return await readProcesses(["-axo", PROCESS_COLUMNS], deadline);
+}
+async function readProcess(pid, deadline) {
+	return (await readProcesses([
+		"-o",
+		PROCESS_COLUMNS,
+		"-p",
+		String(pid)
+	], deadline))?.find((row) => row.pid === pid);
+}
+async function readProcesses(args, deadline) {
+	const remainingMs = deadline - Date.now();
+	if (remainingMs <= 0) return;
+	return await new Promise((resolve) => {
+		let settled = false;
+		const settle = (processes) => {
+			if (settled) return;
+			settled = true;
+			clearTimeout(timer);
+			resolve(processes);
+		};
+		const inspector = execFile("ps", args, {
+			encoding: "utf8",
+			maxBuffer: PROCESS_INSPECTION_MAX_BYTES
+		}, (error, stdout) => {
+			settle(error ? void 0 : parseProcesses(stdout));
+		});
+		const timer = setTimeout(() => {
+			settle(void 0);
+			inspector.stdout?.destroy();
+			inspector.stderr?.destroy();
+			inspector.kill("SIGKILL");
+			inspector.unref();
+		}, Math.max(1, remainingMs));
+		timer.unref?.();
+	});
+}
+function parseProcesses(output) {
+	const rows = [];
+	for (const line of output.split("\n")) {
+		const match = /^\s*(\d+)\s+(\d+)\s+(\d+)\s+(\S+)\s+(.+?)\s*$/.exec(line);
+		if (!match) continue;
+		const pid = Number(match[1] ?? "");
+		const ppid = Number(match[2] ?? "");
+		const pgid = Number(match[3] ?? "");
+		const startedAt = (match[5] ?? "").trim().replace(/\s+/g, " ");
+		if (![
+			pid,
+			ppid,
+			pgid
+		].every(Number.isSafeInteger) || pid <= 0 || ppid < 0 || pgid <= 0 || !startedAt) continue;
+		rows.push({
+			pid,
+			ppid,
+			pgid,
+			state: match[4] ?? "",
+			startedAt
+		});
+	}
+	return rows;
+}
+function collectDescendants(snapshot, rootPids) {
+	const childrenByParent = /* @__PURE__ */ new Map();
+	for (const row of snapshot) {
+		const children = childrenByParent.get(row.ppid) ?? [];
+		children.push(row);
+		childrenByParent.set(row.ppid, children);
+	}
+	const descendants = [];
+	const pending = [...new Set(rootPids)];
+	const seen = new Set(pending);
+	for (const parentPid of pending) for (const child of childrenByParent.get(parentPid) ?? []) {
+		if (seen.has(child.pid)) continue;
+		seen.add(child.pid);
+		descendants.push(child);
+		pending.push(child.pid);
+	}
+	return descendants;
+}
+function isStoppedState(state) {
+	return state.startsWith("T") || state.startsWith("t") || state.startsWith("Z");
+}
+function isQuiescedState(state) {
+	return isStoppedState(state) || isUninterruptibleState(state);
+}
+function isUninterruptibleState(state) {
+	return state.startsWith("D") || state.startsWith("U");
+}
+function isSameLiveProcess(current, expected) {
+	return current.pgid === expected.pgid && !current.state.startsWith("Z") && hasSameIdentity(current, expected);
+}
+function isSameLiveRoot(current, expected, requireStopped = false) {
+	return current.ppid === process.pid && (!requireStopped || isQuiescedState(current.state)) && isSameLiveProcess(current, expected);
+}
+async function signalSameRoot(root, signal, deadline) {
+	const current = await readProcess(root.pid, deadline);
+	return Boolean(current && isSameLiveRoot(current, root) && signalProcess(current.pid, signal));
+}
+function resumeTransportRoot(child, root, allowSynchronousPidFallback) {
+	try {
+		if (child.kill) {
+			child.kill("SIGCONT");
+			return;
+		}
+	} catch {
+		if (!allowSynchronousPidFallback) return;
+	}
+	if (allowSynchronousPidFallback) signalProcess(root.pid, "SIGCONT");
+}
+async function signalSameProcess(expected, signal, deadline) {
+	const current = await readProcess(expected.pid, deadline);
+	return Boolean(current && isSameLiveProcess(current, expected) && signalProcess(current.pid, signal));
+}
+function hasSameIdentity(left, right) {
+	return identityKey(left) === identityKey(right);
+}
+function identityKey(row) {
+	return `${row.pid}\0${row.startedAt}`;
+}
+function hasExited(child) {
+	return child.exitCode != null || child.signalCode != null;
+}
+function signalProcess(pid, signal) {
+	try {
+		process.kill(pid, signal);
+		return true;
+	} catch {
+		return false;
+	}
+}
+//#endregion
 //#region extensions/codex/src/app-server/transport.ts
+/**
+* Shared transport lifecycle helpers for stdio and WebSocket Codex app-server
+* connections.
+*/
+const CODEX_APP_SERVER_TRANSPORT_CLOSES = /* @__PURE__ */ new WeakMap();
 /** Starts graceful transport shutdown and schedules a force kill fallback. */
 function closeCodexAppServerTransport(child, options = {}) {
-	child.stdin.end?.();
-	child.stdin.destroy?.();
+	beginCodexAppServerTransportClose(child, options);
+}
+function beginCodexAppServerTransportClose(child, options) {
+	const current = CODEX_APP_SERVER_TRANSPORT_CLOSES.get(child);
+	if (current) return current;
+	if (process.platform === "win32" || !child.pid || !child.kill || hasCodexAppServerTransportExited(child)) {
+		finishCodexAppServerTransportClose(child, options);
+		const completed = Promise.resolve();
+		CODEX_APP_SERVER_TRANSPORT_CLOSES.set(child, completed);
+		return completed;
+	}
+	const closing = (async () => {
+		let resumeRoot;
+		try {
+			resumeRoot = await terminateCodexAppServerDescendants(child);
+		} catch {
+			resumeRoot = void 0;
+		}
+		try {
+			finishCodexAppServerTransportClose(child, options, resumeRoot);
+		} catch {
+			signalCodexAppServerTransport(child, "SIGKILL");
+		}
+	})();
+	CODEX_APP_SERVER_TRANSPORT_CLOSES.set(child, closing);
+	return closing;
+}
+function finishCodexAppServerTransportClose(child, options, resumeRoot) {
 	const forceKillDelayMs = options.forceKillDelayMs ?? 1e3;
 	const forceKill = setTimeout(() => {
 		if (hasCodexAppServerTransportExited(child)) return;
@@ -1574,6 +2246,12 @@ function closeCodexAppServerTransport(child, options = {}) {
 		child.stdout.destroy?.();
 		child.stderr.destroy?.();
 	});
+	try {
+		child.stdin.end?.();
+		child.stdin.destroy?.();
+	} finally {
+		resumeRoot?.();
+	}
 	child.unref?.();
 	child.stdout.unref?.();
 	child.stderr.unref?.();
@@ -1581,7 +2259,7 @@ function closeCodexAppServerTransport(child, options = {}) {
 }
 /** Closes a transport and waits briefly for an exit event. */
 async function closeCodexAppServerTransportAndWait(child, options = {}) {
-	if (!hasCodexAppServerTransportExited(child)) closeCodexAppServerTransport(child, options);
+	if (!hasCodexAppServerTransportExited(child)) await beginCodexAppServerTransportClose(child, options);
 	return await waitForCodexAppServerTransportExit(child, options.exitTimeoutMs ?? 2e3);
 }
 function hasCodexAppServerTransportExited(child) {
@@ -1614,15 +2292,6 @@ function signalCodexAppServerTransport(child, signal) {
 	child.kill?.(signal);
 }
 //#endregion
-//#region extensions/codex/src/app-server/version.ts
-/**
-* Version and package pins for the managed Codex app-server runtime.
-*/
-/** Exact Codex app-server version shipped and supported by the OpenClaw Codex bridge. */
-const CODEX_APP_SERVER_VERSION = "0.147.0";
-/** npm package name for the managed Codex app-server binary. */
-const MANAGED_CODEX_APP_SERVER_PACKAGE = "@openai/codex";
-//#endregion
 //#region extensions/codex/src/app-server/client.ts
 /**
 * JSON-RPC client for Codex app-server transports, including request/response
@@ -1756,7 +2425,13 @@ var CodexAppServerClient = class CodexAppServerClient {
 				title: "OpenClaw",
 				version: OPENCLAW_VERSION
 			},
-			capabilities: { experimentalApi: true }
+			capabilities: {
+				experimentalApi: true,
+				extensions: {
+					"openai/standard-form-input": {},
+					"openai/form": {}
+				}
+			}
 		});
 		this.serverVersion = assertSupportedCodexAppServerVersion(response);
 		this.runtimeIdentity = buildCodexAppServerRuntimeIdentity(response, this.serverVersion);
@@ -2206,7 +2881,7 @@ function defaultServerRequestResponse(request) {
 		scope: "turn"
 	};
 	if (request.method === "item/tool/requestUserInput") return { answers: {} };
-	if (request.method === "mcpServer/elicitation/request") return { action: "decline" };
+	if (request.method === "mcpServer/elicitation/request") return createCodexElicitationResponse("decline", null, { message: "OpenClaw has no interactive handler for this elicitation." });
 	return {};
 }
 function stringifyCodexAppServerMessage(message) {
@@ -2226,14 +2901,20 @@ function timeoutServerRequestResponse(request) {
 var CodexAppServerVersionError = class extends Error {
 	constructor(detectedVersion) {
 		const detected = detectedVersion ? `detected ${detectedVersion}` : "OpenClaw could not determine the running Codex version";
-		super(`Codex app-server ${CODEX_APP_SERVER_VERSION} is required, but ${detected}. Update the configured Codex app-server binary, or remove custom command overrides to use the managed binary.`);
+		super(`Codex app-server ${MIN_SUPPORTED_CODEX_APP_SERVER_VERSION} or newer is required, but ${detected}. Update the configured Codex app-server binary, or remove custom command overrides to use the managed binary.`);
 		this.name = "CodexAppServerVersionError";
 		this.detectedVersion = detectedVersion;
 	}
 };
 function assertSupportedCodexAppServerVersion(response) {
 	const detectedVersion = readCodexVersionFromUserAgent(response.userAgent);
-	if (detectedVersion !== "0.147.0") throw new CodexAppServerVersionError(detectedVersion);
+	if (!detectedVersion) throw new CodexAppServerVersionError(detectedVersion);
+	const detected = parse(detectedVersion);
+	if (!detected || detected.compare("0.147.0") < 0) throw new CodexAppServerVersionError(detectedVersion);
+	if (detected.compare("0.149.1") > 0) embeddedAgentLog.warn("codex app-server is newer than OpenClaw's managed runtime; continuing with normal startup validation", {
+		detectedVersion,
+		validatedVersion: CODEX_APP_SERVER_VERSION
+	});
 	return detectedVersion;
 }
 function isUnsupportedCodexAppServerVersionError(error) {
@@ -2397,206 +3078,6 @@ function resolveCodexGatewayTimeoutWithGraceMs(timeoutMs, graceMs = 1e4) {
 	return addTimerTimeoutGraceMs(timeout, resolveTimerTimeoutMs(graceMs, 0, 0)) ?? timeout;
 }
 //#endregion
-//#region extensions/codex/src/app-server/managed-binary.ts
-/**
-* Resolves the managed Codex app-server binary shipped with or installed beside
-* the Codex plugin before stdio startup.
-*/
-const CODEX_PLUGIN_ROOT = resolveDefaultCodexPluginRoot(path.dirname(fileURLToPath(import.meta.url)));
-const MACOS_DESKTOP_CODEX_APP_SERVER_COMMANDS = ["/Applications/ChatGPT.app/Contents/Resources/codex", "/Applications/Codex.app/Contents/Resources/codex"];
-/** Rewrites managed stdio start options to point at an executable Codex binary path. */
-async function resolveManagedCodexAppServerStartOptions(startOptions, options = {}) {
-	if (startOptions.transport !== "stdio" || startOptions.commandSource !== "managed") return startOptions;
-	const platform = options.platform ?? process.platform;
-	const paths = resolveManagedCodexAppServerPaths({
-		platform,
-		pluginRoot: options.pluginRoot,
-		managedCommandOrder: startOptions.managedCommandOrder
-	});
-	const pathExists = options.pathExists ?? commandPathExists;
-	const commandPaths = await findManagedCodexAppServerCommandPaths({
-		candidateCommandPaths: paths.candidateCommandPaths,
-		pathExists,
-		platform
-	});
-	const commandPath = expectDefined(commandPaths[0], "resolved managed Codex command path");
-	const managedFallbackCommandPaths = commandPaths.slice(1);
-	return {
-		...startOptions,
-		command: commandPath,
-		commandSource: "resolved-managed",
-		...managedFallbackCommandPaths.length > 0 ? { managedFallbackCommandPaths } : {}
-	};
-}
-/** Resolves the native artifact behind a successful managed launcher selection. */
-function resolveManagedCodexNativeCommand(command, options = {}) {
-	const platform = options.platform ?? process.platform;
-	if (platform === "darwin" && MACOS_DESKTOP_CODEX_APP_SERVER_COMMANDS.some((candidate) => candidate === command)) return command;
-	const target = resolveCodexNativeTarget(platform, options.arch ?? process.arch);
-	if (!target) return;
-	const packageRoot = resolveManagedCodexPackageRootForCommand(command, platform);
-	if (!packageRoot) return;
-	const resolvePackageJson = options.resolvePackageJson ?? resolvePackageJsonFromRoot;
-	const pathExists = options.pathExists ?? existsSync;
-	for (const packageName of [target.packageName, MANAGED_CODEX_APP_SERVER_PACKAGE]) {
-		const packageJsonPath = resolvePackageJson(packageName, packageRoot);
-		if (!packageJsonPath) continue;
-		const candidate = path.join(path.dirname(packageJsonPath), "vendor", target.triple, "bin", platform === "win32" ? "codex.exe" : "codex");
-		if (pathExists(candidate)) return candidate;
-	}
-}
-function resolveManagedCodexPackageRootForCommand(command, platform) {
-	const pathApi = pathForPlatform(platform);
-	const commandPaths = [command];
-	try {
-		commandPaths.unshift(realpathSync(command));
-	} catch {}
-	for (const commandPath of commandPaths) {
-		let current = pathApi.dirname(commandPath);
-		while (true) {
-			if (pathApi.basename(current) === "codex" && pathApi.basename(pathApi.dirname(current)) === "@openai") return current;
-			if (pathApi.basename(current) === ".bin") return pathApi.join(pathApi.dirname(current), "@openai", "codex");
-			const parent = pathApi.dirname(current);
-			if (parent === current) break;
-			current = parent;
-		}
-	}
-}
-function resolveCodexNativeTarget(platform, arch) {
-	if ((platform === "linux" || platform === "android") && arch === "x64") return {
-		packageName: "@openai/codex-linux-x64",
-		triple: "x86_64-unknown-linux-musl"
-	};
-	if ((platform === "linux" || platform === "android") && arch === "arm64") return {
-		packageName: "@openai/codex-linux-arm64",
-		triple: "aarch64-unknown-linux-musl"
-	};
-	if (platform === "darwin" && arch === "x64") return {
-		packageName: "@openai/codex-darwin-x64",
-		triple: "x86_64-apple-darwin"
-	};
-	if (platform === "darwin" && arch === "arm64") return {
-		packageName: "@openai/codex-darwin-arm64",
-		triple: "aarch64-apple-darwin"
-	};
-	if (platform === "win32" && arch === "x64") return {
-		packageName: "@openai/codex-win32-x64",
-		triple: "x86_64-pc-windows-msvc"
-	};
-	if (platform === "win32" && arch === "arm64") return {
-		packageName: "@openai/codex-win32-arm64",
-		triple: "aarch64-pc-windows-msvc"
-	};
-}
-function resolvePackageJsonFromRoot(packageName, root) {
-	try {
-		return createRequire(path.join(root, "package.json")).resolve(`${packageName}/package.json`);
-	} catch {
-		return;
-	}
-}
-/** Returns the preferred and fallback managed Codex binary paths for a plugin root. */
-function resolveManagedCodexAppServerPaths(params) {
-	const platform = params.platform ?? process.platform;
-	const candidateCommandPaths = resolveManagedCodexAppServerCommandCandidates(params.pluginRoot ?? CODEX_PLUGIN_ROOT, platform, params.managedCommandOrder ?? "package-first");
-	return {
-		commandPath: candidateCommandPaths[0] ?? "",
-		candidateCommandPaths
-	};
-}
-function resolveManagedCodexAppServerCommandCandidates(pluginRoot, platform, managedCommandOrder) {
-	const pathApi = pathForPlatform(platform);
-	const commandName = platform === "win32" ? "codex.cmd" : "codex";
-	const roots = resolveManagedCodexAppServerCandidateRoots(pluginRoot, platform);
-	const packageCommandPaths = [...roots.map((root) => pathApi.join(root, "node_modules", ".bin", commandName)), ...resolveManagedCodexPackageBinCandidates(roots, platform)];
-	const desktopCommandPaths = resolveDesktopCodexAppServerCommandCandidates(platform);
-	const orderedCommandPaths = managedCommandOrder === "desktop-first" ? [...desktopCommandPaths, ...packageCommandPaths] : [...packageCommandPaths, ...desktopCommandPaths];
-	return [...new Set(orderedCommandPaths)];
-}
-function resolveDesktopCodexAppServerCommandCandidates(platform) {
-	return platform === "darwin" ? [...MACOS_DESKTOP_CODEX_APP_SERVER_COMMANDS] : [];
-}
-function resolveDefaultCodexPluginRoot(moduleDir) {
-	const moduleBaseName = path.basename(moduleDir);
-	if (moduleBaseName === "dist" || moduleBaseName === "dist-runtime") return path.dirname(moduleDir);
-	return path.resolve(moduleDir, "..", "..");
-}
-function resolveManagedCodexAppServerCandidateRoots(pluginRoot, platform) {
-	const pathApi = pathForPlatform(platform);
-	const directRoots = [
-		pluginRoot,
-		pathApi.dirname(pluginRoot),
-		pathApi.dirname(pathApi.dirname(pluginRoot)),
-		isDistExtensionRoot(pluginRoot, platform) ? pathApi.dirname(pathApi.dirname(pathApi.dirname(pluginRoot))) : null
-	].filter((root) => Boolean(root));
-	return [.../* @__PURE__ */ new Set([...directRoots, ...resolveNearestNodeModulesProjectRoots(directRoots, platform)])];
-}
-function resolveNearestNodeModulesProjectRoots(roots, platform) {
-	const pathApi = pathForPlatform(platform);
-	const projectRoots = [];
-	for (const root of roots) {
-		let current = pathApi.resolve(root);
-		while (true) {
-			if (pathApi.basename(current) === "node_modules") {
-				projectRoots.push(pathApi.dirname(current));
-				break;
-			}
-			const parent = pathApi.dirname(current);
-			if (parent === current) break;
-			current = parent;
-		}
-	}
-	return projectRoots;
-}
-function resolveManagedCodexPackageBinCandidates(roots, platform) {
-	if (platform === "win32") return [];
-	const candidates = [];
-	for (const root of roots) {
-		const candidate = resolveManagedCodexPackageBinCandidate(root);
-		if (candidate) candidates.push(candidate);
-	}
-	return candidates;
-}
-function resolveManagedCodexPackageBinCandidate(root) {
-	try {
-		const packageJsonPath = createRequire(path.join(root, "package.json")).resolve(`${MANAGED_CODEX_APP_SERVER_PACKAGE}/package.json`);
-		const packageRoot = path.dirname(packageJsonPath);
-		const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8"));
-		const packageBin = packageJson.bin && typeof packageJson.bin === "object" ? packageJson.bin : void 0;
-		const binPath = typeof packageJson.bin === "string" ? packageJson.bin : typeof packageBin?.codex === "string" ? packageBin.codex : null;
-		return binPath ? path.resolve(packageRoot, binPath) : null;
-	} catch {
-		return null;
-	}
-}
-function isDistExtensionRoot(pluginRoot, platform) {
-	const pathApi = pathForPlatform(platform);
-	const extensionsDir = pathApi.dirname(pluginRoot);
-	const distDir = pathApi.dirname(extensionsDir);
-	return pathApi.basename(extensionsDir) === "extensions" && (pathApi.basename(distDir) === "dist" || pathApi.basename(distDir) === "dist-runtime");
-}
-function pathForPlatform(platform) {
-	return platform === "win32" ? path.win32 : path.posix;
-}
-async function findManagedCodexAppServerCommandPaths(params) {
-	const commandPaths = [];
-	for (const commandPath of params.candidateCommandPaths) if (await params.pathExists(commandPath, params.platform)) commandPaths.push(commandPath);
-	if (commandPaths.length > 0) return commandPaths;
-	throw new Error([
-		`Managed Codex app-server binary was not found for ${MANAGED_CODEX_APP_SERVER_PACKAGE}.`,
-		"Reinstall or update OpenClaw, or run pnpm install in a source checkout.",
-		"Set plugins.entries.codex.config.appServer.command or OPENCLAW_CODEX_APP_SERVER_BIN to use a custom Codex binary."
-	].join(" "));
-}
-async function commandPathExists(filePath, platform) {
-	try {
-		await access(filePath, platform === "win32" ? constants.F_OK : constants.X_OK);
-		return true;
-	} catch {
-		return false;
-	}
-}
-//#endregion
 //#region extensions/codex/src/app-server/native-config-fence.ts
 const CODEX_NATIVE_CONFIG_FENCE_STATE = Symbol.for("openclaw.codexNativeConfigFenceState");
 function getFenceState() {
@@ -3088,18 +3569,19 @@ function createSharedCodexAppServerClientStartup(params) {
 		onStartedClient: (startedClient) => {
 			const state = getSharedCodexAppServerClientState();
 			params.entry.client = startedClient;
-			state.entriesByClient.set(startedClient, params.entry);
 			state.liveClients.add(startedClient);
 			startedClient.addCloseHandler((closedClient) => {
-				getSharedCodexAppServerClientState().liveClients.delete(closedClient);
-				clearSharedClientEntryIfCurrent(params.key, closedClient);
+				state.liveClients.delete(closedClient);
+				if (state.entriesByClient.get(closedClient) === params.entry) clearSharedClientEntryIfCurrent(params.key, closedClient);
 			});
 			for (const callback of params.entry.onStartedClientCallbacks) callback(startedClient);
 			retirePendingSharedClientEntryIfUnclaimed(params.key, params.entry);
 		},
 		onInitializedClient: () => initialized.resolve()
 	}).then((client) => {
+		const state = getSharedCodexAppServerClientState();
 		params.entry.client = client;
+		state.entriesByClient.set(client, params.entry);
 		return client;
 	}, (error) => {
 		initialized.reject(error);
@@ -3139,7 +3621,7 @@ async function startInitializedCodexAppServerClient(params) {
 	const timeoutMs = params.timeoutMs ?? 0;
 	const startOptionsCandidates = resolveManagedFallbackStartOptions(params.startOptions);
 	for (const [index, startOptions] of startOptionsCandidates.entries()) {
-		const runtimeArtifactModule = params.runtimeArtifactMode ? await import("./runtime-artifact-BVSPdd6g.js") : void 0;
+		const runtimeArtifactModule = params.runtimeArtifactMode ? await import("./runtime-artifact-BvyT1uyd.js") : void 0;
 		const nativeCommandBeforeStart = startOptions.commandSource === "resolved-managed" ? resolveManagedCodexNativeCommand(startOptions.command) : void 0;
 		const runtimeArtifactBeforeStart = runtimeArtifactModule ? await runtimeArtifactModule.captureCodexAppServerRuntimeArtifactBeforeStart({
 			startOptions,
@@ -3430,4 +3912,4 @@ function collectSharedClients(state) {
 	return [...state.liveClients];
 }
 //#endregion
-export { resolveCodexAppServerAuthProfileId as $, isCodexAppServerApprovalRequest as A, claimCodexAppServerLiveThread as B, resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs as C, resolveCodexTurnTerminalIdleTimeoutMs as D, resolveCodexTurnCompletionIdleTimeoutMs as E, isCodexAppServerPrewriteRequestCancellationError as F, protectCodexAppServerLiveThread as G, ensureCodexAppServerClientRuntime as H, isCodexAppServerRequestTimeoutError as I, unsubscribeCodexAppServerLiveThread as J, releaseCodexAppServerLiveThread as K, isUnsupportedCodexAppServerVersionError as L, isCodexAppServerConnectionClosedError as M, isCodexAppServerIndeterminateRequestCancellationError as N, withCodexStartupTimeout as O, isCodexAppServerIndeterminateTransportError as P, resolveCodexAppServerAuthAccountCacheKey as Q, resolveCodexAppServerClientInstanceId as R, resolveCodexGatewayTimeoutWithGraceMs as S, resolveCodexTurnAssistantCompletionIdleTimeoutMs as T, isCodexAppServerClientRuntimeLive as U, consumeCodexAppServerLiveThread as V, isCodexAppServerLiveThreadClaimed as W, readRecentCodexRateLimits as X, readCodexRateLimitsRevision as Y, rememberCodexRateLimitsRead as Z, withTimeout$1 as _, getLeasedSharedCodexAppServerClient as a, CODEX_INTERACTIVE_THREAD_SOURCE_KINDS as at, CodexAppServerStartupError as b, releaseCodexAppServerClientLease as c, isJsonObject as ct, retainSharedCodexAppServerClientByInstanceId as d, resolveCodexAppServerLocalHomeDir as dt, resolveCodexAppServerAuthProfileIdForAgent as et, retainSharedCodexAppServerClientIfCurrent as f, withAbortableTimeout as g, withLeasedCodexAppServerClientStartSelectionRetry as h, createIsolatedCodexAppServerClient as i, CODEX_INTERACTIVE_CUSTOM_THREAD_SOURCES as it, isCodexAppServerBrokenPipeError as j, getCodexAppServerClientInstanceId as k, releaseLeasedSharedCodexAppServerClient as l, resolveFirstExistingMacOSDesktopCodexBundledMarketplacePath as lt, shared_client_exports as m, clearSharedCodexAppServerClientIfCurrentAndUnclaimed as n, resolveCodexAppServerPreparedApiKeyCacheKey as nt, getSharedCodexAppServerClient as o, CODEX_OPENCLAW_DIRECT_DYNAMIC_TOOL_NAMESPACE as ot, retireSharedCodexAppServerClientIfCurrent as p, retainCodexAppServerLiveThread as q, clearSharedCodexAppServerClientIfCurrentAndWait as r, resolveCodexAppServerPreparedAuthHandoff as rt, isCodexAppServerStartSelectionChangedError as s, flattenCodexDynamicToolFunctions as st, clearSharedCodexAppServerClientIfCurrent as t, resolveCodexAppServerFallbackApiKeyCacheKey as tt, resolveCodexNativeConfigFenceKey as u, resolveCodexAppServerHomeDir as ut, acquireCodexNativeConfigFence as v, resolveCodexStartupTimeoutMs as w, isCodexAppServerStartupError as x, CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS as y, CodexAppServerRpcError as z };
+export { rememberCodexRateLimitsRead as $, isCodexAppServerApprovalRequest as A, CodexAppServerRpcError as B, resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs as C, resolveCodexTurnTerminalIdleTimeoutMs as D, resolveCodexTurnCompletionIdleTimeoutMs as E, isCodexAppServerPrewriteRequestCancellationError as F, isCodexAppServerClientRuntimeLive as G, claimCodexAppServerLiveThread as H, isCodexAppServerRequestTimeoutError as I, releaseCodexAppServerLiveThread as J, isCodexAppServerLiveThreadClaimed as K, isUnsupportedCodexAppServerVersionError as L, isCodexAppServerConnectionClosedError as M, isCodexAppServerIndeterminateRequestCancellationError as N, withCodexStartupTimeout as O, isCodexAppServerIndeterminateTransportError as P, readRecentCodexRateLimits as Q, resolveCodexAppServerClientInstanceId as R, resolveCodexGatewayTimeoutWithGraceMs as S, resolveCodexTurnAssistantCompletionIdleTimeoutMs as T, consumeCodexAppServerLiveThread as U, createCodexElicitationResponse as V, ensureCodexAppServerClientRuntime as W, unsubscribeCodexAppServerLiveThread as X, retainCodexAppServerLiveThread as Y, readCodexRateLimitsRevision as Z, withTimeout$1 as _, getLeasedSharedCodexAppServerClient as a, resolveCodexAppServerPreparedAuthHandoff as at, CodexAppServerStartupError as b, releaseCodexAppServerClientLease as c, CODEX_OPENCLAW_DIRECT_DYNAMIC_TOOL_NAMESPACE as ct, retainSharedCodexAppServerClientByInstanceId as d, resolveFirstExistingMacOSDesktopCodexBundledMarketplacePath as dt, resolveCodexAppServerAuthAccountCacheKey as et, retainSharedCodexAppServerClientIfCurrent as f, resolveCodexAppServerHomeDir as ft, withAbortableTimeout as g, withLeasedCodexAppServerClientStartSelectionRetry as h, createIsolatedCodexAppServerClient as i, resolveCodexAppServerPreparedApiKeyCacheKey as it, isCodexAppServerBrokenPipeError as j, getCodexAppServerClientInstanceId as k, releaseLeasedSharedCodexAppServerClient as l, flattenCodexDynamicToolFunctions as lt, shared_client_exports as m, clearSharedCodexAppServerClientIfCurrentAndUnclaimed as n, resolveCodexAppServerAuthProfileIdForAgent as nt, getSharedCodexAppServerClient as o, CODEX_INTERACTIVE_CUSTOM_THREAD_SOURCES as ot, retireSharedCodexAppServerClientIfCurrent as p, resolveCodexAppServerLocalHomeDir as pt, protectCodexAppServerLiveThread as q, clearSharedCodexAppServerClientIfCurrentAndWait as r, resolveCodexAppServerFallbackApiKeyCacheKey as rt, isCodexAppServerStartSelectionChangedError as s, CODEX_INTERACTIVE_THREAD_SOURCE_KINDS as st, clearSharedCodexAppServerClientIfCurrent as t, resolveCodexAppServerAuthProfileId as tt, resolveCodexNativeConfigFenceKey as u, isJsonObject as ut, acquireCodexNativeConfigFence as v, resolveCodexStartupTimeoutMs as w, isCodexAppServerStartupError as x, CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS as y, closeCodexAppServerTransportAndWait as z };