agent-transport-system 0.7.31 → 0.7.33

package/dist/ats.js

@@ -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.31";
+var version = "0.7.33";
 var package_default = {
 	$schema: "https://www.schemastore.org/package.json",
 	name: "agent-transport-system",
 	version,
-	atsReleaseDate: "2026-06-04",
+	atsReleaseDate: "2026-06-05",
 	description: "Agent Transport System CLI - https://ats.sh",
 	license: "MIT",
 	type: "module",
@@ -56,7 +56,7 @@ var package_default = {
 		"typecheck": "tsc -p tsconfig.json --noEmit",
 		"check": "ultracite check && tsc -p tsconfig.json --noEmit",
 		"test": "vitest run --config vitest.config.ts",
-		"test:integration": "vitest run --config vitest.integration.config.ts",
+		"test:integration": "node scripts/run-integration-tests.mjs",
 		"test:full": "pnpm run test && pnpm run test:integration",
 		"test:daemon": "vitest run --config vitest.integration.config.ts tests/daemon-state.integration.test.ts tests/daemon-command.integration.test.ts tests/daemon-menu.integration.test.ts tests/daemon-run.integration.test.ts tests/daemon-bootstrap-recommendation.integration.test.ts",
 		"test:watch": "vitest"
@@ -77,7 +77,7 @@ var package_default = {
 		"@agent-transport-system/adapter-openclaw": "workspace:*",
 		"@agent-transport-system/agent-runtime": "workspace:*",
 		"@agent-transport-system/api-client": "workspace:*",
-		"@agent-transport-system/atsd": "workspace:*",
+		"@agent-transport-system/local-execution": "workspace:*",
 		"@agent-transport-system/gateway-contract": "workspace:*",
 		"@agent-transport-system/protocol": "workspace:*",
 		"@agent-transport-system/schemas": "workspace:*",
@@ -16267,6 +16267,56 @@ const createStartApi = (client) => {
 	};
 };
 
+//#endregion
+//#region src/local-service/carrier/heartbeat-loop.ts
+function waitForHeartbeatResponse(input) {
+	if (input.waiters.heartbeatResolver || input.waiters.heartbeatRejecter) return Promise.reject(new DaemonServiceRunError({
+		code: "daemon.run.heartbeat_response_busy",
+		message: "heartbeat response waiter is already pending"
+	}));
+	return new Promise((resolve, reject) => {
+		const timeout = setTimeout(() => {
+			input.waiters.heartbeatResolver = null;
+			input.waiters.heartbeatRejecter = null;
+			reject(new DaemonServiceRunError({
+				code: "daemon.run.heartbeat_timeout",
+				message: "heartbeat response timeout"
+			}));
+		}, input.timeoutMs);
+		input.waiters.heartbeatResolver = (payload) => {
+			clearTimeout(timeout);
+			input.waiters.heartbeatRejecter = null;
+			resolve(payload);
+		};
+		input.waiters.heartbeatRejecter = (error) => {
+			clearTimeout(timeout);
+			input.waiters.heartbeatResolver = null;
+			input.waiters.heartbeatRejecter = null;
+			reject(error);
+		};
+	});
+}
+function applyAcceptedLeases(input) {
+	input.leasesByProfileId.clear();
+	for (const lease of input.acceptedLeases) input.leasesByProfileId.set(lease.profileId, lease.leaseEpoch);
+}
+function pruneStaleLeases(input) {
+	for (const staleLease of input.staleLeases) if (input.leasesByProfileId.get(staleLease.profileId) === staleLease.leaseEpoch) input.leasesByProfileId.delete(staleLease.profileId);
+}
+function resolveAdaptiveHeartbeatIntervalMs(input) {
+	if (input.hasDispatchActivity) return MIN_HEARTBEAT_INTERVAL_MS;
+	const growthFactor = typeof input.growthFactor === "number" && Number.isFinite(input.growthFactor) ? input.growthFactor : ADAPTIVE_HEARTBEAT_GROWTH_FACTOR;
+	return clampInteger$1(input.currentIntervalMs * growthFactor, MIN_HEARTBEAT_INTERVAL_MS, MAX_HEARTBEAT_INTERVAL_MS);
+}
+function applyIntervalJitterMs(input) {
+	const jitterRatio = typeof input.jitterRatio === "number" && Number.isFinite(input.jitterRatio) ? Math.max(0, input.jitterRatio) : 0;
+	const jitterMultiplier = 1 + ((typeof input.randomValue === "number" && Number.isFinite(input.randomValue) ? Math.min(1, Math.max(0, input.randomValue)) : Math.random()) * 2 - 1) * jitterRatio;
+	return clampInteger$1(input.baseIntervalMs * jitterMultiplier, input.minIntervalMs, input.maxIntervalMs);
+}
+function resolveCatalogSyncIntervalMs(input) {
+	return clampInteger$1(input.heartbeatIntervalMs * CATALOG_SYNC_INTERVAL_MULTIPLIER, MIN_CATALOG_SYNC_INTERVAL_MS, MAX_CATALOG_SYNC_INTERVAL_MS);
+}
+
 //#endregion
 //#region src/agents/controller-identity.ts
 function resolveLocalRegistryAgentIdFromAgentControllerRef(input) {
@@ -19856,56 +19906,6 @@ function resolveProfileWorkspaceStateReason(input) {
 	return "projected agent profile workspaces look good";
 }
 
-//#endregion
-//#region src/daemon/session/heartbeat-loop.ts
-function waitForHeartbeatResponse(input) {
-	if (input.waiters.heartbeatResolver || input.waiters.heartbeatRejecter) return Promise.reject(new DaemonServiceRunError({
-		code: "daemon.run.heartbeat_response_busy",
-		message: "heartbeat response waiter is already pending"
-	}));
-	return new Promise((resolve, reject) => {
-		const timeout = setTimeout(() => {
-			input.waiters.heartbeatResolver = null;
-			input.waiters.heartbeatRejecter = null;
-			reject(new DaemonServiceRunError({
-				code: "daemon.run.heartbeat_timeout",
-				message: "heartbeat response timeout"
-			}));
-		}, input.timeoutMs);
-		input.waiters.heartbeatResolver = (payload) => {
-			clearTimeout(timeout);
-			input.waiters.heartbeatRejecter = null;
-			resolve(payload);
-		};
-		input.waiters.heartbeatRejecter = (error) => {
-			clearTimeout(timeout);
-			input.waiters.heartbeatResolver = null;
-			input.waiters.heartbeatRejecter = null;
-			reject(error);
-		};
-	});
-}
-function applyAcceptedLeases(input) {
-	input.leasesByProfileId.clear();
-	for (const lease of input.acceptedLeases) input.leasesByProfileId.set(lease.profileId, lease.leaseEpoch);
-}
-function pruneStaleLeases(input) {
-	for (const staleLease of input.staleLeases) if (input.leasesByProfileId.get(staleLease.profileId) === staleLease.leaseEpoch) input.leasesByProfileId.delete(staleLease.profileId);
-}
-function resolveAdaptiveHeartbeatIntervalMs(input) {
-	if (input.hasDispatchActivity) return MIN_HEARTBEAT_INTERVAL_MS;
-	const growthFactor = typeof input.growthFactor === "number" && Number.isFinite(input.growthFactor) ? input.growthFactor : ADAPTIVE_HEARTBEAT_GROWTH_FACTOR;
-	return clampInteger$1(input.currentIntervalMs * growthFactor, MIN_HEARTBEAT_INTERVAL_MS, MAX_HEARTBEAT_INTERVAL_MS);
-}
-function applyIntervalJitterMs(input) {
-	const jitterRatio = typeof input.jitterRatio === "number" && Number.isFinite(input.jitterRatio) ? Math.max(0, input.jitterRatio) : 0;
-	const jitterMultiplier = 1 + ((typeof input.randomValue === "number" && Number.isFinite(input.randomValue) ? Math.min(1, Math.max(0, input.randomValue)) : Math.random()) * 2 - 1) * jitterRatio;
-	return clampInteger$1(input.baseIntervalMs * jitterMultiplier, input.minIntervalMs, input.maxIntervalMs);
-}
-function resolveCatalogSyncIntervalMs(input) {
-	return clampInteger$1(input.heartbeatIntervalMs * CATALOG_SYNC_INTERVAL_MULTIPLIER, MIN_CATALOG_SYNC_INTERVAL_MS, MAX_CATALOG_SYNC_INTERVAL_MS);
-}
-
 //#endregion
 //#region src/daemon/routing/resolve-controller-support.ts
 async function readLocalEnabledControllers() {
@@ -27664,6 +27664,134 @@ function toErrorMessage$18(error) {
 	return String(error);
 }
 
+//#endregion
+//#region src/runtime/view-argv.ts
+const PASSIVE_CLI_QUERY_FLAGS = new Set([
+	"--help",
+	"--version",
+	"-V",
+	"-h"
+]);
+function isStandaloneViewQueryArgv(argv) {
+	const args = argv.slice(2);
+	return args.length === 1 && args[0] === "--view";
+}
+function parseViewFromArgv(argv, options) {
+	const allowMissingValue = options?.allowMissingValue === true;
+	for (let i = 2; i < argv.length; i += 1) {
+		const arg = argv[i];
+		if (typeof arg !== "string") continue;
+		if (arg === "--") break;
+		if (arg === "--view") {
+			const next = argv[i + 1];
+			if (typeof next !== "string" || next.startsWith("-")) {
+				if (allowMissingValue) return null;
+				throw new Error("missing --view value (use auto|human|agent)");
+			}
+			return parseCliViewMode(next);
+		}
+		if (arg.startsWith("--view=")) return parseCliViewMode(arg.slice(7));
+	}
+	return null;
+}
+function parseStandaloneViewSwitchArgv(argv) {
+	const args = argv.slice(2);
+	if (args.length === 0) return null;
+	let view = null;
+	for (let i = 0; i < args.length; i += 1) {
+		const arg = args[i];
+		if (typeof arg !== "string") continue;
+		if (arg === "--view") {
+			const next = args[i + 1];
+			if (typeof next !== "string" || next.startsWith("-")) return null;
+			view = next.trim().toLowerCase();
+			i += 1;
+			continue;
+		}
+		if (arg.startsWith("--view=")) {
+			view = arg.slice(7).trim().toLowerCase();
+			continue;
+		}
+		return null;
+	}
+	return view;
+}
+function parseFirstCommandTokenFromArgv(argv) {
+	return parseLeadingCommandTokensFromArgv(argv, 1)[0] ?? null;
+}
+function parseLeadingCommandTokensFromArgv(argv, maxTokens = 2) {
+	if (maxTokens <= 0) return [];
+	const args = argv.slice(2);
+	const tokens = [];
+	for (let i = 0; i < args.length; i += 1) {
+		if (collectTokensAfterTerminator(args, i, tokens, maxTokens)) return tokens;
+		if (shouldSkipKnownGlobalFlag(args, i)) {
+			i += 1;
+			continue;
+		}
+		const arg = args[i];
+		if (typeof arg !== "string" || shouldSkipInlineGlobalFlag(arg)) continue;
+		if (pushLeadingCommandToken(arg, tokens, maxTokens)) return tokens;
+	}
+	return tokens;
+}
+function isPassiveCliQueryArgv(argv) {
+	const args = argv.slice(2);
+	for (let i = 0; i < args.length; i += 1) {
+		const arg = args[i];
+		if (typeof arg !== "string") continue;
+		if (arg === "--") return false;
+		if (isKnownGlobalFlagExpectValue(arg) && isGlobalFlagValueCandidate(args[i + 1])) {
+			i += 1;
+			continue;
+		}
+		if (arg.startsWith("--view=") || arg.startsWith("--service-auto-install=")) continue;
+		if (arg === "help" || PASSIVE_CLI_QUERY_FLAGS.has(arg)) return true;
+	}
+	return false;
+}
+function hasJsonOutputArgv(argv) {
+	for (let i = 2; i < argv.length; i += 1) {
+		const arg = argv[i];
+		if (typeof arg !== "string") continue;
+		if (arg === "--") return false;
+		if (arg === "--json" || arg.startsWith("--json=")) return true;
+	}
+	return false;
+}
+function shouldUseAgentViewForNonInteractiveStart(argv, interactive) {
+	if (interactive) return false;
+	if (parseViewFromArgv(argv, { allowMissingValue: true }) !== null) return false;
+	return parseFirstCommandTokenFromArgv(argv) === "start";
+}
+function isKnownGlobalFlagExpectValue(value) {
+	return value === "--view" || value === "--service-auto-install";
+}
+function isGlobalFlagValueCandidate(value) {
+	return typeof value === "string" && value.length > 0 && !value.startsWith("-");
+}
+function collectTokensAfterTerminator(args, index, tokens, maxTokens) {
+	if (args[index] !== "--") return false;
+	for (let i = index + 1; i < args.length; i += 1) {
+		const next = args[i];
+		if (typeof next !== "string" || next.length === 0) continue;
+		tokens.push(next);
+		if (tokens.length >= maxTokens) break;
+	}
+	return true;
+}
+function shouldSkipKnownGlobalFlag(args, index) {
+	return isKnownGlobalFlagExpectValue(args[index] ?? "") && isGlobalFlagValueCandidate(args[index + 1]);
+}
+function shouldSkipInlineGlobalFlag(value) {
+	return value.startsWith("--view=") || value.startsWith("--service-auto-install=");
+}
+function pushLeadingCommandToken(value, tokens, maxTokens) {
+	if (value.startsWith("-")) return false;
+	tokens.push(value);
+	return tokens.length >= maxTokens;
+}
+
 //#endregion
 //#region src/command-entry-checks/build-agent-check-result.ts
 function buildAgentCheckResult(input) {
@@ -28440,6 +28568,7 @@ function resolveFreshCachedLatestVersion(input) {
 	return state.latest_version;
 }
 function shouldCheckNpmCliUpdate(context) {
+	if (hasJsonOutputArgv(context.argv)) return false;
 	return context.environmentTarget.preset === "prod" && context.environmentTarget.userFacingCommand === "ats";
 }
 
@@ -28448,7 +28577,7 @@ function shouldCheckNpmCliUpdate(context) {
 const ATS_ACCEPT_DISCLAIMER_ENV = "ATS_ACCEPT_DISCLAIMER";
 const ATS_ONBOARDING_DISCLAIMER_ACCEPT = "__onboarding_disclaimer_accept__";
 const ATS_ONBOARDING_DISCLAIMER_DECLINE = "__onboarding_disclaimer_decline__";
-const ATS_ONBOARDING_DISCLAIMER_TEXT = "ATSD is experimental and changes rapidly. Breaking changes may occur. You are fully responsible for data security and sensitive information handling. Use ATSD only in trusted environments.";
+const ATS_ONBOARDING_DISCLAIMER_TEXT = "ATS local service is experimental and changes rapidly. Breaking changes may occur. You are fully responsible for data security and sensitive information handling. Use ATS only in trusted environments.";
 async function runOnboardingDisclaimerGate(input) {
 	if (await getConfiguredOnboardingDisclaimerAcceptedAt().catch(() => null)) return true;
 	if (shouldBypassDisclaimerWithEnv()) {
@@ -34925,47 +35054,7 @@ function buildDaemonAgentOverviewPayload(command) {
 }
 
 //#endregion
-//#region src/transport/ws.ts
-async function connectWebSocket(url, input) {
-	return await new Promise((resolve, reject) => {
-		const ws = new WebSocket(url, { headers: input?.headers });
-		const closePromise = new Promise((r) => {
-			ws.on("close", () => r());
-			ws.on("error", () => r());
-		});
-		ws.on("open", () => {
-			resolve({
-				send: (data) => ws.send(data),
-				close: (code, reason) => ws.close(code, reason),
-				terminate: () => ws.terminate(),
-				onMessage: (handler) => {
-					ws.on("message", (buf) => handler(toUtf8(buf)));
-				},
-				onClose: (handler) => {
-					ws.on("close", (code, reason) => handler(code, reason.toString("utf8")));
-				},
-				onError: (handler) => {
-					ws.on("error", handler);
-				},
-				waitUntilClosed: async () => {
-					await closePromise;
-				}
-			});
-		});
-		ws.on("error", (err) => {
-			reject(err);
-		});
-	});
-}
-function toUtf8(value) {
-	if (typeof value === "string") return value;
-	if (value instanceof Buffer) return value.toString("utf8");
-	if (Array.isArray(value)) return Buffer.concat(value).toString("utf8");
-	return String(value);
-}
-
-//#endregion
-//#region ../../runtime/atsd/dist/adapter-routing.js
+//#region ../../runtime/local-execution/dist/adapter-routing.js
 const ADAPTER_ROUTE_ERROR_CODES = {
 	adapterUnreachable: "adapter.unreachable",
 	controllerRuntimeMissing: "controller.runtime.missing",
@@ -35085,7 +35174,7 @@ const isAgentControllerRefRegexMatched = (agentControllerRef, matcherValue) => {
 };
 
 //#endregion
-//#region ../../runtime/atsd/dist/agent-context-policy.js
+//#region ../../runtime/local-execution/dist/agent-context-policy.js
 const AGENT_CONTEXT_LOOKUP_KEY_SEPARATOR$1 = "|";
 const LEDGER_AGENT_CONTEXT_SOURCE_FIELD = "atsd.agent_context_ledger";
 const encodeLookupKeyPart = (value) => encodeURIComponent(value);
@@ -35285,7 +35374,7 @@ const resolveAgentContextForDispatch = (input) => {
 };
 
 //#endregion
-//#region ../../runtime/atsd/dist/control-plane.js
+//#region ../../runtime/local-execution/dist/control-plane.js
 function parseControlPlaneRequest(input) {
 	const parsed = atsdControlPlaneRequestSchema.safeParse(input);
 	if (!parsed.success) throw new Error("invalid daemon control-plane request");
@@ -35467,7 +35556,7 @@ function parseControlPlaneResponse(input) {
 }
 
 //#endregion
-//#region ../../runtime/atsd/dist/control-plane-auth.js
+//#region ../../runtime/local-execution/dist/control-plane-auth.js
 const verifyControlPlaneToken = (input) => input.providedToken === input.expectedToken;
 const buildAuthenticatedControlPlaneResponse = async (input) => {
 	const request = parseControlPlaneRequest(input.request);
@@ -35482,7 +35571,7 @@ const buildAuthenticatedControlPlaneResponse = async (input) => {
 };
 
 //#endregion
-//#region ../../runtime/atsd/dist/data-plane-contract.js
+//#region ../../runtime/local-execution/dist/data-plane-contract.js
 const buildIdempotencyKey = buildIdempotencyKey$1;
 const shouldDedupeWithinWindow = (input) => {
 	return shouldDedupeWithinWindow$1({
@@ -35496,7 +35585,7 @@ const shouldBypassDedupeForDeliveryRecoveryReason = (reason) => {
 };
 
 //#endregion
-//#region ../../runtime/atsd/dist/heartbeat-policy.js
+//#region ../../runtime/local-execution/dist/heartbeat-policy.js
 const HEARTBEAT_POLICY_DEFAULTS = {
 	watchdogTimeoutMs: 45e3,
 	heartbeatIdleIntervalMs: 6e4,
@@ -35513,7 +35602,7 @@ const HEARTBEAT_POLICY_DEFAULTS = {
 };
 
 //#endregion
-//#region ../../runtime/atsd/dist/ledger-store.js
+//#region ../../runtime/local-execution/dist/ledger-store.js
 const LEDGER_STATE_VERSION = 1;
 const LEDGER_STATE_INVALID_JSON_ERROR = "ledger.state.invalid_json";
 const LEDGER_STATE_SCHEMA_ERROR = "ledger.state.schema_invalid";
@@ -36080,7 +36169,7 @@ function resolveStoredAgentControllerRef(agentControllerRef) {
 }
 
 //#endregion
-//#region ../../runtime/atsd/dist/trigger-policy.js
+//#region ../../runtime/local-execution/dist/trigger-policy.js
 const shouldDispatchForMentionOnly = (input) => {
 	const triggerMode = input.triggerMode ?? LEGACY_RUNTIME_DISPATCH_POLICY;
 	if (triggerMode === "listen_all") return true;
@@ -36088,7 +36177,7 @@ const shouldDispatchForMentionOnly = (input) => {
 };
 
 //#endregion
-//#region ../../runtime/atsd/dist/mention-dispatch-integration.js
+//#region ../../runtime/local-execution/dist/mention-dispatch-integration.js
 const dispatchMentionOnlyTask = async (input) => {
 	if (!shouldDispatchForMentionOnly({
 		mentioned: input.mentioned,
@@ -36164,7 +36253,7 @@ const normalizeAgentControllerConversationId = (value) => {
 };
 
 //#endregion
-//#region ../../runtime/atsd/dist/recovery-policy.js
+//#region ../../runtime/local-execution/dist/recovery-policy.js
 const cloneLedgerState = (state) => ({
 	dedupeFirstSeenByKey: { ...state.dedupeFirstSeenByKey },
 	inflightByTaskId: Object.fromEntries(Object.entries(state.inflightByTaskId).map(([taskId, inflight]) => [taskId, { ...inflight }])),
@@ -36263,7 +36352,7 @@ const buildTaskResultPayloadFromOutcome = (input) => {
 };
 
 //#endregion
-//#region ../../runtime/atsd/dist/result-envelope.js
+//#region ../../runtime/local-execution/dist/result-envelope.js
 const buildTaskResultEnvelope = (payload) => {
 	const parsed = atsdTaskResultEnvelopeWriteSchema.safeParse({
 		v: ATSD_TASK_RESULT_SCHEMA_VERSION,
@@ -36275,14 +36364,14 @@ const buildTaskResultEnvelope = (payload) => {
 };
 
 //#endregion
-//#region ../../runtime/atsd/dist/runtime-health-contract.js
+//#region ../../runtime/local-execution/dist/runtime-health-contract.js
 const RUNTIME_HEALTH_SEVERITY = {
 	error: "error",
 	warn: "warn"
 };
 
 //#endregion
-//#region ../../runtime/atsd/dist/runtime-task-lifecycle-contract.js
+//#region ../../runtime/local-execution/dist/runtime-task-lifecycle-contract.js
 const RUNTIME_INFLIGHT_TASK_TRANSITION_MATRIX = {
 	trackNewInflightTask: {
 		kind: "track_new_inflight_task",
@@ -36343,7 +36432,7 @@ const resolveTaskResultTransitionForPayloadStatus = (input) => {
 const resolveRuntimeTaskResultDeliverySemantic = (input) => resolveTaskResultDeliverySemantic({ payloadStatus: input.payloadStatus });
 
 //#endregion
-//#region ../../runtime/atsd/dist/runtime-health-invariant-policy.js
+//#region ../../runtime/local-execution/dist/runtime-health-invariant-policy.js
 const normalizeHumanContext = (humanContext) => humanContext && Object.keys(humanContext).length > 0 ? humanContext : null;
 const buildRuntimeReplayStuckFinding = (input) => ({
 	reasonCode: "runtime.replay_stuck",
@@ -36389,7 +36478,7 @@ const resolveRuntimeResultMappingViolation = (input) => {
 };
 
 //#endregion
-//#region ../../runtime/atsd/dist/runtime-health-view.js
+//#region ../../runtime/local-execution/dist/runtime-health-view.js
 const emitRuntimeHealthFinding = (input) => {
 	emitHealthFinding({
 		eventName: input.eventName,
@@ -36399,7 +36488,7 @@ const emitRuntimeHealthFinding = (input) => {
 };
 
 //#endregion
-//#region ../../runtime/atsd/dist/runtime-workspace-fingerprint.js
+//#region ../../runtime/local-execution/dist/runtime-workspace-fingerprint.js
 const SHA256_PREFIX = "sha256:";
 function normalizeWorkspacePath(workspacePath) {
 	const trimmed = workspacePath.trim();
@@ -36412,7 +36501,7 @@ function buildRuntimeWorkspaceFingerprint(workspacePath) {
 }
 
 //#endregion
-//#region ../../runtime/atsd/dist/runtime-task-orchestrator.js
+//#region ../../runtime/local-execution/dist/runtime-task-orchestrator.js
 const mapAdapterErrorType = (errorType) => {
 	if (errorType === "adapter") return "adapter";
 	if (errorType === "auth") return "auth";
@@ -37988,494 +38077,275 @@ function buildDispatchCorrelation(input) {
 }
 
 //#endregion
-//#region src/local-service/dispatch/daemon-dispatch-journal.ts
-const DAEMON_DISPATCH_EVENT_TYPES = [
-	"dispatch.deliver.received",
-	"dispatch.local.phase",
-	"dispatch.lifecycle.sent",
-	"dispatch.lifecycle.send_failed",
-	"dispatch.result.queued",
-	"dispatch.result.sent",
-	"dispatch.result.send_failed",
-	"dispatch.result.accepted"
-];
-function emitDaemonDispatchJournalEvent(input) {
-	const event = {
-		schema: "ats-daemon-dispatch-event-v1",
-		v: 1,
-		type: input.type,
-		timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-		lane: resolveAtsEnvPreset(input.pathInput),
-		pid: process$1.pid,
-		sessionId: resolveCliContextId(),
-		attemptId: normalizeOptionalString$12(input.attemptId),
-		connectionGeneration: normalizeOptionalInteger(input.connectionGeneration),
-		daemonSessionId: normalizeOptionalString$12(input.daemonSessionId),
-		dispatchId: input.dispatchId,
-		leaseEpoch: normalizeOptionalInteger(input.leaseEpoch),
-		profileId: normalizeOptionalString$12(input.profileId),
-		result: normalizeOptionalString$12(input.result),
-		taskId: normalizeOptionalString$12(input.taskId),
-		...input.metadata ? { metadata: input.metadata } : {}
-	};
-	if (!isDaemonDispatchJournalEvent(event)) {
-		console.warn(`[ats:dispatch-journal] rejected invalid event ${input.type}`);
-		return;
-	}
-	try {
-		const journalPath = daemonDispatchJournalPath(input.pathInput);
-		mkdirSync(dirname(journalPath), { recursive: true });
-		appendFileSync(journalPath, `${JSON.stringify(event)}\n`, "utf8");
-	} catch (error) {
-		console.warn(`[ats:dispatch-journal] failed to append event ${input.type}: ${toJournalErrorMessage(error)}`);
-	}
-}
-function readRecentDaemonDispatchJournalEvents(input) {
-	const normalizedDispatchId = normalizeOptionalString$12(input.dispatchId);
-	if (!normalizedDispatchId) return [];
-	const limit = Math.max(1, Math.min(100, input.limit ?? 20));
-	const journalPath = daemonDispatchJournalPath(input.pathInput);
-	if (!existsSync(journalPath)) return [];
+//#region src/daemon/state/context-store.ts
+async function loadContextStore(contextStorePath) {
+	const raw = await readFile(contextStorePath, "utf8").catch(() => "");
+	if (!raw) return /* @__PURE__ */ new Map();
+	let parsed;
 	try {
-		return readFileSync(journalPath, "utf8").split("\n").reverse().flatMap((line) => {
-			const trimmed = line.trim();
-			if (!trimmed) return [];
-			try {
-				const parsed = JSON.parse(trimmed);
-				return isDaemonDispatchJournalEvent(parsed) && parsed.dispatchId === normalizedDispatchId ? [parsed] : [];
-			} catch {
-				return [];
-			}
-		}).slice(0, limit).reverse();
+		parsed = JSON.parse(raw);
 	} catch {
-		return [];
+		return /* @__PURE__ */ new Map();
 	}
+	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return /* @__PURE__ */ new Map();
+	const contextStore = /* @__PURE__ */ new Map();
+	for (const [key, value] of Object.entries(parsed)) {
+		const normalizedKey = normalizeOptionalText$50(key);
+		const normalizedValue = normalizeOptionalText$50(value);
+		if (!(normalizedKey && normalizedValue)) continue;
+		contextStore.set(normalizedKey, normalizedValue);
+	}
+	return contextStore;
 }
-function isDaemonDispatchJournalEvent(value) {
-	if (!value || typeof value !== "object") return false;
-	const candidate = value;
-	return candidate.schema === "ats-daemon-dispatch-event-v1" && candidate.v === 1 && DAEMON_DISPATCH_EVENT_TYPES.includes(candidate.type) && typeof candidate.timestamp === "string" && candidate.timestamp.length > 0 && typeof candidate.lane === "string" && candidate.lane.length > 0 && typeof candidate.pid === "number" && Number.isInteger(candidate.pid) && candidate.pid > 0 && (candidate.sessionId === null || typeof candidate.sessionId === "string" && candidate.sessionId.length > 0) && (candidate.attemptId === null || typeof candidate.attemptId === "string" && candidate.attemptId.length > 0) && (candidate.connectionGeneration === null || typeof candidate.connectionGeneration === "number" && Number.isInteger(candidate.connectionGeneration)) && (candidate.daemonSessionId === null || typeof candidate.daemonSessionId === "string" && candidate.daemonSessionId.length > 0) && typeof candidate.dispatchId === "string" && candidate.dispatchId.length > 0 && (candidate.leaseEpoch === null || typeof candidate.leaseEpoch === "number" && Number.isInteger(candidate.leaseEpoch)) && (candidate.profileId === null || typeof candidate.profileId === "string" && candidate.profileId.length > 0) && (candidate.result === null || typeof candidate.result === "string" && candidate.result.length > 0) && (candidate.taskId === null || typeof candidate.taskId === "string" && candidate.taskId.length > 0);
+
+//#endregion
+//#region src/daemon/state/daemon-runtime-state.ts
+function resolveDaemonRunMode$1(inputMode) {
+	if (process.env[DAEMON_SERVICE_RUNTIME_DETACHED_ENV] === "1") return "background";
+	const envMode = parseDaemonRunMode$1(process.env[DAEMON_SERVICE_RUNTIME_MODE_ENV]);
+	if (envMode) return envMode;
+	if (inputMode === "foreground") return "foreground";
+	return "background";
 }
-function normalizeOptionalString$12(value) {
-	const normalized = String(value ?? "").trim();
-	return normalized.length > 0 ? normalized : null;
+function parseDaemonRunMode$1(value) {
+	const normalized = normalizeText$9(value).toLowerCase();
+	if (normalized === "foreground" || normalized === "background") return normalized;
+	return null;
 }
-function normalizeOptionalInteger(value) {
-	if (typeof value !== "number") return null;
-	if (!Number.isInteger(value)) return null;
-	return value;
+function shouldPersistDaemonRuntimeState(input) {
+	if (input.forcePersist) return true;
+	if ("stopRequestedAt" in input.updates) return true;
+	return input.nowMs - input.lastPersistedAtMs >= RUNTIME_STATE_PERSIST_MIN_INTERVAL_MS;
 }
-function toJournalErrorMessage(error) {
-	return error instanceof Error ? error.message : String(error);
+function resolveReconnectBackoffMs(attempt) {
+	const next = DEFAULT_RECONNECT_DELAY_MS * 2 ** (Math.max(1, attempt) - 1);
+	return Math.min(MAX_RECONNECT_DELAY_MS, next);
+}
+function toDaemonStreamUrl(baseUrl) {
+	const url = new URL(baseUrl);
+	url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
+	url.pathname = "/v1/daemon/stream";
+	url.search = "";
+	url.hash = "";
+	return url.toString();
+}
+function buildDaemonProcessCommand() {
+	const script = normalizeText$9(process.argv[1]);
+	const args = process.argv.slice(2);
+	const values = script ? [script, ...args] : args;
+	if (values.length === 0) return process.execPath;
+	return `${process.execPath} ${values.join(" ")}`;
+}
+function createDaemonRuntimeState(input) {
+	return {
+		v: 1,
+		schema: DAEMON_SERVICE_RUNTIME_STATE_SCHEMA,
+		status: "running",
+		mode: input.mode,
+		pid: input.pid,
+		command: input.command,
+		gatewayUrl: input.gatewayUrl,
+		atsProfileId: input.atsProfileId,
+		workingDirectory: input.workingDirectory,
+		stopRequestedAt: input.stopRequestedAt,
+		startedAt: input.startedAt,
+		updatedAt: input.updatedAt,
+		heartbeatAt: input.heartbeatAt,
+		managedBySystemService: input.runtimeMetadata.managedBySystemService,
+		serviceController: input.runtimeMetadata.serviceController,
+		autoStart: input.runtimeMetadata.autoStart
+	};
 }
 
 //#endregion
-//#region src/local-service/execution/local-execution-slots.ts
-const LOCAL_EXECUTION_LANE_CONCURRENCY_LIMIT = 1;
-function createLocalExecutionSlots(input) {
-	const pendingTasks = [];
-	const activeCountByLaneKey = /* @__PURE__ */ new Map();
-	const ownedAttemptKeys = /* @__PURE__ */ new Set();
-	const ownedTaskIds = /* @__PURE__ */ new Map();
-	const drainWaiters = [];
-	let activeGlobal = 0;
-	const resolveActiveForLane = (localExecutionLaneKey) => {
-		return activeCountByLaneKey.get(localExecutionLaneKey) ?? 0;
-	};
-	const buildSnapshot = (localExecutionLaneKey) => {
-		return {
-			activeForLane: resolveActiveForLane(localExecutionLaneKey),
-			activeGlobal,
-			limits: input.limits,
-			queueDepth: pendingTasks.length
-		};
-	};
-	const resolveWaitReason = (inputWait) => {
-		if (activeGlobal >= input.limits.globalConcurrency) return "global_concurrency";
-		if (resolveActiveForLane(inputWait.localExecutionLaneKey) >= LOCAL_EXECUTION_LANE_CONCURRENCY_LIMIT) return "local_execution_lane_concurrency";
-		return "none";
-	};
-	const buildLocalQueueDiagnostics = (inputDiagnostics) => {
-		const waitReason = inputDiagnostics.waitReason ?? resolveWaitReason({ localExecutionLaneKey: inputDiagnostics.localExecutionLaneKey });
-		const status = inputDiagnostics.status ?? (waitReason === "none" ? "starting_runtime" : "queued");
-		return {
-			...buildSnapshot(inputDiagnostics.localExecutionLaneKey),
-			queuePosition: status === "queued" ? inputDiagnostics.queuePosition : null,
-			status,
-			waitReason
-		};
-	};
-	const buildTaskOwnerSnapshot = (owner) => {
-		return {
-			attemptId: owner.attemptId,
-			dispatchId: owner.dispatchId,
-			executionTokenRunId: owner.executionTokenRunId,
-			runtimeCoordinatorExecutionId: owner.runtimeCoordinatorExecutionId,
-			taskId: owner.taskId
-		};
-	};
-	const clearQueuedLifecycle = (pendingTask) => {
-		pendingTask.stopQueuedLifecycle?.();
-		pendingTask.stopQueuedLifecycle = null;
-	};
-	const releaseTaskOwnership = (task) => {
-		ownedAttemptKeys.delete(buildAttemptKey(task.dispatchId, task.attemptId));
-		const activeOwner = ownedTaskIds.get(task.taskId);
-		if (activeOwner && activeOwner.attemptId === task.attemptId && activeOwner.dispatchId === task.dispatchId) ownedTaskIds.delete(task.taskId);
-	};
-	const notifyDrainWaitersIfIdle = () => {
-		if (pendingTasks.length > 0 || activeGlobal > 0) return;
-		while (drainWaiters.length > 0) drainWaiters.shift()?.();
-	};
-	const pump = () => {
-		while (activeGlobal < input.limits.globalConcurrency) {
-			const nextTaskIndex = pendingTasks.findIndex((candidate) => {
-				return resolveActiveForLane(candidate.task.localExecutionLaneKey) < LOCAL_EXECUTION_LANE_CONCURRENCY_LIMIT;
-			});
-			if (nextTaskIndex < 0) break;
-			const selectedPendingTask = pendingTasks.splice(nextTaskIndex, 1)[0];
-			if (!selectedPendingTask) continue;
-			clearQueuedLifecycle(selectedPendingTask);
-			const selectedTask = selectedPendingTask.task;
-			activeGlobal += 1;
-			activeCountByLaneKey.set(selectedTask.localExecutionLaneKey, resolveActiveForLane(selectedTask.localExecutionLaneKey) + 1);
-			const startedEvent = {
-				adapterId: selectedTask.adapterId,
-				attemptId: selectedTask.attemptId,
-				controllerKey: selectedTask.controllerKey,
-				dispatchId: selectedTask.dispatchId,
-				localExecutionLaneKey: selectedTask.localExecutionLaneKey,
-				localQueue: buildLocalQueueDiagnostics({
-					localExecutionLaneKey: selectedTask.localExecutionLaneKey,
-					queuePosition: null,
-					status: "starting_runtime",
-					waitReason: "none"
-				}),
-				profileId: selectedTask.profileId,
-				spaceId: selectedTask.spaceId,
-				taskId: selectedTask.taskId,
-				targetLabel: selectedTask.targetLabel,
-				transportMode: selectedTask.transportMode,
-				...buildSnapshot(selectedTask.localExecutionLaneKey)
-			};
-			input.onTaskStarted?.(startedEvent);
-			const startedAtMs = Date.now();
-			Promise.resolve().then(async () => {
-				const completionResult = resolveTaskCompletionResult(await selectedTask.run());
-				input.onTaskCompleted?.({
-					adapterId: selectedTask.adapterId,
-					attemptId: selectedTask.attemptId,
-					...buildSnapshot(selectedTask.localExecutionLaneKey),
-					controllerKey: selectedTask.controllerKey,
-					dispatchId: selectedTask.dispatchId,
-					durationMs: Math.max(0, Date.now() - startedAtMs),
-					errorCode: completionResult.errorCode,
-					errorMessage: completionResult.errorMessage,
-					localExecutionLaneKey: selectedTask.localExecutionLaneKey,
-					localQueue: buildLocalQueueDiagnostics({
-						localExecutionLaneKey: selectedTask.localExecutionLaneKey,
-						queuePosition: null,
-						status: "starting_runtime",
-						waitReason: "none"
-					}),
-					profileId: selectedTask.profileId,
-					result: completionResult.result,
-					spaceId: selectedTask.spaceId,
-					taskId: selectedTask.taskId,
-					targetLabel: selectedTask.targetLabel,
-					transportMode: selectedTask.transportMode
-				});
-			}).catch((error) => {
-				input.onTaskCompleted?.({
-					adapterId: selectedTask.adapterId,
-					attemptId: selectedTask.attemptId,
-					...buildSnapshot(selectedTask.localExecutionLaneKey),
-					controllerKey: selectedTask.controllerKey,
-					dispatchId: selectedTask.dispatchId,
-					durationMs: Math.max(0, Date.now() - startedAtMs),
-					errorCode: null,
-					errorMessage: toErrorMessage$14(error),
-					localExecutionLaneKey: selectedTask.localExecutionLaneKey,
-					localQueue: buildLocalQueueDiagnostics({
-						localExecutionLaneKey: selectedTask.localExecutionLaneKey,
-						queuePosition: null,
-						status: "starting_runtime",
-						waitReason: "none"
-					}),
-					profileId: selectedTask.profileId,
-					result: "failed",
-					spaceId: selectedTask.spaceId,
-					taskId: selectedTask.taskId,
-					targetLabel: selectedTask.targetLabel,
-					transportMode: selectedTask.transportMode
-				});
-			}).finally(() => {
-				releaseTaskOwnership(selectedTask);
-				activeGlobal = Math.max(0, activeGlobal - 1);
-				const remainingActiveForLane = Math.max(0, resolveActiveForLane(selectedTask.localExecutionLaneKey) - 1);
-				if (remainingActiveForLane === 0) activeCountByLaneKey.delete(selectedTask.localExecutionLaneKey);
-				else activeCountByLaneKey.set(selectedTask.localExecutionLaneKey, remainingActiveForLane);
-				notifyDrainWaitersIfIdle();
-				pump();
-			});
-		}
-	};
-	return {
-		request(task) {
-			const attemptKey = buildAttemptKey(task.dispatchId, task.attemptId);
-			if (ownedAttemptKeys.has(attemptKey)) return {
-				accepted: true,
-				deduped: true,
-				snapshot: buildSnapshot(task.localExecutionLaneKey)
-			};
-			const activeOwner = ownedTaskIds.get(task.taskId);
-			if (activeOwner) return {
-				accepted: false,
-				activeOwner: buildTaskOwnerSnapshot(activeOwner),
-				reason: "task.owner_conflict",
-				snapshot: buildSnapshot(task.localExecutionLaneKey)
-			};
-			if (pendingTasks.length >= input.limits.queueMax) return {
-				accepted: false,
-				reason: "queue.full",
-				snapshot: buildSnapshot(task.localExecutionLaneKey)
-			};
-			ownedAttemptKeys.add(attemptKey);
-			ownedTaskIds.set(task.taskId, {
-				attemptId: task.attemptId,
-				dispatchId: task.dispatchId,
-				executionTokenRunId: task.executionTokenRunId ?? null,
-				runtimeCoordinatorExecutionId: task.runtimeCoordinatorExecutionId ?? null,
-				taskId: task.taskId
-			});
-			const pendingTask = {
-				stopQueuedLifecycle: null,
-				task
-			};
-			pendingTasks.push(pendingTask);
-			const snapshot = buildSnapshot(task.localExecutionLaneKey);
-			if (task.onQueued) try {
-				const queuePosition = pendingTasks.indexOf(pendingTask) + 1;
-				const stopQueuedLifecycle = task.onQueued({
-					adapterId: task.adapterId,
-					attemptId: task.attemptId,
-					controllerKey: task.controllerKey,
-					dispatchId: task.dispatchId,
-					localExecutionLaneKey: task.localExecutionLaneKey,
-					localQueue: buildLocalQueueDiagnostics({
-						localExecutionLaneKey: task.localExecutionLaneKey,
-						queuePosition
-					}),
-					profileId: task.profileId,
-					spaceId: task.spaceId,
-					taskId: task.taskId,
-					targetLabel: task.targetLabel,
-					transportMode: task.transportMode,
-					...snapshot
-				});
-				pendingTask.stopQueuedLifecycle = typeof stopQueuedLifecycle === "function" ? stopQueuedLifecycle : null;
-			} catch (error) {
-				pendingTasks.pop();
-				releaseTaskOwnership(task);
-				throw error;
-			}
-			pump();
-			return {
-				accepted: true,
-				deduped: false,
-				snapshot
-			};
-		},
-		dropPendingTasks(inputDrop) {
-			const reason = toPendingDropReason(inputDrop?.reason);
-			const shouldDrop = inputDrop?.shouldDrop ?? (() => true);
-			let droppedCount = 0;
-			for (let index = pendingTasks.length - 1; index >= 0; index -= 1) {
-				const pendingTask = pendingTasks[index];
-				if (!(pendingTask && shouldDrop(pendingTask.task))) continue;
-				pendingTasks.splice(index, 1);
-				clearQueuedLifecycle(pendingTask);
-				releaseTaskOwnership(pendingTask.task);
-				droppedCount += 1;
-				input.onTaskDropped?.({
-					adapterId: pendingTask.task.adapterId,
-					attemptId: pendingTask.task.attemptId,
-					controllerKey: pendingTask.task.controllerKey,
-					dispatchId: pendingTask.task.dispatchId,
-					localExecutionLaneKey: pendingTask.task.localExecutionLaneKey,
-					localQueue: buildLocalQueueDiagnostics({
-						localExecutionLaneKey: pendingTask.task.localExecutionLaneKey,
-						queuePosition: null,
-						status: "queued"
-					}),
-					profileId: pendingTask.task.profileId,
-					reason,
-					spaceId: pendingTask.task.spaceId,
-					taskId: pendingTask.task.taskId,
-					targetLabel: pendingTask.task.targetLabel,
-					transportMode: pendingTask.task.transportMode,
-					...buildSnapshot(pendingTask.task.profileId)
-				});
-			}
-			notifyDrainWaitersIfIdle();
-			return { droppedCount };
-		},
-		drain() {
-			if (pendingTasks.length === 0 && activeGlobal === 0) return Promise.resolve();
-			return new Promise((resolve) => {
-				drainWaiters.push(resolve);
-			});
-		},
-		getDrainState() {
-			return {
-				activeGlobal,
-				pendingCount: pendingTasks.length
-			};
-		},
-		getSnapshot(localExecutionLaneKey) {
-			return buildSnapshot(localExecutionLaneKey);
-		}
+//#region src/daemon/state/route-catalog-cache.ts
+const ROUTE_CATALOG_CACHE_FILE = "route-catalog-cache.json";
+async function readDaemonRouteCatalogCache(input) {
+	const lane = normalizeCacheLane(input.lane);
+	const ownerUserId = normalizeCacheIdentityField(input.ownerUserId);
+	const serviceBundleId = normalizeServiceBundleId(input.serviceBundleId);
+	if (!(lane && ownerUserId && serviceBundleId)) return null;
+	const cached = await readDaemonLocalStateFile({
+		path: daemonRouteCatalogCachePath(),
+		schema: daemonRouteCatalogCacheSchema
+	});
+	if (!cached || cached.ownerUserId !== ownerUserId || cached.lane !== lane || cached.serviceBundleId !== serviceBundleId) return null;
+	return deserializeRouteCatalog(cached);
+}
+async function writeDaemonRouteCatalogCache(input) {
+	const lane = normalizeCacheLane(input.lane);
+	const ownerUserId = normalizeCacheIdentityField(input.ownerUserId);
+	const serviceBundleId = normalizeServiceBundleId(input.serviceBundleId);
+	if (!(lane && ownerUserId && serviceBundleId)) return;
+	if (input.routeCatalog.profileIds.length === 0) {
+		await clearDaemonRouteCatalogCache();
+		return;
+	}
+	const value = {
+		v: DAEMON_ROUTE_CATALOG_CACHE_SCHEMA_VERSION,
+		schema: DAEMON_ROUTE_CATALOG_CACHE_SCHEMA_NAME,
+		cachedAt: (/* @__PURE__ */ new Date()).toISOString(),
+		runtimeContractEpoch: CURRENT_DAEMON_EXECUTION_CONTRACT_EPOCH,
+		ownerUserId,
+		lane,
+		serviceBundleId,
+		profileIds: [...input.routeCatalog.profileIds],
+		routes: input.routeCatalog.profileIds.map((profileId) => {
+			const route = input.routeCatalog.routeByProfileId.get(profileId);
+			if (!route) throw new Error(`route catalog is missing route for ${profileId}`);
+			return serializeRouteConfig(route);
+		}),
+		skippedProfiles: [...input.routeCatalog.skippedProfiles]
 	};
+	await writeDaemonLocalStateFile({
+		path: daemonRouteCatalogCachePath(),
+		schema: daemonRouteCatalogCacheSchema,
+		value,
+		mode: 384
+	});
 }
-function buildAttemptKey(dispatchId, attemptId) {
-	return `${dispatchId}::${attemptId}`;
+async function clearDaemonRouteCatalogCache() {
+	await rm(daemonRouteCatalogCachePath(), { force: true });
 }
-function toErrorMessage$14(error) {
-	if (error instanceof Error && error.message.trim().length > 0) return error.message;
-	if (typeof error === "string" && error.trim().length > 0) return error;
-	return "unknown error";
+function daemonRouteCatalogCachePath() {
+	return join(daemonRuntimeDataPath(), ROUTE_CATALOG_CACHE_FILE);
 }
-function resolveTaskCompletionResult(result) {
-	if (!result || typeof result !== "object") return {
-		errorCode: null,
-		errorMessage: null,
-		result: "success"
-	};
-	const normalizedResult = result.result === "failed" || result.result === "partial_success" || result.result === "success" ? result.result : "success";
-	return {
-		errorCode: toOptionalText(result.errorCode),
-		errorMessage: toOptionalText(result.errorMessage),
-		result: normalizedResult
-	};
+function normalizeServiceBundleId(value) {
+	return String(value ?? "").trim();
 }
-function toOptionalText(value) {
-	if (typeof value !== "string") return null;
-	const normalized = value.trim();
-	return normalized.length > 0 ? normalized : null;
+function normalizeCacheIdentityField(value) {
+	return String(value ?? "").trim();
 }
-function toPendingDropReason(value) {
-	if (typeof value !== "string") return "queue.drop";
-	const normalized = value.trim();
-	return normalized.length > 0 ? normalized : "queue.drop";
+function normalizeCacheLane(value) {
+	const parsed = daemonServiceLaneSchema.safeParse(normalizeCacheIdentityField(value));
+	return parsed.success ? parsed.data : null;
 }
-
-//#endregion
-//#region src/local-service/inventory/agent-controller-inventory.ts
-async function collectLocalAgentControllerInventory(input = {}) {
-	return { capabilities: (await listAgentTargetStates()).filter((state) => state.targetKind === "builtin").map((state) => resolveLocalAgentControllerInventoryItem({
-		localAdapterContainer: input.localAdapterContainer,
-		state
-	})) };
+function serializeRouteConfig(route) {
+	return {
+		agentControllerRef: route.agentControllerRef,
+		contextIdMappingSpec: route.contextIdMappingSpec,
+		...route.launchContract ? { launchContract: route.launchContract } : {},
+		profileId: route.profileId,
+		streamingMode: route.streamingMode,
+		transportMode: route.transportMode
+	};
 }
-function resolveLocalAgentControllerInventoryItem(input) {
-	const agentControllerRef = buildAgentControllerRef({
-		kind: "builtin",
-		id: input.state.agentId
-	});
-	const adapterSupport = input.localAdapterContainer ? resolveLocalRuntimeControllerSupport({
-		agentControllerRef,
-		localAdapterContainer: input.localAdapterContainer
-	}) : null;
-	const launchStatus = input.state.launchStatus ?? (input.state.selectable ? "ready" : "not_available");
-	const launchability = resolveLocalAgentControllerLaunchability({
-		adapterSupported: adapterSupport?.supported ?? true,
-		detected: input.state.detected,
-		launchStatus,
-		runtimeSupported: input.state.runtimeSupported,
-		selectable: input.state.selectable,
-		selectableReason: input.state.selectableReason
+function deserializeRouteCatalog(cache) {
+	const routeByProfileId = /* @__PURE__ */ new Map();
+	for (const route of cache.routes) routeByProfileId.set(route.profileId, {
+		agentControllerRef: route.agentControllerRef,
+		contextIdMappingSpec: route.contextIdMappingSpec,
+		...route.launchContract ? { launchContract: route.launchContract } : {},
+		profileId: route.profileId,
+		streamingMode: route.streamingMode,
+		transportMode: route.transportMode
 	});
 	return {
-		agentId: input.state.agentId,
-		blockerReasonCodes: resolveLocalAgentControllerBlockerReasonCodes({
-			launchability,
-			selectableReason: input.state.selectableReason
-		}),
-		agentControllerRef,
-		detected: input.state.detected,
-		displayName: input.state.displayName,
-		enabled: input.state.enabled,
-		launchability,
-		launchStatus,
-		launchStatusDetail: input.state.launchStatusDetail ?? null,
-		registered: input.state.registered,
-		selectable: input.state.selectable,
-		selectableReason: input.state.selectableReason
+		profileIds: [...cache.profileIds],
+		routeByProfileId,
+		skippedProfiles: [...cache.skippedProfiles]
 	};
 }
-function resolveLocalAgentControllerReportDecision(capability, input) {
-	if (input.requireEnabled && !capability.enabled) return {
-		localParticipationState: "needs_agent_prepare",
-		reasonCodes: ["local_agent_preparation.not_enabled"]
-	};
-	if (capability.launchability !== "launchable" || !capability.selectable) return {
-		localParticipationState: "needs_agent_prepare",
-		reasonCodes: capability.blockerReasonCodes.length > 0 ? capability.blockerReasonCodes : [capability.selectableReason ? `local_agent_preparation.${capability.selectableReason}` : "local_agent_preparation.not_selectable"]
+
+//#endregion
+//#region src/daemon/state/runtime-state-tracker.ts
+function createDaemonRuntimeStateTracker(input) {
+	let runtimeState = input.initialState;
+	let lastRuntimeStatePersistAtMs = Date.now();
+	const touchRuntimeState = async (updates, options) => {
+		const nowAt = nowIsoString();
+		runtimeState = {
+			...runtimeState,
+			...updates,
+			updatedAt: updates.updatedAt ?? nowAt
+		};
+		if (!shouldPersistDaemonRuntimeState({
+			forcePersist: options?.forcePersist === true,
+			nowMs: Date.now(),
+			lastPersistedAtMs: lastRuntimeStatePersistAtMs,
+			updates
+		})) return;
+		await setDaemonServiceRuntimeState(runtimeState);
+		if (input.leaseDescriptor) await writeDaemonRuntimeLease(buildDaemonRuntimeLease({
+			descriptor: input.leaseDescriptor,
+			runtimeState
+		}));
+		lastRuntimeStatePersistAtMs = Date.now();
 	};
 	return {
-		localParticipationState: "ready",
-		reasonCodes: []
+		getRuntimeState: () => runtimeState,
+		touchRuntimeState
 	};
 }
-function resolveLocalAgentControllerLaunchability(input) {
-	if (!input.detected) return "not_detected";
-	if (!input.runtimeSupported || input.selectableReason === "not_supported_yet") return "not_supported";
-	if (input.launchStatus === "needs_choice") return "needs_choice";
-	if (input.launchStatus === "needs_repair") return "needs_repair";
-	if (input.launchStatus === "ready" && input.selectable && input.adapterSupported !== false) return "launchable";
-	return "blocked";
+async function resolveDaemonRuntimeLeaseDescriptor(input) {
+	const [contract, activeBundle] = await Promise.all([readDaemonServiceContract().catch(() => null), readDaemonActiveBundleState().catch(() => null)]);
+	if (contract) return {
+		generation: contract.generation,
+		bundleId: contract.bundleId
+	};
+	const activeBundleEntryPath = await resolveDaemonBundleEntryPathFromState(activeBundle).catch(() => null);
+	const commandEntryPath = extractDaemonCommandEntryPath(input.command);
+	const bundleId = (commandEntryPath ? resolveDaemonBundleIdFromEntryPath(commandEntryPath) : null) ?? (activeBundleEntryPath ? resolveDaemonBundleIdFromEntryPath(activeBundleEntryPath) : null) ?? activeBundle?.bundleId ?? null;
+	if (!bundleId) return null;
+	return {
+		generation: 0,
+		bundleId
+	};
 }
-function resolveLocalAgentControllerBlockerReasonCodes(input) {
-	if (input.launchability === "launchable") return [];
-	if (input.launchability === "needs_choice") return ["controller.launch.choice_required"];
-	if (input.launchability === "needs_repair") return ["controller.launch.needs_repair"];
-	if (input.launchability === "not_detected") return ["local_agent_preparation.not_detected"];
-	if (input.launchability === "not_supported") return ["local_agent_preparation.not_supported_yet"];
-	if (input.selectableReason) return [`local_agent_preparation.${input.selectableReason}`];
-	return ["local_agent_preparation.not_enabled"];
+function buildDaemonRuntimeLease(input) {
+	return {
+		schema: "ats-daemon-runtime-lease-v1",
+		v: 1,
+		generation: input.descriptor.generation,
+		bundleId: input.descriptor.bundleId,
+		pid: input.runtimeState.pid,
+		mode: input.runtimeState.mode,
+		startedAt: input.runtimeState.startedAt,
+		updatedAt: input.runtimeState.updatedAt,
+		heartbeatAt: input.runtimeState.heartbeatAt,
+		serviceController: input.runtimeState.serviceController,
+		managedBySystemService: input.runtimeState.managedBySystemService
+	};
 }
 
 //#endregion
-//#region src/local-service/reporting/runtime-agent-controller-report-sync.ts
-async function syncLocalServiceRuntimeAgentControllerReports(input) {
-	const reports = (await collectLocalAgentControllerInventory({ localAdapterContainer: input.localAdapterContainer })).capabilities.filter((capability) => capability.registered).map((capability) => {
-		if (!capability.agentControllerRef) return null;
-		const reportDecision = resolveLocalAgentControllerReportDecision(capability, { requireEnabled: true });
-		return {
-			agentControllerRef: capability.agentControllerRef,
-			localParticipationState: reportDecision.localParticipationState,
-			reasonCodes: reportDecision.reasonCodes
-		};
-	}).filter((report) => report !== null);
-	if (reports.length === 0) return {
-		status: "skipped",
-		reasonCodes: ["runtime.agent_controller_report.no_local_controllers"],
-		reportCount: 0,
-		submittedCount: 0,
-		failedCount: 0
-	};
-	return summarizeSubmissions(await submitRuntimeAgentControllerReports({ reports }));
+//#region src/transport/ws.ts
+async function connectWebSocket(url, input) {
+	return await new Promise((resolve, reject) => {
+		const ws = new WebSocket(url, { headers: input?.headers });
+		const closePromise = new Promise((r) => {
+			ws.on("close", () => r());
+			ws.on("error", () => r());
+		});
+		ws.on("open", () => {
+			resolve({
+				send: (data) => ws.send(data),
+				close: (code, reason) => ws.close(code, reason),
+				terminate: () => ws.terminate(),
+				onMessage: (handler) => {
+					ws.on("message", (buf) => handler(toUtf8(buf)));
+				},
+				onClose: (handler) => {
+					ws.on("close", (code, reason) => handler(code, reason.toString("utf8")));
+				},
+				onError: (handler) => {
+					ws.on("error", handler);
+				},
+				waitUntilClosed: async () => {
+					await closePromise;
+				}
+			});
+		});
+		ws.on("error", (err) => {
+			reject(err);
+		});
+	});
 }
-function summarizeSubmissions(submissions) {
-	const submittedCount = submissions.filter((submission) => submission.status === "submitted" && submission.agentControllerReportStatus === "accepted").length;
-	const failedCount = submissions.length - submittedCount;
-	return {
-		status: "submitted",
-		reasonCodes: [...new Set(submissions.flatMap((submission) => submission.reasonCodes).filter((reasonCode) => reasonCode.trim()))],
-		reportCount: submissions.length,
-		submittedCount,
-		failedCount
-	};
+function toUtf8(value) {
+	if (typeof value === "string") return value;
+	if (value instanceof Buffer) return value.toString("utf8");
+	if (Array.isArray(value)) return Buffer.concat(value).toString("utf8");
+	return String(value);
 }
 
 //#endregion
@@ -38486,6 +38356,88 @@ function resolveDaemonCapabilities(input) {
 	return { runtimeAdapters };
 }
 
+//#endregion
+//#region src/local-service/dispatch/daemon-dispatch-journal.ts
+const DAEMON_DISPATCH_EVENT_TYPES = [
+	"dispatch.deliver.received",
+	"dispatch.local.phase",
+	"dispatch.lifecycle.sent",
+	"dispatch.lifecycle.send_failed",
+	"dispatch.result.queued",
+	"dispatch.result.sent",
+	"dispatch.result.send_failed",
+	"dispatch.result.accepted"
+];
+function emitDaemonDispatchJournalEvent(input) {
+	const event = {
+		schema: "ats-daemon-dispatch-event-v1",
+		v: 1,
+		type: input.type,
+		timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+		lane: resolveAtsEnvPreset(input.pathInput),
+		pid: process$1.pid,
+		sessionId: resolveCliContextId(),
+		attemptId: normalizeOptionalString$12(input.attemptId),
+		connectionGeneration: normalizeOptionalInteger(input.connectionGeneration),
+		daemonSessionId: normalizeOptionalString$12(input.daemonSessionId),
+		dispatchId: input.dispatchId,
+		leaseEpoch: normalizeOptionalInteger(input.leaseEpoch),
+		profileId: normalizeOptionalString$12(input.profileId),
+		result: normalizeOptionalString$12(input.result),
+		taskId: normalizeOptionalString$12(input.taskId),
+		...input.metadata ? { metadata: input.metadata } : {}
+	};
+	if (!isDaemonDispatchJournalEvent(event)) {
+		console.warn(`[ats:dispatch-journal] rejected invalid event ${input.type}`);
+		return;
+	}
+	try {
+		const journalPath = daemonDispatchJournalPath(input.pathInput);
+		mkdirSync(dirname(journalPath), { recursive: true });
+		appendFileSync(journalPath, `${JSON.stringify(event)}\n`, "utf8");
+	} catch (error) {
+		console.warn(`[ats:dispatch-journal] failed to append event ${input.type}: ${toJournalErrorMessage(error)}`);
+	}
+}
+function readRecentDaemonDispatchJournalEvents(input) {
+	const normalizedDispatchId = normalizeOptionalString$12(input.dispatchId);
+	if (!normalizedDispatchId) return [];
+	const limit = Math.max(1, Math.min(100, input.limit ?? 20));
+	const journalPath = daemonDispatchJournalPath(input.pathInput);
+	if (!existsSync(journalPath)) return [];
+	try {
+		return readFileSync(journalPath, "utf8").split("\n").reverse().flatMap((line) => {
+			const trimmed = line.trim();
+			if (!trimmed) return [];
+			try {
+				const parsed = JSON.parse(trimmed);
+				return isDaemonDispatchJournalEvent(parsed) && parsed.dispatchId === normalizedDispatchId ? [parsed] : [];
+			} catch {
+				return [];
+			}
+		}).slice(0, limit).reverse();
+	} catch {
+		return [];
+	}
+}
+function isDaemonDispatchJournalEvent(value) {
+	if (!value || typeof value !== "object") return false;
+	const candidate = value;
+	return candidate.schema === "ats-daemon-dispatch-event-v1" && candidate.v === 1 && DAEMON_DISPATCH_EVENT_TYPES.includes(candidate.type) && typeof candidate.timestamp === "string" && candidate.timestamp.length > 0 && typeof candidate.lane === "string" && candidate.lane.length > 0 && typeof candidate.pid === "number" && Number.isInteger(candidate.pid) && candidate.pid > 0 && (candidate.sessionId === null || typeof candidate.sessionId === "string" && candidate.sessionId.length > 0) && (candidate.attemptId === null || typeof candidate.attemptId === "string" && candidate.attemptId.length > 0) && (candidate.connectionGeneration === null || typeof candidate.connectionGeneration === "number" && Number.isInteger(candidate.connectionGeneration)) && (candidate.daemonSessionId === null || typeof candidate.daemonSessionId === "string" && candidate.daemonSessionId.length > 0) && typeof candidate.dispatchId === "string" && candidate.dispatchId.length > 0 && (candidate.leaseEpoch === null || typeof candidate.leaseEpoch === "number" && Number.isInteger(candidate.leaseEpoch)) && (candidate.profileId === null || typeof candidate.profileId === "string" && candidate.profileId.length > 0) && (candidate.result === null || typeof candidate.result === "string" && candidate.result.length > 0) && (candidate.taskId === null || typeof candidate.taskId === "string" && candidate.taskId.length > 0);
+}
+function normalizeOptionalString$12(value) {
+	const normalized = String(value ?? "").trim();
+	return normalized.length > 0 ? normalized : null;
+}
+function normalizeOptionalInteger(value) {
+	if (typeof value !== "number") return null;
+	if (!Number.isInteger(value)) return null;
+	return value;
+}
+function toJournalErrorMessage(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+
 //#endregion
 //#region src/daemon/dispatch/send-dispatch-result.ts
 function sendDispatchResultEnvelopeFrame(input) {
@@ -38905,7 +38857,416 @@ const isDispatchResultOutboxRecord = (value) => {
 };
 
 //#endregion
-//#region src/daemon/session/catalog-sync-skipped-profiles.ts
+//#region src/local-service/execution/local-execution-slots.ts
+const LOCAL_EXECUTION_LANE_CONCURRENCY_LIMIT = 1;
+function createLocalExecutionSlots(input) {
+	const pendingTasks = [];
+	const activeCountByLaneKey = /* @__PURE__ */ new Map();
+	const ownedAttemptKeys = /* @__PURE__ */ new Set();
+	const ownedTaskIds = /* @__PURE__ */ new Map();
+	const drainWaiters = [];
+	let activeGlobal = 0;
+	const resolveActiveForLane = (localExecutionLaneKey) => {
+		return activeCountByLaneKey.get(localExecutionLaneKey) ?? 0;
+	};
+	const buildSnapshot = (localExecutionLaneKey) => {
+		return {
+			activeForLane: resolveActiveForLane(localExecutionLaneKey),
+			activeGlobal,
+			limits: input.limits,
+			queueDepth: pendingTasks.length
+		};
+	};
+	const resolveWaitReason = (inputWait) => {
+		if (activeGlobal >= input.limits.globalConcurrency) return "global_concurrency";
+		if (resolveActiveForLane(inputWait.localExecutionLaneKey) >= LOCAL_EXECUTION_LANE_CONCURRENCY_LIMIT) return "local_execution_lane_concurrency";
+		return "none";
+	};
+	const buildLocalQueueDiagnostics = (inputDiagnostics) => {
+		const waitReason = inputDiagnostics.waitReason ?? resolveWaitReason({ localExecutionLaneKey: inputDiagnostics.localExecutionLaneKey });
+		const status = inputDiagnostics.status ?? (waitReason === "none" ? "starting_runtime" : "queued");
+		return {
+			...buildSnapshot(inputDiagnostics.localExecutionLaneKey),
+			queuePosition: status === "queued" ? inputDiagnostics.queuePosition : null,
+			status,
+			waitReason
+		};
+	};
+	const buildTaskOwnerSnapshot = (owner) => {
+		return {
+			attemptId: owner.attemptId,
+			dispatchId: owner.dispatchId,
+			executionTokenRunId: owner.executionTokenRunId,
+			runtimeCoordinatorExecutionId: owner.runtimeCoordinatorExecutionId,
+			taskId: owner.taskId
+		};
+	};
+	const clearQueuedLifecycle = (pendingTask) => {
+		pendingTask.stopQueuedLifecycle?.();
+		pendingTask.stopQueuedLifecycle = null;
+	};
+	const releaseTaskOwnership = (task) => {
+		ownedAttemptKeys.delete(buildAttemptKey(task.dispatchId, task.attemptId));
+		const activeOwner = ownedTaskIds.get(task.taskId);
+		if (activeOwner && activeOwner.attemptId === task.attemptId && activeOwner.dispatchId === task.dispatchId) ownedTaskIds.delete(task.taskId);
+	};
+	const notifyDrainWaitersIfIdle = () => {
+		if (pendingTasks.length > 0 || activeGlobal > 0) return;
+		while (drainWaiters.length > 0) drainWaiters.shift()?.();
+	};
+	const pump = () => {
+		while (activeGlobal < input.limits.globalConcurrency) {
+			const nextTaskIndex = pendingTasks.findIndex((candidate) => {
+				return resolveActiveForLane(candidate.task.localExecutionLaneKey) < LOCAL_EXECUTION_LANE_CONCURRENCY_LIMIT;
+			});
+			if (nextTaskIndex < 0) break;
+			const selectedPendingTask = pendingTasks.splice(nextTaskIndex, 1)[0];
+			if (!selectedPendingTask) continue;
+			clearQueuedLifecycle(selectedPendingTask);
+			const selectedTask = selectedPendingTask.task;
+			activeGlobal += 1;
+			activeCountByLaneKey.set(selectedTask.localExecutionLaneKey, resolveActiveForLane(selectedTask.localExecutionLaneKey) + 1);
+			const startedEvent = {
+				adapterId: selectedTask.adapterId,
+				attemptId: selectedTask.attemptId,
+				controllerKey: selectedTask.controllerKey,
+				dispatchId: selectedTask.dispatchId,
+				localExecutionLaneKey: selectedTask.localExecutionLaneKey,
+				localQueue: buildLocalQueueDiagnostics({
+					localExecutionLaneKey: selectedTask.localExecutionLaneKey,
+					queuePosition: null,
+					status: "starting_runtime",
+					waitReason: "none"
+				}),
+				profileId: selectedTask.profileId,
+				spaceId: selectedTask.spaceId,
+				taskId: selectedTask.taskId,
+				targetLabel: selectedTask.targetLabel,
+				transportMode: selectedTask.transportMode,
+				...buildSnapshot(selectedTask.localExecutionLaneKey)
+			};
+			input.onTaskStarted?.(startedEvent);
+			const startedAtMs = Date.now();
+			Promise.resolve().then(async () => {
+				const completionResult = resolveTaskCompletionResult(await selectedTask.run());
+				input.onTaskCompleted?.({
+					adapterId: selectedTask.adapterId,
+					attemptId: selectedTask.attemptId,
+					...buildSnapshot(selectedTask.localExecutionLaneKey),
+					controllerKey: selectedTask.controllerKey,
+					dispatchId: selectedTask.dispatchId,
+					durationMs: Math.max(0, Date.now() - startedAtMs),
+					errorCode: completionResult.errorCode,
+					errorMessage: completionResult.errorMessage,
+					localExecutionLaneKey: selectedTask.localExecutionLaneKey,
+					localQueue: buildLocalQueueDiagnostics({
+						localExecutionLaneKey: selectedTask.localExecutionLaneKey,
+						queuePosition: null,
+						status: "starting_runtime",
+						waitReason: "none"
+					}),
+					profileId: selectedTask.profileId,
+					result: completionResult.result,
+					spaceId: selectedTask.spaceId,
+					taskId: selectedTask.taskId,
+					targetLabel: selectedTask.targetLabel,
+					transportMode: selectedTask.transportMode
+				});
+			}).catch((error) => {
+				input.onTaskCompleted?.({
+					adapterId: selectedTask.adapterId,
+					attemptId: selectedTask.attemptId,
+					...buildSnapshot(selectedTask.localExecutionLaneKey),
+					controllerKey: selectedTask.controllerKey,
+					dispatchId: selectedTask.dispatchId,
+					durationMs: Math.max(0, Date.now() - startedAtMs),
+					errorCode: null,
+					errorMessage: toErrorMessage$14(error),
+					localExecutionLaneKey: selectedTask.localExecutionLaneKey,
+					localQueue: buildLocalQueueDiagnostics({
+						localExecutionLaneKey: selectedTask.localExecutionLaneKey,
+						queuePosition: null,
+						status: "starting_runtime",
+						waitReason: "none"
+					}),
+					profileId: selectedTask.profileId,
+					result: "failed",
+					spaceId: selectedTask.spaceId,
+					taskId: selectedTask.taskId,
+					targetLabel: selectedTask.targetLabel,
+					transportMode: selectedTask.transportMode
+				});
+			}).finally(() => {
+				releaseTaskOwnership(selectedTask);
+				activeGlobal = Math.max(0, activeGlobal - 1);
+				const remainingActiveForLane = Math.max(0, resolveActiveForLane(selectedTask.localExecutionLaneKey) - 1);
+				if (remainingActiveForLane === 0) activeCountByLaneKey.delete(selectedTask.localExecutionLaneKey);
+				else activeCountByLaneKey.set(selectedTask.localExecutionLaneKey, remainingActiveForLane);
+				notifyDrainWaitersIfIdle();
+				pump();
+			});
+		}
+	};
+	return {
+		request(task) {
+			const attemptKey = buildAttemptKey(task.dispatchId, task.attemptId);
+			if (ownedAttemptKeys.has(attemptKey)) return {
+				accepted: true,
+				deduped: true,
+				snapshot: buildSnapshot(task.localExecutionLaneKey)
+			};
+			const activeOwner = ownedTaskIds.get(task.taskId);
+			if (activeOwner) return {
+				accepted: false,
+				activeOwner: buildTaskOwnerSnapshot(activeOwner),
+				reason: "task.owner_conflict",
+				snapshot: buildSnapshot(task.localExecutionLaneKey)
+			};
+			if (pendingTasks.length >= input.limits.queueMax) return {
+				accepted: false,
+				reason: "queue.full",
+				snapshot: buildSnapshot(task.localExecutionLaneKey)
+			};
+			ownedAttemptKeys.add(attemptKey);
+			ownedTaskIds.set(task.taskId, {
+				attemptId: task.attemptId,
+				dispatchId: task.dispatchId,
+				executionTokenRunId: task.executionTokenRunId ?? null,
+				runtimeCoordinatorExecutionId: task.runtimeCoordinatorExecutionId ?? null,
+				taskId: task.taskId
+			});
+			const pendingTask = {
+				stopQueuedLifecycle: null,
+				task
+			};
+			pendingTasks.push(pendingTask);
+			const snapshot = buildSnapshot(task.localExecutionLaneKey);
+			if (task.onQueued) try {
+				const queuePosition = pendingTasks.indexOf(pendingTask) + 1;
+				const stopQueuedLifecycle = task.onQueued({
+					adapterId: task.adapterId,
+					attemptId: task.attemptId,
+					controllerKey: task.controllerKey,
+					dispatchId: task.dispatchId,
+					localExecutionLaneKey: task.localExecutionLaneKey,
+					localQueue: buildLocalQueueDiagnostics({
+						localExecutionLaneKey: task.localExecutionLaneKey,
+						queuePosition
+					}),
+					profileId: task.profileId,
+					spaceId: task.spaceId,
+					taskId: task.taskId,
+					targetLabel: task.targetLabel,
+					transportMode: task.transportMode,
+					...snapshot
+				});
+				pendingTask.stopQueuedLifecycle = typeof stopQueuedLifecycle === "function" ? stopQueuedLifecycle : null;
+			} catch (error) {
+				pendingTasks.pop();
+				releaseTaskOwnership(task);
+				throw error;
+			}
+			pump();
+			return {
+				accepted: true,
+				deduped: false,
+				snapshot
+			};
+		},
+		dropPendingTasks(inputDrop) {
+			const reason = toPendingDropReason(inputDrop?.reason);
+			const shouldDrop = inputDrop?.shouldDrop ?? (() => true);
+			let droppedCount = 0;
+			for (let index = pendingTasks.length - 1; index >= 0; index -= 1) {
+				const pendingTask = pendingTasks[index];
+				if (!(pendingTask && shouldDrop(pendingTask.task))) continue;
+				pendingTasks.splice(index, 1);
+				clearQueuedLifecycle(pendingTask);
+				releaseTaskOwnership(pendingTask.task);
+				droppedCount += 1;
+				input.onTaskDropped?.({
+					adapterId: pendingTask.task.adapterId,
+					attemptId: pendingTask.task.attemptId,
+					controllerKey: pendingTask.task.controllerKey,
+					dispatchId: pendingTask.task.dispatchId,
+					localExecutionLaneKey: pendingTask.task.localExecutionLaneKey,
+					localQueue: buildLocalQueueDiagnostics({
+						localExecutionLaneKey: pendingTask.task.localExecutionLaneKey,
+						queuePosition: null,
+						status: "queued"
+					}),
+					profileId: pendingTask.task.profileId,
+					reason,
+					spaceId: pendingTask.task.spaceId,
+					taskId: pendingTask.task.taskId,
+					targetLabel: pendingTask.task.targetLabel,
+					transportMode: pendingTask.task.transportMode,
+					...buildSnapshot(pendingTask.task.profileId)
+				});
+			}
+			notifyDrainWaitersIfIdle();
+			return { droppedCount };
+		},
+		drain() {
+			if (pendingTasks.length === 0 && activeGlobal === 0) return Promise.resolve();
+			return new Promise((resolve) => {
+				drainWaiters.push(resolve);
+			});
+		},
+		getDrainState() {
+			return {
+				activeGlobal,
+				pendingCount: pendingTasks.length
+			};
+		},
+		getSnapshot(localExecutionLaneKey) {
+			return buildSnapshot(localExecutionLaneKey);
+		}
+	};
+}
+function buildAttemptKey(dispatchId, attemptId) {
+	return `${dispatchId}::${attemptId}`;
+}
+function toErrorMessage$14(error) {
+	if (error instanceof Error && error.message.trim().length > 0) return error.message;
+	if (typeof error === "string" && error.trim().length > 0) return error;
+	return "unknown error";
+}
+function resolveTaskCompletionResult(result) {
+	if (!result || typeof result !== "object") return {
+		errorCode: null,
+		errorMessage: null,
+		result: "success"
+	};
+	const normalizedResult = result.result === "failed" || result.result === "partial_success" || result.result === "success" ? result.result : "success";
+	return {
+		errorCode: toOptionalText(result.errorCode),
+		errorMessage: toOptionalText(result.errorMessage),
+		result: normalizedResult
+	};
+}
+function toOptionalText(value) {
+	if (typeof value !== "string") return null;
+	const normalized = value.trim();
+	return normalized.length > 0 ? normalized : null;
+}
+function toPendingDropReason(value) {
+	if (typeof value !== "string") return "queue.drop";
+	const normalized = value.trim();
+	return normalized.length > 0 ? normalized : "queue.drop";
+}
+
+//#endregion
+//#region src/local-service/inventory/agent-controller-inventory.ts
+async function collectLocalAgentControllerInventory(input = {}) {
+	return { capabilities: (await listAgentTargetStates()).filter((state) => state.targetKind === "builtin").map((state) => resolveLocalAgentControllerInventoryItem({
+		localAdapterContainer: input.localAdapterContainer,
+		state
+	})) };
+}
+function resolveLocalAgentControllerInventoryItem(input) {
+	const agentControllerRef = buildAgentControllerRef({
+		kind: "builtin",
+		id: input.state.agentId
+	});
+	const adapterSupport = input.localAdapterContainer ? resolveLocalRuntimeControllerSupport({
+		agentControllerRef,
+		localAdapterContainer: input.localAdapterContainer
+	}) : null;
+	const launchStatus = input.state.launchStatus ?? (input.state.selectable ? "ready" : "not_available");
+	const launchability = resolveLocalAgentControllerLaunchability({
+		adapterSupported: adapterSupport?.supported ?? true,
+		detected: input.state.detected,
+		launchStatus,
+		runtimeSupported: input.state.runtimeSupported,
+		selectable: input.state.selectable,
+		selectableReason: input.state.selectableReason
+	});
+	return {
+		agentId: input.state.agentId,
+		blockerReasonCodes: resolveLocalAgentControllerBlockerReasonCodes({
+			launchability,
+			selectableReason: input.state.selectableReason
+		}),
+		agentControllerRef,
+		detected: input.state.detected,
+		displayName: input.state.displayName,
+		enabled: input.state.enabled,
+		launchability,
+		launchStatus,
+		launchStatusDetail: input.state.launchStatusDetail ?? null,
+		registered: input.state.registered,
+		selectable: input.state.selectable,
+		selectableReason: input.state.selectableReason
+	};
+}
+function resolveLocalAgentControllerReportDecision(capability, input) {
+	if (input.requireEnabled && !capability.enabled) return {
+		localParticipationState: "needs_agent_prepare",
+		reasonCodes: ["local_agent_preparation.not_enabled"]
+	};
+	if (capability.launchability !== "launchable" || !capability.selectable) return {
+		localParticipationState: "needs_agent_prepare",
+		reasonCodes: capability.blockerReasonCodes.length > 0 ? capability.blockerReasonCodes : [capability.selectableReason ? `local_agent_preparation.${capability.selectableReason}` : "local_agent_preparation.not_selectable"]
+	};
+	return {
+		localParticipationState: "ready",
+		reasonCodes: []
+	};
+}
+function resolveLocalAgentControllerLaunchability(input) {
+	if (!input.detected) return "not_detected";
+	if (!input.runtimeSupported || input.selectableReason === "not_supported_yet") return "not_supported";
+	if (input.launchStatus === "needs_choice") return "needs_choice";
+	if (input.launchStatus === "needs_repair") return "needs_repair";
+	if (input.launchStatus === "ready" && input.selectable && input.adapterSupported !== false) return "launchable";
+	return "blocked";
+}
+function resolveLocalAgentControllerBlockerReasonCodes(input) {
+	if (input.launchability === "launchable") return [];
+	if (input.launchability === "needs_choice") return ["controller.launch.choice_required"];
+	if (input.launchability === "needs_repair") return ["controller.launch.needs_repair"];
+	if (input.launchability === "not_detected") return ["local_agent_preparation.not_detected"];
+	if (input.launchability === "not_supported") return ["local_agent_preparation.not_supported_yet"];
+	if (input.selectableReason) return [`local_agent_preparation.${input.selectableReason}`];
+	return ["local_agent_preparation.not_enabled"];
+}
+
+//#endregion
+//#region src/local-service/reporting/runtime-agent-controller-report-sync.ts
+async function syncLocalServiceRuntimeAgentControllerReports(input) {
+	const reports = (await collectLocalAgentControllerInventory({ localAdapterContainer: input.localAdapterContainer })).capabilities.filter((capability) => capability.registered).map((capability) => {
+		if (!capability.agentControllerRef) return null;
+		const reportDecision = resolveLocalAgentControllerReportDecision(capability, { requireEnabled: true });
+		return {
+			agentControllerRef: capability.agentControllerRef,
+			localParticipationState: reportDecision.localParticipationState,
+			reasonCodes: reportDecision.reasonCodes
+		};
+	}).filter((report) => report !== null);
+	if (reports.length === 0) return {
+		status: "skipped",
+		reasonCodes: ["runtime.agent_controller_report.no_local_controllers"],
+		reportCount: 0,
+		submittedCount: 0,
+		failedCount: 0
+	};
+	return summarizeSubmissions(await submitRuntimeAgentControllerReports({ reports }));
+}
+function summarizeSubmissions(submissions) {
+	const submittedCount = submissions.filter((submission) => submission.status === "submitted" && submission.agentControllerReportStatus === "accepted").length;
+	const failedCount = submissions.length - submittedCount;
+	return {
+		status: "submitted",
+		reasonCodes: [...new Set(submissions.flatMap((submission) => submission.reasonCodes).filter((reasonCode) => reasonCode.trim()))],
+		reportCount: submissions.length,
+		submittedCount,
+		failedCount
+	};
+}
+
+//#endregion
+//#region src/local-service/carrier/catalog-sync-skipped-profiles.ts
 function resolveCatalogSyncSkippedProfilesLogState(input) {
 	if (input.hasProfiles || input.skippedProfiles.length === 0) return {
 		fingerprint: null,
@@ -43078,7 +43439,7 @@ function failMissingCurrentSocket(dispatchId) {
 }
 
 //#endregion
-//#region src/daemon/session/frame-router.ts
+//#region src/local-service/carrier/frame-router.ts
 function parseDaemonFrame(raw) {
 	let parsedJson;
 	try {
@@ -43281,7 +43642,7 @@ function normalizeResultAckStatus(value) {
 }
 
 //#endregion
-//#region src/daemon/session/register-session.ts
+//#region src/local-service/carrier/register-session.ts
 function waitForRegisterResponse(input) {
 	if (input.waiters.registerResolver || input.waiters.registerRejecter) return Promise.reject(new DaemonServiceRunError({
 		code: "daemon.run.register_response_busy",
@@ -43311,7 +43672,7 @@ function waitForRegisterResponse(input) {
 }
 
 //#endregion
-//#region src/daemon/session/run-socket-session.ts
+//#region src/local-service/carrier/run-socket-session.ts
 async function runDaemonSocketSession(input) {
 	const currentSocketRef = input.currentSocketRef ?? {
 		connectionGeneration: null,
@@ -44166,239 +44527,7 @@ function normalizeFrameInteger(value) {
 }
 
 //#endregion
-//#region src/daemon/state/context-store.ts
-async function loadContextStore(contextStorePath) {
-	const raw = await readFile(contextStorePath, "utf8").catch(() => "");
-	if (!raw) return /* @__PURE__ */ new Map();
-	let parsed;
-	try {
-		parsed = JSON.parse(raw);
-	} catch {
-		return /* @__PURE__ */ new Map();
-	}
-	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return /* @__PURE__ */ new Map();
-	const contextStore = /* @__PURE__ */ new Map();
-	for (const [key, value] of Object.entries(parsed)) {
-		const normalizedKey = normalizeOptionalText$50(key);
-		const normalizedValue = normalizeOptionalText$50(value);
-		if (!(normalizedKey && normalizedValue)) continue;
-		contextStore.set(normalizedKey, normalizedValue);
-	}
-	return contextStore;
-}
-
-//#endregion
-//#region src/daemon/state/daemon-runtime-state.ts
-function resolveDaemonRunMode$1(inputMode) {
-	if (process.env[DAEMON_SERVICE_RUNTIME_DETACHED_ENV] === "1") return "background";
-	const envMode = parseDaemonRunMode$1(process.env[DAEMON_SERVICE_RUNTIME_MODE_ENV]);
-	if (envMode) return envMode;
-	if (inputMode === "foreground") return "foreground";
-	return "background";
-}
-function parseDaemonRunMode$1(value) {
-	const normalized = normalizeText$9(value).toLowerCase();
-	if (normalized === "foreground" || normalized === "background") return normalized;
-	return null;
-}
-function shouldPersistDaemonRuntimeState(input) {
-	if (input.forcePersist) return true;
-	if ("stopRequestedAt" in input.updates) return true;
-	return input.nowMs - input.lastPersistedAtMs >= RUNTIME_STATE_PERSIST_MIN_INTERVAL_MS;
-}
-function resolveReconnectBackoffMs(attempt) {
-	const next = DEFAULT_RECONNECT_DELAY_MS * 2 ** (Math.max(1, attempt) - 1);
-	return Math.min(MAX_RECONNECT_DELAY_MS, next);
-}
-function toDaemonStreamUrl(baseUrl) {
-	const url = new URL(baseUrl);
-	url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
-	url.pathname = "/v1/daemon/stream";
-	url.search = "";
-	url.hash = "";
-	return url.toString();
-}
-function buildDaemonProcessCommand() {
-	const script = normalizeText$9(process.argv[1]);
-	const args = process.argv.slice(2);
-	const values = script ? [script, ...args] : args;
-	if (values.length === 0) return process.execPath;
-	return `${process.execPath} ${values.join(" ")}`;
-}
-function createDaemonRuntimeState(input) {
-	return {
-		v: 1,
-		schema: DAEMON_SERVICE_RUNTIME_STATE_SCHEMA,
-		status: "running",
-		mode: input.mode,
-		pid: input.pid,
-		command: input.command,
-		gatewayUrl: input.gatewayUrl,
-		atsProfileId: input.atsProfileId,
-		workingDirectory: input.workingDirectory,
-		stopRequestedAt: input.stopRequestedAt,
-		startedAt: input.startedAt,
-		updatedAt: input.updatedAt,
-		heartbeatAt: input.heartbeatAt,
-		managedBySystemService: input.runtimeMetadata.managedBySystemService,
-		serviceController: input.runtimeMetadata.serviceController,
-		autoStart: input.runtimeMetadata.autoStart
-	};
-}
-
-//#endregion
-//#region src/daemon/state/route-catalog-cache.ts
-const ROUTE_CATALOG_CACHE_FILE = "route-catalog-cache.json";
-async function readDaemonRouteCatalogCache(input) {
-	const lane = normalizeCacheLane(input.lane);
-	const ownerUserId = normalizeCacheIdentityField(input.ownerUserId);
-	const serviceBundleId = normalizeServiceBundleId(input.serviceBundleId);
-	if (!(lane && ownerUserId && serviceBundleId)) return null;
-	const cached = await readDaemonLocalStateFile({
-		path: daemonRouteCatalogCachePath(),
-		schema: daemonRouteCatalogCacheSchema
-	});
-	if (!cached || cached.ownerUserId !== ownerUserId || cached.lane !== lane || cached.serviceBundleId !== serviceBundleId) return null;
-	return deserializeRouteCatalog(cached);
-}
-async function writeDaemonRouteCatalogCache(input) {
-	const lane = normalizeCacheLane(input.lane);
-	const ownerUserId = normalizeCacheIdentityField(input.ownerUserId);
-	const serviceBundleId = normalizeServiceBundleId(input.serviceBundleId);
-	if (!(lane && ownerUserId && serviceBundleId)) return;
-	if (input.routeCatalog.profileIds.length === 0) {
-		await clearDaemonRouteCatalogCache();
-		return;
-	}
-	const value = {
-		v: DAEMON_ROUTE_CATALOG_CACHE_SCHEMA_VERSION,
-		schema: DAEMON_ROUTE_CATALOG_CACHE_SCHEMA_NAME,
-		cachedAt: (/* @__PURE__ */ new Date()).toISOString(),
-		runtimeContractEpoch: CURRENT_DAEMON_EXECUTION_CONTRACT_EPOCH,
-		ownerUserId,
-		lane,
-		serviceBundleId,
-		profileIds: [...input.routeCatalog.profileIds],
-		routes: input.routeCatalog.profileIds.map((profileId) => {
-			const route = input.routeCatalog.routeByProfileId.get(profileId);
-			if (!route) throw new Error(`route catalog is missing route for ${profileId}`);
-			return serializeRouteConfig(route);
-		}),
-		skippedProfiles: [...input.routeCatalog.skippedProfiles]
-	};
-	await writeDaemonLocalStateFile({
-		path: daemonRouteCatalogCachePath(),
-		schema: daemonRouteCatalogCacheSchema,
-		value,
-		mode: 384
-	});
-}
-async function clearDaemonRouteCatalogCache() {
-	await rm(daemonRouteCatalogCachePath(), { force: true });
-}
-function daemonRouteCatalogCachePath() {
-	return join(daemonRuntimeDataPath(), ROUTE_CATALOG_CACHE_FILE);
-}
-function normalizeServiceBundleId(value) {
-	return String(value ?? "").trim();
-}
-function normalizeCacheIdentityField(value) {
-	return String(value ?? "").trim();
-}
-function normalizeCacheLane(value) {
-	const parsed = daemonServiceLaneSchema.safeParse(normalizeCacheIdentityField(value));
-	return parsed.success ? parsed.data : null;
-}
-function serializeRouteConfig(route) {
-	return {
-		agentControllerRef: route.agentControllerRef,
-		contextIdMappingSpec: route.contextIdMappingSpec,
-		...route.launchContract ? { launchContract: route.launchContract } : {},
-		profileId: route.profileId,
-		streamingMode: route.streamingMode,
-		transportMode: route.transportMode
-	};
-}
-function deserializeRouteCatalog(cache) {
-	const routeByProfileId = /* @__PURE__ */ new Map();
-	for (const route of cache.routes) routeByProfileId.set(route.profileId, {
-		agentControllerRef: route.agentControllerRef,
-		contextIdMappingSpec: route.contextIdMappingSpec,
-		...route.launchContract ? { launchContract: route.launchContract } : {},
-		profileId: route.profileId,
-		streamingMode: route.streamingMode,
-		transportMode: route.transportMode
-	});
-	return {
-		profileIds: [...cache.profileIds],
-		routeByProfileId,
-		skippedProfiles: [...cache.skippedProfiles]
-	};
-}
-
-//#endregion
-//#region src/daemon/state/runtime-state-tracker.ts
-function createDaemonRuntimeStateTracker(input) {
-	let runtimeState = input.initialState;
-	let lastRuntimeStatePersistAtMs = Date.now();
-	const touchRuntimeState = async (updates, options) => {
-		const nowAt = nowIsoString();
-		runtimeState = {
-			...runtimeState,
-			...updates,
-			updatedAt: updates.updatedAt ?? nowAt
-		};
-		if (!shouldPersistDaemonRuntimeState({
-			forcePersist: options?.forcePersist === true,
-			nowMs: Date.now(),
-			lastPersistedAtMs: lastRuntimeStatePersistAtMs,
-			updates
-		})) return;
-		await setDaemonServiceRuntimeState(runtimeState);
-		if (input.leaseDescriptor) await writeDaemonRuntimeLease(buildDaemonRuntimeLease({
-			descriptor: input.leaseDescriptor,
-			runtimeState
-		}));
-		lastRuntimeStatePersistAtMs = Date.now();
-	};
-	return {
-		getRuntimeState: () => runtimeState,
-		touchRuntimeState
-	};
-}
-async function resolveDaemonRuntimeLeaseDescriptor(input) {
-	const [contract, activeBundle] = await Promise.all([readDaemonServiceContract().catch(() => null), readDaemonActiveBundleState().catch(() => null)]);
-	if (contract) return {
-		generation: contract.generation,
-		bundleId: contract.bundleId
-	};
-	const activeBundleEntryPath = await resolveDaemonBundleEntryPathFromState(activeBundle).catch(() => null);
-	const commandEntryPath = extractDaemonCommandEntryPath(input.command);
-	const bundleId = (commandEntryPath ? resolveDaemonBundleIdFromEntryPath(commandEntryPath) : null) ?? (activeBundleEntryPath ? resolveDaemonBundleIdFromEntryPath(activeBundleEntryPath) : null) ?? activeBundle?.bundleId ?? null;
-	if (!bundleId) return null;
-	return {
-		generation: 0,
-		bundleId
-	};
-}
-function buildDaemonRuntimeLease(input) {
-	return {
-		schema: "ats-daemon-runtime-lease-v1",
-		v: 1,
-		generation: input.descriptor.generation,
-		bundleId: input.descriptor.bundleId,
-		pid: input.runtimeState.pid,
-		mode: input.runtimeState.mode,
-		startedAt: input.runtimeState.startedAt,
-		updatedAt: input.runtimeState.updatedAt,
-		heartbeatAt: input.runtimeState.heartbeatAt,
-		serviceController: input.runtimeState.serviceController,
-		managedBySystemService: input.runtimeState.managedBySystemService
-	};
-}
-
-//#endregion
-//#region src/daemon/service-runner.ts
+//#region src/local-service/carrier/service-runner.ts
 async function resolveDaemonServiceOwnerContext(input) {
 	const explicitAtsProfileId = normalizeText$9(input.atsProfileId);
 	if (explicitAtsProfileId) return resolveDaemonServiceOwnerContextFromProfile(await requireAtsProfile({
@@ -46917,6 +47046,14 @@ async function runDaemonStatus(input) {
 		profile: input.profile,
 		view: input.view
 	});
+	if (input.json === true) {
+		outJsonLine(buildDaemonStatusJsonPayload({
+			environmentTarget: await resolveAtsEnvironmentTarget({ gatewayUrl: input.gatewayUrl }),
+			localSnapshot: await resolveDaemonLocalStatusSnapshot(),
+			snapshot: await resolveDaemonStatusSnapshot({ runtime })
+		}));
+		return;
+	}
 	const presenter = createPresenter(runtime);
 	emitDaemonOverviewIfAgent({
 		presenter,
@@ -47208,33 +47345,55 @@ async function runDaemonStatusFlow(input) {
 	await runDaemonStatus(input);
 	return "completed";
 }
+function buildDaemonStatusJsonPayload(input) {
+	return {
+		schemaVersion: 1,
+		type: "daemon.status",
+		localResult: buildDaemonAgentLocalStatusPayload({
+			environmentTarget: input.environmentTarget,
+			snapshot: input.localSnapshot
+		}),
+		result: buildDaemonAgentStatusPayload({
+			environmentTarget: input.environmentTarget,
+			snapshot: input.snapshot
+		}),
+		runtimeProjection: input.snapshot.currentReplyReadiness.runtimeProjection ?? null
+	};
+}
+function buildDaemonAgentStatusPayload(input) {
+	const { environmentTarget, snapshot } = input;
+	const currentProfileWorkspace = buildProfileWorkspacePresentation(snapshot.currentReplyReadiness.profileWorkspaceRuntimeResolution);
+	return {
+		...snapshot.currentReplyReadiness.daemonStatus,
+		environmentTarget,
+		...snapshot.currentReplyReadiness.runtimeStatus ? { runtime: snapshot.currentReplyReadiness.runtimeStatus } : {},
+		...snapshot.runtimeContractRepairReport ? { runtimeContractRepair: snapshot.runtimeContractRepairReport } : {},
+		...snapshot.currentReplyReadiness.inventory ? { inventory: {
+			anomalies: snapshot.currentReplyReadiness.inventory.anomalies,
+			...snapshot.currentReplyReadiness.inventory.runtimeContractCompatibility ? { runtimeContractCompatibility: snapshot.currentReplyReadiness.inventory.runtimeContractCompatibility } : {},
+			cleanupPlan: buildDaemonServiceCleanupPlan({
+				intent: "status_cleanup",
+				inventory: snapshot.currentReplyReadiness.inventory
+			})
+		} } : {},
+		daemonRouteObservation: snapshot.currentReplyReadiness.daemonRouteObservation,
+		diagnostics: buildDaemonLocalReplyReadinessEvidenceDiagnostics({
+			deviceReplyReadiness: snapshot.currentReplyReadiness.deviceReplyReadiness,
+			legacyAgentReplyReadiness: snapshot.currentReplyReadiness.agentReplyReadiness
+		}),
+		currentProfileWorkspace,
+		...snapshot.attention ? { attention: snapshot.attention } : {},
+		...snapshot.latestLifecycleEvent ? { latestLifecycleEvent: snapshot.latestLifecycleEvent } : {}
+	};
+}
 function emitDaemonAgentStatus(input) {
 	const { environmentTarget, presenter, snapshot } = input;
-	const currentProfileWorkspace = buildProfileWorkspacePresentation(snapshot.currentReplyReadiness.profileWorkspaceRuntimeResolution);
 	presenter.data({
 		code: "daemon.status.result",
-		payload: {
-			...snapshot.currentReplyReadiness.daemonStatus,
+		payload: buildDaemonAgentStatusPayload({
 			environmentTarget,
-			...snapshot.currentReplyReadiness.runtimeStatus ? { runtime: snapshot.currentReplyReadiness.runtimeStatus } : {},
-			...snapshot.runtimeContractRepairReport ? { runtimeContractRepair: snapshot.runtimeContractRepairReport } : {},
-			...snapshot.currentReplyReadiness.inventory ? { inventory: {
-				anomalies: snapshot.currentReplyReadiness.inventory.anomalies,
-				...snapshot.currentReplyReadiness.inventory.runtimeContractCompatibility ? { runtimeContractCompatibility: snapshot.currentReplyReadiness.inventory.runtimeContractCompatibility } : {},
-				cleanupPlan: buildDaemonServiceCleanupPlan({
-					intent: "status_cleanup",
-					inventory: snapshot.currentReplyReadiness.inventory
-				})
-			} } : {},
-			daemonRouteObservation: snapshot.currentReplyReadiness.daemonRouteObservation,
-			diagnostics: buildDaemonLocalReplyReadinessEvidenceDiagnostics({
-				deviceReplyReadiness: snapshot.currentReplyReadiness.deviceReplyReadiness,
-				legacyAgentReplyReadiness: snapshot.currentReplyReadiness.agentReplyReadiness
-			}),
-			currentProfileWorkspace,
-			...snapshot.attention ? { attention: snapshot.attention } : {},
-			...snapshot.latestLifecycleEvent ? { latestLifecycleEvent: snapshot.latestLifecycleEvent } : {}
-		}
+			snapshot
+		})
 	});
 	if (!snapshot.currentReplyReadiness.runtimeProjection) return;
 	presenter.data({
@@ -47248,28 +47407,35 @@ function buildDaemonLocalReplyReadinessEvidenceDiagnostics(input) {
 		agentEvidence: input.legacyAgentReplyReadiness
 	});
 }
+function buildDaemonAgentLocalStatusPayload(input) {
+	const { environmentTarget, snapshot } = input;
+	return {
+		...snapshot.daemonStatus,
+		environmentTarget,
+		statusScope: "local_service",
+		...snapshot.runtimeStatus ? { runtime: snapshot.runtimeStatus } : {},
+		...snapshot.serviceManagerStatus ? { serviceManagerStatus: snapshot.serviceManagerStatus } : {},
+		...snapshot.runtimeContractRepairReport ? { runtimeContractRepair: snapshot.runtimeContractRepairReport } : {},
+		...snapshot.inventory ? { inventory: {
+			anomalies: snapshot.inventory.anomalies,
+			...snapshot.inventory.runtimeContractCompatibility ? { runtimeContractCompatibility: snapshot.inventory.runtimeContractCompatibility } : {},
+			cleanupPlan: buildDaemonServiceCleanupPlan({
+				intent: "status_cleanup",
+				inventory: snapshot.inventory
+			})
+		} } : {},
+		...snapshot.attention ? { attention: snapshot.attention } : {},
+		...snapshot.latestLifecycleEvent ? { latestLifecycleEvent: snapshot.latestLifecycleEvent } : {}
+	};
+}
 function emitDaemonAgentLocalStatus(input) {
 	const { environmentTarget, presenter, snapshot } = input;
 	presenter.data({
 		code: "daemon.status.local_result",
-		payload: {
-			...snapshot.daemonStatus,
+		payload: buildDaemonAgentLocalStatusPayload({
 			environmentTarget,
-			statusScope: "local_service",
-			...snapshot.runtimeStatus ? { runtime: snapshot.runtimeStatus } : {},
-			...snapshot.serviceManagerStatus ? { serviceManagerStatus: snapshot.serviceManagerStatus } : {},
-			...snapshot.runtimeContractRepairReport ? { runtimeContractRepair: snapshot.runtimeContractRepairReport } : {},
-			...snapshot.inventory ? { inventory: {
-				anomalies: snapshot.inventory.anomalies,
-				...snapshot.inventory.runtimeContractCompatibility ? { runtimeContractCompatibility: snapshot.inventory.runtimeContractCompatibility } : {},
-				cleanupPlan: buildDaemonServiceCleanupPlan({
-					intent: "status_cleanup",
-					inventory: snapshot.inventory
-				})
-			} } : {},
-			...snapshot.attention ? { attention: snapshot.attention } : {},
-			...snapshot.latestLifecycleEvent ? { latestLifecycleEvent: snapshot.latestLifecycleEvent } : {}
-		}
+			snapshot
+		})
 	});
 }
 async function emitDaemonStatusForView(input) {
@@ -94562,125 +94728,6 @@ function addExplicitProfileToSpaceHint(hint) {
 	return `ats space ${subcommand} --profile <profile-id>${rest}`;
 }
 
-//#endregion
-//#region src/runtime/view-argv.ts
-const PASSIVE_CLI_QUERY_FLAGS = new Set([
-	"--help",
-	"--version",
-	"-V",
-	"-h"
-]);
-function isStandaloneViewQueryArgv(argv) {
-	const args = argv.slice(2);
-	return args.length === 1 && args[0] === "--view";
-}
-function parseViewFromArgv(argv, options) {
-	const allowMissingValue = options?.allowMissingValue === true;
-	for (let i = 2; i < argv.length; i += 1) {
-		const arg = argv[i];
-		if (typeof arg !== "string") continue;
-		if (arg === "--") break;
-		if (arg === "--view") {
-			const next = argv[i + 1];
-			if (typeof next !== "string" || next.startsWith("-")) {
-				if (allowMissingValue) return null;
-				throw new Error("missing --view value (use auto|human|agent)");
-			}
-			return parseCliViewMode(next);
-		}
-		if (arg.startsWith("--view=")) return parseCliViewMode(arg.slice(7));
-	}
-	return null;
-}
-function parseStandaloneViewSwitchArgv(argv) {
-	const args = argv.slice(2);
-	if (args.length === 0) return null;
-	let view = null;
-	for (let i = 0; i < args.length; i += 1) {
-		const arg = args[i];
-		if (typeof arg !== "string") continue;
-		if (arg === "--view") {
-			const next = args[i + 1];
-			if (typeof next !== "string" || next.startsWith("-")) return null;
-			view = next.trim().toLowerCase();
-			i += 1;
-			continue;
-		}
-		if (arg.startsWith("--view=")) {
-			view = arg.slice(7).trim().toLowerCase();
-			continue;
-		}
-		return null;
-	}
-	return view;
-}
-function parseFirstCommandTokenFromArgv(argv) {
-	return parseLeadingCommandTokensFromArgv(argv, 1)[0] ?? null;
-}
-function parseLeadingCommandTokensFromArgv(argv, maxTokens = 2) {
-	if (maxTokens <= 0) return [];
-	const args = argv.slice(2);
-	const tokens = [];
-	for (let i = 0; i < args.length; i += 1) {
-		if (collectTokensAfterTerminator(args, i, tokens, maxTokens)) return tokens;
-		if (shouldSkipKnownGlobalFlag(args, i)) {
-			i += 1;
-			continue;
-		}
-		const arg = args[i];
-		if (typeof arg !== "string" || shouldSkipInlineGlobalFlag(arg)) continue;
-		if (pushLeadingCommandToken(arg, tokens, maxTokens)) return tokens;
-	}
-	return tokens;
-}
-function isPassiveCliQueryArgv(argv) {
-	const args = argv.slice(2);
-	for (let i = 0; i < args.length; i += 1) {
-		const arg = args[i];
-		if (typeof arg !== "string") continue;
-		if (arg === "--") return false;
-		if (isKnownGlobalFlagExpectValue(arg) && isGlobalFlagValueCandidate(args[i + 1])) {
-			i += 1;
-			continue;
-		}
-		if (arg.startsWith("--view=") || arg.startsWith("--service-auto-install=")) continue;
-		if (arg === "help" || PASSIVE_CLI_QUERY_FLAGS.has(arg)) return true;
-	}
-	return false;
-}
-function shouldUseAgentViewForNonInteractiveStart(argv, interactive) {
-	if (interactive) return false;
-	if (parseViewFromArgv(argv, { allowMissingValue: true }) !== null) return false;
-	return parseFirstCommandTokenFromArgv(argv) === "start";
-}
-function isKnownGlobalFlagExpectValue(value) {
-	return value === "--view" || value === "--service-auto-install";
-}
-function isGlobalFlagValueCandidate(value) {
-	return typeof value === "string" && value.length > 0 && !value.startsWith("-");
-}
-function collectTokensAfterTerminator(args, index, tokens, maxTokens) {
-	if (args[index] !== "--") return false;
-	for (let i = index + 1; i < args.length; i += 1) {
-		const next = args[i];
-		if (typeof next !== "string" || next.length === 0) continue;
-		tokens.push(next);
-		if (tokens.length >= maxTokens) break;
-	}
-	return true;
-}
-function shouldSkipKnownGlobalFlag(args, index) {
-	return isKnownGlobalFlagExpectValue(args[index] ?? "") && isGlobalFlagValueCandidate(args[index + 1]);
-}
-function shouldSkipInlineGlobalFlag(value) {
-	return value.startsWith("--view=") || value.startsWith("--service-auto-install=");
-}
-function pushLeadingCommandToken(value, tokens, maxTokens) {
-	if (value.startsWith("-")) return false;
-	tokens.push(value);
-	return tokens.length >= maxTokens;
-}
-
 //#endregion
 //#region src/runtime/retired-command-argv.ts
 const RETIRED_CLI_COMMANDS = [{
@@ -97188,6 +97235,10 @@ function buildCommandHelpExamples(title, examples) {
 async function runCommandWithEntryChecks(input) {
 	const entryName = resolveCommandEntryNameFromTokens(input.routeTokens);
 	if (!entryName) throw new Error(`missing command entry mapping for route: ${input.routeTokens.join(" ")}`);
+	if (hasJsonOutputArgv(process.argv)) {
+		await input.run();
+		return;
+	}
 	const requirements = getCommandCheckRequirements(entryName);
 	const environmentTarget = await resolveAtsEnvironmentTarget({ gatewayUrl: input.gatewayUrl });
 	const normalizedGatewayUrl = await resolveGatewayUrlForEntryChecks({
@@ -97831,18 +97882,20 @@ const serviceCmd = program.command("service").alias("daemon").description("Manag
 });
 serviceCmd.command("start").description("Start ATS Service on this device.").option("--mode <mode>", "Start mode: background (default) or foreground").option("--gateway-url <url>", "ATS gateway URL (command line, ATS_GATEWAY_URL, or saved ATS settings)").option("--profile <id-or-name>", "Optional ATS profile override used for owner resolution").option("--device-id <id>", "Override daemon device id for this run").option("--heartbeat-ms <n>", "Heartbeat interval in milliseconds (default: 25000)").action(runServiceStartCliAction);
 serviceCmd.command("run").description("Legacy alias for `ats service start`.").option("--mode <mode>", "Run mode: background (default) or foreground").option("--gateway-url <url>", "ATS gateway URL (command line, ATS_GATEWAY_URL, or saved ATS settings)").option("--profile <id-or-name>", "Optional ATS profile override used for owner resolution").option("--device-id <id>", "Override daemon device id for this run").option("--heartbeat-ms <n>", "Heartbeat interval in milliseconds (default: 25000)").action(runServiceStartCliAction);
-serviceCmd.command("status").description("Show ATS Service status on this device.").option("--profile <id-or-name>", "Optional ATS profile context for local service diagnostics").action(async (opts) => {
-	const view = getGlobalViewOption();
+serviceCmd.command("status").description("Show ATS Service status on this device.").option("--json", "Print machine-readable JSON.", false).option("--profile <id-or-name>", "Optional ATS profile context for local service diagnostics").action(async (opts) => {
+	const json = opts.json === true;
+	const view = json ? "agent" : getGlobalViewOption();
 	await runCommandWithEntryChecks({
 		routeTokens: ["service", "status"],
 		profile: opts.profile,
 		view,
 		run: async () => {
 			await runDaemonStatusFlow({
+				json,
 				profile: opts.profile,
 				view
 			});
-			await maybeRunAgentViewRecoveryAfterSuccess({ view });
+			if (!json) await maybeRunAgentViewRecoveryAfterSuccess({ view });
 		}
 	});
 });
@@ -99050,6 +99103,7 @@ async function runRootCommand() {
 	}
 }
 async function shouldPrintTagline(argv, effectiveView) {
+	if (hasJsonOutputArgv(argv)) return false;
 	if ((effectiveView === "auto" ? (await resolveRuntimeContext({ view: "auto" })).resolvedView : effectiveView) === "agent") return false;
 	const [firstCommand, secondCommand] = parseLeadingCommandTokensFromArgv(argv, 2);
 	if (firstCommand === "setup" || firstCommand === "agents" && secondCommand === "prepare") return false;