@p4code/cli 0.5.4 → 0.5.6

package/dist/bin.mjs

@@ -19,8 +19,11 @@ import "effect/LogLevel";
 import * as Path$1 from "effect/Path";
 import * as Schema$1 from "effect/Schema";
 import * as NodePath from "node:path";
+import { isAbsolute } from "node:path";
 import * as NodeChildProcess from "node:child_process";
+import { spawn } from "node:child_process";
 import * as NodeFS from "node:fs";
+import { constants } from "node:fs";
 import * as DateTime from "effect/DateTime";
 import * as Duration from "effect/Duration";
 import * as Option from "effect/Option";
@@ -42,6 +45,7 @@ import * as Config from "effect/Config";
 import * as References from "effect/References";
 import * as HttpServerRequest$1 from "effect/unstable/http/HttpServerRequest";
 import * as NodeCrypto from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import * as Encoding from "effect/Encoding";
 import * as Result$1 from "effect/Result";
 import * as Crypto from "effect/Crypto";
@@ -57,6 +61,7 @@ import * as Cause from "effect/Cause";
 import * as Exit from "effect/Exit";
 import * as NodeReadline from "node:readline";
 import * as NodeFSP from "node:fs/promises";
+import { access } from "node:fs/promises";
 import * as Clock from "effect/Clock";
 import * as NodeStream from "@effect/platform-node/NodeStream";
 import * as NodeHttp from "node:http";
@@ -148,7 +153,7 @@ const closeServer = (server) => {
 * NetService - Service tag for startup networking helpers.
 */
 var NetService = class extends Context.Service()("@p4code/shared/Net/NetService") {};
-const make$115 = () => {
+const make$116 = () => {
 	/**
 	* Returns true when a TCP server can bind to {host, port}.
 	* `EADDRNOTAVAIL` is treated as available so IPv6-absent hosts don't fail
@@ -257,10 +262,10 @@ const make$115 = () => {
 		})
 	};
 };
-const layer$118 = Layer.sync(NetService, make$115);
+const layer$119 = Layer.sync(NetService, make$116);
 //#endregion
 //#region package.json
-var version$1 = "0.5.4";
+var version$1 = "0.5.6";
 //#endregion
 //#region src/config.ts
 /**
@@ -281,8 +286,8 @@ var ServerConfig$1 = class extends Context.Service()("@p4code/cli/config/ServerC
 	/** @deprecated Import and use `layerTest` from this module. */
 	static layerTest = (cwd, baseDirOrPrefix) => layerTest$4(cwd, baseDirOrPrefix);
 };
-const make$114 = (config) => ServerConfig$1.of(config);
-const layer$117 = (config) => Layer.succeed(ServerConfig$1, make$114(config));
+const make$115 = (config) => ServerConfig$1.of(config);
+const layer$118 = (config) => Layer.succeed(ServerConfig$1, make$115(config));
 const deriveServerPaths = Effect.fn(function* (baseDir, devUrl, options = {}) {
 	const { join } = yield* Path$1.Path;
 	const stateDir = join(baseDir, devUrl !== void 0 && !options.baseDirIsExplicit ? "dev" : "userdata");
@@ -3719,9 +3724,21 @@ const OrchestrationThreadPairGate = Schema$1.Struct({
 	awaitingWatcherSince: Schema$1.NullOr(IsoDateTime),
 	updatedAt: IsoDateTime
 });
+const FusionReviewPolicy = Schema$1.Struct({
+	mode: Schema$1.Literals(["phase", "risk-and-final"]),
+	maxAutomaticReviews: PositiveInt.pipe(Schema$1.withDecodingDefault(Effect.succeed(4))),
+	maxCorrectionRounds: NonNegativeInt.pipe(Schema$1.withDecodingDefault(Effect.succeed(2)))
+});
+const FusionReviewExperiment = Schema$1.Struct({
+	policy: FusionReviewPolicy,
+	lastMessageSequence: Schema$1.optionalKey(NonNegativeInt),
+	automaticReviews: NonNegativeInt,
+	correctionRounds: NonNegativeInt
+});
 /** Persisted relationship between two otherwise ordinary threads. */
 const OrchestrationThreadPair = Schema$1.Struct({
 	id: ThreadPairId,
+	reviewExperiment: Schema$1.optionalKey(Schema$1.NullOr(FusionReviewExperiment)),
 	implementerThreadId: ThreadId,
 	watcherThreadId: ThreadId,
 	lastReviewedImplementerSequence: NonNegativeInt,
@@ -4245,6 +4262,7 @@ const ThreadPairCreateCommand = Schema$1.Struct({
 	implementerThreadId: ThreadId,
 	watcherThreadId: ThreadId,
 	continuationMessageId: Schema$1.optional(MessageId),
+	reviewPolicy: Schema$1.optionalKey(Schema$1.NullOr(FusionReviewPolicy)),
 	roundCap: Schema$1.optional(NonNegativeInt),
 	gateTimeoutMs: Schema$1.optional(NonNegativeInt),
 	createdAt: IsoDateTime
@@ -4770,6 +4788,7 @@ const ThreadPairCreatedPayload$1 = Schema$1.Struct({
 	lastReviewedImplementerSequence: NonNegativeInt,
 	activationTurnId: Schema$1.optional(Schema$1.NullOr(TurnId)),
 	continuationMessageId: Schema$1.optional(MessageId),
+	reviewPolicy: Schema$1.optionalKey(Schema$1.NullOr(FusionReviewPolicy)),
 	roundCap: Schema$1.optional(NonNegativeInt),
 	gateTimeoutMs: Schema$1.optional(NonNegativeInt),
 	createdAt: IsoDateTime
@@ -7809,6 +7828,7 @@ const TaskProgressPayload = Schema$1.Struct({
 	usage: Schema$1.optional(Schema$1.Unknown),
 	lastToolName: Schema$1.optional(TrimmedNonEmptyStringSchema$1),
 	toolUseId: Schema$1.optional(TrimmedNonEmptyStringSchema$1),
+	model: Schema$1.optional(TrimmedNonEmptyStringSchema$1),
 	subagentType: Schema$1.optional(TrimmedNonEmptyStringSchema$1)
 });
 const TaskCompletedPayload = Schema$1.Struct({
@@ -8824,7 +8844,11 @@ const DeviceHostSummary = Schema$1.Struct({
 	label: TrimmedNonEmptyString.check(Schema$1.isMaxLength(MAX_HOST_LABEL_LENGTH)),
 	platforms: Schema$1.Array(DevicePlatformAvailability),
 	hubInstalled: Schema$1.Boolean,
-	agentDeviceInstalled: Schema$1.Boolean
+	agentDeviceInstalled: Schema$1.Boolean,
+	automation: Schema$1.optional(Schema$1.Struct({
+		provider: Schema$1.Literals(["apple-xcode", "xcodebuildmcp"]),
+		detail: Schema$1.String
+	}))
 });
 /**
 * Lifecycle of the helper processes on a host. Tools are installed on first
@@ -10153,6 +10177,10 @@ const ServerSettings = Schema$1.Struct({
 	* smaller; off is the rollback if a pair misbehaves.
 	*/
 	enableOptimizedFusionPromptDelivery: Schema$1.Boolean.pipe(Schema$1.withDecodingDefault(Effect.succeed(true))),
+	/** Local daily measurements and weekly recommendations; never starts agent turns. */
+	enableFusionObservation: Schema$1.Boolean.pipe(Schema$1.withDecodingDefault(Effect.succeed(true))),
+	/** Experimental policy captured by new pairs; null preserves existing behavior. */
+	fusionReviewPolicy: Schema$1.NullOr(FusionReviewPolicy).pipe(Schema$1.withDecodingDefault(Effect.succeed(null))),
 	/**
 	* Whether the board offers the scoping agent: the Scope action on a task and
 	* the panel that drafts a new one by interview.
@@ -10359,6 +10387,8 @@ const ServerSettingsPatch = Schema$1.Struct({
 	enableRootCauseBeforeFix: Schema$1.optionalKey(Schema$1.Boolean),
 	enableUnpromptedSubagents: Schema$1.optionalKey(Schema$1.Boolean),
 	enableOptimizedFusionPromptDelivery: Schema$1.optionalKey(Schema$1.Boolean),
+	enableFusionObservation: Schema$1.optionalKey(Schema$1.Boolean),
+	fusionReviewPolicy: Schema$1.optionalKey(Schema$1.NullOr(FusionReviewPolicy)),
 	enableScopingAgent: Schema$1.optionalKey(Schema$1.Boolean),
 	enablePlanPhase: Schema$1.optionalKey(Schema$1.Boolean),
 	writeGeneratedSkillsToRepo: Schema$1.optionalKey(Schema$1.Boolean),
@@ -13571,6 +13601,45 @@ const ComputerUseDeviceTarget = {
 	deviceId: DeviceId,
 	leaseId: DeviceId
 };
+const DeviceElementRef = TrimmedNonEmptyString.check(Schema$1.isMaxLength(128));
+const DeviceGesture = {
+	direction: Schema$1.Literals([
+		"up",
+		"down",
+		"left",
+		"right"
+	]),
+	distance: Schema$1.optional(Schema$1.Number.check(Schema$1.isGreaterThan(0), Schema$1.isLessThanOrEqualTo(1)))
+};
+const ComputerUseDeviceAction = Schema$1.Union([
+	Schema$1.Struct({
+		action: Schema$1.Literal("tap"),
+		elementRef: DeviceElementRef
+	}),
+	Schema$1.Struct({
+		action: Schema$1.Literal("type_text"),
+		elementRef: DeviceElementRef,
+		text: Schema$1.String.check(Schema$1.isMinLength(1), Schema$1.isMaxLength(16e3)),
+		replaceExisting: Schema$1.optional(Schema$1.Boolean)
+	}),
+	Schema$1.Struct({
+		action: Schema$1.Literal("swipe"),
+		withinElementRef: DeviceElementRef,
+		...DeviceGesture
+	}),
+	Schema$1.Struct({
+		action: Schema$1.Literal("drag"),
+		elementRef: DeviceElementRef,
+		...DeviceGesture
+	}),
+	Schema$1.Struct({
+		action: Schema$1.Literal("batch"),
+		steps: Schema$1.Array(Schema$1.Struct({
+			action: Schema$1.Literal("tap"),
+			elementRef: DeviceElementRef
+		})).check(Schema$1.isMinLength(1), Schema$1.isMaxLength(100))
+	})
+]);
 const ComputerUseDeviceOperation = Schema$1.Union([
 	Schema$1.Struct({ method: Schema$1.Literal("list") }),
 	Schema$1.Struct({
@@ -13585,7 +13654,18 @@ const ComputerUseDeviceOperation = Schema$1.Union([
 			"screenshot",
 			"close"
 		]),
-		...ComputerUseDeviceTarget
+		...ComputerUseDeviceTarget,
+		sinceScreenHash: Schema$1.optional(TrimmedNonEmptyString)
+	}),
+	Schema$1.Struct({
+		method: Schema$1.Literal("semantic"),
+		...ComputerUseDeviceTarget,
+		action: ComputerUseDeviceAction
+	}),
+	Schema$1.Struct({
+		method: Schema$1.Literal("recording"),
+		...ComputerUseDeviceTarget,
+		action: Schema$1.Literals(["start", "stop"])
 	}),
 	Schema$1.Struct({
 		method: Schema$1.Literal("command"),
@@ -13697,6 +13777,7 @@ const WS_METHODS = {
 	serverGetProcessDiagnostics: "server.getProcessDiagnostics",
 	serverGetProcessResourceHistory: "server.getProcessResourceHistory",
 	serverSignalProcess: "server.signalProcess",
+	threadHandoff: "thread.handoff",
 	btwAsk: "btw.ask",
 	btwCancel: "btw.cancel",
 	pullRequestsList: "pullRequests.list",
@@ -14340,6 +14421,14 @@ const WsServerGetProviderUsageRpc = Rpc.make(WS_METHODS.serverGetProviderUsage,
 	success: Schema$1.Struct({ report: Schema$1.String }),
 	error: Schema$1.Union([TextGenerationError, EnvironmentAuthorizationError])
 });
+const WsThreadHandoffRpc = Rpc.make(WS_METHODS.threadHandoff, {
+	payload: Schema$1.Struct({ threadId: ThreadId }),
+	success: Schema$1.Struct({
+		projectId: ProjectId,
+		text: Schema$1.String
+	}),
+	error: Schema$1.Union([TextGenerationError, EnvironmentAuthorizationError])
+});
 const WsBtwAskRpc = Rpc.make(WS_METHODS.btwAsk, {
 	payload: BtwAskInput,
 	success: BtwAskResult,
@@ -14800,7 +14889,7 @@ const WsSubscribeAuthAccessRpc = Rpc.make(WS_METHODS.subscribeAuthAccess, {
 	error: Schema$1.Union([AuthAccessStreamError, EnvironmentAuthorizationError]),
 	stream: true
 });
-const WsRpcGroup = RpcGroup.make(WsDeviceGetStateRpc, WsDeviceListRpc, WsDeviceConfigureRpc, WsDeviceOpenRpc, WsDeviceCloseRpc, WsDeviceDetailRpc, WsDeviceActionRpc, WsSubscribeDevicesRpc, WsServerProbeRpc, WsServerGetConfigRpc, WsServerRefreshProvidersRpc, WsServerProviderAuthStartRpc, WsServerProviderAuthCompleteRpc, WsServerProviderAuthCancelRpc, WsServerProviderAuthLogoutRpc, WsServerProviderAuthSubscribeRpc, WsServerProviderInstallStartRpc, WsServerProviderInstallCancelRpc, WsServerProviderInstallRemoveRpc, WsServerProviderInstallSubscribeRpc, WsServerUpdateProviderRpc, WsServerUpdateServerRpc, WsServerUpsertKeybindingRpc, WsServerRemoveKeybindingRpc, WsServerGetSettingsRpc, WsServerUpdateSettingsRpc, WsServerDiscoverSourceControlRpc, WsServerGetProviderUsageRpc, WsServerGetHostResourcesRpc, WsServerGetResourceTelemetryRpc, WsServerGetResourceTelemetryHistoryRpc, WsServerRetryResourceTelemetryRpc, WsSubscribeResourceTelemetryRpc, WsBtwAskRpc, WsBtwCancelRpc, WsServerGetUsageSummaryRpc, WsServerGetTraceDiagnosticsRpc, WsServerGetProcessDiagnosticsRpc, WsServerGetProcessResourceHistoryRpc, WsServerSignalProcessRpc, WsPullRequestsListRpc, WsPullRequestsListStatsRpc, WsPullRequestsDetailRpc, WsPullRequestsStackRpc, WsPullRequestsActivityRpc, WsPullRequestsDiffFileContentsRpc, WsPullRequestsRunActionRpc, WsPullRequestsUpdateRpc, WsPullRequestsCommentRpc, WsPullRequestsUpdateCommentRpc, WsPullRequestsSubmitReviewRpc, WsPullRequestsReplyToThreadRpc, WsPullRequestsSetThreadResolutionRpc, WsPullRequestsSetReactionRpc, WsPullRequestsInvalidateRpc, WsPullRequestsReviewerCandidatesRpc, WsPullRequestsRequestReviewersRpc, WsSourceControlLookupRepositoryRpc, WsSourceControlCloneRepositoryRpc, WsSourceControlPublishRepositoryRpc, WsProjectsListEntriesRpc, WsProjectsReadFileRpc, WsProjectsSearchContentsRpc, WsProjectsSearchEntriesRpc, WsProjectsWriteFileRpc, WsShellOpenInEditorRpc, WsFilesystemBrowseRpc, WsAssetsCreateUrlRpc, WsSubscribeVcsStatusRpc, WsVcsPullRpc, WsVcsRefreshStatusRpc, WsGitRunStackedActionRpc, WsGitResolvePullRequestRpc, WsGitPreparePullRequestThreadRpc, WsVcsListRefsRpc, WsVcsCreateWorktreeRpc, WsVcsRemoveWorktreeRpc, WsVcsCreateRefRpc, WsVcsSwitchRefRpc, WsVcsInitRpc, WsReviewGetDiffPreviewRpc, WsTerminalOpenRpc, WsTerminalAttachRpc, WsTerminalWriteRpc, WsTerminalResizeRpc, WsTerminalClearRpc, WsTerminalRestartRpc, WsTerminalCloseRpc, WsSubscribeTerminalEventsRpc, WsSubscribeTerminalMetadataRpc, WsPreviewOpenRpc, WsPreviewNavigateRpc, WsPreviewResizeRpc, WsPreviewRefreshRpc, WsPreviewCloseRpc, WsPreviewListRpc, WsPreviewReportStatusRpc, WsComputerUseConnectRpc, WsComputerUseListRpc, WsComputerUseControlsRpc, WsComputerUseControlRpc, WsComputerUsePreviewRpc, WsComputerUseRespondRpc, WsPreviewAutomationConnectRpc, WsPreviewAutomationRespondRpc, WsPreviewAutomationFocusHostRpc, WsSubscribePreviewEventsRpc, WsSubscribeDiscoveredLocalServersRpc, WsSubscribeServerConfigRpc, WsSubscribeServerLifecycleRpc, WsSubscribeAuthAccessRpc, WsTasksListRpc, WsTasksGetRpc, WsTasksCreateRpc, WsTasksUpdateRpc, WsTasksDeleteRpc, WsTasksStartThreadRpc, WsFeedListRpc, WsFeedRefreshRpc, WsFeedSourcesListRpc, WsFeedSourcesUpsertRpc, WsFeedSourcesDeleteRpc, WsFeedMarkReadRpc, WsFeedCleanupRpc, WsSubscribeTasksRpc, WsHubGetSyncStatusRpc, WsHubConnectRpc, WsHubDisconnectRpc, WsHubSetSyncModeRpc, WsHubSetShareModeRpc, WsHubMintTokenRpc, WsSkillsSyncRpc, WsSkillsPublishRpc, WsSkillsPublishAllRpc, WsSkillsUnpublishRpc, WsAssetsReadRpc, WsAssetsSaveRpc, WsAssetsDeleteRpc, WsAssetsCreateLocalRpc, WsAssetsRemoveLocalRpc, WsSkillRegistrySearchRpc, WsSkillRegistryFetchRpc, WsMcpListRpc, WsMcpSaveRpc, WsMcpRemoveRpc, WsMcpSetSecretRpc, WsMcpOAuthBeginRpc, WsMcpOAuthDisconnectRpc, WsTrackerStatusRpc, WsTrackerSetApiKeyRpc, WsTrackerClearApiKeyRpc, WsOrchestrationDispatchCommandRpc, WsOrchestrationGetTurnDiffRpc, WsOrchestrationGetWorkflowScriptRpc, WsOrchestrationGetFullThreadDiffRpc, WsOrchestrationSearchThreadsRpc, WsOrchestrationGetArchivedShellSnapshotRpc, WsOrchestrationSubscribeShellRpc, WsOrchestrationSubscribeThreadRpc);
+const WsRpcGroup = RpcGroup.make(WsDeviceGetStateRpc, WsDeviceListRpc, WsDeviceConfigureRpc, WsDeviceOpenRpc, WsDeviceCloseRpc, WsDeviceDetailRpc, WsDeviceActionRpc, WsSubscribeDevicesRpc, WsServerProbeRpc, WsServerGetConfigRpc, WsServerRefreshProvidersRpc, WsServerProviderAuthStartRpc, WsServerProviderAuthCompleteRpc, WsServerProviderAuthCancelRpc, WsServerProviderAuthLogoutRpc, WsServerProviderAuthSubscribeRpc, WsServerProviderInstallStartRpc, WsServerProviderInstallCancelRpc, WsServerProviderInstallRemoveRpc, WsServerProviderInstallSubscribeRpc, WsServerUpdateProviderRpc, WsServerUpdateServerRpc, WsServerUpsertKeybindingRpc, WsServerRemoveKeybindingRpc, WsServerGetSettingsRpc, WsServerUpdateSettingsRpc, WsServerDiscoverSourceControlRpc, WsServerGetProviderUsageRpc, WsServerGetHostResourcesRpc, WsServerGetResourceTelemetryRpc, WsServerGetResourceTelemetryHistoryRpc, WsServerRetryResourceTelemetryRpc, WsSubscribeResourceTelemetryRpc, WsThreadHandoffRpc, WsBtwAskRpc, WsBtwCancelRpc, WsServerGetUsageSummaryRpc, WsServerGetTraceDiagnosticsRpc, WsServerGetProcessDiagnosticsRpc, WsServerGetProcessResourceHistoryRpc, WsServerSignalProcessRpc, WsPullRequestsListRpc, WsPullRequestsListStatsRpc, WsPullRequestsDetailRpc, WsPullRequestsStackRpc, WsPullRequestsActivityRpc, WsPullRequestsDiffFileContentsRpc, WsPullRequestsRunActionRpc, WsPullRequestsUpdateRpc, WsPullRequestsCommentRpc, WsPullRequestsUpdateCommentRpc, WsPullRequestsSubmitReviewRpc, WsPullRequestsReplyToThreadRpc, WsPullRequestsSetThreadResolutionRpc, WsPullRequestsSetReactionRpc, WsPullRequestsInvalidateRpc, WsPullRequestsReviewerCandidatesRpc, WsPullRequestsRequestReviewersRpc, WsSourceControlLookupRepositoryRpc, WsSourceControlCloneRepositoryRpc, WsSourceControlPublishRepositoryRpc, WsProjectsListEntriesRpc, WsProjectsReadFileRpc, WsProjectsSearchContentsRpc, WsProjectsSearchEntriesRpc, WsProjectsWriteFileRpc, WsShellOpenInEditorRpc, WsFilesystemBrowseRpc, WsAssetsCreateUrlRpc, WsSubscribeVcsStatusRpc, WsVcsPullRpc, WsVcsRefreshStatusRpc, WsGitRunStackedActionRpc, WsGitResolvePullRequestRpc, WsGitPreparePullRequestThreadRpc, WsVcsListRefsRpc, WsVcsCreateWorktreeRpc, WsVcsRemoveWorktreeRpc, WsVcsCreateRefRpc, WsVcsSwitchRefRpc, WsVcsInitRpc, WsReviewGetDiffPreviewRpc, WsTerminalOpenRpc, WsTerminalAttachRpc, WsTerminalWriteRpc, WsTerminalResizeRpc, WsTerminalClearRpc, WsTerminalRestartRpc, WsTerminalCloseRpc, WsSubscribeTerminalEventsRpc, WsSubscribeTerminalMetadataRpc, WsPreviewOpenRpc, WsPreviewNavigateRpc, WsPreviewResizeRpc, WsPreviewRefreshRpc, WsPreviewCloseRpc, WsPreviewListRpc, WsPreviewReportStatusRpc, WsComputerUseConnectRpc, WsComputerUseListRpc, WsComputerUseControlsRpc, WsComputerUseControlRpc, WsComputerUsePreviewRpc, WsComputerUseRespondRpc, WsPreviewAutomationConnectRpc, WsPreviewAutomationRespondRpc, WsPreviewAutomationFocusHostRpc, WsSubscribePreviewEventsRpc, WsSubscribeDiscoveredLocalServersRpc, WsSubscribeServerConfigRpc, WsSubscribeServerLifecycleRpc, WsSubscribeAuthAccessRpc, WsTasksListRpc, WsTasksGetRpc, WsTasksCreateRpc, WsTasksUpdateRpc, WsTasksDeleteRpc, WsTasksStartThreadRpc, WsFeedListRpc, WsFeedRefreshRpc, WsFeedSourcesListRpc, WsFeedSourcesUpsertRpc, WsFeedSourcesDeleteRpc, WsFeedMarkReadRpc, WsFeedCleanupRpc, WsSubscribeTasksRpc, WsHubGetSyncStatusRpc, WsHubConnectRpc, WsHubDisconnectRpc, WsHubSetSyncModeRpc, WsHubSetShareModeRpc, WsHubMintTokenRpc, WsSkillsSyncRpc, WsSkillsPublishRpc, WsSkillsPublishAllRpc, WsSkillsUnpublishRpc, WsAssetsReadRpc, WsAssetsSaveRpc, WsAssetsDeleteRpc, WsAssetsCreateLocalRpc, WsAssetsRemoveLocalRpc, WsSkillRegistrySearchRpc, WsSkillRegistryFetchRpc, WsMcpListRpc, WsMcpSaveRpc, WsMcpRemoveRpc, WsMcpSetSecretRpc, WsMcpOAuthBeginRpc, WsMcpOAuthDisconnectRpc, WsTrackerStatusRpc, WsTrackerSetApiKeyRpc, WsTrackerClearApiKeyRpc, WsOrchestrationDispatchCommandRpc, WsOrchestrationGetTurnDiffRpc, WsOrchestrationGetWorkflowScriptRpc, WsOrchestrationGetFullThreadDiffRpc, WsOrchestrationSearchThreadsRpc, WsOrchestrationGetArchivedShellSnapshotRpc, WsOrchestrationSubscribeShellRpc, WsOrchestrationSubscribeThreadRpc);
 //#endregion
 //#region ../../packages/shared/src/oauthScope.ts
 const OAUTH_SCOPE_TOKEN = /^[\u0021\u0023-\u005b\u005d-\u007e]+$/u;
@@ -14946,7 +15035,7 @@ function deriveAuthClientMetadata(input) {
 //#endregion
 //#region src/auth/EnvironmentAuthPolicy.ts
 var EnvironmentAuthPolicy = class extends Context.Service()("@p4code/cli/auth/EnvironmentAuthPolicy") {};
-const make$113 = Effect.gen(function* () {
+const make$114 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const isRemoteReachable = isRemoteReachableHost(config.host);
 	const policy = config.mode === "desktop" ? isRemoteReachable ? "remote-reachable" : "desktop-managed-local" : isRemoteReachable ? "remote-reachable" : "loopback-browser";
@@ -14964,7 +15053,7 @@ const make$113 = Effect.gen(function* () {
 	};
 	return EnvironmentAuthPolicy.of({ getDescriptor: () => Effect.succeed(descriptor).pipe(Effect.withSpan("EnvironmentAuthPolicy.getDescriptor")) });
 });
-const layer$116 = Layer.effect(EnvironmentAuthPolicy, make$113);
+const layer$117 = Layer.effect(EnvironmentAuthPolicy, make$114);
 //#endregion
 //#region src/persistence/Errors.ts
 function summarizeSchemaIssue(issue) {
@@ -15145,7 +15234,7 @@ function toPersistenceSqlOrDecodeError$6(sqlOperation, decodeOperation, correlat
 		cause
 	});
 }
-const make$112 = Effect.gen(function* () {
+const make$113 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const createSessionRow = SqlSchema.void({
 		Request: CreateAuthSessionInput,
@@ -15279,7 +15368,7 @@ const make$112 = Effect.gen(function* () {
 		setLastConnectedAt
 	};
 });
-const layer$115 = Layer.effect(AuthSessionRepository, make$112);
+const layer$116 = Layer.effect(AuthSessionRepository, make$113);
 //#endregion
 //#region src/auth/ServerSecretStore.ts
 const secretStoreErrorContext = {
@@ -15421,11 +15510,11 @@ const makeForDirectory = Effect.fn("ServerSecretStore.makeForDirectory")(functio
 		remove
 	});
 });
-const make$111 = Effect.gen(function* () {
+const make$112 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	return yield* makeForDirectory(config.secretsDir);
 });
-const layer$114 = Layer.effect(ServerSecretStore, make$111);
+const layer$115 = Layer.effect(ServerSecretStore, make$112);
 //#endregion
 //#region src/auth/SessionStore.ts
 var MalformedSessionTokenError = class extends Schema$1.TaggedErrorClass()("MalformedSessionTokenError", {}) {
@@ -15663,7 +15752,7 @@ function toAuthClientSession(input) {
 		current: false
 	};
 }
-const make$110 = Effect.gen(function* () {
+const make$111 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const serverConfig = yield* ServerConfig$1;
 	const secretStore = yield* ServerSecretStore;
@@ -15978,7 +16067,7 @@ const make$110 = Effect.gen(function* () {
 		markDisconnected
 	});
 });
-const layer$113 = Layer.effect(SessionStore, make$110).pipe(Layer.provideMerge(layer$115));
+const layer$114 = Layer.effect(SessionStore, make$111).pipe(Layer.provideMerge(layer$116));
 //#endregion
 //#region src/persistence/AuthPairingLinks.ts
 const AuthPairingLinkRecord = Schema$1.Struct({
@@ -16039,7 +16128,7 @@ function toPersistenceSqlOrDecodeError$5(sqlOperation, decodeOperation, correlat
 		cause
 	});
 }
-const make$109 = Effect.gen(function* () {
+const make$110 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const createPairingLinkRow = SqlSchema.void({
 		Request: CreateAuthPairingLinkInput,
@@ -16174,7 +16263,7 @@ const make$109 = Effect.gen(function* () {
 		getByCredential
 	};
 });
-const layer$112 = Layer.effect(AuthPairingLinkRepository, make$109);
+const layer$113 = Layer.effect(AuthPairingLinkRepository, make$110);
 //#endregion
 //#region src/auth/PairingGrantStore.ts
 var UnknownBootstrapCredentialError = class extends Schema$1.TaggedErrorClass()("UnknownBootstrapCredentialError", {}) {
@@ -16269,7 +16358,7 @@ const DEV_STARTUP_TTL_HOURS = Duration.hours(24);
 const PAIRING_TOKEN_ALPHABET = "23456789ABCDEFGHJKLMNPQRSTUVWXYZ";
 const PAIRING_TOKEN_LENGTH = 12;
 const PAIRING_TOKEN_REJECTION_LIMIT = Math.floor(256 / 32) * 32;
-const make$108 = Effect.gen(function* () {
+const make$109 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const config = yield* ServerConfig$1;
 	const pairingLinks = yield* AuthPairingLinkRepository;
@@ -16467,7 +16556,7 @@ const make$108 = Effect.gen(function* () {
 		consume
 	});
 });
-const layer$111 = Layer.effect(PairingGrantStore, make$108).pipe(Layer.provideMerge(layer$112));
+const layer$112 = Layer.effect(PairingGrantStore, make$109).pipe(Layer.provideMerge(layer$113));
 //#endregion
 //#region src/persistence/DatabaseSnapshot.ts
 /**
@@ -16599,6 +16688,11 @@ const discardDatabaseSnapshot = Effect.fn("discardDatabaseSnapshot")(function* (
 	yield* fs.remove(paths.stagingPath, { force: true });
 });
 //#endregion
+//#region src/persistence/Migrations/059_FusionReviewExperiment.ts
+var _059_FusionReviewExperiment_default = Effect.gen(function* () {
+	yield* (yield* SqlClient.SqlClient)`ALTER TABLE thread_pairs ADD COLUMN review_experiment_json TEXT`;
+});
+//#endregion
 //#region src/persistence/Migrations/001_OrchestrationEvents.ts
 var _001_OrchestrationEvents_default = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
@@ -18770,6 +18864,11 @@ const migrationEntries = [
 		58,
 		"HubActivityOutbound",
 		_058_HubActivityOutbound_default
+	],
+	[
+		59,
+		"FusionReviewExperiment",
+		_059_FusionReviewExperiment_default
 	]
 ];
 const makeMigrationLoader = (throughId) => Migrator.fromRecord(Object.fromEntries(migrationEntries.filter(([id]) => throughId === void 0 || id <= throughId).map(([id, name, migration]) => [`${id}_${name}`, migration])));
@@ -19798,7 +19897,7 @@ function parseBearerToken(request) {
 	const token = header.slice(7).trim();
 	return token.length > 0 ? token : null;
 }
-const make$107 = Effect.gen(function* () {
+const make$108 = Effect.gen(function* () {
 	const policy = yield* EnvironmentAuthPolicy;
 	const bootstrapCredentials = yield* PairingGrantStore;
 	const sessions = yield* SessionStore;
@@ -19993,9 +20092,9 @@ const make$107 = Effect.gen(function* () {
 		issueStartupPairingUrl
 	});
 });
-const layer$110 = Layer.effect(EnvironmentAuth, make$107).pipe(Layer.provideMerge(layer$111), Layer.provideMerge(layer$113), Layer.provideMerge(layer$116));
-const storageLayer = Layer.mergeAll(layer$114, layerConfig);
-const runtimeLayer = layer$110.pipe(Layer.provideMerge(storageLayer));
+const layer$111 = Layer.effect(EnvironmentAuth, make$108).pipe(Layer.provideMerge(layer$112), Layer.provideMerge(layer$114), Layer.provideMerge(layer$117));
+const storageLayer = Layer.mergeAll(layer$115, layerConfig);
+const runtimeLayer = layer$111.pipe(Layer.provideMerge(storageLayer));
 //#endregion
 //#region ../../packages/shared/src/Struct.ts
 function deepMerge(current, patch) {
@@ -21843,7 +21942,7 @@ const runWithEnvironmentAuth = (flags, run, options) => Effect.gen(function* ()
 	}
 	return yield* Effect.gen(function* () {
 		return yield* run(yield* EnvironmentAuth);
-	}).pipe(Effect.provide(Layer.mergeAll(runtimeLayer).pipe(Layer.provide(layer$117(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)))));
+	}).pipe(Effect.provide(Layer.mergeAll(runtimeLayer).pipe(Layer.provide(layer$118(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)))));
 });
 const ttlFlag = Flag.string("ttl").pipe(Flag.withSchema(DurationFromString), Flag.withDescription("TTL, for example `5m`, `1h`, `30d`, or `15 minutes`."), Flag.optional);
 const jsonFlag = Flag.boolean("json").pipe(Flag.withDescription("Emit JSON instead of human-readable output."), Flag.withDefault(false));
@@ -21989,7 +22088,7 @@ const DEFAULT_LIMITS = {
 	windowMillis: FAILURE_WINDOW_MS$1,
 	blockMillis: BLOCK_DURATION_MS
 };
-const make$106 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_LIMITS) {
+const make$107 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_LIMITS) {
 	const state = yield* Ref.make(initialThrottleState);
 	return HubAuthThrottle.of({
 		shouldRefuse: Effect.gen(function* () {
@@ -22003,7 +22102,7 @@ const make$106 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_L
 		})
 	});
 });
-const layer$109 = Layer.effect(HubAuthThrottle, make$106());
+const layer$110 = Layer.effect(HubAuthThrottle, make$107());
 //#endregion
 //#region src/hub/HubAuth.ts
 /**
@@ -22771,7 +22870,7 @@ const TaskRepositoryLive = Layer.effect(TaskRepository, makeTaskRepository);
 //#region src/hub/HubClientRevocations.ts
 var HubClientRevocations = class extends Context.Service()("@p4code/cli/hub/HubClientRevocations") {};
 /** Coalesced invalidations carry no identity or credential; consumers recheck durable state. */
-const layer$108 = Layer.effect(HubClientRevocations, Effect.gen(function* () {
+const layer$109 = Layer.effect(HubClientRevocations, Effect.gen(function* () {
 	const changes = yield* PubSub.sliding(1);
 	yield* Effect.addFinalizer(() => PubSub.shutdown(changes));
 	return HubClientRevocations.of({
@@ -23009,7 +23108,7 @@ const hubClientPreflight = Effect.gen(function* () {
 		}
 	});
 });
-const layer$107 = Layer.mergeAll(Layer.empty, ...Object.keys(CLIENT_ROUTES).map((path) => HttpRouter.add("OPTIONS", path, hubClientPreflight)));
+const layer$108 = Layer.mergeAll(Layer.empty, ...Object.keys(CLIENT_ROUTES).map((path) => HttpRouter.add("OPTIONS", path, hubClientPreflight)));
 const HUB_TUNNEL_MAX_FRAME_PAYLOAD_BYTES = 64 * 1024;
 const HUB_TUNNEL_MAX_MESSAGE_BYTES = 128 * 1024 * 1024;
 const HUB_TUNNEL_FRAME_MAGIC = 1345606705;
@@ -23296,7 +23395,7 @@ var HubTunnelConnectorBudget = class {
 const HUB_TUNNEL_RETIRE_TIMEOUT_MS = 1e4;
 var HubTunnelUnavailable = class extends Data.TaggedError("HubTunnelUnavailable") {};
 var HubTunnelRegistry = class extends Context.Service()("@p4code/cli/hub/HubTunnelRegistry") {};
-const layer$106 = Layer.effect(HubTunnelRegistry, Effect.gen(function* () {
+const layer$107 = Layer.effect(HubTunnelRegistry, Effect.gen(function* () {
 	const config = yield* HubConfig;
 	const lock = yield* Semaphore.make(1);
 	const entries = /* @__PURE__ */ new Map();
@@ -23549,7 +23648,7 @@ const makeHubClientSocketTickets = Effect.gen(function* () {
 	};
 });
 var HubClientSocketTickets = class extends Context.Service()("@p4code/cli/hub/HubClientSocketTickets") {};
-const layer$105 = Layer.effect(HubClientSocketTickets, makeHubClientSocketTickets);
+const layer$106 = Layer.effect(HubClientSocketTickets, makeHubClientSocketTickets);
 //#endregion
 //#region src/hub/HubClientLease.ts
 /** Other Hub processes sharing the database are observed within this interval. */
@@ -23705,7 +23804,7 @@ const socketTicket = handle$1(Effect.gen(function* () {
 		}
 	}));
 }), "client-route");
-const layer$104 = Layer.mergeAll(layer$107, HttpRouter.add("POST", "/v1/clients/me/socket-ticket", withHubClientCors(socketTicket)), HttpRouter.add("POST", "/v1/client-enrollments", issue$1), HttpRouter.add("POST", "/v1/client-enrollments/exchange", withHubClientCors(exchange$1)), HttpRouter.add("GET", "/v1/clients/me", withHubClientCors(identity$2)), HttpRouter.add("GET", "/v1/clients/me/events", withHubClientCors(events)), HttpRouter.add("DELETE", "/v1/clients/me", withHubClientCors(signOut)), HttpRouter.add("POST", "/v1/clients/revoke", revoke));
+const layer$105 = Layer.mergeAll(layer$108, HttpRouter.add("POST", "/v1/clients/me/socket-ticket", withHubClientCors(socketTicket)), HttpRouter.add("POST", "/v1/client-enrollments", issue$1), HttpRouter.add("POST", "/v1/client-enrollments/exchange", withHubClientCors(exchange$1)), HttpRouter.add("GET", "/v1/clients/me", withHubClientCors(identity$2)), HttpRouter.add("GET", "/v1/clients/me/events", withHubClientCors(events)), HttpRouter.add("DELETE", "/v1/clients/me", withHubClientCors(signOut)), HttpRouter.add("POST", "/v1/clients/revoke", revoke));
 //#endregion
 //#region src/hub/HubPushTokenProtection.ts
 const KEY_NAME = "hub-push-token-encryption-v1";
@@ -23985,12 +24084,12 @@ const persistHubAgentActivity = Effect.fn("HubNotificationActivity.persist")(fun
 var HubSecretStoreUnavailable = class extends Data.TaggedError("HubSecretStoreUnavailable") {};
 const HUB_SECRETS_SUFFIX = ".secrets";
 /** Dedicated sibling directory per Hub database; no environment configuration is consulted. */
-const make$105 = Effect.gen(function* () {
+const make$106 = Effect.gen(function* () {
 	const config = yield* HubConfig;
 	if (!(yield* Path$1.Path).isAbsolute(config.dbPath)) return yield* Effect.fail(new HubSecretStoreUnavailable({ message: "Hub secret storage requires an absolute database path." }));
 	return yield* makeForDirectory(`${config.dbPath}${HUB_SECRETS_SUFFIX}`);
 });
-const layer$103 = Layer.effect(ServerSecretStore, make$105);
+const layer$104 = Layer.effect(ServerSecretStore, make$106);
 //#endregion
 //#region src/hub/HubNotificationRoutes.ts
 const MAX_NOTIFICATION_BODY_BYTES = 16 * 1024;
@@ -24034,7 +24133,7 @@ const makeRoutes = Effect.gen(function* () {
 	}))));
 });
 /** Launch-only composition: isolated Hub HTTP tests need no filesystem credential store. */
-const layer$102 = Layer.unwrap(makeRoutes).pipe(Layer.provide(layer$103));
+const layer$103 = Layer.unwrap(makeRoutes).pipe(Layer.provide(layer$104));
 //#endregion
 //#region src/hub/HubApnsCredentials.ts
 const HUB_APNS_CREDENTIAL_SECRET = "hub-apns-credentials-v1";
@@ -24605,7 +24704,7 @@ const MAX_APNS_REQUEST_BYTES = 4096;
 const CLEANUP_TIMEOUT_MS$1 = 1e3;
 const MAX_REQUEST_BYTES$2 = 8 * 1024;
 const MAX_RESPONSE_BYTES$8 = 16 * 1024;
-const REQUEST_TIMEOUT_MS$6 = 8e3;
+const REQUEST_TIMEOUT_MS$7 = 8e3;
 const MAX_AUTH_CHARS = 8192;
 const unavailable$6 = () => ({
 	outcome: "retry",
@@ -24650,7 +24749,7 @@ const sendHubApns = Effect.fn("HubPushTransport.apns")(function* (input) {
 				finish(unavailable$6());
 				return;
 			}
-			timer = setTimeout(() => finish(unavailable$6()), REQUEST_TIMEOUT_MS$6);
+			timer = setTimeout(() => finish(unavailable$6()), REQUEST_TIMEOUT_MS$7);
 			session = NodeHttp2.connect(input.sandbox ? "https://api.sandbox.push.apple.com" : "https://api.push.apple.com", { maxHeaderListPairs: 32 });
 			session.on("error", () => finish(unavailable$6()));
 			session.on("close", () => finish(unavailable$6()));
@@ -24705,7 +24804,7 @@ const sendHubFcm = Effect.fn("HubPushTransport.fcm")(function* (input, fetcher =
 			const abort = () => owner.abort();
 			signal.addEventListener("abort", abort, { once: true });
 			if (signal.aborted) owner.abort();
-			const timeout = setTimeout(abort, REQUEST_TIMEOUT_MS$6);
+			const timeout = setTimeout(abort, REQUEST_TIMEOUT_MS$7);
 			let reader;
 			try {
 				const response = await fetcher(`https://fcm.googleapis.com/v1/projects/${input.projectId}/messages:send`, {
@@ -24746,7 +24845,7 @@ const sendHubFcm = Effect.fn("HubPushTransport.fcm")(function* (input, fetcher =
 			}
 		},
 		catch: () => unavailable$6()
-	}).pipe(Effect.timeout(REQUEST_TIMEOUT_MS$6), Effect.catch(() => Effect.succeed(unavailable$6())));
+	}).pipe(Effect.timeout(REQUEST_TIMEOUT_MS$7), Effect.catch(() => Effect.succeed(unavailable$6())));
 });
 //#endregion
 //#region src/hub/HubNotificationRuntime.ts
@@ -24777,10 +24876,10 @@ const makeHubNotificationProvider = Effect.fn("HubNotificationRuntime.provider")
 	});
 });
 const runHubNotificationSchedule = (batch) => batch.pipe(Effect.asVoid, Effect.catch(() => Effect.logWarning("Hub notification delivery unavailable.")), Effect.repeat(Schedule.spaced(Duration.millis(HUB_NOTIFICATION_INTERVAL_MS))));
-const layer$101 = Layer.effectDiscard(Effect.gen(function* () {
+const layer$102 = Layer.effectDiscard(Effect.gen(function* () {
 	const batch = yield* makeHubNotificationDelivery(yield* makeHubNotificationProvider());
 	yield* runHubNotificationSchedule(batch()).pipe(Effect.forkScoped);
-})).pipe(Layer.provide(layer$103));
+})).pipe(Layer.provide(layer$104));
 const HUB_RETIREMENT_TIMEOUT_MS = 1e4;
 const HUB_RETIREMENT_CLAIM_MS = 3e4;
 const HUB_RETIREMENT_TTL_MS = 1440 * 60 * 1e3;
@@ -24947,10 +25046,10 @@ const HUB_RETIREMENT_INTERVAL_MS = 5e3;
 /** One bounded batch per tick; persisted due times control retries, never an in-memory retry loop. */
 const runHubRetirementSchedule = (batch) => batch.pipe(Effect.asVoid, Effect.catch(() => Effect.logWarning("Hub retirement delivery unavailable.")), Effect.repeat(Schedule.spaced(Duration.millis(HUB_RETIREMENT_INTERVAL_MS))));
 /** Secret store remains private to notification runtime rather than becoming a general Hub dependency. */
-const layer$100 = Layer.effectDiscard(Effect.gen(function* () {
+const layer$101 = Layer.effectDiscard(Effect.gen(function* () {
 	const batch = yield* makeHubPushRetirementDelivery(yield* makeHubRetirementProvider());
 	yield* runHubRetirementSchedule(batch()).pipe(Effect.forkScoped);
-})).pipe(Layer.provide(layer$103));
+})).pipe(Layer.provide(layer$104));
 /** One bounded keyset page; callers resume the receipt and restart from null after a full sweep. */
 const reconcileHubPushRegistrations = Effect.fn("HubPushReconciliation.page")(function* (afterClientId = null) {
 	const sql = yield* SqlClient.SqlClient;
@@ -24993,7 +25092,7 @@ const sweepHubPushRegistrations = Effect.fn("HubPushReconciliation.sweep")(funct
 	};
 });
 /** Scoped schedule prevents overlapping sweeps and cancels both page work and waiting on shutdown. */
-const layer$99 = Layer.effectDiscard(Effect.gen(function* () {
+const layer$100 = Layer.effectDiscard(Effect.gen(function* () {
 	yield* sweepHubPushRegistrations(reconcileHubPushRegistrations).pipe(Effect.catch(() => Effect.logWarning("Hub notification reconciliation unavailable.")), Effect.repeat(Schedule.spaced(Duration.millis(HUB_PUSH_RECONCILIATION_INTERVAL_MS))), Effect.forkScoped);
 }));
 //#endregion
@@ -25024,7 +25123,7 @@ const hubMdxHost = Effect.gen(function* () {
 		}
 	});
 }).pipe(Effect.catch(() => Effect.succeed(HttpServerResponse.empty({ status: 503 }))));
-const layer$98 = Layer.mergeAll(HttpRouter.add("GET", "/mdx-host.html", hubMdxHost), HttpRouter.add("GET", "/mdx-jsx-runtime.js", hubMdxHost), HttpRouter.add("GET", "/assets/:file", hubMdxHost));
+const layer$99 = Layer.mergeAll(HttpRouter.add("GET", "/mdx-host.html", hubMdxHost), HttpRouter.add("GET", "/mdx-jsx-runtime.js", hubMdxHost), HttpRouter.add("GET", "/assets/:file", hubMdxHost));
 //#endregion
 //#region ../../packages/shared/src/hubAssetGrant.ts
 /** Managed assets retain the environment's signed grant root for relative preview resources. */
@@ -25109,7 +25208,7 @@ const makeHubClientAssetGrants = Effect.gen(function* () {
 	};
 });
 var HubClientAssetGrants = class extends Context.Service()("@p4code/cli/hub/HubClientAssetGrants") {};
-const layer$97 = Layer.effect(HubClientAssetGrants, makeHubClientAssetGrants);
+const layer$98 = Layer.effect(HubClientAssetGrants, makeHubClientAssetGrants);
 //#endregion
 //#region src/hub/HubTunnelHttpRequestProducer.ts
 /** Consumes the ingress request lazily under its stream producer; transport admission owns frame copies. */
@@ -25411,7 +25510,7 @@ const writeHubTunnelNativeResponse = Effect.fn("HubTunnelNativeResponse.write")(
 //#region src/hub/HubTunnelPublished.ts
 const MAX_STREAM_ID$1 = 4294967295;
 var HubTunnelPublished = class extends Context.Service()("@p4code/cli/hub/HubTunnelPublished") {};
-const layer$96 = Layer.effect(HubTunnelPublished, Effect.gen(function* () {
+const layer$97 = Layer.effect(HubTunnelPublished, Effect.gen(function* () {
 	const registry = yield* HubTunnelRegistry;
 	const entries = /* @__PURE__ */ new Map();
 	const current = (lease) => Effect.gen(function* () {
@@ -25597,7 +25696,7 @@ const hubTunnelHttpRoute = Effect.gen(function* () {
 	const response = yield* authenticatedRoute;
 	return HttpServerResponse.setHeaders(response, cors);
 });
-const layer$95 = HttpRouter.add("*", `${HUB_TUNNEL_HTTP_PATH}/*`, hubTunnelHttpRoute);
+const layer$96 = HttpRouter.add("*", `${HUB_TUNNEL_HTTP_PATH}/*`, hubTunnelHttpRoute);
 //#endregion
 //#region src/hub/HubAssetRoutes.ts
 const MAX_GRANT_BODY_BYTES = 8192;
@@ -25657,7 +25756,7 @@ const hubAssetRoute = Effect.gen(function* () {
 		}
 	}))));
 });
-const layer$94 = Layer.mergeAll(HttpRouter.add("POST", "/v1/clients/me/asset-grant", issue), HttpRouter.add("*", `${HUB_ASSET_PATH}/*`, hubAssetRoute));
+const layer$95 = Layer.mergeAll(HttpRouter.add("POST", "/v1/clients/me/asset-grant", issue), HttpRouter.add("*", `${HUB_ASSET_PATH}/*`, hubAssetRoute));
 //#endregion
 //#region src/hub/HubComputerUseIdentity.ts
 /** A server identity is not a helper identity or a client pairing credential. */
@@ -25745,7 +25844,7 @@ const readBody = Effect.fn("hub.computerUse.readBody")(function* (request) {
 	return (yield* request.stream.pipe(Stream.runFoldEffect(() => Buffer.alloc(0), (body, chunk) => body.byteLength + chunk.byteLength > MAX_REQUEST_BYTES$1 ? Effect.fail(new HubComputerUseRoutesFailure({ message: "Computer Use enrollment body exceeds limit" })) : Effect.succeed(Buffer.concat([body, chunk]))))).toString("utf8");
 });
 /** Server-to-server delegation only. A Hub identity does not authenticate an ordinary environment client. */
-const layer$93 = Layer.unwrap(Effect.gen(function* () {
+const layer$94 = Layer.unwrap(Effect.gen(function* () {
 	const enrollments = makeHubComputerUseEnrollments(yield* HubConfig);
 	const handle = Effect.fn("hub.computerUse.handle")(function* (operation) {
 		const environmentId = yield* authenticateHubComputerUseServer();
@@ -26554,7 +26653,7 @@ const hubTunnelConnectorRoute = Effect.gen(function* () {
 	status: 503,
 	headers: { "cache-control": "no-store" }
 }))));
-const layer$92 = HttpRouter.add("GET", HUB_TUNNEL_CONNECTOR_PATH, hubTunnelConnectorRoute);
+const layer$93 = HttpRouter.add("GET", HUB_TUNNEL_CONNECTOR_PATH, hubTunnelConnectorRoute);
 const TICKET_PATTERN = /^[a-f0-9]{64}$/;
 const MAX_TICKETED_URL_CHARS = 8512;
 /** Remove only Hub transport authentication; retain environment query bytes and order exactly. */
@@ -26745,7 +26844,7 @@ const hubTunnelClientSocketRoute = Effect.gen(function* () {
 	}
 	return unavailable$5();
 })));
-const layer$91 = HttpRouter.add("GET", `${HUB_TUNNEL_CLIENT_SOCKET_PATH}/*`, hubTunnelClientSocketRoute);
+const layer$92 = HttpRouter.add("GET", `${HUB_TUNNEL_CLIENT_SOCKET_PATH}/*`, hubTunnelClientSocketRoute);
 //#endregion
 //#region src/hub/HubHttpServer.ts
 /**
@@ -27242,8 +27341,8 @@ const releaseFeedLeaseRoute = HttpRouter.add("DELETE", "/feed/lease", respondToH
 	return HttpServerResponse.empty({ status: 204 });
 })));
 /** Provide around HttpRouter.serve so request fibers share these process-owned services. */
-const routingServices = Layer.mergeAll(layer$108, layer$105, layer$97, layer$96).pipe(Layer.provideMerge(layer$106));
-const layer$90 = Layer.mergeAll(layer$95, layer$94, layer$98, layer$92, layer$91, layer$104, layer$93, healthRoute, identityRoute, listTasksRoute, getTaskRoute, createTaskRoute, putTaskRoute, updateTaskRoute, deleteTaskRoute, listAssetsRoute, getAssetRoute, putAssetRoute, deleteAssetRoute, listFeedSourcesRoute, upsertFeedSourceRoute, deleteFeedSourceRoute, listFeedRoute, putFeedArticleRoute, putFeedEngagementRoute, markFeedReadRoute, cleanupFeedRoute, setFeedRefreshedAtRoute, acquireFeedLeaseRoute, renewFeedLeaseRoute, releaseFeedLeaseRoute).pipe(Layer.provideMerge(layer$108), Layer.provideMerge(layer$105), Layer.provideMerge(layer$97));
+const routingServices = Layer.mergeAll(layer$109, layer$106, layer$98, layer$97).pipe(Layer.provideMerge(layer$107));
+const layer$91 = Layer.mergeAll(layer$96, layer$95, layer$99, layer$93, layer$92, layer$105, layer$94, healthRoute, identityRoute, listTasksRoute, getTaskRoute, createTaskRoute, putTaskRoute, updateTaskRoute, deleteTaskRoute, listAssetsRoute, getAssetRoute, putAssetRoute, deleteAssetRoute, listFeedSourcesRoute, upsertFeedSourceRoute, deleteFeedSourceRoute, listFeedRoute, putFeedArticleRoute, putFeedEngagementRoute, markFeedReadRoute, cleanupFeedRoute, setFeedRefreshedAtRoute, acquireFeedLeaseRoute, renewFeedLeaseRoute, releaseFeedLeaseRoute).pipe(Layer.provideMerge(layer$109), Layer.provideMerge(layer$106), Layer.provideMerge(layer$98));
 //#endregion
 //#region src/hub/Migrations/001_Tasks.ts
 /**
@@ -27931,7 +28030,7 @@ const announce = Layer.effectDiscard(Effect.gen(function* () {
 	});
 	if (isRemoteReachableHost(config.host)) yield* Effect.logWarning("Hub is reachable beyond loopback. The bearer token is the only control — repeated auth failures are not rate limited.", { host: config.host });
 }));
-const makeHubLayer = HttpRouter.serve(Layer.mergeAll(layer$90, layer$102)).pipe(Layer.provideMerge(routingServices), Layer.provideMerge(layer$100), Layer.provideMerge(layer$101), Layer.provideMerge(layer$99), Layer.provideMerge(announce), Layer.provideMerge(HubHttpServerLive), Layer.provideMerge(layer$109), Layer.provideMerge(TaskRepositoryLive), Layer.provideMerge(AgentAssetRepositoryLive), Layer.provideMerge(HubPersistenceLive));
+const makeHubLayer = HttpRouter.serve(Layer.mergeAll(layer$91, layer$103)).pipe(Layer.provideMerge(routingServices), Layer.provideMerge(layer$101), Layer.provideMerge(layer$102), Layer.provideMerge(layer$100), Layer.provideMerge(announce), Layer.provideMerge(HubHttpServerLive), Layer.provideMerge(layer$110), Layer.provideMerge(TaskRepositoryLive), Layer.provideMerge(AgentAssetRepositoryLive), Layer.provideMerge(HubPersistenceLive));
 const runHub = Layer.launch(makeHubLayer);
 //#endregion
 //#region src/atomicWrite.ts
@@ -28062,7 +28161,7 @@ function stripDefaultServerSettings(current, defaults) {
 	}
 	return Object.is(current, defaults) ? void 0 : current;
 }
-const make$104 = Effect.gen(function* () {
+const make$105 = Effect.gen(function* () {
 	const { settingsPath } = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const pathService = yield* Path$1.Path;
@@ -28284,7 +28383,7 @@ const make$104 = Effect.gen(function* () {
 		}
 	};
 });
-const layer$89 = Layer.effect(ServerSettingsService, make$104);
+const layer$90 = Layer.effect(ServerSettingsService, make$105);
 //#endregion
 //#region src/pathExpansion.ts
 /**
@@ -28946,7 +29045,7 @@ function claudeEntryFromRegistration(registration) {
 	};
 }
 var ClaudeMcpFiles = class extends Context.Service()("@p4code/cli/mcp/ClaudeMcpFiles") {};
-const make$103 = Effect.gen(function* () {
+const make$104 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const services = yield* Effect.context();
@@ -29013,7 +29112,7 @@ const make$103 = Effect.gen(function* () {
 		removeProject: (projectDir, name) => removeAt(Effect.succeed(projectFile(projectDir)))(name)
 	};
 });
-const layer$88 = Layer.effect(ClaudeMcpFiles, make$103);
+const layer$89 = Layer.effect(ClaudeMcpFiles, make$104);
 Layer.succeed(ClaudeMcpFiles, {
 	readUser: Effect.succeed([]),
 	readUserAt: () => Effect.succeed([]),
@@ -29151,7 +29250,7 @@ const decodeClientRegistration = Schema$1.decodeUnknownExit(ClientRegistrationRe
 const decodeTokenResponse = Schema$1.decodeUnknownExit(TokenResponse);
 var McpOAuth = class extends Context.Service()("@p4code/cli/mcp/McpOAuth") {};
 const registryError = (detail) => new McpRegistryError({ detail });
-const make$102 = Effect.gen(function* () {
+const make$103 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const secrets = yield* ServerSecretStore;
 	const http = yield* HttpClient.HttpClient;
@@ -29471,7 +29570,7 @@ const make$102 = Effect.gen(function* () {
 		accessTokenFor
 	};
 });
-const layer$87 = Layer.effect(McpOAuth, make$102);
+const layer$88 = Layer.effect(McpOAuth, make$103);
 Layer.succeed(McpOAuth, {
 	statusFor: () => Effect.succeed(Option.none()),
 	begin: () => Effect.fail(new McpRegistryError({ detail: "OAuth sign-in is not available." })),
@@ -29489,7 +29588,7 @@ const decodeRegistration$1 = Schema$1.decodeUnknownExit(RegistrationFromJson$1);
 const encodeRegistration = Schema$1.encodeSync(RegistrationFromJson$1);
 var McpRegistry = class extends Context.Service()("@p4code/cli/mcp/McpRegistry") {};
 const slotsOf = (registration) => registration.secrets ?? [];
-const make$101 = Effect.gen(function* () {
+const make$102 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const secrets = yield* ServerSecretStore;
 	const oauth = yield* McpOAuth;
@@ -29663,7 +29762,7 @@ const make$101 = Effect.gen(function* () {
 		resolveForSessionAtClaudeUserConfigPath
 	};
 });
-const layer$86 = Layer.effect(McpRegistry, make$101);
+const layer$87 = Layer.effect(McpRegistry, make$102);
 //#endregion
 //#region src/sync/skillDirectory.ts
 /**
@@ -30042,7 +30141,7 @@ const formatHubLink = (input) => encodeStoredHubLink({
 	shareMode: input.shareMode
 });
 const fromEnvironment = (environment) => validateHubLink(environment.P4CODE_HUB_URL ?? "", environment.P4CODE_HUB_TOKEN ?? "");
-const make$100 = Effect.fn("HubLink.make")(function* (environment) {
+const make$101 = Effect.fn("HubLink.make")(function* (environment) {
 	const secrets = yield* ServerSecretStore;
 	const env = environment ?? process.env;
 	const fromEnv = fromEnvironment(env);
@@ -30115,7 +30214,7 @@ const make$100 = Effect.fn("HubLink.make")(function* (environment) {
 		})
 	};
 });
-const layer$85 = Layer.effect(HubLink, make$100());
+const layer$86 = Layer.effect(HubLink, make$101());
 //#endregion
 //#region src/sync/HubAssetClient.ts
 /**
@@ -30148,7 +30247,7 @@ const decodeAssetListPage = Schema$1.decodeUnknownEffect(AssetListPage);
 const decodeConflictBody$1 = Schema$1.decodeUnknownEffect(ConflictBody$1);
 const decodeAsset = Schema$1.decodeUnknownEffect(AgentAsset);
 var HubAssetClient = class extends Context.Service()("@p4code/cli/sync/HubAssetClient") {};
-const make$99 = Effect.gen(function* () {
+const make$100 = Effect.gen(function* () {
 	const http = yield* HttpClient.HttpClient;
 	const link = yield* HubLink;
 	const requireSettings = Effect.gen(function* () {
@@ -30230,7 +30329,7 @@ const make$99 = Effect.gen(function* () {
 		remove
 	};
 });
-const layer$84 = Layer.effect(HubAssetClient, make$99);
+const layer$85 = Layer.effect(HubAssetClient, make$100);
 //#endregion
 //#region src/sync/mcpRegistrationFiles.ts
 /**
@@ -31146,7 +31245,7 @@ const EMPTY_REPORT = {
 	unavailable: null
 };
 var AssetSync = class extends Context.Service()("@p4code/cli/sync/AssetSync") {};
-const make$98 = Effect.gen(function* () {
+const make$99 = Effect.gen(function* () {
 	const client = yield* HubAssetClient;
 	const link = yield* HubLink;
 	const settingsStore = yield* ServerSettingsService;
@@ -31992,7 +32091,7 @@ const make$98 = Effect.gen(function* () {
 		removeLocal
 	};
 });
-const layer$83 = Layer.effect(AssetSync, make$98);
+const layer$84 = Layer.effect(AssetSync, make$99);
 //#endregion
 //#region src/provider/CompressPrompts.ts
 /**
@@ -32345,7 +32444,7 @@ const findAgentPreset = (requested) => {
 };
 //#endregion
 //#region src/cli/assets.ts
-const SyncServicesLive = layer$83.pipe(Layer.provideMerge(layer$84), Layer.provideMerge(layer$85), Layer.provideMerge(layer$89.pipe(Layer.provide(layer$114))), Layer.provideMerge(layer$114), Layer.provideMerge(FetchHttpClient.layer));
+const SyncServicesLive = layer$84.pipe(Layer.provideMerge(layer$85), Layer.provideMerge(layer$86), Layer.provideMerge(layer$90.pipe(Layer.provide(layer$115))), Layer.provideMerge(layer$115), Layer.provideMerge(FetchHttpClient.layer));
 const runWithSync = (flags, run) => Effect.gen(function* () {
 	const config = yield* resolveCliAuthConfig(flags, yield* GlobalFlag.LogLevel);
 	return yield* Effect.gen(function* () {
@@ -32353,7 +32452,7 @@ const runWithSync = (flags, run) => Effect.gen(function* () {
 			sync: yield* AssetSync,
 			link: yield* HubLink
 		});
-	}).pipe(Effect.provide(SyncServicesLive.pipe(Layer.provide(layer$117(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, "Error")))));
+	}).pipe(Effect.provide(SyncServicesLive.pipe(Layer.provide(layer$118(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, "Error")))));
 });
 const STATE_LABEL = {
 	synced: "synced",
@@ -33381,7 +33480,7 @@ const TERMINAL_STATUSES = /* @__PURE__ */ new Set([
 	"interrupted"
 ]);
 var ThreadBackgroundLivenessService = class extends Context.Service()("@p4code/cli/orchestration/ThreadBackgroundLiveness/ThreadBackgroundLivenessService") {};
-function make$97() {
+function make$98() {
 	const stateByThreadId = /* @__PURE__ */ new Map();
 	const stateFor = (threadId) => {
 		const existing = stateByThreadId.get(threadId);
@@ -33437,7 +33536,7 @@ function make$97() {
 		}
 	};
 }
-const layer$82 = Layer.effect(ThreadBackgroundLivenessService, Effect.sync(make$97));
+const layer$83 = Layer.effect(ThreadBackgroundLivenessService, Effect.sync(make$98));
 //#endregion
 //#region ../../packages/shared/src/sourceControl.ts
 const GITHUB_CHANGE_REQUEST_PRESENTATION = {
@@ -33811,6 +33910,55 @@ function completionAfterEvent(thread, event) {
 	}
 }
 //#endregion
+//#region src/orchestration/fusionReviewPolicy.ts
+function fusionBudgetAction(pair, threadId, text) {
+	if (threadId === pair.watcherThreadId && (text.startsWith("[fusion-review]") || text.startsWith("[fusion-gate]"))) return "review";
+	if (threadId === pair.implementerThreadId && text.startsWith("[fusion-advice]")) return "correction";
+	if ([
+		"[fusion-activation]",
+		"[fusion-advice]",
+		"[fusion-gate]",
+		"[fusion-review]"
+	].some((prefix) => text.startsWith(prefix))) return "protocol";
+	return "human";
+}
+function advanceFusionBudget(pair, threadId, text, sequence, commandId = "client") {
+	if (!pair.reviewExperiment || pair.detachedAt !== null || sequence <= (pair.reviewExperiment.lastMessageSequence ?? 0)) return pair.reviewExperiment;
+	const experiment = {
+		...pair.reviewExperiment,
+		lastMessageSequence: sequence
+	};
+	switch (fusionBudgetAction(pair, threadId, text)) {
+		case "review": return {
+			...experiment,
+			automaticReviews: experiment.automaticReviews + 1
+		};
+		case "correction": return experiment.automaticReviews === 0 ? experiment : {
+			...experiment,
+			correctionRounds: experiment.correctionRounds + 1
+		};
+		case "human":
+			if (commandId === null || [
+				"server:",
+				"provider:",
+				"scheduled-task:"
+			].some((prefix) => commandId.startsWith(prefix))) return experiment;
+			return {
+				...experiment,
+				automaticReviews: 0,
+				correctionRounds: 0
+			};
+		case "protocol": return experiment;
+	}
+}
+function fusionBudgetBlock(pair, threadId, text) {
+	const experiment = pair.reviewExperiment;
+	if (!experiment || pair.detachedAt !== null) return void 0;
+	const action = fusionBudgetAction(pair, threadId, text);
+	if (action === "review" && experiment.automaticReviews >= experiment.policy.maxAutomaticReviews) return `Automatic review limit (${experiment.policy.maxAutomaticReviews}) reached. Work remains unapproved; send a new instruction to either thread to resume.`;
+	if (action === "correction" && experiment.automaticReviews > 0 && (experiment.correctionRounds >= experiment.policy.maxCorrectionRounds || experiment.automaticReviews >= experiment.policy.maxAutomaticReviews)) return "Correction budget exhausted or no review remains for another correction. Work remains unapproved; send a new instruction to either thread to resume.";
+}
+//#endregion
 //#region src/attachmentPaths.ts
 function normalizeAttachmentRelativePath(rawRelativePath) {
 	const normalized = NodePath.normalize(rawRelativePath).replace(/^[/\\]+/, "");
@@ -34243,6 +34391,11 @@ function projectEvent(model, event) {
 				watcherThreadId: payload.watcherThreadId,
 				lastReviewedImplementerSequence: payload.lastReviewedImplementerSequence,
 				activationTurnId: payload.activationTurnId ?? null,
+				...payload.reviewPolicy ? { reviewExperiment: {
+					policy: payload.reviewPolicy,
+					automaticReviews: 0,
+					correctionRounds: 0
+				} } : {},
 				roundCap: payload.roundCap ?? 2,
 				gateTimeoutMs: payload.gateTimeoutMs ?? 12e4,
 				activeGate: null,
@@ -34514,6 +34667,10 @@ function projectEvent(model, event) {
 			} : entry) : [...thread.messages, message]).slice(-2e3);
 			return {
 				...nextBase,
+				threadPairs: payload.role === "user" ? (nextBase.threadPairs ?? []).map((pair) => pair.reviewExperiment && pair.detachedAt === null && (pair.implementerThreadId === payload.threadId || pair.watcherThreadId === payload.threadId) ? {
+					...pair,
+					reviewExperiment: advanceFusionBudget(pair, payload.threadId, payload.text, event.sequence, event.commandId) ?? pair.reviewExperiment
+				} : pair) : nextBase.threadPairs ?? [],
 				threads: updateThread(nextBase.threads, payload.threadId, {
 					messages: cappedMessages,
 					updatedAt: event.occurredAt
@@ -35110,6 +35267,7 @@ const decideCommand = Effect.fn("decideCommand")(function* ({ command, readModel
 					lastReviewedImplementerSequence: readModel.snapshotSequence,
 					activationTurnId: implementer.latestTurn?.state === "running" ? implementer.latestTurn.turnId : null,
 					...command.continuationMessageId !== void 0 ? { continuationMessageId: command.continuationMessageId } : {},
+					...command.reviewPolicy !== void 0 ? { reviewPolicy: command.reviewPolicy } : {},
 					...command.roundCap !== void 0 ? { roundCap: command.roundCap } : {},
 					...command.gateTimeoutMs !== void 0 ? { gateTimeoutMs: command.gateTimeoutMs } : {},
 					createdAt: command.createdAt
@@ -35898,7 +36056,13 @@ const decideCommand = Effect.fn("decideCommand")(function* ({ command, readModel
 				command,
 				threadId: command.threadId
 			});
-			if (findActiveThreadPair(readModel, command.threadId)?.watcherThreadId === command.threadId && targetThread.interactionMode !== "default") return yield* decideCommandSequence({
+			const activePair = findActiveThreadPair(readModel, command.threadId);
+			const budgetBlock = activePair && fusionBudgetBlock(activePair, command.threadId, command.message.text);
+			if (budgetBlock) return yield* new OrchestrationCommandInvariantError({
+				commandType: command.type,
+				detail: budgetBlock
+			});
+			if (activePair?.watcherThreadId === command.threadId && targetThread.interactionMode !== "default") return yield* decideCommandSequence({
 				readModel,
 				commands: [{
 					type: "thread.interaction-mode.set",
@@ -36497,6 +36661,7 @@ function commandToAggregateRef(command) {
 }
 const makeOrchestrationEngine = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
+	const settingsService = yield* Effect.serviceOption(ServerSettingsService);
 	const eventStore = yield* OrchestrationEventStore;
 	const commandReceiptRepository = yield* OrchestrationCommandReceiptRepository;
 	const projectionPipeline = yield* OrchestrationProjectionPipeline;
@@ -36548,8 +36713,19 @@ const makeOrchestrationEngine = Effect.gen(function* () {
 					detail: existingReceipt.value.error ?? "Previously rejected."
 				});
 			}
+			let command = envelope.command;
+			if (command.type === "thread-pair.create" && command.reviewPolicy === void 0 && Option.isSome(settingsService)) {
+				const settings = yield* settingsService.value.getSettings.pipe(Effect.mapError(() => new OrchestrationCommandInvariantError({
+					commandType: "thread-pair.create",
+					detail: "Could not read the review policy settings."
+				})));
+				command = {
+					...command,
+					reviewPolicy: settings.fusionReviewPolicy
+				};
+			}
 			const eventBase = yield* decideOrchestrationCommand({
-				command: envelope.command,
+				command,
 				readModel: commandReadModel,
 				hasLiveBackgroundWork: "threadId" in envelope.command && backgroundLiveness.getThreadBackgroundLiveness(envelope.command.threadId) !== null
 			}).pipe(Effect.provideService(Crypto.Crypto, crypto), Effect.mapError((cause) => isOrchestrationCommandInvariantError(cause) ? cause : new OrchestrationCommandInvariantError({
@@ -36653,7 +36829,7 @@ const makeOrchestrationEngine = Effect.gen(function* () {
 		latestSequence: Effect.sync(() => commandReadModel.snapshotSequence)
 	};
 });
-const OrchestrationEngineLive = Layer.effect(OrchestrationEngineService, makeOrchestrationEngine).pipe(Layer.provide(layer$82));
+const OrchestrationEngineLive = Layer.effect(OrchestrationEngineService, makeOrchestrationEngine).pipe(Layer.provide(layer$83));
 //#endregion
 //#region src/persistence/Services/ProjectionPendingApprovals.ts
 /**
@@ -38132,6 +38308,8 @@ const ProjectionThreadRepositoryLive = Layer.effect(ProjectionThreadRepository,
 * Counted rather than flagged so a lost completion can only strand one task,
 * and read as a boolean by the shell.
 */
+const decodeReviewExperiment = Schema$1.decodeUnknownEffect(Schema$1.fromJsonString(FusionReviewExperiment));
+const encodeReviewExperiment = Schema$1.encodeEffect(Schema$1.fromJsonString(FusionReviewExperiment));
 const ORCHESTRATION_PROJECTOR_NAMES = {
 	projects: "projection.projects",
 	threads: "projection.threads",
@@ -38399,7 +38577,32 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
 	});
 	const applyThreadPairsProjection = Effect.fn("applyThreadPairsProjection")(function* (event, _attachmentSideEffects) {
 		switch (event.type) {
-			case "thread-pair.created":
+			case "thread.message-sent": {
+				if (event.payload.role !== "user") return;
+				const rows = yield* sql`
+            SELECT pair_id AS id, implementer_thread_id AS "implementerThreadId", watcher_thread_id AS "watcherThreadId",
+              review_experiment_json AS "experimentJson", created_at AS "createdAt"
+            FROM thread_pairs WHERE detached_at IS NULL AND review_experiment_json IS NOT NULL
+              AND (implementer_thread_id = ${event.payload.threadId} OR watcher_thread_id = ${event.payload.threadId})`.pipe(Effect.mapError(toPersistenceSqlError("ProjectionPipeline.fusionBudget:read")));
+				for (const row of rows) {
+					const experiment = yield* decodeReviewExperiment(row.experimentJson).pipe(Effect.orDie);
+					const next = advanceFusionBudget({
+						...row,
+						reviewExperiment: experiment,
+						detachedAt: null
+					}, event.payload.threadId, event.payload.text, event.sequence, event.commandId);
+					if (!next) continue;
+					const encoded = yield* encodeReviewExperiment(next).pipe(Effect.orDie);
+					yield* sql`UPDATE thread_pairs SET review_experiment_json = ${encoded} WHERE pair_id = ${row.id}`.pipe(Effect.mapError(toPersistenceSqlError("ProjectionPipeline.fusionBudget:update")));
+				}
+				return;
+			}
+			case "thread-pair.created": {
+				const experimentJson = event.payload.reviewPolicy ? yield* encodeReviewExperiment({
+					policy: event.payload.reviewPolicy,
+					automaticReviews: 0,
+					correctionRounds: 0
+				}).pipe(Effect.orDie) : null;
 				yield* sql`
             INSERT INTO thread_pairs (
               pair_id,
@@ -38409,6 +38612,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
               activation_turn_id,
               round_cap,
               gate_timeout_ms,
+              review_experiment_json,
               active_gate_json,
               created_at,
               detached_at
@@ -38420,6 +38624,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
               ${event.payload.activationTurnId ?? null},
               ${event.payload.roundCap ?? 2},
               ${event.payload.gateTimeoutMs ?? 12e4},
+              ${experimentJson},
               NULL,
               ${event.payload.createdAt},
               NULL
@@ -38431,11 +38636,13 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
               activation_turn_id = excluded.activation_turn_id,
               round_cap = excluded.round_cap,
               gate_timeout_ms = excluded.gate_timeout_ms,
+              review_experiment_json = excluded.review_experiment_json,
               active_gate_json = NULL,
               created_at = excluded.created_at,
               detached_at = NULL
           `.pipe(Effect.mapError(toPersistenceSqlError("ProjectionPipeline.threadPairs:create")));
 				return;
+			}
 			case "thread-pair.gate-opened":
 			case "thread-pair.gate-advanced":
 				yield* sql`
@@ -39755,12 +39962,12 @@ const runProcessCore = Effect.fn("processRunner.runProcessCore")(function* (spaw
 		stderrInvalidUtf8: stderr.invalidUtf8
 	};
 });
-const make$96 = Effect.fn("ProcessRunner.make")(function* () {
+const make$97 = Effect.fn("ProcessRunner.make")(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const run = (input) => finalizeRunProcess(runProcessCore(spawner, input), input);
 	return ProcessRunner.of({ run });
 });
-const layer$81 = Layer.effect(ProcessRunner, make$96());
+const layer$82 = Layer.effect(ProcessRunner, make$97());
 //#endregion
 //#region src/project/RepositoryIdentityResolver.ts
 const DEFAULT_REPOSITORY_IDENTITY_CACHE_CAPACITY = 512;
@@ -39851,7 +40058,7 @@ const resolveRepositoryIdentityFromCacheKey = Effect.fn("RepositoryIdentityResol
 		rootPath: cacheKey
 	}) : null;
 });
-const make$95 = Effect.fn("RepositoryIdentityResolver.make")(function* (options = {}) {
+const make$96 = Effect.fn("RepositoryIdentityResolver.make")(function* (options = {}) {
 	const processRunner = yield* ProcessRunner;
 	const repositoryIdentityCache = yield* Cache.makeWith((cacheKey) => resolveRepositoryIdentityFromCacheKey(cacheKey).pipe(Effect.provideService(ProcessRunner, processRunner)), {
 		capacity: options.cacheCapacity ?? DEFAULT_REPOSITORY_IDENTITY_CACHE_CAPACITY,
@@ -39866,7 +40073,7 @@ const make$95 = Effect.fn("RepositoryIdentityResolver.make")(function* (options
 	});
 	return RepositoryIdentityResolver.of({ resolve });
 });
-const layer$80 = Layer.effect(RepositoryIdentityResolver, make$95()).pipe(Layer.provide(layer$81));
+const layer$81 = Layer.effect(RepositoryIdentityResolver, make$96()).pipe(Layer.provide(layer$82));
 //#endregion
 //#region src/orchestration/Layers/ProjectionSnapshotQuery.ts
 const decodeReadModel = Schema$1.decodeUnknownEffect(OrchestrationReadModel);
@@ -39923,6 +40130,7 @@ const ProjectionThreadPairDbRowSchema = Schema$1.Struct({
 	activationTurnId: Schema$1.NullOr(TurnId),
 	roundCap: NonNegativeInt,
 	gateTimeoutMs: NonNegativeInt,
+	reviewExperiment: Schema$1.NullOr(Schema$1.fromJsonString(FusionReviewExperiment)),
 	activeGate: Schema$1.NullOr(Schema$1.fromJsonString(OrchestrationThreadPairGate)),
 	createdAt: IsoDateTime,
 	detachedAt: Schema$1.NullOr(IsoDateTime)
@@ -40175,6 +40383,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           activation_turn_id AS "activationTurnId",
           round_cap AS "roundCap",
           gate_timeout_ms AS "gateTimeoutMs",
+          review_experiment_json AS "reviewExperiment",
           active_gate_json AS "activeGate",
           created_at AS "createdAt",
           detached_at AS "detachedAt"
@@ -40194,6 +40403,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           activation_turn_id AS "activationTurnId",
           round_cap AS "roundCap",
           gate_timeout_ms AS "gateTimeoutMs",
+          review_experiment_json AS "reviewExperiment",
           active_gate_json AS "activeGate",
           created_at AS "createdAt",
           detached_at AS "detachedAt"
@@ -41541,6 +41751,72 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 		if (isPersistenceError(error)) return error;
 		return toPersistenceSqlError("ProjectionSnapshotQuery.getSnapshot:query")(error);
 	}));
+	const readHandoffThread = SqlSchema.findOneOption({
+		Request: ThreadIdLookupInput,
+		Result: ProjectionBtwThreadRowSchema,
+		execute: ({ threadId }) => sql`
+      SELECT threads.project_id AS "projectId",
+        COALESCE(projects.workspace_root, threads.worktree_path, '') AS cwd
+      FROM projection_threads AS threads
+      LEFT JOIN projection_projects AS projects ON projects.project_id = threads.project_id
+      WHERE threads.thread_id = ${threadId} AND threads.deleted_at IS NULL
+        AND (threads.project_id = ${P4_CHAT_PROJECT_ID} OR projects.deleted_at IS NULL)
+    `
+	});
+	const readHandoffRows = SqlSchema.findAll({
+		Request: ThreadIdLookupInput,
+		Result: Schema$1.Struct({
+			threadId: ThreadId,
+			role: Schema$1.String,
+			text: Schema$1.String
+		}),
+		execute: ({ threadId }) => sql`
+      WITH latest_pair AS (
+        SELECT implementer_thread_id, watcher_thread_id FROM thread_pairs
+        WHERE implementer_thread_id = ${threadId} OR watcher_thread_id = ${threadId}
+        ORDER BY created_at DESC LIMIT 1
+      ), sources AS (
+        SELECT ${threadId} AS id
+        UNION SELECT implementer_thread_id FROM latest_pair
+        UNION SELECT watcher_thread_id FROM latest_pair
+      ), ranked AS (
+        SELECT messages.thread_id AS "threadId", messages.role,
+          substr(messages.text, -${BTW_CONTEXT_CHARACTER_LIMIT}) AS text,
+          messages.created_at, messages.message_id,
+          ROW_NUMBER() OVER (PARTITION BY messages.thread_id ORDER BY messages.created_at DESC, messages.message_id DESC) AS recent,
+          ROW_NUMBER() OVER (PARTITION BY messages.thread_id ORDER BY messages.created_at, messages.message_id) AS earliest
+        FROM projection_thread_messages AS messages
+        JOIN projection_threads AS threads ON threads.thread_id = messages.thread_id
+        WHERE messages.thread_id IN (SELECT id FROM sources)
+          AND threads.deleted_at IS NULL AND messages.is_streaming = 0
+          AND messages.role IN ('user', 'assistant')
+      ) SELECT "threadId", role, text FROM ranked
+        WHERE recent <= ${BTW_CONTEXT_MESSAGE_LIMIT} OR earliest = 1
+        ORDER BY created_at, message_id
+    `
+	});
+	const getHandoffContext = Effect.fn("ProjectionSnapshotQuery.getHandoffContext")(function* (threadId) {
+		return yield* sql.withTransaction(Effect.gen(function* () {
+			const thread = yield* readHandoffThread({ threadId });
+			if (Option.isNone(thread)) return Option.none();
+			const rows = yield* readHandoffRows({ threadId });
+			const sourceIds = [...new Set(rows.map((row) => row.threadId))];
+			const sourceCount = Math.max(1, sourceIds.length);
+			const budget = Math.floor((BTW_CONTEXT_CHARACTER_LIMIT - 2 * (sourceCount - 1)) / sourceCount);
+			const transcript = sourceIds.map((sourceId) => {
+				const text = rows.filter((row) => row.threadId === sourceId).map((row) => `${row.role}: ${row.text}`).join("\n\n");
+				const heading = `Thread ${sourceId} (bounded history):\n`;
+				const available = budget - heading.length;
+				const omission = "\n[Earlier history omitted]\n";
+				const beginning = Math.floor(available / 4);
+				return heading + (text.length <= available ? text : text.slice(0, beginning) + omission + text.slice(-(available - beginning - 27)));
+			}).join("\n\n");
+			return Option.some({
+				...thread.value,
+				transcript
+			});
+		})).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getHandoffContext:query", "ProjectionSnapshotQuery.getHandoffContext:decodeRows")));
+	});
 	const getBtwContext = Effect.fn("ProjectionSnapshotQuery.getBtwContext")(function* (threadId) {
 		const [thread, rows] = yield* Effect.all([getBtwThreadRow({ threadId }), listBtwContextRows({ threadId })]).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getBtwContext:query", "ProjectionSnapshotQuery.getBtwContext:decodeRows")));
 		if (Option.isNone(thread)) return Option.none();
@@ -42124,11 +42400,12 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 		getThreadPairById,
 		getThreadShellById,
 		getThreadDetailById,
+		getHandoffContext,
 		getBtwContext,
 		getThreadDetailSnapshot
 	};
 });
-const OrchestrationProjectionSnapshotQueryLive = Layer.effect(ProjectionSnapshotQuery, makeProjectionSnapshotQuery).pipe(Layer.provide(layer$82));
+const OrchestrationProjectionSnapshotQueryLive = Layer.effect(ProjectionSnapshotQuery, makeProjectionSnapshotQuery).pipe(Layer.provide(layer$83));
 //#endregion
 //#region src/orchestration/Services/ThreadEventStream.ts
 var ThreadEventStreamService = class extends Context.Service()("@p4code/cli/orchestration/Services/ThreadEventStream/ThreadEventStreamService") {};
@@ -42398,7 +42675,7 @@ const OrchestrationProjectionPipelineLayerLive = OrchestrationProjectionPipeline
 * ingestion writes it, and layers memoize by reference, so both must receive
 * THIS layer or they would each get their own empty registry.
 */
-const ThreadBackgroundLivenessLayerLive = layer$82;
+const ThreadBackgroundLivenessLayerLive = layer$83;
 const OrchestrationInfrastructureLayerLive = Layer.mergeAll(OrchestrationProjectionSnapshotQueryLive, OrchestrationEventInfrastructureLayerLive, OrchestrationProjectionPipelineLayerLive, ThreadBackgroundLivenessLayerLive);
 const OrchestrationEngineLayerLive = OrchestrationEngineLive.pipe(Layer.provide(OrchestrationInfrastructureLayerLive));
 const OrchestrationLayerLive = Layer.mergeAll(OrchestrationInfrastructureLayerLive, OrchestrationEngineLayerLive, ThreadEventStreamLive.pipe(Layer.provide(OrchestrationEngineLayerLive), Layer.provide(OrchestrationEventStoreLive)));
@@ -42873,7 +43150,7 @@ function mergeWithDefaultKeybindings(custom) {
 * Keybindings - Service tag for keybinding configuration operations.
 */
 var Keybindings = class extends Context.Service()("@p4code/cli/keybindings") {};
-const make$94 = Effect.gen(function* () {
+const make$95 = Effect.gen(function* () {
 	const { keybindingsConfigPath } = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
@@ -43134,7 +43411,7 @@ const make$94 = Effect.gen(function* () {
 		}))
 	};
 });
-const layer$79 = Layer.effect(Keybindings, make$94);
+const layer$80 = Layer.effect(Keybindings, make$95);
 //#endregion
 //#region src/process/externalLauncher.ts
 /**
@@ -43361,7 +43638,7 @@ const launchEditorProcess = Effect.fn("externalLauncher.launchEditorProcess")(fu
 		cause
 	}));
 });
-const make$93 = Effect.gen(function* () {
+const make$94 = Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
@@ -43372,7 +43649,7 @@ const make$93 = Effect.gen(function* () {
 		launchEditor: (input) => provideCommandResolutionServices(Effect.flatMap(resolveEditorLaunch(input), (launch) => launchEditorProcess(launch).pipe(Effect.provideService(ChildProcessSpawner$1.ChildProcessSpawner, spawner))))
 	});
 });
-const layer$78 = Layer.effect(ExternalLauncher, make$93);
+const layer$79 = Layer.effect(ExternalLauncher, make$94);
 //#endregion
 //#region src/orchestration/Services/OrchestrationReactor.ts
 /**
@@ -43390,7 +43667,7 @@ var OrchestrationReactor = class extends Context.Service()("@p4code/cli/orchestr
 //#endregion
 //#region src/serverLifecycleEvents.ts
 var ServerLifecycleEvents = class extends Context.Service()("@p4code/cli/serverLifecycleEvents") {};
-const make$92 = Effect.gen(function* () {
+const make$93 = Effect.gen(function* () {
 	const pubsub = yield* PubSub.unbounded();
 	const state = yield* Ref.make({
 		sequence: 0,
@@ -43414,7 +43691,7 @@ const make$92 = Effect.gen(function* () {
 		}
 	};
 });
-const layer$77 = Layer.effect(ServerLifecycleEvents, make$92);
+const layer$78 = Layer.effect(ServerLifecycleEvents, make$93);
 //#endregion
 //#region src/telemetry/Identify.ts
 const CodexAuthJsonSchema = Schema$1.Struct({ tokens: Schema$1.Struct({ account_id: Schema$1.String }) });
@@ -43587,7 +43864,7 @@ var AnalyticsService = class AnalyticsService extends Context.Service()("@p4code
 	/** No-op layer for callers that intentionally disable telemetry. */
 	static layerTest = Layer.succeed(AnalyticsService, inert);
 };
-const make$91 = Effect.gen(function* () {
+const make$92 = Effect.gen(function* () {
 	const telemetryConfig = yield* TelemetryEnvConfig;
 	const posthogKey = telemetryConfig.posthogKey.trim();
 	if (!telemetryConfig.enabled || posthogKey === "") return inert;
@@ -43657,7 +43934,7 @@ const make$91 = Effect.gen(function* () {
 		flush
 	});
 });
-const layer$76 = Layer.effect(AnalyticsService, make$91);
+const layer$77 = Layer.effect(AnalyticsService, make$92);
 AnalyticsService.layerTest;
 //#endregion
 //#region src/provider/Services/ProviderSessionDirectory.ts
@@ -44088,7 +44365,7 @@ var BootServiceInstallError = class extends Schema$1.TaggedErrorClass()("BootSer
 	}
 };
 var BootService = class extends Context.Service()("@p4code/cli/service/bootService") {};
-const make$90 = Effect.fn("cloud.boot_service.make")(function* (input) {
+const make$91 = Effect.fn("cloud.boot_service.make")(function* (input) {
 	const hostExecPath = yield* HostProcessExecutablePath;
 	const hostArguments = yield* HostProcessArguments;
 	const host = input.host ?? {
@@ -44310,7 +44587,7 @@ const make$90 = Effect.fn("cloud.boot_service.make")(function* (input) {
 		logPath
 	});
 });
-const layer$75 = (input) => Layer.effect(BootService, make$90(input));
+const layer$76 = (input) => Layer.effect(BootService, make$91(input));
 //#endregion
 //#region src/service/selfUpdate.ts
 /**
@@ -44385,7 +44662,7 @@ const resolveServerSelfUpdateCapability = Effect.fn("cloud.server_self_update.re
 	return null;
 });
 var ServerSelfUpdate = class extends Context.Service()("@p4code/cli/service/selfUpdate/ServerSelfUpdate") {};
-const make$89 = Effect.fn("cloud.server_self_update.make")(function* (options) {
+const make$90 = Effect.fn("cloud.server_self_update.make")(function* (options) {
 	const serverConfig = yield* ServerConfig$1;
 	const settings = yield* ServerSettingsService;
 	const continuationContext = yield* Effect.context();
@@ -44548,7 +44825,7 @@ const make$89 = Effect.fn("cloud.server_self_update.make")(function* (options) {
 	});
 	return ServerSelfUpdate.of({ update });
 });
-const layer$74 = Layer.effect(ServerSelfUpdate, make$89()).pipe(Layer.provide(layer$81));
+const layer$75 = Layer.effect(ServerSelfUpdate, make$90()).pipe(Layer.provide(layer$82));
 //#endregion
 //#region src/environment/ServerEnvironmentLabel.ts
 const ServerEnvironmentLabelCommandProbe = Schema$1.Literals(["macos-computer-name", "linux-pretty-hostname"]);
@@ -44680,7 +44957,7 @@ function platformArch(architecture) {
 		default: return "other";
 	}
 }
-const make$88 = Effect.gen(function* () {
+const make$89 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const serverConfig = yield* ServerConfig$1;
@@ -44758,7 +45035,7 @@ const make$88 = Effect.gen(function* () {
 * state. It intentionally has no fallback Layer.succeed value: callers must
 * provide the external platform services and a ServerConfig.
 */
-const layer$73 = Layer.effect(ServerEnvironment, make$88).pipe(Layer.provide(layer$81));
+const layer$74 = Layer.effect(ServerEnvironment, make$89).pipe(Layer.provide(layer$82));
 //#endregion
 //#region src/provider/Services/ProviderSessionReaper.ts
 var ProviderSessionReaper = class extends Context.Service()("@p4code/cli/provider/Services/ProviderSessionReaper") {};
@@ -45113,7 +45390,7 @@ function daemonPortLine(line) {
 	const port = Number(raw);
 	return Number.isInteger(port) && port > 0 && port <= MAX_PORT$1 ? port : null;
 }
-const make$87 = Effect.fn("AgentDeviceProcess.make")(function* () {
+const make$88 = Effect.fn("AgentDeviceProcess.make")(function* () {
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
@@ -45225,14 +45502,14 @@ const make$87 = Effect.fn("AgentDeviceProcess.make")(function* () {
 	});
 	return { start };
 });
-const layer$72 = Layer.effect(AgentDeviceProcess, make$87());
+const layer$73 = Layer.effect(AgentDeviceProcess, make$88());
 //#endregion
 //#region src/device/DeviceDiscovery.ts
 var DeviceDiscoveryFailure = class extends Data.TaggedError("DeviceDiscoveryFailure") {};
 const MAX_DEVICES = 512;
 const MAX_RESPONSE_BYTES$6 = 1024 * 1024;
 const MAX_DEVICE_LABEL = 512;
-const REQUEST_TIMEOUT_MS$5 = 15e3;
+const REQUEST_TIMEOUT_MS$6 = 15e3;
 const HubDevice = Schema$1.Struct({
 	id: DeviceId,
 	name: Schema$1.String.check(Schema$1.isMinLength(1), Schema$1.isMaxLength(MAX_DEVICE_LABEL)),
@@ -45258,7 +45535,7 @@ const decodeDeviceDiscovery = (hostId, body) => Schema$1.decodeUnknownEffect(Sch
 		partial: (value.errors?.length ?? 0) > 0
 	});
 }));
-const make$86 = Effect.fn("DeviceDiscovery.make")(function* () {
+const make$87 = Effect.fn("DeviceDiscovery.make")(function* () {
 	const http = yield* HttpClient.HttpClient;
 	return Effect.fn("DeviceDiscovery.read")(function* (input) {
 		const origin = yield* Effect.try(() => new URL(input.ready.hub.origin));
@@ -45275,7 +45552,10 @@ const make$86 = Effect.fn("DeviceDiscovery.make")(function* () {
 		});
 		if (body.invalidUtf8 || body.truncated) return yield* new DeviceDiscoveryFailure({ message: "Invalid device discovery response." });
 		const result = yield* decodeDeviceDiscovery(input.hostId, body.text);
-		const devices = [...result.devices];
+		const adapterDevices = input.ready.xcode ? yield* input.ready.xcode.discover : [];
+		const simulatorIds = new Set(adapterDevices.map((device) => device.id));
+		const devices = [...result.devices.filter((device) => device.platform !== "ios" || device.physical || !simulatorIds.has(device.id)), ...adapterDevices];
+		if (devices.length > MAX_DEVICES || new Set(devices.map((device) => device.id)).size !== devices.length || adapterDevices.some((device) => device.hostId !== input.hostId || device.platform !== "ios" || device.physical)) return yield* new DeviceDiscoveryFailure({ message: "Invalid Xcode simulator identity." });
 		if (input.androidAvailable) {
 			const avds = yield* input.ready.run("emulator", ["-list-avds"]);
 			if (avds.code !== 0) return yield* new DeviceDiscoveryFailure({ message: "Android virtual device discovery failed." });
@@ -45299,7 +45579,7 @@ const make$86 = Effect.fn("DeviceDiscovery.make")(function* () {
 			devices,
 			partial: result.partial
 		};
-	}, Effect.scoped, Effect.timeout(Duration.millis(REQUEST_TIMEOUT_MS$5)), Effect.mapError(() => new DeviceOperationError({
+	}, Effect.scoped, Effect.timeout(Duration.millis(REQUEST_TIMEOUT_MS$6)), Effect.mapError(() => new DeviceOperationError({
 		operation: "list",
 		reason: "request_failed",
 		cause: "Device discovery unavailable."
@@ -45317,7 +45597,7 @@ const Result = Schema$1.Struct({
 	serial: Schema$1.optional(DeviceId),
 	error: Schema$1.optional(Schema$1.String)
 });
-const make$85 = Effect.fn("DeviceHubActions.make")(function* () {
+const make$86 = Effect.fn("DeviceHubActions.make")(function* () {
 	const http = yield* HttpClient.HttpClient;
 	const post = Effect.fn("DeviceHubActions.post")(function* (ready, route, payload, timeoutMs) {
 		return yield* Effect.gen(function* () {
@@ -45386,7 +45666,7 @@ function sessionsToClose(sessions, input) {
 //#endregion
 //#region src/device/DeviceCommandLeases.ts
 /** Owns commands by exact session object, so close/reopen cannot revive an old lease. */
-const make$84 = Effect.fn("DeviceCommandLeases.make")(function* () {
+const make$85 = Effect.fn("DeviceCommandLeases.make")(function* () {
 	const lock = yield* Semaphore.make(1);
 	const entries = /* @__PURE__ */ new Map();
 	const revoked = /* @__PURE__ */ new WeakSet();
@@ -45432,7 +45712,7 @@ const make$84 = Effect.fn("DeviceCommandLeases.make")(function* () {
 //#endregion
 //#region src/device/DeviceThreadLeases.ts
 /** Thread retirement also cancels opens that have not created a session yet. */
-const make$83 = Effect.fn("DeviceThreadLeases.make")(function* () {
+const make$84 = Effect.fn("DeviceThreadLeases.make")(function* () {
 	const lock = yield* Semaphore.make(1);
 	const scopes = /* @__PURE__ */ new Map();
 	const blocked = /* @__PURE__ */ new Set();
@@ -45480,7 +45760,7 @@ const make$83 = Effect.fn("DeviceThreadLeases.make")(function* () {
 //#region src/device/DeviceHostRegistry.ts
 const sameConfig = (a, b) => a === b || a !== null && b !== null && a.id === b.id && a.label === b.label && a.target === b.target && a.port === b.port && a.identityFile === b.identityFile;
 /** Owns configuration generations; use() interrupts in-flight work before a host is retired. */
-const make$82 = Effect.fn("DeviceHostRegistry.make")(function* (factories) {
+const make$83 = Effect.fn("DeviceHostRegistry.make")(function* (factories) {
 	const factoryContext = yield* Effect.context();
 	const lock = yield* Semaphore.make(1);
 	const entries = /* @__PURE__ */ new Map();
@@ -45603,6 +45883,675 @@ const start = Effect.fn("DeviceHostSettings.start")(function* (input) {
 	return { refresh };
 });
 //#endregion
+//#region src/device/DeviceScreenshot.ts
+const MAX_SCREENSHOT_BYTES = 8 * 1024 * 1024;
+var DeviceScreenshotFailure = class extends Data.TaggedError("DeviceScreenshotFailure") {};
+const MAX_DIMENSION = 16384;
+const MAX_PIXELS = 64 * 1024 * 1024;
+const SCREENSHOT_TIMEOUT_MS = 2e4;
+const PNG_HEADER_BYTES = 33;
+const PNG_CHUNK_OVERHEAD = 12;
+const PNG_SIGNATURE = Buffer.from([
+	137,
+	80,
+	78,
+	71,
+	13,
+	10,
+	26,
+	10
+]);
+function pngDimensions(png) {
+	const buffer = Buffer.from(png.buffer, png.byteOffset, png.byteLength);
+	if (buffer.length < PNG_HEADER_BYTES || buffer.length > 8388608 || !buffer.subarray(0, PNG_SIGNATURE.length).equals(PNG_SIGNATURE) || buffer.readUInt32BE(8) !== 13 || buffer.toString("ascii", 12, 16) !== "IHDR") throw new DeviceScreenshotFailure({ message: "Invalid PNG screenshot." });
+	const width = buffer.readUInt32BE(16);
+	const height = buffer.readUInt32BE(20);
+	if (!width || !height || width > MAX_DIMENSION || height > MAX_DIMENSION || width * height > MAX_PIXELS) throw new DeviceScreenshotFailure({ message: "Screenshot dimensions exceed limits." });
+	let offset = PNG_HEADER_BYTES;
+	let imageData = false;
+	let ended = false;
+	while (offset + PNG_CHUNK_OVERHEAD <= buffer.length) {
+		const length = buffer.readUInt32BE(offset);
+		const type = buffer.toString("ascii", offset + 4, offset + 8);
+		const next = offset + PNG_CHUNK_OVERHEAD + length;
+		if (next > buffer.length || type === "IHDR") throw new DeviceScreenshotFailure({ message: "Invalid PNG chunk." });
+		if (type === "IDAT") imageData = true;
+		if (type === "IEND") {
+			ended = length === 0 && next === buffer.length;
+			break;
+		}
+		offset = next;
+	}
+	if (!imageData || !ended) throw new DeviceScreenshotFailure({ message: "Incomplete PNG screenshot." });
+	return {
+		width,
+		height
+	};
+}
+const make$82 = Effect.fn("DeviceScreenshot.make")(function* () {
+	const http = yield* HttpClient.HttpClient;
+	return Effect.fn("DeviceScreenshot.capture")(function* (ready, session) {
+		const origin = yield* Effect.try(() => new URL(ready.hub.origin));
+		if (origin.protocol !== "http:" || origin.hostname !== "127.0.0.1" || !origin.port || origin.username || origin.password || origin.pathname !== "/" || origin.search || origin.hash) return yield* new DeviceScreenshotFailure({ message: "Invalid owned hub." });
+		const vendor = session.platform === "ios" ? "serve-sim" : "serve-emu";
+		const response = yield* http.execute(HttpClientRequest.post(`${origin.origin}/vendor/${vendor}/api/screenshot?device=${encodeURIComponent(session.deviceId)}`));
+		if (response.status !== 200) return yield* new DeviceScreenshotFailure({ message: "Screenshot rejected." });
+		let bytes = 0;
+		const chunks = [];
+		yield* response.stream.pipe(Stream.runForEach((chunk) => Effect.gen(function* () {
+			bytes += chunk.byteLength;
+			if (bytes > 8388608) return yield* new DeviceScreenshotFailure({ message: "Screenshot too large." });
+			chunks.push(chunk);
+		})));
+		const png = Buffer.concat(chunks, bytes);
+		return {
+			png,
+			...yield* Effect.try(() => pngDimensions(png))
+		};
+	}, Effect.scoped, Effect.timeout(Duration.millis(SCREENSHOT_TIMEOUT_MS)), Effect.mapError(() => new DeviceOperationError({
+		operation: "screenshot",
+		reason: "request_failed",
+		cause: "Device screenshot could not be captured."
+	})));
+});
+var DeviceScreenshot = class extends Context.Service()("@p4code/cli/device/DeviceScreenshot") {};
+const layer$72 = Layer.effect(DeviceScreenshot, make$82().pipe(Effect.map((capture) => ({ capture }))));
+//#endregion
+//#region src/device/XcodeMcpClient.ts
+const XCODE_BUILD_MCP_VERSION = "2.7.0";
+const PROTOCOL_VERSION = "2025-06-18";
+const REQUEST_TIMEOUT_MS$5 = 6e4;
+const MAX_MESSAGE_BYTES = 12 * 1024 * 1024;
+const MAX_TOOL_PAGES = 32;
+function objectValue(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : {};
+}
+/** One process per lease keeps semantic refs and simulator defaults isolated. Never invokes npx. */
+var XcodeMcpClient = class XcodeMcpClient {
+	child;
+	sequence = 0;
+	buffer = "";
+	closed = false;
+	pending = /* @__PURE__ */ new Map();
+	tools = /* @__PURE__ */ new Set();
+	constructor(child) {
+		this.child = child;
+		child.stdout.setEncoding("utf8");
+		child.stdout.on("data", (chunk) => {
+			this.buffer += chunk;
+			if (Buffer.byteLength(this.buffer) > MAX_MESSAGE_BYTES) {
+				this.close(/* @__PURE__ */ new Error("Device MCP response exceeds the supported size."));
+				return;
+			}
+			let boundary;
+			while ((boundary = this.buffer.indexOf("\n")) >= 0) {
+				const line = this.buffer.slice(0, boundary);
+				this.buffer = this.buffer.slice(boundary + 1);
+				try {
+					const message = objectValue(JSON.parse(line));
+					if (typeof message.id !== "number") continue;
+					const call = this.pending.get(message.id);
+					if (!call) continue;
+					this.pending.delete(message.id);
+					if (message.error) {
+						const detail = objectValue(message.error).message;
+						call.reject(new Error(typeof detail === "string" ? detail : "Device MCP request failed."));
+					} else call.resolve(message.result);
+				} catch {
+					this.close(/* @__PURE__ */ new Error("Device MCP returned invalid stdio JSON."));
+					return;
+				}
+			}
+		});
+		child.stderr.resume();
+		child.on("error", () => this.close(/* @__PURE__ */ new Error("Device MCP executable could not start.")));
+		child.on("exit", () => this.close(/* @__PURE__ */ new Error("Device MCP disconnected. Select the device again.")));
+		child.stdin.on("error", () => this.close(/* @__PURE__ */ new Error("Device MCP input disconnected.")));
+	}
+	static async start(executable, cwd, environment, signal, kind = "legacy") {
+		if (!isAbsolute(executable)) throw new Error("Device MCP requires an absolute executable path.");
+		await access(executable, constants.X_OK).catch(() => {
+			throw new Error(kind === "apple" ? "Selected Xcode bridge is missing or not executable. Check the selected Xcode installation." : "Configured XcodeBuildMCP executable is missing or not executable. Install 2.7.0 explicitly.");
+		});
+		signal.throwIfAborted();
+		const client = new XcodeMcpClient(spawn(executable, kind === "apple" ? ["mcpbridge"] : ["mcp"], {
+			cwd,
+			shell: false,
+			stdio: "pipe",
+			env: {
+				...environment,
+				...kind === "legacy" ? {
+					XCODEBUILDMCP_CWD: cwd,
+					XCODEBUILDMCP_DISABLE_SESSION_DEFAULTS: "true",
+					XCODEBUILDMCP_ENABLED_WORKFLOWS: "simulator,ui-automation",
+					XCODEBUILDMCP_SENTRY_DISABLED: "true"
+				} : {}
+			}
+		}));
+		try {
+			const initialized = objectValue(await client.request("initialize", {
+				protocolVersion: PROTOCOL_VERSION,
+				capabilities: {},
+				clientInfo: {
+					name: "p4code-device-adapter",
+					version: "1"
+				}
+			}, signal));
+			if (kind === "apple" && objectValue(initialized.serverInfo).name !== "xcode-tools") throw new Error("Selected Xcode did not expose Apple MCP tools.");
+			if (kind === "legacy" && objectValue(initialized.serverInfo).version !== "2.7.0") throw new Error(`P4 requires XcodeBuildMCP ${XCODE_BUILD_MCP_VERSION}; configured executable reported a different version.`);
+			client.child.stdin.write(JSON.stringify({
+				jsonrpc: "2.0",
+				method: "notifications/initialized"
+			}) + "\n");
+			let cursor;
+			const cursors = /* @__PURE__ */ new Set();
+			do {
+				const page = objectValue(await client.request("tools/list", cursor ? { cursor } : {}, signal));
+				if (!Array.isArray(page.tools)) throw new Error("Device MCP did not advertise tools.");
+				for (const tool of page.tools) {
+					const name = objectValue(tool).name;
+					if (typeof name === "string") client.tools.add(name);
+				}
+				cursor = page.nextCursor;
+				if (typeof cursor === "string" && cursor.length > 0) {
+					if (cursors.has(cursor) || cursors.size >= MAX_TOOL_PAGES) throw new Error("Device MCP tool discovery did not finish within its page limit.");
+					cursors.add(cursor);
+				}
+			} while (typeof cursor === "string" && cursor.length > 0);
+			return client;
+		} catch (error) {
+			client.close();
+			throw error;
+		}
+	}
+	request(method, params, signal) {
+		signal.throwIfAborted();
+		if (this.closed) return Promise.reject(/* @__PURE__ */ new Error("Device MCP session is closed. Select the device again."));
+		const id = ++this.sequence;
+		return new Promise((resolve, reject) => {
+			const abort = () => this.close(/* @__PURE__ */ new Error("Device MCP request cancelled. Select the device again."));
+			const timer = setTimeout(() => this.close(/* @__PURE__ */ new Error("Device MCP timed out. Select the device again.")), REQUEST_TIMEOUT_MS$5);
+			const finish = () => {
+				clearTimeout(timer);
+				signal.removeEventListener("abort", abort);
+			};
+			this.pending.set(id, {
+				resolve: (result) => {
+					finish();
+					resolve(result);
+				},
+				reject: (error) => {
+					finish();
+					reject(error);
+				}
+			});
+			signal.addEventListener("abort", abort, { once: true });
+			this.child.stdin.write(JSON.stringify({
+				jsonrpc: "2.0",
+				id,
+				method,
+				params
+			}) + "\n");
+		});
+	}
+	async call(name, args, signal) {
+		if (!this.tools.has(name)) throw new Error(`Selected device MCP service does not expose ${name}. Check adapter capabilities and Xcode setup.`);
+		const redact = (error) => {
+			let message = error instanceof Error ? error.message : String(error);
+			for (const [key, value] of Object.entries(args)) if (/sessionkey$/i.test(key) && typeof value === "string" && value.length > 0) message = message.replaceAll(value, "[redacted]");
+			return new Error(message);
+		};
+		try {
+			const result = objectValue(await this.request("tools/call", {
+				name,
+				arguments: args
+			}, signal));
+			const structured = objectValue(result.structuredContent);
+			if (result.isError === true || structured.didError === true) {
+				const detail = (Array.isArray(result.content) ? result.content : []).map((part) => objectValue(part).text).filter((part) => typeof part === "string").join("\n");
+				throw new Error(detail || String(structured.error ?? `${name} failed. Refresh device state before retrying.`));
+			}
+			return result;
+		} catch (error) {
+			throw redact(error);
+		}
+	}
+	close(error = /* @__PURE__ */ new Error("Device MCP session closed.")) {
+		if (this.closed) return;
+		this.closed = true;
+		for (const call of this.pending.values()) call.reject(error);
+		this.pending.clear();
+		this.child.kill("SIGTERM");
+	}
+};
+//#endregion
+//#region src/device/XcodeDeviceAdapter.ts
+const SimulatorList = Schema$1.Struct({ simulators: Schema$1.Array(Schema$1.Struct({
+	simulatorId: Schema$1.String,
+	name: Schema$1.String,
+	runtime: Schema$1.String,
+	state: Schema$1.String,
+	isAvailable: Schema$1.Boolean
+})) });
+const decodeSimulators = Schema$1.decodeUnknownSync(SimulatorList);
+const MAX_LEASES = 32;
+const Frame = Schema$1.Struct({
+	x: Schema$1.Number,
+	y: Schema$1.Number,
+	width: Schema$1.Number,
+	height: Schema$1.Number
+});
+const Snapshot = Schema$1.Struct({ elements: Schema$1.Array(Schema$1.Struct({
+	ref: Schema$1.String,
+	role: Schema$1.optional(Schema$1.String),
+	frame: Frame
+})) });
+const readSnapshot = Schema$1.decodeUnknownOption(Snapshot);
+/** Retain structured semantic snapshots; callers never need screenshot round trips for refs. */
+function xcodeResultData(result) {
+	const structured = objectValue(result.structuredContent);
+	return objectValue(structured.data ?? structured);
+}
+function createXcodeDeviceAdapter(executable, cwd, environment) {
+	const clients = /* @__PURE__ */ new Map();
+	const recordings = /* @__PURE__ */ new Map();
+	const snapshots = /* @__PURE__ */ new Map();
+	const remember = (session, data) => {
+		const snapshot = readSnapshot(data.capture);
+		if (snapshot._tag === "Some") snapshots.set(session.leaseId, snapshot.value);
+		const viewport = snapshots.get(session.leaseId)?.elements.find((element) => element.role === "window")?.frame;
+		return {
+			...data,
+			...viewport ? { viewport } : {}
+		};
+	};
+	const get = async (key, signal) => {
+		let pending = clients.get(key);
+		if (!pending) {
+			if (clients.size >= MAX_LEASES) throw new Error("Close an existing Xcode device session before opening another.");
+			pending = XcodeMcpClient.start(executable, cwd, environment, signal);
+			clients.set(key, pending);
+			pending.catch(() => {
+				if (clients.get(key) === pending) clients.delete(key);
+			});
+		}
+		return pending;
+	};
+	const run = (operation, execute) => Effect.tryPromise({
+		try: execute,
+		catch: (cause) => new DeviceOperationError({
+			operation,
+			reason: "request_failed",
+			cause: cause instanceof Error ? cause.message : String(cause)
+		})
+	});
+	const forSession = async (session, signal) => {
+		if (session.hostId !== "local" || session.platform !== "ios" || !session.leaseId) throw new Error("Xcode adapter requires an exact local iOS Simulator lease.");
+		return get(session.leaseId, signal);
+	};
+	const closeSession = (leaseId) => {
+		const client = clients.get(leaseId);
+		clients.delete(leaseId);
+		const recording = recordings.get(leaseId);
+		recordings.delete(leaseId);
+		snapshots.delete(leaseId);
+		client?.then(async (client) => {
+			try {
+				if (recording) await client.call("record_sim_video", {
+					...recording,
+					stop: true
+				}, new AbortController().signal);
+			} finally {
+				client.close();
+			}
+		}).catch(() => {});
+	};
+	return {
+		discover: run("list", async (signal) => {
+			const client = await get("discovery", signal);
+			return decodeSimulators(xcodeResultData(await client.call("list_sims", {}, signal))).simulators.filter((sim) => sim.isAvailable && /iOS/i.test(sim.runtime)).map((sim) => ({
+				id: sim.simulatorId,
+				hostId: "local",
+				name: sim.name,
+				version: sim.runtime,
+				booted: sim.state === "Booted",
+				physical: false,
+				platform: "ios"
+			}));
+		}),
+		state: (session, sinceScreenHash) => run("state", async (signal) => {
+			const client = await forSession(session, signal);
+			const data = xcodeResultData(await client.call("snapshot_ui", {
+				simulatorId: session.deviceId,
+				...sinceScreenHash ? { sinceScreenHash } : {}
+			}, signal));
+			return {
+				adapter: "xcodebuildmcp",
+				capabilities: [...client.tools].filter((tool) => [
+					"tap",
+					"type_text",
+					"swipe",
+					"drag",
+					"batch",
+					"snapshot_ui",
+					"screenshot",
+					"record_sim_video"
+				].includes(tool)),
+				...remember(session, data)
+			};
+		}),
+		action: (session, input) => run("command", async (signal) => {
+			const client = await forSession(session, signal);
+			const { action, ...parameters } = input;
+			const snapshot = snapshots.get(session.leaseId);
+			const ref = input.action === "batch" ? input.steps.at(-1)?.elementRef : input.action === "swipe" ? input.withinElementRef : input.elementRef;
+			const bounds = snapshot?.elements.find((element) => element.ref === ref)?.frame;
+			const viewport = snapshot?.elements.find((element) => element.role === "window")?.frame;
+			const data = xcodeResultData(await client.call(action, {
+				...parameters,
+				simulatorId: session.deviceId
+			}, signal));
+			return {
+				...remember(session, data),
+				...bounds && viewport && viewport.width > 0 && viewport.height > 0 ? { pointer: {
+					x: (bounds.x + bounds.width / 2 - viewport.x) / viewport.width,
+					y: (bounds.y + bounds.height / 2 - viewport.y) / viewport.height
+				} } : {}
+			};
+		}),
+		screenshot: (session) => run("screenshot", async (signal) => {
+			const result = await (await forSession(session, signal)).call("screenshot", {
+				simulatorId: session.deviceId,
+				returnFormat: "base64"
+			}, signal);
+			const image = (Array.isArray(result.content) ? result.content : []).map(objectValue).find((part) => part.type === "image" && part.mimeType === "image/png");
+			if (typeof image?.data !== "string") throw new Error("XcodeBuildMCP did not return a PNG screenshot.");
+			const png = Buffer.from(image.data, "base64");
+			return {
+				png,
+				...pngDimensions(png)
+			};
+		}),
+		recording: (session, action) => run("recording", async (signal) => {
+			const client = await forSession(session, signal);
+			const key = session.leaseId;
+			if (action === "start" && recordings.has(key)) throw new Error("This device session is already recording.");
+			if (action === "stop" && !recordings.has(key)) throw new Error("This device session has no active recording.");
+			const outputFile = recordings.get(key)?.outputFile ?? `${cwd}/device-recording-${randomUUID()}.mp4`;
+			const result = xcodeResultData(await client.call("record_sim_video", {
+				simulatorId: session.deviceId,
+				...action === "start" ? { start: true } : {
+					stop: true,
+					outputFile
+				}
+			}, signal));
+			if (action === "start") recordings.set(key, {
+				outputFile,
+				simulatorId: session.deviceId
+			});
+			else recordings.delete(key);
+			return result;
+		}),
+		closeSession,
+		stop: () => {
+			for (const key of clients.keys()) closeSession(key);
+		}
+	};
+}
+//#endregion
+//#region src/device/AppleDeviceAdapter.ts
+const MAX_HIERARCHY_BYTES = 512 * 1024;
+const MAX_SESSIONS = 32;
+const REQUIRED_DEVICE_TOOLS = [
+	"DeviceInteractionStartSession",
+	"DeviceInteractionSynthesize",
+	"DeviceInteractionEndSession"
+];
+const FRAME_PATTERN = /\{\{(-?[\d.]+),\s*(-?[\d.]+)\},\s*\{([\d.]+),\s*([\d.]+)\}\}/;
+const HIT_PATTERN = /hitPoint:\s*\{(-?[\d.]+),\s*(-?[\d.]+)\}/;
+const Capture = Schema$1.Struct({
+	hierarchyPath: Schema$1.String,
+	screenshotPath: Schema$1.String
+});
+const Session = Schema$1.Struct({
+	interactionSessionKey: Schema$1.String,
+	deviceUUID: Schema$1.String,
+	deviceIsSimulator: Schema$1.Boolean
+});
+const Simulators = Schema$1.Struct({ devices: Schema$1.Record(Schema$1.String, Schema$1.Array(Schema$1.Struct({
+	udid: Schema$1.String,
+	name: Schema$1.String,
+	state: Schema$1.String,
+	isAvailable: Schema$1.Boolean
+}))) });
+function appleMcpData(result) {
+	if (result.structuredContent) return objectValue(result.structuredContent);
+	for (const block of Array.isArray(result.content) ? result.content : []) {
+		const text = objectValue(block).text;
+		if (typeof text !== "string") continue;
+		try {
+			return objectValue(JSON.parse(text));
+		} catch {}
+	}
+	throw new Error("Apple MCP returned no structured device result.");
+}
+/** Use Apple's documented hierarchy hit points, never guessed screenshot coordinates. */
+function appleHierarchySnapshot(text, sequence) {
+	const elements = text.split("\n").flatMap((line, index) => {
+		const frame = line.match(FRAME_PATTERN);
+		const hit = line.match(HIT_PATTERN);
+		if (!frame || !hit || line.includes("isRemoteLeafPlaceholder")) return [];
+		const [x, y, width, height] = frame.slice(1).map(Number);
+		const [hx, hy] = hit.slice(1).map(Number);
+		if (![
+			x,
+			y,
+			width,
+			height,
+			hx,
+			hy
+		].every((value) => value !== void 0 && Number.isFinite(value)) || width <= 0 || height <= 0) return [];
+		return [{
+			ref: `a${sequence}-${index}`,
+			label: line.trim(),
+			frame: {
+				x,
+				y,
+				width,
+				height
+			},
+			hitPoint: {
+				x: hx,
+				y: hy
+			},
+			role: /\b(?:UI)?Window\b/.test(line) ? "window" : "element",
+			actions: ["tap"]
+		}];
+	});
+	return {
+		screenHash: createHash("sha256").update(text).digest("hex"),
+		seq: sequence,
+		elements
+	};
+}
+function createAppleDeviceAdapter(input) {
+	const sessions = /* @__PURE__ */ new Map();
+	const fail = (operation) => (cause) => new DeviceOperationError({
+		operation,
+		reason: "request_failed",
+		cause: cause instanceof Error ? cause.message : String(cause)
+	});
+	const call = (client, name, args) => Effect.tryPromise({
+		try: (signal) => client.call(name, args, signal),
+		catch: fail(name)
+	});
+	const closeSession = (leaseId) => {
+		const pending = sessions.get(leaseId);
+		sessions.delete(leaseId);
+		pending?.then(async (owned) => {
+			try {
+				await owned.client.call("DeviceInteractionEndSession", { interactionSessionKey: owned.key }, new AbortController().signal);
+			} finally {
+				owned.client.close();
+			}
+		}).catch(() => {});
+	};
+	const get = (session) => Effect.tryPromise({
+		try: async (signal) => {
+			if (session.hostId !== "local" || session.platform !== "ios" || !session.leaseId) throw new Error("Apple MCP requires an exact local iOS device lease.");
+			let pending = sessions.get(session.leaseId);
+			if (!pending) {
+				if (sessions.size >= MAX_SESSIONS) throw new Error("Close an existing device session first.");
+				pending = (async () => {
+					const client = await XcodeMcpClient.start("/usr/bin/xcrun", input.cwd, {
+						...input.environment,
+						MCP_XCODE_SESSION_ID: randomUUID()
+					}, signal, "apple");
+					try {
+						const missing = REQUIRED_DEVICE_TOOLS.filter((tool) => !client.tools.has(tool));
+						if (missing.length > 0) throw new Error(`Selected Xcode lacks required device tools: ${missing.join(", ")}. No device session was opened.`);
+						if (input.workspacePath) await client.call("XcodeOpenWorkspace", { path: input.workspacePath }, signal);
+						const opened = Schema$1.decodeUnknownSync(Session)(appleMcpData(await client.call("DeviceInteractionStartSession", {
+							deviceIdentifier: session.deviceId,
+							sessionIdentifier: `P4 Device ${session.threadId.slice(0, 8)}`
+						}, signal)));
+						if (opened.deviceUUID.toLowerCase() !== session.deviceId.toLowerCase() || !opened.deviceIsSimulator) {
+							await client.call("DeviceInteractionEndSession", { interactionSessionKey: opened.interactionSessionKey }, signal);
+							throw new Error("Apple selected a different device. No interaction was performed.");
+						}
+						return {
+							client,
+							key: opened.interactionSessionKey,
+							sequence: 0
+						};
+					} catch (error) {
+						client.close();
+						throw error;
+					}
+				})();
+				sessions.set(session.leaseId, pending);
+				const leaseId = session.leaseId;
+				pending.catch(() => {
+					if (sessions.get(leaseId) === pending) sessions.delete(leaseId);
+				});
+			}
+			return pending;
+		},
+		catch: fail("open")
+	});
+	const capture = (owned, interactionCommand) => Effect.gen(function* () {
+		const response = yield* call(owned.client, "DeviceInteractionSynthesize", {
+			interactSessionKey: owned.key,
+			...interactionCommand ? { interactionCommand } : {}
+		});
+		const data = yield* Effect.try({
+			try: () => appleMcpData(response),
+			catch: fail("state")
+		});
+		const result = yield* Schema$1.decodeUnknownEffect(Capture)(data);
+		if ((yield* input.fs.stat(result.hierarchyPath)).size > BigInt(MAX_HIERARCHY_BYTES)) return yield* fail("state")("Apple hierarchy exceeds the supported size.");
+		const snapshot = appleHierarchySnapshot(yield* input.fs.readFileString(result.hierarchyPath), owned.sequence + 1);
+		if (owned.snapshot?.screenHash !== snapshot.screenHash) {
+			owned.snapshot = snapshot;
+			owned.sequence += 1;
+		}
+		const currentSnapshot = owned.snapshot;
+		owned.image = result.screenshotPath;
+		const viewport = currentSnapshot.elements.find((element) => element.role === "window")?.frame;
+		return {
+			adapter: "apple-xcode",
+			capabilities: [
+				"snapshot_ui",
+				"tap",
+				"screenshot"
+			],
+			capture: currentSnapshot,
+			...viewport ? { viewport } : {}
+		};
+	}).pipe(Effect.mapError(fail("state")));
+	return {
+		diagnose: Effect.gen(function* () {
+			const result = yield* input.run("xcrun", [
+				"mcp-server",
+				"status",
+				"--format",
+				"json"
+			]);
+			if (result.code !== 0) return "Apple MCP did not respond. Check the selected Xcode installation and MCP service.";
+			const status = objectValue(yield* Schema$1.decodeUnknownEffect(Schema$1.UnknownFromJsonString)(result.stdout));
+			const permission = objectValue(status.permission);
+			if ((Array.isArray(permission.pendingAgentApprovals) ? permission.pendingAgentApprovals : []).some((item) => objectValue(objectValue(objectValue(objectValue(item).subject).agent)._0).name === "p4code-device-adapter")) return "Apple Xcode is waiting for approval of p4code-device-adapter and its project folder. Approve the pending request in Xcode, then select the device again. P4 cannot grant this approval automatically.";
+			if (status.running === false) return "Apple MCP service is not running. Open the selected Xcode project or configure its headless service, then select the device again.";
+			return "Apple MCP did not respond in time. Check Xcode agent/folder permissions and session logs before selecting the device again.";
+		}).pipe(Effect.orElseSucceed(() => "Apple MCP did not respond. Check Xcode agent/folder permissions and service status.")),
+		discover: Effect.gen(function* () {
+			const result = yield* input.run("xcrun", [
+				"simctl",
+				"list",
+				"devices",
+				"available",
+				"--json"
+			]);
+			if (result.code !== 0) return yield* fail("list")("Selected Xcode cannot list simulators.");
+			const parsed = yield* Schema$1.decodeUnknownEffect(Schema$1.fromJsonString(Simulators))(result.stdout).pipe(Effect.mapError(fail("list")));
+			return Object.entries(parsed.devices).filter(([runtime]) => runtime.includes(".iOS-")).flatMap(([runtime, devices]) => devices.filter((device) => device.isAvailable).map((device) => ({
+				hostId: "local",
+				id: device.udid,
+				platform: "ios",
+				name: device.name,
+				version: runtime.replace("com.apple.CoreSimulator.SimRuntime.", "").replaceAll("-", "."),
+				physical: false,
+				booted: device.state === "Booted"
+			})));
+		}),
+		state: (session, sinceScreenHash) => Effect.gen(function* () {
+			const result = yield* capture(yield* get(session));
+			return sinceScreenHash === result.capture.screenHash ? {
+				...result,
+				capture: {
+					screenHash: result.capture.screenHash,
+					seq: result.capture.seq,
+					unchanged: true
+				}
+			} : result;
+		}),
+		action: (session, action) => Effect.gen(function* () {
+			if (action.action !== "tap") return yield* fail("command")("This Apple MCP integration currently advertises tap only. Use only capabilities returned by getAXState().");
+			const owned = yield* get(session);
+			const previous = owned.snapshot;
+			const element = previous?.elements.find((element) => element.ref === action.elementRef);
+			if (!element) return yield* fail("command")("Stale device ref. Read getAXState() and choose a current element.");
+			const fresh = yield* capture(owned);
+			if (fresh.capture.screenHash !== previous.screenHash) return yield* fail("command")("Device layout changed. Read getAXState() and choose a current element; no action was performed.");
+			return {
+				...yield* capture(owned, `t ${element.hitPoint.x} ${element.hitPoint.y}`),
+				...fresh.viewport ? { pointer: {
+					x: (element.hitPoint.x - fresh.viewport.x) / fresh.viewport.width,
+					y: (element.hitPoint.y - fresh.viewport.y) / fresh.viewport.height
+				} } : {}
+			};
+		}),
+		screenshot: (session) => Effect.gen(function* () {
+			const owned = yield* get(session);
+			yield* capture(owned);
+			if ((yield* input.fs.stat(owned.image)).size > BigInt(8388608)) return yield* fail("screenshot")("Apple screenshot exceeds the supported size.");
+			const png = Buffer.from(yield* input.fs.readFile(owned.image));
+			return {
+				png,
+				...yield* Effect.try({
+					try: () => pngDimensions(png),
+					catch: fail("screenshot")
+				})
+			};
+		}).pipe(Effect.mapError(fail("screenshot"))),
+		recording: (_session, _action) => Effect.fail(fail("recording")("Apple MCP does not advertise a recording tool. Recording is unavailable through this adapter.")),
+		closeSession,
+		stop: () => {
+			for (const key of sessions.keys()) closeSession(key);
+		}
+	};
+}
+//#endregion
 //#region src/device/DeviceToolchain.ts
 /**
 * Pinned installs of the two external tools device support is built on.
@@ -45818,6 +46767,7 @@ function deviceHubPlatform(platforms) {
 const COMMAND_TIMEOUT_MS$1 = 2e4;
 const COMMAND_OUTPUT_LIMIT = 1024 * 1024;
 const COMMAND_FAILURE_CODE = 127;
+const APPLE_DEVICE_MCP_MINIMUM_XCODE = 27;
 const make$81 = Effect.fn("LocalDeviceHost.make")(function* () {
 	const config = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
@@ -45864,7 +46814,19 @@ const make$81 = Effect.fn("LocalDeviceHost.make")(function* () {
 		stderr: "Device command failed.",
 		code: COMMAND_FAILURE_CODE
 	})));
+	const appleVersion = (platform === "darwin" ? yield* run("xcrun", ["--find", "mcpbridge"]) : null)?.code === 0 ? yield* run("xcodebuild", ["-version"]) : null;
+	const appleAvailable = appleVersion?.code === 0 && Number(appleVersion.stdout.match(/^Xcode (\d+)\b/m)?.[1]) >= APPLE_DEVICE_MCP_MINIMUM_XCODE;
+	const legacyPath = environment.P4CODE_XCODEBUILDMCP_PATH?.trim();
+	const useLegacy = environment.P4CODE_DEVICE_ADAPTER === "xcodebuildmcp";
+	const xcode = appleAvailable && !useLegacy ? createAppleDeviceAdapter({
+		cwd: config.stateDir,
+		environment: hostEnvironment,
+		fs,
+		run,
+		...environment.P4CODE_APPLE_MCP_WORKSPACE ? { workspacePath: environment.P4CODE_APPLE_MCP_WORKSPACE } : {}
+	}) : platform === "darwin" && legacyPath ? createXcodeDeviceAdapter(legacyPath, config.stateDir, hostEnvironment) : void 0;
 	const stopAgent = Effect.suspend(() => {
+		xcode?.stop();
 		const owned = agent;
 		agent = null;
 		return owned?.stop ?? Effect.void;
@@ -45903,7 +46865,8 @@ const make$81 = Effect.fn("LocalDeviceHost.make")(function* () {
 			nodePath: process.execPath,
 			hub: { origin: started.origin },
 			helpers,
-			run
+			run,
+			...xcode ? { xcode } : {}
 		};
 		return ready;
 	}, Effect.onExit((exit) => Exit.isFailure(exit) ? stop : Effect.void));
@@ -45914,6 +46877,10 @@ const make$81 = Effect.fn("LocalDeviceHost.make")(function* () {
 				id: hostId,
 				kind: "local",
 				label: "This machine",
+				...xcode ? { automation: {
+					provider: appleAvailable && !useLegacy ? "apple-xcode" : "xcodebuildmcp",
+					detail: appleAvailable && !useLegacy ? "Apple Xcode MCP. Agent and folder approval is required; P4 never grants it automatically." : "Optional XcodeBuildMCP 2.7.0 executable. No automatic installation."
+				} } : {},
 				platforms: yield* Effect.all([platformAvailability("ios"), platformAvailability("android")]),
 				hubInstalled: yield* isDeviceHubInstalled(config.baseDir).pipe(Effect.provideContext(context)),
 				agentDeviceInstalled: yield* isAgentDeviceInstalled(config.baseDir).pipe(Effect.provideContext(context))
@@ -45925,8 +46892,9 @@ const make$81 = Effect.fn("LocalDeviceHost.make")(function* () {
 			return ready;
 		})),
 		ensureReady: (onPhase) => lock.withPermit(ensureHub(onPhase)),
-		ensureAgentReady: (onPhase) => lock.withPermit(Effect.gen(function* () {
+		ensureAgentReady: (onPhase, devicePlatform) => lock.withPermit(Effect.gen(function* () {
 			const host = yield* ensureHub(onPhase);
+			if (xcode && devicePlatform === "ios") return host;
 			if (agent && (yield* agent.isRunning)) return {
 				...host,
 				agentDevice: agent.endpoint
@@ -45953,7 +46921,7 @@ const make$81 = Effect.fn("LocalDeviceHost.make")(function* () {
 		stop: lock.withPermit(stop)
 	};
 });
-Layer.effect(DeviceHost, make$81()).pipe(Layer.provide(layer$72));
+Layer.effect(DeviceHost, make$81()).pipe(Layer.provide(layer$73));
 Data.TaggedError("SshHostDiscoveryError");
 var SshInvalidTargetError = class extends Data.TaggedError("SshInvalidTargetError") {};
 var SshCommandError = class extends Data.TaggedError("SshCommandError") {};
@@ -46952,9 +47920,17 @@ var DeviceService = class extends Context.Service()("@p4code/cli/device/DeviceSe
 const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function* (input) {
 	const settings = yield* ServerSettingsService;
 	const scope = yield* Scope.Scope;
-	const registry = yield* make$82(input);
-	const commands = yield* make$84();
-	const threads = yield* make$83();
+	const registry = yield* make$83(input);
+	const commands = yield* make$85();
+	const adapterLeases = /* @__PURE__ */ new Map();
+	const closeCommands = (sessions) => Effect.sync(() => {
+		for (const session of sessions) {
+			if (!session.leaseId) continue;
+			adapterLeases.get(session.leaseId)?.();
+			adapterLeases.delete(session.leaseId);
+		}
+	}).pipe(Effect.andThen(commands.close(sessions)));
+	const threads = yield* make$84();
 	const changes = yield* Effect.acquireRelease(PubSub.sliding(STATE_BUFFER_SIZE), PubSub.shutdown);
 	const stateLock = yield* Semaphore.make(1);
 	const discoveryLock = yield* Semaphore.make(1);
@@ -46991,7 +47967,7 @@ const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function* (input)
 		}));
 	}
 	const retireSessions = (ids) => Effect.gen(function* () {
-		yield* commands.close(state.sessions.filter((session) => ids.includes(session.hostId)));
+		yield* closeCommands(state.sessions.filter((session) => ids.includes(session.hostId)));
 		yield* update((current) => {
 			for (const id of ids) hostLocks.delete(id);
 			return {
@@ -47202,7 +48178,7 @@ const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function* (input)
 		return yield* withHost(value.hostId, (lease) => Effect.gen(function* () {
 			let found = yield* freshDevice(lease, value);
 			if (access === "agent") {
-				yield* lease.host.ensureAgentReady(() => Effect.void);
+				yield* lease.host.ensureAgentReady(() => Effect.void, value.platform);
 				yield* registry.commit(lease, () => void 0);
 			}
 			if (!found.device.booted && value.boot !== false) {
@@ -47241,7 +48217,7 @@ const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function* (input)
 				openedAt,
 				leaseId: NodeCrypto.randomUUID()
 			};
-			yield* commands.close(sessionsToClose(state.sessions, session));
+			yield* closeCommands(sessionsToClose(state.sessions, session));
 			yield* update((current) => ({
 				...current,
 				sessions: [...current.sessions.filter((item) => !(item.threadId === session.threadId && item.hostId === session.hostId && item.deviceId === session.deviceId)), session]
@@ -47252,7 +48228,7 @@ const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function* (input)
 	const shutdownWithin = Effect.fn("DeviceService.shutdownWithin")(function* (lease, value) {
 		const { ready, device } = yield* freshDevice(lease, value);
 		yield* input.actions.shutdown(ready, device);
-		yield* commands.close(state.sessions.filter((session) => session.hostId === value.hostId && session.deviceId === value.deviceId));
+		yield* closeCommands(state.sessions.filter((session) => session.hostId === value.hostId && session.deviceId === value.deviceId));
 		yield* update((current) => ({
 			...current,
 			devices: current.devices.map((item) => item.hostId === value.hostId && item.id === value.deviceId ? {
@@ -47276,7 +48252,7 @@ const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function* (input)
 				platform: session.platform
 			});
 			else {
-				yield* commands.close(sessionsToClose(state.sessions, value));
+				yield* closeCommands(sessionsToClose(state.sessions, value));
 				yield* update((current) => {
 					const closing = sessionsToClose(current.sessions, value);
 					return {
@@ -47319,11 +48295,16 @@ const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function* (input)
 			});
 			const validate = registry.isCurrent(lease).pipe(Effect.map((current) => current && state.sessions.includes(session)));
 			return yield* commands.run(session, validate, Effect.gen(function* () {
-				const ready = yield* lease.host.ensureAgentReady(() => Effect.void);
+				const ready = yield* lease.host.ensureAgentReady(() => Effect.void, session.platform);
 				if (!(yield* validate)) return yield* new DeviceHostUnavailableError({
 					hostId: target.hostId,
 					reason: "Device session or agent authorization changed."
 				});
+				if (ready.xcode && session.leaseId) {
+					const adapter = ready.xcode;
+					const leaseId = session.leaseId;
+					adapterLeases.set(leaseId, () => adapter.closeSession(leaseId));
+				}
 				return yield* execute(ready, session);
 			}));
 		})).pipe(Effect.mapError((error) => isDeviceHostError(error) || isDeviceHostTimeoutError(error) ? new DeviceHostUnavailableError({
@@ -47337,7 +48318,7 @@ const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function* (input)
 		agentList: listForAccess("agent"),
 		configure,
 		shutdown,
-		retireThread: (threadId) => threads.retire(threadId).pipe(Effect.ensuring(Effect.suspend(() => commands.close(state.sessions.filter((session) => session.threadId === threadId))).pipe(Effect.ensuring(update((current) => ({
+		retireThread: (threadId) => threads.retire(threadId).pipe(Effect.ensuring(Effect.suspend(() => closeCommands(state.sessions.filter((session) => session.threadId === threadId))).pipe(Effect.ensuring(update((current) => ({
 			...current,
 			sessions: current.sessions.filter((session) => session.threadId !== threadId),
 			bootingDevices: (current.bootingDevices ?? []).filter((device) => device.threadId !== threadId)
@@ -47345,7 +48326,10 @@ const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function* (input)
 		restoreThread: threads.restore,
 		withAgentDevice: (target, execute) => threads.run(target.threadId, withAgentDevice(target, execute)),
 		withManualDevice: (target, execute) => threads.run(target.threadId, withManualDevice(target, execute)),
-		withAgentCommand: (target, execute) => threads.run(target.threadId, withAgentDevice(target, (ready, session) => execute(ready.agentDevice, session))),
+		withAgentCommand: (target, execute) => threads.run(target.threadId, withAgentDevice(target, (ready, session) => ready.agentDevice ? execute(ready.agentDevice, session) : Effect.fail(new DeviceHostUnavailableError({
+			hostId: target.hostId,
+			reason: "This host uses semantic device control. Use cua.getDevice() and element refs."
+		})))),
 		open: (value) => threads.run(value.threadId, openWithAccess(value, "manual")),
 		agentOpen: (value) => threads.run(value.threadId, openWithAccess(value, "agent")),
 		close: (value) => closeWithAccess(value, "manual"),
@@ -47358,15 +48342,15 @@ const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function* (input)
 	};
 });
 const make$79 = Effect.gen(function* () {
-	const discover = yield* make$86();
-	const actions = yield* make$85();
+	const discover = yield* make$87();
+	const actions = yield* make$86();
 	return yield* makeWithHosts({
 		local: make$81(),
 		ssh: make$80,
 		discover,
 		actions
 	});
-}).pipe(Effect.provide(layer$72));
+}).pipe(Effect.provide(layer$73));
 const layer$70 = Layer.effect(DeviceService, make$79);
 //#endregion
 //#region src/serverRuntimeStartup.ts
@@ -47979,7 +48963,7 @@ const projectCommandUuid = Crypto.Crypto.pipe(Effect.flatMap((crypto) => crypto.
 	operation: "generateProjectCommandId",
 	cause
 })));
-const ProjectCliRuntimeLive = Layer.mergeAll(layer$68, OrchestrationLayerLive.pipe(Layer.provideMerge(layer$80), Layer.provideMerge(layerConfig)));
+const ProjectCliRuntimeLive = Layer.mergeAll(layer$68, OrchestrationLayerLive.pipe(Layer.provideMerge(layer$81), Layer.provideMerge(layerConfig)));
 const PROJECT_CLI_LIVE_SERVER_TIMEOUT = Duration.seconds(1);
 const withProjectCliSessionToken = (environmentAuth, run) => Effect.acquireUseRelease(environmentAuth.issueSession({
 	scopes: AuthAdministrativeScopes,
@@ -48070,7 +49054,7 @@ const runProjectMutation = Effect.fn("runProjectMutation")(function* (flags, run
 			});
 			yield* Console.log(output);
 		}));
-		const offlineRuntimeLayer = ProjectCliRuntimeLive.pipe(Layer.provide(layer$117(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)));
+		const offlineRuntimeLayer = ProjectCliRuntimeLive.pipe(Layer.provide(layer$118(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)));
 		return yield* Effect.gen(function* () {
 			const snapshot = yield* getOfflineSnapshot();
 			const orchestrationEngine = yield* OrchestrationEngineService;
@@ -48081,7 +49065,7 @@ const runProjectMutation = Effect.fn("runProjectMutation")(function* (flags, run
 			});
 			yield* Console.log(output);
 		}).pipe(Effect.provide(offlineRuntimeLayer));
-	}).pipe(Effect.provide(Layer.mergeAll(runtimeLayer, layer$68).pipe(Layer.provideMerge(FetchHttpClient.layer), Layer.provide(layer$117(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)))));
+	}).pipe(Effect.provide(Layer.mergeAll(runtimeLayer, layer$68).pipe(Layer.provideMerge(FetchHttpClient.layer), Layer.provide(layer$118(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)))));
 });
 const projectAddCommand = Command.make("add", {
 	...projectLocationFlags,
@@ -53298,80 +54282,6 @@ const make$75 = Effect.fn("DeviceCommandProxy.make")(function* () {
 var DeviceCommandProxy = class extends Context.Service()("@p4code/cli/device/DeviceCommandProxy") {};
 const layer$67 = Layer.effect(DeviceCommandProxy, make$75().pipe(Effect.map((execute) => ({ execute }))));
 //#endregion
-//#region src/device/DeviceScreenshot.ts
-const MAX_SCREENSHOT_BYTES = 8 * 1024 * 1024;
-var DeviceScreenshotFailure = class extends Data.TaggedError("DeviceScreenshotFailure") {};
-const MAX_DIMENSION = 16384;
-const MAX_PIXELS = 64 * 1024 * 1024;
-const SCREENSHOT_TIMEOUT_MS = 2e4;
-const PNG_HEADER_BYTES = 33;
-const PNG_CHUNK_OVERHEAD = 12;
-const PNG_SIGNATURE = Buffer.from([
-	137,
-	80,
-	78,
-	71,
-	13,
-	10,
-	26,
-	10
-]);
-function pngDimensions(png) {
-	const buffer = Buffer.from(png.buffer, png.byteOffset, png.byteLength);
-	if (buffer.length < PNG_HEADER_BYTES || buffer.length > 8388608 || !buffer.subarray(0, PNG_SIGNATURE.length).equals(PNG_SIGNATURE) || buffer.readUInt32BE(8) !== 13 || buffer.toString("ascii", 12, 16) !== "IHDR") throw new DeviceScreenshotFailure({ message: "Invalid PNG screenshot." });
-	const width = buffer.readUInt32BE(16);
-	const height = buffer.readUInt32BE(20);
-	if (!width || !height || width > MAX_DIMENSION || height > MAX_DIMENSION || width * height > MAX_PIXELS) throw new DeviceScreenshotFailure({ message: "Screenshot dimensions exceed limits." });
-	let offset = PNG_HEADER_BYTES;
-	let imageData = false;
-	let ended = false;
-	while (offset + PNG_CHUNK_OVERHEAD <= buffer.length) {
-		const length = buffer.readUInt32BE(offset);
-		const type = buffer.toString("ascii", offset + 4, offset + 8);
-		const next = offset + PNG_CHUNK_OVERHEAD + length;
-		if (next > buffer.length || type === "IHDR") throw new DeviceScreenshotFailure({ message: "Invalid PNG chunk." });
-		if (type === "IDAT") imageData = true;
-		if (type === "IEND") {
-			ended = length === 0 && next === buffer.length;
-			break;
-		}
-		offset = next;
-	}
-	if (!imageData || !ended) throw new DeviceScreenshotFailure({ message: "Incomplete PNG screenshot." });
-	return {
-		width,
-		height
-	};
-}
-const make$74 = Effect.fn("DeviceScreenshot.make")(function* () {
-	const http = yield* HttpClient.HttpClient;
-	return Effect.fn("DeviceScreenshot.capture")(function* (ready, session) {
-		const origin = yield* Effect.try(() => new URL(ready.hub.origin));
-		if (origin.protocol !== "http:" || origin.hostname !== "127.0.0.1" || !origin.port || origin.username || origin.password || origin.pathname !== "/" || origin.search || origin.hash) return yield* new DeviceScreenshotFailure({ message: "Invalid owned hub." });
-		const vendor = session.platform === "ios" ? "serve-sim" : "serve-emu";
-		const response = yield* http.execute(HttpClientRequest.post(`${origin.origin}/vendor/${vendor}/api/screenshot?device=${encodeURIComponent(session.deviceId)}`));
-		if (response.status !== 200) return yield* new DeviceScreenshotFailure({ message: "Screenshot rejected." });
-		let bytes = 0;
-		const chunks = [];
-		yield* response.stream.pipe(Stream.runForEach((chunk) => Effect.gen(function* () {
-			bytes += chunk.byteLength;
-			if (bytes > 8388608) return yield* new DeviceScreenshotFailure({ message: "Screenshot too large." });
-			chunks.push(chunk);
-		})));
-		const png = Buffer.concat(chunks, bytes);
-		return {
-			png,
-			...yield* Effect.try(() => pngDimensions(png))
-		};
-	}, Effect.scoped, Effect.timeout(Duration.millis(SCREENSHOT_TIMEOUT_MS)), Effect.mapError(() => new DeviceOperationError({
-		operation: "screenshot",
-		reason: "request_failed",
-		cause: "Device screenshot could not be captured."
-	})));
-});
-var DeviceScreenshot = class extends Context.Service()("@p4code/cli/device/DeviceScreenshot") {};
-const layer$66 = Layer.effect(DeviceScreenshot, make$74().pipe(Effect.map((capture) => ({ capture }))));
-//#endregion
 //#region src/device/DeviceHubRoute.ts
 const DEVICE_HUB_PROXY_PREFIX = "/api/device-hub";
 const MAX_ROUTE_LENGTH = 16 * 1024;
@@ -53574,12 +54484,12 @@ const requireThreadSpawn = Effect.fn("mcp.requireThreadSpawn")(function* (fusion
 const isDeviceToolUnavailableError = Schema$1.is(DeviceToolUnavailableError);
 const isDeviceActionUnavailableError = Schema$1.is(DeviceActionUnavailableError);
 /** Internal bridge; tool payloads never choose thread identity or daemon credentials. */
-const withDeviceInvocation = (execute) => Effect.gen(function* () {
+const withDeviceInvocation = (execute, capability = "devices") => Effect.gen(function* () {
 	const invocation = yield* McpInvocationContext;
 	const service = yield* DeviceService;
 	const lifetime = invocation.authorizationLifetime;
 	const denied = () => new DeviceToolUnavailableError({ reason: "Device command unavailable or authorization changed." });
-	if (!invocation.capabilities.has("devices") || !lifetime?.revocation || lifetime.revoked) return yield* denied();
+	if (!invocation.capabilities.has(capability) || !lifetime?.revocation || lifetime.revoked) return yield* denied();
 	const work = execute(service, invocation.threadId).pipe(Effect.tap(() => lifetime.revoked ? Effect.fail(denied()) : Effect.void), Effect.mapError((error) => isDeviceToolUnavailableError(error) || isDeviceActionUnavailableError(error) ? error : denied()));
 	return yield* Effect.raceFirst(work, Deferred.await(lifetime.revocation).pipe(Effect.andThen(Effect.fail(denied()))));
 });
@@ -53594,6 +54504,7 @@ const MAX_AX_BYTES = 512 * 1024;
 const AX_TIMEOUT_MS = 1e4;
 const MAX_AX_EXTENT = 32768;
 const MIN_AX_EXTENT = 2;
+const isToolUnavailable = Schema$1.is(DeviceToolUnavailableError);
 const AxFrames = Schema$1.Array(Schema$1.Struct({ frame: Schema$1.Struct({
 	x: Schema$1.Number,
 	y: Schema$1.Number,
@@ -53633,6 +54544,7 @@ const makeComputerUseDevices = Effect.fn("ComputerUseDevices.make")(function* ()
 			const state = yield* service.agentList;
 			const device = state.devices.find((device) => device.hostId === input.hostId && device.id === input.deviceId && device.platform === input.platform);
 			if (!device) return yield* stale();
+			if (device.physical) return yield* new DeviceToolUnavailableError({ reason: "Physical-device UI control is not supported by this adapter. Pairing, trust, Developer Mode and signing must be configured separately; use supported device-management workflows." });
 			const session = yield* service.agentOpen({
 				threadId,
 				hostId: input.hostId,
@@ -53670,8 +54582,16 @@ const makeComputerUseDevices = Effect.fn("ComputerUseDevices.make")(function* ()
 			deviceId: target.deviceId
 		}, (ready, session) => Effect.gen(function* () {
 			if (session.leaseId !== input.leaseId) return yield* stale();
+			if (input.method === "recording") {
+				if (!ready.xcode || session.platform !== "ios") return yield* new DeviceToolUnavailableError({ reason: "Recording is unavailable on this device adapter." });
+				return yield* ready.xcode.recording(session, input.action).pipe(Effect.mapError((error) => new DeviceToolUnavailableError({ reason: String(error.cause) })));
+			}
+			if (input.method === "semantic") {
+				if (!ready.xcode || session.platform !== "ios") return yield* new DeviceToolUnavailableError({ reason: "Semantic device actions require a supported local Xcode adapter. Use the capabilities returned by getAXState()." });
+				return yield* ready.xcode.action(session, input.action).pipe(Effect.mapError((error) => new DeviceToolUnavailableError({ reason: String(error.cause) })));
+			}
 			if (input.method === "screenshot") {
-				const capture = yield* screenshots.capture(ready, session);
+				const capture = yield* ready.xcode && session.platform === "ios" ? ready.xcode.screenshot(session).pipe(Effect.mapError((error) => new DeviceToolUnavailableError({ reason: String(error.cause) }))) : screenshots.capture(ready, session);
 				return {
 					mimeType: "image/png",
 					data: capture.png.toString("base64"),
@@ -53679,6 +54599,7 @@ const makeComputerUseDevices = Effect.fn("ComputerUseDevices.make")(function* ()
 					height: capture.height
 				};
 			}
+			if (ready.xcode && session.platform === "ios") return yield* ready.xcode.state(session, input.sinceScreenHash).pipe(Effect.mapError((error) => new DeviceToolUnavailableError({ reason: String(error.cause) })));
 			if (session.platform !== "ios") return yield* new DeviceToolUnavailableError({ reason: "CUA accessibility state is currently supported only for iOS Simulator. Use a screenshot for this device." });
 			const route = resolveDeviceHubRoute({
 				target: {
@@ -53706,12 +54627,13 @@ const makeComputerUseDevices = Effect.fn("ComputerUseDevices.make")(function* ()
 				leaseId: session.leaseId,
 				accessibility
 			};
-		}).pipe(Effect.scoped, Effect.timeout(AX_TIMEOUT_MS), Effect.mapError((error) => new DeviceOperationError({
-			operation: "command",
-			reason: "request_failed",
-			cause: error.message
-		}))));
-	})).pipe(Effect.provideService(McpInvocationContext, scope), Effect.provideService(DeviceService, devices), Effect.mapError((error) => new ComputerUseError({
+		}).pipe(Effect.scoped, Effect.timeoutOrElse({
+			duration: AX_TIMEOUT_MS,
+			orElse: () => Effect.gen(function* () {
+				return yield* new DeviceToolUnavailableError({ reason: ready.xcode && "diagnose" in ready.xcode ? yield* ready.xcode.diagnose : "Device state request timed out. Check device support before selecting the device again." });
+			})
+		}), Effect.mapError((error) => isToolUnavailable(error) ? error : new DeviceToolUnavailableError({ reason: error instanceof Error ? error.message : String(error) }))));
+	}), "computer-use").pipe(Effect.provideService(McpInvocationContext, scope), Effect.provideService(DeviceService, devices), Effect.mapError((error) => new ComputerUseError({
 		reason: "unavailable",
 		detail: error.message
 	})));
@@ -53737,7 +54659,7 @@ const hostSession = (scope) => ({
 	providerSessionId: scope.providerSessionId
 });
 var ComputerUseBroker = class extends Context.Service()("@p4code/cli/mcp/ComputerUseBroker") {};
-const layer$65 = Layer.effect(ComputerUseBroker, Effect.gen(function* () {
+const layer$66 = Layer.effect(ComputerUseBroker, Effect.gen(function* () {
 	const serviceScope = yield* Scope.Scope;
 	const crypto = yield* Crypto.Crypto;
 	const environment = yield* ServerEnvironment;
@@ -54328,7 +55250,7 @@ const renew = HttpRouter.add("POST", "/internal/computer-use/renew", Effect.gen(
 	if (binding.trust) yield* (yield* RemoteComputerUseBindings).touch(bearer(request));
 	return HttpServerResponse.empty({ status: 204 });
 }).pipe(Effect.catch(failure$1)));
-const layer$64 = Layer.mergeAll(exchange, hubForward, hubExchange, connect, respond, device, report, environment, renew).pipe(Layer.provide(remoteComputerUseBindingsLayer));
+const layer$65 = Layer.mergeAll(exchange, hubForward, hubExchange, connect, respond, device, report, environment, renew).pipe(Layer.provide(remoteComputerUseBindingsLayer));
 //#endregion
 //#region src/device/DeviceHubSocketProtocol.ts
 const MAX_DEVICE_INPUT_BYTES = 8 * 1024;
@@ -55706,7 +56628,7 @@ const logP4ProjectFileLoadError = (error) => Effect.logWarning(error).pipe(Effec
 	filePath: error.filePath,
 	errorTag: error._tag
 }));
-const make$73 = Effect.gen(function* () {
+const make$74 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const load = Effect.fn("P4ProjectFileLoader.load")(function* (workspaceRoot) {
@@ -55727,7 +56649,7 @@ const make$73 = Effect.gen(function* () {
 	});
 	return P4ProjectFileLoader.of({ load });
 });
-const layer$63 = Layer.effect(P4ProjectFileLoader, make$73);
+const layer$64 = Layer.effect(P4ProjectFileLoader, make$74);
 //#endregion
 //#region src/project/ProjectFaviconResolver.ts
 /**
@@ -55802,7 +56724,7 @@ function extractIconHref(source) {
 	return null;
 }
 const optionOnNotFound$1 = (effect) => effect.pipe(Effect.map(Option.some), Effect.catchTags({ PlatformError: (error) => error.reason._tag === "NotFound" ? Effect.succeed(Option.none()) : Effect.fail(error) }));
-const make$72 = Effect.gen(function* () {
+const make$73 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const workspacePaths = yield* WorkspacePaths;
@@ -55871,7 +56793,7 @@ const make$72 = Effect.gen(function* () {
 	});
 	return ProjectFaviconResolver.of({ resolvePath });
 });
-const layer$62 = Layer.effect(ProjectFaviconResolver, make$72);
+const layer$63 = Layer.effect(ProjectFaviconResolver, make$73);
 //#endregion
 //#region src/assets/AssetAccess.ts
 const ASSET_ROUTE_PREFIX = "/api/assets";
@@ -56282,10 +57204,10 @@ const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (token, rel
 //#endregion
 //#region src/observability/BrowserTraceCollector.ts
 var BrowserTraceCollector = class extends Context.Service()("@p4code/cli/observability/BrowserTraceCollector") {};
-const make$71 = (sink) => BrowserTraceCollector.of({ record: (records) => Effect.sync(() => {
+const make$72 = (sink) => BrowserTraceCollector.of({ record: (records) => Effect.sync(() => {
 	for (const record of records) sink.push(record);
 }) });
-const layer$61 = (sink) => Layer.succeed(BrowserTraceCollector, make$71(sink));
+const layer$62 = (sink) => Layer.succeed(BrowserTraceCollector, make$72(sink));
 //#endregion
 //#region src/auth/http.ts
 const CREDENTIAL_RESPONSE_HEADERS = {
@@ -57427,7 +58349,7 @@ const defaultCancelTimeout = Duration.seconds(15);
 const defaultSessionLoadTimeout = Duration.seconds(90);
 const defaultSessionLoadReplayIdleGap = Duration.seconds(2);
 var AcpSessionRuntime = class extends Context.Service()("@p4code/cli/provider/acp/AcpSessionRuntime") {};
-const make$70 = (options) => Effect.gen(function* () {
+const make$71 = (options) => Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const runtimeScope = yield* Scope.Scope;
@@ -57831,7 +58753,7 @@ const make$70 = (options) => Effect.gen(function* () {
 		notify: acp.raw.notify
 	};
 });
-const layer$60 = (options) => Layer.effect(AcpSessionRuntime, make$70(options));
+const layer$61 = (options) => Layer.effect(AcpSessionRuntime, make$71(options));
 function sessionConfigOptionsFromSetup(response) {
 	return response?.configOptions ?? [];
 }
@@ -58225,7 +59147,7 @@ const buildAntigravityPrompt = Effect.fn("buildAntigravityPrompt")(function* (in
 });
 /** Normal launches reject browser login; only the auth flow supplies `onAuthorizationUrl`. */
 const makeAntigravityAcpRuntime = Effect.fn("makeAntigravityAcpRuntime")(function* (input) {
-	const context = yield* Layer.build(layer$60({
+	const context = yield* Layer.build(layer$61({
 		...input,
 		authMethodId: input.authMethod ?? "oauth-personal",
 		resumeMethod: "resume",
@@ -62202,7 +63124,7 @@ const BundledOnlyModelManifest = {
 	refreshInBackground: Effect.void
 };
 Layer.succeed(ModelManifest, BundledOnlyModelManifest);
-const make$69 = Effect.gen(function* () {
+const make$70 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const config = yield* ServerConfig$1;
@@ -62247,7 +63169,7 @@ const make$69 = Effect.gen(function* () {
 		refreshInBackground: Effect.forkIn(guardedRefresh, serviceScope).pipe(Effect.asVoid)
 	});
 });
-const layer$59 = Layer.effect(ModelManifest, make$69);
+const layer$60 = Layer.effect(ModelManifest, make$70);
 //#endregion
 //#region src/provider/ProviderDriver.ts
 function defaultProviderContinuationIdentity(input) {
@@ -62507,11 +63429,11 @@ const makeTextGenerationFromRegistry = (registry) => TextGeneration.of({
 		detail: "This provider does not report account usage."
 	}))))
 });
-const make$68 = Effect.gen(function* () {
+const make$69 = Effect.gen(function* () {
 	const registry = yield* ProviderInstanceRegistry;
 	return makeTextGenerationFromRegistry(registry);
 });
-const layer$58 = Layer.effect(TextGeneration, make$68);
+const layer$59 = Layer.effect(TextGeneration, make$69);
 //#endregion
 //#region src/provider/Layers/claudeUsageLimits.ts
 const SESSION_MINS$1 = 300;
@@ -64186,7 +65108,7 @@ function formatAskUserQuestionAnswers(answers) {
 * written as if the setting applied only to user-facing answers.
 */
 const FUSION_PAIR_COMMUNICATION_INSTRUCTIONS = `Everything you send the other half of the pair obeys the thread's active response-compression mode, exactly as a user-facing answer does: phase reports, advice, reviews, questions, and handoffs. When the mode is off, write normal prose. Compression governs form only - never drop a requirement, a negation, a number or unit, a file, symbol, or command name, code, security or warning text, the evidence behind a claim, or an exact protocol heading or token in order to save words.`;
-const FUSION_BUILDER_INSTRUCTIONS = `You are Fusion Builder in an already-created native server pair. Server owns pairing and coordination. Do not inspect or invoke the Fusion skill, create/pair/rename threads, or announce/setup Fusion. Start the user's task directly. Before editing, create and maintain the phase list with your provider's step-tracking tool (Claude Code: TaskCreate for each phase, then TaskUpdate for status, or TodoWrite when that is the tool offered; Codex: update_plan), never the MCP task board tools - one entry per phase in order, exactly one in progress at a time, marked completed at each phase end - so phases render in the task banner. That list holds phase entries only for the whole task; keep step-level or per-file todos out of it. Name each phase in 3-6 words by its outcome, never by a command, file path, or flag, because the banner shows the title verbatim. Prose alone leaves the banner empty. Split it into the fewest substantial phases the task genuinely needs plus a final integration/whole-task phase; most tasks need one to three work phases. Each phase is a complete reviewable slice of behavior. Never split per file, per function, or per trivial step: over-splitting spends review turns instead of finishing the job. Add a phase only when a real review boundary, risky decision, or independent behavior separates the work. Complete exactly one phase per turn, and finish the whole phase in that turn rather than stopping early. Do not run tests, typecheck, lint, or builds per phase; write the tests the change needs, then run verification once in the final phase over the whole task. Exception: a phase whose own correctness is unclear may run the single narrowest check that resolves it. End every phase turn with phase completed, todo status, changed behavior/files, and remaining phases; do not start the next phase in the same turn. Server then wakes the paired Supervisor, which resumes you through ${FUSION_ADVICE_PROMPT_PREFIX}; a user message may also revise or resume the work. Final phase verifies the entire task against the original request and labels it ready for whole-task review. Supervisor is unreachable during your turn. Never spawn/use another Supervisor thread/subagent or attribute Supervisor decisions without ${FUSION_ADVICE_PROMPT_PREFIX}. Within the current phase, continue when straightforward or evidence is clear. For a concrete unresolved tradeoff, correctness risk, or design decision materially needing judgment, stop safely before the risky choice; final response states the exact question and why review is needed. Evaluate/follow Supervisor advice unless conflicting with user request or verified repo state. ${FUSION_PAIR_COMMUNICATION_INSTRUCTIONS}`;
+const FUSION_BUILDER_INSTRUCTIONS = `You are Fusion Builder in an already-created native server pair. Server owns pairing and coordination. Follow the current turn's [fusion-review-policy] block when present; it overrides the phase-boundary scheduling rules below. Do not inspect or invoke the Fusion skill, create/pair/rename threads, or announce/setup Fusion. Start the user's task directly. Before editing, create and maintain the phase list with your provider's step-tracking tool (Claude Code: TaskCreate for each phase, then TaskUpdate for status, or TodoWrite when that is the tool offered; Codex: update_plan), never the MCP task board tools - one entry per phase in order, exactly one in progress at a time, marked completed at each phase end - so phases render in the task banner. That list holds phase entries only for the whole task; keep step-level or per-file todos out of it. Name each phase in 3-6 words by its outcome, never by a command, file path, or flag, because the banner shows the title verbatim. Prose alone leaves the banner empty. Split it into the fewest substantial phases the task genuinely needs plus a final integration/whole-task phase; most tasks need one to three work phases. Each phase is a complete reviewable slice of behavior. Never split per file, per function, or per trivial step: over-splitting spends review turns instead of finishing the job. Add a phase only when a real review boundary, risky decision, or independent behavior separates the work. Complete exactly one phase per turn, and finish the whole phase in that turn rather than stopping early. Do not run tests, typecheck, lint, or builds per phase; write the tests the change needs, then run verification once in the final phase over the whole task. Exception: a phase whose own correctness is unclear may run the single narrowest check that resolves it. End every phase turn with phase completed, todo status, changed behavior/files, and remaining phases; do not start the next phase in the same turn. Server then wakes the paired Supervisor, which resumes you through ${FUSION_ADVICE_PROMPT_PREFIX}; a user message may also revise or resume the work. Final phase verifies the entire task against the original request and labels it ready for whole-task review. Supervisor is unreachable during your turn. Never spawn/use another Supervisor thread/subagent or attribute Supervisor decisions without ${FUSION_ADVICE_PROMPT_PREFIX}. Within the current phase, continue when straightforward or evidence is clear. For a concrete unresolved tradeoff, correctness risk, or design decision materially needing judgment, stop safely before the risky choice; final response states the exact question and why review is needed. Evaluate/follow Supervisor advice unless conflicting with user request or verified repo state. ${FUSION_PAIR_COMMUNICATION_INSTRUCTIONS}`;
 const FUSION_WATCHER_TOOL_INSTRUCTIONS = `Supervisor tools belong to the p4-code MCP server: thread_watch_review, thread_watch_events, thread_advise, and thread_gate_respond. If absent from the visible tool list, first use the available tool search/discovery facility to load those exact tools, including provider-prefixed names; absence from the initial list does not establish unavailability. If discovery or a call fails, report the exact missing capability or error and the need to restore the p4-code MCP connection. Do not offer manual relay, draft or implement the task yourself, or abandon the supervisor role as a workaround. For an actionable user requirement, read the relevant builder evidence and relay it through thread_advise; when a gate is open, answer through thread_gate_respond instead. Structure every actionable supervisor advice message with these Markdown headings, in order:
 ## Recommendation
 State the decision or correction in one sentence. For a phase review, say whether the phase is approved or needs changes.
@@ -64194,7 +65116,7 @@ State the decision or correction in one sentence. For a phase review, say whethe
 Give concise evidence, relevant file/line references, and any unresolved risk. Distinguish observed facts from assumptions; do not claim checks you did not run.
 ## Next step
 Give ordered, concrete actions for the builder, including the next phase and its completion condition. Preserve user requirements, constraints, and delivery authorization. Keep each section short; omit empty bullets and repeated status. Formatting does not authorize an otherwise unnecessary advice turn or replace an exact protocol response.`;
-const FUSION_WATCHER_INSTRUCTIONS = `You are Fusion Supervisor (watcher) in an already-created native server pair. Server owns pairing and coordination and wakes you with ${FUSION_REVIEW_PROMPT_PREFIX} or ${FUSION_GATE_PROMPT_PREFIX} prompts at builder turn boundaries. A plain message outside such a wake may arrive after your conversational memory of the pair is gone; its [fusion-pair] metadata block is authoritative: the builder thread exists and is the counterpart thread id. Never report that no builder thread exists. For a new pair, the initial user request is yours, and its first turn is research, not relay. Research it: when the request names a ticket, read that ticket AND its comments, including replies and inline comments, and treat a later comment as newer intent than the description; read the code, docs, project instructions, and current state the request touches. Analyse what you found: root cause or the concrete design constraint, scope, what the user actually wants delivered, and which delivery steps they authorized. Only then direct the first actionable phase to the idle builder through thread_advise, stating the findings that make the direction actionable alongside the original requirements, constraints, and authorized delivery scope. Never echo the request back as its own direction, never hand over a plan you did not ground in evidence, and never send ${FUSION_NO_OBJECTION_TEXT} before the builder has received its first phase and produced a turn to review. The builder has not received the initial prompt and must not start before your direction. Missing builder turn evidence is expected before that first direction; do not wait for it or implement the work yourself. Ask the user only when needed to resolve a blocking requirement. ${FUSION_WATCHER_TOOL_INSTRUCTIONS} To resume supervision, read builder evidence with thread_watch_review from lastReviewedImplementerSequence, capture its throughSequence on the first page and reuse that fixed bound while paging with nextAfterSequence until hasMore is false (including empty pages). Apply message append/replace operations by identity; recover truncated evidence through targeted raw thread_watch_events source ranges. Retain reviewed requirements and evidence for final review; recover missing context with targeted history reads rather than mandatory raw replay from zero, derive phase from artifacts (git log/status, PR, builder events, including its turn.plan.updated phase list), steer with thread_advise, and answer an open gate with thread_gate_respond. When a review or gate wake prompt specifies an explicit event range, that range wins over this metadata. Never poll or wait for the builder; deliver review or advice, then end the turn. Every thread_advise starts a builder turn whose completion wakes you again, so never advise a builder that is idle on an external wait or has nothing actionable; report the state in your own thread and end without advising. ${FUSION_PAIR_COMMUNICATION_INSTRUCTIONS}`;
+const FUSION_WATCHER_INSTRUCTIONS = `You are Fusion Supervisor (watcher) in an already-created native server pair. Follow the current turn's [fusion-review-policy] block when present; it overrides phase scheduling. Server owns pairing and coordination and wakes you with ${FUSION_REVIEW_PROMPT_PREFIX} or ${FUSION_GATE_PROMPT_PREFIX} prompts at builder turn boundaries. A plain message outside such a wake may arrive after your conversational memory of the pair is gone; its [fusion-pair] metadata block is authoritative: the builder thread exists and is the counterpart thread id. Never report that no builder thread exists. For a new pair, the initial user request is yours, and its first turn is research, not relay. Research it: when the request names a ticket, read that ticket AND its comments, including replies and inline comments, and treat a later comment as newer intent than the description; read the code, docs, project instructions, and current state the request touches. Analyse what you found: root cause or the concrete design constraint, scope, what the user actually wants delivered, and which delivery steps they authorized. Only then direct the first actionable phase to the idle builder through thread_advise, stating the findings that make the direction actionable alongside the original requirements, constraints, and authorized delivery scope. Never echo the request back as its own direction, never hand over a plan you did not ground in evidence, and never send ${FUSION_NO_OBJECTION_TEXT} before the builder has received its first phase and produced a turn to review. The builder has not received the initial prompt and must not start before your direction. Missing builder turn evidence is expected before that first direction; do not wait for it or implement the work yourself. Ask the user only when needed to resolve a blocking requirement. ${FUSION_WATCHER_TOOL_INSTRUCTIONS} To resume supervision, read builder evidence with thread_watch_review from lastReviewedImplementerSequence, capture its throughSequence on the first page and reuse that fixed bound while paging with nextAfterSequence until hasMore is false (including empty pages). Apply message append/replace operations by identity; recover truncated evidence through targeted raw thread_watch_events source ranges. Retain reviewed requirements and evidence for final review; recover missing context with targeted history reads rather than mandatory raw replay from zero, derive phase from artifacts (git log/status, PR, builder events, including its turn.plan.updated phase list), steer with thread_advise, and answer an open gate with thread_gate_respond. When a review or gate wake prompt specifies an explicit event range, that range wins over this metadata. Never poll or wait for the builder; deliver review or advice, then end the turn. Every thread_advise starts a builder turn whose completion wakes you again, so never advise a builder that is idle on an external wait or has nothing actionable; report the state in your own thread and end without advising. ${FUSION_PAIR_COMMUNICATION_INSTRUCTIONS}`;
 /**
 * The one-line stand-in for the full block on a message whose session already
 * carries the role instructions.
@@ -64214,6 +65136,13 @@ function fusionRoleInstructionsFor(role) {
 function fusionRoleReferenceLineFor(role) {
 	return role === "implementer" ? FUSION_BUILDER_REFERENCE_LINE : FUSION_WATCHER_REFERENCE_LINE;
 }
+function fusionReviewPolicyInstructions(experiment) {
+	if (!experiment) return "";
+	const { policy } = experiment;
+	return `[fusion-review-policy] Authoritative policy for this pair, overriding phase-boundary rules in session instructions: ${policy.mode}.
+${policy.mode === "risk-and-final" ? "Builder: maintain your phase list, but continue across routine phase boundaries within the same turn. End only for a concrete unresolved judgment request, an external blocker, or final whole-task review after verification. Do not stop merely because one phase finished. Supervisor: after resolving a judgment request, direct the builder to continue through remaining routine phases and final verification; do not require another intermediate phase stop." : "Builder: retain one phase per turn. Supervisor: retain phase reviews."}
+At most ${policy.maxAutomaticReviews} automatic reviews and ${policy.maxCorrectionRounds} advice turns after review per human instruction. Initial direction is free. Current usage: ${experiment.automaticReviews} reviews, ${experiment.correctionRounds} correction rounds. Gate review wakes also consume reviews. Budget exhaustion pauses unresolved work; it never approves it. Human instruction to either thread resets the budget. Never send acknowledgment-only advice.`;
+}
 //#endregion
 //#region src/provider/GuardrailPrompts.ts
 /** Fresh-evidence gate adapted from superpowers' verification skill. */
@@ -65658,6 +66587,7 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 			context.inFlightTools.delete(index);
 		}
 		context.inFlightTools.clear();
+		for (const toolUseId of context.subagentModels.keys()) if (!context.subagentTasks.has(toolUseId)) context.subagentModels.delete(toolUseId);
 		for (const block of turnState.assistantTextBlockOrder) yield* completeAssistantTextBlock(context, block, {
 			force: true,
 			rawMethod: "claude/result",
@@ -65826,9 +66756,31 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 			discard: true
 		});
 	});
+	const recordSubagentModel = Effect.fn("recordSubagentModel")(function* (context, toolUseId, model) {
+		if (!toolUseId || !model || context.subagentModels.get(toolUseId) === model) return;
+		const task = context.subagentTasks.get(toolUseId);
+		if (!task && !Array.from(context.inFlightTools.values()).some((tool) => tool.itemId === toolUseId)) return;
+		context.subagentModels.set(toolUseId, model);
+		if (!task) return;
+		yield* offerRuntimeEvent({
+			...yield* makeEventStamp(),
+			type: "task.progress",
+			provider: PROVIDER$6,
+			threadId: context.session.threadId,
+			...context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {},
+			payload: {
+				taskId: RuntimeTaskId.make(task.taskId),
+				description: task.description,
+				toolUseId,
+				...task.subagentType ? { subagentType: task.subagentType } : {},
+				model
+			}
+		});
+	});
 	const handleStreamEvent = Effect.fn("handleStreamEvent")(function* (context, message) {
 		if (message.type !== "stream_event") return;
 		const { event } = message;
+		if (event.type === "message_start") yield* recordSubagentModel(context, message.parent_tool_use_id, event.message.model);
 		if (event.type === "message_delta") {
 			if (message.parent_tool_use_id !== null && message.parent_tool_use_id !== void 0) return;
 			const snapshot = normalizeClaudeActiveTokenUsage(event.usage, context.lastKnownContextWindow, context.lastKnownTotalProcessedTokens);
@@ -66149,10 +67101,12 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 				rawPayload: message
 			});
 			context.inFlightTools.delete(index);
+			if (!context.subagentTasks.has(tool.itemId)) context.subagentModels.delete(tool.itemId);
 		}
 	});
 	const handleAssistantMessage = Effect.fn("handleAssistantMessage")(function* (context, message) {
 		if (message.type !== "assistant") return;
+		yield* recordSubagentModel(context, message.parent_tool_use_id, message.message.model);
 		if (!context.turnState) {
 			const turnId = TurnId.make(yield* randomUUIDv4);
 			const startedAt = yield* nowIso;
@@ -66259,6 +67213,7 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 		}
 		switch (message.subtype) {
 			case "init":
+				context.currentApiModelId = message.model || context.currentApiModelId;
 				yield* offerRuntimeEvent({
 					...base,
 					type: "session.configured",
@@ -66329,7 +67284,12 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 				return;
 			case "task_started": {
 				const requestedModel = readString((message.tool_use_id ? Array.from(context.inFlightTools.values()).find((tool) => tool.itemId === message.tool_use_id) : void 0)?.input.model);
-				const model = requestedModel === "inherit" ? context.currentApiModelId : requestedModel;
+				const model = (message.tool_use_id ? context.subagentModels.get(message.tool_use_id) : void 0) ?? (requestedModel === "inherit" ? context.currentApiModelId : requestedModel);
+				if (message.tool_use_id) context.subagentTasks.set(message.tool_use_id, {
+					taskId: message.task_id,
+					description: message.description,
+					...message.subagent_type ? { subagentType: message.subagent_type } : {}
+				});
 				yield* offerRuntimeEvent({
 					...base,
 					type: "task.started",
@@ -66380,6 +67340,11 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 						...message.tool_use_id ? { toolUseId: message.tool_use_id } : {}
 					}
 				});
+				for (const [toolUseId, task] of context.subagentTasks) if (toolUseId === message.tool_use_id || task.taskId === message.task_id) {
+					context.subagentTasks.delete(toolUseId);
+					context.subagentModels.delete(toolUseId);
+				}
+				if (message.tool_use_id) context.subagentModels.delete(message.tool_use_id);
 				return;
 			case "files_persisted":
 				yield* offerRuntimeEvent({
@@ -67080,6 +68045,8 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 			turns: [],
 			inFlightTools,
 			claudeTasks,
+			subagentTasks: /* @__PURE__ */ new Map(),
+			subagentModels: /* @__PURE__ */ new Map(),
 			turnState: void 0,
 			pendingTurnRequest: void 0,
 			steeredMessages: /* @__PURE__ */ new Map(),
@@ -85454,7 +86421,7 @@ const makeTerminationError = (handle) => Effect.match(handle.exitCode, {
 //#endregion
 //#region ../../packages/effect-codex-app-server/src/client.ts
 var CodexAppServerClient = class extends Context.Service()("effect-codex-app-server/client/CodexAppServerClient") {};
-const make$67 = Effect.fn("effect-codex-app-server/CodexAppServerClient.make")(function* (stdio, options = {}, terminationError) {
+const make$68 = Effect.fn("effect-codex-app-server/CodexAppServerClient.make")(function* (stdio, options = {}, terminationError) {
 	const requestHandlers = /* @__PURE__ */ new Map();
 	const notificationHandlers = /* @__PURE__ */ new Map();
 	let unknownRequestHandler;
@@ -85521,7 +86488,7 @@ const make$67 = Effect.fn("effect-codex-app-server/CodexAppServerClient.make")(f
 const layerChildProcess = (handle, options = {}) => Layer.effect(CodexAppServerClient, makeChildProcessClient(handle, options));
 const makeChildProcessClient = Effect.fn("effect-codex-app-server/CodexAppServerClient.makeChildProcessClient")(function* (handle, options) {
 	yield* Stream.runDrain(handle.stderr).pipe(Effect.ignore, Effect.forkScoped);
-	return yield* make$67(makeChildStdio(handle), options, makeTerminationError(handle));
+	return yield* make$68(makeChildStdio(handle), options, makeTerminationError(handle));
 });
 const resolveCodexLaunchArgs = (launchArgs, environment = process.env) => environment["P4CODE_CODEX_LAUNCH_ARGS"]?.trim() || launchArgs?.trim() || "";
 const codexLaunchArgv = (launchArgs) => tokenizeCliArgs(launchArgs);
@@ -89365,7 +90332,7 @@ function buildCursorDiscoveredModelsFromAvailableModelsResponse(response) {
 }
 const makeCursorAcpProbeRuntime = (cursorSettings, environment) => Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
-	const acpContext = yield* Layer.build(layer$60({
+	const acpContext = yield* Layer.build(layer$61({
 		spawn: {
 			command: cursorSettings.binaryPath,
 			args: [...cursorSettings.apiEndpoint ? ["-e", cursorSettings.apiEndpoint] : [], "acp"],
@@ -89815,7 +90782,7 @@ function buildCursorAcpSpawnInput(cursorSettings, cwd, environment) {
 	};
 }
 const makeCursorAcpRuntime = (input) => Effect.gen(function* () {
-	const acpContext = yield* Layer.build(layer$60({
+	const acpContext = yield* Layer.build(layer$61({
 		...input,
 		spawn: buildCursorAcpSpawnInput(input.cursorSettings, input.cwd, input.environment),
 		authMethodId: "cursor_login",
@@ -91008,7 +91975,7 @@ function resolveGrokAuthMethodId(environment) {
 	return environment?.[GROK_API_KEY_ENV]?.trim() ? GROK_AUTH_METHOD_API_KEY : GROK_AUTH_METHOD_CACHED_TOKEN;
 }
 const makeGrokAcpRuntime = (input) => Effect.gen(function* () {
-	const acpContext = yield* Layer.build(layer$60({
+	const acpContext = yield* Layer.build(layer$61({
 		...input,
 		spawn: buildGrokAcpSpawnInput(input.grokSettings, input.cwd, input.environment),
 		authMethodId: resolveGrokAuthMethodId(input.environment)
@@ -94467,7 +95434,7 @@ const makeOpenCodeRuntime = Effect.gen(function* () {
 	};
 });
 var OpenCodeRuntime = class extends Context.Service()("@p4code/cli/provider/opencodeRuntime") {};
-const OpenCodeRuntimeLive = Layer.effect(OpenCodeRuntime, makeOpenCodeRuntime).pipe(Layer.provide(layer$118));
+const OpenCodeRuntimeLive = Layer.effect(OpenCodeRuntime, makeOpenCodeRuntime).pipe(Layer.provide(layer$119));
 //#endregion
 //#region src/textGeneration/OpenCodeTextGeneration.ts
 const OPENCODE_TEXT_GENERATION_IDLE_TTL = "30 seconds";
@@ -97057,8 +98024,8 @@ const makeWithReader = (api) => Effect.gen(function* () {
 		}))
 	};
 });
-const make$66 = makeCliproxyApi.pipe(Effect.flatMap(makeWithReader));
-const layer$57 = Layer.effect(UsageLimitSources, make$66);
+const make$67 = makeCliproxyApi.pipe(Effect.flatMap(makeWithReader));
+const layer$58 = Layer.effect(UsageLimitSources, make$67);
 //#endregion
 //#region src/resourceTelemetry/HostResources.ts
 const CPU_SAMPLE_INTERVAL = "200 millis";
@@ -97093,7 +98060,7 @@ function darwinAvailableMemory(output) {
 	const available = (Number(free) + Number(inactive) + Number(speculative)) * Number(pageSize);
 	return Number.isSafeInteger(available) && Number(pageSize) > 0 ? available : null;
 }
-const make$65 = Effect.fn("makeHostResources")(function* () {
+const make$66 = Effect.fn("makeHostResources")(function* () {
 	const fs = yield* FileSystem.FileSystem;
 	const platform = yield* HostProcessPlatform;
 	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
@@ -97127,7 +98094,7 @@ const make$65 = Effect.fn("makeHostResources")(function* () {
 	});
 	return HostResources.of({ read: Cache.get(cache, "host") });
 });
-const layer$56 = Layer.effect(HostResources, make$65());
+const layer$57 = Layer.effect(HostResources, make$66());
 //#endregion
 //#region src/resourceTelemetry/DesktopTelemetryReceiver.ts
 const INITIAL_SAMPLE_DEADLINE_MS = 9e4;
@@ -97262,7 +98229,7 @@ function requireDesktopTelemetryWriteProgress(fd, remainingBytes, written) {
 	}));
 }
 /** @public Service construction is part of the canonical Effect module API. */
-const make$64 = Effect.fn("resourceTelemetry.desktopTelemetryReceiver.make")(function* () {
+const make$65 = Effect.fn("resourceTelemetry.desktopTelemetryReceiver.make")(function* () {
 	const serverConfig = yield* ServerConfig$1;
 	const hasDescriptors = serverConfig.mode === "desktop" && serverConfig.desktopTelemetryFd === 4 && serverConfig.desktopTelemetryControlFd === 5;
 	const config = {
@@ -97419,7 +98386,7 @@ const make$64 = Effect.fn("resourceTelemetry.desktopTelemetryReceiver.make")(fun
 		setDiagnosticsDemand
 	});
 });
-const layer$55 = Layer.effect(DesktopTelemetryReceiver, make$64());
+const layer$56 = Layer.effect(DesktopTelemetryReceiver, make$65());
 //#endregion
 //#region src/resourceTelemetry/Model.ts
 const MAX_DELTA_INTERVAL_MS = 3e4;
@@ -97844,7 +98811,7 @@ function resourceMonitorRustTarget(platform, architecture, linuxLibc) {
 	}
 	if (platform === "win32") return architecture === "arm64" ? "aarch64-pc-windows-msvc" : architecture === "x64" ? "x86_64-pc-windows-msvc" : void 0;
 }
-const make$63 = Effect.fn("resourceTelemetry.resourceMonitorBinary.make")(function* () {
+const make$64 = Effect.fn("resourceTelemetry.resourceMonitorBinary.make")(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const platform = yield* HostProcessPlatform;
@@ -97890,7 +98857,7 @@ const make$63 = Effect.fn("resourceTelemetry.resourceMonitorBinary.make")(functi
 	});
 	return ResourceMonitorBinary.of({ resolve });
 });
-const layer$54 = Layer.effect(ResourceMonitorBinary, make$63());
+const layer$55 = Layer.effect(ResourceMonitorBinary, make$64());
 //#endregion
 //#region src/resourceTelemetry/NativeTelemetryClient.ts
 const SAMPLE_INTERVAL_MS$1 = 1e3;
@@ -98040,7 +99007,7 @@ function canCommandNativeTelemetrySidecar(status, hasHandle) {
 	return hasHandle && (status === "healthy" || status === "degraded");
 }
 /** @public Service construction is part of the canonical Effect module API. */
-const make$62 = Effect.fn("resourceTelemetry.nativeTelemetryClient.make")(function* () {
+const make$63 = Effect.fn("resourceTelemetry.nativeTelemetryClient.make")(function* () {
 	const binary = yield* ResourceMonitorBinary;
 	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 	const crypto = yield* Crypto.Crypto;
@@ -98451,7 +99418,7 @@ const make$62 = Effect.fn("resourceTelemetry.nativeTelemetryClient.make")(functi
 		})
 	});
 });
-const layer$53 = Layer.effect(NativeTelemetryClient, make$62());
+const layer$54 = Layer.effect(NativeTelemetryClient, make$63());
 //#endregion
 //#region src/resourceTelemetry/ResourceAttribution.ts
 var ResourceAttribution = class extends Context.Service()("@p4code/cli/resourceTelemetry/ResourceAttribution") {};
@@ -98463,7 +99430,7 @@ function nonNegativeInteger(value, fallback) {
 	if (!Number.isFinite(value)) return 0;
 	return Math.max(0, Math.round(value));
 }
-const make$61 = Effect.fn("resourceTelemetry.resourceAttribution.make")(function* () {
+const make$62 = Effect.fn("resourceTelemetry.resourceAttribution.make")(function* () {
 	const entries = yield* Ref.make(/* @__PURE__ */ new Map());
 	const record = (input) => Ref.update(entries, (current) => {
 		const next = new Map(current);
@@ -98489,7 +99456,7 @@ const make$61 = Effect.fn("resourceTelemetry.resourceAttribution.make")(function
 		})
 	});
 });
-const layer$52 = Layer.effect(ResourceAttribution, make$61());
+const layer$53 = Layer.effect(ResourceAttribution, make$62());
 //#endregion
 //#region src/resourceTelemetry/ResourceTelemetryHistory.ts
 const MAX_HISTORY_WINDOW_MS = 60 * 6e4;
@@ -98712,7 +99679,7 @@ function buildHealth(input) {
 	};
 }
 /** @public Service construction is part of the canonical Effect module API. */
-const make$60 = Effect.fn("resourceTelemetry.resourceTelemetry.make")(function* () {
+const make$61 = Effect.fn("resourceTelemetry.resourceTelemetry.make")(function* () {
 	const nativeClient = yield* NativeTelemetryClient;
 	const desktopReceiver = yield* DesktopTelemetryReceiver;
 	const attribution = yield* ResourceAttribution;
@@ -98964,7 +99931,7 @@ const make$60 = Effect.fn("resourceTelemetry.resourceTelemetry.make")(function*
 		})))
 	});
 });
-const layer$51 = Layer.effect(ResourceTelemetry, make$60());
+const layer$52 = Layer.effect(ResourceTelemetry, make$61());
 //#endregion
 //#region src/device/DeviceInspection.ts
 const READ_TIMEOUT_MS = 1e4;
@@ -102119,7 +103086,7 @@ const classifyNonZeroExit = (command, stderr) => {
 	if (command === "gh" && (normalized.includes("could not resolve to a pullrequest") || normalized.includes("repository.pullrequest") || normalized.includes("no pull requests found for branch") || normalized.includes("pull request not found")) || command === "glab" && (normalized.includes("merge request not found") || normalized.includes("not found") || normalized.includes("404")) || command === "az" && normalized.includes("pull request") && (normalized.includes("not found") || normalized.includes("does not exist"))) return "not-found";
 	return "command-failed";
 };
-const make$59 = Effect.gen(function* () {
+const make$60 = Effect.gen(function* () {
 	const processRunner = yield* ProcessRunner;
 	const run = Effect.fn("VcsProcess.run")(function* (input) {
 		const baseError = {
@@ -102178,7 +103145,7 @@ const make$59 = Effect.gen(function* () {
 	});
 	return VcsProcess.of({ run });
 });
-const layer$50 = Layer.effect(VcsProcess, make$59).pipe(Layer.provide(layer$81));
+const layer$51 = Layer.effect(VcsProcess, make$60).pipe(Layer.provide(layer$82));
 //#endregion
 //#region src/vcs/VcsDriver.ts
 var VcsDriver = class extends Context.Service()("@p4code/cli/vcs/VcsDriver") {};
@@ -102629,12 +103596,12 @@ const makeVcsDriver = Effect.gen(function* () {
 	const driver = yield* makeVcsDriverShape();
 	return VcsDriver.of(driver);
 });
-const make$58 = Effect.gen(function* () {
+const make$59 = Effect.gen(function* () {
 	const git = yield* makeGitVcsDriverCore();
 	return GitVcsDriver.of(git);
 });
 Layer.effect(VcsDriver, makeVcsDriver);
-const layer$49 = Layer.effect(GitVcsDriver, make$58);
+const layer$50 = Layer.effect(GitVcsDriver, make$59);
 //#endregion
 //#region src/vcs/VcsProjectConfig.ts
 const ProjectVcsConfigJson = fromLenientJson(Schema$1.Struct({
@@ -102666,7 +103633,7 @@ const logVcsProjectConfigError = (error) => Effect.logWarning(error).pipe(Effect
 	configPath: error.configPath,
 	errorTag: error._tag
 }));
-const make$57 = Effect.gen(function* () {
+const make$58 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const findConfigPath = Effect.fn("VcsProjectConfig.findConfigPath")(function* (cwd) {
@@ -102707,7 +103674,7 @@ const make$57 = Effect.gen(function* () {
 	});
 	return VcsProjectConfig.of({ resolveKind });
 });
-const layer$48 = Layer.effect(VcsProjectConfig, make$57);
+const layer$49 = Layer.effect(VcsProjectConfig, make$58);
 //#endregion
 //#region src/vcs/VcsDriverRegistry.ts
 const DETECTION_CACHE_CAPACITY = 2048;
@@ -102727,7 +103694,7 @@ function parseDetectionCacheKey(key) {
 		cwd: key.slice(separatorIndex + 1)
 	};
 }
-const make$56 = Effect.gen(function* () {
+const make$57 = Effect.gen(function* () {
 	const projectConfig = yield* VcsProjectConfig;
 	const git = yield* makeVcsDriver;
 	const drivers = { git };
@@ -102784,7 +103751,7 @@ const make$56 = Effect.gen(function* () {
 		resolve
 	});
 });
-const layer$47 = Layer.effect(VcsDriverRegistry, make$56).pipe(Layer.provide(layer$48));
+const layer$48 = Layer.effect(VcsDriverRegistry, make$57).pipe(Layer.provide(layer$49));
 //#endregion
 //#region src/checkpointing/CheckpointStore.ts
 /**
@@ -102804,7 +103771,7 @@ const layer$47 = Layer.effect(VcsDriverRegistry, make$56).pipe(Layer.provide(lay
 */
 /** Service tag for checkpoint persistence and restore operations. */
 var CheckpointStore = class extends Context.Service()("@p4code/cli/checkpointing/CheckpointStore") {};
-const make$55 = Effect.gen(function* () {
+const make$56 = Effect.gen(function* () {
 	const vcsRegistry = yield* VcsDriverRegistry;
 	const resolveCheckpoints = Effect.fn("CheckpointStore.resolveCheckpoints")(function* (operation, cwd) {
 		const handle = yield* vcsRegistry.resolve({ cwd });
@@ -102843,7 +103810,7 @@ const make$55 = Effect.gen(function* () {
 		deleteCheckpointRefs
 	});
 });
-const layer$46 = Layer.effect(CheckpointStore, make$55);
+const layer$47 = Layer.effect(CheckpointStore, make$56);
 //#endregion
 //#region src/checkpointing/CheckpointDiffQuery.ts
 /**
@@ -102865,7 +103832,7 @@ function buildTurnDiffResult(input, diff) {
 		diff
 	};
 }
-const make$54 = Effect.gen(function* () {
+const make$55 = Effect.gen(function* () {
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 	const checkpointStore = yield* CheckpointStore;
 	const threadActivities = yield* ProjectionThreadActivityRepository;
@@ -103036,7 +104003,7 @@ const make$54 = Effect.gen(function* () {
 		getFullThreadDiff
 	});
 });
-const layer$45 = Layer.effect(CheckpointDiffQuery, make$54);
+const layer$46 = Layer.effect(CheckpointDiffQuery, make$55);
 //#endregion
 //#region src/orchestration/ThreadLiveEventCoalescer.ts
 const COALESCE_WINDOW = Duration.millis(50);
@@ -103581,7 +104548,7 @@ const serversEqual = (left, right) => {
 	}
 	return true;
 };
-const make$53 = Effect.gen(function* PortDiscoveryMake() {
+const make$54 = Effect.gen(function* PortDiscoveryMake() {
 	const net = yield* NetService;
 	const processRunner = yield* ProcessRunner;
 	const hostPlatform = yield* HostProcessPlatform;
@@ -103732,7 +104699,7 @@ const make$53 = Effect.gen(function* PortDiscoveryMake() {
 		unregisterTerminal
 	});
 }).pipe(Effect.withSpan("PortDiscovery.make"));
-const layer$44 = Layer.effect(PortDiscovery, make$53);
+const layer$45 = Layer.effect(PortDiscovery, make$54);
 //#endregion
 //#region src/terminal/Manager.ts
 /**
@@ -104410,7 +105377,7 @@ function normalizedRuntimeEnv(env) {
 	if (entries.length === 0) return null;
 	return Object.fromEntries(entries.toSorted(([left], [right]) => left.localeCompare(right)));
 }
-const make$52 = Effect.fn("TerminalManager.make")(function* () {
+const make$53 = Effect.fn("TerminalManager.make")(function* () {
 	const { terminalLogsDir } = yield* ServerConfig$1;
 	const ptyAdapter = yield* PtyAdapter;
 	const portDiscovery = yield* PortDiscovery;
@@ -105372,7 +106339,7 @@ const makeWithOptions$1 = Effect.fn("TerminalManager.makeWithOptions")(function*
 		subscribeMetadata
 	});
 });
-const layer$43 = Layer.effect(TerminalManager, make$52()).pipe(Layer.provide(layer$81));
+const layer$44 = Layer.effect(TerminalManager, make$53()).pipe(Layer.provide(layer$82));
 //#endregion
 //#region src/project/ProjectSetupScriptRunner.ts
 var ProjectSetupScriptOperationError = class extends Schema$1.TaggedErrorClass()("ProjectSetupScriptOperationError", {
@@ -105404,7 +106371,7 @@ var ProjectSetupScriptProjectNotFoundError = class extends Schema$1.TaggedErrorC
 };
 Schema$1.Union([ProjectSetupScriptOperationError, ProjectSetupScriptProjectNotFoundError]);
 var ProjectSetupScriptRunner = class extends Context.Service()("@p4code/cli/project/ProjectSetupScriptRunner") {};
-const make$51 = Effect.gen(function* () {
+const make$52 = Effect.gen(function* () {
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 	const terminalManager = yield* TerminalManager;
 	const settingsService = yield* Effect.serviceOption(ServerSettingsService);
@@ -105467,7 +106434,7 @@ const make$51 = Effect.gen(function* () {
 	});
 	return ProjectSetupScriptRunner.of({ runForThread });
 });
-const layer$42 = Layer.effect(ProjectSetupScriptRunner, make$51);
+const layer$43 = Layer.effect(ProjectSetupScriptRunner, make$52);
 //#endregion
 //#region src/sourceControl/azureDevOpsPullRequests.ts
 const AzureDevOpsPullRequestSchema = Schema$1.Struct({
@@ -105795,7 +106762,7 @@ function decodeAzureDevOpsJson(raw, schema, operation, cwd) {
 		cause
 	})));
 }
-const make$50 = Effect.gen(function* () {
+const make$51 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const execute = (input) => process.run({
 		operation: "AzureDevOpsCli.execute",
@@ -105937,7 +106904,7 @@ const make$50 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$41 = Layer.effect(AzureDevOpsCli, make$50);
+const layer$42 = Layer.effect(AzureDevOpsCli, make$51);
 //#endregion
 //#region src/sourceControl/SourceControlProviderDiscovery.ts
 function firstNonEmptyLine(text) {
@@ -106141,7 +107108,7 @@ function toChangeRequest$5(summary) {
 		isCrossRepository: false
 	};
 }
-const make$49 = Effect.gen(function* () {
+const make$50 = Effect.gen(function* () {
 	const azure = yield* AzureDevOpsCli;
 	return SourceControlProvider.of({
 		kind: "azure-devops",
@@ -106234,7 +107201,7 @@ const make$49 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$49);
+Layer.effect(SourceControlProvider, make$50);
 //#endregion
 //#region src/sourceControl/bitbucketPullRequests.ts
 const BitbucketRepositoryRefSchema = Schema$1.Struct({
@@ -106611,7 +107578,7 @@ function responseError(operation, response) {
 		responseBodyLength: collected.text.length
 	}))));
 }
-const make$48 = Effect.gen(function* () {
+const make$49 = Effect.gen(function* () {
 	const config = yield* BitbucketApiEnvConfig;
 	const httpClient = yield* HttpClient.HttpClient;
 	const fileSystem = yield* FileSystem.FileSystem;
@@ -106827,7 +107794,7 @@ const make$48 = Effect.gen(function* () {
 		})))
 	});
 });
-const layer$39 = Layer.effect(BitbucketApi, make$48);
+const layer$40 = Layer.effect(BitbucketApi, make$49);
 //#endregion
 //#region src/sourceControl/BitbucketSourceControlProvider.ts
 function toChangeRequest$4(summary) {
@@ -106845,7 +107812,7 @@ function toChangeRequest$4(summary) {
 		...summary.headRepositoryOwnerLogin !== void 0 ? { headRepositoryOwnerLogin: summary.headRepositoryOwnerLogin } : {}
 	};
 }
-const make$47 = Effect.gen(function* () {
+const make$48 = Effect.gen(function* () {
 	const bitbucket = yield* BitbucketApi;
 	return SourceControlProvider.of({
 		kind: "bitbucket",
@@ -106936,7 +107903,7 @@ const make$47 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$47);
+Layer.effect(SourceControlProvider, make$48);
 const makeDiscovery = Effect.gen(function* () {
 	return {
 		type: "api",
@@ -107184,7 +108151,7 @@ function deriveRepositoryCloneUrlsFromCreateOutput(stdout, repository) {
 		sshUrl: `git@${fallbackHost}:${repository}.git`
 	};
 }
-const make$46 = Effect.gen(function* () {
+const make$47 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const execute = (input) => process.run({
 		operation: "GitHubCli.execute",
@@ -107302,7 +108269,7 @@ const make$46 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$37 = Layer.effect(GitHubCli, make$46);
+const layer$38 = Layer.effect(GitHubCli, make$47);
 //#endregion
 //#region src/sourceControl/gitHubAuthStatus.ts
 const GitHubAuthStatusAccountSchema = Schema$1.Struct({
@@ -107404,7 +108371,7 @@ const discovery$1 = {
 	parseAuth: parseGitHubAuth,
 	installHint: "Install the GitHub command-line tool (`gh`) via https://cli.github.com/ or your package manager (for example `brew install gh`)."
 };
-const make$45 = Effect.gen(function* () {
+const make$46 = Effect.gen(function* () {
 	const github = yield* GitHubCli;
 	const listChangeRequests = (input) => {
 		if (input.state === "open") return github.listOpenPullRequests({
@@ -107520,7 +108487,7 @@ const make$45 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$45);
+Layer.effect(SourceControlProvider, make$46);
 //#endregion
 //#region src/sourceControl/gitLabMergeRequests.ts
 const GitLabProjectReferenceSchema = Schema$1.Struct({
@@ -107839,7 +108806,7 @@ function parseRepositoryPath(repository) {
 		projectPath
 	};
 }
-const make$44 = Effect.gen(function* () {
+const make$45 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const run = (input, mapError) => process.run({
 		operation: "GitLabCli.execute",
@@ -107990,7 +108957,7 @@ const make$44 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$35 = Layer.effect(GitLabCli, make$44);
+const layer$36 = Layer.effect(GitLabCli, make$45);
 //#endregion
 //#region src/sourceControl/gitLabAuthStatus.ts
 const HOST_LINE_PATTERN = /^(?:[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?|\[[a-f0-9:.]+\])(?::\d+)?$/iu;
@@ -108088,7 +109055,7 @@ const discovery = {
 	refineUnknownRemote: refineUnknownGitLabRemote,
 	installHint: "Install the GitLab command-line tool (`glab`) from https://gitlab.com/gitlab-org/cli or your package manager (for example `brew install glab`)."
 };
-const make$43 = Effect.gen(function* () {
+const make$44 = Effect.gen(function* () {
 	const gitlab = yield* GitLabCli;
 	return SourceControlProvider.of({
 		kind: "gitlab",
@@ -108177,7 +109144,7 @@ const make$43 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$43);
+Layer.effect(SourceControlProvider, make$44);
 //#endregion
 //#region src/sourceControl/SourceControlProviderRegistry.ts
 const PROVIDER_DETECTION_CACHE_CAPACITY = 2048;
@@ -108333,12 +109300,12 @@ const makeWithProviders = Effect.fn("makeSourceControlProviderRegistryWithProvid
 		})), { concurrency: "unbounded" })
 	});
 });
-const make$42 = Effect.gen(function* () {
-	const github = yield* make$45;
-	const gitlab = yield* make$43;
-	const bitbucket = yield* make$47;
+const make$43 = Effect.gen(function* () {
+	const github = yield* make$46;
+	const gitlab = yield* make$44;
+	const bitbucket = yield* make$48;
 	const bitbucketDiscovery = yield* makeDiscovery;
-	const azureDevOps = yield* make$49;
+	const azureDevOps = yield* make$50;
 	return yield* makeWithProviders([
 		{
 			kind: "github",
@@ -108362,7 +109329,7 @@ const make$42 = Effect.gen(function* () {
 		}
 	]);
 });
-const layer$33 = Layer.effect(SourceControlProviderRegistry, make$42);
+const layer$34 = Layer.effect(SourceControlProviderRegistry, make$43);
 //#endregion
 //#region src/sourceControl/PrTemplateDetection.ts
 const TEMPLATE_MAX_BYTES = 8e3;
@@ -108733,7 +109700,7 @@ function toPullRequestHeadRemoteInfo(pr) {
 		...pr.headRepositoryOwnerLogin !== void 0 ? { headRepositoryOwnerLogin: pr.headRepositoryOwnerLogin } : {}
 	};
 }
-const make$41 = Effect.gen(function* () {
+const make$42 = Effect.gen(function* () {
 	const gitCore = yield* GitVcsDriver;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
 	const textGeneration = yield* TextGeneration;
@@ -109707,7 +110674,7 @@ const make$41 = Effect.gen(function* () {
 		runStackedAction
 	});
 });
-const layer$32 = Layer.effect(GitManager, make$41);
+const layer$33 = Layer.effect(GitManager, make$42);
 //#endregion
 //#region src/git/GitWorkflowService.ts
 var GitWorkflowService = class extends Context.Service()("@p4code/cli/git/GitWorkflowService") {};
@@ -109744,7 +110711,7 @@ function nonRepositoryListRefs() {
 		totalCount: 0
 	};
 }
-const make$40 = Effect.gen(function* () {
+const make$41 = Effect.gen(function* () {
 	const registry = yield* VcsDriverRegistry;
 	const git = yield* GitVcsDriver;
 	const gitManager = yield* GitManager;
@@ -109830,7 +110797,7 @@ const make$40 = Effect.gen(function* () {
 		renameBranch: (input) => ensureGit("GitWorkflowService.renameBranch", input.cwd).pipe(Effect.andThen(git.renameBranch(input)))
 	});
 });
-const layer$31 = Layer.effect(GitWorkflowService, make$40);
+const layer$32 = Layer.effect(GitWorkflowService, make$41);
 //#endregion
 //#region src/pullRequest/PullRequestProvider.ts
 /**
@@ -110191,7 +111158,7 @@ function isReviewerName(value) {
 	const name = value.trim();
 	return name.length > 0 && !name.startsWith("-");
 }
-const make$39 = Effect.gen(function* () {
+const make$40 = Effect.gen(function* () {
 	const azure = yield* AzureDevOpsCli;
 	const detectArgs = ["--detect", "true"];
 	const executeJson = (input) => azure.execute({
@@ -110391,7 +111358,7 @@ const make$39 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$30 = Layer.effect(AzureDevOpsPullRequestCli, make$39);
+const layer$31 = Layer.effect(AzureDevOpsPullRequestCli, make$40);
 //#endregion
 //#region src/pullRequest/AzureDevOpsPullRequestProvider.ts
 const CAPABILITIES$3 = {
@@ -110466,7 +111433,7 @@ function toChangeRequest$1(pullRequest) {
 		labels: []
 	};
 }
-const make$38 = Effect.gen(function* () {
+const make$39 = Effect.gen(function* () {
 	const cli = yield* AzureDevOpsPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "azure-devops",
@@ -111206,7 +112173,7 @@ function mergeStrategy(method) {
 		default: return "merge_commit";
 	}
 }
-const make$37 = Effect.gen(function* () {
+const make$38 = Effect.gen(function* () {
 	const bitbucket = yield* BitbucketApi;
 	/**
 	* The repository's own path, and the workspace above it — which the people who may review are
@@ -111486,7 +112453,7 @@ const make$37 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid))
 	});
 });
-const layer$29 = Layer.effect(BitbucketPullRequestApi, make$37);
+const layer$30 = Layer.effect(BitbucketPullRequestApi, make$38);
 //#endregion
 //#region src/pullRequest/BitbucketPullRequestProvider.ts
 const CAPABILITIES$2 = {
@@ -111566,7 +112533,7 @@ function toChangeRequest(pullRequest) {
 		labels: []
 	};
 }
-const make$36 = Effect.gen(function* () {
+const make$37 = Effect.gen(function* () {
 	const api = yield* BitbucketPullRequestApi;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "bitbucket",
@@ -113795,7 +114762,7 @@ function actionArgs$1(action, mergeMethod, updateMethod) {
 		case "reopen": return ["reopen"];
 	}
 }
-const make$35 = Effect.gen(function* () {
+const make$36 = Effect.gen(function* () {
 	const github = yield* GitHubCli;
 	/**
 	* The pull request's own node id, which is what a mutation against the pull request itself is
@@ -114558,7 +115525,7 @@ const make$35 = Effect.gen(function* () {
 		})))
 	});
 });
-const layer$28 = Layer.effect(GitHubPullRequestCli, make$35);
+const layer$29 = Layer.effect(GitHubPullRequestCli, make$36);
 //#endregion
 //#region src/pullRequest/GitHubPullRequestProvider.ts
 const CAPABILITIES$1 = {
@@ -114675,7 +115642,7 @@ function loginAvatarUrl(login, host) {
 }
 /** True where markdown would render nothing: whitespace, or only HTML comments. */
 const rendersEmpty = (body) => body.replace(/<!--[\s\S]*?-->/g, "").trim().length === 0;
-const make$34 = Effect.gen(function* () {
+const make$35 = Effect.gen(function* () {
 	const cli = yield* GitHubPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "github",
@@ -115697,7 +116664,7 @@ function actionArgs(action, mergeMethod) {
 		case "reopen": return ["reopen"];
 	}
 }
-const make$33 = Effect.gen(function* () {
+const make$34 = Effect.gen(function* () {
 	const gitlab = yield* GitLabCli;
 	const api = (input) => gitlab.execute({
 		cwd: input.cwd,
@@ -116268,7 +117235,7 @@ const make$33 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$27 = Layer.effect(GitLabPullRequestCli, make$33);
+const layer$28 = Layer.effect(GitLabPullRequestCli, make$34);
 //#endregion
 //#region src/pullRequest/GitLabPullRequestProvider.ts
 const CAPABILITIES = {
@@ -116348,7 +117315,7 @@ function reasonFor(error) {
 	if (error._tag === "GitLabCliAuthenticationError") return "unauthenticated";
 	return "failed";
 }
-const make$32 = Effect.gen(function* () {
+const make$33 = Effect.gen(function* () {
 	const cli = yield* GitLabPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "gitlab",
@@ -116491,13 +117458,13 @@ function fromProviders(providers) {
 * The hosts this build can read change requests from. A host with no entry here still shows up
 * in the provider list as unimplemented, so its projects are explained rather than missing.
 */
-const make$31 = Effect.map(Effect.all([
-	make$34,
-	make$32,
-	make$36,
-	make$38
+const make$32 = Effect.map(Effect.all([
+	make$35,
+	make$33,
+	make$37,
+	make$39
 ]), fromProviders);
-const layer$26 = Layer.effect(PullRequestProviderRegistry, make$31).pipe(Layer.provide(layer$28.pipe(Layer.provide(layer$37))), Layer.provide(layer$27.pipe(Layer.provide(layer$35))), Layer.provide(layer$29.pipe(Layer.provide(layer$39))), Layer.provide(layer$30.pipe(Layer.provide(layer$41))));
+const layer$27 = Layer.effect(PullRequestProviderRegistry, make$32).pipe(Layer.provide(layer$29.pipe(Layer.provide(layer$38))), Layer.provide(layer$28.pipe(Layer.provide(layer$36))), Layer.provide(layer$30.pipe(Layer.provide(layer$40))), Layer.provide(layer$31.pipe(Layer.provide(layer$42))));
 //#endregion
 //#region src/pullRequest/PullRequestService.ts
 /**
@@ -116685,7 +117652,7 @@ function repositoryIdentityOf(project) {
 	if (identity.displayName) return identity.displayName;
 	return identity.owner && identity.name ? `${identity.owner}/${identity.name}` : null;
 }
-const make$30 = Effect.gen(function* () {
+const make$31 = Effect.gen(function* () {
 	const registry = yield* PullRequestProviderRegistry;
 	const projections = yield* ProjectionSnapshotQuery;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
@@ -117683,7 +118650,7 @@ const make$30 = Effect.gen(function* () {
 		invalidate
 	});
 });
-const layer$25 = Layer.effect(PullRequestService, make$30);
+const layer$26 = Layer.effect(PullRequestService, make$31);
 //#endregion
 //#region src/orchestration/ThreadWorkspaceLifecycle.ts
 var ThreadWorkspaceLifecycleError = class extends Data.TaggedError("ThreadWorkspaceLifecycleError") {};
@@ -117727,7 +118694,7 @@ const mapLifecycleError = Effect.mapError((cause) => cause instanceof ThreadWork
 	detail: "Thread workspace lifecycle operation failed.",
 	cause
 }));
-const make$29 = Effect.gen(function* () {
+const make$30 = Effect.gen(function* () {
 	const snapshots = yield* ProjectionSnapshotQuery;
 	const engine = yield* OrchestrationEngineService;
 	const gitWorkflow = yield* GitWorkflowService;
@@ -117981,7 +118948,7 @@ const make$29 = Effect.gen(function* () {
 		record
 	};
 });
-const layer$24 = Layer.effect(ThreadWorkspaceLifecycleService, make$29);
+const layer$25 = Layer.effect(ThreadWorkspaceLifecycleService, make$30);
 //#endregion
 //#region src/textGeneration/BtwRequestCoordinator.ts
 const MAX_PENDING_BTW_CANCELLATIONS = 256;
@@ -120254,7 +121221,7 @@ function makeUpdateState(input) {
 		output: input.output ?? null
 	};
 }
-const make$28 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
+const make$29 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
 	const providerRegistry = yield* ProviderRegistry;
 	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 	const httpClient = yield* HttpClient.HttpClient;
@@ -120369,7 +121336,7 @@ const make$28 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
 	});
 	return ProviderMaintenanceRunner.of({ updateProvider });
 });
-const layer$23 = Layer.effect(ProviderMaintenanceRunner, make$28());
+const layer$24 = Layer.effect(ProviderMaintenanceRunner, make$29());
 //#endregion
 //#region src/usage/usageTranscripts.ts
 const EMPTY_TOTALS = {
@@ -121176,29 +122143,33 @@ const ScanCacheJson = Schema$1.fromJsonString(Schema$1.Unknown);
 const decodeScanCacheFile = Schema$1.decodeUnknownEffect(ScanCacheJson);
 const encodeScanCacheFile = Schema$1.encodeEffect(ScanCacheJson);
 var UsageService = class extends Context.Service()("@p4code/cli/usage/UsageService") {};
-Layer.succeed(UsageService, UsageService.of({ readSummary: (input) => Effect.succeed({
-	contractVersion: 4,
-	readAt: "1970-01-01T00:00:00.000Z",
-	timeZone: input.timeZone,
-	sinceDay: input.sinceDay,
-	untilDay: input.untilDay,
-	buckets: [],
-	sources: [],
-	pricing: {
-		status: "unavailable",
-		source: LITELLM_RATES_URL,
-		fetchedAt: null,
-		knownModels: 0
-	},
-	scanDurationMs: 0
-}) }));
-const make$27 = Effect.gen(function* () {
+Layer.succeed(UsageService, UsageService.of({
+	readSessionRecords: () => Effect.succeed([]),
+	readSummary: (input) => Effect.succeed({
+		contractVersion: 4,
+		readAt: "1970-01-01T00:00:00.000Z",
+		timeZone: input.timeZone,
+		sinceDay: input.sinceDay,
+		untilDay: input.untilDay,
+		buckets: [],
+		sources: [],
+		pricing: {
+			status: "unavailable",
+			source: LITELLM_RATES_URL,
+			fetchedAt: null,
+			knownModels: 0
+		},
+		scanDurationMs: 0
+	})
+}));
+const make$28 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const config = yield* ServerConfig$1;
 	const settingsService = yield* ServerSettingsService;
 	const httpClient = yield* HttpClient.HttpClient;
 	const fileCache = /* @__PURE__ */ new Map();
+	const scanLock = yield* Semaphore.make(1);
 	let cacheDirty = false;
 	const ratesCachePath = path.join(config.stateDir, "usage-model-rates.json");
 	const scanCachePath = path.join(config.stateDir, "usage-scan-cache.json");
@@ -121309,7 +122280,7 @@ const make$27 = Effect.gen(function* () {
 		cacheDirty = true;
 		return tailRecords.length === 0 ? records : [...records, ...tailRecords];
 	});
-	return { readSummary: Effect.fn("UsageService.readSummary")(function* (input) {
+	const readSummary = Effect.fn("UsageService.readSummary")(function* (input) {
 		if (input.sinceDay > input.untilDay) return yield* new UsageReadError({
 			reason: "invalidWindow",
 			detail: `sinceDay '${input.sinceDay}' is after untilDay '${input.untilDay}'`
@@ -121432,9 +122403,49 @@ const make$27 = Effect.gen(function* () {
 			},
 			scanDurationMs: Math.max(0, finishedAtMs - startedAtMs)
 		};
-	}) };
+	});
+	const readSessionRecords = Effect.fn("UsageService.readSessionRecords")(function* (input) {
+		if (input.sessionIds.length === 0) return [];
+		yield* ensureScanCacheLoaded;
+		const { dirs } = yield* resolveTranscriptDirs().pipe(Effect.provideService(Path$1.Path, path));
+		const roots = dirs.flatMap((root) => root.provider === "codex" ? [root, {
+			...root,
+			dir: path.join(path.dirname(root.dir), "archived_sessions")
+		}] : [root]);
+		const sessions = new Set(input.sessionIds);
+		const seen = /* @__PURE__ */ new Set();
+		const records = [];
+		for (const { provider, dir } of roots) {
+			const files = yield* Effect.promise(() => listTranscriptFiles(dir, input.sinceMs - MTIME_SLACK_MS));
+			for (const file of files) {
+				if (!input.sessionIds.some((id) => file.path.includes(id))) continue;
+				const rows = yield* readFileRecords(file.path, file.size, file.mtimeMs, provider);
+				for (const record of rows) {
+					if (!sessions.has(record.sessionId) || record.timestampMs < input.sinceMs) continue;
+					if (record.dedupeKey !== null) {
+						if (seen.has(record.dedupeKey)) continue;
+						seen.add(record.dedupeKey);
+					}
+					records.push(record);
+				}
+			}
+		}
+		const now = yield* Clock.currentTimeMillis;
+		if (pruneScanCache(fileCache, {
+			livePaths: /* @__PURE__ */ new Set(),
+			walkedRoots: [],
+			windowStartMs: input.sinceMs,
+			retentionCutoffMs: now - CACHE_RETENTION_DAYS * 24 * 60 * 60 * 1e3
+		}) > 0) cacheDirty = true;
+		yield* persistScanCache();
+		return records;
+	});
+	return {
+		readSummary: (input) => scanLock.withPermits(1)(readSummary(input)),
+		readSessionRecords: (input) => scanLock.withPermits(1)(readSessionRecords(input))
+	};
 });
-const layer$22 = Layer.effect(UsageService, make$27);
+const layer$23 = Layer.effect(UsageService, make$28);
 //#endregion
 //#region src/feed/FeedStore.ts
 const storageFailure = (message) => new FeedError({
@@ -121798,7 +122809,7 @@ const jsonRequest = Effect.fn("FeedService.jsonRequest")(function* (url, token,
 		catch: () => fail("hub_unavailable", "Hub returned invalid JSON.")
 	});
 });
-const make$26 = Effect.gen(function* () {
+const make$27 = Effect.gen(function* () {
 	const hubLink = yield* HubLink;
 	const providers = yield* ProviderInstanceRegistry;
 	const config = yield* ServerConfig$1;
@@ -122036,7 +123047,7 @@ var FeedService = class extends Context.Reference("@p4code/cli/feed/FeedService"
 	markRead: unavailable,
 	cleanup: unavailable
 }) }) {};
-const layer$21 = Layer.effect(FeedService, make$26);
+const layer$22 = Layer.effect(FeedService, make$27);
 const SKILL_MANIFEST_FILENAME = "SKILL.md";
 /**
 * Split a catalogue id (`owner/repo/skill-name`) into its parts.
@@ -122182,7 +123193,7 @@ const emptyFetch = (id, unavailable) => ({
 	skipped: [],
 	unavailable
 });
-const make$25 = Effect.gen(function* () {
+const make$26 = Effect.gen(function* () {
 	const http = yield* HttpClient.HttpClient;
 	const request = Effect.fn("SkillRegistry.request")(function* (url) {
 		return yield* http.execute(HttpClientRequest.get(url).pipe(HttpClientRequest.setHeader("accept", "application/json"), HttpClientRequest.setHeader("user-agent", "p4code"))).pipe(Effect.timeout(REQUEST_TIMEOUT_MS$1));
@@ -122253,7 +123264,7 @@ const make$25 = Effect.gen(function* () {
 		fetch
 	};
 });
-const layer$20 = Layer.effect(SkillRegistry, make$25);
+const layer$21 = Layer.effect(SkillRegistry, make$26);
 //#endregion
 //#region src/mcp/PreviewAutomationBroker.ts
 var PreviewAutomationBroker = class extends Context.Service()("@p4code/cli/mcp/PreviewAutomationBroker") {};
@@ -122371,7 +123382,7 @@ const classifyResponseError = (context, error) => {
 		});
 	}
 };
-const make$24 = Effect.gen(function* PreviewAutomationBrokerMake() {
+const make$25 = Effect.gen(function* PreviewAutomationBrokerMake() {
 	const crypto = yield* Crypto.Crypto;
 	const state = yield* SynchronizedRef.make({
 		clients: /* @__PURE__ */ new Map(),
@@ -122605,7 +123616,7 @@ const make$24 = Effect.gen(function* PreviewAutomationBrokerMake() {
 		invoke
 	});
 }).pipe(Effect.withSpan("PreviewAutomationBroker.make"));
-const layer$19 = Layer.effect(PreviewAutomationBroker, make$24);
+const layer$20 = Layer.effect(PreviewAutomationBroker, make$25);
 //#endregion
 //#region src/preview/Manager.ts
 /**
@@ -122669,7 +123680,7 @@ const buildIdleSnapshot = (input) => ({
 	viewport: FILL_PREVIEW_VIEWPORT,
 	updatedAt: input.updatedAt
 });
-const make$23 = Effect.gen(function* PreviewManagerMake() {
+const make$24 = Effect.gen(function* PreviewManagerMake() {
 	const serverEpoch = NodeCrypto.randomUUID();
 	const stateRef = yield* SynchronizedRef.make(initialState);
 	const eventsPubSub = yield* PubSub.unbounded();
@@ -122900,7 +123911,7 @@ const make$23 = Effect.gen(function* PreviewManagerMake() {
 		subscribeEvents: PubSub.subscribe(eventsPubSub)
 	});
 }).pipe(Effect.withSpan("PreviewManager.make"));
-const layer$18 = Layer.effect(PreviewManager, make$23);
+const layer$19 = Layer.effect(PreviewManager, make$24);
 //#endregion
 //#region src/workspace/WorkspaceSearchIndex.ts
 const WORKSPACE_INDEX_MAX_ENTRIES = 25e3;
@@ -123037,7 +124048,7 @@ const waitForScan = (cwd, finder, onFailure) => Effect.try({
 		timeout: WORKSPACE_INDEX_SCAN_TIMEOUT
 	})
 }), Effect.withSpan("WorkspaceSearchIndex.waitForScan"));
-const make$22 = Effect.fn("WorkspaceSearchIndex.make")(function* (cwd, contentSearch = false) {
+const make$23 = Effect.fn("WorkspaceSearchIndex.make")(function* (cwd, contentSearch = false) {
 	const finder = yield* Effect.acquireRelease(createFinder(cwd, contentSearch), (finder) => Effect.try({
 		try: () => finder.destroy(),
 		catch: (cause) => new WorkspaceSearchIndexDestroyFailed({
@@ -123177,14 +124188,14 @@ const make$22 = Effect.fn("WorkspaceSearchIndex.make")(function* (cwd, contentSe
 * workspace root. WorkspaceSearchIndexMap owns memoization and idle cleanup;
 * using a default cwd here would mix resources from different workspaces.
 */
-const layer$17 = (cwd) => Layer.effect(WorkspaceSearchIndex, make$22(cwd));
+const layer$18 = (cwd) => Layer.effect(WorkspaceSearchIndex, make$23(cwd));
 var WorkspaceSearchIndexMap = class extends LayerMap.Service()("@p4code/cli/workspace/WorkspaceSearchIndexMap", {
-	lookup: layer$17,
+	lookup: layer$18,
 	idleTimeToLive: WORKSPACE_INDEX_IDLE_TTL
 }) {};
 /** Content indexing is allocated only when workspace content search is used. */
 var WorkspaceContentSearchIndexMap = class extends LayerMap.Service()("@p4code/cli/workspace/WorkspaceContentSearchIndexMap", {
-	lookup: (cwd) => Layer.effect(WorkspaceSearchIndex, make$22(cwd, true)),
+	lookup: (cwd) => Layer.effect(WorkspaceSearchIndex, make$23(cwd, true)),
 	idleTimeToLive: WORKSPACE_INDEX_IDLE_TTL
 }) {};
 //#endregion
@@ -123246,7 +124257,7 @@ const resolveBrowseTarget = Effect.fn("WorkspaceEntries.resolveBrowseTarget")(fu
 	if (!input.cwd) return yield* new WorkspaceEntriesCurrentProjectRequiredError({ partialPath: input.partialPath });
 	return path.resolve(expandHomePath$1(input.cwd, path), input.partialPath);
 });
-const make$21 = Effect.gen(function* () {
+const make$22 = Effect.gen(function* () {
 	const path = yield* Path$1.Path;
 	const workspacePaths = yield* WorkspacePaths;
 	const contentSearchIndexes = yield* WorkspaceContentSearchIndexMap;
@@ -123328,7 +124339,7 @@ const make$21 = Effect.gen(function* () {
 		searchContents
 	});
 });
-const layer$16 = Layer.effect(WorkspaceEntries, make$21).pipe(Layer.provide(WorkspaceSearchIndexMap.layer), Layer.provide(WorkspaceContentSearchIndexMap.layer));
+const layer$17 = Layer.effect(WorkspaceEntries, make$22).pipe(Layer.provide(WorkspaceSearchIndexMap.layer), Layer.provide(WorkspaceContentSearchIndexMap.layer));
 //#endregion
 //#region src/workspace/WorkspaceFileSystem.ts
 /**
@@ -123387,7 +124398,7 @@ Schema$1.Union([
 ]);
 /** Service tag for workspace file operations. */
 var WorkspaceFileSystem = class extends Context.Service()("@p4code/cli/workspace/WorkspaceFileSystem") {};
-const make$20 = Effect.gen(function* () {
+const make$21 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const workspacePaths = yield* WorkspacePaths;
@@ -123531,7 +124542,7 @@ const make$20 = Effect.gen(function* () {
 		writeFile
 	});
 });
-const layer$15 = Layer.effect(WorkspaceFileSystem, make$20);
+const layer$16 = Layer.effect(WorkspaceFileSystem, make$21);
 //#endregion
 //#region src/vcs/VcsStatusBroadcaster.ts
 const DEFAULT_VCS_STATUS_REFRESH_INTERVAL = Duration.seconds(30);
@@ -123613,7 +124624,7 @@ const autoPullPolicyLayer = Layer.effect(VcsAutoPullPolicy, Effect.gen(function*
 		return resolveProjectAutoPull(yield* settingsService.getSettings, project.value.id);
 	}, Effect.orElseSucceed(() => false)) };
 }));
-const make$19 = Effect.gen(function* () {
+const make$20 = Effect.gen(function* () {
 	const autoPullPolicy = yield* VcsAutoPullPolicy;
 	const workflow = yield* GitWorkflowService;
 	const fs = yield* FileSystem.FileSystem;
@@ -123872,7 +124883,7 @@ const make$19 = Effect.gen(function* () {
 		streamStatus
 	});
 });
-const layer$14 = Layer.effect(VcsStatusBroadcaster, make$19);
+const layer$15 = Layer.effect(VcsStatusBroadcaster, make$20);
 //#endregion
 //#region src/vcs/VcsProvisioningService.ts
 var VcsProvisioningService = class extends Context.Service()("@p4code/cli/vcs/VcsProvisioningService") {};
@@ -123885,7 +124896,7 @@ function resolveRequestedKind(kind) {
 	}));
 	return Effect.succeed(kind);
 }
-const make$18 = Effect.gen(function* () {
+const make$19 = Effect.gen(function* () {
 	const registry = yield* VcsDriverRegistry;
 	const initRepository = Effect.fn("VcsProvisioningService.initRepository")(function* (input) {
 		const kind = yield* resolveRequestedKind(input.kind);
@@ -123893,11 +124904,11 @@ const make$18 = Effect.gen(function* () {
 	});
 	return VcsProvisioningService.of({ initRepository });
 });
-const layer$13 = Layer.effect(VcsProvisioningService, make$18);
+const layer$14 = Layer.effect(VcsProvisioningService, make$19);
 //#endregion
 //#region src/review/ReviewService.ts
 var ReviewService = class extends Context.Service()("@p4code/cli/review/ReviewService") {};
-const make$17 = Effect.gen(function* () {
+const make$18 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
@@ -123953,7 +124964,7 @@ const make$17 = Effect.gen(function* () {
 	});
 	return ReviewService.of({ getDiffPreview });
 });
-const layer$12 = Layer.effect(ReviewService, make$17);
+const layer$13 = Layer.effect(ReviewService, make$18);
 //#endregion
 //#region src/diagnostics/ProcessDiagnostics.ts
 const PROCESS_QUERY_TIMEOUT_MS = 1e3;
@@ -124248,7 +125259,7 @@ function assertDescendantPid(pid) {
 		}));
 	}));
 }
-const make$16 = Effect.gen(function* () {
+const make$17 = Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const read = Effect.gen(function* () {
 		const readAt = yield* DateTime.now;
@@ -124292,7 +125303,7 @@ const make$16 = Effect.gen(function* () {
 		signal
 	});
 });
-const layer$11 = Layer.effect(ProcessDiagnostics, make$16);
+const layer$12 = Layer.effect(ProcessDiagnostics, make$17);
 //#endregion
 //#region src/diagnostics/ProcessResourceMonitor.ts
 const SAMPLE_INTERVAL_MS = 5e3;
@@ -124443,7 +125454,7 @@ function aggregateProcessResourceHistory(input) {
 		}) : Option.none()
 	};
 }
-const make$15 = Effect.gen(function* () {
+const make$16 = Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const state = yield* Ref.make({
 		samples: [],
@@ -124492,7 +125503,7 @@ const make$15 = Effect.gen(function* () {
 	});
 	return ProcessResourceMonitor.of({ readHistory });
 });
-const layer$10 = Layer.effect(ProcessResourceMonitor, make$15);
+const layer$11 = Layer.effect(ProcessResourceMonitor, make$16);
 //#endregion
 //#region src/diagnostics/TraceDiagnostics.ts
 var TraceFileReadError = class extends Schema$1.TaggedErrorClass()("TraceFileReadError", {
@@ -124740,7 +125751,7 @@ function readTraceFile(fileSystem, path) {
 		cause
 	})) }));
 }
-const make$14 = Effect.gen(function* () {
+const make$15 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const read = Effect.fn("TraceDiagnostics.read")(function* (options) {
 		const readAt = options.readAt ?? (yield* DateTime.now);
@@ -124784,7 +125795,7 @@ const make$14 = Effect.gen(function* () {
 	});
 	return TraceDiagnostics.of({ read });
 });
-const layer$9 = Layer.effect(TraceDiagnostics, make$14);
+const layer$10 = Layer.effect(TraceDiagnostics, make$15);
 function readTraceDiagnostics(options) {
 	return Effect.gen(function* () {
 		return yield* (yield* TraceDiagnostics).read(options);
@@ -124819,7 +125830,7 @@ function snapshotFromDetail(link, detail, syncedAt) {
 		mergeability: detail.mergeability
 	};
 }
-const make$13 = Effect.gen(function* () {
+const make$14 = Effect.gen(function* () {
 	const engine = yield* OrchestrationEngineService;
 	const projections = yield* ProjectionSnapshotQuery;
 	const pullRequests = yield* PullRequestService;
@@ -124913,7 +125924,7 @@ const make$13 = Effect.gen(function* () {
 	};
 });
 var PullRequestSyncReactor = class extends Context.Service()("@p4code/cli/orchestration/Layers/PullRequestSyncReactor") {};
-const PullRequestSyncReactorLive = Layer.effect(PullRequestSyncReactor, make$13);
+const PullRequestSyncReactorLive = Layer.effect(PullRequestSyncReactor, make$14);
 //#endregion
 //#region src/sourceControl/SourceControlDiscovery.ts
 const VCS_PROBES = [{
@@ -124932,7 +125943,7 @@ const VCS_PROBES = [{
 	installHint: "Install Jujutsu with `brew install jj` or from https://github.com/jj-vcs/jj."
 }];
 var SourceControlDiscovery = class extends Context.Service()("@p4code/cli/sourceControl/SourceControlDiscovery") {};
-const make$12 = Effect.gen(function* () {
+const make$13 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const process = yield* VcsProcess;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
@@ -124981,7 +125992,7 @@ const make$12 = Effect.gen(function* () {
 		sourceControlProviders: sourceControlProviders.discover
 	}) });
 });
-const layer$8 = Layer.effect(SourceControlDiscovery, make$12);
+const layer$9 = Layer.effect(SourceControlDiscovery, make$13);
 //#endregion
 //#region src/sourceControl/SourceControlRepositoryService.ts
 const isSourceControlRepositoryError = Schema$1.is(SourceControlRepositoryError);
@@ -125014,7 +126025,7 @@ function expandHomePath(input, path) {
 	if (input.startsWith("~/") || input.startsWith("~\\")) return path.join(NodeOS.homedir(), input.slice(2));
 	return input;
 }
-const make$11 = Effect.gen(function* () {
+const make$12 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const git = yield* GitVcsDriver;
@@ -125153,7 +126164,7 @@ const make$11 = Effect.gen(function* () {
 		publishRepository: (input) => publishRepository(input).pipe(mapRepositoryError("publishRepository", input.provider))
 	});
 });
-const layer$7 = Layer.effect(SourceControlRepositoryService, make$11);
+const layer$8 = Layer.effect(SourceControlRepositoryService, make$12);
 //#endregion
 //#region src/ws.ts
 /** Matches `p4c hub token add`, so a token minted here and one minted there are the same thing. */
@@ -125300,6 +126311,7 @@ const RPC_REQUIRED_SCOPE = /* @__PURE__ */ new Map([
 	[WS_METHODS.serverUpdateServer, AuthOrchestrationOperateScope],
 	[WS_METHODS.serverUpsertKeybinding, AuthOrchestrationOperateScope],
 	[WS_METHODS.serverRemoveKeybinding, AuthOrchestrationOperateScope],
+	[WS_METHODS.threadHandoff, AuthOrchestrationReadScope],
 	[WS_METHODS.btwAsk, AuthOrchestrationReadScope],
 	[WS_METHODS.btwCancel, AuthOrchestrationReadScope],
 	[WS_METHODS.tasksList, AuthOrchestrationReadScope],
@@ -126152,6 +127164,27 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker, computerUseBrok
 			operation: "getUsageReport",
 			detail: "This provider does not report account usage."
 		})), { "rpc.aggregate": "server" }),
+		[WS_METHODS.threadHandoff]: (input) => observeRpcEffect$1(WS_METHODS.threadHandoff, Effect.gen(function* () {
+			const fail = (detail) => new TextGenerationError({
+				operation: "createHandoff",
+				detail
+			});
+			if (!projectionSnapshotQuery.getHandoffContext || !textGeneration.generateBtwAnswer) return yield* fail("Handoff generation is unavailable on this server.");
+			const context = yield* projectionSnapshotQuery.getHandoffContext(input.threadId).pipe(Effect.mapError(() => fail("Could not read thread history.")));
+			if (Option.isNone(context)) return yield* fail("Thread or project is no longer available.");
+			const settings = yield* serverSettings.getSettings.pipe(Effect.mapError(() => fail("Could not read text generation settings.")));
+			const result = yield* textGeneration.generateBtwAnswer({
+				cwd: context.value.projectId === P4_CHAT_PROJECT_ID ? config.chatWorkspaceDir : context.value.cwd,
+				modelSelection: settings.textGenerationModelSelection,
+				context: context.value.transcript,
+				question: "Write a self-contained handoff for a new coding-agent thread continuing this work. Include objective, latest user constraints, decisions, completed changes, verification evidence and its limits, pending work, important paths and identifiers. Reconcile builder and watcher histories without duplicating their shared facts. Later user corrections win. Preserve explicit authorization limits; do not invent approvals or claim missing work is complete. Histories may be bounded: say when earlier context is unavailable. Return only the handoff in concise Markdown, addressed to the next agent."
+			});
+			if (!result.answer.trim()) return yield* fail("Model returned an empty handoff. Try again.");
+			return {
+				projectId: context.value.projectId,
+				text: result.answer.trim()
+			};
+		}), { "rpc.aggregate": "thread" }),
 		[WS_METHODS.btwAsk]: (input) => observeRpcEffect$1(WS_METHODS.btwAsk, btw ? btw.ask(input) : Effect.fail(new BtwAskError({ detail: "Contextual questions are unavailable on this server." })), { "rpc.aggregate": "server" }),
 		[WS_METHODS.btwCancel]: (input) => observeRpcEffect$1(WS_METHODS.btwCancel, btw ? btw.cancel(input) : Effect.succeed({}), { "rpc.aggregate": "server" }),
 		[WS_METHODS.serverGetUsageSummary]: (input) => observeRpcEffect$1(WS_METHODS.serverGetUsageSummary, usage.readSummary(input), { "rpc.aggregate": "server" }),
@@ -126593,7 +127626,7 @@ const websocketRpcRouteLayer = Layer.unwrap(Effect.gen(function* () {
 		const serverAuth = yield* EnvironmentAuth;
 		const sessions = yield* SessionStore;
 		const session = yield* serverAuth.authenticateWebSocketUpgrade(request).pipe(Effect.catchIf(isServerAuthCredentialError, (error) => failEnvironmentAuthInvalid(serverAuthCredentialReason(error))), Effect.catchIf(isServerAuthInternalError, (error) => failEnvironmentInternal("internal_error", error)));
-		const rpcWebSocketHttpEffect = yield* RpcServer.toHttpEffectWebsocket(WsRpcGroup, { disableTracing: true }).pipe(Effect.provide(makeWsRpcLayer(session, previewAutomationBroker, computerUseBroker).pipe(Layer.provideMerge(RpcSerialization.layerJson), Layer.provide(layer$23), Layer.provide(Layer.succeed(ServerSelfUpdate, serverSelfUpdate)), Layer.provide(Layer.succeed(PullRequestService, pullRequests)), Layer.provide(Layer.succeed(TaskRepositoryRegistry, taskRepositories)), Layer.provide(Layer.succeed(ProjectionProjectRepository, projectionProjects)), Layer.provide(Layer.succeed(P4ProjectFileLoader, p4ProjectFileLoader)), Layer.provide(layer$8.pipe(Layer.provide(layer$33.pipe(Layer.provide(Layer.mergeAll(layer$41, layer$39, layer$37, layer$35)), Layer.provideMerge(layer$49), Layer.provide(layer$47.pipe(Layer.provide(layer$48))))), Layer.provide(layer$50))))));
+		const rpcWebSocketHttpEffect = yield* RpcServer.toHttpEffectWebsocket(WsRpcGroup, { disableTracing: true }).pipe(Effect.provide(makeWsRpcLayer(session, previewAutomationBroker, computerUseBroker).pipe(Layer.provideMerge(RpcSerialization.layerJson), Layer.provide(layer$24), Layer.provide(Layer.succeed(ServerSelfUpdate, serverSelfUpdate)), Layer.provide(Layer.succeed(PullRequestService, pullRequests)), Layer.provide(Layer.succeed(TaskRepositoryRegistry, taskRepositories)), Layer.provide(Layer.succeed(ProjectionProjectRepository, projectionProjects)), Layer.provide(Layer.succeed(P4ProjectFileLoader, p4ProjectFileLoader)), Layer.provide(layer$9.pipe(Layer.provide(layer$34.pipe(Layer.provide(Layer.mergeAll(layer$42, layer$40, layer$38, layer$36)), Layer.provideMerge(layer$50), Layer.provide(layer$48.pipe(Layer.provide(layer$49))))), Layer.provide(layer$51))))));
 		return yield* Effect.acquireUseRelease(sessions.markConnected(session.sessionId), () => rpcWebSocketHttpEffect, () => sessions.markDisconnected(session.sessionId));
 	}).pipe(Effect.catchTags({
 		EnvironmentAuthInvalidError: HttpServerRespondable.toResponse,
@@ -126658,7 +127691,7 @@ function toPersistenceSqlOrDecodeError(sqlOperation, decodeOperation, correlatio
 		cause
 	});
 }
-const make$10 = Effect.gen(function* () {
+const make$11 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const upsertRuntimeRow = SqlSchema.void({
 		Request: ProviderSessionRuntimeDbRowSchema,
@@ -126761,7 +127794,7 @@ const make$10 = Effect.gen(function* () {
 		deleteByThreadId
 	};
 });
-const layer$6 = Layer.effect(ProviderSessionRuntimeRepository, make$10);
+const layer$7 = Layer.effect(ProviderSessionRuntimeRepository, make$11);
 //#endregion
 //#region src/provider/Layers/ProviderSessionDirectory.ts
 const decodeProviderDriverKindValue = Schema$1.decodeUnknownEffect(ProviderDriverKind);
@@ -126912,6 +127945,13 @@ const makeProviderAdapterRegistry = Effect.fn("makeProviderAdapterRegistry")(fun
 });
 const ProviderAdapterRegistryLive = Layer.effect(ProviderAdapterRegistry, makeProviderAdapterRegistry());
 //#endregion
+//#region src/provider/ComputerUsePrompts.ts
+/** Routing guidance is injected only when the session has P4's Computer Use endpoint. */
+const COMPUTER_USE_ROUTING_PROMPT = "P4 Computer Use is enabled for this session through the cua_repl MCP server. For natural-language requests to inspect or interact with a native desktop app, use its js tool by default, even when the user does not mention P4 or Computer Use. Do not substitute provider-builtin Computer Use, AppleScript, shell automation, or another integration unless the user explicitly requests that path. For a named app, start directly with const app = await cua.getApp(exactNameOrBundleId); read the automatically returned state/image and stop if it answers the request. Reuse the handle and batch safe actions; do not repeat selection or unchanged state. For Device Hub, simulator, emulator, or connected-device requests, use cua.listDevices() once, then cua.getDevice({hostId,deviceId,platform}) with exact discovered IDs. Selection already emits initial device state. Reuse its handle; do not print the handle or repeat that state before acting. Never substitute macOS getApp('Simulator'). Device hosts are scoped to this provider environment and can differ from the desktop host. If device discovery, opening, inspection, or interaction reports missing permission or unavailable control, stop and report the exact limitation. Do not retry through screenshots, shell simctl, Xcode tools, or another MCP server. Do not call getState/getApp, control the P4 desktop app, or open device settings to work around a device API failure. Missing consent, unavailable devices, or unsupported operations are limitations to report, not permission to switch hosts or bypass the tool.";
+function withComputerUseRouting(input, enabled) {
+	return enabled ? `<p4-computer-use>\n${COMPUTER_USE_ROUTING_PROMPT}\n</p4-computer-use>\n\n${input ?? ""}` : input;
+}
+//#endregion
 //#region src/mcp/McpSessionRegistry.ts
 var McpSessionRegistry = class extends Context.Service()("@p4code/cli/mcp/McpSessionRegistry") {};
 /**
@@ -127214,7 +128254,7 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 	});
 });
 let activeMcpSessionRegistry;
-const make$9 = Effect.acquireRelease(Effect.gen(function* () {
+const make$10 = Effect.acquireRelease(Effect.gen(function* () {
 	const broker = yield* Effect.serviceOption(ComputerUseBroker);
 	return yield* makeWithOptions(Option.isSome(broker) ? { onRevoke: broker.value.invalidate } : {});
 }).pipe(Effect.tap((registry) => Effect.sync(() => {
@@ -127222,7 +128262,7 @@ const make$9 = Effect.acquireRelease(Effect.gen(function* () {
 }))), (registry) => registry.revokeAll.pipe(Effect.andThen(Effect.sync(() => {
 	if (activeMcpSessionRegistry === registry) activeMcpSessionRegistry = void 0;
 }))));
-const layer$5 = Layer.effect(McpSessionRegistry, make$9);
+const layer$6 = Layer.effect(McpSessionRegistry, make$10);
 const issueActiveMcpCredential = (request) => activeMcpSessionRegistry ? activeMcpSessionRegistry.revokeThread(request.threadId).pipe(Effect.andThen(activeMcpSessionRegistry.issue(request))) : Effect.sync(() => void 0);
 /**
 * Refreshes the liveness of a thread's MCP credential. Called on every provider
@@ -127685,7 +128725,10 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (options)
 				...input.modelSelection?.model ? { "provider.model": input.modelSelection.model } : {}
 			});
 			yield* touchActiveMcpThread(input.threadId);
-			const turn = yield* routed.adapter.sendTurn(input);
+			const turn = yield* routed.adapter.sendTurn({
+				...input,
+				input: withComputerUseRouting(input.input, !forCompaction && Boolean(readMcpProviderSession(input.threadId)?.computerUse))
+			});
 			yield* directory.upsert({
 				threadId: input.threadId,
 				provider: routed.adapter.provider,
@@ -128170,7 +129213,7 @@ const mcpToolkit = (toolkit) => Layer.effectDiscard(Effect.gen(function* () {
 //#endregion
 //#region src/mcp/toolkits/computerUse/tools.ts
 const ComputerUseJsTool = Tool.make("js", {
-	description: "Run JavaScript in a persistent P4 Computer Use REPL. Start with await cua.getState(). Use cua.createBrowserTab('iab', url, {visible:true}) or cua.getTab(tabId) for P4 browser tabs. Tab methods: getState(), goto(url), click({locator}), type({text,locator?,clear?}), press({key,modifiers?}), scroll({deltaY,deltaX?}). Print results with nodeRepl.write(value); emit PNG/JPEG with nodeRepl.emitImage({mimeType,data}) using base64 data. Top-level await and persistent let bindings are supported. Await each operation. Reset after timeout or host disconnect. For available native apps, use cua.getApp(exactNameOrBundleId), then getAXState(), click(elementIndex), or setValue(elementIndex,text) to replace a field value in the background. Selection and getAXState print numbered accessibility state; Several deterministic actions against distinct unchanged elements may share one snapshot. Each used handle expires; the host revalidates remaining native handles and rejects changed elements. Read fresh state after the action batch before deciding the next action. getScreenshot() emits the selected app window; getAXStateAndScreenshot() emits both. Legacy getState(), click({elementId}), type({elementId,text}), windows(), and screenshot(windowId) remain supported. Native control preserves foreground focus and the system pointer. Coordinate, key, drag, scroll, and activation input are unsupported; do not use global input or activate the app as a fallback. P4Code shows the controlled native window and a persistent independent white pointer with a blue glow in its embedded live view. Hide closes only the view; use Show live view in the Computer Use control to reopen it. Stop ends thread control; reset clears the view and handles. Google Chrome can be controlled as a native app using cua.getApp('Google Chrome'); Chrome extension/CDP tab APIs are not exposed by this host. Native app availability and macOS permission states are reported by the host; never assume native apps are supported. The host may be a different machine from the provider server. Device hub simulators are scoped to the provider environment: await cua.listDevices(), then await cua.getDevice({hostId,deviceId,platform}) using exact discovered IDs. The device handle supports getAXState() (raw iOS accessibility state), getScreenshot(), getAXStateAndScreenshot(), click([x,y]) in device coordinates from fresh AX state, typeText(text), and close(). No device key, scroll, or drag APIs are currently exposed. Device consent must already be enabled in P4 Settings. Use timeout_ms:60000 for initial device startup. Reset invalidates device handles; device viewer sessions remain under Devices until explicitly closed. Never substitute macOS Simulator.app AX for simulated-app state.",
+	description: "P4 Code Computer Use: control native apps through P4Code's signed helper. Run JavaScript in a persistent REPL. On the first call, execute exactly one entry-point operation and read its automatic output before continuing. When the user names an app, execute only const app = await cua.getApp(exactNameBundleIdOrPath); this already prints its state and includes a screenshot when AX exposes no app content. Use await cua.getState() only when discovery is needed. Use cua.createBrowserTab('iab', url, {visible:true}) or cua.getTab(tabId) for P4 browser tabs. Tab methods: getState(), goto(url), click({locator}), type({text,locator?,clear?}), press({key,modifiers?}), scroll({deltaY,deltaX?}). Print results with nodeRepl.write(value); emit PNG/JPEG with nodeRepl.emitImage({mimeType,data}) using base64 data. Top-level await and persistent let bindings are supported. Await each operation. Bindings disappear after helper restart, host disconnect, reset, or tray Stop. When resuming a task, guard a remembered binding within the same js call: if (typeof app === 'undefined') { globalThis.app = await cua.getApp('Spotify'); } else { await app.getScreenshot(); }. Substitute the named app and intended operation. The missing-binding branch selects only and prints fresh state; decide the next action after reading it. Never spend a separate tool call checking whether a binding exists. Reset after timeout or host disconnect. For available native apps, use cua.getApp(exactNameBundleIdOrPath), then getAXState(), click(elementIndex), or setValue(elementIndex,text) to replace a field value in the background. Selection already prints numbered accessibility state; reuse the app handle without selecting or reading it again before the first action. Snapshot text is bounded; use getAXState({filter:'Pause'}) for case-insensitive text filtering across the snapshot, including controls omitted from the initial output. Use {emit:false} on getApp(name, options), getAXState(options), or getScreenshot(options) when processing the returned value yourself; do not print auto-emitted output again. Several deterministic actions against distinct unchanged elements may share one snapshot. Each used element index expires after one action. To click the same control again, refresh with getAXState({filter: controlLabel}) first, even inside a batch; never reuse its old index. The host revalidates remaining native handles and rejects changed elements. Read fresh state after the action batch before deciding the next action. If selection includes a screenshot because AX exposes only window controls or menus, read that image immediately and finish if it answers the request. If no image is included, use getScreenshot() to read visual content; do not repeat unchanged snapshots hoping for missing accessibility content. getScreenshot() emits the selected app window; getAXStateAndScreenshot() emits both. Legacy getState(), click({elementId}), type({elementId,text}), windows(), and screenshot(windowId) remain supported. Native control preserves foreground focus and the system pointer. Coordinate, key, drag, scroll, and activation input are unsupported; do not use global input or activate the app as a fallback. P4Code shows the controlled native window and a persistent independent black pointer with a thin contrast edge in its embedded live view. Hide closes only the view; use Show live view in the Computer Use control to reopen it. Stop ends thread control; reset clears the view and handles. Google Chrome can be controlled as a native app using cua.getApp('Google Chrome'); Chrome extension/CDP tab APIs are not exposed by this host. Native app availability and macOS permission states are reported by the host; never assume native apps are supported. The host may be a different machine from the provider server. Device hub simulators are scoped to the provider environment: await cua.listDevices(), then await cua.getDevice({hostId,deviceId,platform}) using exact discovered IDs. Selection automatically emits initial AX state (or a screenshot on other platforms); reuse the handle without repeating that capture or printing the handle. A permission or unavailable-control error requires stopping and reporting it, never shell or alternative-tool fallback. The device handle supports getAXState() (raw iOS accessibility state), getScreenshot(), getAXStateAndScreenshot(), click([x,y]) in device coordinates from fresh AX state, typeText(text), and close(). When getAXState() reports adapter apple-xcode or xcodebuildmcp, use semantic refs from capture.elements and only advertised capabilities: click(elementRef), typeText(text,{elementRef,replaceExisting:true}), swipe({withinElementRef,direction}), drag({elementRef,direction}), batch([{action:\"tap\",elementRef},...]), and recordVideo(\"start\"|\"stop\") only when advertised in capabilities. getAXState({sinceScreenHash}) avoids unchanged snapshots. Batch only same-screen taps; action output includes updated capture. On stale-ref errors inspect fresh state and choose a current ref; never replay an action automatically. Physical-device UI control and device key input are unavailable. Device consent must already be enabled in P4 Settings. Use timeout_ms:60000 for initial device startup. Reset invalidates device handles; device viewer sessions remain under Devices until explicitly closed. Never substitute macOS Simulator.app AX for simulated-app state.",
 	parameters: Schema$1.Struct({
 		...ComputerUseJsInput.fields,
 		hostId: Schema$1.optional(TrimmedNonEmptyString).annotate({ description: "Select an available host when more than one is connected. Reset before changing hosts." })
@@ -128629,7 +129672,7 @@ const stringField = (record, key) => {
 	const value = record[key];
 	return typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
 };
-const make$8 = Effect.gen(function* () {
+const make$9 = Effect.gen(function* () {
 	const linear = yield* LinearClient;
 	return { resolve: Effect.fn("TicketResolver.resolve")(function* (reference) {
 		const identifier = parseTicketReference(reference);
@@ -128660,7 +129703,7 @@ const make$8 = Effect.gen(function* () {
 		};
 	}) };
 });
-const layer$4 = Layer.effect(TicketResolver, make$8);
+const layer$5 = Layer.effect(TicketResolver, make$9);
 //#endregion
 //#region src/mcp/toolkits/tasks/tools.ts
 const dependencies = [McpInvocationContext, TaskRepository];
@@ -130001,6 +131044,34 @@ const ThreadToolkitHandlersLive = ThreadToolkit.toLayer({
 	})
 });
 //#endregion
+//#region src/orchestration/FusionBudgetPause.ts
+const pauseFusionBudget = Effect.fn("pauseFusionBudget")(function* (input) {
+	const engine = yield* OrchestrationEngineService;
+	const epoch = input.pair.reviewExperiment?.lastMessageSequence ?? 0;
+	for (const threadId of [input.pair.implementerThreadId, input.pair.watcherThreadId]) {
+		const id = `fusion-budget:${input.pair.id}:${epoch}:${threadId}`;
+		yield* engine.dispatch({
+			type: "thread.activity.append",
+			commandId: CommandId.make(id),
+			threadId,
+			activity: {
+				id: EventId.make(id),
+				tone: "info",
+				kind: "fusion.pair.paused",
+				summary: `Fusion paused: ${input.reason}`,
+				payload: {
+					pairId: input.pair.id,
+					reason: "review-budget",
+					experiment: input.pair.reviewExperiment
+				},
+				turnId: null,
+				createdAt: input.createdAt
+			},
+			createdAt: input.createdAt
+		});
+	}
+});
+//#endregion
 //#region src/mcp/toolkits/advise/tools.ts
 /**
 * The write half of cross-thread access, and the reason advise is its own
@@ -130104,6 +131175,22 @@ const AdviseToolkitHandlersLive = AdviseToolkit.toLayer({
 			};
 		}
 		const createdAt = DateTime.formatIso(yield* DateTime.now);
+		const activePair = readModel.threadPairs?.find((pair) => pair.detachedAt === null && pair.implementerThreadId === input.threadId);
+		const budgetBlock = activePair && fusionBudgetBlock(activePair, input.threadId, `[fusion-advice] ${input.message}`);
+		if (budgetBlock && activePair) {
+			yield* pauseFusionBudget({
+				pair: activePair,
+				reason: budgetBlock,
+				createdAt
+			}).pipe(Effect.mapError((cause) => new ThreadAdviseFailedError({
+				threadId: input.threadId,
+				detail: cause.message
+			})));
+			return yield* new ThreadAdviseFailedError({
+				threadId: input.threadId,
+				detail: budgetBlock
+			});
+		}
 		const interrupted = input.interrupt === true;
 		if (interrupted) yield* dispatchAdvise({
 			type: "thread.turn.interrupt",
@@ -130391,7 +131478,7 @@ const ComputerUseMcpLive = ComputerUseToolkitRegistrationLive.pipe(Layer.provide
 	version: version$1,
 	path: "/mcp/computer-use"
 }).pipe(Layer.provide(McpAuthMiddlewareLive))));
-const layer$3 = Layer.mergeAll(Layer.fresh(StandardMcpLive), Layer.fresh(ComputerUseMcpLive));
+const layer$4 = Layer.mergeAll(Layer.fresh(StandardMcpLive), Layer.fresh(ComputerUseMcpLive));
 //#endregion
 //#region src/hub/HubActivityTransport.ts
 const REQUEST_TIMEOUT_MS = 8e3;
@@ -130681,7 +131768,7 @@ const runHubActivityEmission = Effect.fn("HubActivityRuntime.run")(function* (se
 	const outbound = yield* makeHubActivityOutbound(identity.destination);
 	yield* runHubActivityTick(outbound, transport, identity).pipe(Effect.tap(() => ready), Effect.repeat(Schedule.spaced(Duration.millis(HUB_ACTIVITY_INTERVAL_MS))));
 });
-const layer$2 = Layer.effectDiscard(Effect.gen(function* () {
+const layer$3 = Layer.effectDiscard(Effect.gen(function* () {
 	yield* runHubTunnelReconnect((yield* HubLink).changes, (settings, ready) => runHubActivityEmission(settings, ready).pipe(Effect.mapError((error) => error instanceof HubActivityUnauthorized ? new HubUnauthorizedError() : error))).pipe(Effect.forkScoped);
 }));
 //#endregion
@@ -131506,7 +132593,7 @@ const runHubTunnelOutbound = Effect.fn("HubTunnelOutbound.run")(function* (setti
 		yield* runHubTunnelPump(lease, socket, makeHubTunnelEnvironmentDispatch(localOrigin));
 	}));
 });
-const layer$1 = Layer.effectDiscard(Effect.gen(function* () {
+const layer$2 = Layer.effectDiscard(Effect.gen(function* () {
 	const link = yield* HubLink;
 	const server = yield* HttpServer.HttpServer;
 	if (server.address._tag !== "TcpAddress") return;
@@ -131578,7 +132665,7 @@ const COMPLETION_SWEEP_BATCH_SIZE = 25;
 const COMPLETION_SWEEP_INTERVAL = Duration.minutes(1);
 const COMPLETION_PR_TIMEOUT = Duration.seconds(10);
 const MILLISECONDS_PER_DAY = 1440 * 60 * 1e3;
-const make$7 = Effect.gen(function* () {
+const make$8 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const settings = yield* ServerSettingsService;
 	const git = yield* GitManager;
@@ -131665,7 +132752,7 @@ const make$7 = Effect.gen(function* () {
 	};
 });
 var ThreadCompletionReactor = class extends Context.Service()("@p4code/cli/orchestration/Layers/ThreadCompletionReactor") {};
-const ThreadCompletionReactorLive = Layer.effect(ThreadCompletionReactor, make$7);
+const ThreadCompletionReactorLive = Layer.effect(ThreadCompletionReactor, make$8);
 //#endregion
 //#region src/orchestration/Services/ScheduledTaskReactor.ts
 /**
@@ -131702,6 +132789,238 @@ const makeOrchestrationReactor = Effect.gen(function* () {
 });
 const OrchestrationReactorLive = Layer.effect(OrchestrationReactor, makeOrchestrationReactor);
 //#endregion
+//#region src/usage/fusionObservation.ts
+const OBSERVATION_DAY_MS = 1440 * 60 * 1e3;
+const REVIEW_RATIO_THRESHOLD = .5;
+const REVIEW_COUNT_THRESHOLD = 10;
+const MILLISECONDS_PER_MINUTE = 60 * 1e3;
+function emptyRole() {
+	return {
+		turns: 0,
+		failedTurns: 0,
+		turnsWithUsage: 0,
+		activeMinutes: 0,
+		tokens: { ...EMPTY_TOTALS }
+	};
+}
+function observationWeek(date) {
+	const instant = DateTime.makeUnsafe(date);
+	const daysSinceMonday = (DateTime.getPartUtc(instant, "weekDay") + 7 - 1) % 7;
+	return DateTime.formatIso(DateTime.makeUnsafe(DateTime.toEpochMillis(instant) - daysSinceMonday * OBSERVATION_DAY_MS)).slice(0, 10);
+}
+/** Role consumption is descriptive; it cannot estimate a counterfactual solo run. */
+function buildFusionObservation(input) {
+	const sinceMs = Date.parse(input.since);
+	const untilMs = Date.parse(input.generatedAt);
+	const pairs = /* @__PURE__ */ new Map();
+	const sessions = /* @__PURE__ */ new Map();
+	let missingSessionTurns = 0;
+	for (const turn of input.turns) {
+		const start = Math.max(sinceMs, Date.parse(turn.startedAt), Date.parse(turn.pairCreatedAt));
+		const end = Math.min(untilMs, Date.parse(turn.completedAt), turn.detachedAt === null ? untilMs : Date.parse(turn.detachedAt));
+		if (!Number.isFinite(start) || !Number.isFinite(end) || end < start) continue;
+		let pair = pairs.get(turn.pairId);
+		if (!pair) {
+			pair = {
+				pairId: turn.pairId,
+				reviewPolicy: turn.reviewPolicy ?? null,
+				builder: emptyRole(),
+				review: emptyRole(),
+				supervisorOther: emptyRole()
+			};
+			pairs.set(turn.pairId, pair);
+		}
+		const role = turn.role === "builder" ? pair.builder : turn.trigger === "review" || turn.trigger === "gate" ? pair.review : pair.supervisorOther;
+		role.turns += 1;
+		role.failedTurns += Number(turn.state !== "completed");
+		role.activeMinutes += (end - start) / MILLISECONDS_PER_MINUTE;
+		if (turn.sessionId === null) {
+			missingSessionTurns += 1;
+			continue;
+		}
+		const entries = sessions.get(turn.sessionId) ?? [];
+		entries.push({
+			start,
+			end,
+			role,
+			observed: false
+		});
+		sessions.set(turn.sessionId, entries);
+	}
+	let unattributedRecords = 0;
+	let ambiguousRecords = 0;
+	const seen = /* @__PURE__ */ new Set();
+	for (const record of input.records) {
+		if (record.timestampMs < sinceMs || record.timestampMs > untilMs) continue;
+		if (record.dedupeKey !== null) {
+			if (seen.has(record.dedupeKey)) continue;
+			seen.add(record.dedupeKey);
+		}
+		const matching = (sessions.get(record.sessionId) ?? []).filter((turn) => record.timestampMs >= turn.start && record.timestampMs <= turn.end);
+		if (matching.length !== 1) {
+			unattributedRecords += 1;
+			if (matching.length > 1) ambiguousRecords += 1;
+			continue;
+		}
+		const match = matching[0];
+		match.role.tokens = addTotals(match.role.tokens, record.totals);
+		if (!match.observed) match.role.turnsWithUsage += 1;
+		match.observed = true;
+	}
+	const observedPairs = [...pairs.values()].map((pair) => {
+		const builderTokens = totalTokens(pair.builder.tokens);
+		const reviewTokens = totalTokens(pair.review.tokens);
+		return {
+			...pair,
+			reviewTokensPerBuilderToken: builderTokens > 0 && reviewTokens > 0 ? reviewTokens / builderTokens : null
+		};
+	});
+	const ratios = observedPairs.flatMap((pair) => pair.reviewTokensPerBuilderToken === null ? [] : [pair.reviewTokensPerBuilderToken]).sort((a, b) => a - b);
+	const middle = Math.floor(ratios.length / 2);
+	const median = ratios.length === 0 ? null : ratios.length % 2 === 0 ? (ratios[middle - 1] + ratios[middle]) / 2 : ratios[middle];
+	const recommendations = [];
+	const hasIncompleteUsage = missingSessionTurns > 0 || observedPairs.some((pair) => [
+		pair.builder,
+		pair.review,
+		pair.supervisorOther
+	].some((role) => role.turnsWithUsage < role.turns));
+	if (hasIncompleteUsage) recommendations.push("Improve usage attribution before comparing policies; missing usage is not zero consumption.");
+	if (ratios.length < 20) recommendations.push(`Collect at least 20 pairs with builder and review usage before selecting a policy experiment.`);
+	else if (!hasIncompleteUsage && median !== null && median > REVIEW_RATIO_THRESHOLD) recommendations.push("Trial fewer review boundaries against the current policy on fixed tasks; compare independently verified outcomes and total cost.");
+	if (observedPairs.some((pair) => pair.review.turns > REVIEW_COUNT_THRESHOLD)) recommendations.push(`Inspect pairs with more than ${REVIEW_COUNT_THRESHOLD} review turns for overly small phases or repeated corrections; a high count alone does not establish waste.`);
+	recommendations.push("Keep settings unchanged until an isolated comparison passes acceptance and regression checks. These observations do not measure defects prevented or solo performance.");
+	return {
+		version: 1,
+		mode: "observe",
+		generatedAt: input.generatedAt,
+		since: input.since,
+		timeZone: "UTC",
+		coverage: {
+			pairs: observedPairs.length,
+			pairsWithBothUsage: ratios.length,
+			missingSessionTurns,
+			unattributedRecords,
+			ambiguousRecords
+		},
+		medianReviewTokensPerBuilderToken: median,
+		limitations: [
+			"Only completed or failed turn intervals are counted; ongoing turns are excluded.",
+			"Current session linkage may omit usage before a provider session reset; unsupported providers remain unmeasured.",
+			"Codex subagent sessions are not linked; Claude descendants sharing the parent session id can be included.",
+			"Cached tokens are included. Tokens and wall time are not billing, quota, latency overhead, or causal quality measurements.",
+			"Supervisor startup and direct user turns are separate from automatic reviews; review-induced builder repairs are not separable."
+		],
+		pairs: observedPairs,
+		recommendations
+	};
+}
+//#endregion
+//#region src/usage/FusionObservationService.ts
+const OBSERVATION_CHECK_INTERVAL = Duration.hours(1);
+const ReportStamp = Schema$1.Struct({
+	version: Schema$1.Literal(1),
+	generatedAt: Schema$1.String
+});
+const TurnRow = Schema$1.Struct({
+	pairId: Schema$1.String,
+	reviewPolicy: Schema$1.NullOr(Schema$1.fromJsonString(FusionReviewPolicy)),
+	threadId: Schema$1.String,
+	turnId: Schema$1.String,
+	role: Schema$1.Literals(["builder", "supervisor"]),
+	sessionId: Schema$1.NullOr(Schema$1.String),
+	pairCreatedAt: Schema$1.String,
+	detachedAt: Schema$1.NullOr(Schema$1.String),
+	startedAt: Schema$1.String,
+	completedAt: Schema$1.String,
+	state: Schema$1.String,
+	trigger: Schema$1.Literals([
+		"review",
+		"gate",
+		"advice",
+		"other"
+	])
+});
+const decodeReportStamp = Schema$1.decodeUnknownEffect(Schema$1.fromJsonString(ReportStamp));
+const decodeTurns = Schema$1.decodeUnknownEffect(Schema$1.Array(TurnRow));
+const encodeReport = Schema$1.encodeEffect(Schema$1.UnknownFromJsonString);
+/** Reads existing projections only; observation never dispatches orchestration commands. */
+const make$7 = Effect.gen(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path$1.Path;
+	const config = yield* ServerConfig$1;
+	const settings = yield* ServerSettingsService;
+	const usage = yield* UsageService;
+	const lock = yield* Semaphore.make(1);
+	const directory = path.join(config.stateDir, "fusion-observation");
+	const latestPath = path.join(directory, "latest.json");
+	const writeReport = Effect.fn("FusionObservation.writeReport")(function* (destination, body) {
+		const temporary = `${destination}.tmp`;
+		yield* fs.writeFileString(temporary, body);
+		yield* fs.rename(temporary, destination);
+	});
+	const refresh = Effect.fn("FusionObservation.refresh")(function* () {
+		if (!(yield* settings.getSettings).enableFusionObservation) return;
+		const now = yield* Clock.currentTimeMillis;
+		const generatedAt = DateTime.formatIso(DateTime.makeUnsafe(now));
+		const weeklyPath = path.join(directory, `week-${observationWeek(generatedAt)}.json`);
+		const stamp = yield* fs.readFileString(latestPath).pipe(Effect.flatMap(decodeReportStamp), Effect.orElseSucceed(() => null));
+		const weeklyExists = yield* fs.exists(weeklyPath);
+		if (stamp?.generatedAt.slice(0, 10) === generatedAt.slice(0, 10) && weeklyExists) return;
+		const since = DateTime.formatIso(DateTime.makeUnsafe(now - 7 * OBSERVATION_DAY_MS));
+		const rows = yield* sql`
+      SELECT p.pair_id AS "pairId", t.thread_id AS "threadId", t.turn_id AS "turnId",
+        CASE WHEN t.thread_id = p.implementer_thread_id THEN 'builder' ELSE 'supervisor' END AS role,
+        CASE WHEN json_valid(r.resume_cursor_json) THEN
+          CASE WHEN r.provider_name = 'codex' THEN json_extract(r.resume_cursor_json, '$.threadId')
+               WHEN r.provider_name = 'claudeAgent' THEN json_extract(r.resume_cursor_json, '$.resume') END
+        END AS "sessionId",
+        json_extract(p.review_experiment_json, '$.policy') AS "reviewPolicy",
+        p.created_at AS "pairCreatedAt", p.detached_at AS "detachedAt",
+        coalesce(t.started_at, t.requested_at) AS "startedAt", t.completed_at AS "completedAt", t.state,
+        CASE WHEN substr(m.text, 1, 15) = '[fusion-review]' THEN 'review'
+             WHEN substr(m.text, 1, 13) = '[fusion-gate]' THEN 'gate'
+             WHEN substr(m.text, 1, 15) = '[fusion-advice]' THEN 'advice' ELSE 'other' END AS trigger
+      FROM thread_pairs p
+      JOIN projection_turns t ON t.thread_id IN (p.implementer_thread_id, p.watcher_thread_id)
+      LEFT JOIN provider_session_runtime r ON r.thread_id = t.thread_id
+      LEFT JOIN projection_thread_messages m ON m.message_id = t.pending_message_id
+      WHERE t.turn_id IS NOT NULL AND t.completed_at >= ${since} AND t.completed_at <= ${generatedAt}
+        AND t.completed_at >= p.created_at
+        AND (p.detached_at IS NULL OR t.requested_at <= p.detached_at)
+    `;
+		const turns = yield* decodeTurns(rows);
+		const sessionIds = [...new Set(turns.flatMap((turn) => turn.sessionId === null ? [] : [turn.sessionId]))];
+		const report = buildFusionObservation({
+			generatedAt,
+			since,
+			turns,
+			records: yield* usage.readSessionRecords({
+				sessionIds,
+				sinceMs: Date.parse(since)
+			})
+		});
+		yield* fs.makeDirectory(directory, { recursive: true });
+		const body = yield* encodeReport(report);
+		if (!weeklyExists) {
+			yield* writeReport(weeklyPath, body);
+			yield* Effect.logInfo("Weekly Fusion observation available", {
+				path: weeklyPath,
+				pairs: report.coverage.pairs
+			});
+		}
+		yield* writeReport(latestPath, body);
+	});
+	const run = lock.withPermits(1)(refresh());
+	return {
+		refresh: run,
+		start: run.pipe(Effect.catchCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.failCause(cause) : Effect.logWarning("Fusion observation failed; retrying on the next scheduled check")), Effect.repeat(Schedule.spaced(OBSERVATION_CHECK_INTERVAL)), Effect.forkScoped)
+	};
+});
+const layer$1 = Layer.effectDiscard(Effect.gen(function* () {
+	yield* (yield* make$7).start;
+}));
+//#endregion
 //#region src/orchestration/Services/RuntimeReceiptBus.ts
 /**
 * RuntimeReceiptBus - Internal checkpoint-reactor synchronization receipts.
@@ -132158,6 +133477,7 @@ function runtimeEventToActivities(event, taskTitle, compressMode) {
 			summary: event.payload.description.trim().length > 0 ? truncateDetail(event.payload.description, 120) : "Reasoning update",
 			payload: {
 				taskId: event.payload.taskId,
+				...event.payload.model ? { model: event.payload.model } : {},
 				...event.provider === "claudeAgent" && event.payload.workflowScript?.instanceId === event.providerInstanceId ? { workflowScript: event.payload.workflowScript } : {},
 				...event.payload.description.trim().length > 0 ? { title: truncateDetail(event.payload.description, 120) } : {},
 				detail: event.payload.summary ?? event.payload.description,
@@ -132919,7 +134239,7 @@ const make$6 = Effect.gen(function* () {
 		drain: worker.drain
 	};
 });
-const ProviderRuntimeIngestionLive = Layer.effect(ProviderRuntimeIngestionService, make$6).pipe(Layer.provide(ProjectionTurnRepositoryLive), Layer.provide(layer$82));
+const ProviderRuntimeIngestionLive = Layer.effect(ProviderRuntimeIngestionService, make$6).pipe(Layer.provide(ProjectionTurnRepositoryLive), Layer.provide(layer$83));
 //#endregion
 //#region src/provider/userInvokedSkills.ts
 /**
@@ -133759,6 +135079,7 @@ const make$5 = Effect.gen(function* () {
 		].join("\n\n") : fusionRole === "watcher" && isFusionWatcherWakeMessageId(input.messageId) ? sidechatSeededInput : [
 			sessionFusionRole === fusionRole ? fusionRoleReferenceLineFor(fusionRole) : fusionRoleInstructionsFor(fusionRole),
 			fusionPairContext(activeFusionPair, fusionRole),
+			fusionReviewPolicyInstructions(activeFusionPair.reviewExperiment),
 			sidechatSeededInput
 		].join("\n\n");
 		const providerHasStructuredQuestionSystemPrompt = activeSession?.provider === "claudeAgent" || activeSession?.provider === "codex";
@@ -134841,7 +136162,7 @@ Then thread_gate_respond, threadId ${input.implementerThreadId}, gateId ${input.
 - "approve": clear gate, continue builder.
 - "object" plus message: send objection, spend round. After ${input.roundCap} objections, escalate to user.
 
-No answer within ${Math.round(input.gateTimeoutMs / 1e3)} seconds: fail open, record unwatched. Answer, briefly explain to user, end turn; never wait for builder.`;
+No answer within ${Math.round(input.gateTimeoutMs / 1e3)} seconds: ${input.failClosed ? "escalate to the user; keep work unapproved" : "fail open, record unwatched"}. Answer, briefly explain to user, end turn; never wait for builder.`;
 const make$3 = Effect.gen(function* () {
 	const orchestrationEngine = yield* OrchestrationEngineService;
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
@@ -134944,6 +136265,9 @@ const make$3 = Effect.gen(function* () {
 			discard: true
 		});
 	});
+	const wakeWasRequested = Effect.fn("FusionWatcherReactor.wakeWasRequested")(function* (afterSequence, throughSequence, messageId) {
+		return (yield* orchestrationEngine.readEvents(afterSequence, throughSequence - afterSequence, { eventTypes: ["thread.turn-start-requested"] }).pipe(Stream.takeWhile((event) => event.sequence <= throughSequence), Stream.filter((event) => event.type === "thread.turn-start-requested" && event.payload.messageId === messageId), Stream.take(1), Stream.runCollect)).length > 0;
+	});
 	/** Starts one watcher turn for the open gate and advances the pair cursor. */
 	const wakeWatcherForGate = Effect.fn("FusionWatcherReactor.wakeWatcherForGate")(function* (event) {
 		const gate = event.payload.gate;
@@ -134951,8 +136275,26 @@ const make$3 = Effect.gen(function* () {
 		const { readModel, activePairs } = yield* readPairs;
 		const pair = activePairs.find((candidate) => candidate.id === event.payload.pairId);
 		if (pair === void 0) return;
+		if (pair.reviewExperiment && (pair.activeGate?.id !== gate.id || pair.activeGate.state !== "awaiting-watcher" || pair.activeGate.round !== gate.round)) return;
 		const watcher = readModel.threads.find((thread) => thread.id === pair.watcherThreadId && thread.deletedAt === null);
 		if (watcher === void 0) return;
+		const budgetBlock = fusionBudgetBlock(pair, watcher.id, FUSION_GATE_PROMPT_PREFIX);
+		if (budgetBlock && !(yield* wakeWasRequested(event.sequence, readModel.snapshotSequence, gateMessageId(gate.id, gate.round)))) {
+			yield* orchestrationEngine.dispatch({
+				type: "thread-pair.gate.advance",
+				commandId: gateCommandId(pair.id, gate.id, `budget:${gate.round}`),
+				pairId: pair.id,
+				gateId: gate.id,
+				transition: "escalate",
+				advancedAt: gate.updatedAt
+			});
+			yield* pauseFusionBudget({
+				pair,
+				reason: budgetBlock,
+				createdAt: gate.updatedAt
+			});
+			return;
+		}
 		yield* orchestrationEngine.dispatch({
 			type: "thread.turn.start",
 			commandId: gateCommandId(pair.id, gate.id, `wake:${gate.round}`),
@@ -134965,9 +136307,10 @@ const make$3 = Effect.gen(function* () {
 					gate,
 					roundCap: pair.roundCap,
 					gateTimeoutMs: pair.gateTimeoutMs,
+					failClosed: pair.reviewExperiment != null,
 					afterSequence: pair.lastReviewedImplementerSequence,
 					throughSequence: event.sequence
-				}),
+				}) + "\n\n" + fusionReviewPolicyInstructions(pair.reviewExperiment),
 				attachments: []
 			},
 			runtimeMode: watcher.runtimeMode,
@@ -135301,6 +136644,15 @@ const make$3 = Effect.gen(function* () {
 			implementerSequence: completion.sequence,
 			advancedAt: completion.occurredAt
 		});
+		const budgetBlock = fusionBudgetBlock(currentPair, watcher.id, FUSION_REVIEW_PROMPT_PREFIX);
+		if (budgetBlock && !(yield* wakeWasRequested(completion.sequence, readModel.snapshotSequence, reviewMessageId(currentPair.id, completion.sequence)))) {
+			yield* pauseFusionBudget({
+				pair: currentPair,
+				reason: budgetBlock,
+				createdAt: completion.occurredAt
+			});
+			return;
+		}
 		const idleCycles = turn.startedByAdvice && !turn.humanMessage && !turn.ranTools ? (idleAdviceCycles.get(currentPair.id) ?? 0) + 1 : 0;
 		idleAdviceCycles.set(currentPair.id, idleCycles);
 		if (idleCycles >= 3) {
@@ -135324,7 +136676,7 @@ const make$3 = Effect.gen(function* () {
 					implementerThreadId: currentPair.implementerThreadId,
 					afterSequence: currentPair.lastReviewedImplementerSequence,
 					throughSequence: completion.sequence
-				}),
+				}) + "\n\n" + fusionReviewPolicyInstructions(currentPair.reviewExperiment),
 				attachments: []
 			},
 			runtimeMode: watcher.runtimeMode,
@@ -135378,6 +136730,7 @@ const make$3 = Effect.gen(function* () {
 			});
 			completions = completions.filter((completion) => completion !== activationCompletion);
 		}
+		if (pair.reviewExperiment) completions = completions.filter((completion) => completion.payload.state === "completed").slice(-1);
 		let boundary = activationCompletion?.sequence ?? pair.lastReviewedImplementerSequence;
 		for (const completion of completions.filter((candidate) => candidate.payload.state === "completed")) {
 			const turn = describeBuilderTurn({
@@ -135425,6 +136778,17 @@ const make$3 = Effect.gen(function* () {
 			if (gate.awaitingWatcherSince === null) continue;
 			const since = Date.parse(gate.awaitingWatcherSince);
 			if (Number.isNaN(since) || nowMillis - since < pair.gateTimeoutMs) continue;
+			if (pair.reviewExperiment) {
+				yield* orchestrationEngine.dispatch({
+					type: "thread-pair.gate.advance",
+					commandId: gateCommandId(pair.id, gate.id, `timeout-escalate:${gate.round}`),
+					pairId: pair.id,
+					gateId: gate.id,
+					transition: "escalate",
+					advancedAt: DateTime.formatIso(now)
+				});
+				continue;
+			}
 			yield* orchestrationEngine.dispatch({
 				type: "thread-pair.gate.resolve",
 				commandId: gateCommandId(pair.id, gate.id, `timeout:${gate.round}`),
@@ -136441,7 +137805,7 @@ const ObservabilityLive = Layer.unwrap(Effect.gen(function* () {
 			sink,
 			...delegate ? { delegate } : {}
 		});
-		return Layer.mergeAll(Layer.succeed(Tracer.Tracer, tracer), layer$61(sink));
+		return Layer.mergeAll(Layer.succeed(Tracer.Tracer, tracer), layer$62(sink));
 	})).pipe(Layer.provide(OtlpExporter.layerFlusher), Layer.provideMerge(otlpSerializationLayer));
 	const metricsLayer = config.otlpMetricsUrl === void 0 ? Layer.empty : OtlpMetrics.layer({
 		url: config.otlpMetricsUrl,
@@ -136813,31 +138177,31 @@ const PlatformServicesLive = Layer.unwrap(Effect.gen(function* () {
 	}
 }));
 const ReactorLayerLive = Layer.empty.pipe(Layer.provideMerge(OrchestrationReactorLive), Layer.provideMerge(ProviderRuntimeIngestionLive), Layer.provideMerge(ProviderCommandReactorLive), Layer.provideMerge(CheckpointReactorLive), Layer.provideMerge(ThreadDeletionReactorLive), Layer.provideMerge(FusionWatcherReactorLive), Layer.provideMerge(ScheduledTaskReactorLive), Layer.provideMerge(ThreadCompletionReactorLive), Layer.provideMerge(PullRequestSyncReactorLive), Layer.provideMerge(RuntimeReceiptBusLive));
-const ProviderSessionDirectoryLayerLive = ProviderSessionDirectoryLive.pipe(Layer.provide(layer$6));
+const ProviderSessionDirectoryLayerLive = ProviderSessionDirectoryLive.pipe(Layer.provide(layer$7));
 const ProviderLayerLive = ProviderServiceLive.pipe(Layer.provide(ProviderAdapterRegistryLive), Layer.provideMerge(ProviderSessionDirectoryLayerLive));
 const PersistenceLayerLive = Layer.empty.pipe(Layer.provideMerge(layerConfig));
-const VcsDriverRegistryLayerLive = layer$47.pipe(Layer.provide(layer$48));
-const SourceControlProviderRegistryLayerLive = layer$33.pipe(Layer.provide(Layer.mergeAll(layer$41, layer$39, layer$37, layer$35)), Layer.provideMerge(layer$49), Layer.provideMerge(VcsDriverRegistryLayerLive));
-const GitManagerLayerLive = layer$32.pipe(Layer.provideMerge(layer$42), Layer.provideMerge(layer$49), Layer.provideMerge(SourceControlProviderRegistryLayerLive), Layer.provideMerge(layer$58));
-const GitLayerLive = Layer.empty.pipe(Layer.provideMerge(GitManagerLayerLive), Layer.provideMerge(layer$49));
-const GitWorkflowLayerLive = layer$31.pipe(Layer.provideMerge(VcsDriverRegistryLayerLive), Layer.provideMerge(GitLayerLive));
-const SourceControlRepositoryServiceLayerLive = layer$7.pipe(Layer.provideMerge(layer$49), Layer.provideMerge(SourceControlProviderRegistryLayerLive));
-const ReviewLayerLive = layer$12.pipe(Layer.provideMerge(layer$49), Layer.provideMerge(VcsDriverRegistryLayerLive));
-const VcsLayerLive = Layer.empty.pipe(Layer.provideMerge(layer$48), Layer.provideMerge(VcsDriverRegistryLayerLive), Layer.provideMerge(layer$13.pipe(Layer.provide(VcsDriverRegistryLayerLive))), Layer.provideMerge(GitWorkflowLayerLive), Layer.provideMerge(ReviewLayerLive), Layer.provideMerge(SourceControlRepositoryServiceLayerLive), Layer.provideMerge(layer$14.pipe(Layer.provide(autoPullPolicyLayer), Layer.provide(GitWorkflowLayerLive))));
-const PullRequestServiceLive = layer$25.pipe(Layer.provide(layer$26), Layer.provide(SourceControlProviderRegistryLayerLive), Layer.provide(layer$50));
-const CheckpointingLayerLive = Layer.empty.pipe(Layer.provideMerge(layer$45), Layer.provideMerge(layer$46.pipe(Layer.provide(VcsDriverRegistryLayerLive))));
-const PortScannerLayerLive = layer$44.pipe(Layer.provide(layer$81));
-const TerminalLayerLive = layer$43.pipe(Layer.provide(PtyAdapterLive), Layer.provide(PortScannerLayerLive));
-const PreviewLayerLive = Layer.empty.pipe(Layer.provideMerge(layer$18), Layer.provideMerge(PortScannerLayerLive));
-const WorkspaceEntriesLayerLive = layer$16.pipe(Layer.provide(layer$68));
-const WorkspaceFileSystemLayerLive = layer$15.pipe(Layer.provide(layer$68), Layer.provide(WorkspaceEntriesLayerLive));
+const VcsDriverRegistryLayerLive = layer$48.pipe(Layer.provide(layer$49));
+const SourceControlProviderRegistryLayerLive = layer$34.pipe(Layer.provide(Layer.mergeAll(layer$42, layer$40, layer$38, layer$36)), Layer.provideMerge(layer$50), Layer.provideMerge(VcsDriverRegistryLayerLive));
+const GitManagerLayerLive = layer$33.pipe(Layer.provideMerge(layer$43), Layer.provideMerge(layer$50), Layer.provideMerge(SourceControlProviderRegistryLayerLive), Layer.provideMerge(layer$59));
+const GitLayerLive = Layer.empty.pipe(Layer.provideMerge(GitManagerLayerLive), Layer.provideMerge(layer$50));
+const GitWorkflowLayerLive = layer$32.pipe(Layer.provideMerge(VcsDriverRegistryLayerLive), Layer.provideMerge(GitLayerLive));
+const SourceControlRepositoryServiceLayerLive = layer$8.pipe(Layer.provideMerge(layer$50), Layer.provideMerge(SourceControlProviderRegistryLayerLive));
+const ReviewLayerLive = layer$13.pipe(Layer.provideMerge(layer$50), Layer.provideMerge(VcsDriverRegistryLayerLive));
+const VcsLayerLive = Layer.empty.pipe(Layer.provideMerge(layer$49), Layer.provideMerge(VcsDriverRegistryLayerLive), Layer.provideMerge(layer$14.pipe(Layer.provide(VcsDriverRegistryLayerLive))), Layer.provideMerge(GitWorkflowLayerLive), Layer.provideMerge(ReviewLayerLive), Layer.provideMerge(SourceControlRepositoryServiceLayerLive), Layer.provideMerge(layer$15.pipe(Layer.provide(autoPullPolicyLayer), Layer.provide(GitWorkflowLayerLive))));
+const PullRequestServiceLive = layer$26.pipe(Layer.provide(layer$27), Layer.provide(SourceControlProviderRegistryLayerLive), Layer.provide(layer$51));
+const CheckpointingLayerLive = Layer.empty.pipe(Layer.provideMerge(layer$46), Layer.provideMerge(layer$47.pipe(Layer.provide(VcsDriverRegistryLayerLive))));
+const PortScannerLayerLive = layer$45.pipe(Layer.provide(layer$82));
+const TerminalLayerLive = layer$44.pipe(Layer.provide(PtyAdapterLive), Layer.provide(PortScannerLayerLive));
+const PreviewLayerLive = Layer.empty.pipe(Layer.provideMerge(layer$19), Layer.provideMerge(PortScannerLayerLive));
+const WorkspaceEntriesLayerLive = layer$17.pipe(Layer.provide(layer$68));
+const WorkspaceFileSystemLayerLive = layer$16.pipe(Layer.provide(layer$68), Layer.provide(WorkspaceEntriesLayerLive));
 const WorkspaceLayerLive = Layer.mergeAll(layer$68, WorkspaceEntriesLayerLive, WorkspaceFileSystemLayerLive);
-const ProjectFaviconResolverLayerLive = layer$62.pipe(Layer.provide(layer$68), Layer.provide(layer$63));
-const AuthLayerLive = layer$110.pipe(Layer.provideMerge(PersistenceLayerLive), Layer.provide(layer$114));
+const ProjectFaviconResolverLayerLive = layer$63.pipe(Layer.provide(layer$68), Layer.provide(layer$64));
+const AuthLayerLive = layer$111.pipe(Layer.provideMerge(PersistenceLayerLive), Layer.provide(layer$115));
 const ProviderRuntimeLayerLive = ProviderSessionReaperLive.pipe(Layer.provideMerge(ProviderLayerLive), Layer.provideMerge(OrchestrationLayerLive));
-const RuntimeCoreDependenciesLive = ReactorLayerLive.pipe(Layer.provideMerge(layer$24), Layer.provideMerge(Layer.mergeAll(PullRequestServiceLive, CheckpointingLayerLive, SourceControlProviderRegistryLayerLive)), Layer.provideMerge(GitLayerLive), Layer.provideMerge(VcsLayerLive), Layer.provideMerge(ProviderAuthServiceLive), Layer.provideMerge(ProviderRuntimeLayerLive), Layer.provideMerge(Layer.mergeAll(TerminalLayerLive, PreviewLayerLive, RoutedTaskRepositoryLive)), Layer.provideMerge(Layer.mergeAll(PersistenceLayerLive, layer$85)), Layer.provideMerge(layer$79), Layer.provideMerge(ProviderRegistryLive), Layer.provideMerge(layer$57), Layer.provideMerge(Layer.mergeAll(layer$56, layer$70.pipe(Layer.provide(layer$81)), layer$66, layer$67)), Layer.provideMerge(layer$51), Layer.provideMerge(layer$52), Layer.provideMerge(layer$53), Layer.provideMerge(layer$54), Layer.provideMerge(layer$55)).pipe(Layer.provideMerge(ProviderInstanceRegistryHydrationLive), Layer.provideMerge(AntigravityInstallation.layer), Layer.provideMerge(ProviderEventLoggersLive), Layer.provideMerge(OpenCodeRuntimeLive), Layer.provideMerge(layer$59), Layer.provideMerge(layer$89.pipe(Layer.provide(layer$114))), Layer.provideMerge(WorkspaceLayerLive), Layer.provideMerge(ProjectFaviconResolverLayerLive), Layer.provideMerge(layer$80), Layer.provideMerge(layer$65), Layer.provideMerge(remoteComputerUseBindingsLayer.pipe(Layer.provide(layer$85))), Layer.provideMerge(layer$73), Layer.provideMerge(AuthLayerLive), Layer.provideMerge(layer$4.pipe(Layer.provideMerge(LinearClientLive), Layer.provideMerge(Layer.mergeAll(LinearMcpClientLive, TrackerSecretsLive)), Layer.provideMerge(Layer.mergeAll(layer$86, layer$20).pipe(Layer.provideMerge(layer$87), Layer.provideMerge(layer$88))))), Layer.provideMerge(layer$114));
-const UsageLayerLive = layer$22.pipe(Layer.provide(layer$89.pipe(Layer.provide(layer$114))));
-const RuntimeDependenciesLive = layer$21.pipe(Layer.provideMerge(RuntimeCoreDependenciesLive)).pipe(Layer.provideMerge(UsageLayerLive), Layer.provideMerge(layer$11), Layer.provideMerge(layer$10), Layer.provideMerge(layer$9), Layer.provideMerge(layer$76), Layer.provideMerge(layer$78), Layer.provideMerge(layer$77), Layer.provide(layer$118));
+const RuntimeCoreDependenciesLive = ReactorLayerLive.pipe(Layer.provideMerge(layer$25), Layer.provideMerge(Layer.mergeAll(PullRequestServiceLive, CheckpointingLayerLive, SourceControlProviderRegistryLayerLive)), Layer.provideMerge(GitLayerLive), Layer.provideMerge(VcsLayerLive), Layer.provideMerge(ProviderAuthServiceLive), Layer.provideMerge(ProviderRuntimeLayerLive), Layer.provideMerge(Layer.mergeAll(TerminalLayerLive, PreviewLayerLive, RoutedTaskRepositoryLive)), Layer.provideMerge(Layer.mergeAll(PersistenceLayerLive, layer$86)), Layer.provideMerge(layer$80), Layer.provideMerge(ProviderRegistryLive), Layer.provideMerge(layer$58), Layer.provideMerge(Layer.mergeAll(layer$57, layer$70.pipe(Layer.provide(layer$82)), layer$72, layer$67)), Layer.provideMerge(layer$52), Layer.provideMerge(layer$53), Layer.provideMerge(layer$54), Layer.provideMerge(layer$55), Layer.provideMerge(layer$56)).pipe(Layer.provideMerge(ProviderInstanceRegistryHydrationLive), Layer.provideMerge(AntigravityInstallation.layer), Layer.provideMerge(ProviderEventLoggersLive), Layer.provideMerge(OpenCodeRuntimeLive), Layer.provideMerge(layer$60), Layer.provideMerge(layer$90.pipe(Layer.provide(layer$115))), Layer.provideMerge(WorkspaceLayerLive), Layer.provideMerge(ProjectFaviconResolverLayerLive), Layer.provideMerge(layer$81), Layer.provideMerge(layer$66), Layer.provideMerge(remoteComputerUseBindingsLayer.pipe(Layer.provide(layer$86))), Layer.provideMerge(layer$74), Layer.provideMerge(AuthLayerLive), Layer.provideMerge(layer$5.pipe(Layer.provideMerge(LinearClientLive), Layer.provideMerge(Layer.mergeAll(LinearMcpClientLive, TrackerSecretsLive)), Layer.provideMerge(Layer.mergeAll(layer$87, layer$21).pipe(Layer.provideMerge(layer$88), Layer.provideMerge(layer$89))))), Layer.provideMerge(layer$115));
+const UsageLayerLive = layer$23.pipe(Layer.provide(layer$90.pipe(Layer.provide(layer$115))));
+const RuntimeDependenciesLive = layer$22.pipe(Layer.provideMerge(RuntimeCoreDependenciesLive)).pipe(Layer.provideMerge(UsageLayerLive), Layer.provideMerge(layer$12), Layer.provideMerge(layer$11), Layer.provideMerge(layer$10), Layer.provideMerge(layer$77), Layer.provideMerge(layer$79), Layer.provideMerge(layer$78), Layer.provide(layer$119));
 /**
 * Hub asset sync.
 *
@@ -136845,9 +138209,9 @@ const RuntimeDependenciesLive = layer$21.pipe(Layer.provideMerge(RuntimeCoreDepe
 * not-configured shape, and every call reports that rather than failing — so
 * this costs a server with no hub nothing but a layer.
 */
-const AssetSyncLive = layer$83.pipe(Layer.provideMerge(layer$84), Layer.provideMerge(layer$85));
-const RuntimeServicesLive = layer$69.pipe(Layer.provideMerge(AssetSyncLive), Layer.provideMerge(RuntimeDependenciesLive));
-const makeRoutesLayer = Layer.mergeAll(Layer.mergeAll(HttpApiBuilder.layer(EnvironmentHttpApi).pipe(Layer.provide(authHttpApiLayer), Layer.provide(orchestrationHttpApiLayer), Layer.provide(pullRequestHttpApiLayer), Layer.provide(serverEnvironmentHttpApiLayer), Layer.provide(environmentAuthenticatedAuthLayer)), otlpTracesProxyRouteLayer, assetRouteLayer, mcpOAuthCallbackRouteLayer, staticAndDevRouteLayer, websocketRpcRouteLayer), layer$3.pipe(Layer.provide(layer$5)), layer$64, layer).pipe(Layer.provide(ProjectionProjectRepositoryLive.pipe(Layer.provide(PersistenceLayerLive))), Layer.provide(ProjectionThreadRepositoryLive.pipe(Layer.provide(PersistenceLayerLive))), Layer.provide(layer$63), Layer.provide(layer$24), Layer.provide(PullRequestServiceLive), Layer.provide(layer$19), Layer.provide(layer$74), Layer.provide(browserApiCorsLayer), Layer.provide(httpCompressionLayer));
+const AssetSyncLive = layer$84.pipe(Layer.provideMerge(layer$85), Layer.provideMerge(layer$86));
+const RuntimeServicesLive = layer$69.pipe(Layer.provideMerge(layer$1), Layer.provideMerge(AssetSyncLive), Layer.provideMerge(RuntimeDependenciesLive));
+const makeRoutesLayer = Layer.mergeAll(Layer.mergeAll(HttpApiBuilder.layer(EnvironmentHttpApi).pipe(Layer.provide(authHttpApiLayer), Layer.provide(orchestrationHttpApiLayer), Layer.provide(pullRequestHttpApiLayer), Layer.provide(serverEnvironmentHttpApiLayer), Layer.provide(environmentAuthenticatedAuthLayer)), otlpTracesProxyRouteLayer, assetRouteLayer, mcpOAuthCallbackRouteLayer, staticAndDevRouteLayer, websocketRpcRouteLayer), layer$4.pipe(Layer.provide(layer$6)), layer$65, layer).pipe(Layer.provide(ProjectionProjectRepositoryLive.pipe(Layer.provide(PersistenceLayerLive))), Layer.provide(ProjectionThreadRepositoryLive.pipe(Layer.provide(PersistenceLayerLive))), Layer.provide(layer$64), Layer.provide(layer$25), Layer.provide(PullRequestServiceLive), Layer.provide(layer$20), Layer.provide(layer$75), Layer.provide(browserApiCorsLayer), Layer.provide(httpCompressionLayer));
 const makeServerLayer = Layer.unwrap(Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	yield* fixPath();
@@ -136890,7 +138254,7 @@ const makeServerLayer = Layer.unwrap(Effect.gen(function* () {
 		cause,
 		servePort: configured.servePort
 	}))) : Effect.void)) : Layer.empty;
-	const fullyProvisionedServerLayer = Layer.mergeAll(HttpRouter.serve(makeRoutesLayer, { disableLogger: !config.logWebSocketEvents }), httpListeningLayer, runtimeStateLayer, tailscaleServeLayer, layer$1, layer$2).pipe(Layer.provideMerge(RuntimeServicesLive), Layer.provideMerge(HttpResponseCompressionLive), Layer.provideMerge(HttpServerLive), Layer.provide(ObservabilityLive), Layer.provideMerge(FetchHttpClient.layer), Layer.provideMerge(layer$50));
+	const fullyProvisionedServerLayer = Layer.mergeAll(HttpRouter.serve(makeRoutesLayer, { disableLogger: !config.logWebSocketEvents }), httpListeningLayer, runtimeStateLayer, tailscaleServeLayer, layer$2, layer$3).pipe(Layer.provideMerge(RuntimeServicesLive), Layer.provideMerge(HttpResponseCompressionLive), Layer.provideMerge(HttpServerLive), Layer.provide(ObservabilityLive), Layer.provideMerge(FetchHttpClient.layer), Layer.provideMerge(layer$51));
 	return Layer.unwrap(Effect.gen(function* () {
 		yield* acquireServerInstanceLock(config.stateDir);
 		return fullyProvisionedServerLayer;
@@ -137192,11 +138556,11 @@ function describeServiceUpdateState(state) {
 //#endregion
 //#region src/cli/service.ts
 const isBootServiceCommandError = Schema$1.is(BootServiceCommandError);
-const bootServiceLayer = (config) => layer$75({
+const bootServiceLayer = (config) => layer$76({
 	baseDir: config.baseDir,
 	logsDir: config.logsDir,
 	cliVersion: version$1
-}).pipe(Layer.provide(layer$81));
+}).pipe(Layer.provide(layer$82));
 /**
 * The update installed a build that never reported itself listening.
 *
@@ -137322,7 +138686,7 @@ const runServiceCommand = Effect.fn("cli.service.run")(function* (flags, run, pr
 	const baseDirNotice = yield* describeNonDefaultBaseDir(config.baseDir);
 	if (baseDirNotice !== null) yield* Console.error(baseDirNotice);
 	if (prepare !== void 0) yield* prepare(config);
-	return yield* run.pipe(Effect.tapError((error) => isBootServiceCommandError(error) ? BootService.pipe(Effect.flatMap((service) => Console.error(`Details: ${service.logPath}`))) : Effect.void), Effect.provide(Layer.mergeAll(bootServiceLayer(config), layer$81)));
+	return yield* run.pipe(Effect.tapError((error) => isBootServiceCommandError(error) ? BootService.pipe(Effect.flatMap((service) => Console.error(`Details: ${service.logPath}`))) : Effect.void), Effect.provide(Layer.mergeAll(bootServiceLayer(config), layer$82)));
 });
 /**
 * Options the installed unit carries, rather than ones this command consumes.
@@ -137489,7 +138853,7 @@ const serviceCommand = Command.make("service").pipe(Command.withDescription("Man
 ]));
 //#endregion
 //#region src/bin.ts
-const CliRuntimeLayer = Layer.mergeAll(NodeServices.layer, layer$118, FetchHttpClient.layer);
+const CliRuntimeLayer = Layer.mergeAll(NodeServices.layer, layer$119, FetchHttpClient.layer);
 /**
 * Prints an update reminder before dispatching, at most once a day.
 *