agent-transport-system 0.7.39 → 0.7.40

package/dist/ats.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import { $ as gatewayErrorCodeSchema, $n as collectCanonicalMentionTextFragments, $t as signalEnvelopeSchema, A as createSpaceBodySchema, An as CURRENT_DAEMON_EXECUTION_CONTRACT_EPOCH, Ar as resolveSpaceMentionLabels, At as patchProfileSpaceHistoryStatusResponseSchema, B as daemonRouteObservationResponseSchema, Bn as SPACE_MEMBER_REMOVE_NOTICE_PURPOSE, Bt as prepareSessionResponseSchema, C as agentProfileBindingRouteParamsSchema, Cn as writeSetupTokenLocalRuntimeObservedMetadataResponseSchema, Cr as normalizeSpacePasswordText, Ct as localRuntimesQuerySchema, D as atsdControlPlaneResponseSchema, Dn as AGENT_REPLY_PREVIEW_PURPOSE, Dr as resolveBuiltinAgentControllerConversationKind, Dt as notifyAgentProfileRouteCatalogChangedBodySchema, E as atsdControlPlaneRequestSchema, En as AGENT_REPLY_PREVIEW_END_PURPOSE, Er as profileWorkspaceModeSchema, Et as normalizeSpaceCursorPatch, F as createSpaceThreadResponseSchema, Fn as LEGACY_RUNTIME_DISPATCH_POLICY, Ft as postNormalMessageResponseSchema, G as ensureAgentProfilePrimaryBindingResponseSchema, Gn as atsSpaceEgressActionSchema, Gt as querySpaceDeletionTombstonesResponseSchema, H as deleteSpaceResponseSchema, Hn as SPACE_PASSWORD_MIN_LENGTH, Ht as projectObservabilityWakeCorrelation, I as createStartSessionBodySchema, In as MAX_PROFILE_WORKING_DIRECTORY_LENGTH, It as postSpaceMembersBodySchema, J as forgetCurrentComputerResponseSchema, Jn as atsdTaskResultPayloadSchema, Jt as resolveStartHandoffBodySchema, K as entryBriefSchema, Kn as atsdTaskResultEnvelopeWriteSchema, Kt as removeSpaceMembersResponseSchema, L as currentDeviceTargetResponseSchema, Ln as MAX_SIGNAL_REPLY_TO_PREVIEW_LENGTH, Lt as postSpaceMembersResponseSchema, M as createSpaceDiagnosticReportResponseSchema, Mn as DISPATCH_ACTIVITY_DISPATCHING_PURPOSE, Mt as patchSpaceContractResponseSchema, N as createSpaceResponseSchema, Nn as DISPATCH_ACTIVITY_FAILED_PURPOSE, Nr as runtimeCoordinatorExecutionTokenEnvelopeSchema, Nt as patchStartSessionBodySchema, O as catchupResponseSchema, On as ATSD_TASK_RESULT_SCHEMA_VERSION, Or as resolveMessageEnvelopeTargetField, Ot as notifyAgentProfileRouteCatalogChangedResponseSchema, P as createSpaceThreadBodySchema, Pn as DISPATCH_ACTIVITY_RETRYING_PURPOSE, Pr as sanitizeSignalTextPreview, Pt as postNormalMessageBodySchema, Q as formatLocalSetupActionLabel, Qn as canonicalizeBuiltinAgentControllerRef, Qt as setLocalRuntimeDisplayNameBodySchema, R as currentLocalRuntimeReplyReadinessResponseSchema, Rn as MESSAGE_MENTION_TYPE_VALUES, Rt as postSpaceThreadSignalBodySchema, S as agentExecutionReadinessRouteParamsSchema, Sn as writeSetupTokenLocalRuntimeObservedMetadataBodySchema, Sr as normalizeOptionalWorkingDirectory, St as listSpaceThreadsResponseSchema, T as atsRequestContextSchema, Tn as AGENT_REPLYING_PURPOSE, Tr as parseOptionalClientMessageId, Tt as normalizeListSignalsReadQuerySemantics, U as dispatchBriefSchema, Un as SPACE_UPDATES_MAX_LIMIT, Ut as projectSpaceDispatchTraceFinalVisibleOutcome, V as daemonRuntimeLeaseSchema, Vn as SPACE_MENTION_REJECT_NOTICE_PURPOSE, Vt as prepareSessionStreamServerFrameSchema, W as ensureAgentProfilePrimaryBindingBodySchema, Wn as atsRuntimeProfileIdSchema, Wt as providerDispatchRuntimeContextSchema, X as formatLocalComponentsSummaryLabel, Xn as buildAgentControllerRoutingKey, Xt as serverErrorFrameSchema, Y as formatLocalComponentsSummaryDescription, Yn as buildAgentControllerConversationRef, Yt as resolveStartHandoffResponseSchema, Z as formatLocalSetupActionDescription, Zn as canonicalizeAgentControllerRef, Zt as setCurrentDeviceTargetBodySchema, _ as ATSD_CONTROL_PLANE_SCHEMA_VERSION, _n as submitRuntimeRegistrationResponseSchema, _r as formatCanonicalMentionLiteral, _t as installedLocalComponentsSnapshotSchema, a as runWithHeldLock, an as spaceViewerMembershipResponseSchema, ar as daemonHubDispatchPreviewEndRequestSchema, at as getPrepareReadinessQuerySchema, b as LOCAL_COMPONENTS_SCHEMA_VERSION, bn as writeCurrentDeviceObservedMetadataBodySchema, br as normalizeKnownBuiltinAgentControllerId, bt as listSpaceThreadEventsResponseSchema, c as LEGACY_ATS_CLI_CONTEXT_ENV_KEY, cn as startSessionProgressSchema, cr as daemonHubHeartbeatRequestSchema, ct as getSpaceDispatchLookupResponseSchema, d as resolveCliContext, dn as startSessionSpaceChoiceResponseSchema, dr as daemonHubRegisterSessionResponseSchema, dt as getSpaceStatusResponseSchema, en as spaceCreatorSchema, er as conversationExecutionStateSchema, et as gatewayErrorEnvelopeSchema, f as resolveCliContextId, fn as startSessionWithTokenResponseSchema, fr as daemonHubRouteCatalogChangedFramePayloadSchema, ft as getSpaceThreadResponseSchema, g as resolveMappedPublicAgentFailureReason, gn as submitRuntimeRegistrationBodySchema, gr as daemonStreamFrameSchema, gt as incomingServerMessageSchema, h as resolveBuiltinAgentControllerBrand, hn as submitRuntimeAgentControllerReportsResponseSchema, hr as daemonServiceLaneSchema, ht as getSpaceWakeTraceWaterfallResponseSchema, i as releaseLock, in as spaceMetaSchema, ir as daemonHubDispatchLifecycleRequestSchema, it as getAgentProfilePrimaryBindingResponseSchema, j as createSpaceDiagnosticReportBodySchema, jn as DAEMON_HUB_SCHEMA_VERSION, jt as patchSpaceContractBodySchema, k as continuitySchema, kn as CONVERSATION_CONTINUITY_WARNING_PURPOSE, kr as resolveSingleSpaceMentionLabels, kt as observabilityWakeTraceSelectorSchema, l as listCliContextStates, ln as startSessionResponseSchema, lr as daemonHubHeartbeatResponseSchema, lt as getSpaceDispatchResultResponseSchema, m as CODEX_UPGRADE_REQUIRED_REASON, mn as submitRuntimeAgentControllerReportsBodySchema, mr as daemonServiceContractSchema, mt as getSpaceWakeProgressResponseSchema, n as isAtsLockError, nn as spaceIdentityDirectorySchema, nr as daemonHubDeliverDispatchRequestSchema, nt as getAgentExecutionReadinessBatchResponseSchema, o as tryCleanupStaleLock, on as startDeviceProjectionSchema, or as daemonHubDispatchPreviewRequestSchema, ot as getPrepareReadinessResponseSchema, p as writeCliContextState, pn as structuredGuidePayloadFromInputSchema, pr as daemonHubSubmitTaskResultRequestSchema, pt as getSpaceUpdatesResponseSchema, q as forgetComputerResponseSchema, qn as atsdTaskResultOpenClawGatewayVisibilityStatusSchema, qt as resolveSpaceDispatchTraceRootCause, r as readLockMeta, rn as spaceMembersSnapshotSchema, rr as daemonHubDeliveryExecutionIdentitySchema, rt as getAgentExecutionReadinessResponseSchema, s as ATS_CLI_CONTEXT_ENV_KEY, sn as startProfileReadinessSummarySchema, sr as daemonHubDispatchRuntimeEvidenceRequestSchema, st as getSpaceContractResponseSchema, t as acquireLock, tn as spaceDispatchTraceResponseSchema, tr as createDaemonRouteObservationSummary, tt as getAgentExecutionReadinessBatchBodySchema, u as readCliContextState, un as startSessionSpaceChoiceBodySchema, ur as daemonHubRegisterSessionRequestSchema, ut as getSpaceMessageDetailsResponseSchema, v as DAEMON_ROUTE_CATALOG_CACHE_SCHEMA_NAME, vn as upsertProfileSpaceHistoryResponseSchema, vr as getSpaceMessageAddressingRelationSupportForTargetKind, vt as leaveSpaceResponseSchema, w as atsProfileIdSchema, wn as AGENT_REPLYING_END_PURPOSE, wr as parseAgentControllerRef$1, wt as localRuntimesResponseSchema, x as SPACE_DISPATCH_TRACE_PROMPT_PREVIEW_MAX_CHARS, xn as writeCurrentDeviceObservedMetadataResponseSchema, xr as normalizeMessageEnvelope, xt as listSpaceThreadSignalsResponseSchema, y as DAEMON_ROUTE_CATALOG_CACHE_SCHEMA_VERSION, yn as upsertSpaceDeletionTombstoneResponseSchema, yr as normalizeBuiltinAgentControllerId, yt as listProfileSpaceHistoryResponseSchema, z as daemonRouteCatalogCacheSchema, zn as SPACE_MEMBER_JOIN_NOTICE_PURPOSE, zt as postSpaceThreadSignalResponseSchema } from "./lock-DV2_jevB.js";
+import { $ as gatewayErrorCodeSchema, $n as canonicalizeBuiltinAgentControllerRef, $t as setLocalRuntimeDisplayNameBodySchema, A as createSpaceBodySchema, An as CONVERSATION_CONTINUITY_WARNING_PURPOSE, Ar as resolveSingleSpaceMentionLabels, At as observabilityWakeTraceSelectorSchema, B as daemonRouteObservationResponseSchema, Bn as SPACE_MEMBER_JOIN_NOTICE_PURPOSE, Bt as postSpaceThreadSignalResponseSchema, C as agentProfileBindingRouteParamsSchema, Cn as writeSetupTokenLocalRuntimeObservedMetadataBodySchema, Cr as normalizeOptionalWorkingDirectory, Ct as listSpaceThreadsResponseSchema, D as atsdControlPlaneResponseSchema, Dn as AGENT_REPLY_PREVIEW_END_PURPOSE, Dr as profileWorkspaceModeSchema, Dt as normalizeSpaceCursorPatch, E as atsdControlPlaneRequestSchema, En as AGENT_REPLYING_PURPOSE, Er as parseOptionalClientMessageId, Et as normalizeListSignalsReadQuerySemantics, F as createSpaceThreadResponseSchema, Fn as DISPATCH_ACTIVITY_RETRYING_PURPOSE, Fr as sanitizeSignalTextPreview, Ft as postNormalMessageBodySchema, G as ensureAgentProfilePrimaryBindingResponseSchema, Gn as atsRuntimeProfileIdSchema, Gt as providerDispatchRuntimeContextSchema, H as deleteSpaceResponseSchema, Hn as SPACE_MENTION_REJECT_NOTICE_PURPOSE, Ht as prepareSessionStreamServerFrameSchema, I as createStartSessionBodySchema, In as LEGACY_RUNTIME_DISPATCH_POLICY, It as postNormalMessageResponseSchema, J as forgetCurrentComputerResponseSchema, Jn as atsdTaskResultOpenClawGatewayVisibilityStatusSchema, Jt as resolveSpaceDispatchTraceRootCause, K as entryBriefSchema, Kn as atsSpaceEgressActionSchema, Kt as querySpaceDeletionTombstonesResponseSchema, L as currentDeviceTargetResponseSchema, Ln as MAX_PROFILE_WORKING_DIRECTORY_LENGTH, Lt as postSpaceMembersBodySchema, M as createSpaceDiagnosticReportResponseSchema, Mn as DAEMON_HUB_SCHEMA_VERSION, Mt as patchSpaceContractBodySchema, N as createSpaceResponseSchema, Nn as DISPATCH_ACTIVITY_DISPATCHING_PURPOSE, Nt as patchSpaceContractResponseSchema, O as catchupResponseSchema, On as AGENT_REPLY_PREVIEW_PURPOSE, Or as resolveBuiltinAgentControllerConversationKind, Ot as notifyAgentProfileRouteCatalogChangedBodySchema, P as createSpaceThreadBodySchema, Pn as DISPATCH_ACTIVITY_FAILED_PURPOSE, Pr as runtimeCoordinatorExecutionTokenEnvelopeSchema, Pt as patchStartSessionBodySchema, Q as formatLocalSetupActionLabel, Qn as canonicalizeAgentControllerRef, Qt as setCurrentDeviceTargetBodySchema, R as currentLocalRuntimeReplyReadinessResponseSchema, Rn as MAX_SIGNAL_REPLY_TO_PREVIEW_LENGTH, Rt as postSpaceMembersResponseSchema, S as agentExecutionReadinessRouteParamsSchema, Sn as writeCurrentDeviceObservedMetadataResponseSchema, Sr as normalizeMessageEnvelope, St as listSpaceThreadSignalsResponseSchema, T as atsRequestContextSchema, Tn as AGENT_REPLYING_END_PURPOSE, Tr as parseAgentControllerRef$1, Tt as localRuntimesResponseSchema, U as dispatchBriefSchema, Un as SPACE_PASSWORD_MIN_LENGTH, Ut as projectObservabilityWakeCorrelation, V as daemonRuntimeLeaseSchema, Vn as SPACE_MEMBER_REMOVE_NOTICE_PURPOSE, Vt as prepareSessionResponseSchema, W as ensureAgentProfilePrimaryBindingBodySchema, Wn as SPACE_UPDATES_MAX_LIMIT, Wt as projectSpaceDispatchTraceFinalVisibleOutcome, X as formatLocalComponentsSummaryLabel, Xn as buildAgentControllerConversationRef, Xt as resolveStartHandoffResponseSchema, Y as formatLocalComponentsSummaryDescription, Yn as atsdTaskResultPayloadSchema, Yt as resolveStartHandoffBodySchema, Z as formatLocalSetupActionDescription, Zn as buildAgentControllerRoutingKey, Zt as serverErrorFrameSchema, _ as ATSD_CONTROL_PLANE_SCHEMA_VERSION, _n as submitRuntimeRegistrationBodySchema, _r as daemonStreamFrameSchema, _t as incomingServerMessageSchema, a as runWithHeldLock, an as spaceMetaSchema, ar as daemonHubDispatchLifecycleRequestSchema, at as getAgentProfilePrimaryBindingResponseSchema, b as LOCAL_COMPONENTS_SCHEMA_VERSION, bn as upsertSpaceDeletionTombstoneResponseSchema, br as normalizeBuiltinAgentControllerId, bt as listProfileSpaceHistoryResponseSchema, c as LEGACY_ATS_CLI_CONTEXT_ENV_KEY, cn as startProfileReadinessSummarySchema, cr as daemonHubDispatchRuntimeEvidenceRequestSchema, ct as getSpaceContractResponseSchema, d as resolveCliContext, dn as startSessionSpaceChoiceBodySchema, dr as daemonHubRegisterSessionRequestSchema, dt as getSpaceMessageDetailsResponseSchema, en as signalEnvelopeSchema, er as collectCanonicalMentionTextFragments, et as gatewayErrorEnvelopeSchema, f as resolveCliContextId, fn as startSessionSpaceChoiceResponseSchema, fr as daemonHubRegisterSessionResponseSchema, ft as getSpaceStatusResponseSchema, g as resolveMappedPublicAgentFailureReason, gn as submitRuntimeAgentControllerReportsResponseSchema, gr as daemonServiceLaneSchema, gt as getSpaceWakeTraceWaterfallResponseSchema, h as resolveBuiltinAgentControllerBrand, hn as submitRuntimeAgentControllerReportsBodySchema, hr as daemonServiceContractSchema, ht as getSpaceWakeProgressResponseSchema, i as releaseLock, in as spaceMembersSnapshotSchema, ir as daemonHubDeliveryExecutionIdentitySchema, it as getAgentExecutionReadinessResponseSchema, j as createSpaceDiagnosticReportBodySchema, jn as CURRENT_DAEMON_EXECUTION_CONTRACT_EPOCH, jr as resolveSpaceMentionLabels, jt as patchProfileSpaceHistoryStatusResponseSchema, k as continuitySchema, kn as ATSD_TASK_RESULT_SCHEMA_VERSION, kr as resolveMessageEnvelopeTargetField, kt as notifyAgentProfileRouteCatalogChangedResponseSchema, l as listCliContextStates, ln as startSessionProgressSchema, lr as daemonHubHeartbeatRequestSchema, lt as getSpaceDispatchLookupResponseSchema, m as CODEX_UPGRADE_REQUIRED_REASON, mn as structuredGuidePayloadFromInputSchema, mr as daemonHubSubmitTaskResultRequestSchema, mt as getSpaceUpdatesResponseSchema, n as isAtsLockError, nn as spaceDispatchTraceResponseSchema, nr as createDaemonRouteObservationSummary, nt as getAgentExecutionReadinessBatchBodySchema, o as tryCleanupStaleLock, on as spaceViewerMembershipResponseSchema, or as daemonHubDispatchPreviewEndRequestSchema, ot as getPrepareReadinessQuerySchema, p as writeCliContextState, pn as startSessionWithTokenResponseSchema, pr as daemonHubRouteCatalogChangedFramePayloadSchema, pt as getSpaceThreadResponseSchema, q as forgetComputerResponseSchema, qn as atsdTaskResultEnvelopeWriteSchema, qt as removeSpaceMembersResponseSchema, r as readLockMeta, rn as spaceIdentityDirectorySchema, rr as daemonHubDeliverDispatchRequestSchema, rt as getAgentExecutionReadinessBatchResponseSchema, s as ATS_CLI_CONTEXT_ENV_KEY, sn as startDeviceProjectionSchema, sr as daemonHubDispatchPreviewRequestSchema, st as getPrepareReadinessResponseSchema, t as acquireLock, tn as spaceCreatorSchema, tr as conversationExecutionStateSchema, tt as getActiveSpaceWakeProgressResponseSchema, u as readCliContextState, un as startSessionResponseSchema, ur as daemonHubHeartbeatResponseSchema, ut as getSpaceDispatchResultResponseSchema, v as DAEMON_ROUTE_CATALOG_CACHE_SCHEMA_NAME, vn as submitRuntimeRegistrationResponseSchema, vr as formatCanonicalMentionLiteral, vt as installedLocalComponentsSnapshotSchema, w as atsProfileIdSchema, wn as writeSetupTokenLocalRuntimeObservedMetadataResponseSchema, wr as normalizeSpacePasswordText, wt as localRuntimesQuerySchema, x as SPACE_DISPATCH_TRACE_PROMPT_PREVIEW_MAX_CHARS, xn as writeCurrentDeviceObservedMetadataBodySchema, xr as normalizeKnownBuiltinAgentControllerId, xt as listSpaceThreadEventsResponseSchema, y as DAEMON_ROUTE_CATALOG_CACHE_SCHEMA_VERSION, yn as upsertProfileSpaceHistoryResponseSchema, yr as getSpaceMessageAddressingRelationSupportForTargetKind, yt as leaveSpaceResponseSchema, z as daemonRouteCatalogCacheSchema, zn as MESSAGE_MENTION_TYPE_VALUES, zt as postSpaceThreadSignalBodySchema } from "./lock-BJ3j8Z9n.js";
 import { A as runtimeDir, C as normalizeAtsProfileId, D as resolveAtsEnvPreset, E as resolveAtsCliEntryNameFromArgv, F as systemDir, N as skillsDir, O as resolveAtsRootDir, P as spacesDir, S as normalizeAccountKey, T as profileViewPath, a as accountProfileWorkspacePath, c as atsRootDir, d as deviceOpenClawProfileBootstrapPath, f as deviceOpenClawProfileDir, i as accountProfileViewPath, j as runtimeLogsDir, k as resolveDefaultAtsHomeDirname, n as accountProfileLocalMetaPath, o as accountsDir, p as deviceOpenClawProfileWorkspaceDir, r as accountProfileSpaceCacheDir, s as atsBackupsDir, t as ATS_HOME_ENV_KEY, w as profileDir, y as legacyAccountProfileSpacesDir } from "./paths-DFiopT5Y.js";
-import { A as toSpaceDeleteUrl, B as toSpaceUpdatesUrl, C as updateConfiguredSkillsConfig, D as toSpaceContractUrl, E as toDaemonRouteObservationUrl, F as toSpaceMetaUrl, I as toSpacePasswordUrl, L as toSpaceRemoveMembersUrl, M as toSpaceDispatchTraceUrl, N as toSpaceLeaveUrl, O as toSpaceCreateUrl, P as toSpaceMembersUrl, R as toSpaceResultUrl, S as updateConfiguredOnboardingConfig, T as normalizeBaseUrl, V as toSpaceWsUrl, _ as getRuntimeConfigReadHealth, a as resolveBaseUrlOrNull, b as setConfiguredSkillsConfig, c as DEFAULT_RUNTIME_AGENT_TRANSPORT_MODE, d as getConfiguredDaemonDispatchLimits, f as getConfiguredDeviceRuntimeState, g as getConfiguredViewCustomization, h as getConfiguredStartV1OnboardingState, i as resolveBaseUrl, j as toSpaceDispatchLookupUrl, k as toSpaceCursorUrl, l as alignRuntimeConfigStorage, m as getConfiguredSkillsConfig, n as normalizeGatewayBaseUrl, o as resolveDefaultGatewayBaseUrl, p as getConfiguredOnboardingDisclaimerAcceptedAt, r as normalizeGatewayBaseUrlOrNull, s as resolveExplicitGatewayUrlOrThrow, u as createDefaultRuntimeAgentControllerSettings, v as resolveRuntimeSkillsCustomTargetId, w as updateConfiguredStartV1OnboardingState, x as updateConfiguredDeviceRuntimeState, y as setConfiguredBaseUrl, z as toSpaceSignalsUrl } from "./base-url-Gd_RGCHM.js";
+import { A as toSpaceDeleteUrl, B as toSpaceUpdatesUrl, C as updateConfiguredSkillsConfig, D as toSpaceContractUrl, E as toDaemonRouteObservationUrl, F as toSpaceMetaUrl, I as toSpacePasswordUrl, L as toSpaceRemoveMembersUrl, M as toSpaceDispatchTraceUrl, N as toSpaceLeaveUrl, O as toSpaceCreateUrl, P as toSpaceMembersUrl, R as toSpaceResultUrl, S as updateConfiguredOnboardingConfig, T as normalizeBaseUrl, V as toSpaceWsUrl, _ as getRuntimeConfigReadHealth, a as resolveBaseUrlOrNull, b as setConfiguredSkillsConfig, c as DEFAULT_RUNTIME_AGENT_TRANSPORT_MODE, d as getConfiguredDaemonDispatchLimits, f as getConfiguredDeviceRuntimeState, g as getConfiguredViewCustomization, h as getConfiguredStartV1OnboardingState, i as resolveBaseUrl, j as toSpaceDispatchLookupUrl, k as toSpaceCursorUrl, l as alignRuntimeConfigStorage, m as getConfiguredSkillsConfig, n as normalizeGatewayBaseUrl, o as resolveDefaultGatewayBaseUrl, p as getConfiguredOnboardingDisclaimerAcceptedAt, r as normalizeGatewayBaseUrlOrNull, s as resolveExplicitGatewayUrlOrThrow, u as createDefaultRuntimeAgentControllerSettings, v as resolveRuntimeSkillsCustomTargetId, w as updateConfiguredStartV1OnboardingState, x as updateConfiguredDeviceRuntimeState, y as setConfiguredBaseUrl, z as toSpaceSignalsUrl } from "./base-url-CjrWhAM1.js";
 import { createRequire } from "node:module";
 import { Command, Option } from "commander";
 import { accessSync, appendFileSync, chmodSync, constants, existsSync, mkdirSync, readFileSync, realpathSync, renameSync, statSync, writeFileSync } from "node:fs";
@@ -27,12 +27,12 @@ import wrapAnsi from "wrap-ansi";
 import { Box, Container, Editor, Key, ProcessTerminal, TUI, Text, getEditorKeybindings, matchesKey } from "@mariozechner/pi-tui";
 
 //#region package.json
-var version = "0.7.39";
+var version = "0.7.40";
 var package_default = {
 	$schema: "https://www.schemastore.org/package.json",
 	name: "agent-transport-system",
 	version,
-	atsReleaseDate: "2026-06-05",
+	atsReleaseDate: "2026-06-06",
 	description: "Agent Transport System CLI - https://ats.sh",
 	license: "MIT",
 	type: "module",
@@ -363,7 +363,7 @@ var registry_default$1 = {
 						"kind": "contains",
 						"values": ["codex"]
 					},
-					"transportModes": ["local-cli"],
+					"transportModes": ["codex-app-server"],
 					"capabilityDeclaration": {
 						"streamingCapability": "preview_capable",
 						"runtimeWorkingDirectoryMode": "spawn_cwd",
@@ -375,8 +375,8 @@ var registry_default$1 = {
 			},
 			"originLaunch": { "commandTemplate": "cd {workingDirectory} && codex resume {agentControllerConversationId}" },
 			"notes": "Primary runnable agent in current environment.",
-			"transportModes": ["local-cli"],
-			"defaultTransportMode": "local-cli",
+			"transportModes": ["codex-app-server"],
+			"defaultTransportMode": "codex-app-server",
 			"defaultStreamingMode": "final"
 		},
 		{
@@ -1068,7 +1068,7 @@ const SUPPORTED_PLATFORMS = new Set([
 	"linux",
 	"win32"
 ]);
-const SUPPORTED_TRANSPORT_MODES = new Set(["local-cli"]);
+const SUPPORTED_TRANSPORT_MODES = new Set(["local-cli", "codex-app-server"]);
 const SUPPORTED_STREAMING_MODES = new Set(["final", "stream"]);
 const SUPPORTED_RUNTIME_MATCHER_KINDS = new Set([
 	"contains",
@@ -1128,6 +1128,7 @@ function resolveRegistryRuntimeAdapterByAgentControllerRef(agentControllerRef) {
 		agentId: runtimeAdapterContract.agentId,
 		adapterId: runtimeAdapterContract.adapterId,
 		controllerRefMatcher: runtimeAdapterContract.controllerRefMatcher,
+		...runtimeAdapterContract.defaultTransportMode ? { defaultTransportMode: runtimeAdapterContract.defaultTransportMode } : {},
 		transportModes: runtimeAdapterContract.transportModes,
 		...runtimeAdapterContract.defaultStreamingMode ? { defaultStreamingMode: runtimeAdapterContract.defaultStreamingMode } : {}
 	};
@@ -1159,6 +1160,7 @@ function resolveRegistryRuntimeAdapterContractByAgentControllerRef(agentControll
 				values: [...adapter.controllerRefMatcher.values]
 			},
 			transportModes: [...adapter.transportModes],
+			...agent.defaultTransportMode ? { defaultTransportMode: agent.defaultTransportMode } : {},
 			...buildRuntimeAdapterStreamingDefaults({
 				capabilityDeclaration: adapter.capabilityDeclaration,
 				defaultStreamingMode: agent.defaultStreamingMode
@@ -1412,7 +1414,7 @@ function parseOptionalStreamingMode(value, context) {
 	return parseStreamingMode$1(value, context);
 }
 function parseTransportMode$1(value, context) {
-	const transportMode = readEnumValue(value, context, ["local-cli"]);
+	const transportMode = readEnumValue(value, context, ["local-cli", "codex-app-server"]);
 	if (!SUPPORTED_TRANSPORT_MODES.has(transportMode)) throw new Error(`Unsupported transport mode at ${context}: ${transportMode}`);
 	return transportMode;
 }
@@ -1600,12 +1602,12 @@ const PROFILE_AWARE_SPACE_COMMANDS = new Set([
 ]);
 const SPACE_PARENT_OPTIONS_WITH_VALUE = new Set(["--gateway-url"]);
 function resolveUserFacingCliEntryCommand(input = {}) {
-	const explicitCommand = normalizeText$10((input.env ?? process$1.env)[ATS_USER_FACING_CLI_COMMAND_ENV$2]);
+	const explicitCommand = normalizeText$11((input.env ?? process$1.env)[ATS_USER_FACING_CLI_COMMAND_ENV$2]);
 	if (explicitCommand.length > 0) return explicitCommand;
 	return isNpxCliInvocation(input) ? ATS_CLI_NPX_COMMAND$1 : ATS_CLI_COMMAND;
 }
 function resolveSetupFollowUpCliEntryCommand(input = {}) {
-	const setupCommand = normalizeText$10((input.env ?? process$1.env)[ATS_SETUP_FOLLOW_UP_CLI_COMMAND_ENV]);
+	const setupCommand = normalizeText$11((input.env ?? process$1.env)[ATS_SETUP_FOLLOW_UP_CLI_COMMAND_ENV]);
 	if (setupCommand.length > 0) return setupCommand;
 	return resolveUserFacingCliEntryCommand(input);
 }
@@ -1641,9 +1643,9 @@ function formatAtsCliTextBlock(text, input = {}) {
 function isNpxCliInvocation(input) {
 	const env = input.env ?? process$1.env;
 	const argv = input.argv ?? process$1.argv;
-	const npmCommand = normalizeText$10(env.npm_command).toLowerCase();
+	const npmCommand = normalizeText$11(env.npm_command).toLowerCase();
 	const npmExecPath = normalizePath$1(env.npm_execpath);
-	const npmUserAgent = normalizeText$10(env.npm_config_user_agent).toLowerCase();
+	const npmUserAgent = normalizeText$11(env.npm_config_user_agent).toLowerCase();
 	if (npmCommand === "exec" && (npmUserAgent.startsWith("npm/") || npmExecPath.includes("/npm/") || npmExecPath.endsWith("/npm-cli.js"))) return true;
 	const scriptPath = normalizePath$1(argv[1]);
 	return scriptPath.includes("/.npm/") && scriptPath.includes("_npx");
@@ -1656,7 +1658,7 @@ function formatBareAtsCliMentions(text, input = {}) {
 function applyProfileAwareCommandScope(command, input) {
 	if (!ATS_COMMAND_PREFIX_RE$1.test(command)) return command;
 	let scopedCommand = command.trimEnd();
-	const profileId = normalizeText$10(input.profileId ?? void 0);
+	const profileId = normalizeText$11(input.profileId ?? void 0);
 	if (profileId.length > 0) scopedCommand = appendCliOption(scopedCommand, "profile", profileId);
 	if (input.resolvedView === "agent") scopedCommand = appendCliOption(scopedCommand, "view", "agent");
 	return scopedCommand;
@@ -1708,9 +1710,9 @@ function resolveProfileOptionInsertionIndex(tokens) {
 	return index + 1;
 }
 function normalizePath$1(value) {
-	return normalizeText$10(value).replaceAll("\\", "/").toLowerCase();
+	return normalizeText$11(value).replaceAll("\\", "/").toLowerCase();
 }
-function normalizeText$10(value) {
+function normalizeText$11(value) {
 	return String(value ?? "").trim();
 }
 
@@ -2115,8 +2117,8 @@ function buildDaemonControlTargetExamples(input) {
 	})];
 }
 function validateDaemonControlTargetInput(input) {
-	const dispatch = normalizeOptionalText$53(input.dispatch);
-	const task = normalizeOptionalText$53(input.task);
+	const dispatch = normalizeOptionalText$54(input.dispatch);
+	const task = normalizeOptionalText$54(input.task);
 	if (dispatch && task || !(dispatch || task)) throw createCommandContractError("daemon.control.invalid_target_selector", DAEMON_CONTROL_TARGET_ERROR);
 	return {
 		dispatch,
@@ -2135,7 +2137,7 @@ function buildDaemonControlTargetCommand(input) {
 	if (input.includeViewFlag) tokens.push("--view", "agent");
 	return tokens.join(" ");
 }
-function normalizeOptionalText$53(value) {
+function normalizeOptionalText$54(value) {
 	const normalized = String(value ?? "").trim();
 	return normalized.length > 0 ? normalized : null;
 }
@@ -3798,7 +3800,7 @@ async function requestLatestPackageVersion(packageName) {
 		if (!version) throw new Error("missing version");
 		return version;
 	} catch (error) {
-		throw new Error(`version check failed: invalid registry response: ${toErrorMessage$36(error)}`);
+		throw new Error(`version check failed: invalid registry response: ${toErrorMessage$37(error)}`);
 	}
 }
 function compareSemver(a, b) {
@@ -3863,20 +3865,20 @@ function toNonEmptyString(value) {
 	const normalized = value.trim();
 	return normalized.length > 0 ? normalized : null;
 }
-function toErrorMessage$36(error) {
+function toErrorMessage$37(error) {
 	if (error instanceof Error) return error.message;
 	return String(error);
 }
 
 //#endregion
 //#region ../../runtime/adapters/core/dist/conversation-bridge.js
-const normalizeText$9 = (value) => {
+const normalizeText$10 = (value) => {
 	if (typeof value !== "string") return null;
 	const normalized = value.trim();
 	return normalized.length > 0 ? normalized : null;
 };
 const resolveBuiltinAdapterConversationBridgeSpec = (adapterId) => {
-	const rawAgentControllerRef = normalizeText$9(adapterId);
+	const rawAgentControllerRef = normalizeText$10(adapterId);
 	if (!rawAgentControllerRef) return null;
 	const agentControllerRef = canonicalizeBuiltinAgentControllerRef(rawAgentControllerRef);
 	if (!agentControllerRef) return null;
@@ -3893,7 +3895,7 @@ const buildAdapterAgentControllerConversationRef = (input) => buildAgentControll
 	agentControllerConversationKind: input.agentControllerConversationKind
 });
 const resolveBridgedAgentControllerConversationId = (input) => {
-	const agentControllerConversationId = normalizeText$9(input.agentControllerConversationId);
+	const agentControllerConversationId = normalizeText$10(input.agentControllerConversationId);
 	const agentControllerConversation = input.agentControllerConversation;
 	if (!agentControllerConversation) return agentControllerConversationId;
 	if (agentControllerConversation.agentControllerRef !== input.bridgeSpec.agentControllerRef) throw new Error(`conversation.bridge.agent_controller_ref_mismatch: expected agentControllerRef=${input.bridgeSpec.agentControllerRef}, received agentControllerRef=${agentControllerConversation.agentControllerRef}`);
@@ -4215,7 +4217,7 @@ const WINDOWS_PATHEXT = [
 const SHEBANG_ARGS_SPLIT_RE = /\s+/;
 const FIRST_LINE_SPLIT_RE = /\r?\n/u;
 const NODE_VERSION_PATH_RE = /(?:^|\/)v?(\d+\.\d+\.\d+)(?:\/|$)/u;
-const HOME_DIR = normalizeOptionalText$52(homedir());
+const HOME_DIR = normalizeOptionalText$53(homedir());
 function buildExecutableLaunchContract(input) {
 	return {
 		kind: "executable",
@@ -4259,7 +4261,7 @@ async function verifyLaunchContractFiles(input) {
 		};
 	} catch (error) {
 		return {
-			errorMessage: toErrorMessage$35(error),
+			errorMessage: toErrorMessage$36(error),
 			ok: false
 		};
 	}
@@ -4286,7 +4288,7 @@ async function verifyCliLaunchContract(input) {
 		return fileCheck;
 	} catch (error) {
 		return {
-			errorMessage: `${input.displayName} can't start on this device: ${toErrorMessage$35(error)}`,
+			errorMessage: `${input.displayName} can't start on this device: ${toErrorMessage$36(error)}`,
 			ok: false
 		};
 	}
@@ -4347,7 +4349,7 @@ async function inspectInstalledNodeScriptLaunchCandidate(input) {
 		};
 	} catch (error) {
 		return {
-			errorMessage: `${input.displayName} is installed, but ATS could not inspect its launch files: ${toErrorMessage$35(error)}`,
+			errorMessage: `${input.displayName} is installed, but ATS could not inspect its launch files: ${toErrorMessage$36(error)}`,
 			ok: false
 		};
 	}
@@ -4356,7 +4358,7 @@ function resolveInstalledCommandPath(input) {
 	return resolveInstalledCommandPaths(input)[0] ?? null;
 }
 function resolveInstalledCommandPaths(input) {
-	const configuredCommand = normalizeOptionalText$52(input.configuredCommand);
+	const configuredCommand = normalizeOptionalText$53(input.configuredCommand);
 	if (configuredCommand) {
 		if (isAbsolute(configuredCommand)) return [configuredCommand];
 		if (configuredCommand.includes("/") || configuredCommand.includes("\\")) return [];
@@ -4365,9 +4367,9 @@ function resolveInstalledCommandPaths(input) {
 	return resolveExecutablePathsOnPath(input.commandName);
 }
 function resolveExecutablePathsOnPath(commandName) {
-	const normalizedCommandName = normalizeOptionalText$52(commandName);
+	const normalizedCommandName = normalizeOptionalText$53(commandName);
 	if (!normalizedCommandName) return [];
-	const pathValue = normalizeOptionalText$52(process.env.PATH);
+	const pathValue = normalizeOptionalText$53(process.env.PATH);
 	if (!pathValue) return [];
 	const resolvedPaths = [];
 	for (const pathEntry of pathValue.split(delimiter)) {
@@ -4381,7 +4383,7 @@ function resolveExecutablePathsOnPath(commandName) {
 	return resolvedPaths;
 }
 function resolveSiblingCommandPath(input) {
-	const normalizedCommandName = normalizeOptionalText$52(input.commandName);
+	const normalizedCommandName = normalizeOptionalText$53(input.commandName);
 	if (!normalizedCommandName) return null;
 	const siblingDirectory = dirname(input.anchorPath);
 	for (const candidateName of resolveCommandFileNameCandidates(normalizedCommandName)) {
@@ -4391,7 +4393,7 @@ function resolveSiblingCommandPath(input) {
 	return null;
 }
 async function resolvePinnedNodePath(input) {
-	const firstLine = normalizeOptionalText$52(input.firstLine);
+	const firstLine = normalizeOptionalText$53(input.firstLine);
 	if (!firstLine) return null;
 	if (firstLine === ENV_NODE_SHEBANG) {
 		const nodeSibling = join(dirname(input.commandPath), "node");
@@ -4403,7 +4405,7 @@ async function resolvePinnedNodePath(input) {
 		}
 	}
 	if (!firstLine.startsWith("#!")) return null;
-	const interpreter = normalizeOptionalText$52(firstLine.slice(2));
+	const interpreter = normalizeOptionalText$53(firstLine.slice(2));
 	if (!(interpreter && isAbsolute(interpreter))) return null;
 	const normalizedInterpreter = interpreter.split(SHEBANG_ARGS_SPLIT_RE, 1)[0] ?? interpreter;
 	try {
@@ -4414,7 +4416,7 @@ async function resolvePinnedNodePath(input) {
 	}
 }
 async function readFirstLine(path) {
-	return normalizeOptionalText$52((await readFile(path, "utf8")).split(FIRST_LINE_SPLIT_RE, 1)[0] ?? "");
+	return normalizeOptionalText$53((await readFile(path, "utf8")).split(FIRST_LINE_SPLIT_RE, 1)[0] ?? "");
 }
 async function assertExecutablePath(path) {
 	await access(path, resolveRunnablePathAccessMode());
@@ -4446,11 +4448,11 @@ function resolveRunnablePathAccessMode() {
 	return process.platform === "win32" ? constants.F_OK : constants.X_OK;
 }
 function resolveWindowsPathExtensions(value) {
-	const normalized = normalizeOptionalText$52(value);
+	const normalized = normalizeOptionalText$53(value);
 	if (!normalized) return [...WINDOWS_PATHEXT];
 	return normalized.split(";").map((entry) => entry.trim().toLowerCase()).filter((entry, index, values) => entry && values.indexOf(entry) === index).map((entry) => entry.startsWith(".") ? entry : `.${entry}`);
 }
-function normalizeOptionalText$52(value) {
+function normalizeOptionalText$53(value) {
 	const normalized = String(value ?? "").trim();
 	return normalized.length > 0 ? normalized : null;
 }
@@ -4542,9 +4544,9 @@ function shortenPathForDisplay(path) {
 	return `~${path.slice(HOME_DIR.length)}`;
 }
 function resolveNodeVersionFromPath(path) {
-	return normalizeOptionalText$52(path.match(NODE_VERSION_PATH_RE)?.[1]);
+	return normalizeOptionalText$53(path.match(NODE_VERSION_PATH_RE)?.[1]);
 }
-function toErrorMessage$35(error) {
+function toErrorMessage$36(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 
@@ -4569,9 +4571,9 @@ const buildProviderExitError = (input) => {
 	};
 };
 const hasVisibleText = (value) => {
-	return normalizeOptionalText$51(value) !== null;
+	return normalizeOptionalText$52(value) !== null;
 };
-const normalizeOptionalText$51 = (value) => {
+const normalizeOptionalText$52 = (value) => {
 	if (typeof value !== "string") return null;
 	const normalized = value.trim();
 	return normalized.length > 0 ? normalized : null;
@@ -4582,7 +4584,7 @@ const normalizeOptionalText$51 = (value) => {
 const DEFAULT_GRACEFUL_INTERRUPT_TIMEOUT_MS = 1e4;
 const DEFAULT_INTERRUPT_REASON = "service.interrupt";
 const DEFAULT_CANCEL_REASON = "service.cancel";
-const TEST_DISABLE_DEFAULT_INVOKE = Symbol.for("ats.test.disableDefaultInvoke");
+const TEST_DISABLE_DEFAULT_INVOKE$1 = Symbol.for("ats.test.disableDefaultInvoke");
 const createSharedDispatchShell = (input) => {
 	const bridgeSpec = input.bridgeSpec ?? null;
 	return async (dispatchInput) => {
@@ -4594,7 +4596,7 @@ const createSharedDispatchShell = (input) => {
 			errorType: "adapter",
 			status: "failed"
 		};
-		const defaultInvoke = isDefaultInvokeDisabledForTests(input.runtimeOptions) ? null : input.resolveDefaultInvoke() ?? null;
+		const defaultInvoke = isDefaultInvokeDisabledForTests$1(input.runtimeOptions) ? null : input.resolveDefaultInvoke() ?? null;
 		const resolvedInvoke = transportInvoke ?? input.invoke ?? defaultInvoke;
 		if (!resolvedInvoke) return {
 			errorCode: "controller.runtime.missing",
@@ -4876,18 +4878,18 @@ const buildDefaultInvokeRequest = (input) => {
 		agentControllerConversationId: input.request.agentControllerConversationId,
 		bridgeSpec: input.bridgeSpec,
 		agentControllerConversation: input.request.agentControllerConversation
-	}) : normalizeOptionalText$50(input.request.agentControllerConversationId);
+	}) : normalizeOptionalText$51(input.request.agentControllerConversationId);
 	return {
 		...input.request,
 		agentControllerConversationId
 	};
 };
-const normalizeOptionalText$50 = (value) => {
+const normalizeOptionalText$51 = (value) => {
 	if (typeof value !== "string") return null;
 	const normalized = value.trim();
 	return normalized.length > 0 ? normalized : null;
 };
-const isDefaultInvokeDisabledForTests = (runtimeOptions) => runtimeOptions?.[TEST_DISABLE_DEFAULT_INVOKE] === true;
+const isDefaultInvokeDisabledForTests$1 = (runtimeOptions) => runtimeOptions?.[TEST_DISABLE_DEFAULT_INVOKE$1] === true;
 const resolveCancelSignalSender = (input) => {
 	if (input.sendCancel) return {
 		deliveryPath: "cancel",
@@ -4924,7 +4926,7 @@ const DEFAULT_CLAUDE_CODE_COMMAND = "claude";
 async function resolveInstalledClaudeCodeLaunchCandidates() {
 	const installedCandidates = await resolveInstalledNodeScriptLaunchCandidates({
 		commandName: DEFAULT_CLAUDE_CODE_COMMAND,
-		configuredCommand: normalizeOptionalText$49(process.env.ATSD_RUNTIME_CLAUDE_CODE_BIN),
+		configuredCommand: normalizeOptionalText$50(process.env.ATSD_RUNTIME_CLAUDE_CODE_BIN),
 		displayName: "Claude Code"
 	});
 	if (!installedCandidates.ok) return installedCandidates;
@@ -4952,13 +4954,13 @@ async function verifyClaudeCodeLaunchContract(input) {
 	});
 }
 function resolveClaudeCodeTimeoutMs() {
-	const raw = normalizeOptionalText$49(process.env.ATSD_RUNTIME_REQUEST_TIMEOUT_MS);
+	const raw = normalizeOptionalText$50(process.env.ATSD_RUNTIME_REQUEST_TIMEOUT_MS);
 	if (!raw) return null;
 	const parsed = Number.parseInt(raw, 10);
 	if (!Number.isFinite(parsed) || parsed <= 0) return null;
 	return parsed;
 }
-function normalizeOptionalText$49(value) {
+function normalizeOptionalText$50(value) {
 	const normalized = String(value ?? "").trim();
 	return normalized.length > 0 ? normalized : null;
 }
@@ -4989,8 +4991,8 @@ function parseClaudeOutputLine(line) {
 	}
 	const record = toObjectRecord(parsed);
 	if (!record) return null;
-	const sessionId = normalizeOptionalText$48(record.session_id);
-	const resultText = normalizeOptionalText$48(record.result);
+	const sessionId = normalizeOptionalText$49(record.session_id);
+	const resultText = normalizeOptionalText$49(record.result);
 	const isErrorResult = typeof record.is_error === "boolean" ? record.is_error : null;
 	if (record.type === "result") return {
 		errorMessage: isErrorResult ? resultText : null,
@@ -5001,7 +5003,7 @@ function parseClaudeOutputLine(line) {
 		terminal: true
 	};
 	if (record.type === "error") return {
-		errorMessage: normalizeOptionalText$48(record.message),
+		errorMessage: normalizeOptionalText$49(record.message),
 		isErrorResult: true,
 		previewDeltaText: null,
 		resultText: null,
@@ -5017,7 +5019,7 @@ function parseClaudeOutputLine(line) {
 function parseClaudeStreamEvent(record, sessionId) {
 	const event = toObjectRecord(record.event);
 	if (!event) return null;
-	const eventType = normalizeOptionalText$48(event.type);
+	const eventType = normalizeOptionalText$49(event.type);
 	if (eventType === "message_start") return {
 		errorMessage: null,
 		isErrorResult: null,
@@ -5041,11 +5043,11 @@ function parseClaudeStreamEvent(record, sessionId) {
 function toObjectRecord(value) {
 	return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
-function normalizeText$8(value) {
+function normalizeText$9(value) {
 	return String(value ?? "").trim();
 }
-function normalizeOptionalText$48(value) {
-	const normalized = normalizeText$8(value);
+function normalizeOptionalText$49(value) {
+	const normalized = normalizeText$9(value);
 	return normalized.length > 0 ? normalized : null;
 }
 function preserveOptionalText(value) {
@@ -5069,7 +5071,7 @@ var ClaudeCliTransportError = class extends Error {
 	}
 };
 async function invokeClaudeCliTransport(input) {
-	const prompt = normalizeOptionalText$47(input.prompt);
+	const prompt = normalizeOptionalText$48(input.prompt);
 	if (!prompt) throw new ClaudeCliTransportError({
 		code: "schema.invalid",
 		errorType: "config",
@@ -5079,7 +5081,7 @@ async function invokeClaudeCliTransport(input) {
 		args: buildClaudeArgs({
 			executionMode: input.executionMode,
 			prompt,
-			sessionId: normalizeOptionalText$47(input.sessionId),
+			sessionId: normalizeOptionalText$48(input.sessionId),
 			streamingMode: input.streamingMode
 		}),
 		launchContract: input.launchContract
@@ -5087,7 +5089,7 @@ async function invokeClaudeCliTransport(input) {
 	const invokedAtMs = Date.now();
 	let latestOutput = "";
 	let latestResultIsError = false;
-	let resolvedSessionId = normalizeOptionalText$47(input.sessionId);
+	let resolvedSessionId = normalizeOptionalText$48(input.sessionId);
 	const providerErrorMessages = [];
 	let firstStdoutAtMs = null;
 	let firstOutputAtMs = null;
@@ -5148,7 +5150,7 @@ async function invokeClaudeCliTransport(input) {
 			...classifiedFailure.providerAccessEvidence ? { providerAccessEvidence: classifiedFailure.providerAccessEvidence } : {}
 		});
 	}
-	const output = normalizeOptionalText$47(latestOutput);
+	const output = normalizeOptionalText$48(latestOutput);
 	if (!output) throw new ClaudeCliTransportError({
 		code: "runtime.output.empty",
 		errorType: "adapter",
@@ -5156,7 +5158,7 @@ async function invokeClaudeCliTransport(input) {
 	});
 	return {
 		output,
-		sessionId: normalizeOptionalText$47(resolvedSessionId),
+		sessionId: normalizeOptionalText$48(resolvedSessionId),
 		telemetry: {
 			completedAtMs: Date.now(),
 			...driverResult.lifecycle.exitCode === null ? {} : { exitCode: driverResult.lifecycle.exitCode },
@@ -5169,7 +5171,7 @@ async function invokeClaudeCliTransport(input) {
 			previewEmitted: previewEmitter.emitted,
 			...driverResult.lifecycle.processId === null ? {} : { processId: driverResult.lifecycle.processId },
 			...driverResult.lifecycle.processSpawnedAtMs === null ? {} : { processSpawnedAtMs: driverResult.lifecycle.processSpawnedAtMs },
-			resumedContext: normalizeOptionalText$47(input.sessionId) !== null,
+			resumedContext: normalizeOptionalText$48(input.sessionId) !== null,
 			...driverResult.lifecycle.stdinClosedAtMs === null ? {} : { stdinClosedAtMs: driverResult.lifecycle.stdinClosedAtMs },
 			streamingMode: input.streamingMode ?? "final",
 			...driverResult.lifecycle.timeoutTriggeredAtMs === null ? {} : { timeoutTriggeredAtMs: driverResult.lifecycle.timeoutTriggeredAtMs }
@@ -5337,7 +5339,7 @@ const classifyClaudeFailure = (input) => {
 			message: providerMessage
 		};
 	}
-	const stderrText = normalizeOptionalText$47(input.stderrText);
+	const stderrText = normalizeOptionalText$48(input.stderrText);
 	if (stderrText) return {
 		code: "upstream_unreachable",
 		errorType: "adapter",
@@ -5349,13 +5351,13 @@ const resolveProviderFailureMessage$2 = (input) => {
 	const candidateMessages = [
 		...input.providerErrorMessages,
 		...extractErrorMessagesFromStdout$1(input.stdoutText),
-		...normalizeOptionalText$47(input.stderrText) ? [normalizeOptionalText$47(input.stderrText)] : []
+		...normalizeOptionalText$48(input.stderrText) ? [normalizeOptionalText$48(input.stderrText)] : []
 	].filter((value) => Boolean(value));
 	for (const candidate of candidateMessages) if (looksLikeProviderFailure$2(candidate)) return candidate;
 	return candidateMessages[0] ?? null;
 };
 const extractErrorMessagesFromStdout$1 = (value) => {
-	const stdoutText = normalizeOptionalText$47(value);
+	const stdoutText = normalizeOptionalText$48(value);
 	if (!stdoutText) return [];
 	const messages = [];
 	const lines = stdoutText.split("\n");
@@ -5366,7 +5368,7 @@ const extractErrorMessagesFromStdout$1 = (value) => {
 	return messages;
 };
 const collectProviderErrorMessage$1 = (line, messages) => {
-	const normalizedLine = normalizeOptionalText$47(line);
+	const normalizedLine = normalizeOptionalText$48(line);
 	if (!normalizedLine) return;
 	messages.push(normalizedLine);
 };
@@ -5404,11 +5406,11 @@ const buildClaudeCodeProviderAccessEvidence = (normalizedProviderMessage) => {
 const isRateLimitFailure$2 = (value) => {
 	return value.includes("429") || value.includes("rate limit") || value.includes("too many requests");
 };
-function normalizeText$7(value) {
+function normalizeText$8(value) {
 	return String(value ?? "").trim();
 }
-function normalizeOptionalText$47(value) {
-	const normalized = normalizeText$7(value);
+function normalizeOptionalText$48(value) {
+	const normalized = normalizeText$8(value);
 	return normalized.length > 0 ? normalized : null;
 }
 
@@ -5434,7 +5436,7 @@ async function invokeClaudeWithSingleContextHeal(input) {
 			return new ClaudeRuntimeError({
 				code: "context.rebuild_failed",
 				errorType: "adapter",
-				message: `context.rebuild_failed: ${toErrorMessage$34(error)}`,
+				message: `context.rebuild_failed: ${toErrorMessage$35(error)}`,
 				...providerAccessEvidence ? { providerAccessEvidence } : {}
 			});
 		},
@@ -5494,7 +5496,7 @@ async function invokeClaudeOnce(input) {
 		throw new ClaudeRuntimeError({
 			code: "upstream_unreachable",
 			errorType: "adapter",
-			message: `upstream_unreachable: ${toErrorMessage$34(error)}`
+			message: `upstream_unreachable: ${toErrorMessage$35(error)}`
 		});
 	}
 }
@@ -5504,7 +5506,7 @@ function getClaudeProviderAccessEvidence(error) {
 	if (!evidence || typeof evidence !== "object") return null;
 	return evidence;
 }
-function toErrorMessage$34(error) {
+function toErrorMessage$35(error) {
 	if (error instanceof Error) return error.message;
 	return String(error);
 }
@@ -5558,7 +5560,7 @@ const resolveDefaultClaudeCodeInvoke = (options) => {
 			...onProcessControlEvent ? { onProcessControlEvent } : {},
 			...input.onRuntimeEvent ? { onRuntimeEvent: input.onRuntimeEvent } : {},
 			prompt: input.prompt,
-			sessionId: normalizeOptionalText$46(input.agentControllerConversationId),
+			sessionId: normalizeOptionalText$47(input.agentControllerConversationId),
 			...input.onPreview ? { onPreview: input.onPreview } : {},
 			streamingMode: input.streamingMode
 		});
@@ -5578,7 +5580,7 @@ const resolveDefaultClaudeCodeInvoke = (options) => {
 	};
 };
 async function resolveClaudeDispatchLaunchContract(input) {
-	const explicitLaunchContract = input.inputLaunchContract ?? input.optionLaunchContract ?? (normalizeOptionalText$46(input.claudeBin) ? buildExecutableLaunchContract({ commandPath: normalizeOptionalText$46(input.claudeBin) }) : null);
+	const explicitLaunchContract = input.inputLaunchContract ?? input.optionLaunchContract ?? (normalizeOptionalText$47(input.claudeBin) ? buildExecutableLaunchContract({ commandPath: normalizeOptionalText$47(input.claudeBin) }) : null);
 	if (explicitLaunchContract) {
 		const verification = await verifyClaudeCodeLaunchContract({ launchContract: explicitLaunchContract });
 		if (verification.ok) return explicitLaunchContract;
@@ -5592,7 +5594,7 @@ async function resolveClaudeDispatchLaunchContract(input) {
 		errorType: "config"
 	});
 }
-const normalizeOptionalText$46 = (value) => {
+const normalizeOptionalText$47 = (value) => {
 	const normalized = String(value ?? "").trim();
 	return normalized.length > 0 ? normalized : null;
 };
@@ -5620,7 +5622,7 @@ const DEFAULT_CODEX_COMMAND = "codex";
 async function resolveInstalledCodexLaunchCandidates() {
 	const installedCandidates = await resolveInstalledNodeScriptLaunchCandidates({
 		commandName: DEFAULT_CODEX_COMMAND,
-		configuredCommand: normalizeOptionalText$45(process.env.ATSD_RUNTIME_CODEX_BIN),
+		configuredCommand: normalizeOptionalText$46(process.env.ATSD_RUNTIME_CODEX_BIN),
 		displayName: "Codex"
 	});
 	if (!installedCandidates.ok) return installedCandidates;
@@ -5648,13 +5650,13 @@ async function verifyCodexLaunchContract(input) {
 	});
 }
 function resolveCodexTimeoutMs() {
-	const raw = normalizeOptionalText$45(process.env.ATSD_RUNTIME_REQUEST_TIMEOUT_MS);
+	const raw = normalizeOptionalText$46(process.env.ATSD_RUNTIME_REQUEST_TIMEOUT_MS);
 	if (!raw) return null;
 	const parsed = Number.parseInt(raw, 10);
 	if (!Number.isFinite(parsed) || parsed <= 0) return null;
 	return parsed;
 }
-function normalizeOptionalText$45(value) {
+function normalizeOptionalText$46(value) {
 	const normalized = String(value ?? "").trim();
 	return normalized.length > 0 ? normalized : null;
 }
@@ -5674,6 +5676,619 @@ function isLikelyContextLostError(message) {
 	return CONTEXT_LOST_ERROR_PATTERNS.some((pattern) => pattern.test(message));
 }
 
+//#endregion
+//#region ../../runtime/adapters/codex/dist/transport/codex-app-server-transport.js
+const APP_SERVER_APPROVAL_POLICY = "never";
+const APP_SERVER_PROCESS_KILL_GRACE_MS = 1e3;
+var CodexAppServerTransportError = class extends Error {
+	code;
+	errorType;
+	constructor(input) {
+		super(input.message);
+		this.name = "CodexAppServerTransportError";
+		this.code = input.code;
+		this.errorType = input.errorType;
+	}
+};
+async function invokeCodexAppServerTransport(input) {
+	const prompt = normalizeOptionalText$45(input.prompt);
+	if (!prompt) throw new CodexAppServerTransportError({
+		code: "schema.invalid",
+		errorType: "config",
+		message: "schema.invalid: prompt is required"
+	});
+	const invokedAtMs = Date.now();
+	return await withCodexAppServerSession({
+		codexTimeoutMs: input.codexTimeoutMs,
+		codexWorkdir: input.codexWorkdir,
+		env: input.env,
+		launchContract: input.launchContract,
+		onProcessControlEvent: input.onProcessControlEvent,
+		onRuntimeEvent: input.onRuntimeEvent
+	}, async (session) => {
+		const threadId = await resolveDispatchThreadId({
+			codexWorkdir: input.codexWorkdir,
+			session,
+			threadId: input.threadId
+		});
+		session.emitProviderConversationObserved(threadId);
+		const turn = readTurnStartResponse(await session.request("turn/start", {
+			approvalPolicy: APP_SERVER_APPROVAL_POLICY,
+			cwd: input.codexWorkdir,
+			input: [{
+				text: prompt,
+				text_elements: [],
+				type: "text"
+			}],
+			threadId
+		}));
+		const turnId = readRequiredText(turn.id, "turn/start response turn.id");
+		const completedTurn = turn.status === "completed" ? turn : await session.waitForTurnCompleted({
+			threadId,
+			turnId
+		});
+		const output = normalizeOptionalText$45(readAgentMessageOutput(completedTurn) ?? session.readCollectedAgentMessageDeltaText());
+		if (completedTurn.status === "failed") throw new CodexAppServerTransportError({
+			code: "runtime.turn.failed",
+			errorType: "adapter",
+			message: `runtime.turn.failed: ${readTurnFailureMessage(completedTurn)}`
+		});
+		if (output) session.markAgentOutputObserved();
+		await emitPreviewIfRequested({
+			onPreview: input.onPreview,
+			output: output ?? "",
+			streamingMode: input.streamingMode
+		});
+		return {
+			output: output ?? "",
+			telemetry: session.buildTelemetry({
+				invokedAtMs,
+				previewEmitted: input.streamingMode === "stream" && input.onPreview !== void 0,
+				resumedContext: normalizeOptionalText$45(input.threadId) !== null,
+				streamingMode: input.streamingMode ?? "final"
+			}),
+			threadId
+		};
+	});
+}
+async function verifyCodexAppServerThread(input) {
+	const threadId = normalizeOptionalText$45(input.threadId);
+	if (!threadId) throw new CodexAppServerTransportError({
+		code: "schema.invalid",
+		errorType: "config",
+		message: "schema.invalid: threadId is required"
+	});
+	return await withCodexAppServerSession({
+		codexTimeoutMs: input.codexTimeoutMs,
+		codexWorkdir: input.codexWorkdir,
+		env: input.env,
+		launchContract: input.launchContract
+	}, async (session) => {
+		return { threadId: readThreadIdFromResponse(await session.request("thread/resume", {
+			approvalPolicy: APP_SERVER_APPROVAL_POLICY,
+			cwd: input.codexWorkdir,
+			threadId
+		})) };
+	});
+}
+async function resolveDispatchThreadId(input) {
+	const existingThreadId = normalizeOptionalText$45(input.threadId);
+	if (existingThreadId) return readThreadIdFromResponse(await input.session.request("thread/resume", {
+		approvalPolicy: APP_SERVER_APPROVAL_POLICY,
+		cwd: input.codexWorkdir,
+		threadId: existingThreadId
+	}));
+	return readThreadIdFromResponse(await input.session.request("thread/start", {
+		approvalPolicy: APP_SERVER_APPROVAL_POLICY,
+		cwd: input.codexWorkdir,
+		threadSource: "user"
+	}));
+}
+async function withCodexAppServerSession(input, callback) {
+	const session = new CodexAppServerSession(input);
+	try {
+		await session.start();
+		return await callback(session);
+	} catch (error) {
+		throw toCodexAppServerTransportError(error, input.codexTimeoutMs);
+	} finally {
+		await session.close();
+	}
+}
+var CodexAppServerSession = class {
+	#codexTimeoutMs;
+	#codexWorkdir;
+	#env;
+	#launchContract;
+	#notifications = [];
+	#onProcessControlEvent;
+	#onRuntimeEvent;
+	#pending = /* @__PURE__ */ new Map();
+	#turnAgentMessageDeltas = /* @__PURE__ */ new Map();
+	#child = null;
+	#forceKillTimeout = null;
+	#firstOutputAtMs = null;
+	#lineBuffer = "";
+	#nextRequestId = 1;
+	#processTimeout = null;
+	#settledFailure = null;
+	#waiters = /* @__PURE__ */ new Set();
+	#lifecycle = {
+		exitCode: null,
+		exitObservedAtMs: null,
+		exitSignal: null,
+		firstStderrAtMs: null,
+		firstStdoutAtMs: null,
+		processId: null,
+		processSpawnedAtMs: null,
+		stdinClosedAtMs: null,
+		timeoutTriggeredAtMs: null
+	};
+	constructor(input) {
+		this.#codexTimeoutMs = input.codexTimeoutMs;
+		this.#codexWorkdir = input.codexWorkdir;
+		this.#env = input.env;
+		this.#launchContract = input.launchContract;
+		this.#onProcessControlEvent = input.onProcessControlEvent;
+		this.#onRuntimeEvent = input.onRuntimeEvent;
+	}
+	async start() {
+		const invocation = buildCliLaunchInvocation({
+			args: [
+				"app-server",
+				"--listen",
+				"stdio://"
+			],
+			launchContract: this.#launchContract
+		});
+		const child = spawn(invocation.bin, invocation.args, {
+			cwd: this.#codexWorkdir,
+			env: {
+				...process.env,
+				...this.#env ?? {}
+			},
+			shell: invocation.shell ?? false,
+			stdio: [
+				"pipe",
+				"pipe",
+				"pipe"
+			]
+		});
+		this.#child = child;
+		const processId = typeof child.pid === "number" ? child.pid : null;
+		const processSpawnedAtMs = Date.now();
+		this.#lifecycle.processId = processId;
+		this.#lifecycle.processSpawnedAtMs = processSpawnedAtMs;
+		this.#emitRuntimeEvent({
+			phase: "process_spawned",
+			processId,
+			tsMs: processSpawnedAtMs
+		});
+		this.#onProcessControlEvent?.({
+			phase: "process_spawned",
+			processId
+		});
+		child.stdout.setEncoding("utf8");
+		child.stdout.on("data", (chunk) => {
+			const text = String(chunk);
+			if (this.#lifecycle.firstStdoutAtMs === null) {
+				const firstStdoutAtMs = Date.now();
+				this.#lifecycle.firstStdoutAtMs = firstStdoutAtMs;
+				this.#emitRuntimeEvent({
+					phase: "first_stdout",
+					processId,
+					tsMs: firstStdoutAtMs
+				});
+			}
+			this.#consumeStdoutText(text);
+		});
+		child.stderr.setEncoding("utf8");
+		child.stderr.on("data", () => {
+			if (this.#lifecycle.firstStderrAtMs !== null) return;
+			const firstStderrAtMs = Date.now();
+			this.#lifecycle.firstStderrAtMs = firstStderrAtMs;
+			this.#emitRuntimeEvent({
+				phase: "first_stderr",
+				processId,
+				tsMs: firstStderrAtMs
+			});
+		});
+		child.on("error", (error) => {
+			this.#failAll(new CodexAppServerTransportError({
+				code: "upstream_unreachable",
+				errorType: "adapter",
+				message: `upstream_unreachable: failed to spawn codex app-server (${error.message})`
+			}));
+		});
+		child.on("close", (exitCode, signal) => {
+			this.#clearTimers();
+			this.#lifecycle.exitCode = exitCode;
+			this.#lifecycle.exitObservedAtMs = Date.now();
+			this.#lifecycle.exitSignal = signal;
+			this.#emitRuntimeEvent({
+				exitCode,
+				phase: "process_exit",
+				processId,
+				signal,
+				tsMs: this.#lifecycle.exitObservedAtMs
+			});
+			this.#onProcessControlEvent?.({
+				phase: "process_exit",
+				processId
+			});
+			if (this.#pending.size > 0 || this.#waiters.size > 0) this.#failAll(new CodexAppServerTransportError({
+				code: "upstream_unreachable",
+				errorType: "adapter",
+				message: "upstream_unreachable: codex app-server exited early"
+			}));
+		});
+		this.#processTimeout = this.#codexTimeoutMs === null ? null : setTimeout(() => {
+			const timeoutTriggeredAtMs = Date.now();
+			this.#lifecycle.timeoutTriggeredAtMs = timeoutTriggeredAtMs;
+			this.#emitRuntimeEvent({
+				phase: "timeout_triggered",
+				processId,
+				tsMs: timeoutTriggeredAtMs
+			});
+			this.#failAll(new CodexAppServerTransportError({
+				code: "process.timeout",
+				errorType: "timeout",
+				message: this.#codexTimeoutMs === null ? "process.timeout: codex app-server timed out" : `process.timeout: codex app-server did not complete within ${this.#codexTimeoutMs}ms`
+			}));
+			this.#requestProcessTermination();
+		}, this.#codexTimeoutMs);
+		await this.request("initialize", {
+			capabilities: { experimentalApi: true },
+			clientInfo: {
+				name: "agent-transport-system",
+				version: "0.0.0"
+			}
+		});
+		this.notify("initialized", {});
+	}
+	async close() {
+		this.#clearTimers();
+		const child = this.#child;
+		if (!child) return;
+		if (this.#lifecycle.stdinClosedAtMs === null) {
+			this.#lifecycle.stdinClosedAtMs = Date.now();
+			this.#emitRuntimeEvent({
+				phase: "stdin_closed",
+				processId: this.#lifecycle.processId,
+				tsMs: this.#lifecycle.stdinClosedAtMs
+			});
+		}
+		child.stdin.end();
+		if (this.#lifecycle.exitObservedAtMs !== null) return;
+		this.#requestProcessTermination();
+		await new Promise((resolve) => {
+			const timeout = setTimeout(() => {
+				resolve();
+			}, APP_SERVER_PROCESS_KILL_GRACE_MS);
+			child.once("close", () => {
+				clearTimeout(timeout);
+				resolve();
+			});
+		});
+	}
+	async request(method, params) {
+		if (this.#settledFailure) throw this.#settledFailure;
+		const id = this.#nextRequestId;
+		this.#nextRequestId += 1;
+		const requestPromise = new Promise((resolve, reject) => {
+			this.#pending.set(id, {
+				reject,
+				resolve
+			});
+		});
+		this.#write({
+			id,
+			jsonrpc: "2.0",
+			method,
+			params
+		});
+		return await requestPromise;
+	}
+	notify(method, params) {
+		this.#write({
+			jsonrpc: "2.0",
+			method,
+			...params === void 0 ? {} : { params }
+		});
+	}
+	async waitForTurnCompleted(input) {
+		const turn = toRecord$2(toRecord$2((await this.#waitForNotification((candidate) => {
+			if (candidate.method !== "turn/completed") return false;
+			const params = toRecord$2(candidate.params);
+			const turn = toRecord$2(params?.turn);
+			return params?.threadId === input.threadId && normalizeOptionalText$45(turn?.id) === input.turnId;
+		})).params)?.turn);
+		if (!turn) throw new CodexAppServerTransportError({
+			code: "protocol.invalid",
+			errorType: "adapter",
+			message: "protocol.invalid: turn/completed did not include turn"
+		});
+		return turn;
+	}
+	buildTelemetry(input) {
+		return {
+			completedAtMs: Date.now(),
+			...this.#lifecycle.exitCode === null ? {} : { exitCode: this.#lifecycle.exitCode },
+			...this.#lifecycle.exitObservedAtMs === null ? {} : { exitObservedAtMs: this.#lifecycle.exitObservedAtMs },
+			...this.#lifecycle.exitSignal === null ? {} : { exitSignal: this.#lifecycle.exitSignal },
+			...this.#firstOutputAtMs === null ? {} : { firstOutputAtMs: this.#firstOutputAtMs },
+			...this.#lifecycle.firstStderrAtMs === null ? {} : { firstStderrAtMs: this.#lifecycle.firstStderrAtMs },
+			...this.#lifecycle.firstStdoutAtMs === null ? {} : { firstStdoutAtMs: this.#lifecycle.firstStdoutAtMs },
+			invokedAtMs: input.invokedAtMs,
+			previewEmitted: input.previewEmitted,
+			...this.#lifecycle.processId === null ? {} : { processId: this.#lifecycle.processId },
+			...this.#lifecycle.processSpawnedAtMs === null ? {} : { processSpawnedAtMs: this.#lifecycle.processSpawnedAtMs },
+			resumedContext: input.resumedContext,
+			...this.#lifecycle.stdinClosedAtMs === null ? {} : { stdinClosedAtMs: this.#lifecycle.stdinClosedAtMs },
+			streamingMode: input.streamingMode,
+			...this.#lifecycle.timeoutTriggeredAtMs === null ? {} : { timeoutTriggeredAtMs: this.#lifecycle.timeoutTriggeredAtMs }
+		};
+	}
+	readCollectedAgentMessageDeltaText() {
+		const output = [...this.#turnAgentMessageDeltas.values()].join("").trim();
+		return output.length > 0 ? output : null;
+	}
+	markAgentOutputObserved() {
+		if (this.#firstOutputAtMs !== null) return;
+		this.#firstOutputAtMs = Date.now();
+	}
+	#consumeStdoutText(text) {
+		this.#lineBuffer += text;
+		while (true) {
+			const newlineIndex = this.#lineBuffer.indexOf("\n");
+			if (newlineIndex < 0) return;
+			const line = this.#lineBuffer.slice(0, newlineIndex).trim();
+			this.#lineBuffer = this.#lineBuffer.slice(newlineIndex + 1);
+			if (!line) continue;
+			this.#handleStdoutLine(line);
+		}
+	}
+	#handleStdoutLine(line) {
+		let message;
+		try {
+			message = JSON.parse(line);
+		} catch (error) {
+			this.#failAll(new CodexAppServerTransportError({
+				code: "protocol.invalid",
+				errorType: "adapter",
+				message: `protocol.invalid: codex app-server emitted non-JSON output (${toErrorMessage$34(error)})`
+			}));
+			return;
+		}
+		if (message.id !== void 0 && message.method) {
+			this.#handleServerRequest(message);
+			return;
+		}
+		if (message.id !== void 0) {
+			this.#handleResponse(message);
+			return;
+		}
+		if (message.method) this.#handleNotification(message);
+	}
+	#handleResponse(message) {
+		const id = message.id;
+		if (!(typeof id === "number" || typeof id === "string")) return;
+		const pending = this.#pending.get(id);
+		if (!pending) return;
+		this.#pending.delete(id);
+		if (message.error) {
+			pending.reject(toJsonRpcTransportError(message.error));
+			return;
+		}
+		pending.resolve(message.result);
+	}
+	#handleNotification(message) {
+		this.#notifications.push(message);
+		this.#collectAgentMessageDelta(message);
+		for (const waiter of [...this.#waiters]) {
+			if (!waiter.predicate(message)) continue;
+			this.#waiters.delete(waiter);
+			waiter.resolve(message);
+		}
+	}
+	#handleServerRequest(message) {
+		const id = message.id;
+		if (!(typeof id === "number" || typeof id === "string")) return;
+		const result = buildServerRequestDeclineResponse(message.method);
+		if (result === null) {
+			this.#write({
+				error: {
+					code: -32601,
+					message: `ATS Codex App Server transport does not handle server request '${message.method}'.`
+				},
+				id,
+				jsonrpc: "2.0"
+			});
+			return;
+		}
+		this.#write({
+			id,
+			jsonrpc: "2.0",
+			result
+		});
+	}
+	#waitForNotification(predicate) {
+		for (const notification of this.#notifications) if (predicate(notification)) return Promise.resolve(notification);
+		if (this.#settledFailure) return Promise.reject(this.#settledFailure);
+		return new Promise((resolve, reject) => {
+			this.#waiters.add({
+				predicate,
+				reject,
+				resolve
+			});
+		});
+	}
+	#collectAgentMessageDelta(message) {
+		if (message.method !== "item/agentMessage/delta") return;
+		const params = toRecord$2(message.params);
+		const itemId = normalizeOptionalText$45(params?.itemId);
+		const delta = normalizeOptionalText$45(params?.delta);
+		if (!(itemId && delta)) return;
+		this.markAgentOutputObserved();
+		this.#turnAgentMessageDeltas.set(itemId, `${this.#turnAgentMessageDeltas.get(itemId) ?? ""}${delta}`);
+	}
+	#write(message) {
+		const child = this.#child;
+		if (!child) throw new CodexAppServerTransportError({
+			code: "upstream_unreachable",
+			errorType: "adapter",
+			message: "upstream_unreachable: codex app-server is not running"
+		});
+		child.stdin.write(`${JSON.stringify(message)}\n`);
+	}
+	#failAll(error) {
+		if (!this.#settledFailure) this.#settledFailure = error;
+		for (const pending of this.#pending.values()) pending.reject(error);
+		this.#pending.clear();
+		for (const waiter of this.#waiters) waiter.reject(error);
+		this.#waiters.clear();
+	}
+	#requestProcessTermination() {
+		const child = this.#child;
+		if (!child || child.killed) return;
+		child.kill("SIGTERM");
+		this.#forceKillTimeout = setTimeout(() => {
+			child.kill("SIGKILL");
+		}, APP_SERVER_PROCESS_KILL_GRACE_MS);
+		this.#forceKillTimeout.unref?.();
+	}
+	#clearTimers() {
+		if (this.#processTimeout !== null) {
+			clearTimeout(this.#processTimeout);
+			this.#processTimeout = null;
+		}
+		if (this.#forceKillTimeout !== null) {
+			clearTimeout(this.#forceKillTimeout);
+			this.#forceKillTimeout = null;
+		}
+	}
+	emitProviderConversationObserved(threadId) {
+		const agentControllerConversationId = normalizeOptionalText$45(threadId);
+		if (!agentControllerConversationId) return;
+		this.#emitRuntimeEvent({
+			agentControllerConversationId,
+			phase: "provider_conversation_observed",
+			tsMs: Date.now()
+		});
+	}
+	#emitRuntimeEvent(event) {
+		this.#onRuntimeEvent?.(event);
+	}
+};
+function readThreadIdFromResponse(value) {
+	return readRequiredText(toRecord$2(value)?.thread?.id, "thread response thread.id");
+}
+function readTurnStartResponse(value) {
+	const turn = toRecord$2(value)?.turn;
+	if (!turn || typeof turn !== "object") throw new CodexAppServerTransportError({
+		code: "protocol.invalid",
+		errorType: "adapter",
+		message: "protocol.invalid: turn/start response did not include turn"
+	});
+	return turn;
+}
+function readAgentMessageOutput(turn) {
+	const text = (Array.isArray(turn.items) ? turn.items : []).filter((item) => item.type === "agentMessage").map((item) => normalizeOptionalText$45(item.text)).filter((item) => item !== null).join("\n").trim();
+	return text.length > 0 ? text : null;
+}
+function readTurnFailureMessage(turn) {
+	return normalizeOptionalText$45(turn.error?.message) ?? "codex app-server turn failed";
+}
+async function emitPreviewIfRequested(input) {
+	if (!(input.onPreview && input.streamingMode === "stream")) return;
+	await input.onPreview({ text: input.output });
+}
+function buildServerRequestDeclineResponse(method) {
+	switch (method) {
+		case "item/commandExecution/requestApproval": return { decision: "decline" };
+		case "item/fileChange/requestApproval": return { decision: "decline" };
+		case "execCommandApproval": return { decision: "denied" };
+		case "applyPatchApproval": return { decision: "denied" };
+		case "item/tool/requestUserInput": return { answers: {} };
+		case "mcpServer/elicitation/request": return {
+			_meta: null,
+			action: "decline",
+			content: null
+		};
+		case "item/tool/call": return {
+			contentItems: [],
+			success: false
+		};
+		case "item/permissions/requestApproval": return {
+			permissions: {},
+			scope: "turn",
+			strictAutoReview: true
+		};
+		default: return null;
+	}
+}
+function toJsonRpcTransportError(error) {
+	const message = normalizeOptionalText$45(error.message) ?? "codex app-server error";
+	const lowered = message.toLowerCase();
+	if (lowered.includes("not logged in") || lowered.includes("unauthorized") || lowered.includes("authentication") || lowered.includes("401")) return new CodexAppServerTransportError({
+		code: "auth.required",
+		errorType: "auth",
+		message
+	});
+	if (lowered.includes("thread not found") || lowered.includes("thread not loaded") || lowered.includes("no thread") || lowered.includes("not found")) return new CodexAppServerTransportError({
+		code: "context_not_found",
+		errorType: "config",
+		message
+	});
+	return new CodexAppServerTransportError({
+		code: "upstream_unreachable",
+		errorType: "adapter",
+		message
+	});
+}
+function toCodexAppServerTransportError(error, timeoutMs) {
+	if (error instanceof CodexAppServerTransportError) return error;
+	if (error && typeof error === "object" && "code" in error && typeof error.code === "string" && "errorType" in error && typeof error.errorType === "string" && error instanceof Error) return new CodexAppServerTransportError({
+		code: error.code,
+		errorType: error.errorType,
+		message: error.message
+	});
+	if (timeoutMs !== null && toErrorMessage$34(error).includes("timed out")) return new CodexAppServerTransportError({
+		code: "process.timeout",
+		errorType: "timeout",
+		message: toErrorMessage$34(error)
+	});
+	return new CodexAppServerTransportError({
+		code: "upstream_unreachable",
+		errorType: "adapter",
+		message: `upstream_unreachable: failed to execute codex app-server (${toErrorMessage$34(error)})`
+	});
+}
+function readRequiredText(value, label) {
+	const text = normalizeOptionalText$45(value);
+	if (text) return text;
+	throw new CodexAppServerTransportError({
+		code: "protocol.invalid",
+		errorType: "adapter",
+		message: `protocol.invalid: missing ${label}`
+	});
+}
+function toRecord$2(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+	return value;
+}
+function normalizeText$7(value) {
+	return String(value ?? "").trim();
+}
+function normalizeOptionalText$45(value) {
+	const normalized = normalizeText$7(value);
+	return normalized.length > 0 ? normalized : null;
+}
+function toErrorMessage$34(error) {
+	if (error instanceof Error) return error.message;
+	return String(error);
+}
+
 //#endregion
 //#region ../../runtime/adapters/codex/dist/output/codex-output-parser.js
 function processCodexStdoutLine(input) {
@@ -6152,6 +6767,35 @@ async function invokeCodexWithSingleContextHeal(input) {
 		threadId: result.contextId
 	};
 }
+async function invokeCodexAppServer(input) {
+	try {
+		return await invokeCodexAppServerTransport({
+			launchContract: input.launchContract,
+			codexTimeoutMs: input.codexTimeoutMs,
+			codexWorkdir: input.codexWorkdir,
+			env: input.env,
+			executionMode: input.executionMode,
+			...input.onProcessControlEvent ? { onProcessControlEvent: input.onProcessControlEvent } : {},
+			...input.onPreview ? { onPreview: input.onPreview } : {},
+			...input.onRuntimeEvent ? { onRuntimeEvent: input.onRuntimeEvent } : {},
+			prompt: input.prompt,
+			streamingMode: input.streamingMode,
+			threadId: input.threadId
+		});
+	} catch (error) {
+		if (error instanceof CodexRuntimeError) throw error;
+		if (error && typeof error === "object" && "code" in error && typeof error.code === "string" && "errorType" in error && typeof error.errorType === "string" && error instanceof Error) throw new CodexRuntimeError({
+			code: error.code,
+			errorType: error.errorType,
+			message: error.message
+		});
+		throw new CodexRuntimeError({
+			code: "upstream_unreachable",
+			errorType: "adapter",
+			message: `upstream_unreachable: ${toErrorMessage$33(error)}`
+		});
+	}
+}
 async function invokeCodexOnce(input) {
 	try {
 		return await invokeCodexCliTransport({
@@ -6189,6 +6833,7 @@ function toErrorMessage$33(error) {
 //#endregion
 //#region ../../runtime/adapters/codex/dist/index.js
 const CODEX_CONVERSATION_BRIDGE_SPEC = resolveBuiltinAdapterConversationBridgeSpec("codex");
+const TEST_DISABLE_DEFAULT_INVOKE = Symbol.for("ats.test.disableDefaultInvoke");
 const createCodexAdapter = (options) => {
 	const controlShell = createSharedControlShell({
 		gracefulTimeoutMs: options.gracefulTimeoutMs,
@@ -6200,7 +6845,7 @@ const createCodexAdapter = (options) => {
 		adapterId: "codex",
 		bridgeSpec: CODEX_CONVERSATION_BRIDGE_SPEC,
 		invoke: options.invoke,
-		invokeByMode: options.invokeByMode,
+		invokeByMode: resolveCodexInvokeByTransportMode(options),
 		resolveDefaultInvoke: () => resolveDefaultCodexInvoke(options),
 		runtimeOptions: options
 	});
@@ -6253,6 +6898,55 @@ const resolveDefaultCodexInvoke = (options) => {
 		};
 	};
 };
+const resolveCodexInvokeByTransportMode = (options) => {
+	if (options.invoke || isDefaultInvokeDisabledForTests(options)) return options.invokeByMode;
+	return {
+		"codex-app-server": resolveDefaultCodexAppServerInvoke(options),
+		...options.enableLocalCliTransport ? { "local-cli": resolveDefaultCodexInvoke(options) } : {},
+		...options.invokeByMode ?? {}
+	};
+};
+const resolveDefaultCodexAppServerInvoke = (options) => {
+	const codexTimeoutMs = options.codexTimeoutMs ?? resolveCodexTimeoutMs();
+	return async (input) => {
+		const launchContract = await resolveCodexDispatchLaunchContract({
+			codexBin: options.codexBin,
+			inputLaunchContract: input.launchContract,
+			optionLaunchContract: options.launchContract
+		});
+		const onProcessControlEvent = options.registerRuntimeProcess ? (event) => {
+			options.registerRuntimeProcess?.({
+				...event,
+				taskId: input.taskId
+			});
+		} : void 0;
+		const result = await invokeCodexAppServer({
+			launchContract,
+			codexTimeoutMs,
+			codexWorkdir: input.runtimeContext.providerRuntimeWorkingDirectory,
+			env: input.env,
+			executionMode: input.executionMode,
+			...onProcessControlEvent ? { onProcessControlEvent } : {},
+			...input.onPreview ? { onPreview: input.onPreview } : {},
+			...input.onRuntimeEvent ? { onRuntimeEvent: input.onRuntimeEvent } : {},
+			prompt: input.prompt,
+			streamingMode: input.streamingMode,
+			threadId: normalizeOptionalText$42(input.agentControllerConversationId)
+		});
+		const agentControllerConversation = CODEX_CONVERSATION_BRIDGE_SPEC ? bridgeAgentControllerConversationRef({
+			bridgeSpec: CODEX_CONVERSATION_BRIDGE_SPEC,
+			agentControllerConversationId: result.threadId
+		}) : null;
+		return {
+			contextDelta: {
+				agentControllerConversationId: result.threadId,
+				...agentControllerConversation ? { agentControllerConversation } : {}
+			},
+			output: result.output,
+			...result.telemetry ? { telemetry: result.telemetry } : {}
+		};
+	};
+};
 async function resolveCodexDispatchLaunchContract(input) {
 	const explicitLaunchContract = input.inputLaunchContract ?? input.optionLaunchContract ?? (normalizeOptionalText$42(input.codexBin) ? buildExecutableLaunchContract({ commandPath: normalizeOptionalText$42(input.codexBin) }) : null);
 	if (explicitLaunchContract) {
@@ -6272,6 +6966,7 @@ const normalizeOptionalText$42 = (value) => {
 	const normalized = String(value ?? "").trim();
 	return normalized.length > 0 ? normalized : null;
 };
+const isDefaultInvokeDisabledForTests = (options) => options[TEST_DISABLE_DEFAULT_INVOKE] === true;
 
 //#endregion
 //#region ../../runtime/local-service/src/adapters/installers/install-codex.ts
@@ -6285,7 +6980,7 @@ const installCodexAdapter = {
 		return {
 			adapter: codexAdapter,
 			adapterId: codexAdapter.adapterId,
-			transportModes: ["local-cli"]
+			transportModes: ["codex-app-server"]
 		};
 	}
 };
@@ -9262,22 +9957,32 @@ const resolveAgentControllerRefKind = (input) => {
 const areAgentControllerRefsEquivalent = (input) => resolveCanonicalAgentControllerRef({ agentControllerRef: input.leftAgentControllerRef }) === resolveCanonicalAgentControllerRef({ agentControllerRef: input.rightAgentControllerRef });
 const listCompatibleAgentControllerRefs = (input) => [resolveCanonicalAgentControllerRef({ agentControllerRef: input.agentControllerRef })];
 const buildLookupKey = (input) => [
+	input.targetProfileId,
+	input.agentControllerRef,
+	input.transportMode,
+	input.runtimeWorkspaceFingerprint
+].map(encodeLookupKeyPart).join(AGENT_CONTEXT_LOOKUP_KEY_SEPARATOR$1);
+const buildLegacySpaceScopedLookupKey = (input) => [
 	input.spaceId,
 	input.targetProfileId,
 	input.agentControllerRef,
 	input.transportMode,
 	input.runtimeWorkspaceFingerprint
 ].map(encodeLookupKeyPart).join(AGENT_CONTEXT_LOOKUP_KEY_SEPARATOR$1);
-const listCompatibleAgentContextLookupKeys = (input) => listCompatibleAgentControllerRefs(input).map((agentControllerRef) => buildLookupKey({
+const listCompatibleAgentContextLookupKeys = (input) => listCompatibleAgentControllerRefs(input).flatMap((agentControllerRef) => [buildLookupKey({
+	agentControllerRef,
+	targetProfileId: input.targetProfileId,
+	transportMode: input.transportMode,
+	runtimeWorkspaceFingerprint: input.runtimeWorkspaceFingerprint
+}), buildLegacySpaceScopedLookupKey({
 	agentControllerRef,
 	spaceId: input.spaceId,
 	targetProfileId: input.targetProfileId,
 	transportMode: input.transportMode,
 	runtimeWorkspaceFingerprint: input.runtimeWorkspaceFingerprint
-}));
+})]).filter((lookupKey, index, values) => values.indexOf(lookupKey) === index);
 const buildAgentContextLookupKey = (input) => buildLookupKey({
 	agentControllerRef: resolveCanonicalAgentControllerRef(input),
-	spaceId: input.spaceId,
 	targetProfileId: input.targetProfileId,
 	transportMode: input.transportMode,
 	runtimeWorkspaceFingerprint: input.runtimeWorkspaceFingerprint
@@ -9291,7 +9996,11 @@ const isAgentContextCompatibleWithLookupKeyInput = (input) => isAgentContextComp
 	agentContext: input.agentContext,
 	scope: input.key
 }) && input.agentContext.runtimeWorkspaceFingerprint === input.key.runtimeWorkspaceFingerprint;
-const isAgentContextCompatibleWithScopeInput = (input) => input.agentContext.spaceId === input.scope.spaceId && input.agentContext.targetProfileId === input.scope.targetProfileId && input.agentContext.transportMode === input.scope.transportMode && areAgentControllerRefsEquivalent({
+const isAgentContextStoredUnderCompatibleLookupKeyInput = (input) => listCompatibleAgentContextLookupKeys({
+	...input.key,
+	spaceId: input.agentContext.spaceId
+}).includes(input.agentContext.agentContextLookupKey);
+const isAgentContextCompatibleWithScopeInput = (input) => input.agentContext.targetProfileId === input.scope.targetProfileId && input.agentContext.transportMode === input.scope.transportMode && areAgentControllerRefsEquivalent({
 	leftAgentControllerRef: input.agentContext.agentControllerRef,
 	rightAgentControllerRef: input.scope.agentControllerRef
 });
@@ -9315,11 +10024,21 @@ const resolveExistingAgentContext = (input) => {
 			key: input.key
 		})) return agentContext;
 	}
-	return null;
+	return Object.values(input.state.agentContextByLookupKey).filter((agentContext) => isAgentContextCompatibleWithLookupKeyInput({
+		agentContext,
+		key: input.key
+	}) && isAgentContextStoredUnderCompatibleLookupKeyInput({
+		agentContext,
+		key: input.key
+	})).sort((left, right) => {
+		if (left.updatedAtMs !== right.updatedAtMs) return right.updatedAtMs - left.updatedAtMs;
+		if (left.createdAtMs !== right.createdAtMs) return right.createdAtMs - left.createdAtMs;
+		return right.agentContextLookupKey.localeCompare(left.agentContextLookupKey);
+	})[0] ?? null;
 };
 const resolveNextAgentContextLookupKey = (input) => resolveAgentControllerRefKind({ agentControllerRef: input.existing.agentControllerRef }) === "builtin" ? buildAgentContextLookupKey(input.key) : input.existing.agentContextLookupKey;
 const resolveIncompatibleAgentContext = (input) => {
-	const candidates = Object.values(input.state.agentContextByLookupKey).filter((agentContext) => agentContext.spaceId === input.key.spaceId && agentContext.targetProfileId === input.key.targetProfileId && agentContext.runtimeWorkspaceFingerprint === input.key.runtimeWorkspaceFingerprint);
+	const candidates = Object.values(input.state.agentContextByLookupKey).filter((agentContext) => agentContext.targetProfileId === input.key.targetProfileId && agentContext.runtimeWorkspaceFingerprint === input.key.runtimeWorkspaceFingerprint);
 	candidates.sort((left, right) => {
 		if (left.updatedAtMs !== right.updatedAtMs) return right.updatedAtMs - left.updatedAtMs;
 		if (left.createdAtMs !== right.createdAtMs) return right.createdAtMs - left.createdAtMs;
@@ -9370,6 +10089,8 @@ const resolveAgentContextForDispatch = (input) => {
 			}),
 			agentControllerRef: resolveCanonicalAgentControllerRef({ agentControllerRef: existing.agentControllerRef }),
 			lastTaskId: input.taskId,
+			runtimeWorkspaceFingerprint: input.key.runtimeWorkspaceFingerprint,
+			spaceId: input.key.spaceId,
 			updatedAtMs: input.nowMs
 		};
 		const replacedAgentContextLookupKey = existing.agentContextLookupKey === nextAgentContext.agentContextLookupKey ? null : existing.agentContextLookupKey;
@@ -9570,7 +10291,7 @@ async function buildConversationExecutionStatusControlPlaneResponse(input) {
 			errorCode: null,
 			errorMessage: null,
 			errorType: null,
-			message: "Live provider resume probe was not run. Re-run with --validate to confirm wake readiness on this device.",
+			message: "Provider conversation proof was not run. Re-run with --validate to confirm wake readiness on this device.",
 			status: "not_run"
 		},
 		runtimeWorkspace: {
@@ -9692,6 +10413,7 @@ const AGENT_CONTEXT_MAX_ENTRIES = 2e3;
 const AGENT_CONTEXT_LOOKUP_KEY_SEPARATOR = "|";
 const isRecord$6 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 const isPositiveInteger = (value) => Number.isInteger(value) && typeof value === "number" && value >= 0;
+const isRuntimeTransportMode$1 = (value) => value === "local-cli" || value === "codex-app-server";
 const utf8ByteLength = (value) => {
 	let byteLength = 0;
 	for (const char of value) {
@@ -9720,6 +10442,12 @@ const toErrorCode = (error) => {
 };
 const encodeAgentContextLookupKeyPart = (value) => encodeURIComponent(value);
 const buildStoredAgentContextLookupKey = (input) => [
+	input.targetProfileId,
+	input.agentControllerRef,
+	input.transportMode,
+	input.runtimeWorkspaceFingerprint
+].map(encodeAgentContextLookupKeyPart).join(AGENT_CONTEXT_LOOKUP_KEY_SEPARATOR);
+const buildLegacySpaceScopedAgentContextLookupKey = (input) => [
 	input.spaceId,
 	input.targetProfileId,
 	input.agentControllerRef,
@@ -9744,14 +10472,21 @@ const parseAgentContextState = (agentContextLookupKey, value) => {
 	if (!isRecord$6(value)) return null;
 	const { agentControllerConversationId, agentControllerRef, createdAtMs, lastTaskId, spaceId, targetProfileId, transportMode, runtimeWorkspaceFingerprint, updatedAtMs } = value;
 	const parsedAgentControllerRef = typeof agentControllerRef === "string" ? parseAgentControllerRef$1(agentControllerRef) : null;
-	if (transportMode !== "local-cli" || typeof agentContextLookupKey !== "string" || agentContextLookupKey.length === 0 || typeof spaceId !== "string" || spaceId.length === 0 || typeof targetProfileId !== "string" || targetProfileId.length === 0 || !parsedAgentControllerRef || typeof runtimeWorkspaceFingerprint !== "string" || runtimeWorkspaceFingerprint.length === 0 || typeof agentControllerConversationId !== "string" || agentControllerConversationId.length === 0 || !isPositiveInteger(createdAtMs) || !isPositiveInteger(updatedAtMs) || typeof lastTaskId !== "string" || lastTaskId.length === 0) return null;
-	if (agentContextLookupKey !== buildStoredAgentContextLookupKey({
+	if (!isRuntimeTransportMode$1(transportMode) || typeof agentContextLookupKey !== "string" || agentContextLookupKey.length === 0 || typeof spaceId !== "string" || spaceId.length === 0 || typeof targetProfileId !== "string" || targetProfileId.length === 0 || !parsedAgentControllerRef || typeof runtimeWorkspaceFingerprint !== "string" || runtimeWorkspaceFingerprint.length === 0 || typeof agentControllerConversationId !== "string" || agentControllerConversationId.length === 0 || !isPositiveInteger(createdAtMs) || !isPositiveInteger(updatedAtMs) || typeof lastTaskId !== "string" || lastTaskId.length === 0) return null;
+	const canonicalLookupKey = buildStoredAgentContextLookupKey({
+		agentControllerRef: parsedAgentControllerRef.ref,
+		runtimeWorkspaceFingerprint,
+		targetProfileId,
+		transportMode
+	});
+	const legacySpaceScopedLookupKey = buildLegacySpaceScopedAgentContextLookupKey({
 		agentControllerRef: parsedAgentControllerRef.ref,
 		runtimeWorkspaceFingerprint,
 		spaceId,
 		targetProfileId,
 		transportMode
-	})) return null;
+	});
+	if (agentContextLookupKey !== canonicalLookupKey && agentContextLookupKey !== legacySpaceScopedLookupKey) return null;
 	return {
 		agentControllerConversationId,
 		agentControllerRef: parsedAgentControllerRef.ref,
@@ -10383,44 +11118,46 @@ const settleRecoveredTask = (input) => settleInflightTask({
 const buildTaskResultPayloadFromOutcome = (input) => {
 	const output = normalizeOutput$1(input.output);
 	const errorType = input.errorType ?? "internal";
+	const commonFields = buildTaskResultCommonFields(input);
+	const errorFields = buildTaskResultErrorFields(input);
 	if (output && input.emitFailed) return {
-		agentId: input.agentId,
-		attemptId: input.attemptId,
-		deduped: input.deduped,
+		...commonFields,
 		errorType: input.errorType ?? "network",
-		...input.errorCode ? { errorCode: input.errorCode } : {},
-		...input.errorMessage ? { errorMessage: input.errorMessage } : {},
+		...errorFields,
 		output,
 		partialReason: input.partialReason ?? "emit_failed",
-		sourceEventId: input.sourceEventId,
-		status: "partial_success",
-		taskId: input.taskId,
-		...input.telemetry ? { telemetry: input.telemetry } : {}
+		status: "partial_success"
 	};
 	if (output) return {
-		agentId: input.agentId,
-		attemptId: input.attemptId,
-		deduped: input.deduped,
+		...commonFields,
 		output,
-		sourceEventId: input.sourceEventId,
-		status: "success",
-		taskId: input.taskId,
-		...input.telemetry ? { telemetry: input.telemetry } : {}
+		status: "success"
 	};
+	return {
+		...commonFields,
+		errorType,
+		...errorFields,
+		...input.providerAccessEvidence ? { providerAccessEvidence: input.providerAccessEvidence } : {},
+		status: "failed"
+	};
+};
+function buildTaskResultCommonFields(input) {
 	return {
 		agentId: input.agentId,
 		attemptId: input.attemptId,
 		deduped: input.deduped,
-		errorType,
-		...input.errorCode ? { errorCode: input.errorCode } : {},
-		...input.errorMessage ? { errorMessage: input.errorMessage } : {},
-		...input.providerAccessEvidence ? { providerAccessEvidence: input.providerAccessEvidence } : {},
 		sourceEventId: input.sourceEventId,
-		status: "failed",
 		taskId: input.taskId,
-		...input.telemetry ? { telemetry: input.telemetry } : {}
+		...input.telemetry ? { telemetry: input.telemetry } : {},
+		...input.transportMode ? { transportMode: input.transportMode } : {}
 	};
-};
+}
+function buildTaskResultErrorFields(input) {
+	return {
+		...input.errorCode ? { errorCode: input.errorCode } : {},
+		...input.errorMessage ? { errorMessage: input.errorMessage } : {}
+	};
+}
 
 //#endregion
 //#region ../../runtime/local-execution/dist/result-envelope.js
@@ -10718,6 +11455,40 @@ const resolveProviderContextId = (route) => {
 	const normalized = raw.trim();
 	return normalized.length > 0 ? normalized : null;
 };
+const normalizeContextDeltaConversationId = (value) => {
+	if (typeof value !== "string") return null;
+	const normalized = value.trim();
+	return normalized.length > 0 ? normalized : null;
+};
+const resolveDispatchResultContextDeltaConversationId = (dispatchResult) => {
+	if (!(dispatchResult.dispatched && "adapterResult" in dispatchResult)) return null;
+	if (dispatchResult.adapterResult.status !== "success") return null;
+	return normalizeContextDeltaConversationId(dispatchResult.adapterResult.contextDelta?.agentControllerConversationId);
+};
+const resolvePostDispatchAgentContextInput = (input) => {
+	if (!input.route || input.committedAgentContextResolution?.agentContext) return null;
+	const providerContextId = resolveDispatchResultContextDeltaConversationId(input.dispatchResult);
+	if (!providerContextId) return null;
+	return {
+		nowMs: input.nowMs,
+		providerContextId,
+		route: input.route,
+		task: input.task
+	};
+};
+const resolvePostDispatchAgentContextResolution = (input) => resolveAgentContextForDispatch({
+	key: {
+		agentControllerRef: input.postDispatchAgentContext.route.agentControllerRef,
+		runtimeWorkspaceFingerprint: input.postDispatchAgentContext.route.runtimeWorkspaceFingerprint ?? buildRuntimeWorkspaceFingerprint(input.postDispatchAgentContext.task.runtimeContext.providerRuntimeWorkingDirectory),
+		spaceId: input.postDispatchAgentContext.task.spaceId,
+		targetProfileId: input.postDispatchAgentContext.task.agentId,
+		transportMode: input.postDispatchAgentContext.route.transportMode
+	},
+	nowMs: input.postDispatchAgentContext.nowMs,
+	providerContextId: input.postDispatchAgentContext.providerContextId,
+	state: input.state,
+	taskId: input.postDispatchAgentContext.task.taskId
+});
 const commitAgentContextResolutionToState = (input) => {
 	if (!input.committedAgentContextResolution) return input.state;
 	let nextState = input.state;
@@ -10862,7 +11633,8 @@ const resolveRuntimeTaskOutcomeResult = (input) => {
 			...outcome.providerAccessEvidence ? { providerAccessEvidence: outcome.providerAccessEvidence } : {},
 			...outcome.telemetry ? { telemetry: outcome.telemetry } : {},
 			sourceEventId: input.sourceEventId,
-			taskId: input.taskId
+			taskId: input.taskId,
+			...input.transportMode ? { transportMode: input.transportMode } : {}
 		})
 	};
 };
@@ -10900,12 +11672,20 @@ const settleRuntimeTaskState = async (input) => withLedgerStateTransaction({
 	invalidStateStrategy: "backup_and_reset",
 	io: input.io,
 	mutate: (state) => {
+		let committedAgentContextResolution = input.committedAgentContextResolution;
+		if (!committedAgentContextResolution?.agentContext && input.postDispatchAgentContext) committedAgentContextResolution = resolvePostDispatchAgentContextResolution({
+			postDispatchAgentContext: input.postDispatchAgentContext,
+			state
+		});
 		if (input.persistExecutionState === false) return {
 			nextState: state,
-			value: state
+			value: {
+				committedAgentContextResolution,
+				state
+			}
 		};
 		let nextState = commitAgentContextResolutionToState({
-			committedAgentContextResolution: input.committedAgentContextResolution,
+			committedAgentContextResolution,
 			state
 		});
 		nextState = settleRecoveredTask({
@@ -10914,7 +11694,10 @@ const settleRuntimeTaskState = async (input) => withLedgerStateTransaction({
 		});
 		return {
 			nextState,
-			value: nextState
+			value: {
+				committedAgentContextResolution,
+				state: nextState
+			}
 		};
 	},
 	paths: input.paths
@@ -10967,13 +11750,21 @@ const runRuntimeTask = async (input) => {
 		dispatchResult,
 		agentContextResolution
 	});
+	const postDispatchAgentContext = isRepairExecutionMode(input.task.executionMode) ? null : resolvePostDispatchAgentContextInput({
+		committedAgentContextResolution,
+		dispatchResult,
+		nowMs,
+		route: input.route,
+		task: input.task
+	});
 	const runtimeTaskOutcome = resolveRuntimeTaskOutcomeResult({
 		agentId: input.task.agentId,
 		attemptId: input.task.attemptId,
 		deduped,
 		dispatchResult,
 		sourceEventId: input.task.sourceEventId,
-		taskId: input.task.taskId
+		taskId: input.task.taskId,
+		transportMode: input.route?.transportMode ?? null
 	});
 	emitRuntimeTaskOutcomeHealthFindings({
 		humanContext: runtimeHealthContext,
@@ -10982,13 +11773,16 @@ const runRuntimeTask = async (input) => {
 		runtimeState
 	});
 	const { resultPayload } = runtimeTaskOutcome;
-	const state = await settleRuntimeTaskState({
+	const settledRuntimeTaskState = await settleRuntimeTaskState({
 		committedAgentContextResolution,
 		io: input.io,
 		paths: input.paths,
 		persistExecutionState: !isRepairExecutionMode(input.task.executionMode),
+		postDispatchAgentContext,
 		taskId: input.task.taskId
 	});
+	const finalCommittedAgentContextResolution = settledRuntimeTaskState.committedAgentContextResolution;
+	const state = settledRuntimeTaskState.state;
 	if (!isRepairExecutionMode(input.task.executionMode)) await appendLedgerHistoryEntry({
 		entry: buildHistoryEntry({
 			deduped,
@@ -11000,7 +11794,7 @@ const runRuntimeTask = async (input) => {
 		paths: input.paths
 	});
 	const contextResolution = resolveRuntimeContextResolution(dispatchResult);
-	const lifecycleMetadata = resolveRuntimeLifecycleMetadata(committedAgentContextResolution);
+	const lifecycleMetadata = resolveRuntimeLifecycleMetadata(finalCommittedAgentContextResolution);
 	return {
 		...contextResolution ? { contextResolution } : {},
 		deduped,
@@ -11020,6 +11814,20 @@ const listOrderedCompatibleLookupKeys = (input) => {
 	if (!input.preferredLookupKey) return lookupKeys;
 	return [input.preferredLookupKey, ...lookupKeys].filter((lookupKey, index, values) => values.indexOf(lookupKey) === index);
 };
+const listCompatibleAgentContextMatches = (input) => Object.values(input.state.agentContextByLookupKey).filter((agentContext) => isAgentContextCompatibleWithLookupKeyInput({
+	agentContext,
+	key: input.key
+}) && listCompatibleAgentContextLookupKeys({
+	...input.key,
+	spaceId: agentContext.spaceId
+}).includes(agentContext.agentContextLookupKey)).sort((left, right) => {
+	if (left.updatedAtMs !== right.updatedAtMs) return right.updatedAtMs - left.updatedAtMs;
+	if (left.createdAtMs !== right.createdAtMs) return right.createdAtMs - left.createdAtMs;
+	return right.agentContextLookupKey.localeCompare(left.agentContextLookupKey);
+}).map((agentContext) => ({
+	agentContext,
+	agentContextLookupKey: agentContext.agentContextLookupKey
+}));
 const resolveCompatibleAgentContextMatch = (input) => {
 	for (const agentContextLookupKey of listCompatibleAgentContextLookupKeys(input.key)) {
 		const agentContext = resolveAgentContextByLookupKey({
@@ -11035,7 +11843,7 @@ const resolveCompatibleAgentContextMatch = (input) => {
 			agentContextLookupKey
 		};
 	}
-	return null;
+	return listCompatibleAgentContextMatches(input)[0] ?? null;
 };
 const resolveCompatibleConversationExecutionState = (input) => {
 	for (const agentContextLookupKey of listOrderedCompatibleLookupKeys(input)) {
@@ -11053,6 +11861,13 @@ const resolveCompatibleConversationExecutionState = (input) => {
 		});
 		if (executionState) return executionState;
 	}
+	for (const match of listCompatibleAgentContextMatches(input)) {
+		const executionState = resolveConversationExecutionStateByLookupKey({
+			agentContextLookupKey: match.agentContextLookupKey,
+			state: input.state
+		});
+		if (executionState) return executionState;
+	}
 	return null;
 };
 const resolveLatestScopedConversationExecutionState = (input) => {
@@ -11861,6 +12676,11 @@ function syncRuntimeEventToInflightTaskControlRegistry(input) {
 			updated: record !== null
 		};
 	}
+	if (!("processId" in input.event)) return {
+		processId: null,
+		taskId: input.taskId,
+		updated: false
+	};
 	const processId = input.event.processId;
 	if (typeof processId === "number" && Number.isInteger(processId) && processId > 0) {
 		const record = input.registry.updateTaskProcess({
@@ -12007,7 +12827,7 @@ async function setDaemonServiceRuntimeState(state, pathInput = {}) {
 	await writeDaemonServiceRuntimeState(state, pathInput);
 }
 async function clearDaemonServiceRuntimeState(pathInput = {}) {
-	const { clearDaemonRuntimeLease } = await import("./daemon-runtime-lease-BzvcJMMC.js");
+	const { clearDaemonRuntimeLease } = await import("./daemon-runtime-lease-B8Ox_m9_.js");
 	await Promise.all([rm(daemonServiceRuntimeStatePath(pathInput), { force: true }), clearDaemonRuntimeLease(pathInput)]);
 }
 async function withDaemonServiceRunLock(callback, meta = {
@@ -14025,7 +14845,7 @@ function normalizeHeartbeatIntervalMs(value) {
 	return clampInteger$1(value, MIN_HEARTBEAT_INTERVAL_MS, MAX_HEARTBEAT_INTERVAL_MS);
 }
 function parseTransportMode(value) {
-	if (value === "local-cli") return value;
+	if (value === "local-cli" || value === "codex-app-server") return value;
 	return null;
 }
 function parseStreamingMode(value) {
@@ -14033,7 +14853,7 @@ function parseStreamingMode(value) {
 	return null;
 }
 function parseRuntimeTransportMode(value) {
-	if (value === "local-cli") return value;
+	if (value === "local-cli" || value === "codex-app-server") return value;
 	return null;
 }
 function parseContextIdMappingSpec(value) {
@@ -19311,8 +20131,8 @@ function createAgentRegistration(input) {
 		displayName,
 		enabled: true,
 		...input.launchContract ? { launchContract: input.launchContract } : {},
-		transportMode: controllerSettings.transportMode,
-		streamingMode: controllerSettings.streamingMode,
+		transportMode: input.transportMode ?? controllerSettings.transportMode,
+		streamingMode: input.streamingMode ?? controllerSettings.streamingMode,
 		timeoutMs: controllerSettings.timeoutMs,
 		retry: controllerSettings.retry,
 		contextIdMappingSpec: controllerSettings.contextIdMappingSpec,
@@ -19473,11 +20293,17 @@ function normalizeReason(value) {
 
 //#endregion
 //#region src/skills/agents.ts
-const SUPPORTED_RUNTIME_TRANSPORT_MODES = new Set(["local-cli"]);
-const TRANSPORT_MODE_METADATA = { "local-cli": {
-	label: "Local CLI (Default)",
-	description: "Run via local CLI on this computer, with session continuation when available."
-} };
+const SUPPORTED_RUNTIME_TRANSPORT_MODES = new Set(["local-cli", "codex-app-server"]);
+const TRANSPORT_MODE_METADATA = {
+	"local-cli": {
+		label: "Local CLI (Default)",
+		description: "Run via local CLI on this computer, with session continuation when available."
+	},
+	"codex-app-server": {
+		label: "Codex App Server",
+		description: "Run Codex through the local Codex App Server with native thread control."
+	}
+};
 const SUPPORTED_RUNTIME_STREAMING_MODES = new Set(["final", "stream"]);
 function resolveSkillsAgentRegistry(skillsConfig) {
 	const overrides = skillsConfig?.agents ?? {};
@@ -19781,7 +20607,9 @@ function createRegistrationFromCatalogTarget(target) {
 	return createAgentRegistration({
 		agentId: target.agentId,
 		displayName: target.displayName,
-		...target.launchContract ? { launchContract: target.launchContract } : {}
+		...target.launchContract ? { launchContract: target.launchContract } : {},
+		...target.defaultStreamingMode ? { streamingMode: target.defaultStreamingMode } : {},
+		...target.defaultTransportMode ? { transportMode: target.defaultTransportMode } : {}
 	});
 }
 async function toAgentTargetState(target, registration) {
@@ -20641,6 +21469,9 @@ function buildSpaceUpdatesPath(spaceId) {
 function buildSpaceWakeProgressPath(spaceId) {
 	return buildSpaceRoutePath(spaceId, "wake-progress");
 }
+function buildActiveSpaceWakeProgressPath(spaceId) {
+	return buildSpaceRoutePath(spaceId, "active-wake-progress");
+}
 function buildSpaceWakeTraceWaterfallPath(spaceId) {
 	return buildSpaceRoutePath(spaceId, "wake-trace-waterfall");
 }
@@ -21030,6 +21861,20 @@ async function getSpaceWakeProgress(client, input) {
 		invalidMessage: "invalid wake progress response"
 	});
 }
+async function getActiveSpaceWakeProgress(client, input) {
+	const searchParams = new URLSearchParams();
+	if (input.targetProfileId) searchParams.set("targetProfileId", input.targetProfileId);
+	const query = searchParams.toString();
+	return await client.requestJson({
+		url: query ? `${buildActiveSpaceWakeProgressPath(input.spaceId)}?${query}` : buildActiveSpaceWakeProgressPath(input.spaceId),
+		operation: "space.active_wake_progress",
+		method: "GET",
+		requestContext: input.requestContext,
+		...input.spacePassword === void 0 ? {} : { spacePassword: input.spacePassword },
+		schema: getActiveSpaceWakeProgressResponseSchema,
+		invalidMessage: "invalid active wake progress response"
+	});
+}
 async function getSpaceWakeTraceWaterfall(client, input) {
 	const searchParams = new URLSearchParams();
 	if (input.clientMessageId) searchParams.set("clientMessageId", input.clientMessageId);
@@ -21059,6 +21904,7 @@ const createSpaceApi = (client) => {
 		listSignals: async (input) => await listSpaceSignals(client, input),
 		listSignalEnvelopes: async (input) => await listSpaceSignalEnvelopes(client, input),
 		getUpdates: async (input) => await getSpaceUpdates(client, input),
+		getActiveWakeProgress: async (input) => await getActiveSpaceWakeProgress(client, input),
 		getWakeProgress: async (input) => await getSpaceWakeProgress(client, input),
 		getWakeTraceWaterfall: async (input) => await getSpaceWakeTraceWaterfall(client, input),
 		getMessageDetails: async (input) => await getSpaceMessageDetails(client, input),
@@ -22555,11 +23401,29 @@ function buildAcceptedLocalDaemonRouteCandidate(input) {
 			launchContract: input.localController.launchContract,
 			profileId: input.profileId,
 			streamingMode: parseStreamingMode(input.localController.streamingMode) ?? parseStreamingMode(input.runtimeControllerSupport.runtimeAdapterMatch.defaultStreamingMode) ?? defaults.streamingMode,
-			transportMode: parseTransportMode(input.localController.transportMode) ?? defaults.transportMode
+			transportMode: resolveAcceptedRouteTransportMode({
+				defaults,
+				localController: input.localController,
+				runtimeControllerSupport: input.runtimeControllerSupport
+			})
 		},
 		status: "accepted"
 	};
 }
+function resolveAcceptedRouteTransportMode(input) {
+	const supportedTransportModes = /* @__PURE__ */ new Set();
+	for (const transportMode of input.runtimeControllerSupport.runtimeAdapterMatch.transportModes) {
+		const parsedTransportMode = parseRuntimeTransportMode(transportMode);
+		if (parsedTransportMode) supportedTransportModes.add(parsedTransportMode);
+	}
+	const configuredTransportMode = parseTransportMode(input.localController.transportMode);
+	if (configuredTransportMode && supportedTransportModes.has(configuredTransportMode)) return configuredTransportMode;
+	const registryDefaultTransportMode = parseRuntimeTransportMode(input.runtimeControllerSupport.runtimeAdapterMatch.defaultTransportMode);
+	if (registryDefaultTransportMode && supportedTransportModes.has(registryDefaultTransportMode)) return registryDefaultTransportMode;
+	const firstSupportedTransportMode = [...supportedTransportModes][0] ?? null;
+	if (firstSupportedTransportMode) return firstSupportedTransportMode;
+	return input.defaults.transportMode;
+}
 function buildSkippedLocalDaemonRouteCandidate(input) {
 	return {
 		...input?.profileId ? { profileId: input.profileId } : {},
@@ -37866,7 +38730,7 @@ async function resolveLocalConversationExecutionStatus(input) {
 		transportMode: input.transportMode,
 		workspaceResolution
 	});
-	const liveResumeCheck = input.validate === true ? await runProviderResumeProbe({
+	const liveResumeCheck = input.validate === true ? await runProviderConversationProof({
 		boundAgentControllerRef: input.boundAgentControllerRef,
 		agentControllerConversationId: input.agentControllerConversationId,
 		launchContract: localController?.launchContract ?? null,
@@ -37945,11 +38809,11 @@ function buildLiveResumeCheckNotRun() {
 		errorCode: null,
 		errorMessage: null,
 		errorType: null,
-		message: "Live provider resume probe was not run. Re-run with --validate to confirm Wake availability on this device.",
+		message: "Provider conversation proof was not run. Re-run with --validate to confirm Wake availability on this device.",
 		status: "not_run"
 	};
 }
-async function runProviderResumeProbe(input) {
+async function runProviderConversationProof(input) {
 	if (!input.agentControllerConversationId) return {
 		checkedAt: null,
 		errorCode: null,
@@ -37980,7 +38844,7 @@ async function runProviderResumeProbe(input) {
 		errorCode: "controller_ref_mismatch",
 		errorMessage: "The bound agent controller conversation controller does not match the current agent profile controller.",
 		errorType: "config",
-		message: "Live provider resume probe was skipped because the bound controller does not match the current agent profile controller.",
+		message: "Provider conversation proof was skipped because the bound controller does not match the current agent profile controller.",
 		status: "skipped"
 	};
 	const providerId = normalizeKnownBuiltinAgentControllerId(input.profileAgentControllerRef);
@@ -37988,9 +38852,9 @@ async function runProviderResumeProbe(input) {
 	if (!(providerId && agentControllerConversationKind)) return {
 		checkedAt,
 		errorCode: "provider_unsupported",
-		errorMessage: `Live provider resume probe is not available for ${input.profileAgentControllerRef}.`,
+		errorMessage: `Provider conversation proof is not available for ${input.profileAgentControllerRef}.`,
 		errorType: "config",
-		message: `Live provider resume probe is not available for ${input.profileAgentControllerRef} in this phase.`,
+		message: `Provider conversation proof is not available for ${input.profileAgentControllerRef} in this phase.`,
 		status: "skipped"
 	};
 	const agentControllerConversation = buildAgentControllerConversationRef({
@@ -37999,15 +38863,14 @@ async function runProviderResumeProbe(input) {
 		agentControllerConversationKind
 	});
 	try {
-		if (providerId === "codex") await invokeCodexCliTransport({
-			codexTimeoutMs: resolveLiveResumeProbeTimeoutMs(resolveCodexTimeoutMs()),
+		if (providerId === "codex") await verifyCodexAppServerThread({
+			codexTimeoutMs: resolveProviderConversationProofTimeoutMs(resolveCodexTimeoutMs()),
 			codexWorkdir: input.runtimeWorkingDirectory,
 			launchContract: input.launchContract,
-			prompt: LIVE_RESUME_PROBE_PROMPT,
 			threadId: agentControllerConversation.agentControllerConversationId
 		});
 		else if (providerId === "claude-code") await invokeClaudeCliTransport({
-			claudeTimeoutMs: resolveLiveResumeProbeTimeoutMs(resolveClaudeCodeTimeoutMs()),
+			claudeTimeoutMs: resolveProviderConversationProofTimeoutMs(resolveClaudeCodeTimeoutMs()),
 			claudeWorkdir: input.runtimeWorkingDirectory,
 			launchContract: input.launchContract,
 			prompt: LIVE_RESUME_PROBE_PROMPT,
@@ -38016,9 +38879,9 @@ async function runProviderResumeProbe(input) {
 		else return {
 			checkedAt,
 			errorCode: "provider_unsupported",
-			errorMessage: `Live provider resume probe is not available for ${agentControllerConversation.agentControllerRef}.`,
+			errorMessage: `Provider conversation proof is not available for ${agentControllerConversation.agentControllerRef}.`,
 			errorType: "config",
-			message: `Live provider resume probe is not available for ${agentControllerConversation.agentControllerRef} in this phase.`,
+			message: `Provider conversation proof is not available for ${agentControllerConversation.agentControllerRef} in this phase.`,
 			status: "skipped"
 		};
 		return {
@@ -38026,7 +38889,7 @@ async function runProviderResumeProbe(input) {
 			errorCode: null,
 			errorMessage: null,
 			errorType: null,
-			message: "Live provider resume probe passed. ATS can resume this Agent Profile conversation on this device.",
+			message: providerId === "codex" ? "Codex App Server thread proof passed. ATS can control this Agent Profile thread on this device without adding a probe turn." : "Provider conversation proof passed. ATS can resume this Agent Profile conversation on this device.",
 			status: "passed"
 		};
 	} catch (error) {
@@ -38035,7 +38898,7 @@ async function runProviderResumeProbe(input) {
 			errorCode: readErrorCode$1(error),
 			errorMessage: readErrorMessage(error),
 			errorType: readErrorType(error),
-			message: "Live provider resume probe failed. ATS should not wake this Agent Profile until the agent controller conversation or local runtime is fixed.",
+			message: providerId === "codex" ? "Codex App Server thread proof failed. ATS should not wake this Agent Profile until the Codex thread or local App Server runtime is fixed." : "Provider conversation proof failed. ATS should not wake this Agent Profile until the agent controller conversation or local runtime is fixed.",
 			status: "failed"
 		};
 	}
@@ -38103,10 +38966,10 @@ function readErrorType(error) {
 	return null;
 }
 const LIVE_RESUME_PROBE_PROMPT = "ATS resume probe. Reply with one short confirmation sentence.";
-const LIVE_RESUME_PROBE_TIMEOUT_MS = 3e4;
-function resolveLiveResumeProbeTimeoutMs(runtimeTimeoutMs) {
-	if (runtimeTimeoutMs === null) return LIVE_RESUME_PROBE_TIMEOUT_MS;
-	return Math.min(runtimeTimeoutMs, LIVE_RESUME_PROBE_TIMEOUT_MS);
+const PROVIDER_CONVERSATION_PROOF_TIMEOUT_MS = 3e4;
+function resolveProviderConversationProofTimeoutMs(runtimeTimeoutMs) {
+	if (runtimeTimeoutMs === null) return PROVIDER_CONVERSATION_PROOF_TIMEOUT_MS;
+	return Math.min(runtimeTimeoutMs, PROVIDER_CONVERSATION_PROOF_TIMEOUT_MS);
 }
 
 //#endregion
@@ -40780,6 +41643,8 @@ async function handleDispatchDeliverFrame(input) {
 	let contextIdForDispatch = null;
 	let bootstrapPlan = null;
 	let plannedAgentControllerConversation = null;
+	let observedProviderConversationId = null;
+	let observedProviderConversation = null;
 	let runtimePrompt = "";
 	let runtimePromptTrace = null;
 	let stopRunningKeepalive = null;
@@ -40863,9 +41728,11 @@ async function handleDispatchDeliverFrame(input) {
 			agentControllerConversationResumePlan
 		});
 		plannedAgentControllerConversation = resolvePlannedAgentControllerConversation({
-			agentControllerConversationId: parsedTask.agentControllerConversationId,
+			agentControllerConversationId: contextIdForDispatch,
 			agentControllerRef: parsedTask.agentControllerRef
 		});
+		observedProviderConversationId = contextIdForDispatch;
+		observedProviderConversation = plannedAgentControllerConversation;
 		bootstrapPlan = resolveBootstrapPlan({
 			bootstrapTemplateFacts: bootstrapContext.bootstrapTemplateFacts,
 			executionState: currentExecutionState,
@@ -40992,6 +41859,55 @@ async function handleDispatchDeliverFrame(input) {
 			phase: "runtime_invocation_started",
 			result: "started"
 		});
+		const providerConversationLedgerIo = ledgerIo;
+		if (!providerConversationLedgerIo) throw new DaemonServiceRunError({
+			code: "dispatch.ledger.unavailable",
+			message: "dispatch.ledger.unavailable: dispatch ledger is not initialized"
+		});
+		const recordProviderConversationObservation = (observation) => {
+			const agentControllerConversationId = normalizeOptionalContextId(observation.agentControllerConversationId);
+			if (!agentControllerConversationId) return null;
+			const agentControllerConversation = observation.agentControllerConversation ?? buildAgentControllerConversationRefFromAgentControllerConversation({
+				agentControllerConversationId,
+				agentControllerRef: parsedTask.agentControllerRef
+			});
+			observedProviderConversationId = agentControllerConversationId;
+			observedProviderConversation = agentControllerConversation;
+			withLedgerStateTransaction({
+				invalidStateStrategy: "backup_and_reset",
+				io: providerConversationLedgerIo,
+				mutate: (state) => ({
+					nextState: commitResolvedAgentContext({
+						state,
+						agentContextLookupKey: contextLookupKey,
+						agentControllerConversationId,
+						agentControllerRef: parsedTask.agentControllerRef,
+						spaceId: parsedTask.spaceId,
+						targetProfileId: parsedTask.targetProfileId,
+						transportMode: parsedTask.transportMode,
+						runtimeWorkspaceFingerprint: buildRuntimeWorkspaceFingerprint(activeRuntimeContext.providerRuntimeWorkingDirectory),
+						taskId: parsedTask.taskId,
+						nowMs: Date.now()
+					}),
+					value: void 0
+				}),
+				paths: input.ledgerPaths
+			}).catch((error) => {
+				emitRunLine({
+					presenter: input.presenter,
+					code: "daemon.run.provider_conversation_observation_ignored",
+					text: `provider conversation observation could not be persisted for task ${parsedTask.taskId}`,
+					payload: {
+						dispatchId: parsedTask.dispatchId,
+						errorMessage: toErrorMessage$28(error),
+						source: observation.source,
+						targetProfileId: parsedTask.targetProfileId,
+						taskId: parsedTask.taskId
+					}
+				});
+			});
+			return agentControllerConversationId;
+		};
 		const runtimeExecutionPromise = Promise.resolve(runDispatchRuntimeExecution({
 			contextId: contextIdForDispatch,
 			executionMode: "normal",
@@ -41011,6 +41927,11 @@ async function handleDispatchDeliverFrame(input) {
 				});
 			},
 			onRuntimeEvent: (event) => {
+				if (event.phase === "provider_conversation_observed") recordProviderConversationObservation({
+					agentControllerConversation: event.agentControllerConversation ?? null,
+					agentControllerConversationId: event.agentControllerConversationId,
+					source: "runtime_event"
+				});
 				if (!firstOutputEvidenceSent && (event.phase === "first_stdout" || event.phase === "first_stderr")) {
 					firstOutputEvidenceSent = true;
 					emitDispatchRuntimeEvidenceTransition({
@@ -41077,8 +41998,18 @@ async function handleDispatchDeliverFrame(input) {
 		let runtimeResult = await resolveRuntimeResultFromRuntimeOrCliSpaceAction({
 			contextIdForDispatch,
 			dispatchSpaceActionContext,
+			getObservedAgentControllerConversation: () => observedProviderConversation,
+			getObservedAgentControllerConversationId: () => observedProviderConversationId,
 			ledgerIo,
 			ledgerPaths: input.ledgerPaths,
+			onRuntimeResultAfterCliSpaceAction: (runtimeResult) => {
+				const runtimeContextDelta = resolveDispatchContextDeltaFromRuntimeResult(runtimeResult.dispatchResult);
+				recordProviderConversationObservation({
+					agentControllerConversation: runtimeResult.contextResolution?.agentControllerConversation ?? runtimeContextDelta?.agentControllerConversation ?? null,
+					agentControllerConversationId: runtimeResult.contextResolution?.agentControllerConversationId ?? runtimeContextDelta?.agentControllerConversationId ?? null,
+					source: "runtime_result"
+				});
+			},
 			parsedTask,
 			presenter: input.presenter,
 			runtimeExecutionPromise
@@ -41614,19 +42545,6 @@ async function resolveRuntimeResultFromRuntimeOrCliSpaceAction(input) {
 		runtimeResult: completion.runtimeResult
 	});
 	if (completion.kind === "cli_space_action_poll_aborted") return await input.runtimeExecutionPromise;
-	input.runtimeExecutionPromise.catch((error) => {
-		emitRunLine({
-			presenter: input.presenter,
-			code: "daemon.run.runtime_ignored_after_cli_space_action",
-			text: `runtime completed after CLI ATS Space Action finalized task ${input.parsedTask.taskId}`,
-			payload: {
-				dispatchId: input.parsedTask.dispatchId,
-				errorMessage: toErrorMessage$28(error),
-				targetProfileId: input.parsedTask.targetProfileId,
-				taskId: input.parsedTask.taskId
-			}
-		});
-	});
 	if (completion.kind === "cli_space_action_invalid") throw new DaemonServiceRunError({
 		code: "dispatch.cli_space_action.invalid",
 		message: completion.errorMessage
@@ -41643,8 +42561,28 @@ async function resolveRuntimeResultFromRuntimeOrCliSpaceAction(input) {
 			taskId: input.parsedTask.taskId
 		}
 	});
+	const completedRuntimeResult = await resolveAlreadyCompletedRuntimeResultAfterCliSpaceAction({
+		parsedTask: input.parsedTask,
+		presenter: input.presenter,
+		runtimeExecutionPromise: input.runtimeExecutionPromise
+	});
+	if (completedRuntimeResult) return applyCliSpaceActionRecordToRuntimeResult({
+		record: completion.record,
+		runtimeResult: completedRuntimeResult
+	});
+	observeRuntimeResultAfterCliSpaceAction({
+		onRuntimeResultAfterCliSpaceAction: input.onRuntimeResultAfterCliSpaceAction,
+		parsedTask: input.parsedTask,
+		presenter: input.presenter,
+		runtimeExecutionPromise: input.runtimeExecutionPromise
+	});
+	const observedAgentControllerConversationId = normalizeOptionalContextId(input.getObservedAgentControllerConversationId?.() ?? null) ?? input.contextIdForDispatch;
 	return await buildCliSpaceActionRuntimeResult({
-		contextIdForDispatch: input.contextIdForDispatch,
+		agentControllerConversation: input.getObservedAgentControllerConversation?.() ?? buildAgentControllerConversationRefFromAgentControllerConversation({
+			agentControllerConversationId: observedAgentControllerConversationId,
+			agentControllerRef: input.parsedTask.agentControllerRef
+		}),
+		agentControllerConversationId: observedAgentControllerConversationId,
 		ledgerIo: input.ledgerIo,
 		ledgerPaths: input.ledgerPaths,
 		parsedTask: input.parsedTask,
@@ -41672,23 +42610,20 @@ async function waitForCliSpaceActionRecord(input) {
 	return { kind: "cli_space_action_poll_aborted" };
 }
 async function buildCliSpaceActionRuntimeResult(input) {
-	const output = resolveStructuredActionOutputFallback({
-		action: input.record.action,
-		cleanedOutput: ""
-	});
-	const resultPayload = {
-		...buildTaskResultPayloadFromOutcome({
+	const resultPayload = buildCliSpaceActionSuccessPayload({
+		basePayload: {
 			agentId: input.parsedTask.targetProfileId,
 			attemptId: input.parsedTask.attemptId,
 			deduped: false,
-			emitFailed: false,
-			output,
 			sourceEventId: input.parsedTask.sourceEventId,
-			taskId: input.parsedTask.taskId
-		}),
-		spaceAction: input.record.action,
-		spaceActionProvenance: "cli_action"
-	};
+			taskId: input.parsedTask.taskId,
+			...input.agentControllerConversation ? { agentControllerConversation: input.agentControllerConversation } : {},
+			...input.agentControllerConversationId ? { agentControllerConversationId: input.agentControllerConversationId } : {},
+			...input.parsedTask.agentControllerRef ? { agentControllerRef: input.parsedTask.agentControllerRef } : {},
+			...input.parsedTask.transportMode ? { transportMode: input.parsedTask.transportMode } : {}
+		},
+		record: input.record
+	});
 	const state = await withLedgerStateTransaction({
 		invalidStateStrategy: "backup_and_reset",
 		io: input.ledgerIo,
@@ -41720,8 +42655,11 @@ async function buildCliSpaceActionRuntimeResult(input) {
 		deduped: false,
 		dispatchResult: {
 			adapterResult: {
-				...input.contextIdForDispatch ? { contextDelta: { agentControllerConversationId: input.contextIdForDispatch } } : {},
-				output,
+				...input.agentControllerConversationId ? { contextDelta: {
+					...input.agentControllerConversation ? { agentControllerConversation: input.agentControllerConversation } : {},
+					agentControllerConversationId: input.agentControllerConversationId
+				} } : {},
+				output: resultPayload.output,
 				status: "success"
 			},
 			dispatched: true,
@@ -41765,13 +42703,86 @@ async function applyCliSpaceActionRecordIfPresent(input) {
 			taskId: input.parsedTask.taskId
 		}
 	});
+	return applyCliSpaceActionRecordToRuntimeResult({
+		record: readResult.record,
+		runtimeResult: input.runtimeResult
+	});
+}
+async function resolveAlreadyCompletedRuntimeResultAfterCliSpaceAction(input) {
+	try {
+		const result = await Promise.race([input.runtimeExecutionPromise.then((runtimeResult) => ({
+			runtimeResult,
+			status: "runtime"
+		})), setTimeout$1(0).then(() => ({ status: "pending" }))]);
+		if (result.status === "runtime") return result.runtimeResult;
+	} catch (error) {
+		emitRunLine({
+			presenter: input.presenter,
+			code: "daemon.run.runtime_ignored_after_cli_space_action",
+			text: `runtime failed after CLI ATS Space Action finalized task ${input.parsedTask.taskId}`,
+			payload: {
+				dispatchId: input.parsedTask.dispatchId,
+				errorMessage: toErrorMessage$28(error),
+				targetProfileId: input.parsedTask.targetProfileId,
+				taskId: input.parsedTask.taskId
+			}
+		});
+	}
+	return null;
+}
+function observeRuntimeResultAfterCliSpaceAction(input) {
+	input.runtimeExecutionPromise.then(async (runtimeResult) => {
+		await input.onRuntimeResultAfterCliSpaceAction?.(runtimeResult);
+	}).catch((error) => {
+		emitRunLine({
+			presenter: input.presenter,
+			code: "daemon.run.runtime_ignored_after_cli_space_action",
+			text: `runtime failed after CLI ATS Space Action finalized task ${input.parsedTask.taskId}`,
+			payload: {
+				dispatchId: input.parsedTask.dispatchId,
+				errorMessage: toErrorMessage$28(error),
+				targetProfileId: input.parsedTask.targetProfileId,
+				taskId: input.parsedTask.taskId
+			}
+		});
+	});
+}
+function applyCliSpaceActionRecordToRuntimeResult(input) {
 	return {
 		...input.runtimeResult,
-		resultPayload: {
-			...input.runtimeResult.resultPayload,
-			spaceAction: readResult.record.action,
-			spaceActionProvenance: "cli_action"
-		}
+		resultPayload: buildCliSpaceActionSuccessPayload({
+			basePayload: input.runtimeResult.resultPayload,
+			record: input.record
+		})
+	};
+}
+function buildCliSpaceActionSuccessPayload(input) {
+	const output = resolveStructuredActionOutputFallback({
+		action: input.record.action,
+		cleanedOutput: ""
+	});
+	return {
+		agentId: input.basePayload.agentId,
+		attemptId: input.basePayload.attemptId,
+		deduped: input.basePayload.deduped,
+		sourceEventId: input.basePayload.sourceEventId,
+		taskId: input.basePayload.taskId,
+		...input.basePayload.agentControllerConversation ? { agentControllerConversation: input.basePayload.agentControllerConversation } : {},
+		...input.basePayload.agentControllerConversationId ? { agentControllerConversationId: input.basePayload.agentControllerConversationId } : {},
+		...input.basePayload.agentControllerRef ? { agentControllerRef: input.basePayload.agentControllerRef } : {},
+		...input.basePayload.bootstrapTemplateFacts ? { bootstrapTemplateFacts: input.basePayload.bootstrapTemplateFacts } : {},
+		...input.basePayload.dispatchExecution ? { dispatchExecution: input.basePayload.dispatchExecution } : {},
+		...input.basePayload.effectiveRuntimeWorkingDirectory ? { effectiveRuntimeWorkingDirectory: input.basePayload.effectiveRuntimeWorkingDirectory } : {},
+		...input.basePayload.openClawBinding ? { openClawBinding: input.basePayload.openClawBinding } : {},
+		...input.basePayload.openClawGatewayVisibility ? { openClawGatewayVisibility: input.basePayload.openClawGatewayVisibility } : {},
+		...input.basePayload.promptTrace ? { promptTrace: input.basePayload.promptTrace } : {},
+		...input.basePayload.runtimeWorkspaceFingerprint ? { runtimeWorkspaceFingerprint: input.basePayload.runtimeWorkspaceFingerprint } : {},
+		...input.basePayload.telemetry ? { telemetry: input.basePayload.telemetry } : {},
+		...input.basePayload.transportMode ? { transportMode: input.basePayload.transportMode } : {},
+		output,
+		spaceAction: input.record.action,
+		spaceActionProvenance: "cli_action",
+		status: "success"
 	};
 }
 async function readCliSpaceActionRecordWithGrace(input) {
@@ -42971,7 +43982,7 @@ function emitProviderRuntimePhaseLine(input) {
 		agentControllerRef: input.agentControllerRef,
 		dispatchId: input.dispatchId,
 		phase: input.event.phase,
-		processId: input.event.processId,
+		processId: "processId" in input.event ? input.event.processId : null,
 		sinceRuntimeStartedMs,
 		targetProfileId: input.targetProfileId,
 		taskId: input.taskId
@@ -43029,6 +44040,17 @@ function emitProviderRuntimePhaseLine(input) {
 				}
 			});
 			return;
+		case "provider_conversation_observed":
+			emitRunLine({
+				presenter: input.presenter,
+				code: "daemon.run.provider_conversation_observed",
+				text: `provider conversation observed for task ${input.taskId}`,
+				payload: {
+					...basePayload,
+					agentControllerConversationId: input.event.agentControllerConversationId
+				}
+			});
+			return;
 		default: return;
 	}
 }
@@ -57134,11 +58156,14 @@ function applySingleEnableSelection(input) {
 		return;
 	}
 	if (existing.enabled && selectedLaunchContract) {
-		input.next[existingIndex] = {
-			...existing,
-			launchContract: selectedLaunchContract,
-			updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-		};
+		input.next[existingIndex] = applyTargetRuntimeDefaults({
+			registration: {
+				...existing,
+				launchContract: selectedLaunchContract,
+				updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+			},
+			targetState
+		});
 		input.summary.reenabled.push(targetState.agentId);
 		return;
 	}
@@ -57149,14 +58174,24 @@ function applySingleEnableSelection(input) {
 		});
 		return;
 	}
-	input.next[existingIndex] = {
-		...existing,
-		enabled: true,
-		...resolvedLaunchContract ? { launchContract: resolvedLaunchContract } : {},
-		updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-	};
+	input.next[existingIndex] = applyTargetRuntimeDefaults({
+		registration: {
+			...existing,
+			enabled: true,
+			...resolvedLaunchContract ? { launchContract: resolvedLaunchContract } : {},
+			updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+		},
+		targetState
+	});
 	input.summary.reenabled.push(targetState.agentId);
 }
+function applyTargetRuntimeDefaults(input) {
+	return {
+		...input.registration,
+		...input.targetState.defaultStreamingMode ? { streamingMode: input.targetState.defaultStreamingMode } : {},
+		...input.targetState.defaultTransportMode ? { transportMode: input.targetState.defaultTransportMode } : {}
+	};
+}
 function resolveRepairCandidate(input) {
 	const state = input.targetStateById.get(input.requestedId) ?? null;
 	if (!isBuiltinEnableChoiceCandidate(state)) {
@@ -59637,9 +60672,16 @@ async function bindAgentProfileToExplicitLocalAgent(input) {
 	});
 	await persistAgentTransportSelection({
 		agentControllerRef,
-		transportMode: "local-cli"
+		transportMode: resolveDefaultTransportModeForLocalAgent({
+			agentControllerRef,
+			localAgentId: input.localAgentId
+		})
 	});
 }
+function resolveDefaultTransportModeForLocalAgent(input) {
+	const runtimeAdapterContract = resolveRegistryRuntimeAdapterContractByAgentControllerRef(input.agentControllerRef);
+	return runtimeAdapterContract?.defaultTransportMode ?? runtimeAdapterContract?.transportModes[0] ?? createDefaultRuntimeAgentControllerSettings(input.localAgentId).transportMode;
+}
 async function prepareLocalAgentLaunchIfNeeded(input) {
 	if (needsLocalAgentLaunchChoice(input.reasonCodes)) {
 		const enableResult = await runAgentsEnable({