@p4code/cli 0.5.2 → 0.5.4

package/dist/bin.mjs

@@ -260,7 +260,7 @@ const make$115 = () => {
 const layer$118 = Layer.sync(NetService, make$115);
 //#endregion
 //#region package.json
-var version$1 = "0.5.2";
+var version$1 = "0.5.4";
 //#endregion
 //#region src/config.ts
 /**
@@ -9806,6 +9806,7 @@ const FusionModelPair = Schema$1.Struct({
 	supervisor: ModelSelection
 });
 const ClientSettingsSchema = Schema$1.Struct({
+	fusionHiddenSuggestionKeys: Schema$1.Array(Schema$1.String).pipe(Schema$1.withDecodingDefault(Effect.succeed([]))),
 	fusionPairOrder: Schema$1.Record(Schema$1.String, Schema$1.Array(Schema$1.String)).pipe(Schema$1.withDecodingDefault(Effect.succeed({}))),
 	fusionRecentPairs: Schema$1.Array(FusionModelPair).pipe(Schema$1.withDecodingDefault(Effect.succeed([]))),
 	fusionFavoritePairs: Schema$1.Array(FusionModelPair).pipe(Schema$1.withDecodingDefault(Effect.succeed([]))),
@@ -10399,6 +10400,7 @@ const ServerSettingsPatch = Schema$1.Struct({
 	providerInstances: Schema$1.optionalKey(Schema$1.Record(ProviderInstanceId, ProviderInstanceConfig))
 });
 Schema$1.Struct({
+	fusionHiddenSuggestionKeys: Schema$1.optionalKey(Schema$1.Array(Schema$1.String)),
 	fusionPairOrder: Schema$1.optionalKey(Schema$1.Record(Schema$1.String, Schema$1.Array(Schema$1.String))),
 	fusionRecentPairs: Schema$1.optionalKey(Schema$1.Array(FusionModelPair)),
 	fusionFavoritePairs: Schema$1.optionalKey(Schema$1.Array(FusionModelPair)),
@@ -11777,6 +11779,13 @@ const ThreadPairCreateResult = Schema$1.Struct({
 	watcherThreadId: ThreadId,
 	continuationMessageId: MessageId
 });
+const ThreadPairDetachInput = Schema$1.Struct({ pairId: ThreadPairId.annotate({ description: "The active Fusion pair to detach. This session must be its implementer and must have created its watcher with thread_spawn." }) });
+const ThreadPairDetachResult = Schema$1.Struct({
+	pairId: ThreadPairId,
+	implementerThreadId: ThreadId,
+	watcherThreadId: ThreadId,
+	detachedAt: IsoDateTime
+});
 const ThreadConfigureInput = Schema$1.Struct({
 	threadId: ControlTargetThreadId,
 	title: Schema$1.optional(TrimmedNonEmptyString),
@@ -13335,6 +13344,30 @@ var ProviderSetupError = class extends Schema$1.TaggedErrorClass()("ProviderSetu
 	}
 };
 //#endregion
+//#region ../../packages/contracts/src/deviceCommand.ts
+const MAX_COORDINATE = 32768;
+const MAX_TEXT_LENGTH = 4096;
+const target = {
+	hostId: DeviceHostId,
+	deviceId: DeviceId
+};
+const Coordinate = Schema$1.Int.check(Schema$1.isBetween({
+	minimum: 0,
+	maximum: MAX_COORDINATE
+}));
+/** Deliberately excludes arbitrary commands, flags, paths and daemon configuration. */
+const DeviceCommandInput = Schema$1.Union([Schema$1.Struct({
+	...target,
+	command: Schema$1.Literal("press"),
+	x: Coordinate,
+	y: Coordinate
+}), Schema$1.Struct({
+	...target,
+	command: Schema$1.Literal("type"),
+	text: Schema$1.String.check(Schema$1.isMinLength(1), Schema$1.isMaxLength(MAX_TEXT_LENGTH))
+})]);
+const DeviceCommandResult = Schema$1.Struct({ ok: Schema$1.Literal(true) });
+//#endregion
 //#region ../../packages/contracts/src/computerUse.ts
 const COMPUTER_USE_MAX_CODE_CHARS = 1e5;
 const COMPUTER_USE_MAX_TIMEOUT_MS = 6e4;
@@ -13374,9 +13407,36 @@ const ComputerUseJsInput = Schema$1.Struct({
 	title: Schema$1.optional(Schema$1.String.check(Schema$1.isMaxLength(COMPUTER_USE_MAX_TITLE_CHARS))),
 	timeout_ms: Schema$1.optional(Schema$1.Int.check(Schema$1.isGreaterThan(0), Schema$1.isLessThanOrEqualTo(COMPUTER_USE_MAX_TIMEOUT_MS)))
 });
+const COMPUTER_USE_PREVIEW_MAX_IMAGE_CHARS = 5e5;
+const ComputerUseLogicalSize = Schema$1.Struct({
+	width: Schema$1.Number.check(Schema$1.isGreaterThan(0)),
+	height: Schema$1.Number.check(Schema$1.isGreaterThan(0))
+});
+const ComputerUsePreviewFrame = Schema$1.Struct({
+	appName: Schema$1.String,
+	windowId: Schema$1.String,
+	sequence: Schema$1.Int,
+	image: Schema$1.optional(Schema$1.Struct({
+		mimeType: Schema$1.Literal("image/jpeg"),
+		data: Schema$1.String.check(Schema$1.isMaxLength(COMPUTER_USE_PREVIEW_MAX_IMAGE_CHARS))
+	})),
+	logicalSize: Schema$1.optional(ComputerUseLogicalSize),
+	pointer: Schema$1.optional(Schema$1.Struct({
+		x: Schema$1.Number,
+		y: Schema$1.Number,
+		sequence: Schema$1.Int
+	})),
+	error: Schema$1.optional(Schema$1.String)
+});
+const ComputerUsePreview = Schema$1.Struct({
+	session: ComputerUseSession,
+	host: ComputerUseHost,
+	frame: ComputerUsePreviewFrame
+});
 const ComputerUseOutput = Schema$1.Struct({
 	text: Schema$1.String.check(Schema$1.isMaxLength(COMPUTER_USE_MAX_OUTPUT_CHARS)),
 	truncated: Schema$1.Boolean,
+	preview: Schema$1.optional(ComputerUsePreviewFrame),
 	images: Schema$1.optional(Schema$1.Array(Schema$1.Struct({
 		mimeType: Schema$1.Literals(["image/png", "image/jpeg"]),
 		data: Schema$1.String.check(Schema$1.isMaxLength(COMPUTER_USE_MAX_IMAGE_CHARS))
@@ -13392,7 +13452,8 @@ const ComputerUseHostRequest = Schema$1.Struct({
 		"js_reset",
 		"close",
 		"stop",
-		"resume"
+		"resume",
+		"preview"
 	]),
 	input: Schema$1.optional(ComputerUseJsInput)
 });
@@ -13439,6 +13500,26 @@ const ComputerUseHostResponse = Schema$1.Struct({
 		error: ComputerUseError
 	})])
 });
+const ComputerUseDeviceControl = Schema$1.Struct({
+	hostId: DeviceHostId,
+	deviceId: DeviceId,
+	platform: DevicePlatform,
+	leaseId: DeviceId,
+	name: Schema$1.String,
+	hostLabel: Schema$1.String,
+	logicalSize: Schema$1.optional(ComputerUseLogicalSize),
+	pointer: Schema$1.Struct({
+		x: Schema$1.Number.check(Schema$1.isBetween({
+			minimum: 0,
+			maximum: 1
+		})),
+		y: Schema$1.Number.check(Schema$1.isBetween({
+			minimum: 0,
+			maximum: 1
+		})),
+		sequence: Schema$1.Int
+	})
+});
 const ComputerUseHostReport = Schema$1.Struct({
 	hostId: TrimmedNonEmptyString,
 	connectionId: TrimmedNonEmptyString,
@@ -13447,7 +13528,9 @@ const ComputerUseHostReport = Schema$1.Struct({
 		"active",
 		"closed",
 		"stopped"
-	])
+	]),
+	previewApp: Schema$1.optional(Schema$1.String),
+	deviceControl: Schema$1.optional(Schema$1.NullOr(ComputerUseDeviceControl))
 });
 const ComputerUseControlState = Schema$1.Struct({
 	session: ComputerUseSession,
@@ -13457,7 +13540,9 @@ const ComputerUseControlState = Schema$1.Struct({
 		"stopping",
 		"stopped",
 		"stop-unconfirmed"
-	])
+	]),
+	previewApp: Schema$1.optional(Schema$1.String),
+	deviceControl: Schema$1.optional(Schema$1.NullOr(ComputerUseDeviceControl))
 });
 const ComputerUseControlInput = Schema$1.Struct({
 	threadId: ThreadId,
@@ -13480,6 +13565,51 @@ const ComputerUseSourceAttestation = Schema$1.Struct({
 	connectionId: TrimmedNonEmptyString,
 	expiresAt: Schema$1.Number
 });
+/** Device commands travel back to the environment through the live helper request lease. */
+const ComputerUseDeviceTarget = {
+	hostId: DeviceHostId,
+	deviceId: DeviceId,
+	leaseId: DeviceId
+};
+const ComputerUseDeviceOperation = Schema$1.Union([
+	Schema$1.Struct({ method: Schema$1.Literal("list") }),
+	Schema$1.Struct({
+		method: Schema$1.Literal("open"),
+		hostId: DeviceHostId,
+		deviceId: DeviceId,
+		platform: DevicePlatform
+	}),
+	Schema$1.Struct({
+		method: Schema$1.Literals([
+			"state",
+			"screenshot",
+			"close"
+		]),
+		...ComputerUseDeviceTarget
+	}),
+	Schema$1.Struct({
+		method: Schema$1.Literal("command"),
+		leaseId: DeviceId,
+		command: DeviceCommandInput
+	})
+]);
+const ComputerUseDeviceRequest = Schema$1.Struct({
+	hostId: TrimmedNonEmptyString,
+	connectionId: TrimmedNonEmptyString,
+	requestId: TrimmedNonEmptyString,
+	callId: TrimmedNonEmptyString,
+	operation: ComputerUseDeviceOperation
+});
+Schema$1.Struct({
+	callId: TrimmedNonEmptyString,
+	result: Schema$1.Union([Schema$1.Struct({
+		ok: Schema$1.Literal(true),
+		value: Schema$1.Unknown
+	}), Schema$1.Struct({
+		ok: Schema$1.Literal(false),
+		error: ComputerUseError
+	})])
+});
 //#endregion
 //#region ../../packages/contracts/src/rpc.ts
 const WS_METHODS = {
@@ -13524,6 +13654,7 @@ const WS_METHODS = {
 	computerUseList: "computerUse.list",
 	computerUseControls: "computerUse.controls",
 	computerUseControl: "computerUse.control",
+	computerUsePreview: "computerUse.preview",
 	computerUseRespond: "computerUse.respond",
 	previewAutomationConnect: "previewAutomation.connect",
 	previewAutomationRespond: "previewAutomation.respond",
@@ -14553,6 +14684,12 @@ const WsComputerUseControlsRpc = Rpc.make(WS_METHODS.computerUseControls, {
 	error: EnvironmentAuthorizationError,
 	stream: true
 });
+const WsComputerUsePreviewRpc = Rpc.make(WS_METHODS.computerUsePreview, {
+	payload: ComputerUseSession,
+	success: ComputerUsePreview,
+	error: Schema$1.Union([ComputerUseError, EnvironmentAuthorizationError]),
+	stream: true
+});
 const WsComputerUseControlRpc = Rpc.make(WS_METHODS.computerUseControl, {
 	payload: ComputerUseControlInput,
 	error: Schema$1.Union([ComputerUseError, EnvironmentAuthorizationError])
@@ -14663,31 +14800,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, 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/contracts/src/deviceCommand.ts
-const MAX_COORDINATE = 32768;
-const MAX_TEXT_LENGTH = 4096;
-const target = {
-	hostId: DeviceHostId,
-	deviceId: DeviceId
-};
-const Coordinate = Schema$1.Int.check(Schema$1.isBetween({
-	minimum: 0,
-	maximum: MAX_COORDINATE
-}));
-/** Deliberately excludes arbitrary commands, flags, paths and daemon configuration. */
-const DeviceCommandInput = Schema$1.Union([Schema$1.Struct({
-	...target,
-	command: Schema$1.Literal("press"),
-	x: Coordinate,
-	y: Coordinate
-}), Schema$1.Struct({
-	...target,
-	command: Schema$1.Literal("type"),
-	text: Schema$1.String.check(Schema$1.isMinLength(1), Schema$1.isMaxLength(MAX_TEXT_LENGTH))
-})]);
-const DeviceCommandResult = Schema$1.Struct({ ok: Schema$1.Literal(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);
 //#endregion
 //#region ../../packages/shared/src/oauthScope.ts
 const OAUTH_SCOPE_TOKEN = /^[\u0021\u0023-\u005b\u005d-\u007e]+$/u;
@@ -20381,7 +20494,7 @@ function resolveFdPath(fd, platform) {
 const modeFlag = Flag.choice("mode", RuntimeMode$1.literals).pipe(Flag.withDescription("Runtime mode. `desktop` keeps loopback defaults unless overridden."), Flag.optional);
 const portFlag$1 = Flag.integer("port").pipe(Flag.withSchema(PortSchema), Flag.withDescription("Port for the HTTP/WebSocket server."), Flag.optional);
 const hostFlag$1 = Flag.string("host").pipe(Flag.withDescription("Host/interface to bind (for example 127.0.0.1, 0.0.0.0, or a Tailnet IP)."), Flag.optional);
-const baseDirFlag$1 = Flag.string("base-dir").pipe(Flag.withDescription("Explicit P4Code data directory; runtime state is stored under userdata (equivalent to P4CODE_HOME)."), Flag.optional);
+const baseDirFlag$1 = Flag.string("base-dir").pipe(Flag.withDescription("Explicit P4 Code data directory; runtime state is stored under userdata (equivalent to P4CODE_HOME)."), Flag.optional);
 const devUrlFlag = Flag.string("dev-url").pipe(Flag.withSchema(Schema$1.URLFromString), Flag.withDescription("Dev web URL to proxy/redirect to (equivalent to VITE_DEV_SERVER_URL)."), Flag.optional);
 const noBrowserFlag = Flag.boolean("no-browser").pipe(Flag.withDescription("Disable automatic browser opening."), Flag.optional);
 const bootstrapFdFlag = Flag.integer("bootstrap-fd").pipe(Flag.withSchema(Schema$1.Int), Flag.withDescription("Read one-time bootstrap secrets from the given file descriptor."), Flag.optional);
@@ -21597,7 +21710,7 @@ const renderTerminalQrCode = (value, margin = 2) => {
 	return rows.join("\n");
 };
 const formatHeadlessServeOutput = (accessInfo) => [
-	"P4Code server is ready.",
+	"P4 Code server is ready.",
 	`Connection string: ${accessInfo.connectionString}`,
 	`Token: ${accessInfo.token}`,
 	`Pairing URL: ${accessInfo.pairingUrl}`,
@@ -27810,7 +27923,7 @@ const announce = Layer.effectDiscard(Effect.gen(function* () {
 	const config = yield* HubConfig;
 	const address = (yield* HttpServer.HttpServer).address;
 	const port = address._tag === "TcpAddress" ? address.port : config.port;
-	yield* Effect.log("P4Code hub listening", {
+	yield* Effect.log("P4 Code hub listening", {
 		host: config.host,
 		port,
 		dbPath: config.dbPath,
@@ -32627,7 +32740,7 @@ const resolveHubPaths = Effect.fn("resolveHubPaths")(function* (baseDirFlag) {
 		tokensPath: path.join(hubDir, "tokens.json")
 	};
 });
-const baseDirFlag = Flag.string("base-dir").pipe(Flag.withDescription("Base directory for hub state. Defaults to the P4Code home directory."), Flag.optional);
+const baseDirFlag = Flag.string("base-dir").pipe(Flag.withDescription("Base directory for hub state. Defaults to the P4 Code home directory."), Flag.optional);
 const hostFlag = Flag.string("host").pipe(Flag.withDescription("Interface to bind. Defaults to 127.0.0.1; pass a Tailnet address to expose the hub to your other machines."), Flag.optional);
 const portFlag = Flag.integer("port").pipe(Flag.withDescription("Port for the hub HTTP server."), Flag.optional);
 const labelFlag = Flag.string("label").pipe(Flag.withDescription("Name of the server this token is for, for example `studio`."));
@@ -32635,7 +32748,7 @@ const serveHubCommand = Command.make("serve", {
 	baseDir: baseDirFlag,
 	host: hostFlag,
 	port: portFlag
-}).pipe(Command.withDescription("Run the P4Code hub: the shared task board for all of your servers."), Command.withHandler((flags) => Effect.gen(function* () {
+}).pipe(Command.withDescription("Run the P4 Code hub: the shared task board for all of your servers."), Command.withHandler((flags) => Effect.gen(function* () {
 	const env = yield* HostProcessEnvironment;
 	const paths = yield* resolveHubPaths(flags.baseDir);
 	const tokenFile = yield* readHubTokenFile(paths.tokensPath);
@@ -32723,7 +32836,7 @@ const tokenCommand = Command.make("token", {}).pipe(Command.withDescription("Man
 	listTokensCommand,
 	revokeTokenCommand
 ]));
-const hubCommand = Command.make("hub", {}).pipe(Command.withDescription("Run and manage the P4Code hub."), Command.withSubcommands([
+const hubCommand = Command.make("hub", {}).pipe(Command.withDescription("Run and manage the P4 Code hub."), Command.withSubcommands([
 	serveHubCommand,
 	tokenCommand,
 	...hubLinkCommands
@@ -43864,7 +43977,7 @@ function quoteSystemdValue(value) {
 function renderBootServiceUnit(plan) {
 	return [
 		"[Unit]",
-		"Description=P4Code server",
+		"Description=P4 Code server",
 		"StartLimitIntervalSec=300",
 		"StartLimitBurst=5",
 		"",
@@ -43971,7 +44084,7 @@ function formatCommandInvocation(command, args) {
 }
 var BootServiceInstallError = class extends Schema$1.TaggedErrorClass()("BootServiceInstallError", { cause: Schema$1.Defect() }) {
 	get message() {
-		return "Could not set up the P4Code background service.";
+		return "Could not set up the P4 Code background service.";
 	}
 };
 var BootService = class extends Context.Service()("@p4code/cli/service/bootService") {};
@@ -44328,7 +44441,7 @@ const make$89 = Effect.fn("cloud.server_self_update.make")(function* (options) {
 		contents
 	}).pipe(Effect.provideService(FileSystem.FileSystem, fs), Effect.provideService(Path$1.Path, path));
 	const update = Effect.fn("cloud.server_self_update.update")(function* (input) {
-		if (capability === "desktop-managed") return yield* failWith("This server is managed by the P4Code desktop app on its machine; update the desktop app to update it.");
+		if (capability === "desktop-managed") return yield* failWith("This server is managed by the P4 Code desktop app on its machine; update the desktop app to update it.");
 		if (capability === null) return yield* failWith("This server cannot update itself; relaunch it manually with the new version.");
 		const activeMethod = capability;
 		const targetVersion = input.targetVersion.trim();
@@ -44944,6 +45057,7 @@ const startDeviceHub = Effect.fn("DeviceHubProcess.start")(function* (input) {
 			String(port),
 			"--host",
 			LOOPBACK_HOST,
+			...input.platform ? ["--platform", input.platform] : [],
 			"--hide-sidebar",
 			"--hide-boot-device"
 		], {
@@ -45694,6 +45808,11 @@ const deviceHostEnvironment = (environment, sdkRoot, hostPlatform, path) => {
 		].join(hostPlatform === "win32" ? ";" : ":")
 	} : environment;
 };
+/** Unavailable Android tooling must not turn a valid iOS inventory into a partial failure. */
+function deviceHubPlatform(platforms) {
+	const available = platforms.filter((platform) => platform.available);
+	return available.length === 1 ? available[0].platform : void 0;
+}
 //#endregion
 //#region src/device/LocalDeviceHost.ts
 const COMMAND_TIMEOUT_MS$1 = 2e4;
@@ -45767,9 +45886,11 @@ const make$81 = Effect.fn("LocalDeviceHost.make")(function* () {
 			cause
 		})));
 		yield* onPhase("starting");
+		const hubPlatform = deviceHubPlatform(yield* Effect.all([platformAvailability("ios"), platformAvailability("android")]));
 		const started = yield* startDeviceHub({
 			tool,
-			environment: hostEnvironment
+			environment: hostEnvironment,
+			...hubPlatform ? { platform: hubPlatform } : {}
 		}).pipe(Effect.provideService(NetService, net), Effect.provideService(ChildProcessSpawner$1.ChildProcessSpawner, spawner), Effect.provideService(HttpClient.HttpClient, http), Effect.provideService(Scope.Scope, scope));
 		hub = started;
 		const dist = path.join(tool.installDir, "node_modules", "expo-device-hub", "vendor", "serve-sim", "dist");
@@ -47527,7 +47648,7 @@ const make$78 = Effect.gen(function* () {
 		} else {
 			yield* Effect.logDebug("startup phase: browser open check");
 			const startupBrowserTarget = yield* resolveStartupBrowserTarget;
-			if (serverConfig.mode !== "desktop") yield* Effect.logInfo("Authentication required. Open P4Code using the pairing URL.").pipe(Effect.annotateLogs({ pairingUrl: startupBrowserTarget }));
+			if (serverConfig.mode !== "desktop") yield* Effect.logInfo("Authentication required. Open P4 Code using the pairing URL.").pipe(Effect.annotateLogs({ pairingUrl: startupBrowserTarget }));
 			yield* runStartupPhase("browser.open", maybeOpenBrowser(startupBrowserTarget));
 		}
 		yield* Effect.logDebug("startup phase: complete");
@@ -52173,7 +52294,7 @@ const prepareAntigravityProfile = Effect.fn("prepareAntigravityProfile")(functio
 		"--",
 		"%s"
 	].map(quoteBrowserArgument).join(" ");
-	if (browserCommand.includes(platform === "win32" ? ";" : ":") || helperExecutable.includes("\r") || helperExecutable.includes("\n") || helperExecutable.includes("\0") || helperExecutable.includes("%s")) return yield* authSupportError("The P4Code runtime path cannot be used to suppress Antigravity browser launches.");
+	if (browserCommand.includes(platform === "win32" ? ";" : ":") || helperExecutable.includes("\r") || helperExecutable.includes("\n") || helperExecutable.includes("\0") || helperExecutable.includes("%s")) return yield* authSupportError("The P4 Code runtime path cannot be used to suppress Antigravity browser launches.");
 	const geminiHome = path.resolve(input.profileDirectory);
 	const acpDirectory = path.join(geminiHome, "antigravity-acp");
 	const profile = {
@@ -52920,7 +53041,7 @@ const makeProviderAuthService = Effect.gen(function* () {
 		if (!instance?.auth) return yield* new ProviderSetupError({
 			instanceId,
 			operation,
-			detail: instance ? "This provider does not support sign-in in P4Code." : "This provider instance is no longer available."
+			detail: instance ? "This provider does not support sign-in in P4 Code." : "This provider instance is no longer available."
 		});
 		return instance.auth;
 	});
@@ -53113,6 +53234,489 @@ const remoteComputerUseBindingsLayer = Layer.effect(RemoteComputerUseBindings, E
 	});
 }));
 //#endregion
+//#region src/device/DeviceCommandProxy.ts
+var DeviceCommandProxyFailure = class extends Data.TaggedError("DeviceCommandProxyFailure") {};
+const COMMAND_TIMEOUT_MS = 3e4;
+const MAX_RESPONSE_BYTES$2 = 64 * 1024;
+const Reply = Schema$1.Struct({
+	jsonrpc: Schema$1.Literal("2.0"),
+	id: Schema$1.String,
+	result: Schema$1.Struct({ ok: Schema$1.Boolean })
+});
+const make$75 = Effect.fn("DeviceCommandProxy.make")(function* () {
+	const http = yield* HttpClient.HttpClient;
+	const daemonSessions = /* @__PURE__ */ new WeakMap();
+	return Effect.fn("DeviceCommandProxy.execute")(function* (endpoint, session, payload) {
+		const input = yield* Schema$1.decodeUnknownEffect(DeviceCommandInput)(payload);
+		if (input.hostId !== session.hostId || input.deviceId !== session.deviceId) return yield* new DeviceCommandProxyFailure({ message: "Target mismatch" });
+		const origin = yield* Effect.try(() => new URL(endpoint.baseUrl));
+		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 DeviceCommandProxyFailure({ message: "Invalid owned daemon" });
+		let daemonSession = daemonSessions.get(session);
+		if (!daemonSession) {
+			daemonSession = `p4-${NodeCrypto.randomUUID()}`;
+			daemonSessions.set(session, daemonSession);
+		}
+		const id = NodeCrypto.randomUUID();
+		const request = HttpClientRequest.post(`${origin.origin}/rpc`).pipe(HttpClientRequest.bodyJsonUnsafe({
+			jsonrpc: "2.0",
+			id,
+			method: "agent_device.command",
+			params: {
+				token: endpoint.token,
+				session: daemonSession,
+				command: input.command,
+				positionals: input.command === "press" ? [String(input.x), String(input.y)] : [input.text],
+				flags: session.platform === "ios" ? {
+					platform: "ios",
+					udid: session.deviceId
+				} : {
+					platform: "android",
+					serial: session.deviceId
+				}
+			}
+		}));
+		const response = yield* http.execute(request);
+		if (response.status !== 200) return yield* new DeviceCommandProxyFailure({ message: "Command rejected" });
+		let bytes = 0;
+		const body = yield* collectUint8StreamText({
+			stream: response.stream.pipe(Stream.mapEffect((chunk) => {
+				bytes += chunk.byteLength;
+				return bytes > MAX_RESPONSE_BYTES$2 ? Effect.fail(new DeviceCommandProxyFailure({ message: "Command response too large" })) : Effect.succeed(chunk);
+			})),
+			maxBytes: MAX_RESPONSE_BYTES$2
+		});
+		if (body.invalidUtf8 || body.truncated) return yield* new DeviceCommandProxyFailure({ message: "Invalid response" });
+		const reply = yield* Schema$1.decodeUnknownEffect(Schema$1.fromJsonString(Reply))(body.text);
+		if (reply.id !== id || !reply.result.ok) return yield* new DeviceCommandProxyFailure({ message: "Command not acknowledged" });
+		return { ok: true };
+	}, Effect.scoped, Effect.timeout(Duration.millis(COMMAND_TIMEOUT_MS)), Effect.mapError(() => new DeviceOperationError({
+		operation: "command",
+		reason: "request_failed",
+		cause: "Device command could not be completed."
+	})));
+});
+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;
+const MAX_TICKET_LENGTH = 2048;
+const decodeTarget = Schema$1.decodeUnknownSync(DeviceSessionDetailInput);
+const RESOURCES = [
+	"video.avcc",
+	"video.mjpeg",
+	"socket",
+	"screenshot",
+	"ax",
+	"foreground"
+];
+function segment(raw) {
+	const value = decodeURIComponent(raw);
+	if (!value || value === "." || value === ".." || /[%/\\\x00-\x1f\x7f]/.test(value) || encodeURIComponent(value) !== raw) throw new Error("Invalid device route segment.");
+	return value;
+}
+/** Parse only P4 resources. Caller query parameters never reach the private hub. */
+function parseDeviceHubRoute(url, method, upgrade) {
+	if (url.href.length > MAX_ROUTE_LENGTH || url.hash || method !== "GET") throw new Error("Invalid device route.");
+	const parts = url.pathname.split("/");
+	if (parts.length !== 10 || parts.slice(0, 3).join("/") !== "/api/device-hub" || parts[3] !== "thread" || parts[5] !== "host" || parts[7] !== "device") throw new Error("Invalid device route.");
+	const resource = parts[9];
+	if (!RESOURCES.some((value) => value === resource) || upgrade !== (resource === "socket")) throw new Error("Unsupported device resource.");
+	const tickets = url.searchParams.getAll("wsTicket");
+	if ([...url.searchParams.keys()].some((key) => key !== "wsTicket") || tickets.length > 1 || tickets.some((ticket) => !ticket || ticket.length > MAX_TICKET_LENGTH)) throw new Error("Invalid device query.");
+	return {
+		target: decodeTarget({
+			threadId: segment(parts[4]),
+			hostId: segment(parts[6]),
+			deviceId: segment(parts[8])
+		}),
+		resource,
+		requiredScope: resource === "socket" ? AuthOrchestrationOperateScope : AuthOrchestrationReadScope
+	};
+}
+/** Resolve from the authoritative session, never from a caller-supplied upstream URL. */
+function resolveDeviceHubRoute(route, session, origin) {
+	if (route.target.threadId !== session.threadId || route.target.hostId !== session.hostId || route.target.deviceId !== session.deviceId) throw new Error("Device session changed.");
+	const hub = new URL(origin);
+	if (hub.protocol !== "http:" || hub.hostname !== "127.0.0.1" || !hub.port || hub.username || hub.password || hub.pathname !== "/" || hub.search || hub.hash) throw new Error("Invalid owned device hub.");
+	const device = encodeURIComponent(session.deviceId);
+	let path;
+	let method = "GET";
+	if (session.platform === "ios") switch (route.resource) {
+		case "video.avcc":
+			path = `/vendor/serve-sim/helper/${device}/stream.avcc`;
+			break;
+		case "video.mjpeg":
+			path = `/vendor/serve-sim/helper/${device}/stream.mjpeg`;
+			break;
+		case "socket":
+			path = `/vendor/serve-sim/helper/ws?device=${device}`;
+			break;
+		case "screenshot":
+			path = `/vendor/serve-sim/api/screenshot?device=${device}`;
+			method = "POST";
+			break;
+		case "ax":
+			path = `/vendor/serve-sim/helper/${device}/ax`;
+			break;
+		case "foreground":
+			path = `/vendor/serve-sim/helper/${device}/foreground`;
+			break;
+	}
+	else switch (route.resource) {
+		case "socket":
+			path = `/vendor/serve-emu/ws?device=${device}&frame-meta=1`;
+			break;
+		case "screenshot":
+			path = `/vendor/serve-emu/api/screenshot?device=${device}`;
+			method = "POST";
+			break;
+		case "ax":
+			path = `/vendor/serve-emu/api/accessibility?device=${device}`;
+			break;
+		default: throw new Error("Device resource unavailable on this platform.");
+	}
+	const upstream = new URL(path, hub);
+	if (route.resource === "socket") upstream.protocol = "ws:";
+	return {
+		url: upstream.href,
+		method,
+		streaming: route.resource === "video.avcc" || route.resource === "video.mjpeg" || route.resource === "socket"
+	};
+}
+//#endregion
+//#region src/mcp/McpInvocationContext.ts
+var McpInvocationContext = class extends Context.Service()("@p4code/cli/mcp/McpInvocationContext") {};
+const requireMcpCapability = Effect.fn("mcp.requireCapability")(function* (capability) {
+	const invocation = yield* McpInvocationContext;
+	if (!invocation.capabilities.has(capability)) return yield* new PreviewAutomationUnavailableError({
+		capability,
+		environmentId: invocation.environmentId,
+		threadId: invocation.threadId,
+		providerSessionId: invocation.providerSessionId,
+		providerInstanceId: invocation.providerInstanceId
+	});
+	return invocation;
+});
+/**
+* The task-board counterpart of {@link requireMcpCapability}. The two are
+* separate because each capability reports its own absence with the error type
+* its toolkit declares as a failure, and those unions do not overlap.
+*/
+const requireTaskCapability = Effect.fn("mcp.requireTaskCapability")(function* () {
+	const invocation = yield* McpInvocationContext;
+	if (!invocation.capabilities.has("tasks")) return yield* new TaskToolUnavailableError({
+		capability: "tasks",
+		environmentId: invocation.environmentId,
+		threadId: invocation.threadId,
+		providerSessionId: invocation.providerSessionId,
+		providerInstanceId: invocation.providerInstanceId
+	});
+	return invocation;
+});
+/**
+* The watch capability's guard is two checks, not one: the capability must be
+* present AND the requested thread must be in the explicit grant set. The two
+* failures are distinct errors so a watcher can tell "this session cannot
+* watch at all" apart from "not this thread".
+*/
+const requireWatchCapability = Effect.fn("mcp.requireWatchCapability")(function* (watchedThreadId) {
+	const invocation = yield* McpInvocationContext;
+	if (!invocation.capabilities.has("watch")) return yield* new WatchToolUnavailableError({
+		capability: "watch",
+		environmentId: invocation.environmentId,
+		threadId: invocation.threadId,
+		providerSessionId: invocation.providerSessionId,
+		providerInstanceId: invocation.providerInstanceId
+	});
+	if (!invocation.watchThreadIds?.has(watchedThreadId)) return yield* new ThreadWatchNotPermittedError({ threadId: watchedThreadId });
+	return invocation;
+});
+/**
+* The advise guard mirrors the watch guard's two checks - capability present
+* AND thread in the explicit grant - because advising carries strictly more
+* power than watching. A watch-only credential fails the first check here no
+* matter what threads it can read.
+*/
+const requireAdviseCapability = Effect.fn("mcp.requireAdviseCapability")(function* (advisedThreadId) {
+	const invocation = yield* McpInvocationContext;
+	if (!invocation.capabilities.has("advise")) return yield* new AdviseToolUnavailableError({
+		capability: "advise",
+		environmentId: invocation.environmentId,
+		threadId: invocation.threadId,
+		providerSessionId: invocation.providerSessionId,
+		providerInstanceId: invocation.providerInstanceId
+	});
+	if (!invocation.adviseThreadIds?.has(advisedThreadId)) return yield* new ThreadAdviseNotPermittedError({ threadId: advisedThreadId });
+	return invocation;
+});
+/** Third of the trio, for the same reason the second exists. */
+const requireThreadCapability = Effect.fn("mcp.requireThreadCapability")(function* () {
+	const invocation = yield* McpInvocationContext;
+	if (!invocation.capabilities.has("threads")) return yield* new ThreadToolUnavailableError({
+		capability: "threads",
+		environmentId: invocation.environmentId,
+		threadId: invocation.threadId,
+		providerSessionId: invocation.providerSessionId,
+		providerInstanceId: invocation.providerInstanceId
+	});
+	return invocation;
+});
+/**
+* The thread a control tool may act on, given what it was asked to act on.
+*
+* Two checks like `requireWatchCapability`, and for the same reason: the
+* capability says this session controls threads at all, the grant says which.
+* An omitted id resolves to the session's own thread, which is always in the
+* grant and is why the common call needs no id and so cannot name a wrong one.
+*/
+const requireThreadControlTarget = Effect.fn("mcp.requireThreadControlTarget")(function* (requested) {
+	const invocation = yield* requireThreadCapability();
+	if (requested === void 0 || requested === invocation.threadId) return {
+		invocation,
+		threadId: invocation.threadId
+	};
+	if (!invocation.controlThreadIds?.has(requested)) return yield* new ThreadControlNotPermittedError({ threadId: requested });
+	return {
+		invocation,
+		threadId: requested
+	};
+});
+/**
+* The guard on starting a thread, which is a different question from acting on
+* one: it is not "which thread" but "may this session make more of them".
+*/
+const requireThreadSpawn = Effect.fn("mcp.requireThreadSpawn")(function* (fusion = false) {
+	const invocation = yield* requireThreadCapability();
+	if (invocation.mayCreateThreads !== true && !(fusion && invocation.mayCreateFusionPairs === true)) return yield* new ThreadSpawnNotPermittedError({
+		threadId: invocation.threadId,
+		detail: "this thread was itself started by an agent, and spawning goes one level deep so a runaway loop has a bound"
+	});
+	return invocation;
+});
+//#endregion
+//#region src/mcp/DeviceInvocation.ts
+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 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();
+	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()))));
+});
+const withDeviceSession = (target, execute) => withDeviceInvocation((service, threadId) => service.withAgentCommand({
+	hostId: target.hostId,
+	deviceId: target.deviceId,
+	threadId
+}, execute));
+//#endregion
+//#region src/mcp/ComputerUseDevices.ts
+const MAX_AX_BYTES = 512 * 1024;
+const AX_TIMEOUT_MS = 1e4;
+const MAX_AX_EXTENT = 32768;
+const MIN_AX_EXTENT = 2;
+const AxFrames = Schema$1.Array(Schema$1.Struct({ frame: Schema$1.Struct({
+	x: Schema$1.Number,
+	y: Schema$1.Number,
+	width: Schema$1.Number.check(Schema$1.isBetween({
+		minimum: MIN_AX_EXTENT,
+		maximum: MAX_AX_EXTENT
+	})),
+	height: Schema$1.Number.check(Schema$1.isBetween({
+		minimum: MIN_AX_EXTENT,
+		maximum: MAX_AX_EXTENT
+	}))
+}) }));
+const readAxFrames = Schema$1.decodeUnknownOption(AxFrames);
+const decodeAxDocument = Schema$1.decodeUnknownEffect(Schema$1.fromJsonString(Schema$1.Unknown));
+/** Reuse consent and authoritative device leases. The helper never receives daemon credentials. */
+const makeComputerUseDevices = Effect.fn("ComputerUseDevices.make")(function* () {
+	const devices = yield* DeviceService;
+	const screenshots = yield* DeviceScreenshot;
+	const commands = yield* DeviceCommandProxy;
+	const http = yield* HttpClient.HttpClient;
+	const stale = () => new DeviceOperationError({
+		operation: "command",
+		reason: "request_failed",
+		cause: "Device lease changed. Select this host/device again."
+	});
+	return (scope, input) => withDeviceInvocation((service, threadId) => Effect.gen(function* () {
+		if (input.method === "list") {
+			const state = yield* service.agentList;
+			return {
+				hosts: state.hosts,
+				devices: state.devices,
+				hostStatuses: state.hostStatuses,
+				open: state.sessions.filter((session) => session.threadId === threadId)
+			};
+		}
+		if (input.method === "open") {
+			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();
+			const session = yield* service.agentOpen({
+				threadId,
+				hostId: input.hostId,
+				deviceId: input.deviceId,
+				platform: input.platform
+			});
+			if (!session.leaseId) return yield* stale();
+			return {
+				device,
+				leaseId: session.leaseId,
+				hostLabel: state.hosts.find((host) => host.id === device.hostId)?.label ?? device.hostId
+			};
+		}
+		const target = input.method === "command" ? input.command : input;
+		if (input.method === "close") {
+			yield* service.agentClose({
+				threadId,
+				hostId: target.hostId,
+				deviceId: target.deviceId,
+				expectedLeaseId: input.leaseId
+			});
+			return { closed: true };
+		}
+		if (input.method === "command") return yield* service.withAgentCommand({
+			threadId,
+			hostId: target.hostId,
+			deviceId: target.deviceId
+		}, (endpoint, session) => {
+			if (session.leaseId !== input.leaseId) return Effect.fail(stale());
+			return commands.execute(endpoint, session, input.command);
+		});
+		return yield* service.withAgentDevice({
+			threadId,
+			hostId: target.hostId,
+			deviceId: target.deviceId
+		}, (ready, session) => Effect.gen(function* () {
+			if (session.leaseId !== input.leaseId) return yield* stale();
+			if (input.method === "screenshot") {
+				const capture = yield* screenshots.capture(ready, session);
+				return {
+					mimeType: "image/png",
+					data: capture.png.toString("base64"),
+					width: capture.width,
+					height: capture.height
+				};
+			}
+			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: {
+					threadId,
+					hostId: target.hostId,
+					deviceId: target.deviceId
+				},
+				resource: "ax",
+				requiredScope: AuthOrchestrationReadScope
+			}, session, ready.hub.origin);
+			const response = yield* http.execute(HttpClientRequest.get(route.url));
+			if (response.status !== 200) return yield* new DeviceToolUnavailableError({ reason: "Device hub accessibility state is unavailable for this simulator. Use getScreenshot() or check the hub helper." });
+			const body = yield* collectUint8StreamText({
+				stream: response.stream,
+				maxBytes: MAX_AX_BYTES
+			});
+			if (body.truncated || body.invalidUtf8) return yield* new DeviceToolUnavailableError({ reason: "Device accessibility state exceeds the supported size." });
+			const accessibility = yield* decodeAxDocument(body.text);
+			const frames = readAxFrames(accessibility);
+			const viewport = Option.isSome(frames) ? frames.value[0]?.frame : void 0;
+			return {
+				...viewport ? { viewport } : {},
+				hostId: session.hostId,
+				deviceId: session.deviceId,
+				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({
+		reason: "unavailable",
+		detail: error.message
+	})));
+});
+//#endregion
 //#region src/mcp/ComputerUseBroker.ts
 const COMPUTER_USE_HELPER_CREDENTIAL_TTL_MS = 300 * 1e3;
 const HELPER_CREDENTIAL_BYTES = 32;
@@ -53133,7 +53737,7 @@ const hostSession = (scope) => ({
 	providerSessionId: scope.providerSessionId
 });
 var ComputerUseBroker = class extends Context.Service()("@p4code/cli/mcp/ComputerUseBroker") {};
-const layer$67 = Layer.effect(ComputerUseBroker, Effect.gen(function* () {
+const layer$65 = Layer.effect(ComputerUseBroker, Effect.gen(function* () {
 	const serviceScope = yield* Scope.Scope;
 	const crypto = yield* Crypto.Crypto;
 	const environment = yield* ServerEnvironment;
@@ -53322,7 +53926,12 @@ const layer$67 = Layer.effect(ComputerUseBroker, Effect.gen(function* () {
 				state: "stopped"
 			});
 		}
-		if (report.state !== "active") yield* publish();
+		if (report.state === "active" && state.state === "active" && (report.previewApp !== void 0 || report.deviceControl !== void 0)) states.set(key, {
+			...state,
+			...report.previewApp !== void 0 ? { previewApp: report.previewApp } : {},
+			...report.deviceControl !== void 0 ? { deviceControl: report.deviceControl } : {}
+		});
+		if (report.state !== "active" || report.previewApp !== void 0 || report.deviceControl !== void 0) yield* publish();
 	}, admission.withPermits(1));
 	const control = Effect.fn("ComputerUseBroker.control")(function* (input) {
 		const targets = yield* admission.withPermits(1)(Effect.gen(function* () {
@@ -53347,6 +53956,53 @@ const layer$67 = Layer.effect(ComputerUseBroker, Effect.gen(function* () {
 		}
 		yield* publish();
 	}, controlAdmission.withPermits(1), Effect.uninterruptible);
+	const capturePreview = Effect.fn("ComputerUseBroker.capturePreview")(function* (session) {
+		const key = scopeKey(session);
+		const state = states.get(key);
+		const connection = state ? connections.get(state.host.hostId) : void 0;
+		if (!state || state.state !== "active" || stoppedThreads.has(session.threadId) || session.environmentId !== environmentId || state.session.generationId !== session.generationId || !connection || connection.host.connectionId !== state.host.connectionId || leases.get(key) !== connection) return yield* new ComputerUseError({
+			reason: "unavailable",
+			detail: "This Computer Use session is no longer active."
+		});
+		yield* authorize(connection.owner);
+		if (pending.size >= MAX_PENDING_REQUESTS) return yield* new ComputerUseError({
+			reason: "busy",
+			detail: "Computer Use is busy."
+		});
+		const requestId = yield* crypto.randomUUIDv4.pipe(Effect.orDie);
+		const completion = yield* Deferred.make();
+		pending.set(requestId, {
+			connection,
+			completion,
+			scopeKey: `preview:${key}`
+		});
+		return yield* Effect.gen(function* () {
+			yield* Queue.offer(connection.queue, {
+				type: "request",
+				request: {
+					requestId,
+					hostId: connection.host.hostId,
+					connectionId: connection.host.connectionId,
+					session: state.session,
+					operation: "preview"
+				}
+			});
+			const output = yield* Deferred.await(completion).pipe(Effect.timeout(COMPUTER_USE_CONTROL_ACK_TIMEOUT_MS), Effect.mapError(() => new ComputerUseError({
+				reason: "unavailable",
+				detail: "Live view is unavailable. Retry after the host reconnects."
+			})));
+			const current = states.get(key);
+			if (!output.preview || !current || current.state !== "active" || current.session.generationId !== session.generationId || connections.get(state.host.hostId) !== connection || leases.get(key) !== connection) return yield* new ComputerUseError({
+				reason: "unavailable",
+				detail: "This live view has ended."
+			});
+			return {
+				session: state.session,
+				host: state.host,
+				frame: output.preview
+			};
+		}).pipe(Effect.ensuring(Effect.sync(() => pending.delete(requestId))));
+	});
 	return ComputerUseBroker.of({
 		attachVerifiedHelper: (binding) => Effect.gen(function* () {
 			if (binding.host.environmentId !== environmentId || !binding.helperIdentity || !binding.desktopSessionId) return yield* deny();
@@ -53411,6 +54067,7 @@ const layer$67 = Layer.effect(ComputerUseBroker, Effect.gen(function* () {
 		report,
 		control,
 		controls: SubscriptionRef.changes(controls),
+		preview: (session) => Stream.fromEffect(capturePreview(session)).pipe(Stream.repeat(Schedule.spaced(500))),
 		list: Effect.sync(() => [...connections.values()].map((entry) => entry.host)),
 		connect: (owner, host) => authorize(owner).pipe(Effect.as(Stream.unwrap(Effect.acquireRelease(admission.withPermits(1)(acquire(owner, host)), (connection) => revokeHelper(connection.owner)).pipe(Effect.map((connection) => Stream.fromQueue(connection.queue)))))),
 		respond: Effect.fn("ComputerUseBroker.respond")(function* (owner, response) {
@@ -53423,6 +54080,13 @@ const layer$67 = Layer.effect(ComputerUseBroker, Effect.gen(function* () {
 			if (response.result.ok) yield* Deferred.succeed(request.completion, response.result.output);
 			else yield* Deferred.fail(request.completion, response.result.error);
 		}),
+		device: Effect.fn("ComputerUseBroker.device")(function* (owner, input, execute) {
+			yield* authorize(owner);
+			const request = pending.get(input.requestId);
+			const invocation = request?.invocation;
+			if (!request || !invocation || request.connection.owner !== owner || request.connection.host.hostId !== input.hostId || request.connection.host.connectionId !== input.connectionId || connections.get(input.hostId) !== request.connection || leases.get(request.scopeKey) !== request.connection || stoppedThreads.has(invocation.threadId)) return yield* deny();
+			return yield* Effect.raceFirst(execute(invocation).pipe(Effect.tap(() => pending.get(input.requestId) === request ? Effect.void : Effect.fail(deny()))), Deferred.await(request.completion).pipe(Effect.ignore, Effect.andThen(Effect.fail(deny()))));
+		}),
 		invoke: (scope, input, hostId) => Effect.uninterruptibleMask((restore) => Effect.gen(function* () {
 			const { requestId, connection, completion, request } = yield* admission.withPermits(1)(Effect.gen(function* () {
 				if (scope.authorizationLifetime?.revoked === true || !scope.capabilities.has("computer-use") || scope.environmentId !== environmentId) return yield* deny();
@@ -53466,7 +54130,8 @@ const layer$67 = Layer.effect(ComputerUseBroker, Effect.gen(function* () {
 				pending.set(requestId, {
 					connection,
 					completion,
-					scopeKey: key
+					scopeKey: key,
+					invocation: scope
 				});
 				return {
 					requestId,
@@ -53510,9 +54175,12 @@ const layer$67 = Layer.effect(ComputerUseBroker, Effect.gen(function* () {
 }));
 //#endregion
 //#region src/mcp/ComputerUseDesktopTransport.ts
+const COMPUTER_USE_HEARTBEAT_MS = 3e4;
+const keepComputerUseTransportAlive = (stream) => stream.pipe(Stream.merge(Stream.fromEffect(Effect.sleep(COMPUTER_USE_HEARTBEAT_MS).pipe(Effect.as({ type: "heartbeat" }))).pipe(Stream.forever), { haltStrategy: "left" }));
 const Registration = Schema$1.Struct({
 	host: ComputerUseHostRegistration,
-	helperIdentity: Schema$1.String.check(Schema$1.isMinLength(1), Schema$1.isMaxLength(200))
+	helperIdentity: Schema$1.String.check(Schema$1.isMinLength(1), Schema$1.isMaxLength(200)),
+	heartbeat: Schema$1.optional(Schema$1.Boolean)
 });
 const denied = () => new ComputerUseError({
 	reason: "denied",
@@ -53592,9 +54260,30 @@ const connect = HttpRouter.add("POST", "/internal/computer-use/connect", Effect.
 			connectionId: helper.connectionId
 		}), events);
 	}));
-	return HttpServerResponse.stream(messages.pipe(Stream.map((message) => new TextEncoder().encode(JSON.stringify(message) + "\n"))), {
+	return HttpServerResponse.stream((input.heartbeat ? keepComputerUseTransportAlive(messages) : messages).pipe(Stream.map((message) => new TextEncoder().encode(JSON.stringify(message) + "\n"))), {
 		contentType: "application/x-ndjson",
-		headers: { "cache-control": "no-store" }
+		headers: {
+			"cache-control": "no-store",
+			"x-accel-buffering": "no"
+		}
+	});
+}).pipe(Effect.catch(failure$1)));
+const decodeDeviceRequest = Schema$1.decodeUnknownEffect(ComputerUseDeviceRequest);
+const device = HttpRouter.add("POST", "/internal/computer-use/device", Effect.gen(function* () {
+	const request = yield* HttpServerRequest.HttpServerRequest;
+	const broker = yield* ComputerUseBroker;
+	const execute = yield* makeComputerUseDevices();
+	const input = yield* decodeDeviceRequest(yield* request.json);
+	const result = yield* broker.device(bearer(request), input, (scope) => execute(scope, input.operation)).pipe(Effect.map((value) => ({
+		ok: true,
+		value
+	})), Effect.catch((error) => Effect.succeed({
+		ok: false,
+		error
+	})));
+	return HttpServerResponse.jsonUnsafe({
+		callId: input.callId,
+		result
 	});
 }).pipe(Effect.catch(failure$1)));
 const respond = HttpRouter.add("POST", "/internal/computer-use/respond", Effect.gen(function* () {
@@ -53639,7 +54328,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$66 = Layer.mergeAll(exchange, hubForward, hubExchange, connect, respond, report, environment, renew).pipe(Layer.provide(remoteComputerUseBindingsLayer));
+const layer$64 = 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;
@@ -53852,94 +54541,6 @@ const bridgeDeviceSockets = Effect.fn("DeviceHubSocketBridge.bridge")(function*
 	}));
 });
 //#endregion
-//#region src/device/DeviceHubRoute.ts
-const DEVICE_HUB_PROXY_PREFIX = "/api/device-hub";
-const MAX_ROUTE_LENGTH = 16 * 1024;
-const MAX_TICKET_LENGTH = 2048;
-const decodeTarget = Schema$1.decodeUnknownSync(DeviceSessionDetailInput);
-const RESOURCES = [
-	"video.avcc",
-	"video.mjpeg",
-	"socket",
-	"screenshot",
-	"ax",
-	"foreground"
-];
-function segment(raw) {
-	const value = decodeURIComponent(raw);
-	if (!value || value === "." || value === ".." || /[%/\\\x00-\x1f\x7f]/.test(value) || encodeURIComponent(value) !== raw) throw new Error("Invalid device route segment.");
-	return value;
-}
-/** Parse only P4 resources. Caller query parameters never reach the private hub. */
-function parseDeviceHubRoute(url, method, upgrade) {
-	if (url.href.length > MAX_ROUTE_LENGTH || url.hash || method !== "GET") throw new Error("Invalid device route.");
-	const parts = url.pathname.split("/");
-	if (parts.length !== 10 || parts.slice(0, 3).join("/") !== "/api/device-hub" || parts[3] !== "thread" || parts[5] !== "host" || parts[7] !== "device") throw new Error("Invalid device route.");
-	const resource = parts[9];
-	if (!RESOURCES.some((value) => value === resource) || upgrade !== (resource === "socket")) throw new Error("Unsupported device resource.");
-	const tickets = url.searchParams.getAll("wsTicket");
-	if ([...url.searchParams.keys()].some((key) => key !== "wsTicket") || tickets.length > 1 || tickets.some((ticket) => !ticket || ticket.length > MAX_TICKET_LENGTH)) throw new Error("Invalid device query.");
-	return {
-		target: decodeTarget({
-			threadId: segment(parts[4]),
-			hostId: segment(parts[6]),
-			deviceId: segment(parts[8])
-		}),
-		resource,
-		requiredScope: resource === "socket" ? AuthOrchestrationOperateScope : AuthOrchestrationReadScope
-	};
-}
-/** Resolve from the authoritative session, never from a caller-supplied upstream URL. */
-function resolveDeviceHubRoute(route, session, origin) {
-	if (route.target.threadId !== session.threadId || route.target.hostId !== session.hostId || route.target.deviceId !== session.deviceId) throw new Error("Device session changed.");
-	const hub = new URL(origin);
-	if (hub.protocol !== "http:" || hub.hostname !== "127.0.0.1" || !hub.port || hub.username || hub.password || hub.pathname !== "/" || hub.search || hub.hash) throw new Error("Invalid owned device hub.");
-	const device = encodeURIComponent(session.deviceId);
-	let path;
-	let method = "GET";
-	if (session.platform === "ios") switch (route.resource) {
-		case "video.avcc":
-			path = `/vendor/serve-sim/helper/${device}/stream.avcc`;
-			break;
-		case "video.mjpeg":
-			path = `/vendor/serve-sim/helper/${device}/stream.mjpeg`;
-			break;
-		case "socket":
-			path = `/vendor/serve-sim/helper/ws?device=${device}`;
-			break;
-		case "screenshot":
-			path = `/vendor/serve-sim/api/screenshot?device=${device}`;
-			method = "POST";
-			break;
-		case "ax":
-			path = `/vendor/serve-sim/helper/${device}/ax`;
-			break;
-		case "foreground":
-			path = `/vendor/serve-sim/helper/${device}/foreground`;
-			break;
-	}
-	else switch (route.resource) {
-		case "socket":
-			path = `/vendor/serve-emu/ws?device=${device}&frame-meta=1`;
-			break;
-		case "screenshot":
-			path = `/vendor/serve-emu/api/screenshot?device=${device}`;
-			method = "POST";
-			break;
-		case "ax":
-			path = `/vendor/serve-emu/api/accessibility?device=${device}`;
-			break;
-		default: throw new Error("Device resource unavailable on this platform.");
-	}
-	const upstream = new URL(path, hub);
-	if (route.resource === "socket") upstream.protocol = "ws:";
-	return {
-		url: upstream.href,
-		method,
-		streaming: route.resource === "video.avcc" || route.resource === "video.mjpeg" || route.resource === "socket"
-	};
-}
-//#endregion
 //#region src/device/DeviceHubNodeSocket.ts
 const OPEN_TIMEOUT_MS = 1e4;
 const MAX_UPGRADE_HEAD_BYTES = 32 * 8206;
@@ -55105,7 +55706,7 @@ const logP4ProjectFileLoadError = (error) => Effect.logWarning(error).pipe(Effec
 	filePath: error.filePath,
 	errorTag: error._tag
 }));
-const make$75 = Effect.gen(function* () {
+const make$73 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const load = Effect.fn("P4ProjectFileLoader.load")(function* (workspaceRoot) {
@@ -55126,7 +55727,7 @@ const make$75 = Effect.gen(function* () {
 	});
 	return P4ProjectFileLoader.of({ load });
 });
-const layer$65 = Layer.effect(P4ProjectFileLoader, make$75);
+const layer$63 = Layer.effect(P4ProjectFileLoader, make$73);
 //#endregion
 //#region src/project/ProjectFaviconResolver.ts
 /**
@@ -55201,7 +55802,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$74 = Effect.gen(function* () {
+const make$72 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const workspacePaths = yield* WorkspacePaths;
@@ -55270,7 +55871,7 @@ const make$74 = Effect.gen(function* () {
 	});
 	return ProjectFaviconResolver.of({ resolvePath });
 });
-const layer$64 = Layer.effect(ProjectFaviconResolver, make$74);
+const layer$62 = Layer.effect(ProjectFaviconResolver, make$72);
 //#endregion
 //#region src/assets/AssetAccess.ts
 const ASSET_ROUTE_PREFIX = "/api/assets";
@@ -55681,10 +56282,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$73 = (sink) => BrowserTraceCollector.of({ record: (records) => Effect.sync(() => {
+const make$71 = (sink) => BrowserTraceCollector.of({ record: (records) => Effect.sync(() => {
 	for (const record of records) sink.push(record);
 }) });
-const layer$63 = (sink) => Layer.succeed(BrowserTraceCollector, make$73(sink));
+const layer$61 = (sink) => Layer.succeed(BrowserTraceCollector, make$71(sink));
 //#endregion
 //#region src/auth/http.ts
 const CREDENTIAL_RESPONSE_HEADERS = {
@@ -56826,7 +57427,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$72 = (options) => Effect.gen(function* () {
+const make$70 = (options) => Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const runtimeScope = yield* Scope.Scope;
@@ -57230,7 +57831,7 @@ const make$72 = (options) => Effect.gen(function* () {
 		notify: acp.raw.notify
 	};
 });
-const layer$62 = (options) => Layer.effect(AcpSessionRuntime, make$72(options));
+const layer$60 = (options) => Layer.effect(AcpSessionRuntime, make$70(options));
 function sessionConfigOptionsFromSetup(response) {
 	return response?.configOptions ?? [];
 }
@@ -57624,7 +58225,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$62({
+	const context = yield* Layer.build(layer$60({
 		...input,
 		authMethodId: input.authMethod ?? "oauth-personal",
 		resumeMethod: "resume",
@@ -60363,7 +60964,7 @@ const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(function* (
 					status: "unknown",
 					...options.auth ? { type: options.auth.type } : {}
 				},
-				message: settings.enabled ? "Checking Antigravity availability." : "Antigravity is disabled in P4Code settings."
+				message: settings.enabled ? "Checking Antigravity availability." : "Antigravity is disabled in P4 Code settings."
 			}
 		}),
 		setup: {
@@ -61601,7 +62202,7 @@ const BundledOnlyModelManifest = {
 	refreshInBackground: Effect.void
 };
 Layer.succeed(ModelManifest, BundledOnlyModelManifest);
-const make$71 = Effect.gen(function* () {
+const make$69 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const config = yield* ServerConfig$1;
@@ -61646,7 +62247,7 @@ const make$71 = Effect.gen(function* () {
 		refreshInBackground: Effect.forkIn(guardedRefresh, serviceScope).pipe(Effect.asVoid)
 	});
 });
-const layer$61 = Layer.effect(ModelManifest, make$71);
+const layer$59 = Layer.effect(ModelManifest, make$69);
 //#endregion
 //#region src/provider/ProviderDriver.ts
 function defaultProviderContinuationIdentity(input) {
@@ -61906,11 +62507,11 @@ const makeTextGenerationFromRegistry = (registry) => TextGeneration.of({
 		detail: "This provider does not report account usage."
 	}))))
 });
-const make$70 = Effect.gen(function* () {
+const make$68 = Effect.gen(function* () {
 	const registry = yield* ProviderInstanceRegistry;
 	return makeTextGenerationFromRegistry(registry);
 });
-const layer$60 = Layer.effect(TextGeneration, make$70);
+const layer$58 = Layer.effect(TextGeneration, make$68);
 //#endregion
 //#region src/provider/Layers/claudeUsageLimits.ts
 const SESSION_MINS$1 = 300;
@@ -62984,7 +63585,7 @@ const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(functio
 			version: null,
 			status: "warning",
 			auth: { status: "unknown" },
-			message: "Claude is disabled in P4Code settings."
+			message: "Claude is disabled in P4 Code settings."
 		}
 	});
 	const versionProbe = yield* runClaudeCommand(claudeSettings, ["--version"], resolvedEnvironment).pipe(Effect.timeoutOption(DEFAULT_TIMEOUT_MS$5), Effect.result);
@@ -63102,7 +63703,7 @@ const makePendingClaudeProvider = (claudeSettings) => Effect.gen(function* () {
 			version: null,
 			status: "warning",
 			auth: { status: "unknown" },
-			message: "Claude is disabled in P4Code settings."
+			message: "Claude is disabled in P4 Code settings."
 		}
 	});
 	return buildServerProvider({
@@ -63568,13 +64169,24 @@ function formatAskUserQuestionAnswers(answers) {
 *
 * They travel through the provider's session channel - Claude's system prompt
 * append, Codex's per-turn developer instructions - rather than as a prefix on
-* every message. The block is about 650 tokens; a message-level copy sits in
-* the conversation history for the rest of the thread, is re-read on every
-* later API call, and is lost at compaction anyway. The session channel is
+* every message. Each resolved block runs to roughly a thousand tokens and
+* grows as the protocol does, so a message-level copy would sit in the
+* conversation history for the rest of the thread, be re-read on every later
+* API call, and be lost at compaction anyway. The session channel is
 * cached, never accumulates, and survives compaction. Messages then carry
 * only a one-line reference and the mutable `[fusion-pair]` metadata.
 */
-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.`;
+/**
+* The half of the protocol both roles share: how a pair message is written.
+*
+* The transport already carries the thread's compression mode - a Fusion child
+* inherits the composer's mode at creation, and `thread_advise` starts the
+* builder turn under the builder thread's stored mode - but neither role block
+* said that pair traffic is subject to it, so phase reports and advice were
+* 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_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.
@@ -63582,7 +64194,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: inspect the task and available project context, plan the work, then direct the first actionable phase to the idle builder through thread_advise. Include the original requirements, constraints, and authorized delivery scope in that direction. 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.`;
+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}`;
 /**
 * The one-line stand-in for the full block on a message whose session already
 * carries the role instructions.
@@ -83861,7 +84473,7 @@ const V2TurnStartParams__CollaborationMode = Schema$1.Struct({
 	mode: V2TurnStartParams__ModeKind,
 	settings: V2TurnStartParams__Settings
 }).annotate({ description: "Collaboration mode for a Codex session." });
-Schema$1.Union([Schema$1.Literals(["explicitRequestOnly", "proactive"]), Schema$1.Struct({ custom: Schema$1.String }).annotate({ title: "CustomMultiAgentMode" })], { mode: "oneOf" }).annotate({ description: "Controls the effective multi-agent delegation instructions for a turn. `custom` means the configured mode hint defines the policy instead of a built-in policy." });
+const V2TurnStartParams__MultiAgentMode = Schema$1.Union([Schema$1.Literals(["explicitRequestOnly", "proactive"]), Schema$1.Struct({ custom: Schema$1.String }).annotate({ title: "CustomMultiAgentMode" })], { mode: "oneOf" }).annotate({ description: "Controls the effective multi-agent delegation instructions for a turn. `custom` means the configured mode hint defines the policy instead of a built-in policy." });
 Schema$1.Literals(["restricted", "enabled"]);
 Schema$1.Struct({
 	cwd: V2TurnStartParams__LegacyAppPathString,
@@ -84842,7 +85454,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$69 = Effect.fn("effect-codex-app-server/CodexAppServerClient.make")(function* (stdio, options = {}, terminationError) {
+const make$67 = Effect.fn("effect-codex-app-server/CodexAppServerClient.make")(function* (stdio, options = {}, terminationError) {
 	const requestHandlers = /* @__PURE__ */ new Map();
 	const notificationHandlers = /* @__PURE__ */ new Map();
 	let unknownRequestHandler;
@@ -84909,7 +85521,7 @@ const make$69 = 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$69(makeChildStdio(handle), options, makeTerminationError(handle));
+	return yield* make$67(makeChildStdio(handle), options, makeTerminationError(handle));
 });
 const resolveCodexLaunchArgs = (launchArgs, environment = process.env) => environment["P4CODE_CODEX_LAUNCH_ARGS"]?.trim() || launchArgs?.trim() || "";
 const codexLaunchArgv = (launchArgs) => tokenizeCliArgs(launchArgs);
@@ -85205,7 +85817,7 @@ function buildCodexInitializeParams() {
 	return {
 		clientInfo: {
 			name: "p4code_desktop",
-			title: "P4Code Desktop",
+			title: "P4 Code Desktop",
 			version: version$1
 		},
 		capabilities: { experimentalApi: true }
@@ -85237,7 +85849,7 @@ const probeCodexAppServerProvider = Effect.fn("probeCodexAppServerProvider")(fun
 	const initialize = yield* client.request("initialize", {
 		clientInfo: {
 			name: "p4code_desktop",
-			title: "P4Code Desktop",
+			title: "P4 Code Desktop",
 			version: "0.1.0"
 		},
 		capabilities: { experimentalApi: true }
@@ -85294,7 +85906,7 @@ const makePendingCodexProvider = (codexSettings) => Effect.gen(function* () {
 			version: null,
 			status: "warning",
 			auth: { status: "unknown" },
-			message: "Codex is disabled in P4Code settings."
+			message: "Codex is disabled in P4 Code settings."
 		}
 	});
 	return buildServerProvider({
@@ -85350,7 +85962,7 @@ const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(function*
 			version: null,
 			status: "warning",
 			auth: { status: "unknown" },
-			message: "Codex is disabled in P4Code settings."
+			message: "Codex is disabled in P4 Code settings."
 		}
 	});
 	const probeResult = yield* probe({
@@ -86110,7 +86722,10 @@ const CodexResumeCursorSchema = Schema$1.Struct({ threadId: Schema$1.String });
 const CodexUserInputAnswerObject = Schema$1.Struct({ answers: Schema$1.Array(Schema$1.String) });
 const isCodexResumeCursorSchema$1 = Schema$1.is(CodexResumeCursorSchema);
 const isCodexUserInputAnswerObject = Schema$1.is(CodexUserInputAnswerObject);
-const CodexTurnStartParamsWithCollaborationMode = V2TurnStartParams.pipe(Schema$1.fieldsAssign({ collaborationMode: Schema$1.optionalKey(V2TurnStartParams__CollaborationMode) }));
+const CodexTurnStartParamsWithCollaborationMode = V2TurnStartParams.pipe(Schema$1.fieldsAssign({
+	collaborationMode: Schema$1.optionalKey(V2TurnStartParams__CollaborationMode),
+	multiAgentMode: Schema$1.optionalKey(V2TurnStartParams__MultiAgentMode)
+}));
 const decodeCodexTurnStartParamsWithCollaborationMode = Schema$1.decodeUnknownEffect(CodexTurnStartParamsWithCollaborationMode);
 var CodexSessionRuntimePendingApprovalNotFoundError = class extends Schema$1.TaggedErrorClass()("CodexSessionRuntimePendingApprovalNotFoundError", { requestId: Schema$1.String }) {
 	get message() {
@@ -86236,6 +86851,7 @@ function buildTurnStartParams(input) {
 		...input.model ? { model: input.model } : {},
 		...input.serviceTier ? { serviceTier: input.serviceTier } : {},
 		...input.effort ? { effort: input.effort } : {},
+		...input.unpromptedSubagents !== void 0 ? { multiAgentMode: input.unpromptedSubagents ? "proactive" : "explicitRequestOnly" } : {},
 		...collaborationMode ? { collaborationMode } : {}
 	}).pipe(compressRulesetUndeliverable ? Effect.tap(() => Effect.logWarning("codex.turn.compress-ruleset-undeliverable", {
 		threadId: input.threadId,
@@ -86811,7 +87427,8 @@ const makeCodexSessionRuntime = (options) => Effect.gen(function* () {
 				...input.effort ? { effort: input.effort } : {},
 				...input.interactionMode ? { interactionMode: input.interactionMode } : {},
 				...input.compressMode ? { compressMode: input.compressMode } : {},
-				...options.guardrailPrompts ? { guardrailPrompts: options.guardrailPrompts } : {}
+				...options.guardrailPrompts ? { guardrailPrompts: options.guardrailPrompts } : {},
+				...input.unpromptedSubagents !== void 0 ? { unpromptedSubagents: input.unpromptedSubagents } : {}
 			});
 			const { collaborationMode: attachedCollaborationMode, ...paramsWithoutCollaboration } = params;
 			const lastCollaborationMode = yield* Ref.get(lastCollaborationModeRef);
@@ -87992,6 +88609,7 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 			...input.interactionMode !== void 0 ? { interactionMode: input.interactionMode } : {},
 			...input.compressMode !== void 0 ? { compressMode: input.compressMode } : {},
 			...input.fusionRole !== void 0 ? { fusionRole: input.fusionRole } : {},
+			...input.unpromptedSubagents !== void 0 ? { unpromptedSubagents: input.unpromptedSubagents } : {},
 			...codexAttachments.length > 0 ? { attachments: codexAttachments } : {}
 		}).pipe(Effect.mapError((cause) => mapCodexRuntimeError(input.threadId, "turn/start", cause)));
 	});
@@ -88562,7 +89180,7 @@ const CURSOR_PARAMETERIZED_MODEL_PICKER_MIN_VERSION_DATE = 20260408;
 const CURSOR_CLI_INSTALLATION_DOCS_URL = "https://cursor.com/docs/cli/installation";
 const CURSOR_ACP_MODEL_DISCOVERY_FAILED_MESSAGE = [
 	"Cursor ACP model discovery failed.",
-	"Cursor CLI setup may be incomplete; install or enable the Cursor CLI, restart P4Code, and try again.",
+	"Cursor CLI setup may be incomplete; install or enable the Cursor CLI, restart P4 Code, and try again.",
 	`See ${CURSOR_CLI_INSTALLATION_DOCS_URL}.`,
 	"Check server logs for ACP details."
 ].join(" ");
@@ -88581,7 +89199,7 @@ function buildInitialCursorProviderSnapshot(cursorSettings) {
 				version: null,
 				status: "warning",
 				auth: { status: "unknown" },
-				message: "Cursor is disabled in P4Code settings."
+				message: "Cursor is disabled in P4 Code settings."
 			}
 		});
 		return buildServerProvider({
@@ -88747,7 +89365,7 @@ function buildCursorDiscoveredModelsFromAvailableModelsResponse(response) {
 }
 const makeCursorAcpProbeRuntime = (cursorSettings, environment) => Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
-	const acpContext = yield* Layer.build(layer$62({
+	const acpContext = yield* Layer.build(layer$60({
 		spawn: {
 			command: cursorSettings.binaryPath,
 			args: [...cursorSettings.apiEndpoint ? ["-e", cursorSettings.apiEndpoint] : [], "acp"],
@@ -88859,7 +89477,7 @@ function joinProviderMessages(...messages) {
 function buildCursorCliCommandMissingMessage(binaryPath) {
 	return [
 		`Cursor CLI command \`${binaryPath}\` was not found.`,
-		`Install or enable the Cursor CLI, make sure \`${binaryPath}\` is on PATH, then restart P4Code.`,
+		`Install or enable the Cursor CLI, make sure \`${binaryPath}\` is on PATH, then restart P4 Code.`,
 		`See ${CURSOR_CLI_INSTALLATION_DOCS_URL}.`
 	].join(" ");
 }
@@ -89099,7 +89717,7 @@ const checkCursorProviderStatus = Effect.fn("checkCursorProviderStatus")(functio
 			version: null,
 			status: "warning",
 			auth: { status: "unknown" },
-			message: "Cursor is disabled in P4Code settings."
+			message: "Cursor is disabled in P4 Code settings."
 		}
 	});
 	const aboutProbe = yield* runCursorAboutCommand(cursorSettings, environment).pipe(Effect.timeoutOption(ABOUT_TIMEOUT_MS), Effect.result);
@@ -89197,7 +89815,7 @@ function buildCursorAcpSpawnInput(cursorSettings, cwd, environment) {
 	};
 }
 const makeCursorAcpRuntime = (input) => Effect.gen(function* () {
-	const acpContext = yield* Layer.build(layer$62({
+	const acpContext = yield* Layer.build(layer$60({
 		...input,
 		spawn: buildCursorAcpSpawnInput(input.cursorSettings, input.cwd, input.environment),
 		authMethodId: "cursor_login",
@@ -90390,7 +91008,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$62({
+	const acpContext = yield* Layer.build(layer$60({
 		...input,
 		spawn: buildGrokAcpSpawnInput(input.grokSettings, input.cwd, input.environment),
 		authMethodId: resolveGrokAuthMethodId(input.environment)
@@ -91457,7 +92075,7 @@ function buildInitialGrokProviderSnapshot(grokSettings) {
 				version: null,
 				status: "warning",
 				auth: { status: "unknown" },
-				message: "Grok is disabled in P4Code settings."
+				message: "Grok is disabled in P4 Code settings."
 			}
 		});
 		return buildServerProvider({
@@ -91526,7 +92144,7 @@ const checkGrokProviderStatus = Effect.fn("checkGrokProviderStatus")(function* (
 			version: null,
 			status: "warning",
 			auth: { status: "unknown" },
-			message: "Grok is disabled in P4Code settings."
+			message: "Grok is disabled in P4 Code settings."
 		}
 	});
 	const versionResult = yield* runGrokVersionCommand(grokSettings, environment).pipe(Effect.timeoutOption(VERSION_PROBE_TIMEOUT_MS$1), Effect.result);
@@ -93186,7 +93804,7 @@ function buildInitialMuseProviderSnapshot(museSettings) {
 				version: null,
 				status: "warning",
 				auth: { status: "unknown" },
-				message: "Muse Code is disabled in P4Code settings."
+				message: "Muse Code is disabled in P4 Code settings."
 			}
 		});
 	});
@@ -93212,7 +93830,7 @@ const checkMuseProviderStatus = Effect.fn("checkMuseProviderStatus")(function* (
 			version: null,
 			status: "warning",
 			auth: { status: "unknown" },
-			message: "Muse Code is disabled in P4Code settings."
+			message: "Muse Code is disabled in P4 Code settings."
 		}
 	});
 	const versionResult = yield* runMuseVersionCommand(museSettings, environment).pipe(Effect.timeoutOption(VERSION_PROBE_TIMEOUT_MS), Effect.result);
@@ -94024,7 +94642,7 @@ const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration")(funct
 			});
 			const session = yield* Effect.tryPromise({
 				try: () => client.session.create({
-					title: `P4Code ${input.operation}`,
+					title: `P4 Code ${input.operation}`,
 					permission: [{
 						permission: "*",
 						pattern: "*",
@@ -95410,7 +96028,7 @@ const makePendingOpenCodeProvider = (openCodeSettings) => Effect.gen(function* (
 			version: null,
 			status: "warning",
 			auth: { status: "unknown" },
-			message: openCodeSettings.serverUrl.trim().length > 0 ? "OpenCode is disabled in P4Code settings. A server URL is configured." : "OpenCode is disabled in P4Code settings."
+			message: openCodeSettings.serverUrl.trim().length > 0 ? "OpenCode is disabled in P4 Code settings. A server URL is configured." : "OpenCode is disabled in P4 Code settings."
 		}
 	});
 	return buildServerProvider({
@@ -95463,7 +96081,7 @@ const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatus")(fun
 			version: null,
 			status: "warning",
 			auth: { status: "unknown" },
-			message: isExternalServer ? "OpenCode is disabled in P4Code settings. A server URL is configured." : "OpenCode is disabled in P4Code settings."
+			message: isExternalServer ? "OpenCode is disabled in P4 Code settings. A server URL is configured." : "OpenCode is disabled in P4 Code settings."
 		}
 	});
 	let version = null;
@@ -95478,7 +96096,7 @@ const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatus")(fun
 		}))));
 		if (versionExit._tag === "Failure") return fallback(Cause.squash(versionExit.cause));
 		version = parseGenericCliVersion(versionExit.value.stdout) ?? null;
-		if (!version) return fallback(/* @__PURE__ */ new Error(`Unable to determine OpenCode version from \`opencode --version\` output. P4Code requires OpenCode v${MINIMUM_OPENCODE_VERSION} or newer.`), null);
+		if (!version) return fallback(/* @__PURE__ */ new Error(`Unable to determine OpenCode version from \`opencode --version\` output. P4 Code requires OpenCode v${MINIMUM_OPENCODE_VERSION} or newer.`), null);
 		if (compareSemverVersions(version, MINIMUM_OPENCODE_VERSION) < 0) return buildServerProvider({
 			presentation: OPENCODE_PRESENTATION,
 			enabled: openCodeSettings.enabled,
@@ -96131,7 +96749,7 @@ const makeProviderInstallation = Effect.fn("makeProviderInstallation")(function*
 		})))).binaryPath) return yield* new ProviderSetupError({
 			instanceId,
 			operation,
-			detail: "This instance uses a custom executable. Clear its binary path to manage installation in P4Code."
+			detail: "This instance uses a custom executable. Clear its binary path to manage installation in P4 Code."
 		});
 	});
 	const failure = (instanceId) => (error) => new ProviderSetupError({
@@ -96169,7 +96787,7 @@ const makeProviderInstallation = Effect.fn("makeProviderInstallation")(function*
 });
 //#endregion
 //#region src/usage/usageSourceHttp.ts
-const MAX_RESPONSE_BYTES$2 = 1024 * 1024;
+const MAX_RESPONSE_BYTES$1 = 1024 * 1024;
 const LOOPBACK_HOSTS$1 = /* @__PURE__ */ new Set([
 	"localhost",
 	"127.0.0.1",
@@ -96202,7 +96820,7 @@ async function readManagementJson(config, path, body, signal) {
 			const chunk = await reader.read();
 			if (chunk.done) break;
 			total += chunk.value.byteLength;
-			if (total > MAX_RESPONSE_BYTES$2) throw new Error("Usage source response too large");
+			if (total > MAX_RESPONSE_BYTES$1) throw new Error("Usage source response too large");
 			chunks.push(chunk.value);
 		}
 		return JSON.parse(Buffer.concat(chunks).toString("utf8"));
@@ -96439,8 +97057,8 @@ const makeWithReader = (api) => Effect.gen(function* () {
 		}))
 	};
 });
-const make$68 = makeCliproxyApi.pipe(Effect.flatMap(makeWithReader));
-const layer$59 = Layer.effect(UsageLimitSources, make$68);
+const make$66 = makeCliproxyApi.pipe(Effect.flatMap(makeWithReader));
+const layer$57 = Layer.effect(UsageLimitSources, make$66);
 //#endregion
 //#region src/resourceTelemetry/HostResources.ts
 const CPU_SAMPLE_INTERVAL = "200 millis";
@@ -96475,7 +97093,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$67 = Effect.fn("makeHostResources")(function* () {
+const make$65 = Effect.fn("makeHostResources")(function* () {
 	const fs = yield* FileSystem.FileSystem;
 	const platform = yield* HostProcessPlatform;
 	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
@@ -96509,7 +97127,7 @@ const make$67 = Effect.fn("makeHostResources")(function* () {
 	});
 	return HostResources.of({ read: Cache.get(cache, "host") });
 });
-const layer$58 = Layer.effect(HostResources, make$67());
+const layer$56 = Layer.effect(HostResources, make$65());
 //#endregion
 //#region src/resourceTelemetry/DesktopTelemetryReceiver.ts
 const INITIAL_SAMPLE_DEADLINE_MS = 9e4;
@@ -96644,7 +97262,7 @@ function requireDesktopTelemetryWriteProgress(fd, remainingBytes, written) {
 	}));
 }
 /** @public Service construction is part of the canonical Effect module API. */
-const make$66 = Effect.fn("resourceTelemetry.desktopTelemetryReceiver.make")(function* () {
+const make$64 = Effect.fn("resourceTelemetry.desktopTelemetryReceiver.make")(function* () {
 	const serverConfig = yield* ServerConfig$1;
 	const hasDescriptors = serverConfig.mode === "desktop" && serverConfig.desktopTelemetryFd === 4 && serverConfig.desktopTelemetryControlFd === 5;
 	const config = {
@@ -96801,7 +97419,7 @@ const make$66 = Effect.fn("resourceTelemetry.desktopTelemetryReceiver.make")(fun
 		setDiagnosticsDemand
 	});
 });
-const layer$57 = Layer.effect(DesktopTelemetryReceiver, make$66());
+const layer$55 = Layer.effect(DesktopTelemetryReceiver, make$64());
 //#endregion
 //#region src/resourceTelemetry/Model.ts
 const MAX_DELTA_INTERVAL_MS = 3e4;
@@ -97226,7 +97844,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$65 = Effect.fn("resourceTelemetry.resourceMonitorBinary.make")(function* () {
+const make$63 = Effect.fn("resourceTelemetry.resourceMonitorBinary.make")(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const platform = yield* HostProcessPlatform;
@@ -97272,7 +97890,7 @@ const make$65 = Effect.fn("resourceTelemetry.resourceMonitorBinary.make")(functi
 	});
 	return ResourceMonitorBinary.of({ resolve });
 });
-const layer$56 = Layer.effect(ResourceMonitorBinary, make$65());
+const layer$54 = Layer.effect(ResourceMonitorBinary, make$63());
 //#endregion
 //#region src/resourceTelemetry/NativeTelemetryClient.ts
 const SAMPLE_INTERVAL_MS$1 = 1e3;
@@ -97422,7 +98040,7 @@ function canCommandNativeTelemetrySidecar(status, hasHandle) {
 	return hasHandle && (status === "healthy" || status === "degraded");
 }
 /** @public Service construction is part of the canonical Effect module API. */
-const make$64 = Effect.fn("resourceTelemetry.nativeTelemetryClient.make")(function* () {
+const make$62 = Effect.fn("resourceTelemetry.nativeTelemetryClient.make")(function* () {
 	const binary = yield* ResourceMonitorBinary;
 	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 	const crypto = yield* Crypto.Crypto;
@@ -97833,7 +98451,7 @@ const make$64 = Effect.fn("resourceTelemetry.nativeTelemetryClient.make")(functi
 		})
 	});
 });
-const layer$55 = Layer.effect(NativeTelemetryClient, make$64());
+const layer$53 = Layer.effect(NativeTelemetryClient, make$62());
 //#endregion
 //#region src/resourceTelemetry/ResourceAttribution.ts
 var ResourceAttribution = class extends Context.Service()("@p4code/cli/resourceTelemetry/ResourceAttribution") {};
@@ -97845,7 +98463,7 @@ function nonNegativeInteger(value, fallback) {
 	if (!Number.isFinite(value)) return 0;
 	return Math.max(0, Math.round(value));
 }
-const make$63 = Effect.fn("resourceTelemetry.resourceAttribution.make")(function* () {
+const make$61 = 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);
@@ -97871,7 +98489,7 @@ const make$63 = Effect.fn("resourceTelemetry.resourceAttribution.make")(function
 		})
 	});
 });
-const layer$54 = Layer.effect(ResourceAttribution, make$63());
+const layer$52 = Layer.effect(ResourceAttribution, make$61());
 //#endregion
 //#region src/resourceTelemetry/ResourceTelemetryHistory.ts
 const MAX_HISTORY_WINDOW_MS = 60 * 6e4;
@@ -98094,7 +98712,7 @@ function buildHealth(input) {
 	};
 }
 /** @public Service construction is part of the canonical Effect module API. */
-const make$62 = Effect.fn("resourceTelemetry.resourceTelemetry.make")(function* () {
+const make$60 = Effect.fn("resourceTelemetry.resourceTelemetry.make")(function* () {
 	const nativeClient = yield* NativeTelemetryClient;
 	const desktopReceiver = yield* DesktopTelemetryReceiver;
 	const attribution = yield* ResourceAttribution;
@@ -98346,7 +98964,7 @@ const make$62 = Effect.fn("resourceTelemetry.resourceTelemetry.make")(function*
 		})))
 	});
 });
-const layer$53 = Layer.effect(ResourceTelemetry, make$62());
+const layer$51 = Layer.effect(ResourceTelemetry, make$60());
 //#endregion
 //#region src/device/DeviceInspection.ts
 const READ_TIMEOUT_MS = 1e4;
@@ -101501,7 +102119,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$61 = Effect.gen(function* () {
+const make$59 = Effect.gen(function* () {
 	const processRunner = yield* ProcessRunner;
 	const run = Effect.fn("VcsProcess.run")(function* (input) {
 		const baseError = {
@@ -101560,7 +102178,7 @@ const make$61 = Effect.gen(function* () {
 	});
 	return VcsProcess.of({ run });
 });
-const layer$52 = Layer.effect(VcsProcess, make$61).pipe(Layer.provide(layer$81));
+const layer$50 = Layer.effect(VcsProcess, make$59).pipe(Layer.provide(layer$81));
 //#endregion
 //#region src/vcs/VcsDriver.ts
 var VcsDriver = class extends Context.Service()("@p4code/cli/vcs/VcsDriver") {};
@@ -102011,12 +102629,12 @@ const makeVcsDriver = Effect.gen(function* () {
 	const driver = yield* makeVcsDriverShape();
 	return VcsDriver.of(driver);
 });
-const make$60 = Effect.gen(function* () {
+const make$58 = Effect.gen(function* () {
 	const git = yield* makeGitVcsDriverCore();
 	return GitVcsDriver.of(git);
 });
 Layer.effect(VcsDriver, makeVcsDriver);
-const layer$51 = Layer.effect(GitVcsDriver, make$60);
+const layer$49 = Layer.effect(GitVcsDriver, make$58);
 //#endregion
 //#region src/vcs/VcsProjectConfig.ts
 const ProjectVcsConfigJson = fromLenientJson(Schema$1.Struct({
@@ -102048,7 +102666,7 @@ const logVcsProjectConfigError = (error) => Effect.logWarning(error).pipe(Effect
 	configPath: error.configPath,
 	errorTag: error._tag
 }));
-const make$59 = Effect.gen(function* () {
+const make$57 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const findConfigPath = Effect.fn("VcsProjectConfig.findConfigPath")(function* (cwd) {
@@ -102089,7 +102707,7 @@ const make$59 = Effect.gen(function* () {
 	});
 	return VcsProjectConfig.of({ resolveKind });
 });
-const layer$50 = Layer.effect(VcsProjectConfig, make$59);
+const layer$48 = Layer.effect(VcsProjectConfig, make$57);
 //#endregion
 //#region src/vcs/VcsDriverRegistry.ts
 const DETECTION_CACHE_CAPACITY = 2048;
@@ -102109,7 +102727,7 @@ function parseDetectionCacheKey(key) {
 		cwd: key.slice(separatorIndex + 1)
 	};
 }
-const make$58 = Effect.gen(function* () {
+const make$56 = Effect.gen(function* () {
 	const projectConfig = yield* VcsProjectConfig;
 	const git = yield* makeVcsDriver;
 	const drivers = { git };
@@ -102166,7 +102784,7 @@ const make$58 = Effect.gen(function* () {
 		resolve
 	});
 });
-const layer$49 = Layer.effect(VcsDriverRegistry, make$58).pipe(Layer.provide(layer$50));
+const layer$47 = Layer.effect(VcsDriverRegistry, make$56).pipe(Layer.provide(layer$48));
 //#endregion
 //#region src/checkpointing/CheckpointStore.ts
 /**
@@ -102186,7 +102804,7 @@ const layer$49 = Layer.effect(VcsDriverRegistry, make$58).pipe(Layer.provide(lay
 */
 /** Service tag for checkpoint persistence and restore operations. */
 var CheckpointStore = class extends Context.Service()("@p4code/cli/checkpointing/CheckpointStore") {};
-const make$57 = Effect.gen(function* () {
+const make$55 = Effect.gen(function* () {
 	const vcsRegistry = yield* VcsDriverRegistry;
 	const resolveCheckpoints = Effect.fn("CheckpointStore.resolveCheckpoints")(function* (operation, cwd) {
 		const handle = yield* vcsRegistry.resolve({ cwd });
@@ -102225,7 +102843,7 @@ const make$57 = Effect.gen(function* () {
 		deleteCheckpointRefs
 	});
 });
-const layer$48 = Layer.effect(CheckpointStore, make$57);
+const layer$46 = Layer.effect(CheckpointStore, make$55);
 //#endregion
 //#region src/checkpointing/CheckpointDiffQuery.ts
 /**
@@ -102247,7 +102865,7 @@ function buildTurnDiffResult(input, diff) {
 		diff
 	};
 }
-const make$56 = Effect.gen(function* () {
+const make$54 = Effect.gen(function* () {
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 	const checkpointStore = yield* CheckpointStore;
 	const threadActivities = yield* ProjectionThreadActivityRepository;
@@ -102418,7 +103036,7 @@ const make$56 = Effect.gen(function* () {
 		getFullThreadDiff
 	});
 });
-const layer$47 = Layer.effect(CheckpointDiffQuery, make$56);
+const layer$45 = Layer.effect(CheckpointDiffQuery, make$54);
 //#endregion
 //#region src/orchestration/ThreadLiveEventCoalescer.ts
 const COALESCE_WINDOW = Duration.millis(50);
@@ -102963,7 +103581,7 @@ const serversEqual = (left, right) => {
 	}
 	return true;
 };
-const make$55 = Effect.gen(function* PortDiscoveryMake() {
+const make$53 = Effect.gen(function* PortDiscoveryMake() {
 	const net = yield* NetService;
 	const processRunner = yield* ProcessRunner;
 	const hostPlatform = yield* HostProcessPlatform;
@@ -103114,7 +103732,7 @@ const make$55 = Effect.gen(function* PortDiscoveryMake() {
 		unregisterTerminal
 	});
 }).pipe(Effect.withSpan("PortDiscovery.make"));
-const layer$46 = Layer.effect(PortDiscovery, make$55);
+const layer$44 = Layer.effect(PortDiscovery, make$53);
 //#endregion
 //#region src/terminal/Manager.ts
 /**
@@ -103792,7 +104410,7 @@ function normalizedRuntimeEnv(env) {
 	if (entries.length === 0) return null;
 	return Object.fromEntries(entries.toSorted(([left], [right]) => left.localeCompare(right)));
 }
-const make$54 = Effect.fn("TerminalManager.make")(function* () {
+const make$52 = Effect.fn("TerminalManager.make")(function* () {
 	const { terminalLogsDir } = yield* ServerConfig$1;
 	const ptyAdapter = yield* PtyAdapter;
 	const portDiscovery = yield* PortDiscovery;
@@ -104754,7 +105372,7 @@ const makeWithOptions$1 = Effect.fn("TerminalManager.makeWithOptions")(function*
 		subscribeMetadata
 	});
 });
-const layer$45 = Layer.effect(TerminalManager, make$54()).pipe(Layer.provide(layer$81));
+const layer$43 = Layer.effect(TerminalManager, make$52()).pipe(Layer.provide(layer$81));
 //#endregion
 //#region src/project/ProjectSetupScriptRunner.ts
 var ProjectSetupScriptOperationError = class extends Schema$1.TaggedErrorClass()("ProjectSetupScriptOperationError", {
@@ -104786,7 +105404,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$53 = Effect.gen(function* () {
+const make$51 = Effect.gen(function* () {
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 	const terminalManager = yield* TerminalManager;
 	const settingsService = yield* Effect.serviceOption(ServerSettingsService);
@@ -104849,7 +105467,7 @@ const make$53 = Effect.gen(function* () {
 	});
 	return ProjectSetupScriptRunner.of({ runForThread });
 });
-const layer$44 = Layer.effect(ProjectSetupScriptRunner, make$53);
+const layer$42 = Layer.effect(ProjectSetupScriptRunner, make$51);
 //#endregion
 //#region src/sourceControl/azureDevOpsPullRequests.ts
 const AzureDevOpsPullRequestSchema = Schema$1.Struct({
@@ -105177,7 +105795,7 @@ function decodeAzureDevOpsJson(raw, schema, operation, cwd) {
 		cause
 	})));
 }
-const make$52 = Effect.gen(function* () {
+const make$50 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const execute = (input) => process.run({
 		operation: "AzureDevOpsCli.execute",
@@ -105319,7 +105937,7 @@ const make$52 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$43 = Layer.effect(AzureDevOpsCli, make$52);
+const layer$41 = Layer.effect(AzureDevOpsCli, make$50);
 //#endregion
 //#region src/sourceControl/SourceControlProviderDiscovery.ts
 function firstNonEmptyLine(text) {
@@ -105523,7 +106141,7 @@ function toChangeRequest$5(summary) {
 		isCrossRepository: false
 	};
 }
-const make$51 = Effect.gen(function* () {
+const make$49 = Effect.gen(function* () {
 	const azure = yield* AzureDevOpsCli;
 	return SourceControlProvider.of({
 		kind: "azure-devops",
@@ -105616,7 +106234,7 @@ const make$51 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$51);
+Layer.effect(SourceControlProvider, make$49);
 //#endregion
 //#region src/sourceControl/bitbucketPullRequests.ts
 const BitbucketRepositoryRefSchema = Schema$1.Struct({
@@ -105993,7 +106611,7 @@ function responseError(operation, response) {
 		responseBodyLength: collected.text.length
 	}))));
 }
-const make$50 = Effect.gen(function* () {
+const make$48 = Effect.gen(function* () {
 	const config = yield* BitbucketApiEnvConfig;
 	const httpClient = yield* HttpClient.HttpClient;
 	const fileSystem = yield* FileSystem.FileSystem;
@@ -106209,7 +106827,7 @@ const make$50 = Effect.gen(function* () {
 		})))
 	});
 });
-const layer$41 = Layer.effect(BitbucketApi, make$50);
+const layer$39 = Layer.effect(BitbucketApi, make$48);
 //#endregion
 //#region src/sourceControl/BitbucketSourceControlProvider.ts
 function toChangeRequest$4(summary) {
@@ -106227,7 +106845,7 @@ function toChangeRequest$4(summary) {
 		...summary.headRepositoryOwnerLogin !== void 0 ? { headRepositoryOwnerLogin: summary.headRepositoryOwnerLogin } : {}
 	};
 }
-const make$49 = Effect.gen(function* () {
+const make$47 = Effect.gen(function* () {
 	const bitbucket = yield* BitbucketApi;
 	return SourceControlProvider.of({
 		kind: "bitbucket",
@@ -106318,7 +106936,7 @@ const make$49 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$49);
+Layer.effect(SourceControlProvider, make$47);
 const makeDiscovery = Effect.gen(function* () {
 	return {
 		type: "api",
@@ -106566,7 +107184,7 @@ function deriveRepositoryCloneUrlsFromCreateOutput(stdout, repository) {
 		sshUrl: `git@${fallbackHost}:${repository}.git`
 	};
 }
-const make$48 = Effect.gen(function* () {
+const make$46 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const execute = (input) => process.run({
 		operation: "GitHubCli.execute",
@@ -106684,7 +107302,7 @@ const make$48 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$39 = Layer.effect(GitHubCli, make$48);
+const layer$37 = Layer.effect(GitHubCli, make$46);
 //#endregion
 //#region src/sourceControl/gitHubAuthStatus.ts
 const GitHubAuthStatusAccountSchema = Schema$1.Struct({
@@ -106786,7 +107404,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$47 = Effect.gen(function* () {
+const make$45 = Effect.gen(function* () {
 	const github = yield* GitHubCli;
 	const listChangeRequests = (input) => {
 		if (input.state === "open") return github.listOpenPullRequests({
@@ -106902,7 +107520,7 @@ const make$47 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$47);
+Layer.effect(SourceControlProvider, make$45);
 //#endregion
 //#region src/sourceControl/gitLabMergeRequests.ts
 const GitLabProjectReferenceSchema = Schema$1.Struct({
@@ -107221,7 +107839,7 @@ function parseRepositoryPath(repository) {
 		projectPath
 	};
 }
-const make$46 = Effect.gen(function* () {
+const make$44 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const run = (input, mapError) => process.run({
 		operation: "GitLabCli.execute",
@@ -107372,7 +107990,7 @@ const make$46 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$37 = Layer.effect(GitLabCli, make$46);
+const layer$35 = Layer.effect(GitLabCli, make$44);
 //#endregion
 //#region src/sourceControl/gitLabAuthStatus.ts
 const HOST_LINE_PATTERN = /^(?:[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?|\[[a-f0-9:.]+\])(?::\d+)?$/iu;
@@ -107470,7 +108088,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$45 = Effect.gen(function* () {
+const make$43 = Effect.gen(function* () {
 	const gitlab = yield* GitLabCli;
 	return SourceControlProvider.of({
 		kind: "gitlab",
@@ -107559,7 +108177,7 @@ const make$45 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$45);
+Layer.effect(SourceControlProvider, make$43);
 //#endregion
 //#region src/sourceControl/SourceControlProviderRegistry.ts
 const PROVIDER_DETECTION_CACHE_CAPACITY = 2048;
@@ -107715,12 +108333,12 @@ const makeWithProviders = Effect.fn("makeSourceControlProviderRegistryWithProvid
 		})), { concurrency: "unbounded" })
 	});
 });
-const make$44 = Effect.gen(function* () {
-	const github = yield* make$47;
-	const gitlab = yield* make$45;
-	const bitbucket = yield* make$49;
+const make$42 = Effect.gen(function* () {
+	const github = yield* make$45;
+	const gitlab = yield* make$43;
+	const bitbucket = yield* make$47;
 	const bitbucketDiscovery = yield* makeDiscovery;
-	const azureDevOps = yield* make$51;
+	const azureDevOps = yield* make$49;
 	return yield* makeWithProviders([
 		{
 			kind: "github",
@@ -107744,7 +108362,7 @@ const make$44 = Effect.gen(function* () {
 		}
 	]);
 });
-const layer$35 = Layer.effect(SourceControlProviderRegistry, make$44);
+const layer$33 = Layer.effect(SourceControlProviderRegistry, make$42);
 //#endregion
 //#region src/sourceControl/PrTemplateDetection.ts
 const TEMPLATE_MAX_BYTES = 8e3;
@@ -108115,7 +108733,7 @@ function toPullRequestHeadRemoteInfo(pr) {
 		...pr.headRepositoryOwnerLogin !== void 0 ? { headRepositoryOwnerLogin: pr.headRepositoryOwnerLogin } : {}
 	};
 }
-const make$43 = Effect.gen(function* () {
+const make$41 = Effect.gen(function* () {
 	const gitCore = yield* GitVcsDriver;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
 	const textGeneration = yield* TextGeneration;
@@ -109089,7 +109707,7 @@ const make$43 = Effect.gen(function* () {
 		runStackedAction
 	});
 });
-const layer$34 = Layer.effect(GitManager, make$43);
+const layer$32 = Layer.effect(GitManager, make$41);
 //#endregion
 //#region src/git/GitWorkflowService.ts
 var GitWorkflowService = class extends Context.Service()("@p4code/cli/git/GitWorkflowService") {};
@@ -109126,7 +109744,7 @@ function nonRepositoryListRefs() {
 		totalCount: 0
 	};
 }
-const make$42 = Effect.gen(function* () {
+const make$40 = Effect.gen(function* () {
 	const registry = yield* VcsDriverRegistry;
 	const git = yield* GitVcsDriver;
 	const gitManager = yield* GitManager;
@@ -109212,7 +109830,7 @@ const make$42 = Effect.gen(function* () {
 		renameBranch: (input) => ensureGit("GitWorkflowService.renameBranch", input.cwd).pipe(Effect.andThen(git.renameBranch(input)))
 	});
 });
-const layer$33 = Layer.effect(GitWorkflowService, make$42);
+const layer$31 = Layer.effect(GitWorkflowService, make$40);
 //#endregion
 //#region src/pullRequest/PullRequestProvider.ts
 /**
@@ -109573,7 +110191,7 @@ function isReviewerName(value) {
 	const name = value.trim();
 	return name.length > 0 && !name.startsWith("-");
 }
-const make$41 = Effect.gen(function* () {
+const make$39 = Effect.gen(function* () {
 	const azure = yield* AzureDevOpsCli;
 	const detectArgs = ["--detect", "true"];
 	const executeJson = (input) => azure.execute({
@@ -109773,7 +110391,7 @@ const make$41 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$32 = Layer.effect(AzureDevOpsPullRequestCli, make$41);
+const layer$30 = Layer.effect(AzureDevOpsPullRequestCli, make$39);
 //#endregion
 //#region src/pullRequest/AzureDevOpsPullRequestProvider.ts
 const CAPABILITIES$3 = {
@@ -109848,7 +110466,7 @@ function toChangeRequest$1(pullRequest) {
 		labels: []
 	};
 }
-const make$40 = Effect.gen(function* () {
+const make$38 = Effect.gen(function* () {
 	const cli = yield* AzureDevOpsPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "azure-devops",
@@ -110588,7 +111206,7 @@ function mergeStrategy(method) {
 		default: return "merge_commit";
 	}
 }
-const make$39 = Effect.gen(function* () {
+const make$37 = Effect.gen(function* () {
 	const bitbucket = yield* BitbucketApi;
 	/**
 	* The repository's own path, and the workspace above it — which the people who may review are
@@ -110868,7 +111486,7 @@ const make$39 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid))
 	});
 });
-const layer$31 = Layer.effect(BitbucketPullRequestApi, make$39);
+const layer$29 = Layer.effect(BitbucketPullRequestApi, make$37);
 //#endregion
 //#region src/pullRequest/BitbucketPullRequestProvider.ts
 const CAPABILITIES$2 = {
@@ -110948,7 +111566,7 @@ function toChangeRequest(pullRequest) {
 		labels: []
 	};
 }
-const make$38 = Effect.gen(function* () {
+const make$36 = Effect.gen(function* () {
 	const api = yield* BitbucketPullRequestApi;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "bitbucket",
@@ -113177,7 +113795,7 @@ function actionArgs$1(action, mergeMethod, updateMethod) {
 		case "reopen": return ["reopen"];
 	}
 }
-const make$37 = Effect.gen(function* () {
+const make$35 = 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
@@ -113940,7 +114558,7 @@ const make$37 = Effect.gen(function* () {
 		})))
 	});
 });
-const layer$30 = Layer.effect(GitHubPullRequestCli, make$37);
+const layer$28 = Layer.effect(GitHubPullRequestCli, make$35);
 //#endregion
 //#region src/pullRequest/GitHubPullRequestProvider.ts
 const CAPABILITIES$1 = {
@@ -114057,7 +114675,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$36 = Effect.gen(function* () {
+const make$34 = Effect.gen(function* () {
 	const cli = yield* GitHubPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "github",
@@ -115079,7 +115697,7 @@ function actionArgs(action, mergeMethod) {
 		case "reopen": return ["reopen"];
 	}
 }
-const make$35 = Effect.gen(function* () {
+const make$33 = Effect.gen(function* () {
 	const gitlab = yield* GitLabCli;
 	const api = (input) => gitlab.execute({
 		cwd: input.cwd,
@@ -115650,7 +116268,7 @@ const make$35 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$29 = Layer.effect(GitLabPullRequestCli, make$35);
+const layer$27 = Layer.effect(GitLabPullRequestCli, make$33);
 //#endregion
 //#region src/pullRequest/GitLabPullRequestProvider.ts
 const CAPABILITIES = {
@@ -115730,7 +116348,7 @@ function reasonFor(error) {
 	if (error._tag === "GitLabCliAuthenticationError") return "unauthenticated";
 	return "failed";
 }
-const make$34 = Effect.gen(function* () {
+const make$32 = Effect.gen(function* () {
 	const cli = yield* GitLabPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "gitlab",
@@ -115873,13 +116491,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$33 = Effect.map(Effect.all([
-	make$36,
+const make$31 = Effect.map(Effect.all([
 	make$34,
-	make$38,
-	make$40
+	make$32,
+	make$36,
+	make$38
 ]), fromProviders);
-const layer$28 = Layer.effect(PullRequestProviderRegistry, make$33).pipe(Layer.provide(layer$30.pipe(Layer.provide(layer$39))), Layer.provide(layer$29.pipe(Layer.provide(layer$37))), Layer.provide(layer$31.pipe(Layer.provide(layer$41))), Layer.provide(layer$32.pipe(Layer.provide(layer$43))));
+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))));
 //#endregion
 //#region src/pullRequest/PullRequestService.ts
 /**
@@ -116067,7 +116685,7 @@ function repositoryIdentityOf(project) {
 	if (identity.displayName) return identity.displayName;
 	return identity.owner && identity.name ? `${identity.owner}/${identity.name}` : null;
 }
-const make$32 = Effect.gen(function* () {
+const make$30 = Effect.gen(function* () {
 	const registry = yield* PullRequestProviderRegistry;
 	const projections = yield* ProjectionSnapshotQuery;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
@@ -117065,7 +117683,7 @@ const make$32 = Effect.gen(function* () {
 		invalidate
 	});
 });
-const layer$27 = Layer.effect(PullRequestService, make$32);
+const layer$25 = Layer.effect(PullRequestService, make$30);
 //#endregion
 //#region src/orchestration/ThreadWorkspaceLifecycle.ts
 var ThreadWorkspaceLifecycleError = class extends Data.TaggedError("ThreadWorkspaceLifecycleError") {};
@@ -117109,7 +117727,7 @@ const mapLifecycleError = Effect.mapError((cause) => cause instanceof ThreadWork
 	detail: "Thread workspace lifecycle operation failed.",
 	cause
 }));
-const make$31 = Effect.gen(function* () {
+const make$29 = Effect.gen(function* () {
 	const snapshots = yield* ProjectionSnapshotQuery;
 	const engine = yield* OrchestrationEngineService;
 	const gitWorkflow = yield* GitWorkflowService;
@@ -117363,7 +117981,7 @@ const make$31 = Effect.gen(function* () {
 		record
 	};
 });
-const layer$26 = Layer.effect(ThreadWorkspaceLifecycleService, make$31);
+const layer$24 = Layer.effect(ThreadWorkspaceLifecycleService, make$29);
 //#endregion
 //#region src/textGeneration/BtwRequestCoordinator.ts
 const MAX_PENDING_BTW_CANCELLATIONS = 256;
@@ -119636,7 +120254,7 @@ function makeUpdateState(input) {
 		output: input.output ?? null
 	};
 }
-const make$30 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
+const make$28 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
 	const providerRegistry = yield* ProviderRegistry;
 	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 	const httpClient = yield* HttpClient.HttpClient;
@@ -119722,7 +120340,7 @@ const make$30 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
 					status: stillOutdated ? "unchanged" : "succeeded",
 					startedAt,
 					finishedAt,
-					message: couldNotVerify ? "Update command completed, but P4Code could not verify the provider version." : stillOutdated ? "Update command completed, but P4Code still detects an outdated provider version." : "Provider updated.",
+					message: couldNotVerify ? "Update command completed, but P4 Code could not verify the provider version." : stillOutdated ? "Update command completed, but P4 Code still detects an outdated provider version." : "Provider updated.",
 					output: commandOutput(result)
 				}));
 			});
@@ -119751,7 +120369,7 @@ const make$30 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
 	});
 	return ProviderMaintenanceRunner.of({ updateProvider });
 });
-const layer$25 = Layer.effect(ProviderMaintenanceRunner, make$30());
+const layer$23 = Layer.effect(ProviderMaintenanceRunner, make$28());
 //#endregion
 //#region src/usage/usageTranscripts.ts
 const EMPTY_TOTALS = {
@@ -120574,7 +121192,7 @@ Layer.succeed(UsageService, UsageService.of({ readSummary: (input) => Effect.suc
 	},
 	scanDurationMs: 0
 }) }));
-const make$29 = Effect.gen(function* () {
+const make$27 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const config = yield* ServerConfig$1;
@@ -120816,7 +121434,7 @@ const make$29 = Effect.gen(function* () {
 		};
 	}) };
 });
-const layer$24 = Layer.effect(UsageService, make$29);
+const layer$22 = Layer.effect(UsageService, make$27);
 //#endregion
 //#region src/feed/FeedStore.ts
 const storageFailure = (message) => new FeedError({
@@ -121180,7 +121798,7 @@ const jsonRequest = Effect.fn("FeedService.jsonRequest")(function* (url, token,
 		catch: () => fail("hub_unavailable", "Hub returned invalid JSON.")
 	});
 });
-const make$28 = Effect.gen(function* () {
+const make$26 = Effect.gen(function* () {
 	const hubLink = yield* HubLink;
 	const providers = yield* ProviderInstanceRegistry;
 	const config = yield* ServerConfig$1;
@@ -121418,7 +122036,7 @@ var FeedService = class extends Context.Reference("@p4code/cli/feed/FeedService"
 	markRead: unavailable,
 	cleanup: unavailable
 }) }) {};
-const layer$23 = Layer.effect(FeedService, make$28);
+const layer$21 = Layer.effect(FeedService, make$26);
 const SKILL_MANIFEST_FILENAME = "SKILL.md";
 /**
 * Split a catalogue id (`owner/repo/skill-name`) into its parts.
@@ -121564,7 +122182,7 @@ const emptyFetch = (id, unavailable) => ({
 	skipped: [],
 	unavailable
 });
-const make$27 = Effect.gen(function* () {
+const make$25 = 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));
@@ -121635,117 +122253,7 @@ const make$27 = Effect.gen(function* () {
 		fetch
 	};
 });
-const layer$22 = Layer.effect(SkillRegistry, make$27);
-//#endregion
-//#region src/mcp/McpInvocationContext.ts
-var McpInvocationContext = class extends Context.Service()("@p4code/cli/mcp/McpInvocationContext") {};
-const requireMcpCapability = Effect.fn("mcp.requireCapability")(function* (capability) {
-	const invocation = yield* McpInvocationContext;
-	if (!invocation.capabilities.has(capability)) return yield* new PreviewAutomationUnavailableError({
-		capability,
-		environmentId: invocation.environmentId,
-		threadId: invocation.threadId,
-		providerSessionId: invocation.providerSessionId,
-		providerInstanceId: invocation.providerInstanceId
-	});
-	return invocation;
-});
-/**
-* The task-board counterpart of {@link requireMcpCapability}. The two are
-* separate because each capability reports its own absence with the error type
-* its toolkit declares as a failure, and those unions do not overlap.
-*/
-const requireTaskCapability = Effect.fn("mcp.requireTaskCapability")(function* () {
-	const invocation = yield* McpInvocationContext;
-	if (!invocation.capabilities.has("tasks")) return yield* new TaskToolUnavailableError({
-		capability: "tasks",
-		environmentId: invocation.environmentId,
-		threadId: invocation.threadId,
-		providerSessionId: invocation.providerSessionId,
-		providerInstanceId: invocation.providerInstanceId
-	});
-	return invocation;
-});
-/**
-* The watch capability's guard is two checks, not one: the capability must be
-* present AND the requested thread must be in the explicit grant set. The two
-* failures are distinct errors so a watcher can tell "this session cannot
-* watch at all" apart from "not this thread".
-*/
-const requireWatchCapability = Effect.fn("mcp.requireWatchCapability")(function* (watchedThreadId) {
-	const invocation = yield* McpInvocationContext;
-	if (!invocation.capabilities.has("watch")) return yield* new WatchToolUnavailableError({
-		capability: "watch",
-		environmentId: invocation.environmentId,
-		threadId: invocation.threadId,
-		providerSessionId: invocation.providerSessionId,
-		providerInstanceId: invocation.providerInstanceId
-	});
-	if (!invocation.watchThreadIds?.has(watchedThreadId)) return yield* new ThreadWatchNotPermittedError({ threadId: watchedThreadId });
-	return invocation;
-});
-/**
-* The advise guard mirrors the watch guard's two checks - capability present
-* AND thread in the explicit grant - because advising carries strictly more
-* power than watching. A watch-only credential fails the first check here no
-* matter what threads it can read.
-*/
-const requireAdviseCapability = Effect.fn("mcp.requireAdviseCapability")(function* (advisedThreadId) {
-	const invocation = yield* McpInvocationContext;
-	if (!invocation.capabilities.has("advise")) return yield* new AdviseToolUnavailableError({
-		capability: "advise",
-		environmentId: invocation.environmentId,
-		threadId: invocation.threadId,
-		providerSessionId: invocation.providerSessionId,
-		providerInstanceId: invocation.providerInstanceId
-	});
-	if (!invocation.adviseThreadIds?.has(advisedThreadId)) return yield* new ThreadAdviseNotPermittedError({ threadId: advisedThreadId });
-	return invocation;
-});
-/** Third of the trio, for the same reason the second exists. */
-const requireThreadCapability = Effect.fn("mcp.requireThreadCapability")(function* () {
-	const invocation = yield* McpInvocationContext;
-	if (!invocation.capabilities.has("threads")) return yield* new ThreadToolUnavailableError({
-		capability: "threads",
-		environmentId: invocation.environmentId,
-		threadId: invocation.threadId,
-		providerSessionId: invocation.providerSessionId,
-		providerInstanceId: invocation.providerInstanceId
-	});
-	return invocation;
-});
-/**
-* The thread a control tool may act on, given what it was asked to act on.
-*
-* Two checks like `requireWatchCapability`, and for the same reason: the
-* capability says this session controls threads at all, the grant says which.
-* An omitted id resolves to the session's own thread, which is always in the
-* grant and is why the common call needs no id and so cannot name a wrong one.
-*/
-const requireThreadControlTarget = Effect.fn("mcp.requireThreadControlTarget")(function* (requested) {
-	const invocation = yield* requireThreadCapability();
-	if (requested === void 0 || requested === invocation.threadId) return {
-		invocation,
-		threadId: invocation.threadId
-	};
-	if (!invocation.controlThreadIds?.has(requested)) return yield* new ThreadControlNotPermittedError({ threadId: requested });
-	return {
-		invocation,
-		threadId: requested
-	};
-});
-/**
-* The guard on starting a thread, which is a different question from acting on
-* one: it is not "which thread" but "may this session make more of them".
-*/
-const requireThreadSpawn = Effect.fn("mcp.requireThreadSpawn")(function* (fusion = false) {
-	const invocation = yield* requireThreadCapability();
-	if (invocation.mayCreateThreads !== true && !(fusion && invocation.mayCreateFusionPairs === true)) return yield* new ThreadSpawnNotPermittedError({
-		threadId: invocation.threadId,
-		detail: "this thread was itself started by an agent, and spawning goes one level deep so a runaway loop has a bound"
-	});
-	return invocation;
-});
+const layer$20 = Layer.effect(SkillRegistry, make$25);
 //#endregion
 //#region src/mcp/PreviewAutomationBroker.ts
 var PreviewAutomationBroker = class extends Context.Service()("@p4code/cli/mcp/PreviewAutomationBroker") {};
@@ -121863,7 +122371,7 @@ const classifyResponseError = (context, error) => {
 		});
 	}
 };
-const make$26 = Effect.gen(function* PreviewAutomationBrokerMake() {
+const make$24 = Effect.gen(function* PreviewAutomationBrokerMake() {
 	const crypto = yield* Crypto.Crypto;
 	const state = yield* SynchronizedRef.make({
 		clients: /* @__PURE__ */ new Map(),
@@ -122097,7 +122605,7 @@ const make$26 = Effect.gen(function* PreviewAutomationBrokerMake() {
 		invoke
 	});
 }).pipe(Effect.withSpan("PreviewAutomationBroker.make"));
-const layer$21 = Layer.effect(PreviewAutomationBroker, make$26);
+const layer$19 = Layer.effect(PreviewAutomationBroker, make$24);
 //#endregion
 //#region src/preview/Manager.ts
 /**
@@ -122161,7 +122669,7 @@ const buildIdleSnapshot = (input) => ({
 	viewport: FILL_PREVIEW_VIEWPORT,
 	updatedAt: input.updatedAt
 });
-const make$25 = Effect.gen(function* PreviewManagerMake() {
+const make$23 = Effect.gen(function* PreviewManagerMake() {
 	const serverEpoch = NodeCrypto.randomUUID();
 	const stateRef = yield* SynchronizedRef.make(initialState);
 	const eventsPubSub = yield* PubSub.unbounded();
@@ -122392,7 +122900,7 @@ const make$25 = Effect.gen(function* PreviewManagerMake() {
 		subscribeEvents: PubSub.subscribe(eventsPubSub)
 	});
 }).pipe(Effect.withSpan("PreviewManager.make"));
-const layer$20 = Layer.effect(PreviewManager, make$25);
+const layer$18 = Layer.effect(PreviewManager, make$23);
 //#endregion
 //#region src/workspace/WorkspaceSearchIndex.ts
 const WORKSPACE_INDEX_MAX_ENTRIES = 25e3;
@@ -122529,7 +123037,7 @@ const waitForScan = (cwd, finder, onFailure) => Effect.try({
 		timeout: WORKSPACE_INDEX_SCAN_TIMEOUT
 	})
 }), Effect.withSpan("WorkspaceSearchIndex.waitForScan"));
-const make$24 = Effect.fn("WorkspaceSearchIndex.make")(function* (cwd, contentSearch = false) {
+const make$22 = 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({
@@ -122669,14 +123177,14 @@ const make$24 = 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$19 = (cwd) => Layer.effect(WorkspaceSearchIndex, make$24(cwd));
+const layer$17 = (cwd) => Layer.effect(WorkspaceSearchIndex, make$22(cwd));
 var WorkspaceSearchIndexMap = class extends LayerMap.Service()("@p4code/cli/workspace/WorkspaceSearchIndexMap", {
-	lookup: layer$19,
+	lookup: layer$17,
 	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$24(cwd, true)),
+	lookup: (cwd) => Layer.effect(WorkspaceSearchIndex, make$22(cwd, true)),
 	idleTimeToLive: WORKSPACE_INDEX_IDLE_TTL
 }) {};
 //#endregion
@@ -122738,7 +123246,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$23 = Effect.gen(function* () {
+const make$21 = Effect.gen(function* () {
 	const path = yield* Path$1.Path;
 	const workspacePaths = yield* WorkspacePaths;
 	const contentSearchIndexes = yield* WorkspaceContentSearchIndexMap;
@@ -122820,7 +123328,7 @@ const make$23 = Effect.gen(function* () {
 		searchContents
 	});
 });
-const layer$18 = Layer.effect(WorkspaceEntries, make$23).pipe(Layer.provide(WorkspaceSearchIndexMap.layer), Layer.provide(WorkspaceContentSearchIndexMap.layer));
+const layer$16 = Layer.effect(WorkspaceEntries, make$21).pipe(Layer.provide(WorkspaceSearchIndexMap.layer), Layer.provide(WorkspaceContentSearchIndexMap.layer));
 //#endregion
 //#region src/workspace/WorkspaceFileSystem.ts
 /**
@@ -122879,7 +123387,7 @@ Schema$1.Union([
 ]);
 /** Service tag for workspace file operations. */
 var WorkspaceFileSystem = class extends Context.Service()("@p4code/cli/workspace/WorkspaceFileSystem") {};
-const make$22 = Effect.gen(function* () {
+const make$20 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const workspacePaths = yield* WorkspacePaths;
@@ -123023,7 +123531,7 @@ const make$22 = Effect.gen(function* () {
 		writeFile
 	});
 });
-const layer$17 = Layer.effect(WorkspaceFileSystem, make$22);
+const layer$15 = Layer.effect(WorkspaceFileSystem, make$20);
 //#endregion
 //#region src/vcs/VcsStatusBroadcaster.ts
 const DEFAULT_VCS_STATUS_REFRESH_INTERVAL = Duration.seconds(30);
@@ -123105,7 +123613,7 @@ const autoPullPolicyLayer = Layer.effect(VcsAutoPullPolicy, Effect.gen(function*
 		return resolveProjectAutoPull(yield* settingsService.getSettings, project.value.id);
 	}, Effect.orElseSucceed(() => false)) };
 }));
-const make$21 = Effect.gen(function* () {
+const make$19 = Effect.gen(function* () {
 	const autoPullPolicy = yield* VcsAutoPullPolicy;
 	const workflow = yield* GitWorkflowService;
 	const fs = yield* FileSystem.FileSystem;
@@ -123364,7 +123872,7 @@ const make$21 = Effect.gen(function* () {
 		streamStatus
 	});
 });
-const layer$16 = Layer.effect(VcsStatusBroadcaster, make$21);
+const layer$14 = Layer.effect(VcsStatusBroadcaster, make$19);
 //#endregion
 //#region src/vcs/VcsProvisioningService.ts
 var VcsProvisioningService = class extends Context.Service()("@p4code/cli/vcs/VcsProvisioningService") {};
@@ -123377,7 +123885,7 @@ function resolveRequestedKind(kind) {
 	}));
 	return Effect.succeed(kind);
 }
-const make$20 = Effect.gen(function* () {
+const make$18 = Effect.gen(function* () {
 	const registry = yield* VcsDriverRegistry;
 	const initRepository = Effect.fn("VcsProvisioningService.initRepository")(function* (input) {
 		const kind = yield* resolveRequestedKind(input.kind);
@@ -123385,11 +123893,11 @@ const make$20 = Effect.gen(function* () {
 	});
 	return VcsProvisioningService.of({ initRepository });
 });
-const layer$15 = Layer.effect(VcsProvisioningService, make$20);
+const layer$13 = Layer.effect(VcsProvisioningService, make$18);
 //#endregion
 //#region src/review/ReviewService.ts
 var ReviewService = class extends Context.Service()("@p4code/cli/review/ReviewService") {};
-const make$19 = Effect.gen(function* () {
+const make$17 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
@@ -123445,7 +123953,7 @@ const make$19 = Effect.gen(function* () {
 	});
 	return ReviewService.of({ getDiffPreview });
 });
-const layer$14 = Layer.effect(ReviewService, make$19);
+const layer$12 = Layer.effect(ReviewService, make$17);
 //#endregion
 //#region src/diagnostics/ProcessDiagnostics.ts
 const PROCESS_QUERY_TIMEOUT_MS = 1e3;
@@ -123740,7 +124248,7 @@ function assertDescendantPid(pid) {
 		}));
 	}));
 }
-const make$18 = Effect.gen(function* () {
+const make$16 = Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const read = Effect.gen(function* () {
 		const readAt = yield* DateTime.now;
@@ -123784,7 +124292,7 @@ const make$18 = Effect.gen(function* () {
 		signal
 	});
 });
-const layer$13 = Layer.effect(ProcessDiagnostics, make$18);
+const layer$11 = Layer.effect(ProcessDiagnostics, make$16);
 //#endregion
 //#region src/diagnostics/ProcessResourceMonitor.ts
 const SAMPLE_INTERVAL_MS = 5e3;
@@ -123935,7 +124443,7 @@ function aggregateProcessResourceHistory(input) {
 		}) : Option.none()
 	};
 }
-const make$17 = Effect.gen(function* () {
+const make$15 = Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const state = yield* Ref.make({
 		samples: [],
@@ -123984,7 +124492,7 @@ const make$17 = Effect.gen(function* () {
 	});
 	return ProcessResourceMonitor.of({ readHistory });
 });
-const layer$12 = Layer.effect(ProcessResourceMonitor, make$17);
+const layer$10 = Layer.effect(ProcessResourceMonitor, make$15);
 //#endregion
 //#region src/diagnostics/TraceDiagnostics.ts
 var TraceFileReadError = class extends Schema$1.TaggedErrorClass()("TraceFileReadError", {
@@ -124232,7 +124740,7 @@ function readTraceFile(fileSystem, path) {
 		cause
 	})) }));
 }
-const make$16 = Effect.gen(function* () {
+const make$14 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const read = Effect.fn("TraceDiagnostics.read")(function* (options) {
 		const readAt = options.readAt ?? (yield* DateTime.now);
@@ -124276,7 +124784,7 @@ const make$16 = Effect.gen(function* () {
 	});
 	return TraceDiagnostics.of({ read });
 });
-const layer$11 = Layer.effect(TraceDiagnostics, make$16);
+const layer$9 = Layer.effect(TraceDiagnostics, make$14);
 function readTraceDiagnostics(options) {
 	return Effect.gen(function* () {
 		return yield* (yield* TraceDiagnostics).read(options);
@@ -124311,7 +124819,7 @@ function snapshotFromDetail(link, detail, syncedAt) {
 		mergeability: detail.mergeability
 	};
 }
-const make$15 = Effect.gen(function* () {
+const make$13 = Effect.gen(function* () {
 	const engine = yield* OrchestrationEngineService;
 	const projections = yield* ProjectionSnapshotQuery;
 	const pullRequests = yield* PullRequestService;
@@ -124405,7 +124913,7 @@ const make$15 = Effect.gen(function* () {
 	};
 });
 var PullRequestSyncReactor = class extends Context.Service()("@p4code/cli/orchestration/Layers/PullRequestSyncReactor") {};
-const PullRequestSyncReactorLive = Layer.effect(PullRequestSyncReactor, make$15);
+const PullRequestSyncReactorLive = Layer.effect(PullRequestSyncReactor, make$13);
 //#endregion
 //#region src/sourceControl/SourceControlDiscovery.ts
 const VCS_PROBES = [{
@@ -124424,7 +124932,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$14 = Effect.gen(function* () {
+const make$12 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const process = yield* VcsProcess;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
@@ -124473,7 +124981,7 @@ const make$14 = Effect.gen(function* () {
 		sourceControlProviders: sourceControlProviders.discover
 	}) });
 });
-const layer$10 = Layer.effect(SourceControlDiscovery, make$14);
+const layer$8 = Layer.effect(SourceControlDiscovery, make$12);
 //#endregion
 //#region src/sourceControl/SourceControlRepositoryService.ts
 const isSourceControlRepositoryError = Schema$1.is(SourceControlRepositoryError);
@@ -124506,7 +125014,7 @@ function expandHomePath(input, path) {
 	if (input.startsWith("~/") || input.startsWith("~\\")) return path.join(NodeOS.homedir(), input.slice(2));
 	return input;
 }
-const make$13 = Effect.gen(function* () {
+const make$11 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const git = yield* GitVcsDriver;
@@ -124645,7 +125153,7 @@ const make$13 = Effect.gen(function* () {
 		publishRepository: (input) => publishRepository(input).pipe(mapRepositoryError("publishRepository", input.provider))
 	});
 });
-const layer$9 = Layer.effect(SourceControlRepositoryService, make$13);
+const layer$7 = Layer.effect(SourceControlRepositoryService, make$11);
 //#endregion
 //#region src/ws.ts
 /** Matches `p4c hub token add`, so a token minted here and one minted there are the same thing. */
@@ -124899,6 +125407,7 @@ const RPC_REQUIRED_SCOPE = /* @__PURE__ */ new Map([
 	[WS_METHODS.computerUseConnect, AuthOrchestrationOperateScope],
 	[WS_METHODS.computerUseList, AuthOrchestrationReadScope],
 	[WS_METHODS.computerUseControls, AuthOrchestrationReadScope],
+	[WS_METHODS.computerUsePreview, AuthOrchestrationReadScope],
 	[WS_METHODS.computerUseControl, AuthOrchestrationOperateScope],
 	[WS_METHODS.computerUseRespond, AuthOrchestrationOperateScope],
 	[WS_METHODS.previewAutomationConnect, AuthOrchestrationOperateScope],
@@ -125989,6 +126498,7 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker, computerUseBrok
 		[WS_METHODS.previewReportStatus]: (input) => observeRpcEffect$1(WS_METHODS.previewReportStatus, previewManager.reportStatus(input), { "rpc.aggregate": "preview" }),
 		[WS_METHODS.computerUseList]: () => computerUseBroker.list,
 		[WS_METHODS.computerUseControls]: () => computerUseBroker.controls,
+		[WS_METHODS.computerUsePreview]: (input) => computerUseBroker.preview(input),
 		[WS_METHODS.computerUseControl]: (input) => computerUseBroker.control(input),
 		[WS_METHODS.computerUseConnect]: () => Effect.fail(new ComputerUseError({
 			reason: "denied",
@@ -126083,7 +126593,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$25), 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$10.pipe(Layer.provide(layer$35.pipe(Layer.provide(Layer.mergeAll(layer$43, layer$41, layer$39, layer$37)), Layer.provideMerge(layer$51), Layer.provide(layer$49.pipe(Layer.provide(layer$50))))), Layer.provide(layer$52))))));
+		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))))));
 		return yield* Effect.acquireUseRelease(sessions.markConnected(session.sessionId), () => rpcWebSocketHttpEffect, () => sessions.markDisconnected(session.sessionId));
 	}).pipe(Effect.catchTags({
 		EnvironmentAuthInvalidError: HttpServerRespondable.toResponse,
@@ -126148,7 +126658,7 @@ function toPersistenceSqlOrDecodeError(sqlOperation, decodeOperation, correlatio
 		cause
 	});
 }
-const make$12 = Effect.gen(function* () {
+const make$10 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const upsertRuntimeRow = SqlSchema.void({
 		Request: ProviderSessionRuntimeDbRowSchema,
@@ -126251,7 +126761,7 @@ const make$12 = Effect.gen(function* () {
 		deleteByThreadId
 	};
 });
-const layer$8 = Layer.effect(ProviderSessionRuntimeRepository, make$12);
+const layer$6 = Layer.effect(ProviderSessionRuntimeRepository, make$10);
 //#endregion
 //#region src/provider/Layers/ProviderSessionDirectory.ts
 const decodeProviderDriverKindValue = Schema$1.decodeUnknownEffect(ProviderDriverKind);
@@ -126704,7 +127214,7 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 	});
 });
 let activeMcpSessionRegistry;
-const make$11 = Effect.acquireRelease(Effect.gen(function* () {
+const make$9 = 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(() => {
@@ -126712,7 +127222,7 @@ const make$11 = Effect.acquireRelease(Effect.gen(function* () {
 }))), (registry) => registry.revokeAll.pipe(Effect.andThen(Effect.sync(() => {
 	if (activeMcpSessionRegistry === registry) activeMcpSessionRegistry = void 0;
 }))));
-const layer$7 = Layer.effect(McpSessionRegistry, make$11);
+const layer$5 = Layer.effect(McpSessionRegistry, make$9);
 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
@@ -127094,7 +127604,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (options)
 				threadId,
 				provider: resolvedProvider
 			};
-			if (!instanceInfo.enabled) return yield* toValidationError("ProviderService.startSession", `Provider instance '${resolvedInstanceId}' is disabled in P4Code settings.`);
+			if (!instanceInfo.enabled) return yield* toValidationError("ProviderService.startSession", `Provider instance '${resolvedInstanceId}' is disabled in P4 Code settings.`);
 			const persistedBinding = Option.getOrUndefined(yield* directory.getBinding(threadId));
 			const effectiveResumeCursor = input.resumeCursor ?? (persistedBinding?.providerInstanceId === resolvedInstanceId ? persistedBinding.resumeCursor : void 0);
 			const effectiveCwd = input.cwd ?? (persistedBinding?.providerInstanceId === resolvedInstanceId ? readPersistedCwd(persistedBinding.runtimePayload) : void 0);
@@ -127183,7 +127693,10 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (options)
 				status: "running",
 				...turn.resumeCursor !== void 0 ? { resumeCursor: turn.resumeCursor } : {},
 				runtimePayload: {
-					...input.modelSelection !== void 0 ? { modelSelection: input.modelSelection } : {},
+					...input.modelSelection !== void 0 ? {
+						model: input.modelSelection.model,
+						modelSelection: input.modelSelection
+					} : {},
 					activeTurnId: turn.turnId,
 					lastRuntimeEvent: "provider.sendTurn",
 					lastRuntimeEventAt: yield* nowIso
@@ -127657,7 +128170,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 getState(), activate(), click({elementId}), or type({elementId,text}) to replace a field value. Element IDs come from the latest app snapshot. List windows with app.windows(); capture a listed ID with app.screenshot(windowId), then nodeRepl.emitImage(image). 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.",
+	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.",
 	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." })
@@ -127730,163 +128243,6 @@ const register = Effect.fn("computerUse.register")(function* () {
 /** Images use MCP image blocks instead of returning base64 in text output. */
 const ComputerUseToolkitRegistrationLive = Layer.effectDiscard(register()).pipe(Layer.provide(ComputerUseToolkitHandlersLive));
 //#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$10 = 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$6 = Layer.effect(DeviceScreenshot, make$10().pipe(Effect.map((capture) => ({ capture }))));
-//#endregion
-//#region src/device/DeviceCommandProxy.ts
-var DeviceCommandProxyFailure = class extends Data.TaggedError("DeviceCommandProxyFailure") {};
-const COMMAND_TIMEOUT_MS = 3e4;
-const MAX_RESPONSE_BYTES$1 = 64 * 1024;
-const Reply = Schema$1.Struct({
-	jsonrpc: Schema$1.Literal("2.0"),
-	id: Schema$1.String,
-	result: Schema$1.Struct({ ok: Schema$1.Boolean })
-});
-const make$9 = Effect.fn("DeviceCommandProxy.make")(function* () {
-	const http = yield* HttpClient.HttpClient;
-	const daemonSessions = /* @__PURE__ */ new WeakMap();
-	return Effect.fn("DeviceCommandProxy.execute")(function* (endpoint, session, payload) {
-		const input = yield* Schema$1.decodeUnknownEffect(DeviceCommandInput)(payload);
-		if (input.hostId !== session.hostId || input.deviceId !== session.deviceId) return yield* new DeviceCommandProxyFailure({ message: "Target mismatch" });
-		const origin = yield* Effect.try(() => new URL(endpoint.baseUrl));
-		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 DeviceCommandProxyFailure({ message: "Invalid owned daemon" });
-		let daemonSession = daemonSessions.get(session);
-		if (!daemonSession) {
-			daemonSession = `p4-${NodeCrypto.randomUUID()}`;
-			daemonSessions.set(session, daemonSession);
-		}
-		const id = NodeCrypto.randomUUID();
-		const request = HttpClientRequest.post(`${origin.origin}/rpc`).pipe(HttpClientRequest.bodyJsonUnsafe({
-			jsonrpc: "2.0",
-			id,
-			method: "agent_device.command",
-			params: {
-				token: endpoint.token,
-				session: daemonSession,
-				command: input.command,
-				positionals: input.command === "press" ? [String(input.x), String(input.y)] : [input.text],
-				flags: session.platform === "ios" ? {
-					platform: "ios",
-					udid: session.deviceId
-				} : {
-					platform: "android",
-					serial: session.deviceId
-				}
-			}
-		}));
-		const response = yield* http.execute(request);
-		if (response.status !== 200) return yield* new DeviceCommandProxyFailure({ message: "Command rejected" });
-		let bytes = 0;
-		const body = yield* collectUint8StreamText({
-			stream: response.stream.pipe(Stream.mapEffect((chunk) => {
-				bytes += chunk.byteLength;
-				return bytes > MAX_RESPONSE_BYTES$1 ? Effect.fail(new DeviceCommandProxyFailure({ message: "Command response too large" })) : Effect.succeed(chunk);
-			})),
-			maxBytes: MAX_RESPONSE_BYTES$1
-		});
-		if (body.invalidUtf8 || body.truncated) return yield* new DeviceCommandProxyFailure({ message: "Invalid response" });
-		const reply = yield* Schema$1.decodeUnknownEffect(Schema$1.fromJsonString(Reply))(body.text);
-		if (reply.id !== id || !reply.result.ok) return yield* new DeviceCommandProxyFailure({ message: "Command not acknowledged" });
-		return { ok: true };
-	}, Effect.scoped, Effect.timeout(Duration.millis(COMMAND_TIMEOUT_MS)), Effect.mapError(() => new DeviceOperationError({
-		operation: "command",
-		reason: "request_failed",
-		cause: "Device command could not be completed."
-	})));
-});
-var DeviceCommandProxy = class extends Context.Service()("@p4code/cli/device/DeviceCommandProxy") {};
-const layer$5 = Layer.effect(DeviceCommandProxy, make$9().pipe(Effect.map((execute) => ({ execute }))));
-//#endregion
-//#region src/mcp/DeviceInvocation.ts
-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 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();
-	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()))));
-});
-const withDeviceSession = (target, execute) => withDeviceInvocation((service, threadId) => service.withAgentCommand({
-	hostId: target.hostId,
-	deviceId: target.deviceId,
-	threadId
-}, execute));
-//#endregion
 //#region src/mcp/toolkits/devices/tools.ts
 const DeviceCommandTool = Tool.make("device_command", {
 	description: "Press explicit screen coordinates or type text into the focused field on a device already opened in this thread. Requires separate agent device consent and the exact host/device session. Coordinates are device screen coordinates. No arbitrary CLI commands or flags are accepted.",
@@ -128867,14 +129223,29 @@ const ThreadPairCreateTool = Tool.make("thread_pair_create", {
 		Crypto.Crypto
 	]
 }).annotate(Tool.Title, "Create a Fusion pair").annotate(Tool.Readonly, false).annotate(Tool.Destructive, false).annotate(Tool.Idempotent, false);
+const ThreadPairDetachTool = Tool.make("thread_pair_detach", {
+	description: "Detach this agent session's active Fusion pair, stopping future automatic supervisor reviews while preserving both threads. The session must be the pair's implementer and must have created its supervisor through thread_spawn.",
+	parameters: ThreadPairDetachInput,
+	success: ThreadPairDetachResult,
+	failure: ThreadControlToolError,
+	dependencies: [
+		McpInvocationContext,
+		OrchestrationEngineService,
+		ProjectionSnapshotQuery,
+		Crypto.Crypto
+	]
+}).annotate(Tool.Title, "Detach Fusion pair").annotate(Tool.Readonly, false).annotate(Tool.Destructive, false).annotate(Tool.Idempotent, false);
 const ThreadConfigureTool = Tool.make("thread_configure", {
-	description: "Change a thread's settings: title, model, permission mode, interaction mode, compression, and whether it may use subagents without asking. Omit threadId to configure this session's own thread; name one only if this session started it. Every field is optional and an omitted field is left alone; the settings actually changed come back in the result.",
+	description: "Change a thread's settings: title, model, permission mode, interaction mode, compression, and whether it may use subagents without asking. Omit threadId to configure this session's own thread; name one only if this session started it. Supported model changes apply to the next turn, including automatic Fusion continuation. Started conversations cannot switch provider drivers or incompatible provider instances; such requests fail before any setting is changed. To use another provider, create a new thread with that selection (thread_spawn, optionally fusion: true) and preserve the current thread. Every field is optional and an omitted field is left alone; the settings actually changed come back in the result.",
 	parameters: ThreadConfigureInput,
 	success: ThreadConfigureResult,
 	failure: ThreadControlToolError,
 	dependencies: [
 		McpInvocationContext,
 		OrchestrationEngineService,
+		ProjectionThreadRepository,
+		ProjectionThreadSessionRepository,
+		ProviderRegistry,
 		Crypto.Crypto
 	]
 }).annotate(Tool.Title, "Configure a thread").annotate(Tool.Readonly, false).annotate(Tool.Destructive, false).annotate(Tool.Idempotent, true);
@@ -128963,7 +129334,7 @@ const ThreadPlanUpdateTool = Tool.make("thread_plan_update", {
 		Crypto.Crypto
 	]
 }).annotate(Tool.Title, "Update task phases").annotate(Tool.Readonly, false).annotate(Tool.Destructive, false).annotate(Tool.Idempotent, false);
-const ThreadToolkit = Toolkit.make(ThreadPlanUpdateTool, AskUserQuestionTool, ThreadSpawnTool, ThreadPairCreateTool, ThreadConfigureTool, ThreadSettleTool, ThreadCleanupTool, ThreadSnoozeTool, ThreadRenameTool, MemoryAppendTool, AssetCompressTool);
+const ThreadToolkit = Toolkit.make(ThreadPlanUpdateTool, AskUserQuestionTool, ThreadSpawnTool, ThreadPairCreateTool, ThreadPairDetachTool, ThreadConfigureTool, ThreadSettleTool, ThreadCleanupTool, ThreadSnoozeTool, ThreadRenameTool, MemoryAppendTool, AssetCompressTool);
 //#endregion
 //#region src/orchestration/pendingMcpUserInputs.ts
 /**
@@ -129290,10 +129661,69 @@ const ThreadToolkitHandlersLive = ThreadToolkit.toLayer({
 			continuationMessageId
 		};
 	}),
+	thread_pair_detach: (input) => Effect.gen(function* () {
+		const invocation = yield* requireThreadCapability();
+		const pair = ((yield* (yield* ProjectionSnapshotQuery).getCommandReadModel().pipe(Effect.mapError((cause) => new ThreadControlRejectedError({
+			threadId: invocation.threadId,
+			commandType: "thread-pair.detach",
+			detail: `The active Fusion pair could not be read: ${cause.message}`
+		})))).threadPairs ?? []).find((candidate) => candidate.id === input.pairId && candidate.detachedAt === null);
+		if (pair === void 0) return yield* new ThreadControlRejectedError({
+			threadId: invocation.threadId,
+			commandType: "thread-pair.detach",
+			detail: `Active Fusion pair '${input.pairId}' was not found.`
+		});
+		if (pair.implementerThreadId !== invocation.threadId) return yield* new ThreadControlRejectedError({
+			threadId: invocation.threadId,
+			commandType: "thread-pair.detach",
+			detail: "This session is not the pair's implementer."
+		});
+		if (!invocation.controlThreadIds?.has(pair.watcherThreadId)) return yield* new ThreadControlRejectedError({
+			threadId: invocation.threadId,
+			commandType: "thread-pair.detach",
+			detail: "This session did not create the pair's supervisor with thread_spawn."
+		});
+		const detachedAt = DateTime.formatIso(yield* DateTime.now);
+		yield* dispatchControl({
+			type: "thread-pair.detach",
+			commandId: yield* newCommandId,
+			pairId: pair.id,
+			createdAt: detachedAt
+		}, invocation.threadId);
+		return {
+			pairId: pair.id,
+			implementerThreadId: pair.implementerThreadId,
+			watcherThreadId: pair.watcherThreadId,
+			detachedAt
+		};
+	}),
 	thread_configure: (input) => Effect.gen(function* () {
 		const { threadId } = yield* requireThreadControlTarget(input.threadId);
 		const createdAt = DateTime.formatIso(yield* DateTime.now);
 		const applied = [];
+		if (input.modelSelection !== void 0) {
+			const requested = input.modelSelection;
+			const providers = yield* (yield* ProviderRegistry).getProviders;
+			const target = providers.find((provider) => provider.instanceId === requested.instanceId);
+			const rejectSelection = (detail) => new ThreadControlRejectedError({
+				threadId,
+				commandType: "thread.meta.update",
+				detail
+			});
+			if (!target) return yield* rejectSelection(`Provider instance '${requested.instanceId}' is not configured.`);
+			const session = yield* (yield* ProjectionThreadSessionRepository).getByThreadId({ threadId }).pipe(Effect.mapError((cause) => rejectSelection(cause.message)));
+			if (Option.isSome(session)) {
+				const thread = yield* (yield* ProjectionThreadRepository).getById({ threadId }).pipe(Effect.mapError((cause) => rejectSelection(cause.message)));
+				if (Option.isSome(thread)) {
+					const currentInstanceId = session.value.providerInstanceId ?? thread.value.modelSelection.instanceId;
+					const current = providers.find((provider) => provider.instanceId === currentInstanceId);
+					const instanceChanged = requested.instanceId !== currentInstanceId;
+					const incompatible = instanceChanged && (!current || current.driver !== target.driver || !current.continuation || current.continuation.groupKey !== target.continuation?.groupKey);
+					const requiresNewThread = (instanceChanged || requested.model !== thread.value.modelSelection.model) && (current?.requiresNewThreadForModelChange === true || target.requiresNewThreadForModelChange === true);
+					if (incompatible || requiresNewThread) return yield* rejectSelection(`This conversation cannot switch to '${requested.model}' on '${requested.instanceId}'. Start a new thread with that provider and model, then enable Fusion there with the same supervisor settings. The current thread, checkout, history and Fusion pair are unchanged.`);
+				}
+			}
+		}
 		if (input.title !== void 0 || input.modelSelection !== void 0) {
 			yield* dispatchControl({
 				type: "thread.meta.update",
@@ -133081,7 +133511,7 @@ const make$5 = Effect.gen(function* () {
 		const thread = yield* resolveThread(threadId);
 		if (!thread) return yield* Effect.die(/* @__PURE__ */ new Error(`Thread '${threadId}' was not found in read model.`));
 		const desiredRuntimeMode = thread.runtimeMode;
-		const requestedModelSelection = options?.modelSelection;
+		const requestedModelSelection = options?.modelSelection ?? thread.modelSelection;
 		const commandReadModel = yield* projectionSnapshotQuery.getCommandReadModel();
 		const watchThreadIds = (commandReadModel.threadPairs ?? []).filter((pair) => pair.detachedAt === null && pair.watcherThreadId === threadId).map((pair) => pair.implementerThreadId);
 		yield* Effect.forEach(watchThreadIds, (watchedThreadId) => grantActiveMcpWatchThread({
@@ -133100,7 +133530,7 @@ const make$5 = Effect.gen(function* () {
 			method: "thread.turn.start",
 			detail: `Thread '${threadId}' has an active provider session without a provider instance id.`
 		});
-		const currentInstanceId = activeThreadSession !== null && activeSession !== void 0 && activeSession.providerInstanceId !== void 0 ? activeSession.providerInstanceId : thread.modelSelection.instanceId;
+		const currentInstanceId = activeThreadSession !== null && activeSession !== void 0 && activeSession.providerInstanceId !== void 0 ? activeSession.providerInstanceId : thread.session?.providerInstanceId ?? thread.modelSelection.instanceId;
 		const desiredModelSelection = requestedModelSelection ?? thread.modelSelection;
 		const desiredInstanceId = desiredModelSelection.instanceId;
 		const currentInfo = yield* providerService.getInstanceInfo(currentInstanceId).pipe(Effect.mapError(() => new ProviderAdapterRequestError({
@@ -133264,11 +133694,18 @@ const make$5 = Effect.gen(function* () {
 		const thread = yield* resolveThread(input.threadId);
 		if (!thread) return yield* Effect.die(/* @__PURE__ */ new Error(`Thread '${input.threadId}' was not found in read model.`));
 		const hadActiveSession = thread.session !== null && thread.session.status !== "stopped";
+		const modelForTurn = input.modelSelection ?? thread.modelSelection;
 		yield* ensureSessionForThread(input.threadId, input.createdAt, {
-			...input.modelSelection !== void 0 ? { modelSelection: input.modelSelection } : {},
+			modelSelection: modelForTurn,
 			pendingTurnStart: true
 		});
-		if (input.modelSelection !== void 0) threadModelSelections.set(input.threadId, input.modelSelection);
+		threadModelSelections.set(input.threadId, modelForTurn);
+		if (!Equal.equals(thread.modelSelection, modelForTurn)) yield* orchestrationEngine.dispatch({
+			type: "thread.meta.update",
+			commandId: yield* serverCommandId("turn-model-selection"),
+			threadId: input.threadId,
+			modelSelection: modelForTurn
+		});
 		const normalizedInput = toNonEmptyProviderInput(input.messageText);
 		const expandedInput = normalizedInput === void 0 ? void 0 : (yield* expandUserInvokedSkill({
 			text: normalizedInput,
@@ -133326,16 +133763,6 @@ const make$5 = Effect.gen(function* () {
 		].join("\n\n");
 		const providerHasStructuredQuestionSystemPrompt = activeSession?.provider === "claudeAgent" || activeSession?.provider === "codex";
 		const inputWithStructuredQuestionPolicy = fusionInput !== void 0 && !providerHasStructuredQuestionSystemPrompt ? `${NON_SYSTEM_PROVIDER_STRUCTURED_USER_QUESTIONS}\n\n${fusionInput}` : fusionInput;
-		const sessionModelSwitch = activeSession === void 0 ? "in-session" : activeSession.providerInstanceId === void 0 ? yield* new ProviderAdapterRequestError({
-			provider: providerErrorLabel(activeSession.provider),
-			method: "thread.turn.start",
-			detail: `Active provider session '${activeSession.threadId}' is missing a provider instance id.`
-		}) : (yield* providerService.getCapabilities(activeSession.providerInstanceId)).sessionModelSwitch;
-		const requestedModelSelection = input.modelSelection ?? threadModelSelections.get(input.threadId) ?? thread.modelSelection;
-		const modelForTurn = sessionModelSwitch === "unsupported" && input.modelSelection === void 0 ? activeSession?.model !== void 0 ? {
-			...requestedModelSelection,
-			model: activeSession.model
-		} : requestedModelSelection : requestedModelSelection;
 		const compressMode = thread.compressMode;
 		const hasSessionLevelRuleset = activeSession?.provider === "claudeAgent" || activeSession?.provider === "codex";
 		const rebuildsRulesetEachTurn = activeSession?.provider === "codex";
@@ -133751,8 +134178,7 @@ const make$5 = Effect.gen(function* () {
 			case "thread.runtime-mode-set": {
 				const thread = yield* resolveThread(event.payload.threadId);
 				if (!thread?.session || thread.session.status === "stopped") return;
-				const cachedModelSelection = threadModelSelections.get(event.payload.threadId);
-				yield* ensureSessionForThread(event.payload.threadId, event.occurredAt, cachedModelSelection !== void 0 ? { modelSelection: cachedModelSelection } : {});
+				yield* ensureSessionForThread(event.payload.threadId, event.occurredAt);
 				return;
 			}
 			case "thread.turn-start-requested":
@@ -136015,7 +136441,7 @@ const ObservabilityLive = Layer.unwrap(Effect.gen(function* () {
 			sink,
 			...delegate ? { delegate } : {}
 		});
-		return Layer.mergeAll(Layer.succeed(Tracer.Tracer, tracer), layer$63(sink));
+		return Layer.mergeAll(Layer.succeed(Tracer.Tracer, tracer), layer$61(sink));
 	})).pipe(Layer.provide(OtlpExporter.layerFlusher), Layer.provideMerge(otlpSerializationLayer));
 	const metricsLayer = config.otlpMetricsUrl === void 0 ? Layer.empty : OtlpMetrics.layer({
 		url: config.otlpMetricsUrl,
@@ -136043,7 +136469,7 @@ const SqliteError = Schema$1.Struct({
 const isSqliteError = Schema$1.is(SqliteError);
 var ServerInstanceAlreadyRunningError = class extends Schema$1.TaggedErrorClass()("ServerInstanceAlreadyRunningError", { stateDir: Schema$1.String }) {
 	get message() {
-		return `A P4Code server is already using ${this.stateDir}. Stop it before starting another server with the same P4 home.`;
+		return `A P4 Code server is already using ${this.stateDir}. Stop it before starting another server with the same P4 home.`;
 	}
 };
 var ServerInstanceLockError = class extends Schema$1.TaggedErrorClass()("ServerInstanceLockError", {
@@ -136052,7 +136478,7 @@ var ServerInstanceLockError = class extends Schema$1.TaggedErrorClass()("ServerI
 	cause: Schema$1.Defect()
 }) {
 	get message() {
-		return `Failed to ${this.operation} P4Code server lock at ${this.lockPath}.`;
+		return `Failed to ${this.operation} P4 Code server lock at ${this.lockPath}.`;
 	}
 };
 const isSqliteBusy = (cause) => {
@@ -136387,31 +136813,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$8));
+const ProviderSessionDirectoryLayerLive = ProviderSessionDirectoryLive.pipe(Layer.provide(layer$6));
 const ProviderLayerLive = ProviderServiceLive.pipe(Layer.provide(ProviderAdapterRegistryLive), Layer.provideMerge(ProviderSessionDirectoryLayerLive));
 const PersistenceLayerLive = Layer.empty.pipe(Layer.provideMerge(layerConfig));
-const VcsDriverRegistryLayerLive = layer$49.pipe(Layer.provide(layer$50));
-const SourceControlProviderRegistryLayerLive = layer$35.pipe(Layer.provide(Layer.mergeAll(layer$43, layer$41, layer$39, layer$37)), Layer.provideMerge(layer$51), Layer.provideMerge(VcsDriverRegistryLayerLive));
-const GitManagerLayerLive = layer$34.pipe(Layer.provideMerge(layer$44), Layer.provideMerge(layer$51), Layer.provideMerge(SourceControlProviderRegistryLayerLive), Layer.provideMerge(layer$60));
-const GitLayerLive = Layer.empty.pipe(Layer.provideMerge(GitManagerLayerLive), Layer.provideMerge(layer$51));
-const GitWorkflowLayerLive = layer$33.pipe(Layer.provideMerge(VcsDriverRegistryLayerLive), Layer.provideMerge(GitLayerLive));
-const SourceControlRepositoryServiceLayerLive = layer$9.pipe(Layer.provideMerge(layer$51), Layer.provideMerge(SourceControlProviderRegistryLayerLive));
-const ReviewLayerLive = layer$14.pipe(Layer.provideMerge(layer$51), Layer.provideMerge(VcsDriverRegistryLayerLive));
-const VcsLayerLive = Layer.empty.pipe(Layer.provideMerge(layer$50), Layer.provideMerge(VcsDriverRegistryLayerLive), Layer.provideMerge(layer$15.pipe(Layer.provide(VcsDriverRegistryLayerLive))), Layer.provideMerge(GitWorkflowLayerLive), Layer.provideMerge(ReviewLayerLive), Layer.provideMerge(SourceControlRepositoryServiceLayerLive), Layer.provideMerge(layer$16.pipe(Layer.provide(autoPullPolicyLayer), Layer.provide(GitWorkflowLayerLive))));
-const PullRequestServiceLive = layer$27.pipe(Layer.provide(layer$28), Layer.provide(SourceControlProviderRegistryLayerLive), Layer.provide(layer$52));
-const CheckpointingLayerLive = Layer.empty.pipe(Layer.provideMerge(layer$47), Layer.provideMerge(layer$48.pipe(Layer.provide(VcsDriverRegistryLayerLive))));
-const PortScannerLayerLive = layer$46.pipe(Layer.provide(layer$81));
-const TerminalLayerLive = layer$45.pipe(Layer.provide(PtyAdapterLive), Layer.provide(PortScannerLayerLive));
-const PreviewLayerLive = Layer.empty.pipe(Layer.provideMerge(layer$20), Layer.provideMerge(PortScannerLayerLive));
-const WorkspaceEntriesLayerLive = layer$18.pipe(Layer.provide(layer$68));
-const WorkspaceFileSystemLayerLive = layer$17.pipe(Layer.provide(layer$68), Layer.provide(WorkspaceEntriesLayerLive));
+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 WorkspaceLayerLive = Layer.mergeAll(layer$68, WorkspaceEntriesLayerLive, WorkspaceFileSystemLayerLive);
-const ProjectFaviconResolverLayerLive = layer$64.pipe(Layer.provide(layer$68), Layer.provide(layer$65));
+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 ProviderRuntimeLayerLive = ProviderSessionReaperLive.pipe(Layer.provideMerge(ProviderLayerLive), Layer.provideMerge(OrchestrationLayerLive));
-const RuntimeCoreDependenciesLive = ReactorLayerLive.pipe(Layer.provideMerge(layer$26), 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$59), Layer.provideMerge(Layer.mergeAll(layer$58, layer$70.pipe(Layer.provide(layer$81)), layer$6, layer$5)), Layer.provideMerge(layer$53), Layer.provideMerge(layer$54), Layer.provideMerge(layer$55), Layer.provideMerge(layer$56), Layer.provideMerge(layer$57)).pipe(Layer.provideMerge(ProviderInstanceRegistryHydrationLive), Layer.provideMerge(AntigravityInstallation.layer), Layer.provideMerge(ProviderEventLoggersLive), Layer.provideMerge(OpenCodeRuntimeLive), Layer.provideMerge(layer$61), Layer.provideMerge(layer$89.pipe(Layer.provide(layer$114))), Layer.provideMerge(WorkspaceLayerLive), Layer.provideMerge(ProjectFaviconResolverLayerLive), Layer.provideMerge(layer$80), Layer.provideMerge(layer$67), 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$22).pipe(Layer.provideMerge(layer$87), Layer.provideMerge(layer$88))))), Layer.provideMerge(layer$114));
-const UsageLayerLive = layer$24.pipe(Layer.provide(layer$89.pipe(Layer.provide(layer$114))));
-const RuntimeDependenciesLive = layer$23.pipe(Layer.provideMerge(RuntimeCoreDependenciesLive)).pipe(Layer.provideMerge(UsageLayerLive), Layer.provideMerge(layer$13), Layer.provideMerge(layer$12), Layer.provideMerge(layer$11), Layer.provideMerge(layer$76), Layer.provideMerge(layer$78), Layer.provideMerge(layer$77), Layer.provide(layer$118));
+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));
 /**
 * Hub asset sync.
 *
@@ -136421,7 +136847,7 @@ const RuntimeDependenciesLive = layer$23.pipe(Layer.provideMerge(RuntimeCoreDepe
 */
 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$7)), layer$66, layer).pipe(Layer.provide(ProjectionProjectRepositoryLive.pipe(Layer.provide(PersistenceLayerLive))), Layer.provide(ProjectionThreadRepositoryLive.pipe(Layer.provide(PersistenceLayerLive))), Layer.provide(layer$65), Layer.provide(layer$26), Layer.provide(PullRequestServiceLive), Layer.provide(layer$21), Layer.provide(layer$74), Layer.provide(browserApiCorsLayer), Layer.provide(httpCompressionLayer));
+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 makeServerLayer = Layer.unwrap(Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	yield* fixPath();
@@ -136464,7 +136890,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$52));
+	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));
 	return Layer.unwrap(Effect.gen(function* () {
 		yield* acquireServerInstanceLock(config.stateDir);
 		return fullyProvisionedServerLayer;
@@ -136477,8 +136903,8 @@ const runServerCommand = (flags, options) => Effect.gen(function* () {
 	const config = yield* resolveServerConfig(flags, yield* GlobalFlag.LogLevel, options);
 	return yield* runServer.pipe(Effect.provideService(ServerConfig$1, config));
 });
-const startCommand = Command.make("start", { ...sharedServerCommandFlags }).pipe(Command.withDescription("Run the P4Code server."), Command.withHandler((flags) => runServerCommand(flags)));
-const serveCommand = Command.make("serve", { ...sharedServerCommandFlags }).pipe(Command.withDescription("Run the P4Code server without opening a browser and print headless pairing details."), Command.withHandler((flags) => runServerCommand(flags, {
+const startCommand = Command.make("start", { ...sharedServerCommandFlags }).pipe(Command.withDescription("Run the P4 Code server."), Command.withHandler((flags) => runServerCommand(flags)));
+const serveCommand = Command.make("serve", { ...sharedServerCommandFlags }).pipe(Command.withDescription("Run the P4 Code server without opening a browser and print headless pairing details."), Command.withHandler((flags) => runServerCommand(flags, {
 	startupPresentation: "headless",
 	forceAutoBootstrapProjectFromCwd: false
 })));
@@ -136873,16 +137299,16 @@ const reconcileService = Effect.fn("cli.service.reconcile")(function* () {
 const LAUNCH_AGENT_LOGIN_NOTE = "This runs as a login item, so it starts when you log in. For an unattended machine, enable automatic login in System Settings › Users & Groups.";
 function formatReconcileSuccess(input) {
 	return [
-		`${input.previouslyInstalled ? "Updated" : "Installed"} P4Code service with @p4code/cli@${input.cliVersion}.`,
+		`${input.previouslyInstalled ? "Updated" : "Installed"} P4 Code service with @p4code/cli@${input.cliVersion}.`,
 		`Logs: ${input.plan.logPath}`,
 		...input.platform === "darwin" && !input.previouslyInstalled ? [LAUNCH_AGENT_LOGIN_NOTE] : []
 	].join("\n");
 }
 function formatServiceStatus(status, cliVersion, lastUpdate) {
-	if (!status.supported) return "P4Code service\n  Status: unavailable on this machine\n  Supported on: Linux with systemd, macOS with launchd";
-	if (!status.installed) return "P4Code service\n  Status: not installed\n  Next: Run `p4c service install`.";
+	if (!status.supported) return "P4 Code service\n  Status: unavailable on this machine\n  Supported on: Linux with systemd, macOS with launchd";
+	if (!status.installed) return "P4 Code service\n  Status: not installed\n  Next: Run `p4c service install`.";
 	return [
-		"P4Code service",
+		"P4 Code service",
 		`  Status: ${status.current ? `installed · @p4code/cli@${cliVersion}` : "needs an update or repair"}`,
 		`  Unit: ${status.unitPath}`,
 		`  Data: ${status.baseDir}`,
@@ -136935,10 +137361,10 @@ const serviceInstallCommand = Command.make("install", {
 	...projectLocationFlags,
 	tailscaleServe: tailscaleServeFlag,
 	tailscaleServePort: tailscaleServePortFlag
-}).pipe(Command.withDescription("Install P4Code as a background service for this user."), Command.withHandler((flags) => runServiceCommand(flags, Effect.gen(function* () {
+}).pipe(Command.withDescription("Install P4 Code as a background service for this user."), Command.withHandler((flags) => runServiceCommand(flags, Effect.gen(function* () {
 	const result = yield* reconcileService();
 	if (!result.changed) {
-		yield* Console.log(`P4Code service is already installed with @p4code/cli@${version$1}.`);
+		yield* Console.log(`P4 Code service is already installed with @p4code/cli@${version$1}.`);
 		return;
 	}
 	yield* Console.log(formatReconcileSuccess({
@@ -136965,7 +137391,7 @@ const serviceUpdateCommand = Command.make("update", projectLocationFlags).pipe(C
 		});
 	}
 	if (!outcome.result.changed) {
-		yield* Console.log(`Restarted the P4Code service on @p4code/cli@${version$1}.`);
+		yield* Console.log(`Restarted the P4 Code service on @p4code/cli@${version$1}.`);
 		return;
 	}
 	yield* Console.log(formatReconcileSuccess({
@@ -136975,9 +137401,9 @@ const serviceUpdateCommand = Command.make("update", projectLocationFlags).pipe(C
 		platform: yield* HostProcessPlatform
 	}));
 }))));
-const serviceUninstallCommand = Command.make("uninstall", projectLocationFlags).pipe(Command.withDescription("Stop and remove the P4Code background service."), Command.withHandler((flags) => runServiceCommand(flags, Effect.gen(function* () {
+const serviceUninstallCommand = Command.make("uninstall", projectLocationFlags).pipe(Command.withDescription("Stop and remove the P4 Code background service."), Command.withHandler((flags) => runServiceCommand(flags, Effect.gen(function* () {
 	const removed = yield* (yield* BootService).uninstall;
-	yield* Console.log(removed ? "Removed the P4Code service." : "P4Code service is not installed.");
+	yield* Console.log(removed ? "Removed the P4 Code service." : "P4 Code service is not installed.");
 }))));
 /**
 * Restart without rewriting the unit.
@@ -136991,11 +137417,11 @@ const serviceUninstallCommand = Command.make("uninstall", projectLocationFlags).
 const serviceRestartCommand = Command.make("restart", projectLocationFlags).pipe(Command.withDescription("Restart the background service without changing its configuration."), Command.withHandler((flags) => runServiceCommand(flags, Effect.gen(function* () {
 	const service = yield* BootService;
 	if (!(yield* service.status).installed) {
-		yield* Console.error("P4Code service is not installed. Install it with: p4c service install");
+		yield* Console.error("P4 Code service is not installed. Install it with: p4c service install");
 		return;
 	}
 	yield* service.restart;
-	yield* Console.log("Restarted the P4Code service.");
+	yield* Console.log("Restarted the P4 Code service.");
 }))));
 /**
 * Install a newer CLI, then point the service at it.
@@ -137030,7 +137456,7 @@ const serviceSelfUpdateCommand = Command.make("self-update", {
 	});
 	yield* Console.log(`Service now runs @p4code/cli@${installed}.`);
 }))));
-const serviceStatusCommand = Command.make("status", projectLocationFlags).pipe(Command.withDescription("Show whether the P4Code background service is installed."), Command.withHandler((flags) => runServiceCommand(flags, Effect.gen(function* () {
+const serviceStatusCommand = Command.make("status", projectLocationFlags).pipe(Command.withDescription("Show whether the P4 Code background service is installed."), Command.withHandler((flags) => runServiceCommand(flags, Effect.gen(function* () {
 	const status = yield* (yield* BootService).status;
 	const recorded = yield* readServiceUpdateState(status.baseDir);
 	yield* Console.log(formatServiceStatus(status, version$1, Option.match(recorded, {
@@ -137042,18 +137468,18 @@ Effect.gen(function* () {
 	const { supported, installed, current } = yield* (yield* BootService).status;
 	if (!supported) return false;
 	if (installed && current) {
-		yield* Console.log("P4Code is already set up to run in the background on this machine.");
+		yield* Console.log("P4 Code is already set up to run in the background on this machine.");
 		return true;
 	}
 	if (!(yield* Prompt.run(Prompt.confirm({
-		message: installed ? "The installed P4Code service needs an update or repair. Update it now?" : "Run P4Code in the background whenever this machine boots? It stays reachable to your other devices over the network.",
+		message: installed ? "The installed P4 Code service needs an update or repair. Update it now?" : "Run P4 Code in the background whenever this machine boots? It stays reachable to your other devices over the network.",
 		initial: true
 	})))) return false;
 	const result = yield* reconcileService();
 	if (result.changed) yield* Console.log(`Background service ${result.previouslyInstalled ? "updated" : "installed"}. Logs: ${result.plan.logPath}`);
 	return true;
 });
-const serviceCommand = Command.make("service").pipe(Command.withDescription("Manage the P4Code background service."), Command.withSubcommands([
+const serviceCommand = Command.make("service").pipe(Command.withDescription("Manage the P4 Code background service."), Command.withSubcommands([
 	serviceInstallCommand,
 	serviceUninstallCommand,
 	serviceUpdateCommand,
@@ -137090,7 +137516,7 @@ const reportUpdateAvailable = Effect.gen(function* () {
 * conflict we chose. Taking a name nothing else claims deletes the problem
 * rather than managing it.
 */
-const makeCli = () => Command.make("p4c", { ...sharedServerCommandFlags }).pipe(Command.withDescription("Run the P4Code server."), Command.withHandler((flags) => runServerCommand(flags)), Command.withSubcommands([
+const makeCli = () => Command.make("p4c", { ...sharedServerCommandFlags }).pipe(Command.withDescription("Run the P4 Code server."), Command.withHandler((flags) => runServerCommand(flags)), Command.withSubcommands([
 	startCommand,
 	serveCommand,
 	agentsCommand,