@openclaw/codex 2026.9.5 → 2026.9.7

package/README.md

@@ -34,6 +34,8 @@ For a supervised branch, Codex App Server selects the snapshot fork's model and
 
 The visible-history mirror keeps at most 200 user or assistant messages, 512 KiB total, and 64 KiB per message. Image inputs become `[Image attachment]`; image data and local paths are not copied.
 
+Settled-turn finalization uses the same configured Codex App Server transport as the supervised conversation. Remote websocket App Server configurations stay on their configured transport. Managed user-home stdio launches running inside an Agent home, and not through the proxy launcher, use a private stdio side turn for native-tool isolation. The bounded finalizer preserves the selected model, provider, and native authorization returned by Codex, and rejects native tool evidence outside the finalization contract. It may mirror a final answer after completed tool work; it does not diagnose why a model omitted a visible final message.
+
 When settled-turn recovery rejects history, the `codex settled-turn finalization context capture failed` warning includes a stable `reason`, such as `item_limit`, `byte_limit`, `field_limit`, `unsupported_user_image`, or `snapshot_invalidated`. Unknown failures use `history_read_failed`. The warning excludes transcript content and exception text. Rejected history remains unavailable for finalization, and completed actions are never replayed.
 
 See the [Codex harness](https://docs.openclaw.ai/plugins/codex-harness) and [Codex supervision](https://docs.openclaw.ai/plugins/codex-supervision) guides.

package/dist/.setup/{account-usage-runtime-C2MOIvfq.mjs → account-usage-runtime-DFhbh1zz.mjs}

@@ -1,9 +1,9 @@
-import { n as isCodexAppServerProxyLaunch } from "./launch-args-DnMak49W.mjs";
-import { t as buildCodexAppServerUsageSnapshot } from "./rate-limits-DOEGYRNs.mjs";
-import { n as readCodexAppServerUsage } from "./request-BioXJLYa.mjs";
-import "./config-CedDWjM-.mjs";
-import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-CeAhl_h4.mjs";
-import { a as resolveCodexAppServerAuthProfileStore } from "./auth-profile-WqZtZfXN.mjs";
+import { n as isCodexAppServerProxyLaunch } from "./launch-args-DbFCehO7.mjs";
+import { t as buildCodexAppServerUsageSnapshot } from "./rate-limits-B7-X2TgG.mjs";
+import { n as readCodexAppServerUsage } from "./request-BHZ1nz8d.mjs";
+import "./config-DKhXquav.mjs";
+import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-C0NbLms1.mjs";
+import { a as resolveCodexAppServerAuthProfileStore } from "./auth-profile-B0okYl2D.mjs";
 import { isDeepStrictEqual } from "node:util";
 import { listAgentIds, resolveAgentDir } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { z } from "zod";

package/dist/.setup/{apply-CJ0ZfmBG.mjs → apply-D3GcSoSa.mjs}

@@ -1,21 +1,21 @@
-import { c as CODEX_PLUGINS_MARKETPLACE_NAME } from "./plugin-inventory-DUle8DLz.mjs";
-import { d as readCodexPluginConfig } from "./config-parsing-CcB9iPoq.mjs";
-import { s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./auth-cache-key-QirmgiCo.mjs";
-import { a as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-BOxKP7db.mjs";
-import { i as requestCodexAppServerJson } from "./request-BioXJLYa.mjs";
-import "./config-CedDWjM-.mjs";
-import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-CeAhl_h4.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-BpTtuLQ5.mjs";
-import { t as ensureCodexPluginActivation } from "./plugin-activation-r8nq5Jzp.mjs";
-import { CODEX_PLUGIN_CONFIG_PATH, buildCodexMigrationPlan, buildCodexPluginsConfigValue, hasCodexPluginConfigConflict, n as applyCodexAuthItems, r as resolveCodexConfigPatchMode, readCodexPluginMigrationConfigEntry, t as resolveCodexMigrationTargets } from "./plan-xD7WKYTM.mjs";
+import { n as isOpenAiCuratedMarketplace, u as CODEX_PLUGINS_MARKETPLACE_NAME } from "./plugin-inventory-Cky2XJUw.mjs";
+import { d as readCodexPluginConfig } from "./config-parsing-b088LyhT.mjs";
+import { s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./auth-cache-key-Dbvq-QgB.mjs";
+import { a as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-BL9B5H0L.mjs";
+import { i as requestCodexAppServerJson } from "./request-BHZ1nz8d.mjs";
+import "./config-DKhXquav.mjs";
+import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-C0NbLms1.mjs";
+import { i as resolveCodexAppServerAuthProfileIdForAgent } from "./auth-profile-B0okYl2D.mjs";
+import { c as getLeasedSharedCodexAppServerClient, et as resolveCodexAppServerAuthAccountCacheKey, h as releaseLeasedSharedCodexAppServerClient, o as clearSharedCodexAppServerClientIfCurrentAndWait } from "./shared-client-DqyTMYug.mjs";
+import { t as ensureCodexPluginActivation } from "./plugin-activation-cNHRfaxU.mjs";
+import { CODEX_PLUGIN_CONFIG_PATH, buildCodexMigrationPlan, buildCodexPluginsConfigValue, hasCodexPluginConfigConflict, n as resolveCodexConfigPatchMode, readCodexPluginMigrationConfigEntry, t as createCodexAuthItemApplier } from "./plan-Y-QIvrKB.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) {
@@ -24,7 +24,8 @@ function codexPluginActivationReportState(result) {
 			installed: true,
 			enabled: true
 		};
-		case "auth_required": return {
+		case "auth_required":
+		case "refresh_failed": return {
 			installed: true,
 			enabled: false
 		};
@@ -35,20 +36,9 @@ function codexPluginActivationReportState(result) {
 			installed: false,
 			enabled: false
 		};
-		case "refresh_failed": return {
-			installed: true,
-			enabled: false
-		};
 	}
 	return result.reason;
 }
-function sanitizeAppsNeedingAuth(apps) {
-	return apps.map((app) => ({
-		id: app.id,
-		name: app.name,
-		needsAuth: true
-	}));
-}
 //#endregion
 //#region extensions/codex/src/migration/apply.ts
 const CODEX_PLUGIN_AUTH_REQUIRED_REASON = "auth_required";
@@ -64,12 +54,9 @@ var CodexPluginConfigConflictError = class extends Error {
 		this.name = "CodexPluginConfigConflictError";
 	}
 };
-function shouldReturnCodexPluginConfigPatch(ctx) {
-	return resolveCodexConfigPatchMode(ctx) === "return";
-}
 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 +79,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 +91,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 +147,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
 			}),
@@ -186,7 +174,11 @@ async function applyCodexPluginInstallItem(ctx, item) {
 			reason: CODEX_PLUGIN_AUTH_REQUIRED_REASON,
 			details: {
 				...baseDetails,
-				appsNeedingAuth: sanitizeAppsNeedingAuth(result.installResponse?.appsNeedingAuth ?? [])
+				appsNeedingAuth: (result.installResponse?.appsNeedingAuth ?? []).map(({ id, name }) => ({
+					id,
+					name,
+					needsAuth: true
+				}))
 			}
 		};
 		if (result.reason === "plugin_missing" || result.reason === "marketplace_missing") return {
@@ -206,7 +198,7 @@ async function applyCodexPluginInstallItem(ctx, item) {
 			details: baseDetails
 		};
 	} catch (error) {
-		if (isCodexPluginInventoryLoadError(error)) return {
+		if (coerceErrorMessage(error).includes("codex app-server plugin/list timed out")) return {
 			...item,
 			status: "warning",
 			reason: "plugin_inventory_unavailable",
@@ -229,9 +221,6 @@ async function applyCodexPluginInstallItem(ctx, item) {
 		};
 	}
 }
-function isCodexPluginInventoryLoadError(error) {
-	return coerceErrorMessage(error).includes("codex app-server plugin/list timed out");
-}
 function resolveTargetCodexAppServer(ctx) {
 	return resolveCodexAppServerRuntimeOptions({ pluginConfig: readCodexPluginConfig(ctx.config) });
 }
@@ -241,36 +230,27 @@ 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;
-	return TARGET_CODEX_MARKETPLACE_DISCOVERY_TIMEOUT_MS;
+	return parseStrictNonNegativeInteger(env[TARGET_CODEX_MARKETPLACE_DISCOVERY_TIMEOUT_ENV]) ?? TARGET_CODEX_MARKETPLACE_DISCOVERY_TIMEOUT_MS;
 }
 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,
@@ -291,7 +271,7 @@ async function buildTargetCodexPluginAppCacheKey(ctx) {
 	});
 }
 async function applyCodexPluginConfigItem(ctx, item, appliedItems) {
-	if (appliedItems.filter((candidate) => candidate.kind === "plugin" && candidate.action === "install" && readCodexPluginPolicy(candidate) !== void 0 && !isCodexPluginConfigTerminal(candidate)).length > 0) return {
+	if (appliedItems.some((candidate) => candidate.kind === "plugin" && candidate.action === "install" && readCodexPluginPolicy(candidate) !== void 0 && !isCodexPluginConfigTerminal(candidate))) return {
 		...item,
 		status: "warning",
 		reason: "selected Codex plugin activation is incomplete"
@@ -301,7 +281,7 @@ async function applyCodexPluginConfigItem(ctx, item, appliedItems) {
 		...markMigrationItemSkipped(item, "no selected Codex plugins"),
 		deferredCompletion: true
 	};
-	const returnPatch = shouldReturnCodexPluginConfigPatch(ctx);
+	const returnPatch = resolveCodexConfigPatchMode(ctx) === "return";
 	const configApi = resolveMigrationConfigRuntime(ctx);
 	const currentConfig = returnPatch ? ctx.config : configApi?.current?.();
 	if (!currentConfig) return markMigrationItemError(item, "config runtime unavailable");

package/dist/.setup/{attempt-client-cleanup-BpYKdTA0.mjs → attempt-client-cleanup-DOP-cW5j.mjs}

@@ -1,21 +1,132 @@
-import { m as isJsonObject } from "./config-security-BRQ2mgW9.mjs";
-import { a as isCodexAppServerBrokenPipeError, d as isCodexAppServerRequestTimeoutError, l as isCodexAppServerOverloadError } from "./client-vXs2929Q.mjs";
-import { m as retireSharedCodexAppServerClientIfCurrent } from "./auth-cache-key-QirmgiCo.mjs";
-import { i as CodexAppServerRpcError } from "./timeout-DZF05XrR.mjs";
-import { h as unknownItemStatus } from "./event-projector-items-DyTQ_XqL.mjs";
-import { G as unsubscribeCodexAppServerLiveThread, rt as isCodexAppServerStartupError, u as isCodexAppServerStartSelectionChangedError } from "./shared-client-BpTtuLQ5.mjs";
-import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
+import { d as retireSharedCodexAppServerClientIfCurrent } from "./shared-client-lifecycle-DJIgqgMw.mjs";
+import { n as CodexAppServerRpcError } from "./rpc-error-BlD2vuzn.mjs";
+import { n as waitForPromiseOrAbort, t as abortReason } from "./timeout-CXOfNoaX.mjs";
+import { J as unsubscribeCodexAppServerLiveThread, ft as isCodexAppServerStartupError, u as isCodexAppServerStartSelectionChangedError } from "./shared-client-DqyTMYug.mjs";
+import { E as readCodexTurnCompletedNotification, a as isCodexAppServerBrokenPipeError, d as isCodexAppServerRequestTimeoutError, l as isCodexAppServerOverloadError } from "./client-N0JpgSzF.mjs";
+import { t as __exportAll } from "./session-binding-sidecars-jo6H8dFr.mjs";
+import { normalizeOptionalString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { AsyncResource } from "node:async_hooks";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
-import { AgentHarnessPreflightError, embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 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/event-projector-items.ts
+const itemStatuses = /* @__PURE__ */ new Map([
+	["completed", "completed"],
+	["failed", "failed"],
+	["error", "failed"],
+	["declined", "blocked"],
+	["inProgress", "running"],
+	["in_progress", "running"],
+	["running", "running"]
+]);
+const itemPresentations = /* @__PURE__ */ new Map([
+	["dynamicToolCall", {
+		kind: "tool",
+		title: "Tool"
+	}],
+	["mcpToolCall", {
+		kind: "tool",
+		title: "MCP tool",
+		projectedTool: true
+	}],
+	["commandExecution", {
+		kind: "command",
+		title: "Command",
+		toolName: "bash",
+		projectedTool: true
+	}],
+	["fileChange", {
+		kind: "patch",
+		title: "File change",
+		toolName: "apply_patch",
+		projectedTool: true
+	}],
+	["webSearch", {
+		kind: "search",
+		title: "Web search",
+		toolName: "web_search",
+		projectedTool: true
+	}],
+	["contextCompaction", {
+		kind: "analysis",
+		title: "Context compaction"
+	}],
+	["reasoning", {
+		kind: "analysis",
+		title: "Reasoning"
+	}]
+]);
+function matchesCodexSnapshotTurn(item, turnId) {
+	const itemTurnId = readStringField(item, "turnId");
+	return itemTurnId === void 0 || itemTurnId === turnId;
+}
+function itemKind(item) {
+	return itemPresentations.get(item.type)?.kind;
+}
+function itemTitle(item) {
+	return itemPresentations.get(item.type)?.title ?? item.type;
+}
+function itemStatus(item) {
+	return itemStatuses.get(readStringField(item, "status") ?? "") ?? "completed";
+}
+function unknownItemStatus(item) {
+	const status = readStringField(item, "status");
+	return status === void 0 || itemStatuses.has(status) ? void 0 : status;
+}
+function auditNativeToolTerminalStatus(item) {
+	if (item.type === "imageView" || item.type === "sleep") return "completed";
+	const status = itemStatuses.get(readStringField(item, "status") ?? "");
+	return status === void 0 || status === "running" ? "unknown" : status;
+}
+function auditNativeToolUnfinishedStatus(item) {
+	return item.type === "webSearch" || item.type === "imageGeneration" ? "unknown" : "failed";
+}
+function isNonSuccessItemStatus(status) {
+	return status === "failed" || status === "blocked";
+}
+function itemName(item) {
+	if (item.type === "dynamicToolCall" && typeof item.tool === "string") return item.tool;
+	if (item.type === "mcpToolCall" && typeof item.tool === "string") {
+		const server = typeof item.server === "string" ? item.server : void 0;
+		return server ? `${server}.${item.tool}` : item.tool;
+	}
+	return itemPresentations.get(item.type)?.toolName;
+}
+function auditNativeToolName(item) {
+	if (item.type === "dynamicToolCall") return;
+	const progressName = itemName(item);
+	if (progressName) return progressName;
+	if (item.type === "collabAgentToolCall") return typeof item.tool === "string" && item.tool.trim() ? `collab.${item.tool.trim()}` : "collab_agent";
+	if (item.type === "imageGeneration") return "image_generation";
+	if (item.type === "imageView") return "image_view";
+	if (item.type === "sleep") return "sleep";
+}
+function isSideEffectingNativeToolItem(item) {
+	return itemStatus(item) !== "blocked" && (isMutatingNativeToolItem(item) || item.type === "mcpToolCall");
+}
+function isProjectedNativeToolItem(item) {
+	return itemPresentations.get(item.type)?.projectedTool === true;
+}
+function isMutatingNativeToolItem(item) {
+	if (item.type === "commandExecution") return true;
+	return item.type === "fileChange" || item.type === "collabAgentToolCall" || item.type === "imageGeneration";
+}
+function shouldClearTerminalPresentationForNativeItem(item) {
+	switch (item.type) {
+		case "collabAgentToolCall":
+		case "commandExecution":
+		case "fileChange":
+		case "imageGeneration":
+		case "imageView":
+		case "mcpToolCall":
+		case "webSearch": return true;
+		default: return false;
+	}
+}
+//#endregion
 //#region extensions/codex/src/app-server/notification-correlation.ts
-/**
-* Correlates Codex app-server notifications with the active thread/turn so
-* projectors can ignore global or stale events without losing diagnostics.
-*/
-/** Returns true when a notification payload belongs to the exact active thread and turn. */
 function isCodexNotificationForTurn(value, threadId, turnId) {
 	if (!isJsonObject(value)) return false;
 	return readCodexNotificationThreadId(value) === threadId && readCodexNotificationTurnId(value) === turnId;
@@ -30,13 +141,8 @@ function readCodexNotificationThreadId(record) {
 	const thread = isJsonObject(record.thread) ? record.thread : void 0;
 	return normalizeOptionalString(record.threadId) ?? (thread ? normalizeOptionalString(thread.id) : void 0);
 }
-/** Reads a turn id from either top-level notification params or nested turn payloads. */
 function readCodexNotificationTurnId(record) {
-	return readNestedTurnId(record) ?? normalizeOptionalString(record.turnId);
-}
-function readNestedTurnId(record) {
-	const turn = record.turn;
-	return isJsonObject(turn) ? normalizeOptionalString(turn.id) : void 0;
+	return (isJsonObject(record.turn) ? normalizeOptionalString(record.turn.id) : void 0) ?? normalizeOptionalString(record.turnId);
 }
 //#endregion
 //#region extensions/codex/src/app-server/event-projector-diagnostics.ts
@@ -87,7 +193,6 @@ var CodexProjectionDiagnostics = class {
 };
 //#endregion
 //#region extensions/codex/src/app-server/turn-router.ts
-/** Keyed routing for all turn traffic on one shared Codex app-server client. */
 const DEFAULT_PREBIND_NOTIFICATION_LIMIT = 256;
 const DEFAULT_GLOBAL_WARNING_LIMIT = 32;
 const CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS = 3e4;
@@ -95,7 +200,6 @@ 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);
 	if (existing) return existing;
@@ -115,9 +219,7 @@ var ClientTurnRouter = class {
 		this.nativeTurnCompletionWatchers = /* @__PURE__ */ new Map();
 		client.addNotificationHandler((notification) => this.routeNotification(notification));
 		client.addRequestHandler((request, signal, setExecutionTimeoutMs) => this.routeRequest(request, signal, setExecutionTimeoutMs));
-		client.addCloseHandler((closedClient) => {
-			this.dispose(closedClient.getCloseError());
-		});
+		client.addCloseHandler((closedClient) => this.dispose(closedClient.getCloseError()));
 	}
 	reserveThread(options) {
 		this.assertActive();
@@ -160,7 +262,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)
 		};
 	}
@@ -168,15 +270,10 @@ var ClientTurnRouter = class {
 		this.assertActive();
 		const threadId = requireId(options.threadId, "thread id");
 		const turnId = requireId(options.turnId, "turn id");
-		if (options.signal?.aborted) return {
-			completion: Promise.resolve(false),
-			state: "unconfirmed",
-			settledSignal: AbortSignal.abort(),
-			cancel: () => {}
-		};
-		if (this.routes.get(threadId)?.completedNativeTurnIds.has(turnId)) return {
-			completion: Promise.resolve(true),
-			state: "confirmed",
+		const confirmed = !options.signal?.aborted && this.routes.get(threadId)?.completedNativeTurnIds.has(turnId) === true;
+		if (options.signal?.aborted || confirmed) return {
+			completion: Promise.resolve(confirmed),
+			state: confirmed ? "confirmed" : "unconfirmed",
 			settledSignal: AbortSignal.abort(),
 			cancel: () => {}
 		};
@@ -266,10 +363,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) {
@@ -282,13 +391,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;
@@ -304,7 +414,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 = {
@@ -323,7 +433,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;
 		}
@@ -375,10 +485,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);
@@ -396,12 +512,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}`);
@@ -420,9 +538,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")) {
@@ -446,23 +562,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);
@@ -479,12 +578,21 @@ function requireId(value, label) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/attempt-client-cleanup.ts
-/**
-* Best-effort cleanup helpers for Codex app-server startup attempts and turns.
-*/
-/** Timeout for best-effort app-server turn interruption during cleanup. */
+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
+});
 const CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS = 5e3;
-/** Timeout for best-effort thread unsubscribe during cleanup. */
 const CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS = 5e3;
 const CODEX_NO_ACTIVE_TURN_ERROR_CODE = -32600;
 const CODEX_NO_ACTIVE_TURN_ERROR_MESSAGE = "no active turn to interrupt";
@@ -502,7 +610,6 @@ var CodexAppServerUnsafeSubscriptionError = class extends Error {
 function isCodexAppServerUnsafeSubscriptionError(error) {
 	return error instanceof CodexAppServerUnsafeSubscriptionError;
 }
-/** Asserts Codex resumed the exact thread this attempt subscribed to. */
 function assertCodexThreadResumeSubscription(requestedThreadId, returnedThreadId) {
 	if (returnedThreadId !== requestedThreadId) throw new CodexAppServerUnsafeSubscriptionError(`Codex thread/resume returned ${returnedThreadId} for ${requestedThreadId}`);
 }
@@ -601,7 +708,6 @@ async function terminateCodexBackgroundTerminals(client, threadId, oneShotCliRun
 		throw new Error("Codex background-terminal cleanup failed; inspect the thread's running terminals before starting more work.", { cause });
 	}
 }
-/** Unsubscribes from a thread while swallowing cleanup-only failures. */
 async function unsubscribeCodexThreadBestEffort(client, params) {
 	try {
 		await unsubscribeCodexAppServerLiveThread(client, params.threadId, params.timeoutMs, params.assertCurrent);
@@ -620,4 +726,4 @@ function shouldRetireCodexStartupClient(error, spawnedBy, signal) {
 	return !isCodexAppServerStartSelectionChangedError(error) && !isCodexAppServerOverloadError(error) && !(error instanceof AgentHarnessPreflightError && error.scope === void 0) && (isCodexAppServerBrokenPipeError(error) || !spawnedBy);
 }
 //#endregion
-export { CodexProjectionDiagnostics as _, closeCodexStartupClientBestEffort as a, readCodexNotificationTurnId as b, isCodexNoActiveTurnInterruptError as c, terminateCodexBackgroundTerminals as d, unsubscribeCodexThreadBestEffort as f, waitForPromiseOrAbort as g, hasCodexAppServerSiblingRouteWork as h, assertCodexThreadResumeSubscription as i, retireUnsafeCodexTurnClientBestEffort as l, getCodexAppServerTurnRouter as m, CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS as n, interruptCodexTurnAndWaitBestEffort as o, CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS as p, CodexAppServerUnsafeSubscriptionError as r, isCodexAppServerUnsafeSubscriptionError as s, CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS as t, shouldRetireCodexStartupClient as u, isCodexNotificationForTurn as v, readCodexNotificationThreadId as y };
+export { itemStatus as A, auditNativeToolUnfinishedStatus as C, isSideEffectingNativeToolItem as D, isProjectedNativeToolItem as E, matchesCodexSnapshotTurn as M, shouldClearTerminalPresentationForNativeItem as N, itemKind as O, unknownItemStatus as P, auditNativeToolTerminalStatus as S, isNonSuccessItemStatus as T, 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, itemTitle as j, itemName as k, 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, isMutatingNativeToolItem as w, auditNativeToolName as x, readCodexNotificationThreadId as y };