@openclaw/codex 2026.9.4 → 2026.9.6

package/assets/activity.svg

@@ -0,0 +1,30 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<!--
+Adapted from OpenClaw ui/public/provider-icons/ProviderIcon-codex.svg.
+Source: https://github.com/steipete/CodexBar/blob/215efbd39ad58acb4b0cd637c407d63e6183bc8d/Sources/CodexBar/Resources/ProviderIcon-codex.svg
+
+MIT License
+Copyright (c) 2026 Peter Steinberger
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Names and marks remain the property of their respective owners.
+-->
+  <path fill="currentColor" stroke="none" d="M83.7733 42.8087C84.6678 40.1149 84.9771 37.2613 84.6807 34.4385C84.3843 31.6156 83.489 28.8885 82.0544 26.4394C77.6908 18.8436 68.9203 14.9365 60.3548 16.7725C57.9831 14.1344 54.9591 12.1668 51.5864 11.0673C48.2137 9.96772 44.611 9.77498 41.1402 10.5084C37.6694 11.2418 34.4527 12.8755 31.8132 15.2455C29.1736 17.6155 27.204 20.6383 26.1024 24.0103C23.3212 24.5806 20.6938 25.738 18.3958 27.405C16.0977 29.0721 14.1819 31.2104 12.7765 33.6772C8.36538 41.2609 9.3669 50.8267 15.2527 57.3327C14.3549 60.0251 14.0424 62.8782 14.3361 65.7012C14.6298 68.5241 15.523 71.2518 16.9558 73.7017C21.325 81.3002 30.1011 85.207 38.6712 83.3686C40.5554 85.4904 42.8707 87.1858 45.4623 88.3416C48.0539 89.4975 50.8622 90.0871 53.6999 90.0713C62.4793 90.079 70.2575 84.4114 72.9393 76.0515C75.7201 75.4802 78.347 74.3225 80.6449 72.6555C82.9427 70.9886 84.8587 68.8507 86.2649 66.3846C90.6227 58.8145 89.6172 49.3005 83.7733 42.8087ZM53.6999 84.8356C50.1955 84.8411 46.801 83.6129 44.1116 81.3661L44.5848 81.098L60.5123 71.9043C60.9087 71.6718 61.2379 71.3402 61.4674 70.942C61.6969 70.5439 61.8189 70.0929 61.8215 69.6333V47.1769L68.5553 51.072C68.6225 51.1063 68.6694 51.1707 68.6814 51.2456V69.854C68.6641 78.1208 61.9667 84.8183 53.6999 84.8356ZM21.4977 71.0843C19.7402 68.0497 19.1092 64.4925 19.7156 61.0386L20.1885 61.3225L36.1321 70.5165C36.5266 70.748 36.9757 70.87 37.4331 70.87C37.8905 70.87 38.3396 70.748 38.7341 70.5165L58.21 59.2883V67.0628C58.2081 67.1031 58.1973 67.1424 58.1782 67.1779C58.1591 67.2134 58.1322 67.2441 58.0996 67.2678L41.9671 76.5722C34.798 80.7022 25.6388 78.2463 21.4977 71.0843ZM17.3026 36.3898C19.0723 33.3357 21.8655 31.0062 25.1878 29.8138V48.7376C25.1818 49.1949 25.2986 49.6453 25.5261 50.042C25.7535 50.4387 26.0833 50.7671 26.4809 50.9928L45.8622 62.1739L39.1283 66.069C39.0919 66.0883 39.0513 66.0984 39.0101 66.0984C38.9689 66.0984 38.9283 66.0883 38.8919 66.069L22.7908 56.7809C15.6359 52.6337 13.1822 43.4816 17.3026 36.3112V36.3898ZM72.624 49.2426L53.1792 37.9512L59.8976 34.0718C59.9341 34.0524 59.9747 34.0423 60.016 34.0423C60.0573 34.0423 60.0979 34.0524 60.1344 34.0718L76.2355 43.3761C78.6973 44.7966 80.7043 46.8882 82.0221 49.4065C83.3398 51.9249 83.914 54.7661 83.6775 57.5985C83.4411 60.431 82.4038 63.1377 80.6867 65.4027C78.9696 67.6677 76.6436 69.3975 73.9803 70.3901V51.466C73.9663 51.0096 73.834 50.5647 73.5962 50.1749C73.3584 49.7851 73.0234 49.4638 72.624 49.2426ZM79.3261 39.1657L78.8529 38.8815L62.9411 29.6089C62.5442 29.376 62.0924 29.2532 61.6322 29.2532C61.172 29.2532 60.7202 29.376 60.3233 29.6089L40.8629 40.8374V33.0628C40.8587 33.0233 40.8654 32.9834 40.882 32.9473C40.8987 32.9113 40.9248 32.8803 40.9575 32.8579L57.0586 23.5692C59.5263 22.1476 62.3478 21.458 65.193 21.5811C68.0382 21.7042 70.7896 22.6348 73.1253 24.2642C75.461 25.8936 77.2845 28.1543 78.3825 30.782C79.4806 33.4097 79.8077 36.2957 79.3257 39.1025V39.1657H79.3261ZM37.1888 52.9484L30.455 49.069C30.4213 49.0487 30.3925 49.0212 30.3707 48.9884C30.3488 48.9557 30.3345 48.9186 30.3286 48.8797V30.3188C30.3323 27.4714 31.1466 24.6839 32.6761 22.2822C34.2057 19.8805 36.3874 17.9639 38.9661 16.7564C41.5448 15.549 44.4139 15.1005 47.2381 15.4636C50.0622 15.8267 52.7247 16.9862 54.9141 18.8067L54.4409 19.0748L38.5134 28.2686C38.117 28.5011 37.7879 28.8327 37.5584 29.2308C37.329 29.629 37.207 30.0799 37.2045 30.5395L37.1888 52.9487V52.9484ZM40.8472 45.0632L49.5209 40.0643L58.21 45.0635V55.0615L49.5523 60.0608L40.8632 55.0615L40.8472 45.0632Z" />
+</svg>

package/dist/.setup/account-usage-runtime-Eem_WGqY.mjs

@@ -0,0 +1,75 @@
+import { n as isCodexAppServerProxyLaunch } from "./launch-args-DbFCehO7.mjs";
+import { t as buildCodexAppServerUsageSnapshot } from "./rate-limits-CMU3DUD0.mjs";
+import { n as readCodexAppServerUsage } from "./request-D2L0zMrq.mjs";
+import "./config-BoTP_mrL.mjs";
+import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-C8Rw1m1m.mjs";
+import { a as resolveCodexAppServerAuthProfileStore } from "./auth-profile-WqZtZfXN.mjs";
+import { isDeepStrictEqual } from "node:util";
+import { listAgentIds, resolveAgentDir } from "openclaw/plugin-sdk/agent-scope-runtime";
+import { z } from "zod";
+import { ErrorCodes, errorShape } from "openclaw/plugin-sdk/gateway-runtime";
+//#region extensions/codex/src/account-usage-runtime.ts
+const paramsSchema = z.object({
+	agentId: z.string().min(1),
+	profileId: z.string().min(1)
+}).strict();
+async function handleCodexAccountUsage({ params, respond, context, signal, hasCurrentClientAuthority }) {
+	const parsed = paramsSchema.safeParse(params);
+	if (!parsed.success) {
+		respond(false, void 0, errorShape(ErrorCodes.INVALID_REQUEST, "Expected agentId and profileId."));
+		return;
+	}
+	const { agentId, profileId } = parsed.data;
+	const config = context.getRuntimeConfig();
+	if (!listAgentIds(config).includes(agentId)) {
+		respond(false, void 0, errorShape(ErrorCodes.INVALID_REQUEST, "Unknown agent."));
+		return;
+	}
+	try {
+		const agentDir = resolveAgentDir(config, agentId);
+		const readStore = () => resolveCodexAppServerAuthProfileStore({
+			agentDir,
+			authProfileId: profileId,
+			config
+		});
+		const store = structuredClone(readStore());
+		const credential = store.profiles[profileId];
+		if (!credential || credential.provider !== "openai" || credential.type === "api_key") {
+			respond(false, void 0, errorShape(ErrorCodes.INVALID_REQUEST, "Select a saved Codex subscription login."));
+			return;
+		}
+		const assertCurrent = () => {
+			if (signal?.aborted || hasCurrentClientAuthority?.() === false || context.getRuntimeConfig() !== config || !isDeepStrictEqual(readStore().profiles[profileId], store.profiles[profileId])) throw new Error("Account credentials changed. Refresh Models and try again.");
+		};
+		assertCurrent();
+		const { start } = resolveCodexAppServerRuntimeOptions({ pluginConfig: config.plugins?.entries?.codex?.config });
+		if (isCodexAppServerProxyLaunch(start.args)) throw new Error("Account usage is unavailable through a Codex proxy. Configure a direct app-server launch.");
+		const usage = await readCodexAppServerUsage({
+			agentDir,
+			config,
+			timeoutMs: 2e4,
+			preparedAuth: {
+				kind: "profile",
+				profileId,
+				store
+			},
+			authRequirement: "subscription",
+			assertCurrent,
+			startOptions: {
+				...start,
+				transport: "stdio",
+				homeScope: "agent"
+			}
+		});
+		assertCurrent();
+		const snapshot = buildCodexAppServerUsageSnapshot(usage.rateLimits, { accountDetails: true });
+		respond(true, {
+			updatedAt: Date.now(),
+			providers: [snapshot]
+		});
+	} catch (error) {
+		respond(false, void 0, errorShape(ErrorCodes.UNAVAILABLE, error instanceof Error ? error.message : "Codex usage unavailable. Try refreshing the account."));
+	}
+}
+//#endregion
+export { handleCodexAccountUsage };

package/dist/{apply-CvT8tW5i.js → .setup/apply-DDOi8uNx.mjs}

@@ -1,21 +1,21 @@
-import { c as CODEX_PLUGINS_MARKETPLACE_NAME } from "./plugin-inventory-oL4Na1ZG.js";
-import { x as readCodexPluginConfig } from "./protocol-5bh1G-H7.js";
-import { s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./auth-cache-key-7orQae_j.js";
-import { r as buildCodexPluginAppCacheKey, s as defaultCodexAppInventoryCache } from "./plugin-app-cache-key-d0eKxy7b.js";
-import { i as requestCodexAppServerJson } from "./request-B7hEkBGq.js";
-import "./config-oIORaQ5T.js";
-import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-D0zGNIHu.js";
-import { i as resolveCodexAppServerAuthProfileIdForAgent } from "./auth-profile-CwzO4_RG.js";
-import { c as getLeasedSharedCodexAppServerClient, et as resolveCodexAppServerAuthAccountCacheKey, h as releaseLeasedSharedCodexAppServerClient, o as clearSharedCodexAppServerClientIfCurrentAndWait } from "./shared-client-CscigXXL.js";
-import { t as ensureCodexPluginActivation } from "./plugin-activation-BYQculil.js";
-import { CODEX_PLUGIN_CONFIG_PATH, buildCodexMigrationPlan, buildCodexPluginsConfigValue, hasCodexPluginConfigConflict, n as applyCodexAuthItems, r as resolveCodexConfigPatchMode, readCodexPluginMigrationConfigEntry, t as resolveCodexMigrationTargets } from "./plan-7uG-Fp36.js";
+import { c as CODEX_PLUGINS_MARKETPLACE_NAME, n as isOpenAiCuratedMarketplace } from "./plugin-inventory-BoRei8Z4.mjs";
+import { d as readCodexPluginConfig } from "./config-parsing-CcB9iPoq.mjs";
+import { s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./auth-cache-key-B2mpaI9D.mjs";
+import { a as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-B2CsSdnV.mjs";
+import { i as requestCodexAppServerJson } from "./request-D2L0zMrq.mjs";
+import "./config-BoTP_mrL.mjs";
+import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-C8Rw1m1m.mjs";
+import { i as resolveCodexAppServerAuthProfileIdForAgent } from "./auth-profile-WqZtZfXN.mjs";
+import { X as resolveCodexAppServerAuthAccountCacheKey, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient, o as clearSharedCodexAppServerClientIfCurrentAndWait } from "./shared-client-DA4VR4Eb.mjs";
+import { t as ensureCodexPluginActivation } from "./plugin-activation-DT3MNtqj.mjs";
+import { CODEX_PLUGIN_CONFIG_PATH, buildCodexMigrationPlan, buildCodexPluginsConfigValue, hasCodexPluginConfigConflict, n as resolveCodexConfigPatchMode, readCodexPluginMigrationConfigEntry, t as createCodexAuthItemApplier } from "./plan-CN3VwfNU.mjs";
 import { uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { parseStrictNonNegativeInteger } from "openclaw/plugin-sdk/number-runtime";
 import path from "node:path";
 import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { sleep } from "openclaw/plugin-sdk/runtime-env";
 import { MIGRATION_REASON_TARGET_EXISTS, applyMigrationManualItem, markMigrationItemConflict, markMigrationItemError, markMigrationItemSkipped, resolveMigrationConfigRuntime, summarizeMigrationItems, writeMigrationConfigPath } from "openclaw/plugin-sdk/migration";
-import { archiveMigrationItem, copyMemoryMigrationFileItem, copyMigrationFileItem, withCachedMigrationConfigRuntime, writeMigrationReport } from "openclaw/plugin-sdk/migration-runtime";
+import { archiveMigrationItem, copyMemoryMigrationFileItem, copyMigrationFileItem, resolvePlannedMigrationTargets, withCachedMigrationConfigRuntime, writeMigrationReport } from "openclaw/plugin-sdk/migration-runtime";
 //#region extensions/codex/src/migration/apply-report.ts
 function codexPluginActivationReportState(result) {
 	switch (result.reason) {
@@ -69,7 +69,7 @@ function shouldReturnCodexPluginConfigPatch(ctx) {
 }
 function prepareTargetCodexAppServer(ctx) {
 	const appServer = resolveTargetCodexAppServer(ctx);
-	const targets = resolveCodexMigrationTargets(ctx);
+	const targets = resolvePlannedMigrationTargets(ctx);
 	let warmedClient;
 	const ready = getLeasedSharedCodexAppServerClient({
 		startOptions: appServer.start,
@@ -92,7 +92,7 @@ async function applyCodexMigrationPlan(params) {
 	const plan = params.plan ?? await buildCodexMigrationPlan(params.ctx);
 	const reportDir = params.ctx.reportDir ?? path.join(params.ctx.stateDir, "migration", "codex");
 	const items = [];
-	const targets = resolveCodexMigrationTargets(params.ctx);
+	const targets = resolvePlannedMigrationTargets(params.ctx);
 	const codexHome = typeof plan.metadata?.codexHome === "string" && plan.metadata.codexHome.trim() ? plan.metadata.codexHome : plan.source;
 	const authSource = {
 		codexHome,
@@ -104,18 +104,19 @@ async function applyCodexMigrationPlan(params) {
 		...params.ctx,
 		runtime
 	};
+	const applyAuthItem = createCodexAuthItemApplier({
+		ctx: applyCtx,
+		source: authSource,
+		targets,
+		items: plan.items
+	});
 	for (const item of plan.items) {
 		if (item.status !== "planned") {
 			items.push(item);
 			continue;
 		}
 		if (item.id === "config:codex-plugins") items.push(await applyCodexPluginConfigItem(applyCtx, item, items));
-		else if (item.kind === "auth") items.push(...await applyCodexAuthItems({
-			ctx: applyCtx,
-			item,
-			source: authSource,
-			targets
-		}));
+		else if (item.kind === "auth") items.push(...await applyAuthItem(item));
 		else if (item.kind === "plugin" && item.action === "install") items.push(await applyCodexPluginInstallItem(applyCtx, item));
 		else if (item.kind === "manual") items.push(applyMigrationManualItem(item));
 		else if (item.action === "archive") items.push(await archiveMigrationItem(item, reportDir));
@@ -159,7 +160,7 @@ async function applyCodexPluginInstallItem(ctx, item) {
 				requestParams,
 				timeoutMs: 6e4,
 				startOptions: appServer.start,
-				agentDir: resolveCodexMigrationTargets(ctx).agentDir,
+				agentDir: resolvePlannedMigrationTargets(ctx).agentDir,
 				config: ctx.config,
 				isolated: false
 			}),
@@ -241,26 +242,19 @@ async function requestTargetCodexAppServerJson(params) {
 	const discoveryTimeoutMs = targetCodexMarketplaceDiscoveryTimeoutMs();
 	const discoveryDeadline = Math.min(deadline, Date.now() + discoveryTimeoutMs);
 	let lastResponse;
-	let attempt = 0;
 	do {
-		attempt += 1;
 		const remainingMs = Math.max(1, discoveryDeadline - Date.now());
 		lastResponse = await requestCodexAppServerJson({
 			...params,
 			timeoutMs: remainingMs
 		});
-		if (hasOpenAiCuratedMarketplace(lastResponse)) return lastResponse;
+		if (lastResponse.marketplaces.some(isOpenAiCuratedMarketplace)) return lastResponse;
 		if (Date.now() >= discoveryDeadline) return lastResponse;
 		const waitMs = Math.min(TARGET_CODEX_MARKETPLACE_DISCOVERY_POLL_MS, discoveryDeadline - Date.now());
 		await sleep(waitMs);
 	} while (Date.now() < discoveryDeadline);
 	return lastResponse;
 }
-function hasOpenAiCuratedMarketplace(response) {
-	if (!response || typeof response !== "object" || !("marketplaces" in response)) return false;
-	const marketplaces = response.marketplaces;
-	return Array.isArray(marketplaces) && marketplaces.some((marketplace) => marketplace && typeof marketplace === "object" && marketplace.name === "openai-curated");
-}
 function targetCodexMarketplaceDiscoveryTimeoutMs(env = process.env) {
 	const configured = parseStrictNonNegativeInteger(env[TARGET_CODEX_MARKETPLACE_DISCOVERY_TIMEOUT_ENV]);
 	if (configured !== void 0) return configured;
@@ -270,7 +264,7 @@ function isCodexPluginLoadWarningItem(item) {
 	return item.kind === "plugin" && item.action === "install" && item.status === "warning" && item.details?.warningReason === CODEX_PLUGIN_LOAD_WARNING;
 }
 async function buildTargetCodexPluginAppCacheKey(ctx) {
-	const targets = resolveCodexMigrationTargets(ctx);
+	const targets = resolvePlannedMigrationTargets(ctx);
 	const appServer = resolveTargetCodexAppServer(ctx);
 	const authProfileId = resolveCodexAppServerAuthProfileIdForAgent({
 		agentDir: targets.agentDir,

package/dist/.setup/async-questions-DdhOCwGi.mjs

@@ -0,0 +1,27 @@
+import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
+//#region extensions/codex/src/app-server/async-questions.ts
+/** Keep unsupported question payloads on Codex's complete plain-text fallback. */
+function readCodexAsyncQuestions(value) {
+	if (!Array.isArray(value) || value.length === 0 || value.length > 12) return;
+	const questions = [];
+	for (const entry of value) {
+		const question = asOptionalRecord(entry);
+		if (!question || !isQuestionText(question.title, 4096)) return;
+		const options = question.options;
+		if (options === void 0 || options === null) {
+			questions.push({ title: question.title });
+			continue;
+		}
+		if (!Array.isArray(options) || options.length === 0 || options.length > 4 || !options.every((option) => isQuestionText(option, 256))) return;
+		questions.push({
+			title: question.title,
+			options: [...options]
+		});
+	}
+	return questions;
+}
+function isQuestionText(value, maxLength) {
+	return typeof value === "string" && value.length <= maxLength && value.trim().length > 0;
+}
+//#endregion
+export { readCodexAsyncQuestions as t };

package/dist/{attempt-client-cleanup-DKHzbwt5.js → .setup/attempt-client-cleanup-CEv1cKwF.mjs}

@@ -1,15 +1,16 @@
-import { o as isJsonObject } from "./protocol-5bh1G-H7.js";
-import "./client-B57KWPQx.js";
-import { m as retireSharedCodexAppServerClientIfCurrent } from "./auth-cache-key-7orQae_j.js";
-import { t as CodexAppServerRpcError } from "./rpc-error-ttN_QjEm.js";
-import { h as unknownItemStatus } from "./event-projector-items-5VhsECCO.js";
-import { Y as unsubscribeCodexAppServerLiveThread } from "./shared-client-CscigXXL.js";
+import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
+import { h as retireSharedCodexAppServerClientIfCurrent } from "./session-catalog-events-Bj6j94E_.mjs";
+import { n as waitForPromiseOrAbort, o as CodexAppServerRpcError, t as abortReason } from "./timeout-C910MdAB.mjs";
+import { h as unknownItemStatus } from "./event-projector-items-C6L_5ZiT.mjs";
+import { G as unsubscribeCodexAppServerLiveThread, rt as isCodexAppServerStartupError, u as isCodexAppServerStartSelectionChangedError } from "./shared-client-DA4VR4Eb.mjs";
+import { T as readCodexTurnCompletedNotification, a as isCodexAppServerBrokenPipeError, d as isCodexAppServerRequestTimeoutError, l as isCodexAppServerOverloadError } from "./client-Cs08OXVQ.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
-import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { AsyncResource } from "node:async_hooks";
-import { redactSensitiveText } from "openclaw/plugin-sdk/logging-core";
+import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
+import { AgentHarnessPreflightError, embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { redactSensitiveText } from "openclaw/plugin-sdk/logging-core";
 //#region extensions/codex/src/app-server/notification-correlation.ts
 /**
 * Correlates Codex app-server notifications with the active thread/turn so
@@ -92,6 +93,9 @@ const DEFAULT_PREBIND_NOTIFICATION_LIMIT = 256;
 const DEFAULT_GLOBAL_WARNING_LIMIT = 32;
 const CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS = 3e4;
 const routers = /* @__PURE__ */ new WeakMap();
+function hasCodexAppServerSiblingRouteWork(client, threadId) {
+	return routers.get(client)?.hasSiblingWork(threadId) ?? false;
+}
 /** Returns the sole router installed on a physical app-server client. */
 function getCodexAppServerTurnRouter(client) {
 	const existing = routers.get(client);
@@ -101,15 +105,18 @@ function getCodexAppServerTurnRouter(client) {
 	return router;
 }
 var ClientTurnRouter = class {
+	hasSiblingWork(threadId) {
+		for (const routedThreadId of this.routes.keys()) if (routedThreadId !== threadId) return true;
+		for (const watchedThreadId of this.nativeTurnCompletionWatchers.keys()) if (watchedThreadId !== threadId) return true;
+		return false;
+	}
 	constructor(client) {
 		this.routes = /* @__PURE__ */ new Map();
 		this.globalWarnings = [];
 		this.nativeTurnCompletionWatchers = /* @__PURE__ */ new Map();
 		client.addNotificationHandler((notification) => this.routeNotification(notification));
-		client.addRequestHandler((request, signal) => this.routeRequest(request, signal));
-		client.addCloseHandler((closedClient) => {
-			this.dispose(closedClient.getCloseError());
-		});
+		client.addRequestHandler((request, signal, setExecutionTimeoutMs) => this.routeRequest(request, signal, setExecutionTimeoutMs));
+		client.addCloseHandler((closedClient) => this.dispose(closedClient.getCloseError()));
 	}
 	reserveThread(options) {
 		this.assertActive();
@@ -152,7 +159,7 @@ var ClientTurnRouter = class {
 			armTurn: () => this.armTurn(route),
 			bindTurn: (turnId, bindingOptions) => this.bindTurn(route, turnId, bindingOptions),
 			cancelTurn: () => this.cancelTurn(route),
-			drain: () => this.drainNotifications(route),
+			drain: () => this.waitForNotifications(route),
 			release: () => this.release(route)
 		};
 	}
@@ -258,10 +265,22 @@ var ClientTurnRouter = class {
 		if (route.gate !== "armed") throw new Error(`codex app-server thread route cannot bind from ${route.gate}`);
 		route.gate = "bound";
 		route.turnId = turnId;
+		if (options?.beforeNotifications) {
+			route.notificationPause = options.beforeNotifications.then(() => {
+				route.notificationPause = void 0;
+				this.flushNotifications(route);
+			}, (cause) => {
+				const error = new Error("codex app-server notification barrier failed", { cause });
+				this.release(route, error);
+				throw error;
+			});
+			route.notificationPause.catch(() => {});
+		}
 		this.flushNotifications(route);
 		route.binding?.resolve();
 		await this.waitForNotifications(route);
 		this.assertRoute(route, turnId);
+		await route.notificationPause;
 		await route.notificationTail;
 	}
 	routeNotification(notification) {
@@ -274,13 +293,14 @@ var ClientTurnRouter = class {
 				this.bufferNotification(route, notification, { threadId: route.threadId }, Date.now());
 				if (route.gate === "bound") this.flushNotifications(route);
 			}
-			return Promise.all([...this.routes.values()].map((route) => route.notificationTail)).then(() => void 0);
+			return Promise.all([...this.routes.values()].map((route) => this.waitForNotifications(route))).then(() => void 0);
 		}
 		const watchers = scope.threadId ? this.nativeTurnCompletionWatchers.get(scope.threadId) : void 0;
 		const route = scope.threadId ? this.routes.get(scope.threadId) : void 0;
 		if (!watchers && !route) return;
+		const completedTurn = notification.method === "turn/completed" && readCodexTurnCompletedNotification(notification.params) !== void 0;
 		if (scope.turnId && watchers) {
-			for (const watcher of watchers) if (watcher.turnId === scope.turnId && notification.method === "turn/completed") watcher.finish(true);
+			for (const watcher of watchers) if (watcher.turnId === scope.turnId && completedTurn) watcher.finish(true);
 			else if (watcher.turnId === scope.turnId && notification.method === "turn/started") watcher.onStarted?.();
 		}
 		if (!route) return;
@@ -296,7 +316,7 @@ var ClientTurnRouter = class {
 					id: scope.turnId,
 					completed: false
 				};
-			} else if (notification.method === "turn/completed") {
+			} else if (completedTurn) {
 				if (route.gate === "bound") route.completedNativeTurnIds.clear();
 				route.completedNativeTurnIds.add(scope.turnId);
 				if (!route.observedNativeTurn || route.observedNativeTurn.completed || route.observedNativeTurn.id === scope.turnId) route.observedNativeTurn = {
@@ -315,7 +335,7 @@ var ClientTurnRouter = class {
 			this.warnDroppedStaleTurnNotification(route, notification, routeScope);
 			return;
 		}
-		if (route.gate === "armed") {
+		if (route.gate === "armed" || route.notificationPause) {
 			this.bufferNotification(route, notification, routeScope, receivedAtMs);
 			return;
 		}
@@ -323,7 +343,7 @@ var ClientTurnRouter = class {
 		this.enqueueNotification(route, handler, notification, routeScope);
 		return route.notificationTail;
 	}
-	async routeRequest(request, signal = new AbortController().signal) {
+	async routeRequest(request, signal = new AbortController().signal, setExecutionTimeoutMs) {
 		if (this.closeError || signal.aborted) return;
 		const scope = readScope(request.params);
 		if (!scope.threadId) return;
@@ -346,7 +366,9 @@ var ClientTurnRouter = class {
 			const result = await handler(request, {
 				threadId: scope.threadId,
 				...scope.turnId ? { turnId: scope.turnId } : {}
-			}, requestSignal);
+			}, requestSignal, setExecutionTimeoutMs && ((timeoutMs) => {
+				if (!requestSignal.aborted) setExecutionTimeoutMs(timeoutMs);
+			}));
 			return requestSignal.aborted ? void 0 : result;
 		} catch (error) {
 			if (requestSignal.aborted) return;
@@ -365,10 +387,16 @@ var ClientTurnRouter = class {
 				this.warnDroppedStaleTurnNotification(route, pending.notification, pending.scope);
 				continue;
 			}
-			route.handlers?.onNotificationReceived?.(pending.notification, pending.scope, pending.receivedAtMs);
-			this.enqueueNotification(route, handler, pending.notification, pending.scope);
+			this.observeNotificationReceipt(route, pending);
+			if (route.notificationPause) route.pending.push(pending);
+			else this.enqueueNotification(route, handler, pending.notification, pending.scope);
 		}
 	}
+	observeNotificationReceipt(route, pending) {
+		if (pending.receiptObserved) return;
+		pending.receiptObserved = true;
+		route.handlers?.onNotificationReceived?.(pending.notification, pending.scope, pending.receivedAtMs);
+	}
 	warnDroppedStaleTurnNotification(route, notification, scope) {
 		if (notification.method === "turn/completed" || !scope.turnId || !route.turnId) return;
 		const eventKind = redactCodexEventKind(notification.method);
@@ -386,12 +414,14 @@ var ClientTurnRouter = class {
 		});
 	}
 	bufferNotification(route, notification, scope, receivedAtMs) {
+		const pending = {
+			notification,
+			receivedAtMs,
+			scope
+		};
+		if (route.gate === "bound") this.observeNotificationReceipt(route, pending);
 		if (route.pending.length < DEFAULT_PREBIND_NOTIFICATION_LIMIT) {
-			route.pending.push({
-				notification,
-				receivedAtMs,
-				scope
-			});
+			route.pending.push(pending);
 			return;
 		}
 		const error = /* @__PURE__ */ new Error(`codex app-server pre-bind notification buffer exceeded ${DEFAULT_PREBIND_NOTIFICATION_LIMIT} entries for thread ${route.threadId}`);
@@ -410,9 +440,7 @@ var ClientTurnRouter = class {
 		});
 	}
 	async waitForNotifications(route) {
-		await Promise.race([route.notificationTail, route.ended.promise]);
-	}
-	async drainNotifications(route) {
+		if (route.notificationPause) await Promise.race([route.notificationPause, route.ended.promise]);
 		await Promise.race([route.notificationTail, route.ended.promise]);
 	}
 	release(route, error = /* @__PURE__ */ new Error("codex app-server thread route is released")) {
@@ -436,23 +464,6 @@ var ClientTurnRouter = class {
 		if (route.released && !this.canDrainClosedTurn(route, completedTurnId)) throw route.released;
 	}
 };
-async function waitForPromiseOrAbort(promise, signal) {
-	if (signal.aborted) return false;
-	let removeAbort;
-	try {
-		return await Promise.race([promise.then(() => true), new Promise((resolve) => {
-			const onAbort = () => resolve(false);
-			signal.addEventListener("abort", onAbort, { once: true });
-			removeAbort = () => signal.removeEventListener("abort", onAbort);
-			if (signal.aborted) onAbort();
-		})]);
-	} finally {
-		removeAbort?.();
-	}
-}
-function abortReason(signal) {
-	return signal.reason instanceof Error ? signal.reason : new Error(String(signal.reason ?? "codex app-server thread route aborted"));
-}
 function readScope(value) {
 	if (!isJsonObject(value)) return {};
 	const threadId = readCodexNotificationThreadId(value);
@@ -472,6 +483,20 @@ function requireId(value, label) {
 /**
 * Best-effort cleanup helpers for Codex app-server startup attempts and turns.
 */
+var attempt_client_cleanup_exports = /* @__PURE__ */ __exportAll({
+	CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS: () => CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS,
+	CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS: () => CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS,
+	CodexAppServerUnsafeSubscriptionError: () => CodexAppServerUnsafeSubscriptionError,
+	assertCodexThreadResumeSubscription: () => assertCodexThreadResumeSubscription,
+	closeCodexStartupClientBestEffort: () => closeCodexStartupClientBestEffort,
+	interruptCodexTurnAndWaitBestEffort: () => interruptCodexTurnAndWaitBestEffort,
+	isCodexAppServerUnsafeSubscriptionError: () => isCodexAppServerUnsafeSubscriptionError,
+	isCodexNoActiveTurnInterruptError: () => isCodexNoActiveTurnInterruptError,
+	retireUnsafeCodexTurnClientBestEffort: () => retireUnsafeCodexTurnClientBestEffort,
+	shouldRetireCodexStartupClient: () => shouldRetireCodexStartupClient,
+	terminateCodexBackgroundTerminals: () => terminateCodexBackgroundTerminals,
+	unsubscribeCodexThreadBestEffort: () => unsubscribeCodexThreadBestEffort
+});
 /** Timeout for best-effort app-server turn interruption during cleanup. */
 const CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS = 5e3;
 /** Timeout for best-effort thread unsubscribe during cleanup. */
@@ -568,7 +593,7 @@ async function interruptCodexTurnAndWaitBestEffort(client, params) {
 	}
 }
 /** Stops native terminals on the cancelled thread without retiring peer threads. */
-async function terminateCodexBackgroundTerminals(client, threadId, oneShotCliRun = false) {
+async function terminateCodexBackgroundTerminals(client, threadId, oneShotCliRun = false, waitForNativeItems) {
 	const options = {
 		timeoutMs: CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS,
 		signal: AbortSignal.timeout(CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS)
@@ -586,6 +611,7 @@ async function terminateCodexBackgroundTerminals(client, threadId, oneShotCliRun
 			}, options)).data.length > 0) throw new Error("native background terminals remain running");
 			if (oneShotCliRun) throw new Error("native terminal termination did not confirm process cleanup");
 		}
+		await waitForNativeItems?.(options.signal);
 	} catch (cause) {
 		throw new Error("Codex background-terminal cleanup failed; inspect the thread's running terminals before starting more work.", { cause });
 	}
@@ -604,5 +630,9 @@ async function unsubscribeCodexThreadBestEffort(client, params) {
 		return false;
 	}
 }
+function shouldRetireCodexStartupClient(error, spawnedBy, signal) {
+	if (signal.aborted || isCodexAppServerStartupError(error) || isCodexAppServerRequestTimeoutError(error)) return true;
+	return !isCodexAppServerStartSelectionChangedError(error) && !isCodexAppServerOverloadError(error) && !(error instanceof AgentHarnessPreflightError && error.scope === void 0) && (isCodexAppServerBrokenPipeError(error) || !spawnedBy);
+}
 //#endregion
-export { readCodexNotificationTurnId as _, closeCodexStartupClientBestEffort as a, isCodexNoActiveTurnInterruptError as c, unsubscribeCodexThreadBestEffort as d, CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS as f, readCodexNotificationThreadId as g, isCodexNotificationForTurn as h, assertCodexThreadResumeSubscription as i, retireUnsafeCodexTurnClientBestEffort as l, CodexProjectionDiagnostics as m, CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS as n, interruptCodexTurnAndWaitBestEffort as o, getCodexAppServerTurnRouter as p, CodexAppServerUnsafeSubscriptionError as r, isCodexAppServerUnsafeSubscriptionError as s, CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS as t, terminateCodexBackgroundTerminals as u };
+export { CodexProjectionDiagnostics as _, attempt_client_cleanup_exports as a, readCodexNotificationTurnId as b, isCodexAppServerUnsafeSubscriptionError as c, shouldRetireCodexStartupClient as d, terminateCodexBackgroundTerminals as f, hasCodexAppServerSiblingRouteWork as g, getCodexAppServerTurnRouter as h, assertCodexThreadResumeSubscription as i, isCodexNoActiveTurnInterruptError as l, CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS as m, CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS as n, closeCodexStartupClientBestEffort as o, unsubscribeCodexThreadBestEffort as p, CodexAppServerUnsafeSubscriptionError as r, interruptCodexTurnAndWaitBestEffort as s, CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS as t, retireUnsafeCodexTurnClientBestEffort as u, isCodexNotificationForTurn as v, readCodexNotificationThreadId as y };

package/dist/.setup/attempt-terminal-gZrxQ35N.mjs

@@ -0,0 +1,5 @@
+import { agentHarnessAttemptTerminal } from "openclaw/plugin-sdk/agent-harness-runtime";
+//#region extensions/codex/src/app-server/attempt-terminal.ts
+const attemptTerminal = agentHarnessAttemptTerminal;
+//#endregion
+export { attemptTerminal as t };