@p4code/cli 0.5.16 → 0.5.19

package/dist/bin.mjs

@@ -153,7 +153,7 @@ const closeServer = (server) => {
 * NetService - Service tag for startup networking helpers.
 */
 var NetService = class extends Context.Service()("@p4code/shared/Net/NetService") {};
-const make$120 = () => {
+const make$122 = () => {
 	/**
 	* Returns true when a TCP server can bind to {host, port}.
 	* `EADDRNOTAVAIL` is treated as available so IPv6-absent hosts don't fail
@@ -262,10 +262,10 @@ const make$120 = () => {
 		})
 	};
 };
-const layer$122 = Layer.sync(NetService, make$120);
+const layer$122 = Layer.sync(NetService, make$122);
 //#endregion
 //#region package.json
-var version$1 = "0.5.16";
+var version$1 = "0.5.19";
 //#endregion
 //#region src/config.ts
 /**
@@ -286,8 +286,8 @@ var ServerConfig$1 = class extends Context.Service()("@p4code/cli/config/ServerC
 	/** @deprecated Import and use `layerTest` from this module. */
 	static layerTest = (cwd, baseDirOrPrefix) => layerTest$4(cwd, baseDirOrPrefix);
 };
-const make$119 = (config) => ServerConfig$1.of(config);
-const layer$121 = (config) => Layer.succeed(ServerConfig$1, make$119(config));
+const make$121 = (config) => ServerConfig$1.of(config);
+const layer$121 = (config) => Layer.succeed(ServerConfig$1, make$121(config));
 const deriveServerPaths = Effect.fn(function* (baseDir, devUrl, options = {}) {
 	const { join } = yield* Path$1.Path;
 	const stateDir = join(baseDir, devUrl !== void 0 && !options.baseDirIsExplicit ? "dev" : "userdata");
@@ -3521,6 +3521,21 @@ const OrchestrationThreadActivity = Schema$1.Struct({
 	sequence: Schema$1.optional(NonNegativeInt),
 	createdAt: IsoDateTime
 });
+/**
+* The activity a turn gets when Jev (TypeSafe System One) answered for it.
+*
+* One per consultation, never merged: a turn that took a skill hint and a
+* workspace choice from Jev carries two, and each names what it decided.
+* Silence, a timeout or a declined answer append nothing, so the row's
+* presence is the whole claim.
+*/
+const JEV_CONSULTED_ACTIVITY_KIND = "jev.consulted";
+const JevConsultedFeature = Schema$1.Literals(["capability-hints", "auto-workspace"]);
+Schema$1.Struct({
+	feature: JevConsultedFeature,
+	/** What Jev decided, in one short clause: "Suggested: design, publish". */
+	summary: TrimmedNonEmptyString
+});
 const OrchestrationLatestTurnState = Schema$1.Literals([
 	"running",
 	"interrupted",
@@ -10400,6 +10415,11 @@ const ClientSettingsSchema = Schema$1.Struct({
 	})).pipe(Schema$1.withDecodingDefault(Effect.succeed(13)))
 });
 const DEFAULT_CLIENT_SETTINGS = Schema$1.decodeSync(ClientSettingsSchema)({});
+const DEFAULT_JEV_PREFETCH_TIMEOUT_MS = 2e3;
+const JevPrefetchTimeoutMs = Schema$1.Int.check(Schema$1.isBetween({
+	minimum: 100,
+	maximum: 3e4
+}));
 const ThreadEnvMode = Schema$1.Literals([
 	"auto",
 	"local",
@@ -10766,6 +10786,32 @@ const ServerSettings = Schema$1.Struct({
 	/** Supervisor wake pre-filter; disabled by default. */
 	fusionReviewTriage: FusionReviewTriageSettings.pipe(Schema$1.withDecodingDefault(Effect.succeed(Schema$1.decodeUnknownSync(FusionReviewTriageSettings)({})))),
 	/**
+	* Whether a turn asks Jev which of this environment's capabilities to name
+	* to the model before its first request.
+	*
+	* One environment-wide switch rather than a per-thread control: which skills
+	* and commands exist is a fact about the machine, not about a conversation,
+	* and nobody wants to answer the same question on every new thread. The
+	* ranking is advisory - it adds a few names to the turn and changes nothing
+	* else - so the cost of leaving it on is a short request, which is why it is
+	* on by default.
+	*
+	* Off removes the request entirely. So does a missing Jev key, a timeout or
+	* an unreadable answer: every one of those is the same turn the agent would
+	* have had before this setting existed.
+	*/
+	enableJevPrefetch: Schema$1.Boolean.pipe(Schema$1.withDecodingDefault(Effect.succeed(true))),
+	/** Maximum per-turn wait for capability hints; failures continue without hints. */
+	jevPrefetchTimeoutMs: JevPrefetchTimeoutMs.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_JEV_PREFETCH_TIMEOUT_MS))),
+	/**
+	* Whether Auto checkout mode asks Jev to choose between the current
+	* checkout and a fresh worktree before falling back to the text generation
+	* model. Same shape as `enableJevPrefetch`: environment-wide, on by
+	* default, and every failure path is the decision the turn would have
+	* made without it.
+	*/
+	enableJevAutoWorkspace: Schema$1.Boolean.pipe(Schema$1.withDecodingDefault(Effect.succeed(true))),
+	/**
 	* Whether the board offers the scoping agent: the Scope action on a task and
 	* the panel that drafts a new one by interview.
 	*
@@ -10995,6 +11041,9 @@ const ServerSettingsPatch = Schema$1.Struct({
 	fusionSummarizerModel: Schema$1.optionalKey(Schema$1.NullOr(ModelSelection)),
 	fusionPromptOverrides: Schema$1.optionalKey(FusionPromptOverrides),
 	fusionReviewTriage: Schema$1.optionalKey(FusionReviewTriageSettings),
+	enableJevPrefetch: Schema$1.optionalKey(Schema$1.Boolean),
+	jevPrefetchTimeoutMs: Schema$1.optionalKey(JevPrefetchTimeoutMs),
+	enableJevAutoWorkspace: Schema$1.optionalKey(Schema$1.Boolean),
 	enableScopingAgent: Schema$1.optionalKey(Schema$1.Boolean),
 	enablePlanPhase: Schema$1.optionalKey(Schema$1.Boolean),
 	writeGeneratedSkillsToRepo: Schema$1.optionalKey(Schema$1.Boolean),
@@ -12575,7 +12624,7 @@ const ThreadSpawnInput = Schema$1.Struct({
 	interactionMode: Schema$1.optional(ProviderInteractionMode),
 	compressMode: Schema$1.optional(CompressMode),
 	unpromptedSubagents: Schema$1.optional(Schema$1.Boolean),
-	fusion: Schema$1.optional(Schema$1.Boolean.annotate({ description: "Create two new threads as a separate Fusion pair, then start the builder with prompt. Leaves the caller and its existing pair unchanged. Cannot be combined with fusionWatcher." })),
+	fusion: Schema$1.optional(Schema$1.Boolean.annotate({ description: "Create two new threads as a separate Fusion pair, then start the supervisor with prompt. The builder stays empty until advised. Leaves the caller and its existing pair unchanged. Cannot be combined with fusionWatcher." })),
 	fusionWatcher: Schema$1.optional(Schema$1.Boolean.annotate({ description: "Set true only when creating the watcher to pair with the current thread. Defaults to the saved Fusion supervisor model. No special user command syntax is required." }))
 });
 const ThreadSpawnResult = Schema$1.Struct({
@@ -12587,16 +12636,16 @@ const ThreadSpawnResult = Schema$1.Struct({
 	watcherThreadId: Schema$1.optional(ThreadId)
 });
 const ThreadPairCreateInput = Schema$1.Struct({
-	watcherThreadId: ThreadId.annotate({ description: "The supervisor thread to pair with this session's own builder thread. It must have been created by this session through thread_spawn." }),
+	watcherThreadId: Schema$1.optional(ThreadId.annotate({ description: "Legacy pairing: use an existing spawned supervisor and keep this chat as builder. Omit to keep this chat and its history as supervisor and create a new empty builder, idle until advised." })),
 	gateTimeoutMs: Schema$1.optional(NonNegativeInt.annotate({ description: "How long a gate waits on the supervisor before failing open, in milliseconds. Defaults to 120000." }))
 });
 const ThreadPairCreateResult = Schema$1.Struct({
 	pairId: ThreadPairId,
 	implementerThreadId: ThreadId,
 	watcherThreadId: ThreadId,
-	continuationMessageId: MessageId
+	continuationMessageId: Schema$1.optional(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 ThreadPairDetachInput = Schema$1.Struct({ pairId: ThreadPairId.annotate({ description: "The active Fusion pair to detach. This session must belong to the pair and must have created its other thread." }) });
 const ThreadPairDetachResult = Schema$1.Struct({
 	pairId: ThreadPairId,
 	implementerThreadId: ThreadId,
@@ -16072,7 +16121,7 @@ function deriveAuthClientMetadata(input) {
 //#endregion
 //#region src/auth/EnvironmentAuthPolicy.ts
 var EnvironmentAuthPolicy = class extends Context.Service()("@p4code/cli/auth/EnvironmentAuthPolicy") {};
-const make$118 = Effect.gen(function* () {
+const make$120 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const isRemoteReachable = isRemoteReachableHost(config.host);
 	const policy = config.mode === "desktop" ? isRemoteReachable ? "remote-reachable" : "desktop-managed-local" : isRemoteReachable ? "remote-reachable" : "loopback-browser";
@@ -16090,7 +16139,7 @@ const make$118 = Effect.gen(function* () {
 	};
 	return EnvironmentAuthPolicy.of({ getDescriptor: () => Effect.succeed(descriptor).pipe(Effect.withSpan("EnvironmentAuthPolicy.getDescriptor")) });
 });
-const layer$120 = Layer.effect(EnvironmentAuthPolicy, make$118);
+const layer$120 = Layer.effect(EnvironmentAuthPolicy, make$120);
 //#endregion
 //#region src/persistence/Errors.ts
 function summarizeSchemaIssue(issue) {
@@ -16271,7 +16320,7 @@ function toPersistenceSqlOrDecodeError$6(sqlOperation, decodeOperation, correlat
 		cause
 	});
 }
-const make$117 = Effect.gen(function* () {
+const make$119 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const createSessionRow = SqlSchema.void({
 		Request: CreateAuthSessionInput,
@@ -16405,7 +16454,7 @@ const make$117 = Effect.gen(function* () {
 		setLastConnectedAt
 	};
 });
-const layer$119 = Layer.effect(AuthSessionRepository, make$117);
+const layer$119 = Layer.effect(AuthSessionRepository, make$119);
 //#endregion
 //#region src/auth/ServerSecretStore.ts
 const secretStoreErrorContext = {
@@ -16547,11 +16596,11 @@ const makeForDirectory = Effect.fn("ServerSecretStore.makeForDirectory")(functio
 		remove
 	});
 });
-const make$116 = Effect.gen(function* () {
+const make$118 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	return yield* makeForDirectory(config.secretsDir);
 });
-const layer$118 = Layer.effect(ServerSecretStore, make$116);
+const layer$118 = Layer.effect(ServerSecretStore, make$118);
 //#endregion
 //#region src/auth/SessionStore.ts
 var MalformedSessionTokenError = class extends Schema$1.TaggedErrorClass()("MalformedSessionTokenError", {}) {
@@ -16789,7 +16838,7 @@ function toAuthClientSession(input) {
 		current: false
 	};
 }
-const make$115 = Effect.gen(function* () {
+const make$117 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const serverConfig = yield* ServerConfig$1;
 	const secretStore = yield* ServerSecretStore;
@@ -17104,7 +17153,7 @@ const make$115 = Effect.gen(function* () {
 		markDisconnected
 	});
 });
-const layer$117 = Layer.effect(SessionStore, make$115).pipe(Layer.provideMerge(layer$119));
+const layer$117 = Layer.effect(SessionStore, make$117).pipe(Layer.provideMerge(layer$119));
 //#endregion
 //#region src/persistence/AuthPairingLinks.ts
 const AuthPairingLinkRecord = Schema$1.Struct({
@@ -17165,7 +17214,7 @@ function toPersistenceSqlOrDecodeError$5(sqlOperation, decodeOperation, correlat
 		cause
 	});
 }
-const make$114 = Effect.gen(function* () {
+const make$116 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const createPairingLinkRow = SqlSchema.void({
 		Request: CreateAuthPairingLinkInput,
@@ -17300,7 +17349,7 @@ const make$114 = Effect.gen(function* () {
 		getByCredential
 	};
 });
-const layer$116 = Layer.effect(AuthPairingLinkRepository, make$114);
+const layer$116 = Layer.effect(AuthPairingLinkRepository, make$116);
 //#endregion
 //#region src/auth/PairingGrantStore.ts
 var UnknownBootstrapCredentialError = class extends Schema$1.TaggedErrorClass()("UnknownBootstrapCredentialError", {}) {
@@ -17395,7 +17444,7 @@ const DEV_STARTUP_TTL_HOURS = Duration.hours(24);
 const PAIRING_TOKEN_ALPHABET = "23456789ABCDEFGHJKLMNPQRSTUVWXYZ";
 const PAIRING_TOKEN_LENGTH = 12;
 const PAIRING_TOKEN_REJECTION_LIMIT = Math.floor(256 / 32) * 32;
-const make$113 = Effect.gen(function* () {
+const make$115 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const config = yield* ServerConfig$1;
 	const pairingLinks = yield* AuthPairingLinkRepository;
@@ -17593,7 +17642,7 @@ const make$113 = Effect.gen(function* () {
 		consume
 	});
 });
-const layer$115 = Layer.effect(PairingGrantStore, make$113).pipe(Layer.provideMerge(layer$116));
+const layer$115 = Layer.effect(PairingGrantStore, make$115).pipe(Layer.provideMerge(layer$116));
 //#endregion
 //#region src/persistence/DatabaseSnapshot.ts
 /**
@@ -20978,7 +21027,7 @@ function parseBearerToken(request) {
 	const token = header.slice(7).trim();
 	return token.length > 0 ? token : null;
 }
-const make$112 = Effect.gen(function* () {
+const make$114 = Effect.gen(function* () {
 	const policy = yield* EnvironmentAuthPolicy;
 	const bootstrapCredentials = yield* PairingGrantStore;
 	const sessions = yield* SessionStore;
@@ -21173,7 +21222,7 @@ const make$112 = Effect.gen(function* () {
 		issueStartupPairingUrl
 	});
 });
-const layer$114 = Layer.effect(EnvironmentAuth, make$112).pipe(Layer.provideMerge(layer$115), Layer.provideMerge(layer$117), Layer.provideMerge(layer$120));
+const layer$114 = Layer.effect(EnvironmentAuth, make$114).pipe(Layer.provideMerge(layer$115), Layer.provideMerge(layer$117), Layer.provideMerge(layer$120));
 const storageLayer = Layer.mergeAll(layer$118, layerConfig);
 const runtimeLayer = layer$114.pipe(Layer.provideMerge(storageLayer));
 //#endregion
@@ -23169,7 +23218,7 @@ const DEFAULT_LIMITS = {
 	windowMillis: FAILURE_WINDOW_MS$1,
 	blockMillis: BLOCK_DURATION_MS
 };
-const make$111 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_LIMITS) {
+const make$113 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_LIMITS) {
 	const state = yield* Ref.make(initialThrottleState);
 	return HubAuthThrottle.of({
 		shouldRefuse: Effect.gen(function* () {
@@ -23183,7 +23232,7 @@ const make$111 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_L
 		})
 	});
 });
-const layer$113 = Layer.effect(HubAuthThrottle, make$111());
+const layer$113 = Layer.effect(HubAuthThrottle, make$113());
 //#endregion
 //#region src/hub/HubAuth.ts
 /**
@@ -25165,12 +25214,12 @@ const persistHubAgentActivity = Effect.fn("HubNotificationActivity.persist")(fun
 var HubSecretStoreUnavailable = class extends Data.TaggedError("HubSecretStoreUnavailable") {};
 const HUB_SECRETS_SUFFIX = ".secrets";
 /** Dedicated sibling directory per Hub database; no environment configuration is consulted. */
-const make$110 = Effect.gen(function* () {
+const make$112 = Effect.gen(function* () {
 	const config = yield* HubConfig;
 	if (!(yield* Path$1.Path).isAbsolute(config.dbPath)) return yield* Effect.fail(new HubSecretStoreUnavailable({ message: "Hub secret storage requires an absolute database path." }));
 	return yield* makeForDirectory(`${config.dbPath}${HUB_SECRETS_SUFFIX}`);
 });
-const layer$107 = Layer.effect(ServerSecretStore, make$110);
+const layer$107 = Layer.effect(ServerSecretStore, make$112);
 //#endregion
 //#region src/hub/HubNotificationRoutes.ts
 const MAX_NOTIFICATION_BODY_BYTES = 16 * 1024;
@@ -29268,7 +29317,7 @@ function stripDefaultServerSettings(current, defaults) {
 	}
 	return Object.is(current, defaults) ? void 0 : current;
 }
-const make$109 = Effect.gen(function* () {
+const make$111 = Effect.gen(function* () {
 	const { settingsPath } = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const pathService = yield* Path$1.Path;
@@ -29491,7 +29540,7 @@ const make$109 = Effect.gen(function* () {
 		}
 	};
 });
-const layer$93 = Layer.effect(ServerSettingsService, make$109);
+const layer$93 = Layer.effect(ServerSettingsService, make$111);
 //#endregion
 //#region src/pathExpansion.ts
 /**
@@ -29731,13 +29780,17 @@ function parseMarkdownFrontmatter(contents) {
 	const name = typeof record.name === "string" ? record.name.trim() : "";
 	const description = typeof record.description === "string" ? record.description.trim() : "";
 	const disableModelInvocation = readFrontmatterBoolean(record["disable-model-invocation"]);
+	const tools = Array.isArray(record.tools) ? record.tools.flatMap((tool) => typeof tool === "string" && tool.trim() ? [tool.trim()] : []) : void 0;
+	const model = typeof record.model === "string" ? record.model.trim() : "";
 	const requiredInteractionMode = record["required-interaction-mode"] === "default" || record["required-interaction-mode"] === "plan" ? record["required-interaction-mode"] : void 0;
 	return {
 		kind: "parsed",
 		...name ? { name } : {},
 		...description ? { description } : {},
 		...disableModelInvocation === void 0 ? {} : { disableModelInvocation },
-		...requiredInteractionMode === void 0 ? {} : { requiredInteractionMode }
+		...requiredInteractionMode === void 0 ? {} : { requiredInteractionMode },
+		...tools && tools.length > 0 ? { tools } : {},
+		...model ? { model } : {}
 	};
 }
 //#endregion
@@ -30041,6 +30094,42 @@ const discoverClaudeSkills = Effect.fn("discoverClaudeSkills")(function* (config
 		scope: "project"
 	}] : []], disabledSkills);
 });
+/**
+* Load named subagent definitions from the user config dir.
+*
+* The CLI finds these itself whenever the `user` setting source is loaded, so
+* nothing calls this on an ordinary session. It exists for the sessions that
+* drop that source and still owe the user a specific agent - a Fusion half
+* under the lean context profile, which must still run the delivery reviewer.
+* Reading only the names asked for keeps that session from paying for the rest
+* of the user's agents, which is what dropping the source bought.
+*
+* Best-effort like the skill discovery beside it: a missing or malformed
+* definition is skipped rather than failing the session, because a session
+* that cannot start is worse than one missing an agent.
+*/
+const discoverClaudeUserAgents = Effect.fn("discoverClaudeUserAgents")(function* (config, names, environment, cwd) {
+	if (names.length === 0) return {};
+	const fileSystem = yield* FileSystem.FileSystem;
+	const path = yield* Path$1.Path;
+	const agentsDir = yield* resolveClaudeUserAgentsDir(config, environment, cwd);
+	const definitions = {};
+	for (const name of names) {
+		const contents = yield* fileSystem.readFileString(path.join(agentsDir, `${name}.md`)).pipe(Effect.orElseSucceed(() => void 0));
+		if (contents === void 0) continue;
+		const frontmatter = parseMarkdownFrontmatter(contents);
+		if (frontmatter.kind !== "parsed") continue;
+		const prompt = stripMarkdownFrontmatter(contents);
+		if (frontmatter.description === void 0 || prompt.length === 0) continue;
+		definitions[name] = {
+			description: frontmatter.description,
+			prompt,
+			...frontmatter.tools ? { tools: frontmatter.tools } : {},
+			...frontmatter.model ? { model: frontmatter.model } : {}
+		};
+	}
+	return definitions;
+});
 //#endregion
 //#region src/mcp/ClaudeMcpFiles.ts
 /**
@@ -30153,7 +30242,7 @@ function claudeEntryFromRegistration(registration) {
 	};
 }
 var ClaudeMcpFiles = class extends Context.Service()("@p4code/cli/mcp/ClaudeMcpFiles") {};
-const make$108 = Effect.gen(function* () {
+const make$110 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const services = yield* Effect.context();
@@ -30220,7 +30309,7 @@ const make$108 = Effect.gen(function* () {
 		removeProject: (projectDir, name) => removeAt(Effect.succeed(projectFile(projectDir)))(name)
 	};
 });
-const layer$92 = Layer.effect(ClaudeMcpFiles, make$108);
+const layer$92 = Layer.effect(ClaudeMcpFiles, make$110);
 Layer.succeed(ClaudeMcpFiles, {
 	readUser: Effect.succeed([]),
 	readUserAt: () => Effect.succeed([]),
@@ -30358,7 +30447,7 @@ const decodeClientRegistration = Schema$1.decodeUnknownExit(ClientRegistrationRe
 const decodeTokenResponse = Schema$1.decodeUnknownExit(TokenResponse);
 var McpOAuth = class extends Context.Service()("@p4code/cli/mcp/McpOAuth") {};
 const registryError = (detail) => new McpRegistryError({ detail });
-const make$107 = Effect.gen(function* () {
+const make$109 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const secrets = yield* ServerSecretStore;
 	const http = yield* HttpClient.HttpClient;
@@ -30678,7 +30767,7 @@ const make$107 = Effect.gen(function* () {
 		accessTokenFor
 	};
 });
-const layer$91 = Layer.effect(McpOAuth, make$107);
+const layer$91 = Layer.effect(McpOAuth, make$109);
 Layer.succeed(McpOAuth, {
 	statusFor: () => Effect.succeed(Option.none()),
 	begin: () => Effect.fail(new McpRegistryError({ detail: "OAuth sign-in is not available." })),
@@ -30696,7 +30785,7 @@ const decodeRegistration$1 = Schema$1.decodeUnknownExit(RegistrationFromJson$1);
 const encodeRegistration = Schema$1.encodeSync(RegistrationFromJson$1);
 var McpRegistry = class extends Context.Service()("@p4code/cli/mcp/McpRegistry") {};
 const slotsOf = (registration) => registration.secrets ?? [];
-const make$106 = Effect.gen(function* () {
+const make$108 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const secrets = yield* ServerSecretStore;
 	const oauth = yield* McpOAuth;
@@ -30870,7 +30959,7 @@ const make$106 = Effect.gen(function* () {
 		resolveForSessionAtClaudeUserConfigPath
 	};
 });
-const layer$90 = Layer.effect(McpRegistry, make$106);
+const layer$90 = Layer.effect(McpRegistry, make$108);
 //#endregion
 //#region src/sync/skillDirectory.ts
 /**
@@ -31249,7 +31338,7 @@ const formatHubLink = (input) => encodeStoredHubLink({
 	shareMode: input.shareMode
 });
 const fromEnvironment = (environment) => validateHubLink(environment.P4CODE_HUB_URL ?? "", environment.P4CODE_HUB_TOKEN ?? "");
-const make$105 = Effect.fn("HubLink.make")(function* (environment) {
+const make$107 = Effect.fn("HubLink.make")(function* (environment) {
 	const secrets = yield* ServerSecretStore;
 	const env = environment ?? process.env;
 	const fromEnv = fromEnvironment(env);
@@ -31322,7 +31411,7 @@ const make$105 = Effect.fn("HubLink.make")(function* (environment) {
 		})
 	};
 });
-const layer$89 = Layer.effect(HubLink, make$105());
+const layer$89 = Layer.effect(HubLink, make$107());
 //#endregion
 //#region src/sync/HubAssetClient.ts
 /**
@@ -31355,7 +31444,7 @@ const decodeAssetListPage = Schema$1.decodeUnknownEffect(AssetListPage);
 const decodeConflictBody$1 = Schema$1.decodeUnknownEffect(ConflictBody$1);
 const decodeAsset = Schema$1.decodeUnknownEffect(AgentAsset);
 var HubAssetClient = class extends Context.Service()("@p4code/cli/sync/HubAssetClient") {};
-const make$104 = Effect.gen(function* () {
+const make$106 = Effect.gen(function* () {
 	const http = yield* HttpClient.HttpClient;
 	const link = yield* HubLink;
 	const requireSettings = Effect.gen(function* () {
@@ -31437,7 +31526,7 @@ const make$104 = Effect.gen(function* () {
 		remove
 	};
 });
-const layer$88 = Layer.effect(HubAssetClient, make$104);
+const layer$88 = Layer.effect(HubAssetClient, make$106);
 //#endregion
 //#region src/sync/mcpRegistrationFiles.ts
 /**
@@ -32368,7 +32457,7 @@ const EMPTY_REPORT = {
 	unavailable: null
 };
 var AssetSync = class extends Context.Service()("@p4code/cli/sync/AssetSync") {};
-const make$103 = Effect.gen(function* () {
+const make$105 = Effect.gen(function* () {
 	const client = yield* HubAssetClient;
 	const link = yield* HubLink;
 	const settingsStore = yield* ServerSettingsService;
@@ -33232,7 +33321,7 @@ const make$103 = Effect.gen(function* () {
 		removeLocal
 	};
 });
-const layer$87 = Layer.effect(AssetSync, make$103);
+const layer$87 = Layer.effect(AssetSync, make$105);
 //#endregion
 //#region src/provider/CompressPrompts.ts
 /**
@@ -34621,7 +34710,7 @@ const TERMINAL_STATUSES = /* @__PURE__ */ new Set([
 	"interrupted"
 ]);
 var ThreadBackgroundLivenessService = class extends Context.Service()("@p4code/cli/orchestration/ThreadBackgroundLiveness/ThreadBackgroundLivenessService") {};
-function make$102() {
+function make$104() {
 	const stateByThreadId = /* @__PURE__ */ new Map();
 	const stateFor = (threadId) => {
 		const existing = stateByThreadId.get(threadId);
@@ -34677,7 +34766,7 @@ function make$102() {
 		}
 	};
 }
-const layer$86 = Layer.effect(ThreadBackgroundLivenessService, Effect.sync(make$102));
+const layer$86 = Layer.effect(ThreadBackgroundLivenessService, Effect.sync(make$104));
 //#endregion
 //#region ../../packages/shared/src/sourceControl.ts
 const GITHUB_CHANGE_REQUEST_PRESENTATION = {
@@ -41145,12 +41234,12 @@ const runProcessCore = Effect.fn("processRunner.runProcessCore")(function* (spaw
 		stderrInvalidUtf8: stderr.invalidUtf8
 	};
 });
-const make$101 = Effect.fn("ProcessRunner.make")(function* () {
+const make$103 = Effect.fn("ProcessRunner.make")(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const run = (input) => finalizeRunProcess(runProcessCore(spawner, input), input);
 	return ProcessRunner.of({ run });
 });
-const layer$85 = Layer.effect(ProcessRunner, make$101());
+const layer$85 = Layer.effect(ProcessRunner, make$103());
 //#endregion
 //#region src/project/RepositoryIdentityResolver.ts
 const DEFAULT_REPOSITORY_IDENTITY_CACHE_CAPACITY = 512;
@@ -41241,7 +41330,7 @@ const resolveRepositoryIdentityFromCacheKey = Effect.fn("RepositoryIdentityResol
 		rootPath: cacheKey
 	}) : null;
 });
-const make$100 = Effect.fn("RepositoryIdentityResolver.make")(function* (options = {}) {
+const make$102 = Effect.fn("RepositoryIdentityResolver.make")(function* (options = {}) {
 	const processRunner = yield* ProcessRunner;
 	const repositoryIdentityCache = yield* Cache.makeWith((cacheKey) => resolveRepositoryIdentityFromCacheKey(cacheKey).pipe(Effect.provideService(ProcessRunner, processRunner)), {
 		capacity: options.cacheCapacity ?? DEFAULT_REPOSITORY_IDENTITY_CACHE_CAPACITY,
@@ -41256,7 +41345,7 @@ const make$100 = Effect.fn("RepositoryIdentityResolver.make")(function* (options
 	});
 	return RepositoryIdentityResolver.of({ resolve });
 });
-const layer$84 = Layer.effect(RepositoryIdentityResolver, make$100()).pipe(Layer.provide(layer$85));
+const layer$84 = Layer.effect(RepositoryIdentityResolver, make$102()).pipe(Layer.provide(layer$85));
 //#endregion
 //#region src/orchestration/Layers/ProjectionSnapshotQuery.ts
 const decodeReadModel = Schema$1.decodeUnknownEffect(OrchestrationReadModel);
@@ -41620,7 +41709,8 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 	const EvidenceReadContextRow = Schema$1.Struct({
 		usedTokensAtRead: Schema$1.NullOr(Schema$1.Number),
 		readAt: Schema$1.String,
-		afterSequence: Schema$1.NullOr(Schema$1.Number)
+		afterSequence: Schema$1.NullOr(Schema$1.Number),
+		throughSequence: Schema$1.NullOr(Schema$1.Number)
 	});
 	const getEvidenceReadContextRow = SqlSchema.findOneOption({
 		Request: Schema$1.String,
@@ -41633,7 +41723,8 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
             ELSE NULL
           END AS "usedTokensAtRead",
           created_at AS "readAt",
-          json_extract(payload_json, '$.afterSequence') AS "afterSequence"
+          json_extract(payload_json, '$.afterSequence') AS "afterSequence",
+          json_extract(payload_json, '$.throughSequence') AS "throughSequence"
         FROM projection_thread_activities
         WHERE activity_id = ${activityId}
         LIMIT 1
@@ -41747,6 +41838,10 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
         WHERE reads.thread_id = ${threadId}
           AND reads.kind = 'fusion.evidence.read'
           AND json_extract(reads.payload_json, '$.throughSequence') >= 0
+          -- A raw row's bound is wherever paging reached, never the bound a
+          -- wake named, so no report can pair with it and an unpaired one must
+          -- not read as a review nobody answered.
+          AND COALESCE(json_extract(reads.payload_json, '$.raw'), 0) = 0
         ORDER BY reads.created_at DESC, reads.rowid DESC
         LIMIT 1
       `
@@ -43544,7 +43639,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 		threadId,
 		turnId
 	}).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getTurnStart:query", "ProjectionSnapshotQuery.getTurnStart:decodeRow")));
-	const getActiveTurnId = (threadId) => getActiveTurnIdRow(threadId).pipe(Effect.map(Option.flatMap((row) => Option.fromNullable(row.activeTurnId))), Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getActiveTurnId:query", "ProjectionSnapshotQuery.getActiveTurnId:decodeRow")));
+	const getActiveTurnId = (threadId) => getActiveTurnIdRow(threadId).pipe(Effect.map(Option.flatMap((row) => Option.fromNullishOr(row.activeTurnId))), Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getActiveTurnId:query", "ProjectionSnapshotQuery.getActiveTurnId:decodeRow")));
 	const getLatestThreadMessageWithIdPrefix = (threadId, idPrefix) => getLatestThreadMessageWithIdPrefixRow({
 		threadId,
 		idPrefix
@@ -44572,7 +44667,7 @@ function mergeWithDefaultKeybindings(custom) {
 * Keybindings - Service tag for keybinding configuration operations.
 */
 var Keybindings = class extends Context.Service()("@p4code/cli/keybindings") {};
-const make$99 = Effect.gen(function* () {
+const make$101 = Effect.gen(function* () {
 	const { keybindingsConfigPath } = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
@@ -44833,7 +44928,7 @@ const make$99 = Effect.gen(function* () {
 		}))
 	};
 });
-const layer$83 = Layer.effect(Keybindings, make$99);
+const layer$83 = Layer.effect(Keybindings, make$101);
 //#endregion
 //#region src/process/externalLauncher.ts
 /**
@@ -45060,7 +45155,7 @@ const launchEditorProcess = Effect.fn("externalLauncher.launchEditorProcess")(fu
 		cause
 	}));
 });
-const make$98 = Effect.gen(function* () {
+const make$100 = Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
@@ -45071,7 +45166,7 @@ const make$98 = Effect.gen(function* () {
 		launchEditor: (input) => provideCommandResolutionServices(Effect.flatMap(resolveEditorLaunch(input), (launch) => launchEditorProcess(launch).pipe(Effect.provideService(ChildProcessSpawner$1.ChildProcessSpawner, spawner))))
 	});
 });
-const layer$82 = Layer.effect(ExternalLauncher, make$98);
+const layer$82 = Layer.effect(ExternalLauncher, make$100);
 //#endregion
 //#region src/orchestration/Services/OrchestrationReactor.ts
 /**
@@ -45089,7 +45184,7 @@ var OrchestrationReactor = class extends Context.Service()("@p4code/cli/orchestr
 //#endregion
 //#region src/serverLifecycleEvents.ts
 var ServerLifecycleEvents = class extends Context.Service()("@p4code/cli/serverLifecycleEvents") {};
-const make$97 = Effect.gen(function* () {
+const make$99 = Effect.gen(function* () {
 	const pubsub = yield* PubSub.unbounded();
 	const state = yield* Ref.make({
 		sequence: 0,
@@ -45113,7 +45208,7 @@ const make$97 = Effect.gen(function* () {
 		}
 	};
 });
-const layer$81 = Layer.effect(ServerLifecycleEvents, make$97);
+const layer$81 = Layer.effect(ServerLifecycleEvents, make$99);
 //#endregion
 //#region src/telemetry/Identify.ts
 const CodexAuthJsonSchema = Schema$1.Struct({ tokens: Schema$1.Struct({ account_id: Schema$1.String }) });
@@ -45286,7 +45381,7 @@ var AnalyticsService = class AnalyticsService extends Context.Service()("@p4code
 	/** No-op layer for callers that intentionally disable telemetry. */
 	static layerTest = Layer.succeed(AnalyticsService, inert);
 };
-const make$96 = Effect.gen(function* () {
+const make$98 = Effect.gen(function* () {
 	const telemetryConfig = yield* TelemetryEnvConfig;
 	const posthogKey = telemetryConfig.posthogKey.trim();
 	if (!telemetryConfig.enabled || posthogKey === "") return inert;
@@ -45356,7 +45451,7 @@ const make$96 = Effect.gen(function* () {
 		flush
 	});
 });
-const layer$80 = Layer.effect(AnalyticsService, make$96);
+const layer$80 = Layer.effect(AnalyticsService, make$98);
 AnalyticsService.layerTest;
 //#endregion
 //#region src/provider/Services/ProviderSessionDirectory.ts
@@ -45787,7 +45882,7 @@ var BootServiceInstallError = class extends Schema$1.TaggedErrorClass()("BootSer
 	}
 };
 var BootService = class extends Context.Service()("@p4code/cli/service/bootService") {};
-const make$95 = Effect.fn("cloud.boot_service.make")(function* (input) {
+const make$97 = Effect.fn("cloud.boot_service.make")(function* (input) {
 	const hostExecPath = yield* HostProcessExecutablePath;
 	const hostArguments = yield* HostProcessArguments;
 	const host = input.host ?? {
@@ -46009,7 +46104,7 @@ const make$95 = Effect.fn("cloud.boot_service.make")(function* (input) {
 		logPath
 	});
 });
-const layer$79 = (input) => Layer.effect(BootService, make$95(input));
+const layer$79 = (input) => Layer.effect(BootService, make$97(input));
 //#endregion
 //#region src/service/selfUpdate.ts
 /**
@@ -46084,7 +46179,7 @@ const resolveServerSelfUpdateCapability = Effect.fn("cloud.server_self_update.re
 	return null;
 });
 var ServerSelfUpdate = class extends Context.Service()("@p4code/cli/service/selfUpdate/ServerSelfUpdate") {};
-const make$94 = Effect.fn("cloud.server_self_update.make")(function* (options) {
+const make$96 = Effect.fn("cloud.server_self_update.make")(function* (options) {
 	const serverConfig = yield* ServerConfig$1;
 	const settings = yield* ServerSettingsService;
 	const continuationContext = yield* Effect.context();
@@ -46247,7 +46342,7 @@ const make$94 = Effect.fn("cloud.server_self_update.make")(function* (options) {
 	});
 	return ServerSelfUpdate.of({ update });
 });
-const layer$78 = Layer.effect(ServerSelfUpdate, make$94()).pipe(Layer.provide(layer$85));
+const layer$78 = Layer.effect(ServerSelfUpdate, make$96()).pipe(Layer.provide(layer$85));
 //#endregion
 //#region src/environment/ServerEnvironmentLabel.ts
 const ServerEnvironmentLabelCommandProbe = Schema$1.Literals(["macos-computer-name", "linux-pretty-hostname"]);
@@ -46379,7 +46474,7 @@ function platformArch(architecture) {
 		default: return "other";
 	}
 }
-const make$93 = Effect.gen(function* () {
+const make$95 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const serverConfig = yield* ServerConfig$1;
@@ -46457,7 +46552,7 @@ const make$93 = Effect.gen(function* () {
 * state. It intentionally has no fallback Layer.succeed value: callers must
 * provide the external platform services and a ServerConfig.
 */
-const layer$77 = Layer.effect(ServerEnvironment, make$93).pipe(Layer.provide(layer$85));
+const layer$77 = Layer.effect(ServerEnvironment, make$95).pipe(Layer.provide(layer$85));
 //#endregion
 //#region src/sync/SettingsSync.ts
 /**
@@ -46487,7 +46582,9 @@ const IDLE = {
 	sent: []
 };
 var SettingsSync = class extends Context.Service()("@p4code/cli/sync/SettingsSync") {};
-const decodePayload = Schema$1.decodeUnknownOption(SettingsSyncPayload);
+const payloadJson = Schema$1.fromJsonString(SettingsSyncPayload);
+const decodePayload = Schema$1.decodeUnknownOption(payloadJson);
+const encodePayload = Schema$1.encodeEffect(payloadJson);
 /** The machine's own name, so history can say where a change came from. */
 const environmentLabel = () => {
 	const hostname = NodeOS.hostname().trim();
@@ -46516,7 +46613,7 @@ const promptOverrideIsRunnable = (value) => {
 	}
 	return true;
 };
-const make$92 = Effect.gen(function* () {
+const make$94 = Effect.gen(function* () {
 	const settingsService = yield* ServerSettingsService;
 	const client = yield* HubAssetClient;
 	const label = environmentLabel();
@@ -46544,13 +46641,9 @@ const make$92 = Effect.gen(function* () {
 		const incoming = Option.flatMap(fetched.asset, (asset) => {
 			const file = asset.files.find((candidate) => candidate.path === SETTINGS_SYNC_FILE_PATH);
 			if (file === void 0) return Option.none();
-			try {
-				return decodePayload(JSON.parse(file.content));
-			} catch {
-				return Option.none();
-			}
+			return decodePayload(file.content);
 		});
-		const now = new Date(yield* Clock.currentTimeMillis).toISOString();
+		const now = DateTime.formatIso(yield* DateTime.now);
 		const plan = planSettingsSync({
 			local: filterSyncedSettings(settings),
 			base: settings.settingsSync.base,
@@ -46604,12 +46697,13 @@ const make$92 = Effect.gen(function* () {
 				environmentLabel: label,
 				publishedAt: now
 			};
+			const content = yield* encodePayload(payload).pipe(Effect.orDie);
 			const written = yield* client.write({
 				kind: "settings",
 				name: ASSET_NAME,
 				files: [{
 					path: SETTINGS_SYNC_FILE_PATH,
-					content: JSON.stringify(payload)
+					content
 				}],
 				...Option.match(fetched.asset, {
 					onNone: () => ({}),
@@ -46661,7 +46755,7 @@ const make$92 = Effect.gen(function* () {
 		unavailable: "settings sync failed"
 	})))) };
 });
-const layer$76 = Layer.effect(SettingsSync, make$92);
+const layer$76 = Layer.effect(SettingsSync, make$94);
 //#endregion
 //#region src/provider/Services/ProviderHealthRefresher.ts
 var ProviderHealthRefresher = class extends Context.Service()("@p4code/cli/provider/Services/ProviderHealthRefresher") {};
@@ -47019,7 +47113,7 @@ function daemonPortLine(line) {
 	const port = Number(raw);
 	return Number.isInteger(port) && port > 0 && port <= MAX_PORT$1 ? port : null;
 }
-const make$91 = Effect.fn("AgentDeviceProcess.make")(function* () {
+const make$93 = Effect.fn("AgentDeviceProcess.make")(function* () {
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
@@ -47131,7 +47225,7 @@ const make$91 = Effect.fn("AgentDeviceProcess.make")(function* () {
 	});
 	return { start };
 });
-const layer$75 = Layer.effect(AgentDeviceProcess, make$91());
+const layer$75 = Layer.effect(AgentDeviceProcess, make$93());
 //#endregion
 //#region src/device/DeviceDiscovery.ts
 var DeviceDiscoveryFailure = class extends Data.TaggedError("DeviceDiscoveryFailure") {};
@@ -47164,7 +47258,7 @@ const decodeDeviceDiscovery = (hostId, body) => Schema$1.decodeUnknownEffect(Sch
 		partial: (value.errors?.length ?? 0) > 0
 	});
 }));
-const make$90 = Effect.fn("DeviceDiscovery.make")(function* () {
+const make$92 = Effect.fn("DeviceDiscovery.make")(function* () {
 	const http = yield* HttpClient.HttpClient;
 	return Effect.fn("DeviceDiscovery.read")(function* (input) {
 		const origin = yield* Effect.try(() => new URL(input.ready.hub.origin));
@@ -47226,7 +47320,7 @@ const Result = Schema$1.Struct({
 	serial: Schema$1.optional(DeviceId),
 	error: Schema$1.optional(Schema$1.String)
 });
-const make$89 = Effect.fn("DeviceHubActions.make")(function* () {
+const make$91 = Effect.fn("DeviceHubActions.make")(function* () {
 	const http = yield* HttpClient.HttpClient;
 	const post = Effect.fn("DeviceHubActions.post")(function* (ready, route, payload, timeoutMs) {
 		return yield* Effect.gen(function* () {
@@ -47295,7 +47389,7 @@ function sessionsToClose(sessions, input) {
 //#endregion
 //#region src/device/DeviceCommandLeases.ts
 /** Owns commands by exact session object, so close/reopen cannot revive an old lease. */
-const make$88 = Effect.fn("DeviceCommandLeases.make")(function* () {
+const make$90 = Effect.fn("DeviceCommandLeases.make")(function* () {
 	const lock = yield* Semaphore.make(1);
 	const entries = /* @__PURE__ */ new Map();
 	const revoked = /* @__PURE__ */ new WeakSet();
@@ -47341,7 +47435,7 @@ const make$88 = Effect.fn("DeviceCommandLeases.make")(function* () {
 //#endregion
 //#region src/device/DeviceThreadLeases.ts
 /** Thread retirement also cancels opens that have not created a session yet. */
-const make$87 = Effect.fn("DeviceThreadLeases.make")(function* () {
+const make$89 = Effect.fn("DeviceThreadLeases.make")(function* () {
 	const lock = yield* Semaphore.make(1);
 	const scopes = /* @__PURE__ */ new Map();
 	const blocked = /* @__PURE__ */ new Set();
@@ -47389,7 +47483,7 @@ const make$87 = Effect.fn("DeviceThreadLeases.make")(function* () {
 //#region src/device/DeviceHostRegistry.ts
 const sameConfig = (a, b) => a === b || a !== null && b !== null && a.id === b.id && a.label === b.label && a.target === b.target && a.port === b.port && a.identityFile === b.identityFile;
 /** Owns configuration generations; use() interrupts in-flight work before a host is retired. */
-const make$86 = Effect.fn("DeviceHostRegistry.make")(function* (factories) {
+const make$88 = Effect.fn("DeviceHostRegistry.make")(function* (factories) {
 	const factoryContext = yield* Effect.context();
 	const lock = yield* Semaphore.make(1);
 	const entries = /* @__PURE__ */ new Map();
@@ -47557,7 +47651,7 @@ function pngDimensions(png) {
 		height
 	};
 }
-const make$85 = Effect.fn("DeviceScreenshot.make")(function* () {
+const make$87 = 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));
@@ -47584,7 +47678,7 @@ const make$85 = Effect.fn("DeviceScreenshot.make")(function* () {
 	})));
 });
 var DeviceScreenshot = class extends Context.Service()("@p4code/cli/device/DeviceScreenshot") {};
-const layer$74 = Layer.effect(DeviceScreenshot, make$85().pipe(Effect.map((capture) => ({ capture }))));
+const layer$74 = Layer.effect(DeviceScreenshot, make$87().pipe(Effect.map((capture) => ({ capture }))));
 //#endregion
 //#region src/device/XcodeMcpClient.ts
 const XCODE_BUILD_MCP_VERSION = "2.7.0";
@@ -48397,7 +48491,7 @@ const COMMAND_TIMEOUT_MS$1 = 2e4;
 const COMMAND_OUTPUT_LIMIT = 1024 * 1024;
 const COMMAND_FAILURE_CODE = 127;
 const APPLE_DEVICE_MCP_MINIMUM_XCODE = 27;
-const make$84 = Effect.fn("LocalDeviceHost.make")(function* () {
+const make$86 = Effect.fn("LocalDeviceHost.make")(function* () {
 	const config = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
@@ -48550,7 +48644,7 @@ const make$84 = Effect.fn("LocalDeviceHost.make")(function* () {
 		stop: lock.withPermit(stop)
 	};
 });
-Layer.effect(DeviceHost, make$84()).pipe(Layer.provide(layer$75));
+Layer.effect(DeviceHost, make$86()).pipe(Layer.provide(layer$75));
 Data.TaggedError("SshHostDiscoveryError");
 var SshInvalidTargetError = class extends Data.TaggedError("SshInvalidTargetError") {};
 var SshCommandError = class extends Data.TaggedError("SshCommandError") {};
@@ -49409,7 +49503,7 @@ const probeSshDeviceHost = Effect.fn("SshDeviceDiagnostics.probe")(function* (co
 //#endregion
 //#region src/device/SshDeviceHost.ts
 const DIAGNOSTICS_CACHE_MS = 1e4;
-const make$83 = Effect.fn("SshDeviceHost.make")(function* (input) {
+const make$85 = Effect.fn("SshDeviceHost.make")(function* (input) {
 	const config = yield* Schema$1.decodeUnknownEffect(SshDeviceHostConfig)({ ...input }).pipe(Effect.mapError(() => new DeviceHostError({
 		hostId: input.id,
 		step: "configuring SSH device host",
@@ -49549,8 +49643,8 @@ var DeviceService = class extends Context.Service()("@p4code/cli/device/DeviceSe
 const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function* (input) {
 	const settings = yield* ServerSettingsService;
 	const scope = yield* Scope.Scope;
-	const registry = yield* make$86(input);
-	const commands = yield* make$88();
+	const registry = yield* make$88(input);
+	const commands = yield* make$90();
 	const adapterLeases = /* @__PURE__ */ new Map();
 	const closeCommands = (sessions) => Effect.sync(() => {
 		for (const session of sessions) {
@@ -49559,7 +49653,7 @@ const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function* (input)
 			adapterLeases.delete(session.leaseId);
 		}
 	}).pipe(Effect.andThen(commands.close(sessions)));
-	const threads = yield* make$87();
+	const threads = yield* make$89();
 	const changes = yield* Effect.acquireRelease(PubSub.sliding(STATE_BUFFER_SIZE), PubSub.shutdown);
 	const stateLock = yield* Semaphore.make(1);
 	const discoveryLock = yield* Semaphore.make(1);
@@ -49970,17 +50064,17 @@ const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function* (input)
 		}))
 	};
 });
-const make$82 = Effect.gen(function* () {
-	const discover = yield* make$90();
-	const actions = yield* make$89();
+const make$84 = Effect.gen(function* () {
+	const discover = yield* make$92();
+	const actions = yield* make$91();
 	return yield* makeWithHosts({
-		local: make$84(),
-		ssh: make$83,
+		local: make$86(),
+		ssh: make$85,
 		discover,
 		actions
 	});
 }).pipe(Effect.provide(layer$75));
-const layer$72 = Layer.effect(DeviceService, make$82);
+const layer$72 = Layer.effect(DeviceService, make$84);
 //#endregion
 //#region src/serverRuntimeStartup.ts
 var ServerRuntimeStartupError = class extends Schema$1.TaggedErrorClass()("ServerRuntimeStartupError", {
@@ -50125,7 +50219,7 @@ const startProviderRecovery = Effect.fn("startup.startProviderRecovery")(functio
 	yield* input.recover;
 	yield* input.startReaper;
 });
-const make$81 = Effect.gen(function* () {
+const make$83 = Effect.gen(function* () {
 	const serverConfig = yield* ServerConfig$1;
 	const keybindings = yield* Keybindings;
 	const orchestrationReactor = yield* OrchestrationReactor;
@@ -50279,7 +50373,7 @@ const make$81 = Effect.gen(function* () {
 		enqueueCommand: commandGate.enqueueCommand
 	};
 });
-const layer$71 = Layer.effect(ServerRuntimeStartup, make$81);
+const layer$71 = Layer.effect(ServerRuntimeStartup, make$83);
 //#endregion
 //#region src/serverRuntimeState.ts
 const PersistedServerRuntimeState = Schema$1.Struct({
@@ -50436,7 +50530,7 @@ function expandHomePath$2(input, path) {
 	if (input.startsWith("~/") || input.startsWith("~\\")) return path.join(NodeOS.homedir(), input.slice(2));
 	return input;
 }
-const make$80 = Effect.gen(function* () {
+const make$82 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const statWorkspaceRoot = Effect.fn("WorkspacePaths.statWorkspaceRoot")(function* (workspaceRoot, normalizedWorkspaceRoot, phase) {
@@ -50493,7 +50587,7 @@ const make$80 = Effect.gen(function* () {
 		resolveRelativePathWithinRoot
 	});
 });
-const layer$70 = Layer.effect(WorkspacePaths, make$80);
+const layer$70 = Layer.effect(WorkspacePaths, make$82);
 //#endregion
 //#region src/cli/project.ts
 const isEnvironmentHttpCommonError = Schema$1.is(EnvironmentHttpCommonError);
@@ -54417,7 +54511,7 @@ const makeTerminationError$1 = (handle) => Effect.match(handle.exitCode, {
 //#region ../../packages/effect-acp/src/client.ts
 const MAX_STDERR_CALLBACK_CHARS = 32768;
 var AcpClient = class extends Context.Service()("effect-acp/client/AcpClient") {};
-const make$79 = Effect.fn("effect-acp/AcpClient.make")(function* (stdio, options = {}, terminationError) {
+const make$81 = Effect.fn("effect-acp/AcpClient.make")(function* (stdio, options = {}, terminationError) {
 	const coreHandlers = {};
 	const notificationHandlers = {
 		sessionUpdate: {
@@ -54584,7 +54678,7 @@ const layerChildProcess$1 = (handle, options = {}) => {
 		})), Stream.drain)) : stdout
 	};
 	const terminationError = makeTerminationError$1(handle);
-	return Layer.effect(AcpClient, make$79(stdio, options, terminationError));
+	return Layer.effect(AcpClient, make$81(stdio, options, terminationError));
 };
 //#endregion
 //#region src/provider/Drivers/AntigravitySkills.ts
@@ -55863,7 +55957,7 @@ const Reply = Schema$1.Struct({
 	id: Schema$1.String,
 	result: Schema$1.Struct({ ok: Schema$1.Boolean })
 });
-const make$78 = Effect.fn("DeviceCommandProxy.make")(function* () {
+const make$80 = Effect.fn("DeviceCommandProxy.make")(function* () {
 	const http = yield* HttpClient.HttpClient;
 	const daemonSessions = /* @__PURE__ */ new WeakMap();
 	return Effect.fn("DeviceCommandProxy.execute")(function* (endpoint, session, payload) {
@@ -55916,7 +56010,7 @@ const make$78 = Effect.fn("DeviceCommandProxy.make")(function* () {
 	})));
 });
 var DeviceCommandProxy = class extends Context.Service()("@p4code/cli/device/DeviceCommandProxy") {};
-const layer$69 = Layer.effect(DeviceCommandProxy, make$78().pipe(Effect.map((execute) => ({ execute }))));
+const layer$69 = Layer.effect(DeviceCommandProxy, make$80().pipe(Effect.map((execute) => ({ execute }))));
 //#endregion
 //#region src/device/DeviceHubRoute.ts
 const DEVICE_HUB_PROXY_PREFIX = "/api/device-hub";
@@ -58265,7 +58359,7 @@ const logP4ProjectFileLoadError = (error) => Effect.logWarning(error).pipe(Effec
 	filePath: error.filePath,
 	errorTag: error._tag
 }));
-const make$77 = Effect.gen(function* () {
+const make$79 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const load = Effect.fn("P4ProjectFileLoader.load")(function* (workspaceRoot) {
@@ -58286,7 +58380,7 @@ const make$77 = Effect.gen(function* () {
 	});
 	return P4ProjectFileLoader.of({ load });
 });
-const layer$66 = Layer.effect(P4ProjectFileLoader, make$77);
+const layer$66 = Layer.effect(P4ProjectFileLoader, make$79);
 //#endregion
 //#region src/project/ProjectFaviconResolver.ts
 /**
@@ -58361,7 +58455,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$76 = Effect.gen(function* () {
+const make$78 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const workspacePaths = yield* WorkspacePaths;
@@ -58430,7 +58524,7 @@ const make$76 = Effect.gen(function* () {
 	});
 	return ProjectFaviconResolver.of({ resolvePath });
 });
-const layer$65 = Layer.effect(ProjectFaviconResolver, make$76);
+const layer$65 = Layer.effect(ProjectFaviconResolver, make$78);
 //#endregion
 //#region src/assets/AssetAccess.ts
 const ASSET_ROUTE_PREFIX = "/api/assets";
@@ -58841,10 +58935,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$75 = (sink) => BrowserTraceCollector.of({ record: (records) => Effect.sync(() => {
+const make$77 = (sink) => BrowserTraceCollector.of({ record: (records) => Effect.sync(() => {
 	for (const record of records) sink.push(record);
 }) });
-const layer$64 = (sink) => Layer.succeed(BrowserTraceCollector, make$75(sink));
+const layer$64 = (sink) => Layer.succeed(BrowserTraceCollector, make$77(sink));
 //#endregion
 //#region src/auth/http.ts
 const CREDENTIAL_RESPONSE_HEADERS = {
@@ -59257,6 +59351,17 @@ function isAutoCheckoutBusy(input) {
 		return thread.latestTurn?.state === "running" || thread.session?.status === "starting" || thread.session?.status === "running";
 	});
 }
+/** The brief every advisor gets; Jev reads it as instructions, the model as a question. */
+const AUTO_WORKSPACE_QUESTION_LINES = (hasWorkingTreeChanges) => [
+	"Choose the workspace for this task before its coding agent starts.",
+	"Return exactly local or worktree in the answer field. Do not perform the task.",
+	"No other P4 agent is currently working in this checkout.",
+	`Uncommitted changes are ${hasWorkingTreeChanges ? "present" : "absent"}.`,
+	"Prefer local for questions, investigation, small focused edits, and work that needs current uncommitted changes.",
+	"Prefer worktree for independent implementation, broad changes, risky experiments, or possible interference with someone else's edits.",
+	"A new worktree starts from the selected base branch; uncommitted files are not copied.",
+	"Honor an explicit workspace preference in the task. Preserve unrelated changes. If uncertain, choose worktree."
+];
 const BUSY_CHECKOUT_DECISION = {
 	mode: "worktree",
 	reason: "Another agent is working in the current checkout."
@@ -59265,27 +59370,23 @@ const UNAVAILABLE_DECISION = {
 	mode: "worktree",
 	reason: "The agent could not choose a workspace; using an isolated worktree."
 };
-const chooseAutoWorkspace = Effect.fn("chooseAutoWorkspace")(function* (input, textGeneration) {
+const chooseAutoWorkspace = Effect.fn("chooseAutoWorkspace")(function* (input, textGeneration, advisor) {
 	if (!input.isRepo) return {
 		mode: "local",
 		reason: "This project has no Git repository."
 	};
 	if (input.busy) return BUSY_CHECKOUT_DECISION;
+	const advised = advisor ? yield* advisor.chooseWorkspace({
+		message: input.message,
+		hasWorkingTreeChanges: input.hasWorkingTreeChanges
+	}) : void 0;
+	if (advised) return advised;
 	if (!textGeneration.generateBtwAnswer || !input.modelSelection) return UNAVAILABLE_DECISION;
 	return yield* textGeneration.generateBtwAnswer({
 		cwd: input.cwd,
 		modelSelection: input.modelSelection,
 		context: input.message,
-		question: [
-			"Choose the workspace for this task before its coding agent starts.",
-			"Return exactly local or worktree in the answer field. Do not perform the task.",
-			"No other P4 agent is currently working in this checkout.",
-			`Uncommitted changes are ${input.hasWorkingTreeChanges ? "present" : "absent"}.`,
-			"Prefer local for questions, investigation, small focused edits, and work that needs current uncommitted changes.",
-			"Prefer worktree for independent implementation, broad changes, risky experiments, or possible interference with someone else's edits.",
-			"A new worktree starts from the selected base branch; uncommitted files are not copied.",
-			"Honor an explicit workspace preference in the task. Preserve unrelated changes. If uncertain, choose worktree."
-		].join("\n")
+		question: AUTO_WORKSPACE_QUESTION_LINES(input.hasWorkingTreeChanges).join("\n")
 	}).pipe(Effect.timeout(AUTO_WORKSPACE_DECISION_TIMEOUT), Effect.map(({ answer }) => {
 		const mode = answer.trim().toLowerCase();
 		if (mode === "local") return {
@@ -59449,8 +59550,30 @@ const readWorkflowScript = Effect.fn("orchestration.readWorkflowScript")(functio
 * 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. Follow the current turn's [fusion-review-policy] block when present; it overrides the phase-boundary scheduling rules below. Do not inspect or invoke the Fusion skill, create/pair/rename threads, or announce/setup Fusion. Start the user's task directly. The phase plan is not yours: Supervisor authors it, orders it, and moves every phase status, and it renders in your task banner from there. Never create or edit a phase list yourself - not with TaskCreate, TaskUpdate, TodoWrite, update_plan, the MCP task board tools, or thread_plan_update - and never mark your own phase complete. Work the one phase Supervisor put in progress, and report what you did. Step-level notes for your own use are fine as long as they never become a phase list. 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 a report of at most six non-empty lines: the phase you finished, what changed and where, what you verified with its result, and anything unresolved. One line each, every fact once, no restatement of the plan or of advice you were given. Code, exact error text and security warnings are exempt from the cap. 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_evidence_report, thread_plan_update, 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:
+/**
+* What a role does when a tool it wants is not its own.
+*
+* Both halves get the same words because the failure is the same on both
+* sides: a denied capability is an answer about what this role may do, and
+* treating it as an obstacle to route around turns a boundary the server
+* enforces into one it merely suggests.
+*/
+const FUSION_TOOL_BOUNDARY_INSTRUCTIONS = `A tool missing from your role, or a call the server denies for want of a capability or a grant, is a limit to report rather than an obstacle to route around. Never substitute the server's own database, its HTTP API, another MCP server, or any other back channel for a capability you were not granted; say which tool or grant you lacked and what you would have done with it.`;
+/**
+* What a role does when the user asks it, in person, for the other half's work.
+*
+* Distinct from the tool boundary above: there the role wants a capability and
+* is told to report the limit, while here the user wants something and the
+* quiet handover is the failure. A builder that silently parks a tracker
+* request in its phase report, or a supervisor that silently forwards an
+* implementation request through thread_advise, answers a question the user
+* never asked - they may have addressed the wrong half, or may want that half
+* to say plainly that it cannot. Confirmation costs one turn; a misrouted
+* instruction costs the work done under it.
+*/
+const FUSION_OUT_OF_ROLE_REQUEST_INSTRUCTIONS = `A request the user addresses to you that your role does not own is neither yours to perform nor yours to hand to the other half on your own initiative. Name the capability you lack and the half that owns it, ask the user whether they meant it to go there, and end the turn without acting; carry it across only once they confirm. This governs an instruction aimed at you, not a need your own work turned up - something the task itself raised still travels its normal path. A user who already named the other half, or whose instruction only the other half could have been meant for, has confirmed it; do not ask again.`;
+const FUSION_BUILDER_INSTRUCTIONS = `You are Fusion Builder in an already-created native server pair. Server owns pairing and coordination. Follow the current turn's [fusion-review-policy] block when present; it overrides the phase-boundary scheduling rules below. Do not inspect or invoke the Fusion skill, create/pair/rename threads, or announce/setup Fusion. Start the user's task directly. The phase plan is not yours: Supervisor authors it, orders it, and moves every phase status, and it renders in your task banner from there. Never create or edit a phase list yourself - not with TaskCreate, TaskUpdate, TodoWrite, update_plan, the MCP task board tools, or thread_plan_update - and never mark your own phase complete. Work the one phase Supervisor put in progress, and report what you did. Step-level notes for your own use are fine as long as they never become a phase list. 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 a report of at most six non-empty lines: the phase you finished, what changed and where, what you verified with its result, and anything unresolved. One line each, every fact once, no restatement of the plan or of advice you were given. Code, exact error text and security warnings are exempt from the cap. 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 review tools are Supervisor's half of the pair, not yours: thread_watch_review, thread_watch_events and thread_evidence_report are its tools, and a thread outside this pair is not yours to read. Your provider may still list them; that is not a grant, and every call fails. The tracker is Supervisor's too: you neither read nor write tickets, so when the work needs one filed, commented, or moved, say so in your phase report and let Supervisor carry it. ${FUSION_OUT_OF_ROLE_REQUEST_INSTRUCTIONS} ${FUSION_TOOL_BOUNDARY_INSTRUCTIONS} ${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_evidence_report, thread_plan_update, thread_advise, thread_gate_respond, and the task board tools task_current, task_get, task_list, task_create and task_update. Read the board whenever planning needs it, and read a named ticket with ticket_resolve together with its comments, treating a later comment as newer intent than the description. Resolve which task that is by calling task_current with the builder's threadId, because a pair started from the board links the row to the builder and not to you; a bare task_current answers for your own thread and reports the task as unlinked. Write only within that task: update it or a subtask you created under it, never an unrelated row, never another project's board, and never any board but this one - task_create files a real ticket on an external tracker when given a source such as 'linear', and that is not yours to file. 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.
 ## Reason
@@ -59465,7 +59588,7 @@ Give ordered, concrete actions for the builder, including the next phase and its
 * which is what it did before this existed.
 */
 const FUSION_EVIDENCE_SUMMARY_INSTRUCTIONS = `Read the builder's evidence through a summarizer subagent rather than into your own context: spawn one subagent with the evidence range and have it call thread_watch_review itself, paging with nextAfterSequence against a fixed throughSequence until hasMore is false, and return a summary. Your tool grants reach it, so it can read the paired builder thread exactly as you can. Instruct that subagent that thread_watch_review and thread_watch_events may be absent from its visible tool list and that absence does not establish unavailability: it must first use the available tool search/discovery facility to load those exact tools by name, including provider-prefixed names, and if discovery itself fails it must report that exact error rather than reporting no such tool. Require of that summary: every file path touched with the scale of the change to each, every command run and whether it succeeded or failed, check and test results with their counts, exact error text quoted rather than characterized, the builder's completion claims marked as claims, and anything the builder flagged as uncertain, blocked or unresolved. Over a multi-turn range it must also carry unresolved objections of yours and whether each was answered, phases completed versus reopened, claims never verified, and files touched repeatedly. Every statement cites the sequences behind it so you can check any one of them with a targeted thread_watch_events read. Fail open: if no subagent is available, the spawn errors, it times out, or what comes back is empty or does not cite sequences, read the range yourself and review from the raw evidence. Never skip or shorten a review because a summary was unavailable. Record which fallback you took: a subagent that could not load the watch tools is a misconfiguration worth naming in your report, and it is not the same as a spawn that errored or timed out. Then close the review by calling thread_evidence_report exactly once, after the last page: pass the watched thread id, the same fixed throughSequence the first review page returned - not lastSequence and not the final page's nextAfterSequence, because the server pairs the report to the read by that exact number - the first and last sequence you actually covered, the model you spawned on, and outcome summarized with the subagent's exact returned text, fallback when you read the raw range yourself, or failed when the summarizer could not run or could not report - with the reason in your own words for the last two. Report even when the summary never arrived; a review with no report cannot be told apart from a supervisor that never tried. Never paste builder tool output into it.`;
-const FUSION_WATCHER_INSTRUCTIONS = `You are Fusion Supervisor (watcher) in an already-created native server pair. Follow the current turn's [fusion-review-policy] block when present; it overrides phase scheduling. Server owns pairing and coordination and wakes you with ${FUSION_REVIEW_PROMPT_PREFIX} or ${FUSION_GATE_PROMPT_PREFIX} prompts at builder turn boundaries. A plain message outside such a wake may arrive after your conversational memory of the pair is gone; its [fusion-pair] metadata block is authoritative: the builder thread exists and is the counterpart thread id. Never report that no builder thread exists. For a new pair, the initial user request is yours, and its first turn is research, not relay. Research it: when the request names a ticket, read that ticket AND its comments, including replies and inline comments, and treat a later comment as newer intent than the description; read the code, docs, project instructions, and current state the request touches. Analyse what you found: root cause or the concrete design constraint, scope, what the user actually wants delivered, and which delivery steps they authorized. Only then write the phase plan and direct its first phase. The plan is yours alone: call thread_plan_update with the builder's threadId, sending the complete ordered list every time, each phase named in 3-6 words by its outcome rather than by a command, file path, or flag, with exactly one in progress. 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 a complete reviewable slice of behavior. Never split per file, per function, or per trivial step. State each phase's completion condition to the builder in the advice, not in the banner title. On every later review, rewrite the same plan: an approved phase becomes completed and the next becomes in progress in the same call, an objection leaves the current phase in progress or reopens a phase you had marked completed, and the final approval completes the last phase. The builder never touches it, so a phase you do not move stays where it is. Then direct the phase to the idle builder through thread_advise, stating the findings that make the direction actionable alongside the original requirements, constraints, and authorized delivery scope. Never echo the request back as its own direction, never hand over a plan you did not ground in evidence, and never send ${FUSION_NO_OBJECTION_TEXT} before the builder has received its first phase and produced a turn to review. The builder has not received the initial prompt and must not start before your direction. Missing builder turn evidence is expected before that first direction; do not wait for it or implement the work yourself. Ask the user only when needed to resolve a blocking requirement. ${FUSION_WATCHER_TOOL_INSTRUCTIONS} To resume supervision, read builder evidence with thread_watch_review from lastReviewedImplementerSequence, capture its throughSequence on the first page and reuse that fixed bound while paging with nextAfterSequence until hasMore is false (including empty pages). Apply message append/replace operations by identity; recover truncated evidence through targeted raw thread_watch_events source ranges. Retain reviewed requirements and evidence for final review; recover missing context with targeted history reads rather than mandatory raw replay from zero, derive phase from artifacts (git log/status, PR, builder events, including its turn.plan.updated phase list), steer with thread_advise, and answer an open gate with thread_gate_respond. When a review or gate wake prompt specifies an explicit event range, that range wins over this metadata. Never poll or wait for the builder; deliver review or advice, then end the turn. Every thread_advise starts a builder turn whose completion wakes you again, so never advise a builder that is idle on an external wait or has nothing actionable; report the state in your own thread and end without advising. ${FUSION_PAIR_COMMUNICATION_INSTRUCTIONS}`;
+const FUSION_WATCHER_INSTRUCTIONS = `You are Fusion Supervisor (watcher) in an already-created native server pair. Follow the current turn's [fusion-review-policy] block when present; it overrides phase scheduling. Server owns pairing and coordination and wakes you with ${FUSION_REVIEW_PROMPT_PREFIX} or ${FUSION_GATE_PROMPT_PREFIX} prompts at builder turn boundaries. A plain message outside such a wake may arrive after your conversational memory of the pair is gone; its [fusion-pair] metadata block is authoritative: the builder thread exists and is the counterpart thread id. Never report that no builder thread exists. For a new pair, the initial user request is yours, and its first turn is research, not relay. Research it: when the request names a ticket, read that ticket AND its comments, including replies and inline comments, and treat a later comment as newer intent than the description; read the code, docs, project instructions, and current state the request touches. Analyse what you found: root cause or the concrete design constraint, scope, what the user actually wants delivered, and which delivery steps they authorized. Only then write the phase plan and direct its first phase. The plan is yours alone: call thread_plan_update with the builder's threadId, sending the complete ordered list every time, each phase named in 3-6 words by its outcome rather than by a command, file path, or flag, with exactly one in progress. 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 a complete reviewable slice of behavior. Never split per file, per function, or per trivial step. State each phase's completion condition to the builder in the advice, not in the banner title. On every later review, rewrite the same plan: an approved phase becomes completed and the next becomes in progress in the same call, an objection leaves the current phase in progress or reopens a phase you had marked completed, and the final approval completes the last phase. The builder never touches it, so a phase you do not move stays where it is. Then direct the 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_OUT_OF_ROLE_REQUEST_INSTRUCTIONS} ${FUSION_TOOL_BOUNDARY_INSTRUCTIONS} ${FUSION_PAIR_COMMUNICATION_INSTRUCTIONS}`;
 /**
 * The one-line stand-in for the full block on a message whose session already
 * carries the role instructions.
@@ -59625,16 +59748,33 @@ const FUSION_SAFETY_KERNEL = [
 	"- Never commit, push, or open a pull request unless the current turn asked for it, and never commit to main or master directly.",
 	"- Never add AI attribution to a commit message, pull request, issue, comment, code, or document."
 ].join("\n");
-/** Everything the supervisor half needs from the P4 MCP server, and nothing else. */
+/**
+* Everything the supervisor half needs from the P4 MCP server, and nothing else.
+*
+* The task tools are here because planning is the supervisor's job, not an
+* aside to it: it owns the phase plan, so it has to be able to read the board,
+* break the work down and keep the authorized task honest. Mutation stays
+* bounded by the prompt rather than by this set, which can only say whether a
+* tool exists - the rule is the current task, never someone else's board row.
+* `task_propose` is deliberately absent: it tells its caller to stop and wait
+* for the user, and a supervisor that waits is one the builder sits idle
+* behind. Asking the user is what `ask_user_question` is for.
+*/
 const FUSION_SUPERVISOR_P4_TOOLS = /* @__PURE__ */ new Set([
 	"thread_watch_review",
 	"thread_watch_events",
 	"thread_evidence_report",
 	"thread_advise",
 	"thread_gate_respond",
+	"thread_pair_detach",
 	"thread_plan_update",
 	"ask_user_question",
-	"task_current"
+	"task_current",
+	"task_get",
+	"task_list",
+	"task_create",
+	"task_update",
+	"ticket_resolve"
 ]);
 /**
 * What the builder half must not reach.
@@ -59642,15 +59782,23 @@ const FUSION_SUPERVISOR_P4_TOOLS = /* @__PURE__ */ new Set([
 * Framed as a denial rather than an allowance because the builder's job is
 * open-ended: it needs coding, verification and preview tools, and a new one of
 * those should reach it without an edit here. What it must never have is the
-* pair's own machinery - spawning threads, creating or detaching pairs,
-* advising, answering its own gate - the phase plan, which the supervisor
-* owns outright, plus task-board mutation and the external services that
-* belong to a person rather than to an implementation turn.
+* pair's own machinery - spawning threads, creating pairs, advising, answering
+* its own gate - the phase plan, which the supervisor owns outright, plus
+* task-board mutation and the external services that belong to a person rather
+* than to an implementation turn. The review tools join that list: they read
+* the review of the builder's own work, which is the supervisor watching the
+* builder and never the other way round.
+*
+* Both roles retain `thread_pair_detach` as their way out. Its handler limits
+* detaching to a pair containing the caller whose other thread this session
+* created. The role policy exposes the action; the handler enforces ownership.
 */
 const FUSION_BUILDER_DENIED_P4_TOOLS = /* @__PURE__ */ new Set([
 	"thread_spawn",
+	"thread_watch_review",
+	"thread_watch_events",
+	"thread_evidence_report",
 	"thread_pair_create",
-	"thread_pair_detach",
 	"thread_cleanup",
 	"thread_rename",
 	"thread_configure",
@@ -59695,21 +59843,90 @@ function fusionContextPolicyFor(role, optimizedContext) {
 		optimizedContext
 	};
 }
-/** Whether the lean profile applies at all. Ordinary threads never reach it. */
+/**
+* Whether a role may call one P4 tool at all, regardless of any setting.
+*
+* The hiding functions below are a context measure: they keep a role's tool
+* list short, they only work on adapters that expose a per-session filter, and
+* the user can turn them off. This is the authorization question instead, so
+* it takes no setting and no adapter - a role that cannot act on a tool must
+* not be able to call it on any provider, whether or not the list it was shown
+* mentioned it.
+*
+* Shaped from the same two sets the hiding uses, so the list a role sees and
+* the calls it may make cannot drift apart. A thread with no role is not half
+* of a pair and is not this function's business.
+*/
+function fusionRoleMayCallP4Tool(role, toolName) {
+	if (role === void 0) return true;
+	return role === "watcher" ? FUSION_SUPERVISOR_P4_TOOLS.has(toolName) : !FUSION_BUILDER_DENIED_P4_TOOLS.has(toolName);
+}
+/**
+* Whether the context trimming applies. Ordinary threads never reach it.
+*
+* Only the measures that exist to save tokens ask this: the P4 tool list and
+* the setting sources. What a role may do is not a token question and must not
+* consult a setting the user can turn off - see `fusionRoleApplies`.
+*/
 function fusionLeanContextApplies(input) {
 	return input.role !== void 0 && input.optimizedContext;
 }
 /**
-* The external MCP registrations a Fusion session keeps: none.
+* Whether a role's restrictions apply: whenever there is a role.
+*
+* Kept apart from the trimming above because the two answer different
+* questions. Turning context optimization off should cost a pair its token
+* savings, never hand the builder the tracker and the planning tools back or
+* give the supervisor an editor.
+*/
+function fusionRoleApplies(input) {
+	return input.role !== void 0;
+}
+/**
+* The registered servers the supervisor half keeps, by lowercased name.
 *
-* Everything a user registered for their own work goes, because neither role
-* can act on it during a pair turn and every definition is paid for on every
-* turn of the loop. Computer Use needs no exception here - it is a
+* Only the tracker, and only for the supervisor. It researches the request
+* before it plans, and `ticket_resolve` answers with a ticket's description
+* alone - the comments that routinely carry newer intent are reachable only
+* through the user's own Linear registration. The builder keeps none: it
+* implements the phase it was given and has no errand on a tracker.
+*
+* The name is repeated here rather than imported from `mcp/LinearMcpClient`,
+* which every adapter would then pull into a provider process. A test pins
+* the two together, exactly as the P4 tool catalogue is pinned.
+*/
+const FUSION_SUPERVISOR_EXTERNAL_MCP_SERVERS = /* @__PURE__ */ new Set(["linear"]);
+/**
+* The name a registration was given, with the user-scope prefix taken back off.
+*
+* A server the user registered in their own provider config reaches a session
+* re-keyed as `p4-user-<name>`, so matching the raw key would look for a name
+* the registry never hands over and would drop the tracker it was written to
+* keep. The prefix is spelled here for the same reason the name is: importing
+* the registry would pull it into every provider process.
+*/
+const USER_SCOPE_REGISTRATION_PREFIX = "p4-user-";
+const fusionRegistrationBareName = (name) => {
+	const lowered = name.toLowerCase();
+	return lowered.startsWith(USER_SCOPE_REGISTRATION_PREFIX) ? lowered.slice(8) : lowered;
+};
+/**
+* The external MCP registrations a Fusion session keeps.
+*
+* Applies to any pair turn, optimized or not: which servers a role may reach
+* is authorization, and the setting only governs what is trimmed to save
+* tokens.
+*
+* Everything else a user registered for their own work goes, because neither
+* role can act on it during a pair turn and every definition is paid for on
+* every turn of the loop. Computer Use needs no exception here - it is a
 * provider-owned endpoint attached only to a session that was granted it, not
 * a registration in this map, so a granted session keeps it either way.
 */
 function fusionExternalMcpServers(servers, input) {
-	return fusionLeanContextApplies(input) ? {} : { ...servers };
+	if (!fusionRoleApplies(input)) return { ...servers };
+	if (input.role !== "watcher") return {};
+	return Object.fromEntries(Object.entries(servers).filter(([name]) => FUSION_SUPERVISOR_EXTERNAL_MCP_SERVERS.has(fusionRegistrationBareName(name))));
 }
 /**
 * P4 tools this role must not see, given the full catalogue.
@@ -59723,20 +59940,70 @@ function fusionHiddenP4Tools(catalogue, input) {
 	return input.role === "watcher" ? catalogue.filter((name) => !FUSION_SUPERVISOR_P4_TOOLS.has(name)) : catalogue.filter((name) => FUSION_BUILDER_DENIED_P4_TOOLS.has(name));
 }
 /**
+* Provider-native tools the supervisor must not see.
+*
+* It reviews and directs; it never edits the tree. Reading tools stay, because
+* grounding an objection in the code is exactly its job, and a shell stays too
+* - `git log` and `git status` are how it derives phase from artifacts. What
+* goes is the means to write the change it is supposed to be reviewing.
+*
+* Named per provider, like the builder's list, because the names are the
+* provider's rather than ours.
+*/
+const FUSION_SUPERVISOR_DENIED_NATIVE_TOOLS = [
+	"Edit",
+	"MultiEdit",
+	"Write",
+	"NotebookEdit",
+	"apply_patch"
+];
+/**
 * Provider-native tools this role must not see.
 *
 * The supervisor keeps its own planning tool: it is the half that plans, and
-* for its own thread that tool is the ordinary one.
+* for its own thread that tool is the ordinary one. It loses the editing tools
+* instead, which are the builder's half of the same split.
+*
+* Applies to any pair turn, optimized or not, for the same reason the external
+* registrations do: a builder holding the planning tool is a role problem, not
+* a token one.
 */
 function fusionHiddenNativeTools(input) {
-	return fusionLeanContextApplies(input) && input.role === "implementer" ? FUSION_BUILDER_DENIED_NATIVE_TOOLS : [];
+	if (!fusionRoleApplies(input)) return [];
+	return input.role === "implementer" ? FUSION_BUILDER_DENIED_NATIVE_TOOLS : FUSION_SUPERVISOR_DENIED_NATIVE_TOOLS;
+}
+/**
+* Global agents a pair still owes its user after the lean profile drops the
+* user setting source.
+*
+* Dropping that source is what makes the profile lean, but it takes the user's
+* subagent definitions with it, and the delivery loop this pair runs on names
+* one of them outright: the supervisor will not accept the work until the
+* global `pr-reviewer` has reviewed the branch. Leaving it unregistered means
+* the builder either cannot comply or quietly reviews with something else,
+* which is the failure this list exists to prevent. Named rather than
+* discovered, so the cost stays one definition instead of every agent the user
+* happens to have.
+*/
+const FUSION_REQUIRED_GLOBAL_AGENTS = ["pr-reviewer"];
+/**
+* Which global agents this session has to register for itself.
+*
+* Empty unless the lean profile actually dropped the user source: when it is
+* off the provider loads them the usual way, and registering them again would
+* be a second definition of the same agent.
+*/
+function fusionRequiredGlobalAgents(input) {
+	return fusionLeanContextApplies(input) ? FUSION_REQUIRED_GLOBAL_AGENTS : [];
 }
 /**
 * Setting sources a Fusion session reads.
 *
 * `user` carries the global memory files and the user-level skills; the
 * project's own instructions live in `project` and `local` and stay, because
-* they are the ones that describe the code being changed.
+* they are the ones that describe the code being changed. What the drop also
+* takes, and what `fusionRequiredGlobalAgents` above hands back, is the user's
+* subagent definitions.
 */
 function fusionSettingSources(sources, input) {
 	if (!fusionLeanContextApplies(input)) return sources;
@@ -60303,7 +60570,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$74 = (options) => Effect.gen(function* () {
+const make$76 = (options) => Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const runtimeScope = yield* Scope.Scope;
@@ -60707,7 +60974,7 @@ const make$74 = (options) => Effect.gen(function* () {
 		notify: acp.raw.notify
 	};
 });
-const layer$63 = (options) => Layer.effect(AcpSessionRuntime, make$74(options));
+const layer$63 = (options) => Layer.effect(AcpSessionRuntime, make$76(options));
 function sessionConfigOptionsFromSetup(response) {
 	return response?.configOptions ?? [];
 }
@@ -65165,7 +65432,7 @@ const BundledOnlyModelManifest = {
 	refreshInBackground: Effect.void
 };
 Layer.succeed(ModelManifest, BundledOnlyModelManifest);
-const make$73 = Effect.gen(function* () {
+const make$75 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const config = yield* ServerConfig$1;
@@ -65210,7 +65477,7 @@ const make$73 = Effect.gen(function* () {
 		refreshInBackground: Effect.forkIn(guardedRefresh, serviceScope).pipe(Effect.asVoid)
 	});
 });
-const layer$62 = Layer.effect(ModelManifest, make$73);
+const layer$62 = Layer.effect(ModelManifest, make$75);
 //#endregion
 //#region src/provider/ProviderDriver.ts
 function defaultProviderContinuationIdentity(input) {
@@ -65476,11 +65743,11 @@ const makeTextGenerationFromRegistry = (registry) => TextGeneration.of({
 		detail: "This provider does not report account usage."
 	}))))
 });
-const make$72 = Effect.gen(function* () {
+const make$74 = Effect.gen(function* () {
 	const registry = yield* ProviderInstanceRegistry;
 	return makeTextGenerationFromRegistry(registry);
 });
-const layer$61 = Layer.effect(TextGeneration, make$72);
+const layer$61 = Layer.effect(TextGeneration, make$74);
 //#endregion
 //#region src/provider/Layers/claudeUsageLimits.ts
 const SESSION_MINS$1 = 300;
@@ -69927,6 +70194,7 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 			optimizedContext: fusionPromptSettings?.optimizedContext ?? DEFAULT_FUSION_PROMPT_SETTINGS.optimizedContext
 		};
 		const externalMcpServers = fusionExternalMcpServers(registeredMcpServers, fusionContextPolicy);
+		const requiredGlobalAgents = yield* discoverClaudeUserAgents(claudeSettings, fusionRequiredGlobalAgents(fusionContextPolicy), claudeEnvironment, input.cwd).pipe(Effect.provideService(FileSystem.FileSystem, fileSystem), Effect.provideService(Path$1.Path, path));
 		const hiddenTools = [...fusionHiddenP4Tools(providerMcpToolNames(), fusionContextPolicy).map((name) => `mcp__${P4CODE_MCP_SERVER_NAME}__${name}`), ...fusionHiddenNativeTools(fusionContextPolicy)];
 		const unpromptedSubagents = input.unpromptedSubagents !== void 0 ? input.unpromptedSubagents : options?.resolveUnpromptedSubagents === void 0 ? DEFAULT_SERVER_SETTINGS.enableUnpromptedSubagents : yield* options.resolveUnpromptedSubagents;
 		const compressRuleset = compressRulesetFor(input.compressMode ?? "off");
@@ -69958,6 +70226,7 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 				...systemPromptAppend.length > 0 ? { append: systemPromptAppend } : {}
 			},
 			settingSources: [...fusionSettingSources(CLAUDE_SETTING_SOURCES, fusionContextPolicy)],
+			...Object.keys(requiredGlobalAgents).length > 0 ? { agents: requiredGlobalAgents } : {},
 			...hiddenTools.length > 0 ? { disallowedTools: hiddenTools } : {},
 			...effectiveEffort ? { effort: effectiveEffort } : {},
 			...permissionMode ? { permissionMode } : {},
@@ -88447,7 +88716,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$71 = Effect.fn("effect-codex-app-server/CodexAppServerClient.make")(function* (stdio, options = {}, terminationError) {
+const make$73 = Effect.fn("effect-codex-app-server/CodexAppServerClient.make")(function* (stdio, options = {}, terminationError) {
 	const requestHandlers = /* @__PURE__ */ new Map();
 	const notificationHandlers = /* @__PURE__ */ new Map();
 	let unknownRequestHandler;
@@ -88514,7 +88783,7 @@ const make$71 = 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$71(makeChildStdio(handle), options, makeTerminationError(handle));
+	return yield* make$73(makeChildStdio(handle), options, makeTerminationError(handle));
 });
 const resolveCodexLaunchArgs = (launchArgs, environment = process.env) => environment["P4CODE_CODEX_LAUNCH_ARGS"]?.trim() || launchArgs?.trim() || "";
 const codexLaunchArgv = (launchArgs) => tokenizeCliArgs(launchArgs);
@@ -95673,7 +95942,7 @@ function mapMuseExecRecord(input) {
 			const toolName = state.toolNameByTaskId.get(taskId);
 			state.settledToolTaskIds.add(taskId);
 			const failed = stringField$1(recordField(payload, "correlation_facts"), "outcome") === "error";
-			const detail = truncate(stringField$1(payload, "text"), MAX_TOOL_DETAIL_CHARS);
+			const detail = truncate$1(stringField$1(payload, "text"), MAX_TOOL_DETAIL_CHARS);
 			const editFacts = recordField(payload, "edit_facts");
 			return [(stamp) => ({
 				type: "item.completed",
@@ -95697,7 +95966,7 @@ function mapMuseExecRecord(input) {
 			const toolName = state.toolNameByTaskId.get(taskId);
 			if (!toolName || state.settledToolTaskIds.has(taskId)) return [];
 			state.settledToolTaskIds.add(taskId);
-			const detail = truncate(stringField$1(event, "reason"), MAX_TOOL_DETAIL_CHARS);
+			const detail = truncate$1(stringField$1(event, "reason"), MAX_TOOL_DETAIL_CHARS);
 			return [(stamp) => ({
 				type: "item.completed",
 				...stamp,
@@ -95874,7 +96143,7 @@ function recordField(source, key) {
 function eventField(payload) {
 	return recordField(payload, "event");
 }
-function truncate(value, max) {
+function truncate$1(value, max) {
 	if (value === void 0) return void 0;
 	const trimmed = value.trim();
 	if (trimmed.length === 0) return void 0;
@@ -100275,8 +100544,8 @@ const makeWithReader = (api) => Effect.gen(function* () {
 		}))
 	};
 });
-const make$70 = makeCliproxyApi.pipe(Effect.flatMap(makeWithReader));
-const layer$60 = Layer.effect(UsageLimitSources, make$70);
+const make$72 = makeCliproxyApi.pipe(Effect.flatMap(makeWithReader));
+const layer$60 = Layer.effect(UsageLimitSources, make$72);
 //#endregion
 //#region src/resourceTelemetry/HostResources.ts
 const CPU_SAMPLE_INTERVAL = "200 millis";
@@ -100311,7 +100580,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$69 = Effect.fn("makeHostResources")(function* () {
+const make$71 = Effect.fn("makeHostResources")(function* () {
 	const fs = yield* FileSystem.FileSystem;
 	const platform = yield* HostProcessPlatform;
 	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
@@ -100345,7 +100614,7 @@ const make$69 = Effect.fn("makeHostResources")(function* () {
 	});
 	return HostResources.of({ read: Cache.get(cache, "host") });
 });
-const layer$59 = Layer.effect(HostResources, make$69());
+const layer$59 = Layer.effect(HostResources, make$71());
 //#endregion
 //#region src/resourceTelemetry/DesktopTelemetryReceiver.ts
 const INITIAL_SAMPLE_DEADLINE_MS = 9e4;
@@ -100480,7 +100749,7 @@ function requireDesktopTelemetryWriteProgress(fd, remainingBytes, written) {
 	}));
 }
 /** @public Service construction is part of the canonical Effect module API. */
-const make$68 = Effect.fn("resourceTelemetry.desktopTelemetryReceiver.make")(function* () {
+const make$70 = Effect.fn("resourceTelemetry.desktopTelemetryReceiver.make")(function* () {
 	const serverConfig = yield* ServerConfig$1;
 	const hasDescriptors = serverConfig.mode === "desktop" && serverConfig.desktopTelemetryFd === 4 && serverConfig.desktopTelemetryControlFd === 5;
 	const config = {
@@ -100637,7 +100906,7 @@ const make$68 = Effect.fn("resourceTelemetry.desktopTelemetryReceiver.make")(fun
 		setDiagnosticsDemand
 	});
 });
-const layer$58 = Layer.effect(DesktopTelemetryReceiver, make$68());
+const layer$58 = Layer.effect(DesktopTelemetryReceiver, make$70());
 //#endregion
 //#region src/resourceTelemetry/Model.ts
 const MAX_DELTA_INTERVAL_MS = 3e4;
@@ -101062,7 +101331,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$67 = Effect.fn("resourceTelemetry.resourceMonitorBinary.make")(function* () {
+const make$69 = Effect.fn("resourceTelemetry.resourceMonitorBinary.make")(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const platform = yield* HostProcessPlatform;
@@ -101108,7 +101377,7 @@ const make$67 = Effect.fn("resourceTelemetry.resourceMonitorBinary.make")(functi
 	});
 	return ResourceMonitorBinary.of({ resolve });
 });
-const layer$57 = Layer.effect(ResourceMonitorBinary, make$67());
+const layer$57 = Layer.effect(ResourceMonitorBinary, make$69());
 //#endregion
 //#region src/resourceTelemetry/NativeTelemetryClient.ts
 const SAMPLE_INTERVAL_MS$1 = 1e3;
@@ -101258,7 +101527,7 @@ function canCommandNativeTelemetrySidecar(status, hasHandle) {
 	return hasHandle && (status === "healthy" || status === "degraded");
 }
 /** @public Service construction is part of the canonical Effect module API. */
-const make$66 = Effect.fn("resourceTelemetry.nativeTelemetryClient.make")(function* () {
+const make$68 = Effect.fn("resourceTelemetry.nativeTelemetryClient.make")(function* () {
 	const binary = yield* ResourceMonitorBinary;
 	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 	const crypto = yield* Crypto.Crypto;
@@ -101669,7 +101938,7 @@ const make$66 = Effect.fn("resourceTelemetry.nativeTelemetryClient.make")(functi
 		})
 	});
 });
-const layer$56 = Layer.effect(NativeTelemetryClient, make$66());
+const layer$56 = Layer.effect(NativeTelemetryClient, make$68());
 //#endregion
 //#region src/resourceTelemetry/ResourceAttribution.ts
 var ResourceAttribution = class extends Context.Service()("@p4code/cli/resourceTelemetry/ResourceAttribution") {};
@@ -101681,7 +101950,7 @@ function nonNegativeInteger(value, fallback) {
 	if (!Number.isFinite(value)) return 0;
 	return Math.max(0, Math.round(value));
 }
-const make$65 = Effect.fn("resourceTelemetry.resourceAttribution.make")(function* () {
+const make$67 = 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);
@@ -101707,7 +101976,7 @@ const make$65 = Effect.fn("resourceTelemetry.resourceAttribution.make")(function
 		})
 	});
 });
-const layer$55 = Layer.effect(ResourceAttribution, make$65());
+const layer$55 = Layer.effect(ResourceAttribution, make$67());
 //#endregion
 //#region src/resourceTelemetry/ResourceTelemetryHistory.ts
 const MAX_HISTORY_WINDOW_MS = 60 * 6e4;
@@ -101930,7 +102199,7 @@ function buildHealth(input) {
 	};
 }
 /** @public Service construction is part of the canonical Effect module API. */
-const make$64 = Effect.fn("resourceTelemetry.resourceTelemetry.make")(function* () {
+const make$66 = Effect.fn("resourceTelemetry.resourceTelemetry.make")(function* () {
 	const nativeClient = yield* NativeTelemetryClient;
 	const desktopReceiver = yield* DesktopTelemetryReceiver;
 	const attribution = yield* ResourceAttribution;
@@ -102182,7 +102451,7 @@ const make$64 = Effect.fn("resourceTelemetry.resourceTelemetry.make")(function*
 		})))
 	});
 });
-const layer$54 = Layer.effect(ResourceTelemetry, make$64());
+const layer$54 = Layer.effect(ResourceTelemetry, make$66());
 //#endregion
 //#region src/device/DeviceInspection.ts
 const READ_TIMEOUT_MS = 1e4;
@@ -105337,7 +105606,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$63 = Effect.gen(function* () {
+const make$65 = Effect.gen(function* () {
 	const processRunner = yield* ProcessRunner;
 	const run = Effect.fn("VcsProcess.run")(function* (input) {
 		const baseError = {
@@ -105396,7 +105665,7 @@ const make$63 = Effect.gen(function* () {
 	});
 	return VcsProcess.of({ run });
 });
-const layer$53 = Layer.effect(VcsProcess, make$63).pipe(Layer.provide(layer$85));
+const layer$53 = Layer.effect(VcsProcess, make$65).pipe(Layer.provide(layer$85));
 //#endregion
 //#region src/vcs/VcsDriver.ts
 var VcsDriver = class extends Context.Service()("@p4code/cli/vcs/VcsDriver") {};
@@ -105847,12 +106116,12 @@ const makeVcsDriver = Effect.gen(function* () {
 	const driver = yield* makeVcsDriverShape();
 	return VcsDriver.of(driver);
 });
-const make$62 = Effect.gen(function* () {
+const make$64 = Effect.gen(function* () {
 	const git = yield* makeGitVcsDriverCore();
 	return GitVcsDriver.of(git);
 });
 Layer.effect(VcsDriver, makeVcsDriver);
-const layer$52 = Layer.effect(GitVcsDriver, make$62);
+const layer$52 = Layer.effect(GitVcsDriver, make$64);
 //#endregion
 //#region src/vcs/VcsProjectConfig.ts
 const ProjectVcsConfigJson = fromLenientJson(Schema$1.Struct({
@@ -105884,7 +106153,7 @@ const logVcsProjectConfigError = (error) => Effect.logWarning(error).pipe(Effect
 	configPath: error.configPath,
 	errorTag: error._tag
 }));
-const make$61 = Effect.gen(function* () {
+const make$63 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const findConfigPath = Effect.fn("VcsProjectConfig.findConfigPath")(function* (cwd) {
@@ -105925,7 +106194,7 @@ const make$61 = Effect.gen(function* () {
 	});
 	return VcsProjectConfig.of({ resolveKind });
 });
-const layer$51 = Layer.effect(VcsProjectConfig, make$61);
+const layer$51 = Layer.effect(VcsProjectConfig, make$63);
 //#endregion
 //#region src/vcs/VcsDriverRegistry.ts
 const DETECTION_CACHE_CAPACITY = 2048;
@@ -105945,7 +106214,7 @@ function parseDetectionCacheKey(key) {
 		cwd: key.slice(separatorIndex + 1)
 	};
 }
-const make$60 = Effect.gen(function* () {
+const make$62 = Effect.gen(function* () {
 	const projectConfig = yield* VcsProjectConfig;
 	const git = yield* makeVcsDriver;
 	const drivers = { git };
@@ -106002,7 +106271,7 @@ const make$60 = Effect.gen(function* () {
 		resolve
 	});
 });
-const layer$50 = Layer.effect(VcsDriverRegistry, make$60).pipe(Layer.provide(layer$51));
+const layer$50 = Layer.effect(VcsDriverRegistry, make$62).pipe(Layer.provide(layer$51));
 //#endregion
 //#region src/checkpointing/CheckpointStore.ts
 /**
@@ -106022,7 +106291,7 @@ const layer$50 = Layer.effect(VcsDriverRegistry, make$60).pipe(Layer.provide(lay
 */
 /** Service tag for checkpoint persistence and restore operations. */
 var CheckpointStore = class extends Context.Service()("@p4code/cli/checkpointing/CheckpointStore") {};
-const make$59 = Effect.gen(function* () {
+const make$61 = Effect.gen(function* () {
 	const vcsRegistry = yield* VcsDriverRegistry;
 	const resolveCheckpoints = Effect.fn("CheckpointStore.resolveCheckpoints")(function* (operation, cwd) {
 		const handle = yield* vcsRegistry.resolve({ cwd });
@@ -106061,7 +106330,7 @@ const make$59 = Effect.gen(function* () {
 		deleteCheckpointRefs
 	});
 });
-const layer$49 = Layer.effect(CheckpointStore, make$59);
+const layer$49 = Layer.effect(CheckpointStore, make$61);
 //#endregion
 //#region src/checkpointing/CheckpointDiffQuery.ts
 /**
@@ -106083,7 +106352,7 @@ function buildTurnDiffResult(input, diff) {
 		diff
 	};
 }
-const make$58 = Effect.gen(function* () {
+const make$60 = Effect.gen(function* () {
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 	const checkpointStore = yield* CheckpointStore;
 	const threadActivities = yield* ProjectionThreadActivityRepository;
@@ -106254,7 +106523,7 @@ const make$58 = Effect.gen(function* () {
 		getFullThreadDiff
 	});
 });
-const layer$48 = Layer.effect(CheckpointDiffQuery, make$58);
+const layer$48 = Layer.effect(CheckpointDiffQuery, make$60);
 //#endregion
 //#region src/orchestration/ThreadLiveEventCoalescer.ts
 const COALESCE_WINDOW = Duration.millis(50);
@@ -106799,7 +107068,7 @@ const serversEqual = (left, right) => {
 	}
 	return true;
 };
-const make$57 = Effect.gen(function* PortDiscoveryMake() {
+const make$59 = Effect.gen(function* PortDiscoveryMake() {
 	const net = yield* NetService;
 	const processRunner = yield* ProcessRunner;
 	const hostPlatform = yield* HostProcessPlatform;
@@ -106950,7 +107219,7 @@ const make$57 = Effect.gen(function* PortDiscoveryMake() {
 		unregisterTerminal
 	});
 }).pipe(Effect.withSpan("PortDiscovery.make"));
-const layer$47 = Layer.effect(PortDiscovery, make$57);
+const layer$47 = Layer.effect(PortDiscovery, make$59);
 //#endregion
 //#region src/terminal/Manager.ts
 /**
@@ -107628,7 +107897,7 @@ function normalizedRuntimeEnv(env) {
 	if (entries.length === 0) return null;
 	return Object.fromEntries(entries.toSorted(([left], [right]) => left.localeCompare(right)));
 }
-const make$56 = Effect.fn("TerminalManager.make")(function* () {
+const make$58 = Effect.fn("TerminalManager.make")(function* () {
 	const { terminalLogsDir } = yield* ServerConfig$1;
 	const ptyAdapter = yield* PtyAdapter;
 	const portDiscovery = yield* PortDiscovery;
@@ -108590,7 +108859,7 @@ const makeWithOptions$1 = Effect.fn("TerminalManager.makeWithOptions")(function*
 		subscribeMetadata
 	});
 });
-const layer$46 = Layer.effect(TerminalManager, make$56()).pipe(Layer.provide(layer$85));
+const layer$46 = Layer.effect(TerminalManager, make$58()).pipe(Layer.provide(layer$85));
 //#endregion
 //#region src/project/ProjectSetupScriptRunner.ts
 var ProjectSetupScriptOperationError = class extends Schema$1.TaggedErrorClass()("ProjectSetupScriptOperationError", {
@@ -108622,7 +108891,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$55 = Effect.gen(function* () {
+const make$57 = Effect.gen(function* () {
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 	const terminalManager = yield* TerminalManager;
 	const settingsService = yield* Effect.serviceOption(ServerSettingsService);
@@ -108685,7 +108954,7 @@ const make$55 = Effect.gen(function* () {
 	});
 	return ProjectSetupScriptRunner.of({ runForThread });
 });
-const layer$45 = Layer.effect(ProjectSetupScriptRunner, make$55);
+const layer$45 = Layer.effect(ProjectSetupScriptRunner, make$57);
 //#endregion
 //#region src/sourceControl/azureDevOpsPullRequests.ts
 const AzureDevOpsPullRequestSchema = Schema$1.Struct({
@@ -109013,7 +109282,7 @@ function decodeAzureDevOpsJson(raw, schema, operation, cwd) {
 		cause
 	})));
 }
-const make$54 = Effect.gen(function* () {
+const make$56 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const execute = (input) => process.run({
 		operation: "AzureDevOpsCli.execute",
@@ -109155,7 +109424,7 @@ const make$54 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$44 = Layer.effect(AzureDevOpsCli, make$54);
+const layer$44 = Layer.effect(AzureDevOpsCli, make$56);
 //#endregion
 //#region src/sourceControl/SourceControlProviderDiscovery.ts
 function firstNonEmptyLine(text) {
@@ -109359,7 +109628,7 @@ function toChangeRequest$5(summary) {
 		isCrossRepository: false
 	};
 }
-const make$53 = Effect.gen(function* () {
+const make$55 = Effect.gen(function* () {
 	const azure = yield* AzureDevOpsCli;
 	return SourceControlProvider.of({
 		kind: "azure-devops",
@@ -109452,7 +109721,7 @@ const make$53 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$53);
+Layer.effect(SourceControlProvider, make$55);
 //#endregion
 //#region src/sourceControl/bitbucketPullRequests.ts
 const BitbucketRepositoryRefSchema = Schema$1.Struct({
@@ -109829,7 +110098,7 @@ function responseError(operation, response) {
 		responseBodyLength: collected.text.length
 	}))));
 }
-const make$52 = Effect.gen(function* () {
+const make$54 = Effect.gen(function* () {
 	const config = yield* BitbucketApiEnvConfig;
 	const httpClient = yield* HttpClient.HttpClient;
 	const fileSystem = yield* FileSystem.FileSystem;
@@ -110045,7 +110314,7 @@ const make$52 = Effect.gen(function* () {
 		})))
 	});
 });
-const layer$42 = Layer.effect(BitbucketApi, make$52);
+const layer$42 = Layer.effect(BitbucketApi, make$54);
 //#endregion
 //#region src/sourceControl/BitbucketSourceControlProvider.ts
 function toChangeRequest$4(summary) {
@@ -110063,7 +110332,7 @@ function toChangeRequest$4(summary) {
 		...summary.headRepositoryOwnerLogin !== void 0 ? { headRepositoryOwnerLogin: summary.headRepositoryOwnerLogin } : {}
 	};
 }
-const make$51 = Effect.gen(function* () {
+const make$53 = Effect.gen(function* () {
 	const bitbucket = yield* BitbucketApi;
 	return SourceControlProvider.of({
 		kind: "bitbucket",
@@ -110154,7 +110423,7 @@ const make$51 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$51);
+Layer.effect(SourceControlProvider, make$53);
 const makeDiscovery = Effect.gen(function* () {
 	return {
 		type: "api",
@@ -110402,7 +110671,7 @@ function deriveRepositoryCloneUrlsFromCreateOutput(stdout, repository) {
 		sshUrl: `git@${fallbackHost}:${repository}.git`
 	};
 }
-const make$50 = Effect.gen(function* () {
+const make$52 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const execute = (input) => process.run({
 		operation: "GitHubCli.execute",
@@ -110520,7 +110789,7 @@ const make$50 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$40 = Layer.effect(GitHubCli, make$50);
+const layer$40 = Layer.effect(GitHubCli, make$52);
 //#endregion
 //#region src/sourceControl/gitHubAuthStatus.ts
 const GitHubAuthStatusAccountSchema = Schema$1.Struct({
@@ -110622,7 +110891,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$49 = Effect.gen(function* () {
+const make$51 = Effect.gen(function* () {
 	const github = yield* GitHubCli;
 	const listChangeRequests = (input) => {
 		if (input.state === "open") return github.listOpenPullRequests({
@@ -110738,7 +111007,7 @@ const make$49 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$49);
+Layer.effect(SourceControlProvider, make$51);
 //#endregion
 //#region src/sourceControl/gitLabMergeRequests.ts
 const GitLabProjectReferenceSchema = Schema$1.Struct({
@@ -111057,7 +111326,7 @@ function parseRepositoryPath(repository) {
 		projectPath
 	};
 }
-const make$48 = Effect.gen(function* () {
+const make$50 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const run = (input, mapError) => process.run({
 		operation: "GitLabCli.execute",
@@ -111208,7 +111477,7 @@ const make$48 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$38 = Layer.effect(GitLabCli, make$48);
+const layer$38 = Layer.effect(GitLabCli, make$50);
 //#endregion
 //#region src/sourceControl/gitLabAuthStatus.ts
 const HOST_LINE_PATTERN = /^(?:[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?|\[[a-f0-9:.]+\])(?::\d+)?$/iu;
@@ -111306,7 +111575,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$47 = Effect.gen(function* () {
+const make$49 = Effect.gen(function* () {
 	const gitlab = yield* GitLabCli;
 	return SourceControlProvider.of({
 		kind: "gitlab",
@@ -111395,7 +111664,7 @@ const make$47 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$47);
+Layer.effect(SourceControlProvider, make$49);
 //#endregion
 //#region src/sourceControl/SourceControlProviderRegistry.ts
 const PROVIDER_DETECTION_CACHE_CAPACITY = 2048;
@@ -111551,12 +111820,12 @@ const makeWithProviders = Effect.fn("makeSourceControlProviderRegistryWithProvid
 		})), { concurrency: "unbounded" })
 	});
 });
-const make$46 = Effect.gen(function* () {
-	const github = yield* make$49;
-	const gitlab = yield* make$47;
-	const bitbucket = yield* make$51;
+const make$48 = Effect.gen(function* () {
+	const github = yield* make$51;
+	const gitlab = yield* make$49;
+	const bitbucket = yield* make$53;
 	const bitbucketDiscovery = yield* makeDiscovery;
-	const azureDevOps = yield* make$53;
+	const azureDevOps = yield* make$55;
 	return yield* makeWithProviders([
 		{
 			kind: "github",
@@ -111580,7 +111849,7 @@ const make$46 = Effect.gen(function* () {
 		}
 	]);
 });
-const layer$36 = Layer.effect(SourceControlProviderRegistry, make$46);
+const layer$36 = Layer.effect(SourceControlProviderRegistry, make$48);
 //#endregion
 //#region src/sourceControl/PrTemplateDetection.ts
 const TEMPLATE_MAX_BYTES = 8e3;
@@ -111951,7 +112220,7 @@ function toPullRequestHeadRemoteInfo(pr) {
 		...pr.headRepositoryOwnerLogin !== void 0 ? { headRepositoryOwnerLogin: pr.headRepositoryOwnerLogin } : {}
 	};
 }
-const make$45 = Effect.gen(function* () {
+const make$47 = Effect.gen(function* () {
 	const gitCore = yield* GitVcsDriver;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
 	const textGeneration = yield* TextGeneration;
@@ -112925,7 +113194,7 @@ const make$45 = Effect.gen(function* () {
 		runStackedAction
 	});
 });
-const layer$35 = Layer.effect(GitManager, make$45);
+const layer$35 = Layer.effect(GitManager, make$47);
 //#endregion
 //#region src/git/GitWorkflowService.ts
 var GitWorkflowService = class extends Context.Service()("@p4code/cli/git/GitWorkflowService") {};
@@ -112962,7 +113231,7 @@ function nonRepositoryListRefs() {
 		totalCount: 0
 	};
 }
-const make$44 = Effect.gen(function* () {
+const make$46 = Effect.gen(function* () {
 	const registry = yield* VcsDriverRegistry;
 	const git = yield* GitVcsDriver;
 	const gitManager = yield* GitManager;
@@ -113048,7 +113317,7 @@ const make$44 = Effect.gen(function* () {
 		renameBranch: (input) => ensureGit("GitWorkflowService.renameBranch", input.cwd).pipe(Effect.andThen(git.renameBranch(input)))
 	});
 });
-const layer$34 = Layer.effect(GitWorkflowService, make$44);
+const layer$34 = Layer.effect(GitWorkflowService, make$46);
 //#endregion
 //#region src/pullRequest/PullRequestProvider.ts
 /**
@@ -113409,7 +113678,7 @@ function isReviewerName(value) {
 	const name = value.trim();
 	return name.length > 0 && !name.startsWith("-");
 }
-const make$43 = Effect.gen(function* () {
+const make$45 = Effect.gen(function* () {
 	const azure = yield* AzureDevOpsCli;
 	const detectArgs = ["--detect", "true"];
 	const executeJson = (input) => azure.execute({
@@ -113609,7 +113878,7 @@ const make$43 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$33 = Layer.effect(AzureDevOpsPullRequestCli, make$43);
+const layer$33 = Layer.effect(AzureDevOpsPullRequestCli, make$45);
 //#endregion
 //#region src/pullRequest/AzureDevOpsPullRequestProvider.ts
 const CAPABILITIES$3 = {
@@ -113684,7 +113953,7 @@ function toChangeRequest$1(pullRequest) {
 		labels: []
 	};
 }
-const make$42 = Effect.gen(function* () {
+const make$44 = Effect.gen(function* () {
 	const cli = yield* AzureDevOpsPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "azure-devops",
@@ -114424,7 +114693,7 @@ function mergeStrategy(method) {
 		default: return "merge_commit";
 	}
 }
-const make$41 = Effect.gen(function* () {
+const make$43 = Effect.gen(function* () {
 	const bitbucket = yield* BitbucketApi;
 	/**
 	* The repository's own path, and the workspace above it — which the people who may review are
@@ -114704,7 +114973,7 @@ const make$41 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid))
 	});
 });
-const layer$32 = Layer.effect(BitbucketPullRequestApi, make$41);
+const layer$32 = Layer.effect(BitbucketPullRequestApi, make$43);
 //#endregion
 //#region src/pullRequest/BitbucketPullRequestProvider.ts
 const CAPABILITIES$2 = {
@@ -114784,7 +115053,7 @@ function toChangeRequest(pullRequest) {
 		labels: []
 	};
 }
-const make$40 = Effect.gen(function* () {
+const make$42 = Effect.gen(function* () {
 	const api = yield* BitbucketPullRequestApi;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "bitbucket",
@@ -117013,7 +117282,7 @@ function actionArgs$1(action, mergeMethod, updateMethod) {
 		case "reopen": return ["reopen"];
 	}
 }
-const make$39 = Effect.gen(function* () {
+const make$41 = 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
@@ -117776,7 +118045,7 @@ const make$39 = Effect.gen(function* () {
 		})))
 	});
 });
-const layer$31 = Layer.effect(GitHubPullRequestCli, make$39);
+const layer$31 = Layer.effect(GitHubPullRequestCli, make$41);
 //#endregion
 //#region src/pullRequest/GitHubPullRequestProvider.ts
 const CAPABILITIES$1 = {
@@ -117893,7 +118162,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$38 = Effect.gen(function* () {
+const make$40 = Effect.gen(function* () {
 	const cli = yield* GitHubPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "github",
@@ -118915,7 +119184,7 @@ function actionArgs(action, mergeMethod) {
 		case "reopen": return ["reopen"];
 	}
 }
-const make$37 = Effect.gen(function* () {
+const make$39 = Effect.gen(function* () {
 	const gitlab = yield* GitLabCli;
 	const api = (input) => gitlab.execute({
 		cwd: input.cwd,
@@ -119486,7 +119755,7 @@ const make$37 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$30 = Layer.effect(GitLabPullRequestCli, make$37);
+const layer$30 = Layer.effect(GitLabPullRequestCli, make$39);
 //#endregion
 //#region src/pullRequest/GitLabPullRequestProvider.ts
 const CAPABILITIES = {
@@ -119566,7 +119835,7 @@ function reasonFor(error) {
 	if (error._tag === "GitLabCliAuthenticationError") return "unauthenticated";
 	return "failed";
 }
-const make$36 = Effect.gen(function* () {
+const make$38 = Effect.gen(function* () {
 	const cli = yield* GitLabPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "gitlab",
@@ -119709,13 +119978,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$35 = Effect.map(Effect.all([
-	make$38,
-	make$36,
+const make$37 = Effect.map(Effect.all([
 	make$40,
-	make$42
+	make$38,
+	make$42,
+	make$44
 ]), fromProviders);
-const layer$29 = Layer.effect(PullRequestProviderRegistry, make$35).pipe(Layer.provide(layer$31.pipe(Layer.provide(layer$40))), Layer.provide(layer$30.pipe(Layer.provide(layer$38))), Layer.provide(layer$32.pipe(Layer.provide(layer$42))), Layer.provide(layer$33.pipe(Layer.provide(layer$44))));
+const layer$29 = Layer.effect(PullRequestProviderRegistry, make$37).pipe(Layer.provide(layer$31.pipe(Layer.provide(layer$40))), Layer.provide(layer$30.pipe(Layer.provide(layer$38))), Layer.provide(layer$32.pipe(Layer.provide(layer$42))), Layer.provide(layer$33.pipe(Layer.provide(layer$44))));
 //#endregion
 //#region src/pullRequest/PullRequestService.ts
 /**
@@ -119903,7 +120172,7 @@ function repositoryIdentityOf(project) {
 	if (identity.displayName) return identity.displayName;
 	return identity.owner && identity.name ? `${identity.owner}/${identity.name}` : null;
 }
-const make$34 = Effect.gen(function* () {
+const make$36 = Effect.gen(function* () {
 	const registry = yield* PullRequestProviderRegistry;
 	const projections = yield* ProjectionSnapshotQuery;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
@@ -120901,7 +121170,7 @@ const make$34 = Effect.gen(function* () {
 		invalidate
 	});
 });
-const layer$28 = Layer.effect(PullRequestService, make$34);
+const layer$28 = Layer.effect(PullRequestService, make$36);
 //#endregion
 //#region src/orchestration/ThreadWorkspaceLifecycle.ts
 var ThreadWorkspaceLifecycleError = class extends Data.TaggedError("ThreadWorkspaceLifecycleError") {};
@@ -120945,7 +121214,7 @@ const mapLifecycleError = Effect.mapError((cause) => cause instanceof ThreadWork
 	detail: "Thread workspace lifecycle operation failed.",
 	cause
 }));
-const make$33 = Effect.gen(function* () {
+const make$35 = Effect.gen(function* () {
 	const snapshots = yield* ProjectionSnapshotQuery;
 	const engine = yield* OrchestrationEngineService;
 	const gitWorkflow = yield* GitWorkflowService;
@@ -121199,7 +121468,7 @@ const make$33 = Effect.gen(function* () {
 		record
 	};
 });
-const layer$27 = Layer.effect(ThreadWorkspaceLifecycleService, make$33);
+const layer$27 = Layer.effect(ThreadWorkspaceLifecycleService, make$35);
 //#endregion
 //#region src/textGeneration/BtwRequestCoordinator.ts
 const MAX_PENDING_BTW_CANCELLATIONS = 256;
@@ -123472,7 +123741,7 @@ function makeUpdateState(input) {
 		output: input.output ?? null
 	};
 }
-const make$32 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
+const make$34 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
 	const providerRegistry = yield* ProviderRegistry;
 	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 	const httpClient = yield* HttpClient.HttpClient;
@@ -123587,7 +123856,7 @@ const make$32 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
 	});
 	return ProviderMaintenanceRunner.of({ updateProvider });
 });
-const layer$26 = Layer.effect(ProviderMaintenanceRunner, make$32());
+const layer$26 = Layer.effect(ProviderMaintenanceRunner, make$34());
 //#endregion
 //#region src/usage/usageTranscripts.ts
 const EMPTY_TOTALS = {
@@ -124413,7 +124682,7 @@ Layer.succeed(UsageService, UsageService.of({
 		scanDurationMs: 0
 	})
 }));
-const make$31 = Effect.gen(function* () {
+const make$33 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const config = yield* ServerConfig$1;
@@ -124696,7 +124965,7 @@ const make$31 = Effect.gen(function* () {
 		readSessionRecords: (input) => scanLock.withPermits(1)(readSessionRecords(input))
 	};
 });
-const layer$25 = Layer.effect(UsageService, make$31);
+const layer$25 = Layer.effect(UsageService, make$33);
 //#endregion
 //#region src/feed/FeedStore.ts
 const storageFailure = (message) => new FeedError({
@@ -125060,7 +125329,7 @@ const jsonRequest = Effect.fn("FeedService.jsonRequest")(function* (url, token,
 		catch: () => fail("hub_unavailable", "Hub returned invalid JSON.")
 	});
 });
-const make$30 = Effect.gen(function* () {
+const make$32 = Effect.gen(function* () {
 	const hubLink = yield* HubLink;
 	const providers = yield* ProviderInstanceRegistry;
 	const config = yield* ServerConfig$1;
@@ -125298,7 +125567,7 @@ var FeedService = class extends Context.Reference("@p4code/cli/feed/FeedService"
 	markRead: unavailable,
 	cleanup: unavailable
 }) }) {};
-const layer$24 = Layer.effect(FeedService, make$30);
+const layer$24 = Layer.effect(FeedService, make$32);
 //#endregion
 //#region src/storageCleanup.ts
 const DAY_MS$1 = 864e5;
@@ -125315,7 +125584,7 @@ function isExpired(modifiedAtMs, days, nowMs) {
 	return modifiedAtMs < nowMs - days * DAY_MS$1;
 }
 var StorageCleanup = class extends Context.Service()("@p4code/cli/storageCleanup") {};
-const make$29 = Effect.gen(function* () {
+const make$31 = Effect.gen(function* () {
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const config = yield* ServerConfig$1;
@@ -125404,7 +125673,7 @@ const make$29 = Effect.gen(function* () {
 		})
 	};
 });
-const layer$23 = Layer.effect(StorageCleanup, make$29);
+const layer$23 = Layer.effect(StorageCleanup, make$31);
 //#endregion
 //#region src/worktreeCleanupRules.ts
 /**
@@ -125504,7 +125773,7 @@ function planWorktreeCleanup(facts, settings, nowMs) {
 * @module worktreeCleanup
 */
 var WorktreeCleanup = class extends Context.Service()("@p4code/cli/worktreeCleanup") {};
-const make$28 = Effect.gen(function* () {
+const make$30 = Effect.gen(function* () {
 	const threads = yield* ProjectionThreadRepository;
 	const projects = yield* ProjectionProjectRepository;
 	const sessions = yield* ProviderSessionDirectory;
@@ -125599,7 +125868,7 @@ const make$28 = Effect.gen(function* () {
 		})
 	};
 });
-const layer$22 = Layer.effect(WorktreeCleanup, make$28);
+const layer$22 = Layer.effect(WorktreeCleanup, make$30);
 const SKILL_MANIFEST_FILENAME = "SKILL.md";
 /**
 * Split a catalogue id (`owner/repo/skill-name`) into its parts.
@@ -125745,7 +126014,7 @@ const emptyFetch = (id, unavailable) => ({
 	skipped: [],
 	unavailable
 });
-const make$27 = Effect.gen(function* () {
+const make$29 = 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));
@@ -125816,7 +126085,7 @@ const make$27 = Effect.gen(function* () {
 		fetch
 	};
 });
-const layer$21 = Layer.effect(SkillRegistry, make$27);
+const layer$21 = Layer.effect(SkillRegistry, make$29);
 //#endregion
 //#region src/orchestration/SupervisorSecrets.ts
 /**
@@ -125892,6 +126161,9 @@ const makeSupervisorSecrets = Effect.gen(function* () {
 });
 const SupervisorSecretsLive = Layer.effect(SupervisorSecrets, makeSupervisorSecrets);
 //#endregion
+//#region src/orchestration/Services/JevWorkspaceAdvisor.ts
+var JevWorkspaceAdvisor = class extends Context.Service()("@p4code/cli/orchestration/Services/JevWorkspaceAdvisor") {};
+//#endregion
 //#region src/mcp/PreviewAutomationBroker.ts
 var PreviewAutomationBroker = class extends Context.Service()("@p4code/cli/mcp/PreviewAutomationBroker") {};
 const removeConnectionFromState = (current, clientId, queue) => {
@@ -126008,7 +126280,7 @@ const classifyResponseError = (context, error) => {
 		});
 	}
 };
-const make$26 = Effect.gen(function* PreviewAutomationBrokerMake() {
+const make$28 = Effect.gen(function* PreviewAutomationBrokerMake() {
 	const crypto = yield* Crypto.Crypto;
 	const state = yield* SynchronizedRef.make({
 		clients: /* @__PURE__ */ new Map(),
@@ -126242,7 +126514,7 @@ const make$26 = Effect.gen(function* PreviewAutomationBrokerMake() {
 		invoke
 	});
 }).pipe(Effect.withSpan("PreviewAutomationBroker.make"));
-const layer$20 = Layer.effect(PreviewAutomationBroker, make$26);
+const layer$20 = Layer.effect(PreviewAutomationBroker, make$28);
 //#endregion
 //#region src/preview/Manager.ts
 /**
@@ -126306,7 +126578,7 @@ const buildIdleSnapshot = (input) => ({
 	viewport: FILL_PREVIEW_VIEWPORT,
 	updatedAt: input.updatedAt
 });
-const make$25 = Effect.gen(function* PreviewManagerMake() {
+const make$27 = Effect.gen(function* PreviewManagerMake() {
 	const serverEpoch = NodeCrypto.randomUUID();
 	const stateRef = yield* SynchronizedRef.make(initialState);
 	const eventsPubSub = yield* PubSub.unbounded();
@@ -126537,7 +126809,7 @@ const make$25 = Effect.gen(function* PreviewManagerMake() {
 		subscribeEvents: PubSub.subscribe(eventsPubSub)
 	});
 }).pipe(Effect.withSpan("PreviewManager.make"));
-const layer$19 = Layer.effect(PreviewManager, make$25);
+const layer$19 = Layer.effect(PreviewManager, make$27);
 //#endregion
 //#region src/workspace/WorkspaceSearchIndex.ts
 const WORKSPACE_INDEX_MAX_ENTRIES = 25e3;
@@ -126674,7 +126946,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$26 = 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({
@@ -126814,14 +127086,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$18 = (cwd) => Layer.effect(WorkspaceSearchIndex, make$24(cwd));
+const layer$18 = (cwd) => Layer.effect(WorkspaceSearchIndex, make$26(cwd));
 var WorkspaceSearchIndexMap = class extends LayerMap.Service()("@p4code/cli/workspace/WorkspaceSearchIndexMap", {
 	lookup: layer$18,
 	idleTimeToLive: WORKSPACE_INDEX_IDLE_TTL
 }) {};
 /** Content indexing is allocated only when workspace content search is used. */
 var WorkspaceContentSearchIndexMap = class extends LayerMap.Service()("@p4code/cli/workspace/WorkspaceContentSearchIndexMap", {
-	lookup: (cwd) => Layer.effect(WorkspaceSearchIndex, make$24(cwd, true)),
+	lookup: (cwd) => Layer.effect(WorkspaceSearchIndex, make$26(cwd, true)),
 	idleTimeToLive: WORKSPACE_INDEX_IDLE_TTL
 }) {};
 //#endregion
@@ -126883,7 +127155,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$25 = Effect.gen(function* () {
 	const path = yield* Path$1.Path;
 	const workspacePaths = yield* WorkspacePaths;
 	const contentSearchIndexes = yield* WorkspaceContentSearchIndexMap;
@@ -126965,7 +127237,7 @@ const make$23 = Effect.gen(function* () {
 		searchContents
 	});
 });
-const layer$17 = Layer.effect(WorkspaceEntries, make$23).pipe(Layer.provide(WorkspaceSearchIndexMap.layer), Layer.provide(WorkspaceContentSearchIndexMap.layer));
+const layer$17 = Layer.effect(WorkspaceEntries, make$25).pipe(Layer.provide(WorkspaceSearchIndexMap.layer), Layer.provide(WorkspaceContentSearchIndexMap.layer));
 //#endregion
 //#region src/workspace/WorkspaceFileSystem.ts
 /**
@@ -127024,7 +127296,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$24 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
 	const workspacePaths = yield* WorkspacePaths;
@@ -127168,7 +127440,7 @@ const make$22 = Effect.gen(function* () {
 		writeFile
 	});
 });
-const layer$16 = Layer.effect(WorkspaceFileSystem, make$22);
+const layer$16 = Layer.effect(WorkspaceFileSystem, make$24);
 //#endregion
 //#region src/vcs/VcsStatusBroadcaster.ts
 const DEFAULT_VCS_STATUS_REFRESH_INTERVAL = Duration.seconds(30);
@@ -127250,7 +127522,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$23 = Effect.gen(function* () {
 	const autoPullPolicy = yield* VcsAutoPullPolicy;
 	const workflow = yield* GitWorkflowService;
 	const fs = yield* FileSystem.FileSystem;
@@ -127509,7 +127781,7 @@ const make$21 = Effect.gen(function* () {
 		streamStatus
 	});
 });
-const layer$15 = Layer.effect(VcsStatusBroadcaster, make$21);
+const layer$15 = Layer.effect(VcsStatusBroadcaster, make$23);
 //#endregion
 //#region src/vcs/VcsProvisioningService.ts
 var VcsProvisioningService = class extends Context.Service()("@p4code/cli/vcs/VcsProvisioningService") {};
@@ -127522,7 +127794,7 @@ function resolveRequestedKind(kind) {
 	}));
 	return Effect.succeed(kind);
 }
-const make$20 = Effect.gen(function* () {
+const make$22 = Effect.gen(function* () {
 	const registry = yield* VcsDriverRegistry;
 	const initRepository = Effect.fn("VcsProvisioningService.initRepository")(function* (input) {
 		const kind = yield* resolveRequestedKind(input.kind);
@@ -127530,11 +127802,11 @@ const make$20 = Effect.gen(function* () {
 	});
 	return VcsProvisioningService.of({ initRepository });
 });
-const layer$14 = Layer.effect(VcsProvisioningService, make$20);
+const layer$14 = Layer.effect(VcsProvisioningService, make$22);
 //#endregion
 //#region src/review/ReviewService.ts
 var ReviewService = class extends Context.Service()("@p4code/cli/review/ReviewService") {};
-const make$19 = Effect.gen(function* () {
+const make$21 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
@@ -127590,7 +127862,7 @@ const make$19 = Effect.gen(function* () {
 	});
 	return ReviewService.of({ getDiffPreview });
 });
-const layer$13 = Layer.effect(ReviewService, make$19);
+const layer$13 = Layer.effect(ReviewService, make$21);
 //#endregion
 //#region src/diagnostics/ProcessDiagnostics.ts
 const PROCESS_QUERY_TIMEOUT_MS = 1e3;
@@ -127885,7 +128157,7 @@ function assertDescendantPid(pid) {
 		}));
 	}));
 }
-const make$18 = Effect.gen(function* () {
+const make$20 = Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const read = Effect.gen(function* () {
 		const readAt = yield* DateTime.now;
@@ -127929,7 +128201,7 @@ const make$18 = Effect.gen(function* () {
 		signal
 	});
 });
-const layer$12 = Layer.effect(ProcessDiagnostics, make$18);
+const layer$12 = Layer.effect(ProcessDiagnostics, make$20);
 //#endregion
 //#region src/diagnostics/ProcessResourceMonitor.ts
 const SAMPLE_INTERVAL_MS = 5e3;
@@ -128080,7 +128352,7 @@ function aggregateProcessResourceHistory(input) {
 		}) : Option.none()
 	};
 }
-const make$17 = Effect.gen(function* () {
+const make$19 = Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const state = yield* Ref.make({
 		samples: [],
@@ -128129,7 +128401,7 @@ const make$17 = Effect.gen(function* () {
 	});
 	return ProcessResourceMonitor.of({ readHistory });
 });
-const layer$11 = Layer.effect(ProcessResourceMonitor, make$17);
+const layer$11 = Layer.effect(ProcessResourceMonitor, make$19);
 //#endregion
 //#region src/diagnostics/TraceDiagnostics.ts
 var TraceFileReadError = class extends Schema$1.TaggedErrorClass()("TraceFileReadError", {
@@ -128377,7 +128649,7 @@ function readTraceFile(fileSystem, path) {
 		cause
 	})) }));
 }
-const make$16 = Effect.gen(function* () {
+const make$18 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const read = Effect.fn("TraceDiagnostics.read")(function* (options) {
 		const readAt = options.readAt ?? (yield* DateTime.now);
@@ -128421,7 +128693,7 @@ const make$16 = Effect.gen(function* () {
 	});
 	return TraceDiagnostics.of({ read });
 });
-const layer$10 = Layer.effect(TraceDiagnostics, make$16);
+const layer$10 = Layer.effect(TraceDiagnostics, make$18);
 function readTraceDiagnostics(options) {
 	return Effect.gen(function* () {
 		return yield* (yield* TraceDiagnostics).read(options);
@@ -128456,7 +128728,7 @@ function snapshotFromDetail(link, detail, syncedAt) {
 		mergeability: detail.mergeability
 	};
 }
-const make$15 = Effect.gen(function* () {
+const make$17 = Effect.gen(function* () {
 	const engine = yield* OrchestrationEngineService;
 	const projections = yield* ProjectionSnapshotQuery;
 	const pullRequests = yield* PullRequestService;
@@ -128550,7 +128822,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$17);
 //#endregion
 //#region src/sourceControl/SourceControlDiscovery.ts
 const VCS_PROBES = [{
@@ -128569,7 +128841,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$16 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const process = yield* VcsProcess;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
@@ -128618,7 +128890,7 @@ const make$14 = Effect.gen(function* () {
 		sourceControlProviders: sourceControlProviders.discover
 	}) });
 });
-const layer$9 = Layer.effect(SourceControlDiscovery, make$14);
+const layer$9 = Layer.effect(SourceControlDiscovery, make$16);
 //#endregion
 //#region src/sourceControl/SourceControlRepositoryService.ts
 const isSourceControlRepositoryError = Schema$1.is(SourceControlRepositoryError);
@@ -128651,7 +128923,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$15 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const git = yield* GitVcsDriver;
@@ -128790,7 +129062,7 @@ const make$13 = Effect.gen(function* () {
 		publishRepository: (input) => publishRepository(input).pipe(mapRepositoryError("publishRepository", input.provider))
 	});
 });
-const layer$8 = Layer.effect(SourceControlRepositoryService, make$13);
+const layer$8 = Layer.effect(SourceControlRepositoryService, make$15);
 //#endregion
 //#region src/ws.ts
 /** Matches `p4c hub token add`, so a token minted here and one minted there are the same thing. */
@@ -129163,6 +129435,7 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker, computerUseBrok
 	const mcpOAuth = yield* McpOAuth;
 	const linearClient = yield* LinearClient;
 	const supervisorSecrets = yield* SupervisorSecrets;
+	const jevWorkspaceAdvisor = yield* JevWorkspaceAdvisor;
 	/** Status with the key masked. The unmasked value never leaves the store. */
 	const supervisorSecretStatuses = supervisorSecrets.status.pipe(Effect.flatMap((entries) => Effect.forEach(entries, (entry) => supervisorSecrets.read(entry.service).pipe(Effect.map((credential) => ({
 		...entry,
@@ -129501,7 +129774,7 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker, computerUseBrok
 					}),
 					hasWorkingTreeChanges: localStatus.hasWorkingTreeChanges,
 					modelSelection: command.modelSelection ?? currentThread?.modelSelection
-				}, textGeneration);
+				}, textGeneration, jevWorkspaceAdvisor);
 				if (decision.mode === "local" && localStatus.isRepo && isAutoCheckoutBusy({
 					snapshot: yield* projectionSnapshotQuery.getCommandReadModel(),
 					threadId: command.threadId,
@@ -129525,6 +129798,24 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker, computerUseBrok
 					},
 					createdAt: command.createdAt
 				});
+				if (decision.source === "jev") yield* orchestrationEngine.dispatch({
+					type: "thread.activity.append",
+					commandId: yield* serverCommandId("jev-consulted-workspace"),
+					threadId: command.threadId,
+					activity: {
+						id: yield* serverEventId,
+						tone: "info",
+						kind: JEV_CONSULTED_ACTIVITY_KIND,
+						turnId: null,
+						summary: "Consulted with Jev",
+						payload: {
+							feature: "auto-workspace",
+							summary: decision.mode === "worktree" ? "Chose a new worktree" : "Chose the current checkout"
+						},
+						createdAt: command.createdAt
+					},
+					createdAt: command.createdAt
+				});
 				if (decision.mode === "local") {
 					yield* orchestrationEngine.dispatch({
 						type: "thread.meta.update",
@@ -130369,7 +130660,7 @@ function toPersistenceSqlOrDecodeError(sqlOperation, decodeOperation, correlatio
 		cause
 	});
 }
-const make$12 = Effect.gen(function* () {
+const make$14 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const upsertRuntimeRow = SqlSchema.void({
 		Request: ProviderSessionRuntimeDbRowSchema,
@@ -130472,7 +130763,7 @@ const make$12 = Effect.gen(function* () {
 		deleteByThreadId
 	};
 });
-const layer$7 = Layer.effect(ProviderSessionRuntimeRepository, make$12);
+const layer$7 = Layer.effect(ProviderSessionRuntimeRepository, make$14);
 //#endregion
 //#region src/provider/Layers/ProviderSessionDirectory.ts
 const decodeProviderDriverKindValue = Schema$1.decodeUnknownEffect(ProviderDriverKind);
@@ -130660,14 +130951,15 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 	const httpServer = yield* HttpServer.HttpServer;
 	const state = yield* SynchronizedRef.make({
 		records: /* @__PURE__ */ new Map(),
-		spawnedThreads: /* @__PURE__ */ new Map()
+		spawnedThreads: /* @__PURE__ */ new Map(),
+		fusionRoles: /* @__PURE__ */ new Map()
 	});
 	const currentTimeMillis = options.now ? Effect.sync(options.now) : Clock.currentTimeMillis;
 	const livenessWindowMs = options.livenessWindowMs ?? DEFAULT_LIVENESS_WINDOW_MS;
 	const endpoint = httpServer.address._tag === "TcpAddress" ? `http://${getHttpMcpEndpointHost(httpServer.address.hostname)}:${httpServer.address.port}/mcp` : "http://127.0.0.1/mcp";
 	const hashToken = (token) => crypto.digest("SHA-256", new TextEncoder().encode(token)).pipe(Effect.map(bytesToHex), Effect.orDie);
 	const revokeWhere = Effect.fn("McpSessionRegistry.revokeWhere")(function* (predicate) {
-		const removed = yield* SynchronizedRef.modify(state, ({ records, spawnedThreads }) => {
+		const removed = yield* SynchronizedRef.modify(state, ({ records, spawnedThreads, fusionRoles }) => {
 			const next = new Map(records);
 			const scopes = [];
 			for (const [hash, record] of records) {
@@ -130678,7 +130970,8 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 			}
 			return [scopes, {
 				records: next,
-				spawnedThreads
+				spawnedThreads,
+				fusionRoles
 			}];
 		});
 		yield* Effect.forEach(removed, (scope) => scope.authorizationLifetime?.revocation ? Deferred.succeed(scope.authorizationLifetime.revocation, void 0) : Effect.void, { discard: true });
@@ -130706,6 +130999,8 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 		if (watchThreadIds.size > 0) capabilities.add("watch");
 		if (adviseThreadIds.size > 0) capabilities.add("advise");
 		const threadId = ThreadId.make(request.threadId);
+		const rememberedRole = yield* SynchronizedRef.get(state).pipe(Effect.map((current) => current.fusionRoles.get(threadId)));
+		const fusionRole = rememberedRole === void 0 ? request.fusionRole : rememberedRole ?? void 0;
 		const scopeWith = (mayCreateThreads, mayCreateFusionPairs, revocation = mainRevocation) => ({
 			authorizationLifetime: {
 				revoked: false,
@@ -130719,11 +131014,12 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 			capabilities,
 			...watchThreadIds.size > 0 ? { watchThreadIds } : {},
 			...adviseThreadIds.size > 0 ? { adviseThreadIds } : {},
+			...fusionRole === void 0 ? {} : { fusionRole },
 			mayCreateThreads,
 			mayCreateFusionPairs,
 			issuedAt
 		});
-		yield* SynchronizedRef.update(state, ({ records, spawnedThreads }) => {
+		yield* SynchronizedRef.update(state, ({ records, spawnedThreads, fusionRoles }) => {
 			const next = new Map(records);
 			next.set(tokenHash, {
 				tokenHash,
@@ -130743,7 +131039,8 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 			});
 			return {
 				records: next,
-				spawnedThreads
+				spawnedThreads,
+				fusionRoles
 			};
 		});
 		return { config: {
@@ -130765,12 +131062,13 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 		const tokenHash = yield* hashToken(rawToken);
 		const timestamp = yield* currentTimeMillis;
 		yield* pruneDead(timestamp);
-		return yield* SynchronizedRef.modify(state, ({ records, spawnedThreads }) => {
+		return yield* SynchronizedRef.modify(state, ({ records, spawnedThreads, fusionRoles }) => {
 			const current = records;
 			const record = current.get(tokenHash);
 			if (!record) return [void 0, {
 				records: current,
-				spawnedThreads
+				spawnedThreads,
+				fusionRoles
 			}];
 			const next = new Map(current);
 			next.set(tokenHash, {
@@ -130784,14 +131082,15 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 				watchThreadIds: /* @__PURE__ */ new Set([...record.scope.watchThreadIds ?? [], ...record.controlThreadIds])
 			}, {
 				records: next,
-				spawnedThreads
+				spawnedThreads,
+				fusionRoles
 			}];
 		});
 	});
 	const touch = Effect.fn("McpSessionRegistry.touch")(function* (threadId) {
 		const timestamp = yield* currentTimeMillis;
 		yield* pruneDead(timestamp);
-		yield* SynchronizedRef.update(state, ({ records, spawnedThreads }) => {
+		yield* SynchronizedRef.update(state, ({ records, spawnedThreads, fusionRoles }) => {
 			const current = records;
 			const next = new Map(current);
 			for (const [tokenHash, record] of current) if (record.scope.threadId === threadId) next.set(tokenHash, {
@@ -130800,12 +131099,13 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 			});
 			return {
 				records: next,
-				spawnedThreads
+				spawnedThreads,
+				fusionRoles
 			};
 		});
 	});
 	const grantWatchThread = Effect.fn("McpSessionRegistry.grantWatchThread")(function* ({ watcherThreadId, watchedThreadId }) {
-		yield* SynchronizedRef.update(state, ({ records, spawnedThreads }) => {
+		yield* SynchronizedRef.update(state, ({ records, spawnedThreads, fusionRoles }) => {
 			const next = new Map(records);
 			for (const [tokenHash, record] of records) {
 				if (record.scope.threadId !== watcherThreadId) continue;
@@ -130820,12 +131120,13 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 			}
 			return {
 				records: next,
-				spawnedThreads
+				spawnedThreads,
+				fusionRoles
 			};
 		});
 	});
 	const revokeWatchThread = Effect.fn("McpSessionRegistry.revokeWatchThread")(function* ({ watcherThreadId, watchedThreadId }) {
-		yield* SynchronizedRef.update(state, ({ records, spawnedThreads }) => {
+		yield* SynchronizedRef.update(state, ({ records, spawnedThreads, fusionRoles }) => {
 			const next = new Map(records);
 			for (const [tokenHash, record] of records) {
 				if (record.scope.threadId !== watcherThreadId) continue;
@@ -130848,12 +131149,13 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 			}
 			return {
 				records: next,
-				spawnedThreads
+				spawnedThreads,
+				fusionRoles
 			};
 		});
 	});
 	const grantAdviseThread = Effect.fn("McpSessionRegistry.grantAdviseThread")(function* ({ watcherThreadId, advisedThreadId }) {
-		yield* SynchronizedRef.update(state, ({ records, spawnedThreads }) => {
+		yield* SynchronizedRef.update(state, ({ records, spawnedThreads, fusionRoles }) => {
 			const next = new Map(records);
 			for (const [tokenHash, record] of records) {
 				if (record.scope.threadId !== watcherThreadId) continue;
@@ -130868,12 +131170,13 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 			}
 			return {
 				records: next,
-				spawnedThreads
+				spawnedThreads,
+				fusionRoles
 			};
 		});
 	});
 	const revokeAdviseThread = Effect.fn("McpSessionRegistry.revokeAdviseThread")(function* ({ watcherThreadId, advisedThreadId }) {
-		yield* SynchronizedRef.update(state, ({ records, spawnedThreads }) => {
+		yield* SynchronizedRef.update(state, ({ records, spawnedThreads, fusionRoles }) => {
 			const next = new Map(records);
 			for (const [tokenHash, record] of records) {
 				if (record.scope.threadId !== watcherThreadId) continue;
@@ -130896,12 +131199,47 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 			}
 			return {
 				records: next,
-				spawnedThreads
+				spawnedThreads,
+				fusionRoles
 			};
 		});
 	});
+	/**
+	* Rewrites one thread's half on every credential it holds, and remembers it.
+	*
+	* A pair is routinely made over a thread that is already running, so the
+	* credential it is using was minted before the pair existed and carries no
+	* role. Patching the live record is what closes that session's gate without
+	* restarting it; the remembered value is what answers for a session that has
+	* not started yet, or has not reached its `issue` call.
+	*/
+	const applyFusionRole = (threadId, role) => SynchronizedRef.update(state, ({ records, spawnedThreads, fusionRoles }) => {
+		const next = new Map(records);
+		for (const [tokenHash, record] of records) {
+			if (record.scope.threadId !== threadId) continue;
+			const { fusionRole: _previous, ...scopeWithoutRole } = record.scope;
+			next.set(tokenHash, {
+				...record,
+				scope: role === null ? scopeWithoutRole : {
+					...scopeWithoutRole,
+					fusionRole: role
+				}
+			});
+		}
+		return {
+			records: next,
+			spawnedThreads,
+			fusionRoles: new Map(fusionRoles).set(threadId, role)
+		};
+	});
+	const setFusionRole = Effect.fn("McpSessionRegistry.setFusionRole")(function* (input) {
+		yield* applyFusionRole(input.threadId, input.role);
+	});
+	const clearFusionRole = Effect.fn("McpSessionRegistry.clearFusionRole")(function* (input) {
+		yield* applyFusionRole(input.threadId, null);
+	});
 	const recordSpawnedThread = Effect.fn("McpSessionRegistry.recordSpawnedThread")(function* (input) {
-		yield* SynchronizedRef.update(state, ({ records, spawnedThreads }) => {
+		yield* SynchronizedRef.update(state, ({ records, spawnedThreads, fusionRoles }) => {
 			const next = new Map(records);
 			for (const [tokenHash, record] of records) if (record.scope.providerSessionId === input.providerSessionId) next.set(tokenHash, {
 				...record,
@@ -130909,7 +131247,8 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 			});
 			return {
 				records: next,
-				spawnedThreads: new Map([...spawnedThreads, [input.threadId, input.mayCreateFusionPairs === true]])
+				spawnedThreads: new Map([...spawnedThreads, [input.threadId, input.mayCreateFusionPairs === true]]),
+				fusionRoles
 			};
 		});
 	});
@@ -130917,6 +131256,8 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 		issue,
 		resolve,
 		touch,
+		setFusionRole,
+		clearFusionRole,
 		grantWatchThread,
 		revokeWatchThread,
 		grantAdviseThread,
@@ -130932,7 +131273,7 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 	});
 });
 let activeMcpSessionRegistry;
-const make$11 = Effect.acquireRelease(Effect.gen(function* () {
+const make$13 = 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(() => {
@@ -130940,7 +131281,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$6 = Layer.effect(McpSessionRegistry, make$11);
+const layer$6 = Layer.effect(McpSessionRegistry, make$13);
 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
@@ -130948,6 +131289,8 @@ const issueActiveMcpCredential = (request) => activeMcpSessionRegistry ? activeM
 */
 const touchActiveMcpThread = (threadId) => activeMcpSessionRegistry ? activeMcpSessionRegistry.touch(threadId) : Effect.void;
 const grantActiveMcpWatchThread = (input) => activeMcpSessionRegistry ? activeMcpSessionRegistry.grantWatchThread(input) : Effect.void;
+const setActiveMcpFusionRole = (input) => activeMcpSessionRegistry ? activeMcpSessionRegistry.setFusionRole(input) : Effect.void;
+const clearActiveMcpFusionRole = (input) => activeMcpSessionRegistry ? activeMcpSessionRegistry.clearFusionRole(input) : Effect.void;
 const revokeActiveMcpWatchThread = (input) => activeMcpSessionRegistry ? activeMcpSessionRegistry.revokeWatchThread(input) : Effect.void;
 const grantActiveMcpAdviseThread = (input) => activeMcpSessionRegistry ? activeMcpSessionRegistry.grantAdviseThread(input) : Effect.void;
 const revokeActiveMcpAdviseThread = (input) => activeMcpSessionRegistry ? activeMcpSessionRegistry.revokeAdviseThread(input) : Effect.void;
@@ -131069,6 +131412,15 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (options)
 			return Option.isSome(thread) ? resolveProjectAgentBrowserAccess(settings, thread.value.projectId) : false;
 		})), Effect.catch((cause) => Effect.logWarning("Could not read settings; withholding agent browser access.", { cause }).pipe(Effect.as(false))));
 		const computerUseAccess = yield* registry.getInstanceInfo(providerInstanceId).pipe(Effect.map((info) => info.driverKind !== "codex"), Effect.catch(() => Effect.succeed(false)));
+		const fusionRole = Option.isSome(projectionQuery) ? yield* projectionQuery.value.getActiveThreadPairs().pipe(Effect.map((pairs) => {
+			const pair = pairs.find((entry) => entry.watcherThreadId === threadId || entry.implementerThreadId === threadId);
+			if (pair === void 0) return void 0;
+			return pair.watcherThreadId === threadId ? "watcher" : "implementer";
+		}), Effect.mapError((cause) => new ProviderValidationError({
+			operation: "ProviderService.prepareMcpSession",
+			issue: "Could not read thread pairs, so the session's Fusion role is unknown. Refusing to issue an MCP credential that would carry no role.",
+			cause
+		}))) : yield* Effect.logWarning("No projection service, so an MCP credential is issued with no Fusion role. A pair whose event this process never saw will be ungated.", { threadId }).pipe(Effect.as(void 0));
 		const threadTitle = Option.isSome(projectionQuery) ? yield* projectionQuery.value.getThreadShellById(threadId).pipe(Effect.map((thread) => Option.isSome(thread) ? thread.value.title : void 0), Effect.catch(() => Effect.succeed(void 0))) : void 0;
 		const credential = yield* issueActiveMcpCredential({
 			threadId,
@@ -131077,7 +131429,8 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (options)
 			browserAccess,
 			computerUseAccess,
 			...watchThreadIds !== void 0 ? { watchThreadIds } : {},
-			...adviseThreadIds !== void 0 ? { adviseThreadIds } : {}
+			...adviseThreadIds !== void 0 ? { adviseThreadIds } : {},
+			...fusionRole !== void 0 ? { fusionRole } : {}
 		});
 		if (credential) yield* Effect.sync(() => setMcpProviderSession(credential.config));
 		return credential;
@@ -131923,6 +132276,47 @@ const mcpInputSchema = (schema) => ({
 	...schema,
 	type: "object"
 });
+const P4_TOOL_NAMES = new Set(P4CODE_MCP_TOOL_NAMES);
+/**
+* The server's own answer to "may this role call this tool", applied to every
+* registered P4 tool before its handler runs.
+*
+* The adapters also hide a role's forbidden tools, but that is a context
+* measure: it depends on a user setting and on the one adapter that can filter
+* a session's tool list. A caller that never saw the tool can still name it,
+* so the rule that matters is enforced here, where every provider's call
+* arrives and neither a setting nor a prompt can move it.
+*
+* Only P4's own tools are governed. A name outside the catalogue belongs to
+* another server sharing this registration helper - Computer Use is one - and
+* this policy has nothing to say about it.
+*/
+const enforceFusionRole = (toolName) => Effect.serviceOption(McpInvocationContext).pipe(Effect.map((invocation) => {
+	if (!P4_TOOL_NAMES.has(toolName)) return null;
+	const role = invocation._tag === "Some" ? invocation.value.fusionRole : void 0;
+	if (role === void 0 || fusionRoleMayCallP4Tool(role, toolName)) return null;
+	return role;
+}));
+/** The half's own word, so the message names the caller rather than a code. */
+const ROLE_LABEL = {
+	implementer: "builder",
+	watcher: "supervisor"
+};
+const deniedResult = (toolName, role) => new McpSchema.CallToolResult({
+	isError: true,
+	content: [{
+		type: "text",
+		text: `${toolName} is not a tool the ${ROLE_LABEL[role]} half of a Fusion pair may call. Report the missing tool rather than working around it.`
+	}]
+});
+/**
+* Wraps one tool handler in the role gate.
+*
+* Exported because `addTool` is reachable from two places: this helper, and
+* the one tool registered by hand. A gate that only covered the helper would
+* leave that tool open, which is the kind of hole a policy is judged by.
+*/
+const withFusionRoleGate = (toolName, handle) => (payload) => enforceFusionRole(toolName).pipe(Effect.flatMap((deniedRole) => deniedRole === null ? handle(payload) : Effect.succeed(deniedResult(toolName, deniedRole))));
 const mcpToolkit = (toolkit) => Layer.effectDiscard(Effect.gen(function* () {
 	const server = yield* McpServer.McpServer;
 	yield* McpServer.registerToolkit(toolkit).pipe(Effect.provideService(McpServer.McpServer, {
@@ -131932,7 +132326,8 @@ const mcpToolkit = (toolkit) => Layer.effectDiscard(Effect.gen(function* () {
 			tool: new McpSchema.Tool({
 				...options.tool,
 				inputSchema: mcpInputSchema(options.tool.inputSchema)
-			})
+			}),
+			handle: withFusionRoleGate(options.tool.name, options.handle)
 		})
 	}));
 }));
@@ -132221,13 +132616,13 @@ const registerScreenshot = Effect.fn("device.registerScreenshot")(function* () {
 			}
 		}),
 		annotations: DeviceScreenshotTool.annotations,
-		handle: (payload) => Effect.withFiber((fiber) => built.handle("device_screenshot", payload).pipe(Stream.unwrap, Stream.run(Sink.last()), Effect.flatMap(Effect.fromOption), Effect.provideService(DeviceService, service), Effect.provideService(DeviceScreenshot, screenshots), Effect.provideService(McpInvocationContext, Context.getUnsafe(fiber.context, McpInvocationContext)), Effect.flatMap((result) => screenshotContent(result.encodedResult)), Effect.orElseSucceed(() => new McpSchema.CallToolResult({
+		handle: withFusionRoleGate(DeviceScreenshotTool.name, (payload) => Effect.withFiber((fiber) => built.handle("device_screenshot", payload).pipe(Stream.unwrap, Stream.run(Sink.last()), Effect.flatMap(Effect.fromOption), Effect.provideService(DeviceService, service), Effect.provideService(DeviceScreenshot, screenshots), Effect.provideService(McpInvocationContext, Context.getUnsafe(fiber.context, McpInvocationContext)), Effect.flatMap((result) => screenshotContent(result.encodedResult)), Effect.orElseSucceed(() => new McpSchema.CallToolResult({
 			isError: true,
 			content: [{
 				type: "text",
 				text: "Device screenshot unavailable. Check the open session and refresh devices."
 			}]
-		}))))
+		})))))
 	});
 });
 const DeviceToolkitRegistrationLive = Layer.mergeAll(mcpToolkit(DeviceStandardToolkit), Layer.effectDiscard(registerScreenshot())).pipe(Layer.provide(DeviceToolkitHandlersLive));
@@ -132398,7 +132793,7 @@ const stringField = (record, key) => {
 	const value = record[key];
 	return typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
 };
-const make$10 = Effect.gen(function* () {
+const make$12 = Effect.gen(function* () {
 	const linear = yield* LinearClient;
 	return { resolve: Effect.fn("TicketResolver.resolve")(function* (reference) {
 		const identifier = parseTicketReference(reference);
@@ -132429,7 +132824,7 @@ const make$10 = Effect.gen(function* () {
 		};
 	}) };
 });
-const layer$5 = Layer.effect(TicketResolver, make$10);
+const layer$5 = Layer.effect(TicketResolver, make$12);
 //#endregion
 //#region src/mcp/toolkits/tasks/tools.ts
 const dependencies = [McpInvocationContext, TaskRepository];
@@ -132968,7 +133363,7 @@ const AskUserQuestionTool = Tool.make("ask_user_question", {
 	]
 }).annotate(Tool.Title, "Ask user question").annotate(Tool.Readonly, false).annotate(Tool.Destructive, false).annotate(Tool.Idempotent, false);
 const ThreadSpawnTool = Tool.make("thread_spawn", {
-	description: "Start a new agent thread and send it a first message, then return its id. Use it to hand a piece of work to a fresh thread - a subtask you just planned, a job that wants its own transcript. Set fusion true to create two new threads as a separate Fusion pair and send prompt to its supervisor, which plans and directs the builder later, even when this thread already belongs to a pair. Set fusionWatcher true only for a supervisor to pair with the current thread. Both use saved Fusion role models unless overridden. Act on the user's request; no special command syntax is required. The new thread inherits this one's project, model, permission mode, interaction mode, compression and subagent policy, and every one of those can be set here instead - what you set is already in force for the first turn, so a thread never has to be corrected after it starts. Set modelSelection to run it on another model: give the model id, and leave instanceId out to keep this thread's provider instance. Once started it can be watched with thread_watch_events and changed later with thread_configure. A thread that was itself started this way cannot start another.",
+	description: "Start a new agent thread and send it a first message, then return its id. Use it to hand a piece of work to a fresh thread - a subtask you just planned, a job that wants its own transcript. For activation here or a new Fusion in this chat, use thread_pair_create with no watcherThreadId so this chat becomes Supervisor and its new Builder starts empty. Set fusion true only for an explicitly separate pair to create two new threads and send prompt to its supervisor, which plans and directs the builder later, even when this thread already belongs to a pair. Set fusionWatcher true only for legacy current-chat-as-builder pairing. Both use saved Fusion role models unless overridden. Act on the user's request; no special command syntax is required. The new thread inherits this one's project, model, permission mode, interaction mode, compression and subagent policy, and every one of those can be set here instead - what you set is already in force for the first turn, so a thread never has to be corrected after it starts. Set modelSelection to run it on another model: give the model id, and leave instanceId out to keep this thread's provider instance. Once started it can be watched with thread_watch_events and changed later with thread_configure. A thread that was itself started this way cannot start another.",
 	parameters: ThreadSpawnInput,
 	success: ThreadSpawnResult,
 	failure: ThreadControlToolError,
@@ -132982,18 +133377,22 @@ const ThreadSpawnTool = Tool.make("thread_spawn", {
 	]
 }).annotate(Tool.Title, "Start a thread").annotate(Tool.Readonly, false).annotate(Tool.Destructive, false).annotate(Tool.Idempotent, false);
 const ThreadPairCreateTool = Tool.make("thread_pair_create", {
-	description: "Create a persisted Fusion pair between this agent session's own thread as builder and a supervisor it previously created with thread_spawn. Act on the user's request; no special command syntax is required. The current thread must not already belong to an active Fusion pair. Successful creation automatically continues the builder, so never ask the user to resend the task.",
+	description: "Activate Fusion here: call with no watcherThreadId to retain this chat and its history as Supervisor and create a new Builder with no messages or provider context. Builder stays idle until you send thread_advise. Use the returned implementerThreadId for the phase plan and advice. No transcript is copied. Requires explicit user authorization and a standalone current thread. Only an explicitly separate pair should use thread_spawn with fusion true. Supplying watcherThreadId retains legacy current-chat-as-builder pairing.",
 	parameters: ThreadPairCreateInput,
 	success: ThreadPairCreateResult,
 	failure: ThreadControlToolError,
 	dependencies: [
 		McpInvocationContext,
 		OrchestrationEngineService,
+		McpSessionRegistry,
+		ProjectionThreadRepository,
+		ProjectionSnapshotQuery,
+		ServerSettingsService,
 		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.",
+	description: "Detach this agent session's active Fusion pair, stopping future automatic supervisor reviews while preserving both threads. The session must belong to the pair and must have created its other thread.",
 	parameters: ThreadPairDetachInput,
 	success: ThreadPairDetachResult,
 	failure: ThreadControlToolError,
@@ -133383,6 +133782,14 @@ const ThreadToolkitHandlersLive = ThreadToolkit.toLayer({
 				watcherThreadId: fusionPair.watcherThreadId,
 				createdAt
 			}, threadId);
+			yield* registry.setFusionRole({
+				threadId,
+				role: "implementer"
+			});
+			yield* registry.setFusionRole({
+				threadId: fusionPair.watcherThreadId,
+				role: "watcher"
+			});
 		}
 		yield* dispatchControl({
 			type: "thread.turn.start",
@@ -133410,6 +133817,74 @@ const ThreadToolkitHandlersLive = ThreadToolkit.toLayer({
 		};
 	}),
 	thread_pair_create: (input) => Effect.gen(function* () {
+		if (input.watcherThreadId === void 0) {
+			const invocation = yield* requireThreadSpawn(true);
+			const reject = (detail) => new ThreadControlRejectedError({
+				threadId: invocation.threadId,
+				commandType: "thread-pair.create",
+				detail
+			});
+			if ((yield* (yield* ProjectionSnapshotQuery).getCommandReadModel().pipe(Effect.mapError((cause) => reject(cause.message)))).threadPairs?.some((pair) => pair.detachedAt === null && (pair.implementerThreadId === invocation.threadId || pair.watcherThreadId === invocation.threadId))) return yield* reject("Current thread already belongs to an active Fusion pair.");
+			const current = yield* (yield* ProjectionThreadRepository).getById({ threadId: invocation.threadId }).pipe(Effect.mapError((cause) => reject(cause.message)));
+			if (Option.isNone(current) || current.value.deletedAt !== null) return yield* reject("Current thread does not exist.");
+			const settings = yield* (yield* ServerSettingsService).getSettings.pipe(Effect.mapError((cause) => reject(cause.message)));
+			const crypto = yield* Crypto.Crypto;
+			const implementerThreadId = ThreadId.make(yield* crypto.randomUUIDv4.pipe(Effect.orDie));
+			const pairId = ThreadPairId.make(yield* crypto.randomUUIDv4.pipe(Effect.orDie));
+			const createdAt = DateTime.formatIso(yield* DateTime.now);
+			const template = current.value;
+			yield* dispatchControl({
+				type: "thread.create",
+				commandId: yield* newCommandId,
+				threadId: implementerThreadId,
+				projectId: template.projectId,
+				title: `Implement: ${template.title}`,
+				modelSelection: settings.fusionBuilderModelSelection ?? template.modelSelection,
+				runtimeMode: template.runtimeMode,
+				interactionMode: template.interactionMode,
+				compressMode: template.compressMode,
+				unpromptedSubagents: template.unpromptedSubagents === 1,
+				branch: template.branch,
+				worktreePath: template.worktreePath,
+				createdAt
+			}, invocation.threadId);
+			yield* dispatchControl({
+				type: "thread-pair.create",
+				commandId: yield* newCommandId,
+				pairId,
+				implementerThreadId,
+				watcherThreadId: invocation.threadId,
+				...input.gateTimeoutMs === void 0 ? {} : { gateTimeoutMs: input.gateTimeoutMs },
+				createdAt
+			}, invocation.threadId);
+			const registry = yield* McpSessionRegistry;
+			yield* registry.recordSpawnedThread({
+				providerSessionId: invocation.providerSessionId,
+				threadId: implementerThreadId
+			});
+			yield* registry.setFusionRole({
+				threadId: implementerThreadId,
+				role: "implementer"
+			});
+			yield* registry.setFusionRole({
+				threadId: invocation.threadId,
+				role: "watcher"
+			});
+			const grant = {
+				watcherThreadId: invocation.threadId,
+				watchedThreadId: implementerThreadId
+			};
+			yield* registry.grantWatchThread(grant);
+			yield* registry.grantAdviseThread({
+				watcherThreadId: invocation.threadId,
+				advisedThreadId: implementerThreadId
+			});
+			return {
+				pairId,
+				implementerThreadId,
+				watcherThreadId: invocation.threadId
+			};
+		}
 		const { invocation, threadId: watcherThreadId } = yield* requireThreadControlTarget(input.watcherThreadId);
 		const crypto = yield* Crypto.Crypto;
 		const pairId = ThreadPairId.make(yield* crypto.randomUUIDv4.pipe(Effect.orDie));
@@ -133423,6 +133898,15 @@ const ThreadToolkitHandlersLive = ThreadToolkit.toLayer({
 			continuationMessageId,
 			createdAt: DateTime.formatIso(yield* DateTime.now)
 		}, invocation.threadId);
+		const registry = yield* McpSessionRegistry;
+		yield* registry.setFusionRole({
+			threadId: invocation.threadId,
+			role: "implementer"
+		});
+		yield* registry.setFusionRole({
+			threadId: watcherThreadId,
+			role: "watcher"
+		});
 		return {
 			pairId,
 			implementerThreadId: invocation.threadId,
@@ -133442,15 +133926,16 @@ const ThreadToolkitHandlersLive = ThreadToolkit.toLayer({
 			commandType: "thread-pair.detach",
 			detail: `Active Fusion pair '${input.pairId}' was not found.`
 		});
-		if (pair.implementerThreadId !== invocation.threadId) return yield* new ThreadControlRejectedError({
+		if (pair.implementerThreadId !== invocation.threadId && pair.watcherThreadId !== invocation.threadId) return yield* new ThreadControlRejectedError({
 			threadId: invocation.threadId,
 			commandType: "thread-pair.detach",
-			detail: "This session is not the pair's implementer."
+			detail: "This session is not a member of the pair."
 		});
-		if (!invocation.controlThreadIds?.has(pair.watcherThreadId)) return yield* new ThreadControlRejectedError({
+		const otherThreadId = pair.implementerThreadId === invocation.threadId ? pair.watcherThreadId : pair.implementerThreadId;
+		if (!invocation.controlThreadIds?.has(otherThreadId)) return yield* new ThreadControlRejectedError({
 			threadId: invocation.threadId,
 			commandType: "thread-pair.detach",
-			detail: "This session did not create the pair's supervisor with thread_spawn."
+			detail: "This session did not create the other thread in the pair."
 		});
 		const detachedAt = DateTime.formatIso(yield* DateTime.now);
 		yield* dispatchControl({
@@ -134067,6 +134552,20 @@ var TypeSafeRequestError = class extends Data.TaggedError("TypeSafeRequestError"
 var TypeSafeClient = class extends Context.Service()("@p4code/cli/orchestration/triage/TypeSafeClient") {};
 const asRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
 /**
+* The finite numbers out of a probability map, or nothing.
+*
+* Non-numeric and non-finite entries are dropped rather than coerced, for the
+* same reason a missing confidence is never read as zero: a rank built on an
+* invented number is worse than one built on fewer.
+*/
+function readProbabilities(value) {
+	const record = asRecord(value);
+	if (record === void 0) return void 0;
+	const probabilities = {};
+	for (const [key, entry] of Object.entries(record)) if (typeof entry === "number" && Number.isFinite(entry)) probabilities[key] = entry;
+	return Object.keys(probabilities).length === 0 ? void 0 : probabilities;
+}
+/**
 * Reads one answer, or nothing.
 *
 * A `choice` or `score` without a numeric `confidence` is rejected rather than
@@ -134081,10 +134580,16 @@ function parseTypeSafeAnswer(value) {
 		case "choice": {
 			const choice = record["choice"];
 			if (typeof choice !== "string" || typeof confidence !== "number") return void 0;
-			return {
+			const probabilities = readProbabilities(record["probabilities"]);
+			return probabilities === void 0 ? {
 				type: "choice",
 				choice,
 				confidence
+			} : {
+				type: "choice",
+				choice,
+				confidence,
+				probabilities
 			};
 		}
 		case "score": {
@@ -134225,7 +134730,7 @@ const TypeSafeToolkit = Toolkit.make(TypeSafeAskTool);
 /** Headroom for the envelope and for the estimate's own error. */
 const RESERVE_TOKENS = 2e3;
 /** One question per call, so the id is fixed rather than invented. */
-const QUESTION_ID = "question";
+const QUESTION_ID$1 = "question";
 const requestTokens = (input) => estimateTokens(input.data) + estimateTokens(input.instructions) + estimateTokens(JSON.stringify(input.criteria));
 const TypeSafeToolkitHandlersLive = TypeSafeToolkit.toLayer({ typesafe_ask: (input) => Effect.gen(function* () {
 	const tokens = requestTokens(input);
@@ -134239,7 +134744,7 @@ const TypeSafeToolkitHandlersLive = TypeSafeToolkit.toLayer({ typesafe_ask: (inp
 		model: settings?.fusionReviewTriage.triageModel ?? "jev-latest",
 		state: input.data,
 		question: {
-			id: QUESTION_ID,
+			id: QUESTION_ID$1,
 			type: input.type,
 			instructions: input.instructions,
 			criteria: input.criteria
@@ -134268,6 +134773,16 @@ const TypeSafeToolkitHandlersLive = TypeSafeToolkit.toLayer({ typesafe_ask: (inp
 * appending beside it.
 */
 const evidenceReadActivityId = (watchedThreadId, throughSequence) => EventId.make(`fusion-evidence:${watchedThreadId}:${throughSequence}`);
+/**
+* The key a raw read records under, when the supervisor paged the events itself.
+*
+* A raw read has no fixed bound to key on: the supervisor discovers where the
+* window ends by paging to it, so keying on the sequence it happens to have
+* reached would mint one row per page. The turn is the bound that already
+* exists, and it collapses the whole raw read into the single row a compact
+* review would have written.
+*/
+const rawEvidenceReadActivityId = (watchedThreadId, readerTurnId) => EventId.make(`fusion-evidence:${watchedThreadId}:turn:${readerTurnId}`);
 /** One report per review, keyed like the read it reports on so a retry replaces. */
 const evidenceReportActivityId = (watchedThreadId, throughSequence) => EventId.make(`fusion-evidence-summary:${watchedThreadId}:${throughSequence}`);
 /**
@@ -134300,7 +134815,8 @@ const evidenceTiming = (readAt, closedAt) => {
 const correlateEvidence = Effect.fn("fusionEvidenceReport.correlateEvidence")(function* (input) {
 	const projections = yield* ProjectionSnapshotQuery;
 	const latest = yield* projections.getLatestThreadContextWindow(input.readerThreadId).pipe(Effect.orElseSucceed(() => Option.none()));
-	const read = yield* projections.getEvidenceReadContext(input.readActivityId).pipe(Effect.orElseSucceed(() => Option.none()));
+	const readContext = (activityId) => projections.getEvidenceReadContext(activityId).pipe(Effect.orElseSucceed(() => Option.none()));
+	const read = yield* readContext(input.readActivityId).pipe(Effect.flatMap((row) => Option.isSome(row) || input.fallbackReadActivityId === void 0 ? Effect.succeed(row) : readContext(input.fallbackReadActivityId)));
 	const timing = Option.match(read, {
 		onNone: () => null,
 		onSome: (row) => evidenceTiming(row.readAt, input.closedAt)
@@ -134341,8 +134857,14 @@ const ThreadWatchEventsTool = Tool.make("thread_watch_events", {
 	parameters: ThreadWatchEventsInput,
 	success: ThreadWatchEventsResult,
 	failure: ThreadWatchToolError,
-	dependencies: [McpInvocationContext, ThreadEventStreamService]
-}).annotate(Tool.Title, "Read watched thread events").annotate(Tool.Readonly, true).annotate(Tool.Destructive, false).annotate(Tool.Idempotent, true);
+	dependencies: [
+		McpInvocationContext,
+		ThreadEventStreamService,
+		OrchestrationEngineService,
+		ProjectionSnapshotQuery,
+		Crypto.Crypto
+	]
+}).annotate(Tool.Title, "Read watched thread events").annotate(Tool.Readonly, false).annotate(Tool.Destructive, false).annotate(Tool.Idempotent, true);
 const ThreadWatchReviewTool = Tool.make("thread_watch_review", {
 	description: "Read bounded compact review evidence for an explicitly granted thread. Combines assistant fragments by message identity; preserves user requirements, tool evidence, plans, errors and turn boundaries. Resume with nextAfterSequence and the same throughSequence until hasMore is false, even on empty pages. Message operations append or replace by identity across pages. Truncated evidence includes source sequence ranges for targeted recovery with thread_watch_events; do not treat an excerpt as full proof.",
 	parameters: ThreadWatchReviewInput,
@@ -134394,20 +134916,24 @@ const REPORT_HEADING = {
 * for; losing the note that it happened is a smaller loss than losing the page,
 * so a rejected dispatch is logged and the page is returned anyway.
 */
-const recordEvidenceRead = Effect.fn("mcp.watch.recordEvidenceRead")(function* (readerThreadId, page, afterSequence) {
+const recordEvidenceRead = Effect.fn("mcp.watch.recordEvidenceRead")(function* (readerThreadId, window) {
 	const engine = yield* OrchestrationEngineService;
 	const crypto = yield* Crypto.Crypto;
 	const projections = yield* ProjectionSnapshotQuery;
 	const createdAt = DateTime.formatIso(yield* DateTime.now);
-	const recorded = yield* projections.getEvidenceReadContext(evidenceReadActivityId(page.threadId, page.throughSequence)).pipe(Effect.orElseSucceed(() => Option.none()));
+	const recorded = yield* projections.getEvidenceReadContext(window.activityId).pipe(Effect.orElseSucceed(() => Option.none()));
 	const opened = Option.isSome(recorded);
 	const readCreatedAt = Option.match(recorded, {
 		onNone: () => createdAt,
 		onSome: (row) => row.readAt
 	});
 	const readAfterSequence = Option.match(recorded, {
-		onNone: () => afterSequence,
-		onSome: (row) => row.afterSequence ?? afterSequence
+		onNone: () => window.afterSequence,
+		onSome: (row) => row.afterSequence ?? window.afterSequence
+	});
+	const readThroughSequence = Option.match(recorded, {
+		onNone: () => window.throughSequence,
+		onSome: (row) => row.throughSequence === null ? window.throughSequence : Math.max(row.throughSequence, window.throughSequence)
 	});
 	const activeTurnId = yield* projections.getActiveTurnId(readerThreadId).pipe(Effect.orElseSucceed(() => Option.none()), Effect.map(Option.getOrNull));
 	const usedTokensAtRead = opened ? Option.getOrNull(Option.map(recorded, (row) => row.usedTokensAtRead)) : yield* projections.getLatestThreadContextWindow(readerThreadId).pipe(Effect.map(Option.map((row) => row.usedTokens)), Effect.orElseSucceed(() => Option.none()), Effect.map(Option.getOrNull));
@@ -134417,29 +134943,40 @@ const recordEvidenceRead = Effect.fn("mcp.watch.recordEvidenceRead")(function* (
 		threadId: readerThreadId,
 		createdAt,
 		activity: {
-			id: evidenceReadActivityId(page.threadId, page.throughSequence),
+			id: window.activityId,
 			createdAt: readCreatedAt,
 			tone: "info",
 			kind: "fusion.evidence.read",
 			summary: "Read builder evidence",
 			turnId: null,
 			payload: {
-				watchedThreadId: page.threadId,
+				watchedThreadId: window.watchedThreadId,
 				afterSequence: readAfterSequence,
-				throughSequence: page.throughSequence,
-				nextAfterSequence: page.nextAfterSequence,
-				hasMore: page.hasMore,
-				scannedEvents: page.scannedEvents,
+				throughSequence: readThroughSequence,
+				nextAfterSequence: window.nextAfterSequence,
+				hasMore: window.hasMore,
+				scannedEvents: window.scannedEvents,
 				...activeTurnId === null ? {} : { turnId: activeTurnId },
+				...window.raw === true ? { raw: true } : {},
 				...usedTokensAtRead === null ? {} : { usedTokensAtRead }
 			}
 		}
 	}).pipe(Effect.catchCause((cause) => Effect.logWarning("could not record the supervisor's evidence read", {
 		readerThreadId,
-		watchedThreadId: page.threadId,
+		watchedThreadId: window.watchedThreadId,
 		cause
 	})));
 });
+/**
+* Whether this reader is the watcher half of a live pair over this thread.
+*
+* `thread_watch_events` is the generic polling tool, so an orchestrator reading
+* a thread it spawned goes through it too. Only a Fusion watcher is reading
+* builder evidence, and only its work log should grow a row saying so.
+*/
+const watchesAsFusionSupervisor = Effect.fn("mcp.watch.watchesAsFusionSupervisor")(function* (readerThreadId, watchedThreadId) {
+	return (yield* (yield* ProjectionSnapshotQuery).getActiveThreadPairs().pipe(Effect.orElseSucceed(() => []))).some((pair) => pair.watcherThreadId === readerThreadId && pair.implementerThreadId === watchedThreadId);
+});
 /** Bounded so one report cannot dominate a thread's activity storage. */
 const clip = (value, limit) => {
 	const trimmed = value?.trim();
@@ -134453,7 +134990,15 @@ const WatchToolkitHandlersLive = WatchToolkit.toLayer({
 			threadId: input.threadId,
 			detail: cause.message
 		})));
-		yield* recordEvidenceRead(invocation.threadId, page, input.afterSequence ?? 0);
+		yield* recordEvidenceRead(invocation.threadId, {
+			activityId: evidenceReadActivityId(page.threadId, page.throughSequence),
+			watchedThreadId: page.threadId,
+			afterSequence: input.afterSequence ?? 0,
+			throughSequence: page.throughSequence,
+			nextAfterSequence: page.nextAfterSequence,
+			hasMore: page.hasMore,
+			scannedEvents: page.scannedEvents
+		});
 		return page;
 	}),
 	thread_evidence_report: (input) => Effect.gen(function* () {
@@ -134461,9 +135006,11 @@ const WatchToolkitHandlersLive = WatchToolkit.toLayer({
 		const engine = yield* OrchestrationEngineService;
 		const crypto = yield* Crypto.Crypto;
 		const createdAt = DateTime.formatIso(yield* DateTime.now);
+		const activeTurnId = yield* (yield* ProjectionSnapshotQuery).getActiveTurnId(invocation.threadId).pipe(Effect.orElseSucceed(() => Option.none()), Effect.map(Option.getOrNull));
 		const { context, timing } = yield* correlateEvidence({
 			readerThreadId: invocation.threadId,
 			readActivityId: evidenceReadActivityId(input.threadId, input.throughSequence),
+			...activeTurnId === null ? {} : { fallbackReadActivityId: rawEvidenceReadActivityId(input.threadId, activeTurnId) },
 			closedAt: createdAt
 		});
 		const summary = clip(input.summary, THREAD_EVIDENCE_REPORT_MAX_CHARS);
@@ -134504,7 +135051,7 @@ const WatchToolkitHandlersLive = WatchToolkit.toLayer({
 		};
 	}),
 	thread_watch_events: (input) => Effect.gen(function* () {
-		yield* requireWatchCapability(input.threadId);
+		const invocation = yield* requireWatchCapability(input.threadId);
 		const page = yield* (yield* ThreadEventStreamService).read({
 			threadId: input.threadId,
 			...input.afterSequence !== void 0 ? { afterSequence: input.afterSequence } : {},
@@ -134513,6 +135060,28 @@ const WatchToolkitHandlersLive = WatchToolkit.toLayer({
 			threadId: input.threadId,
 			detail: cause.message
 		})));
+		const lastSequence = page.events.at(-1)?.sequence;
+		if (lastSequence !== void 0 && (yield* watchesAsFusionSupervisor(invocation.threadId, input.threadId))) {
+			const projections = yield* ProjectionSnapshotQuery;
+			const turnId = yield* projections.getActiveTurnId(invocation.threadId).pipe(Effect.orElseSucceed(() => Option.none()), Effect.map(Option.getOrNull));
+			if (turnId !== null) {
+				const activityId = rawEvidenceReadActivityId(input.threadId, turnId);
+				const opened = yield* projections.getLatestEvidenceRead(invocation.threadId).pipe(Effect.orElseSucceed(() => Option.none()));
+				if (!Option.match(opened, {
+					onNone: () => false,
+					onSome: (row) => row.turnId === turnId && row.watchedThreadId === input.threadId
+				})) yield* recordEvidenceRead(invocation.threadId, {
+					activityId,
+					watchedThreadId: input.threadId,
+					afterSequence: input.afterSequence ?? 0,
+					throughSequence: lastSequence,
+					nextAfterSequence: lastSequence,
+					hasMore: page.hasMore,
+					scannedEvents: page.events.length,
+					raw: true
+				});
+			}
+		}
 		return {
 			threadId: input.threadId,
 			events: page.events,
@@ -134590,7 +135159,7 @@ const registerPreviewSnapshot = Effect.fn("McpHttpServer.registerPreviewSnapshot
 			}
 		}),
 		annotations: tool.annotations,
-		handle: (payload) => Effect.withFiber((fiber) => {
+		handle: withFusionRoleGate(tool.name, (payload) => Effect.withFiber((fiber) => {
 			const invocation = Context.getUnsafe(fiber.context, McpInvocationContext);
 			return built.handle("preview_snapshot", payload).pipe(Stream.unwrap, Stream.run(Sink.last()), Effect.flatMap(Effect.fromOption), Effect.provideService(PreviewAutomationBroker, broker), Effect.provideService(McpInvocationContext, invocation), Effect.matchCauseEffect({
 				onFailure: previewSnapshotFailure,
@@ -134619,7 +135188,7 @@ const registerPreviewSnapshot = Effect.fn("McpHttpServer.registerPreviewSnapshot
 					}));
 				}
 			}));
-		})
+		}))
 	});
 });
 const PreviewStandardToolkitRegistrationLive = mcpToolkit(PreviewStandardToolkit).pipe(Layer.provide(PreviewStandardToolkitHandlersLive));
@@ -135840,7 +136409,7 @@ const COMPLETION_SWEEP_BATCH_SIZE = 25;
 const COMPLETION_SWEEP_INTERVAL = Duration.minutes(1);
 const COMPLETION_PR_TIMEOUT = Duration.seconds(10);
 const MILLISECONDS_PER_DAY = 1440 * 60 * 1e3;
-const make$9 = Effect.gen(function* () {
+const make$11 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const settings = yield* ServerSettingsService;
 	const git = yield* GitManager;
@@ -135927,7 +136496,7 @@ const make$9 = Effect.gen(function* () {
 	};
 });
 var ThreadCompletionReactor = class extends Context.Service()("@p4code/cli/orchestration/Layers/ThreadCompletionReactor") {};
-const ThreadCompletionReactorLive = Layer.effect(ThreadCompletionReactor, make$9);
+const ThreadCompletionReactorLive = Layer.effect(ThreadCompletionReactor, make$11);
 //#endregion
 //#region src/orchestration/Services/ScheduledTaskReactor.ts
 /**
@@ -136119,7 +136688,7 @@ const decodeReportStamp = Schema$1.decodeUnknownEffect(Schema$1.fromJsonString(R
 const decodeTurns = Schema$1.decodeUnknownEffect(Schema$1.Array(TurnRow));
 const encodeReport = Schema$1.encodeEffect(Schema$1.UnknownFromJsonString);
 /** Reads existing projections only; observation never dispatches orchestration commands. */
-const make$8 = Effect.gen(function* () {
+const make$10 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path$1.Path;
@@ -136193,7 +136762,7 @@ const make$8 = Effect.gen(function* () {
 	};
 });
 const layer$1 = Layer.effectDiscard(Effect.gen(function* () {
-	yield* (yield* make$8).start;
+	yield* (yield* make$10).start;
 }));
 //#endregion
 //#region src/orchestration/Services/RuntimeReceiptBus.ts
@@ -136781,7 +137350,7 @@ function runtimeEventToActivities(event, taskTitle, compressMode) {
 	}
 	return [];
 }
-const make$7 = Effect.gen(function* () {
+const make$9 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const orchestrationEngine = yield* OrchestrationEngineService;
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
@@ -137414,7 +137983,7 @@ const make$7 = Effect.gen(function* () {
 		drain: worker.drain
 	};
 });
-const ProviderRuntimeIngestionLive = Layer.effect(ProviderRuntimeIngestionService, make$7).pipe(Layer.provide(ProjectionTurnRepositoryLive), Layer.provide(layer$86));
+const ProviderRuntimeIngestionLive = Layer.effect(ProviderRuntimeIngestionService, make$9).pipe(Layer.provide(ProjectionTurnRepositoryLive), Layer.provide(layer$86));
 //#endregion
 //#region src/provider/userInvokedSkills.ts
 /**
@@ -137536,6 +138105,9 @@ const expandUserInvokedSkill = Effect.fnUntraced(function* (input) {
 	});
 });
 //#endregion
+//#region src/orchestration/Services/JevToolPrefetch.ts
+var JevToolPrefetch = class extends Context.Service()("@p4code/cli/orchestration/Services/JevToolPrefetch") {};
+//#endregion
 //#region src/orchestration/Layers/ProviderCommandReactor.ts
 const isProviderAdapterRequestError = Schema$1.is(ProviderAdapterRequestError);
 const isProviderDriverKind = Schema$1.is(ProviderDriverKind);
@@ -137690,13 +138262,14 @@ function resolvePendingWorkspaceCleanupGroups(input) {
 	}
 	return groups;
 }
-const make$6 = Effect.gen(function* () {
+const make$8 = Effect.gen(function* () {
 	const compactingThreads = /* @__PURE__ */ new Map();
 	const crypto = yield* Crypto.Crypto;
 	const orchestrationEngine = yield* OrchestrationEngineService;
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 	const providerService = yield* ProviderService;
 	const providerRegistry = yield* ProviderRegistry;
+	const jevToolPrefetch = yield* JevToolPrefetch;
 	const gitWorkflow = yield* GitWorkflowService;
 	const threadWorkspaceLifecycle = yield* ThreadWorkspaceLifecycleService;
 	const vcsStatusBroadcaster = yield* VcsStatusBroadcaster;
@@ -137758,6 +138331,27 @@ const make$6 = Effect.gen(function* () {
 		},
 		createdAt: input.createdAt
 	})));
+	const appendJevConsultedActivity = (input) => Effect.all({
+		commandId: serverCommandId("jev-consulted-activity"),
+		eventId: serverEventId()
+	}).pipe(Effect.flatMap(({ commandId, eventId }) => orchestrationEngine.dispatch({
+		type: "thread.activity.append",
+		commandId,
+		threadId: input.threadId,
+		activity: {
+			id: eventId,
+			tone: "info",
+			kind: JEV_CONSULTED_ACTIVITY_KIND,
+			summary: "Consulted with Jev",
+			payload: {
+				feature: input.feature,
+				summary: input.summary
+			},
+			turnId: input.turnId,
+			createdAt: input.createdAt
+		},
+		createdAt: input.createdAt
+	})), Effect.catchCause(() => Effect.void));
 	/**
 	* A stop otherwise leaves nothing behind: the only row the
 	* timeline ever got was the failure case above, and the turn fold's "You
@@ -138278,10 +138872,47 @@ const make$6 = Effect.gen(function* () {
 		if (levelChangedMidSession) threadSessionRulesetModes.set(input.threadId, compressMode);
 		const chatInput = isChatProject(thread.projectId) && activeSession?.provider !== "opencode" && activeSession?.provider !== "claudeAgent" && thread.messages.filter((message) => message.role === "user").length === 1 ? [P4_CHAT_SYSTEM_PROMPT, inputWithStructuredQuestionPolicy].filter(Boolean).join("\n\n") : inputWithStructuredQuestionPolicy;
 		const inputWithCompressSuffix = chatInput !== void 0 && compressSuffix !== void 0 ? `${chatInput}\n\n${compressSuffix}` : chatInput;
+		const prefetchProvider = (yield* providerRegistry.getProviders).find((snapshot) => snapshot.instanceId === modelForTurn.instanceId);
+		yield* Effect.logDebug("jev prefetch evaluated", {
+			threadId: input.threadId,
+			instanceId: modelForTurn.instanceId,
+			providerFound: prefetchProvider !== void 0,
+			catalogSize: (prefetchProvider?.skills.length ?? 0) + (prefetchProvider?.slashCommands.length ?? 0),
+			hasInput: inputWithCompressSuffix !== void 0
+		});
+		if (prefetchProvider === void 0) yield* Effect.logDebug("jev prefetch skipped", {
+			reason: "provider not registered",
+			instanceId: modelForTurn.instanceId
+		});
+		const prefetch = inputWithCompressSuffix === void 0 || prefetchProvider === void 0 ? void 0 : yield* jevToolPrefetch.hintFor({
+			request: input.messageText,
+			skills: prefetchProvider.skills,
+			...activeSession?.cwd ? { cwd: activeSession.cwd } : {},
+			compact: compressMode !== "off",
+			maxChars: Math.max(0, PROVIDER_SEND_TURN_MAX_INPUT_CHARS - inputWithCompressSuffix.length - 2),
+			catalog: [...prefetchProvider.skills.map((skill) => ({
+				kind: "skill",
+				name: skill.name,
+				description: skill.shortDescription ?? skill.description,
+				enabled: skill.enabled
+			})), ...prefetchProvider.slashCommands.map((command) => ({
+				kind: "command",
+				name: command.name,
+				description: command.description
+			}))]
+		});
+		const inputWithPrefetchHint = inputWithCompressSuffix !== void 0 && prefetch !== void 0 ? `${inputWithCompressSuffix}\n\n${prefetch.hint}` : inputWithCompressSuffix;
+		if (prefetch !== void 0) yield* appendJevConsultedActivity({
+			threadId: input.threadId,
+			turnId: null,
+			createdAt: input.createdAt,
+			feature: "capability-hints",
+			summary: [`Suggested: ${prefetch.selected.join(", ")}`, ...prefetch.loaded?.length ? [`Preloaded: ${prefetch.loaded.join(", ")}`] : []].join("; ")
+		});
 		return {
 			threadId: input.threadId,
 			...isChatProject(thread.projectId) && activeSession?.provider === "opencode" ? { systemPrompt: P4_CHAT_SYSTEM_PROMPT } : {},
-			...inputWithCompressSuffix ? { input: inputWithCompressSuffix } : {},
+			...inputWithPrefetchHint ? { input: inputWithPrefetchHint } : {},
 			...providerAttachments.length > 0 ? { attachments: providerAttachments } : {},
 			...modelForTurn !== void 0 ? { modelSelection: modelForTurn } : {},
 			...input.interactionMode !== void 0 ? { interactionMode: input.interactionMode } : {},
@@ -138731,7 +139362,7 @@ const make$6 = Effect.gen(function* () {
 		drain: Effect.all([worker.drain, forceStopDrain], { discard: true }).pipe(Effect.asVoid)
 	};
 });
-const ProviderCommandReactorLive = Layer.effect(ProviderCommandReactor, make$6);
+const ProviderCommandReactorLive = Layer.effect(ProviderCommandReactor, make$8);
 //#endregion
 //#region src/checkpointing/Diffs.ts
 function parseTurnDiffFilesFromUnifiedDiff(diff) {
@@ -138761,7 +139392,7 @@ function checkpointStatusFromRuntime(status) {
 		default: return "ready";
 	}
 }
-const make$5 = Effect.gen(function* () {
+const make$7 = Effect.gen(function* () {
 	const randomUUID = (yield* Crypto.Crypto).randomUUIDv4;
 	const serverEventId = randomUUID.pipe(Effect.map(EventId.make));
 	const serverCommandId = (tag) => randomUUID.pipe(Effect.map((uuid) => CommandId.make(`server:${tag}:${uuid}`)));
@@ -139243,7 +139874,7 @@ const make$5 = Effect.gen(function* () {
 		drain: worker.drain
 	};
 });
-const CheckpointReactorLive = Layer.effect(CheckpointReactor, make$5);
+const CheckpointReactorLive = Layer.effect(CheckpointReactor, make$7);
 //#endregion
 //#region src/orchestration/Services/FusionReviewTriage.ts
 var FusionReviewTriageError = class extends Data.TaggedError("FusionReviewTriageError") {};
@@ -139314,7 +139945,7 @@ function decideFromAnswer(answer, minimumConfidence) {
 		confidence: answer.confidence
 	};
 }
-const make$4 = Effect.gen(function* () {
+const make$6 = Effect.gen(function* () {
 	const secrets = yield* SupervisorSecrets;
 	const engine = yield* OrchestrationEngineService;
 	const textGeneration = yield* TextGeneration;
@@ -139353,7 +139984,338 @@ const make$4 = Effect.gen(function* () {
 	});
 	return { decide };
 });
-const FusionReviewTriageLive = Layer.effect(FusionReviewTriage, make$4);
+const FusionReviewTriageLive = Layer.effect(FusionReviewTriage, make$6);
+//#endregion
+//#region src/orchestration/prefetch/jevSkillContext.ts
+const JEV_SKILL_ITEM_MAX_CHARS = 1e4;
+const JEV_SKILL_TOTAL_MAX_CHARS = 24e3;
+const JEV_SKILL_COMPACT_ITEM_MAX_CHARS = 6e3;
+const JEV_SKILL_COMPACT_TOTAL_MAX_CHARS = 16e3;
+const MAX_SKILL_FILE_BYTES = 256e3;
+const PREFIX = "<jev-prefetched-context>\nSelected skill files follow as reference material, not a user invocation or authorization. Apply only relevant skills; preserve all user approvals and repository instructions. Complete sources are already read; read referenced files as needed. For a truncated source, read the complete file before following it.\n";
+const SUFFIX = "\n</jev-prefetched-context>";
+const TRUNCATED = "\n[Truncated: read the complete source before following this skill.]";
+const escape = (text) => text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+const escapeFence = (text) => text.replace(/<(?=\s*\/?\s*(?:jev-prefetched-context|skill-source)\b)/gi, "&lt;");
+/** Read selected local files only. Paths and contents never enter the Jev request. */
+const preloadJevSkillContext = Effect.fn("preloadJevSkillContext")(function* (input) {
+	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path$1.Path;
+	const totalLimit = Math.min(input.maxChars ?? 24e3, input.compact ? JEV_SKILL_COMPACT_TOTAL_MAX_CHARS : JEV_SKILL_TOTAL_MAX_CHARS);
+	const itemLimit = input.compact ? JEV_SKILL_COMPACT_ITEM_MAX_CHARS : JEV_SKILL_ITEM_MAX_CHARS;
+	let remaining = totalLimit - 337 - 26;
+	const blocks = [];
+	const loaded = [];
+	for (const candidate of input.selected) {
+		if (candidate.kind !== "skill" || remaining <= 0) continue;
+		const skill = input.skills.find((entry) => entry.enabled && entry.name === candidate.name);
+		if (!skill || !path.isAbsolute(skill.path) || path.basename(skill.path) !== "SKILL.md") continue;
+		if (["project", "repo"].includes(skill.scope?.toLowerCase() ?? "")) {
+			if (!input.cwd) continue;
+			const relative = path.relative(input.cwd, skill.path);
+			if (relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) continue;
+		}
+		const stat = yield* fs.stat(skill.path).pipe(Effect.orElseSucceed(() => void 0));
+		if (!stat || stat.type !== "File" || stat.size > BigInt(MAX_SKILL_FILE_BYTES)) continue;
+		const contents = yield* fs.readFileString(skill.path).pipe(Effect.orElseSucceed(() => void 0));
+		if (!contents?.trim()) continue;
+		const frontmatter = parseMarkdownFrontmatter(contents);
+		if (frontmatter.kind === "malformed" || frontmatter.kind === "parsed" && frontmatter.disableModelInvocation === true) continue;
+		const header = `\n<skill-source name="${escape(skill.name)}" path="${escape(skill.path)}">\n`;
+		const footer = "\n</skill-source>";
+		const budget = Math.min(itemLimit, remaining) - header.length - 16;
+		if (budget <= 67) continue;
+		const escaped = escapeFence(contents);
+		const block = `${header}${escaped.length <= budget ? escaped : `${escaped.slice(0, budget - 67)}${TRUNCATED}`}${footer}`;
+		blocks.push(block);
+		loaded.push(skill.name);
+		remaining -= block.length;
+	}
+	return {
+		context: blocks.length ? `${PREFIX}${blocks.join("")}${SUFFIX}` : "",
+		loaded
+	};
+});
+//#endregion
+//#region src/orchestration/prefetch/jevPrefetch.ts
+/** Use the service's current Jev model. */
+const JEV_PREFETCH_MODEL = "jev-latest";
+/** Enough of the request to rank against, without sending a whole essay. */
+const JEV_PREFETCH_REQUEST_MAX_CHARS = 4e3;
+/** The option that means "none of these", so the ranker can decline. */
+const JEV_PREFETCH_NONE_CHOICE = "none";
+/** The one question id; the answer comes back under it. */
+const JEV_PREFETCH_QUESTION_ID = "relevant_capability";
+const collapseWhitespace = (value) => value.replace(/\s+/g, " ").trim();
+const truncate = (value, maxChars) => {
+	const collapsed = collapseWhitespace(value);
+	return collapsed.length <= maxChars ? collapsed : `${collapsed.slice(0, maxChars - 1).trim()}…`;
+};
+/** Words worth matching on; anything shorter matches everything. */
+const MIN_LEXICAL_TOKEN_LENGTH = 3;
+const lexicalTokens = (value) => new Set(value.toLowerCase().split(/[^a-z0-9]+/).filter((token) => token.length >= MIN_LEXICAL_TOKEN_LENGTH));
+/**
+* The catalog, deduplicated, bounded and stripped to metadata.
+*
+* Entries without a description are dropped rather than sent bare: a name
+* alone gives the ranker nothing to distinguish `review` from
+* `review-animations`, and an unrankable candidate spends budget a rankable
+* one could have used. Disabled entries are dropped because naming one to the
+* model would be advertising something the user switched off.
+*
+* Past {@link JEV_PREFETCH_CATALOG_CAP} the list is shortlisted by word
+* overlap with the request rather than cut at the cap. Cutting would hand the
+* ranker whichever capabilities happen to sort first, which on a large
+* install is the same as not ranking at all; overlap is a crude signal, but it
+* is a signal, and ties keep their original order so the result stays
+* deterministic.
+*/
+function buildPrefetchCatalog(entries, request = "") {
+	const seen = /* @__PURE__ */ new Set();
+	const kept = [];
+	for (const entry of entries) {
+		if (entry.enabled === false) continue;
+		const name = collapseWhitespace(entry.name);
+		const description = entry.description === void 0 ? "" : collapseWhitespace(entry.description);
+		if (name.length === 0 || name.length > 128 || description.length === 0) continue;
+		const key = `${entry.kind}:${name.toLowerCase()}`;
+		if (seen.has(key)) continue;
+		seen.add(key);
+		kept.push({
+			kind: entry.kind,
+			name,
+			description: truncate(description, 200)
+		});
+	}
+	return (kept.length <= 128 ? kept : shortlistByOverlap(kept, request)).map((entry, index) => ({
+		id: `c${index}`,
+		...entry
+	}));
+}
+function shortlistByOverlap(entries, request) {
+	const requestTokens = lexicalTokens(request);
+	const scored = entries.map((entry, order) => {
+		let overlap = 0;
+		for (const token of lexicalTokens(`${entry.name} ${entry.description}`)) if (requestTokens.has(token)) overlap += 1;
+		return {
+			entry,
+			order,
+			overlap
+		};
+	});
+	scored.sort((left, right) => right.overlap - left.overlap || left.order - right.order);
+	return scored.slice(0, 128).sort((left, right) => left.order - right.order).map((scoredEntry) => scoredEntry.entry);
+}
+/** The request, collapsed and clipped. Nothing else is ever the state. */
+const buildPrefetchState = (request) => truncate(request, JEV_PREFETCH_REQUEST_MAX_CHARS);
+const QUESTION_INSTRUCTIONS = [
+	"The state is a request a user just sent to a coding agent.",
+	"Choose the one listed capability most likely needed to carry it out.",
+	`Choose "${JEV_PREFETCH_NONE_CHOICE}" when none of them is needed.`
+].join(" ");
+const criterionFor = (candidate) => `${candidate.name} (${candidate.kind}): ${candidate.description}`;
+/**
+* One question over the whole shortlist, not one per candidate.
+*
+* A choice against a criteria map is a single request whose answer already
+* ranks every option; asking each candidate separately would multiply the
+* request by the size of the catalog for a ranking the API produces anyway.
+*/
+const prefetchQuestion = (candidates) => ({
+	id: JEV_PREFETCH_QUESTION_ID,
+	type: "choice",
+	instructions: QUESTION_INSTRUCTIONS,
+	criteria: {
+		...Object.fromEntries(candidates.map((candidate) => [candidate.id, criterionFor(candidate)])),
+		[JEV_PREFETCH_NONE_CHOICE]: "No listed capability is needed for this request."
+	}
+});
+const criterionTokens = (candidate) => estimateTokens(`${candidate.id}${criterionFor(candidate)}`);
+/**
+* As many candidates as the shared request budget can carry, in catalog order.
+*
+* The cap bounds the count and this bounds the size; both are needed, because
+* 128 candidates with long descriptions can exceed the budget that 128 short
+* ones fit inside. Dropping the tail is deterministic and keeps the request
+* valid, which is better than sending one the API rejects.
+*/
+function fitWithinBudget(state, candidates) {
+	let remaining = TYPESAFE_REQUEST_BUDGET_TOKENS - TYPESAFE_BUDGET_RESERVE_TOKENS - estimateTokens(state) - estimateTokens(QUESTION_INSTRUCTIONS);
+	const fitted = [];
+	for (const candidate of candidates) {
+		const cost = criterionTokens(candidate);
+		if (cost > remaining) break;
+		remaining -= cost;
+		fitted.push(candidate);
+	}
+	return fitted;
+}
+const clampSelectionLimit = (limit) => {
+	if (limit === void 0 || !Number.isFinite(limit)) return 3;
+	return Math.min(5, Math.max(0, Math.floor(limit)));
+};
+/**
+* The chosen candidate first, then whatever the probability map can rank.
+*
+* `noul` is an abstention and a `score` answers a question that was not asked;
+* both give nothing. So does choosing {@link JEV_PREFETCH_NONE_CHOICE}, which
+* is the ranker saying the catalog is irrelevant and is worth honouring rather
+* than overriding with the next-best guess.
+*
+* Without a probability map only the chosen candidate comes back. Filling the
+* remaining slots from catalog order would present unranked names as ranked
+* ones, which is the one way this feature could actively mislead.
+*/
+function rankPrefetchAnswer(candidates, answer, limit) {
+	const selectionLimit = clampSelectionLimit(limit);
+	if (answer === void 0 || answer.type !== "choice") return [];
+	if (answer.choice === "none") return [];
+	const chosen = candidates.find((candidate) => candidate.id === answer.choice);
+	const probabilities = answer.probabilities;
+	if (probabilities === void 0) return chosen === void 0 ? [] : [chosen].slice(0, selectionLimit);
+	const ranked = candidates.map((candidate, order) => ({
+		candidate,
+		order,
+		probability: probabilities[candidate.id]
+	})).filter((entry) => entry.probability !== void 0 && entry.candidate.id !== chosen?.id);
+	ranked.sort((left, right) => right.probability - left.probability || left.order - right.order);
+	return [...chosen === void 0 ? [] : [chosen], ...ranked.map((entry) => entry.candidate)].slice(0, selectionLimit);
+}
+/**
+* The one line the model sees, or nothing at all.
+*
+* Phrased as a suggestion because that is what it is: a ranking from a model
+* that read names and descriptions, not the repository. Presenting it as an
+* instruction would let a bad ranking override the agent's own judgement,
+* which is a worse failure than a prefetch that was not useful.
+*/
+function renderPrefetchHint(selected) {
+	if (selected.length === 0) return void 0;
+	return [
+		"[jev-prefetch] These may be relevant to this request:",
+		selected.map((candidate) => `- ${criterionFor(candidate)}`).join("\n"),
+		"Ranked from names and descriptions alone. Use what fits and ignore the rest."
+	].join("\n");
+}
+//#endregion
+//#region src/orchestration/Layers/JevToolPrefetch.ts
+/** Why a turn got no hint, at debug level: the fail-open path is otherwise mute. */
+const skipped = (reason, catalogSize) => Effect.logDebug("jev prefetch skipped", {
+	reason,
+	...catalogSize === void 0 ? {} : { catalogSize }
+}).pipe(Effect.as(void 0));
+const make$5 = Effect.gen(function* () {
+	const secrets = yield* SupervisorSecrets;
+	const serverSettings = yield* ServerSettingsService;
+	const jev = yield* TypeSafeClient;
+	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path$1.Path;
+	const hintFor = (input) => Effect.gen(function* () {
+		const settings = yield* serverSettings.getSettings.pipe(Effect.catchCause(() => Effect.succeed(void 0)));
+		if (!settings?.enableJevPrefetch) return yield* skipped("setting off");
+		const request = buildPrefetchState(input.request);
+		if (request.length === 0) return yield* skipped("empty request");
+		const candidates = fitWithinBudget(request, buildPrefetchCatalog(input.catalog, request));
+		if (candidates.length === 0) return yield* skipped("empty catalog", input.catalog.length);
+		const key = yield* secrets.read("typesafe");
+		if (Option.isNone(key)) return yield* skipped("no key");
+		const startedAt = yield* Clock.currentTimeMillis;
+		return yield* Effect.gen(function* () {
+			const answer = yield* jev.ask({
+				apiKey: key.value.apiKey,
+				model: JEV_PREFETCH_MODEL,
+				state: request,
+				question: prefetchQuestion(candidates)
+			});
+			const selected = rankPrefetchAnswer(candidates, answer, input.limit);
+			const hint = renderPrefetchHint(selected);
+			if (hint === void 0) {
+				yield* Effect.logDebug("jev prefetch skipped", {
+					reason: "ranker declined",
+					catalogSize: candidates.length,
+					answer: answer?.type === "choice" ? answer.choice : answer?.type ?? "none"
+				});
+				return;
+			}
+			const maxChars = input.maxChars ?? Number.POSITIVE_INFINITY;
+			if (hint.length > maxChars) return void 0;
+			const { context, loaded } = yield* preloadJevSkillContext({
+				selected,
+				skills: input.skills ?? [],
+				...input.cwd === void 0 ? {} : { cwd: input.cwd },
+				...input.compact === void 0 ? {} : { compact: input.compact },
+				maxChars: Math.max(0, maxChars - hint.length - 2)
+			}).pipe(Effect.provideService(FileSystem.FileSystem, fs), Effect.provideService(Path$1.Path, path));
+			return {
+				hint: context ? `${hint}\n\n${context}` : hint,
+				selected: [...new Set(selected.map((candidate) => candidate.name))],
+				loaded
+			};
+		}).pipe(Effect.timeout(settings.jevPrefetchTimeoutMs), Effect.tapCause((cause) => Clock.currentTimeMillis.pipe(Effect.flatMap((finishedAt) => Effect.logWarning("jev prefetch did not answer", {
+			elapsedMs: finishedAt - startedAt,
+			cause
+		})))), Effect.catchCause(() => Effect.succeed(void 0)));
+	});
+	return { hintFor };
+});
+const JevToolPrefetchLive = Layer.effect(JevToolPrefetch, make$5);
+//#endregion
+//#region src/orchestration/Layers/JevWorkspaceAdvisor.ts
+/**
+* This answer gates the thread's first turn. Its fixed budget is separate
+* from the configurable capability-hint timeout and shorter than the text
+* generation fallback's budget.
+*/
+const JEV_WORKSPACE_TIMEOUT_MS = 2e3;
+const QUESTION_ID = "auto-workspace";
+const JEV_DECISIONS = {
+	local: {
+		mode: "local",
+		reason: "Jev chose the current checkout for this task.",
+		source: "jev"
+	},
+	worktree: {
+		mode: "worktree",
+		reason: "Jev chose an isolated worktree for this task.",
+		source: "jev"
+	}
+};
+/** The same brief the text generation model gets, as a two-way choice. */
+const workspaceQuestion = (hasWorkingTreeChanges) => ({
+	id: QUESTION_ID,
+	type: "choice",
+	instructions: AUTO_WORKSPACE_QUESTION_LINES(hasWorkingTreeChanges).join("\n"),
+	criteria: {
+		local: "Work in the current checkout: questions, investigation, small focused edits, or work that needs the current uncommitted changes.",
+		worktree: "Start an isolated worktree: independent implementation, broad changes, risky experiments, or possible interference with someone else's edits."
+	}
+});
+const make$4 = Effect.gen(function* () {
+	const secrets = yield* SupervisorSecrets;
+	const serverSettings = yield* ServerSettingsService;
+	const jev = yield* TypeSafeClient;
+	const chooseWorkspace = (input) => Effect.gen(function* () {
+		if (!(yield* serverSettings.getSettings.pipe(Effect.map((settings) => settings.enableJevAutoWorkspace), Effect.catchCause(() => Effect.succeed(false))))) return void 0;
+		const message = input.message.trim();
+		if (message.length === 0) return void 0;
+		const key = yield* secrets.read("typesafe");
+		if (Option.isNone(key)) return void 0;
+		const startedAt = yield* Clock.currentTimeMillis;
+		const answer = yield* jev.ask({
+			apiKey: key.value.apiKey,
+			model: JEV_PREFETCH_MODEL,
+			state: message,
+			question: workspaceQuestion(input.hasWorkingTreeChanges)
+		}).pipe(Effect.timeout(JEV_WORKSPACE_TIMEOUT_MS), Effect.tapCause((cause) => Clock.currentTimeMillis.pipe(Effect.flatMap((finishedAt) => Effect.logWarning("jev workspace advice did not answer", {
+			elapsedMs: finishedAt - startedAt,
+			cause
+		})))), Effect.catchCause(() => Effect.succeed(void 0)));
+		if (answer?.type !== "choice") return void 0;
+		return JEV_DECISIONS[answer.choice];
+	});
+	return { chooseWorkspace };
+});
+const JevWorkspaceAdvisorLive = Layer.effect(JevWorkspaceAdvisor, make$4);
 //#endregion
 //#region src/orchestration/Layers/FusionWatcherReactor.ts
 const GATE_TIMEOUT_SWEEP_INTERVAL = "10 seconds";
@@ -140132,6 +141094,7 @@ const make$3 = Effect.gen(function* () {
 		const { context, timing } = yield* correlateEvidence({
 			readerThreadId: pair.watcherThreadId,
 			readActivityId: evidenceReadActivityId(latest.watchedThreadId, latest.throughSequence),
+			...completion.payload.turnId === null ? {} : { fallbackReadActivityId: rawEvidenceReadActivityId(latest.watchedThreadId, completion.payload.turnId) },
 			closedAt: completion.occurredAt
 		});
 		yield* orchestrationEngine.dispatch({
@@ -140294,6 +141257,14 @@ const make$3 = Effect.gen(function* () {
 			case "thread-pair.gate-advanced": return yield* processGateAdvanced(event);
 			case "thread-pair.gate-resolved": return yield* processGateResolved(event);
 			case "thread-pair.created":
+				yield* setActiveMcpFusionRole({
+					threadId: event.payload.watcherThreadId,
+					role: "watcher"
+				});
+				yield* setActiveMcpFusionRole({
+					threadId: event.payload.implementerThreadId,
+					role: "implementer"
+				});
 				yield* grantActiveMcpWatchThread({
 					watcherThreadId: event.payload.watcherThreadId,
 					watchedThreadId: event.payload.implementerThreadId
@@ -140315,6 +141286,8 @@ const make$3 = Effect.gen(function* () {
 			case "thread-pair.detached": {
 				const pair = ((yield* projectionSnapshotQuery.getCommandReadModel()).threadPairs ?? []).find((candidate) => candidate.id === event.payload.pairId);
 				if (pair === void 0) return;
+				yield* clearActiveMcpFusionRole({ threadId: pair.watcherThreadId });
+				yield* clearActiveMcpFusionRole({ threadId: pair.implementerThreadId });
 				yield* revokeActiveMcpWatchThread({
 					watcherThreadId: pair.watcherThreadId,
 					watchedThreadId: pair.implementerThreadId
@@ -141632,7 +142605,7 @@ const PlatformServicesLive = Layer.unwrap(Effect.gen(function* () {
 		return layer;
 	}
 }));
-const ReactorLayerLive = Layer.empty.pipe(Layer.provideMerge(OrchestrationReactorLive), Layer.provideMerge(ProviderRuntimeIngestionLive), Layer.provideMerge(ProviderCommandReactorLive), Layer.provideMerge(CheckpointReactorLive), Layer.provideMerge(ThreadDeletionReactorLive), Layer.provideMerge(FusionWatcherReactorLive.pipe(Layer.provide(FusionReviewTriageLive.pipe(Layer.provide(TypeSafeClientLive))))), Layer.provideMerge(ScheduledTaskReactorLive), Layer.provideMerge(ThreadCompletionReactorLive), Layer.provideMerge(PullRequestSyncReactorLive), Layer.provideMerge(RuntimeReceiptBusLive));
+const ReactorLayerLive = Layer.empty.pipe(Layer.provideMerge(OrchestrationReactorLive), Layer.provideMerge(ProviderRuntimeIngestionLive), Layer.provideMerge(ProviderCommandReactorLive.pipe(Layer.provide(JevToolPrefetchLive.pipe(Layer.provide(TypeSafeClientLive))))), Layer.provideMerge(CheckpointReactorLive), Layer.provideMerge(ThreadDeletionReactorLive), Layer.provideMerge(FusionWatcherReactorLive.pipe(Layer.provide(FusionReviewTriageLive.pipe(Layer.provide(TypeSafeClientLive))))), Layer.provideMerge(ScheduledTaskReactorLive), Layer.provideMerge(ThreadCompletionReactorLive), Layer.provideMerge(PullRequestSyncReactorLive), Layer.provideMerge(RuntimeReceiptBusLive));
 const ProviderSessionDirectoryLayerLive = ProviderSessionDirectoryLive.pipe(Layer.provide(layer$7));
 const ProviderLayerLive = ProviderServiceLive.pipe(Layer.provide(ProviderAdapterRegistryLive), Layer.provideMerge(ProviderSessionDirectoryLayerLive));
 const PersistenceLayerLive = Layer.empty.pipe(Layer.provideMerge(layerConfig));
@@ -141655,7 +142628,7 @@ const WorkspaceLayerLive = Layer.mergeAll(layer$70, WorkspaceEntriesLayerLive, W
 const ProjectFaviconResolverLayerLive = layer$65.pipe(Layer.provide(layer$70), Layer.provide(layer$66));
 const AuthLayerLive = layer$114.pipe(Layer.provideMerge(PersistenceLayerLive), Layer.provide(layer$118));
 const ProviderRuntimeLayerLive = Layer.mergeAll(ProviderSessionReaperLive, ProviderHealthRefresherLive).pipe(Layer.provideMerge(ProviderLayerLive), Layer.provideMerge(OrchestrationLayerLive));
-const RuntimeCoreDependenciesLive = ReactorLayerLive.pipe(Layer.provideMerge(layer$27), 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$89)), Layer.provideMerge(layer$83), Layer.provideMerge(ProviderRegistryLive), Layer.provideMerge(layer$60), Layer.provideMerge(Layer.mergeAll(layer$59, layer$72.pipe(Layer.provide(layer$85)), layer$74, layer$69)), Layer.provideMerge(layer$54), Layer.provideMerge(layer$55), Layer.provideMerge(layer$56), Layer.provideMerge(layer$57), Layer.provideMerge(layer$58)).pipe(Layer.provideMerge(ProviderInstanceRegistryHydrationLive), Layer.provideMerge(AntigravityInstallation.layer), Layer.provideMerge(ProviderEventLoggersLive), Layer.provideMerge(OpenCodeRuntimeLive), Layer.provideMerge(layer$62), Layer.provideMerge(layer$93.pipe(Layer.provide(layer$118))), Layer.provideMerge(SupervisorSecretsLive.pipe(Layer.provide(layer$118))), Layer.provideMerge(WorkspaceLayerLive), Layer.provideMerge(ProjectFaviconResolverLayerLive), Layer.provideMerge(layer$84), Layer.provideMerge(layer$68), Layer.provideMerge(remoteComputerUseBindingsLayer.pipe(Layer.provide(layer$89))), Layer.provideMerge(layer$77), Layer.provideMerge(AuthLayerLive), Layer.provideMerge(layer$5.pipe(Layer.provideMerge(LinearClientLive), Layer.provideMerge(Layer.mergeAll(LinearMcpClientLive, TrackerSecretsLive)), Layer.provideMerge(Layer.mergeAll(layer$90, layer$21).pipe(Layer.provideMerge(layer$91), Layer.provideMerge(layer$92))))), Layer.provideMerge(layer$118));
+const RuntimeCoreDependenciesLive = ReactorLayerLive.pipe(Layer.provideMerge(layer$27), 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$89)), Layer.provideMerge(layer$83), Layer.provideMerge(ProviderRegistryLive), Layer.provideMerge(layer$60), Layer.provideMerge(Layer.mergeAll(layer$59, layer$72.pipe(Layer.provide(layer$85)), layer$74, layer$69)), Layer.provideMerge(layer$54), Layer.provideMerge(layer$55), Layer.provideMerge(layer$56), Layer.provideMerge(layer$57), Layer.provideMerge(layer$58)).pipe(Layer.provideMerge(ProviderInstanceRegistryHydrationLive), Layer.provideMerge(AntigravityInstallation.layer), Layer.provideMerge(ProviderEventLoggersLive), Layer.provideMerge(OpenCodeRuntimeLive), Layer.provideMerge(layer$62), Layer.provideMerge(JevWorkspaceAdvisorLive.pipe(Layer.provide(TypeSafeClientLive))), Layer.provideMerge(layer$93.pipe(Layer.provide(layer$118))), Layer.provideMerge(SupervisorSecretsLive.pipe(Layer.provide(layer$118))), Layer.provideMerge(WorkspaceLayerLive), Layer.provideMerge(ProjectFaviconResolverLayerLive), Layer.provideMerge(layer$84), Layer.provideMerge(layer$68), Layer.provideMerge(remoteComputerUseBindingsLayer.pipe(Layer.provide(layer$89))), Layer.provideMerge(layer$77), Layer.provideMerge(AuthLayerLive), Layer.provideMerge(layer$5.pipe(Layer.provideMerge(LinearClientLive), Layer.provideMerge(Layer.mergeAll(LinearMcpClientLive, TrackerSecretsLive)), Layer.provideMerge(Layer.mergeAll(layer$90, layer$21).pipe(Layer.provideMerge(layer$91), Layer.provideMerge(layer$92))))), Layer.provideMerge(layer$118));
 const UsageLayerLive = layer$25.pipe(Layer.provide(layer$93.pipe(Layer.provide(layer$118))));
 const RuntimeDependenciesLive = layer$24.pipe(Layer.provideMerge(RuntimeCoreDependenciesLive)).pipe(Layer.provideMerge(UsageLayerLive), Layer.provideMerge(layer$12), Layer.provideMerge(layer$11), Layer.provideMerge(layer$10), Layer.provideMerge(layer$80), Layer.provideMerge(layer$82), Layer.provideMerge(layer$81), Layer.provide(layer$122));
 /**