@p4code/cli 0.2.6 → 0.2.8

package/dist/bin.mjs

@@ -125,7 +125,7 @@ const closeServer = (server) => {
 * NetService - Service tag for startup networking helpers.
 */
 var NetService = class extends Context.Service()("@p4code/shared/Net/NetService") {};
-const make$87 = () => {
+const make$88 = () => {
 	/**
 	* Returns true when a TCP server can bind to {host, port}.
 	* `EADDRNOTAVAIL` is treated as available so IPv6-absent hosts don't fail
@@ -234,10 +234,10 @@ const make$87 = () => {
 		})
 	};
 };
-const layer$79 = Layer.sync(NetService, make$87);
+const layer$79 = Layer.sync(NetService, make$88);
 //#endregion
 //#region package.json
-var version = "0.2.6";
+var version = "0.2.8";
 //#endregion
 //#region src/config.ts
 /**
@@ -258,8 +258,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$3(cwd, baseDirOrPrefix);
 };
-const make$86 = (config) => ServerConfig$1.of(config);
-const layer$78 = (config) => Layer.succeed(ServerConfig$1, make$86(config));
+const make$87 = (config) => ServerConfig$1.of(config);
+const layer$78 = (config) => Layer.succeed(ServerConfig$1, make$87(config));
 const deriveServerPaths = Effect.fn(function* (baseDir, devUrl, options = {}) {
 	const { join } = yield* Path.Path;
 	const stateDir = join(baseDir, devUrl !== void 0 && !options.baseDirIsExplicit ? "dev" : "userdata");
@@ -1005,6 +1005,7 @@ const makeEntityId = (brand) => {
 	return TrimmedNonEmptyString.pipe(Schema$1.brand(brand));
 };
 const ThreadId = makeEntityId("ThreadId");
+const ThreadPairId = makeEntityId("ThreadPairId");
 const ProjectId = makeEntityId("ProjectId");
 /**
 * Identifies a task on the agent task board. Unrelated to {@link RuntimeTaskId},
@@ -1830,6 +1831,8 @@ const OrchestrationMessage = Schema$1.Struct({
 	createdAt: IsoDateTime,
 	updatedAt: IsoDateTime
 });
+const FUSION_REVIEW_PROMPT_PREFIX = "[fusion-review]";
+const FUSION_NO_OBJECTION_TEXT = "[fusion-no-objection]";
 const OrchestrationProposedPlanId = TrimmedNonEmptyString;
 const OrchestrationProposedPlan = Schema$1.Struct({
 	id: OrchestrationProposedPlanId,
@@ -1914,6 +1917,12 @@ const OrchestrationLatestTurn = Schema$1.Struct({
 	assistantMessageId: Schema$1.NullOr(MessageId),
 	sourceProposedPlan: Schema$1.optional(SourceProposedPlanReference)
 });
+const OrchestrationTurnSummary = Schema$1.Struct({
+	turnId: TurnId,
+	state: OrchestrationLatestTurnState,
+	startedAt: Schema$1.NullOr(IsoDateTime),
+	completedAt: Schema$1.NullOr(IsoDateTime)
+});
 const OrchestrationThread = Schema$1.Struct({
 	id: ThreadId,
 	projectId: ProjectId,
@@ -1926,6 +1935,7 @@ const OrchestrationThread = Schema$1.Struct({
 	branch: Schema$1.NullOr(TrimmedNonEmptyString),
 	worktreePath: Schema$1.NullOr(TrimmedNonEmptyString),
 	latestTurn: Schema$1.NullOr(OrchestrationLatestTurn),
+	turns: Schema$1.optional(Schema$1.Array(OrchestrationTurnSummary)),
 	createdAt: IsoDateTime,
 	updatedAt: IsoDateTime,
 	archivedAt: Schema$1.NullOr(IsoDateTime).pipe(Schema$1.withDecodingDefault(Effect.succeed(null))),
@@ -1940,10 +1950,20 @@ const OrchestrationThread = Schema$1.Struct({
 	checkpoints: Schema$1.Array(OrchestrationCheckpointSummary),
 	session: Schema$1.NullOr(OrchestrationSession)
 });
+/** Persisted relationship between two otherwise ordinary threads. */
+const OrchestrationThreadPair = Schema$1.Struct({
+	id: ThreadPairId,
+	implementerThreadId: ThreadId,
+	watcherThreadId: ThreadId,
+	lastReviewedImplementerSequence: NonNegativeInt,
+	createdAt: IsoDateTime,
+	detachedAt: Schema$1.NullOr(IsoDateTime)
+});
 const OrchestrationReadModel = Schema$1.Struct({
 	snapshotSequence: NonNegativeInt,
 	projects: Schema$1.Array(OrchestrationProject),
 	threads: Schema$1.Array(OrchestrationThread),
+	threadPairs: Schema$1.optional(Schema$1.Array(OrchestrationThreadPair)),
 	updatedAt: IsoDateTime
 });
 const OrchestrationProjectShell = Schema$1.Struct({
@@ -1987,6 +2007,7 @@ const OrchestrationShellSnapshot = Schema$1.Struct({
 	snapshotSequence: NonNegativeInt,
 	projects: Schema$1.Array(OrchestrationProjectShell),
 	threads: Schema$1.Array(OrchestrationThreadShell),
+	threadPairs: Schema$1.optional(Schema$1.Array(OrchestrationThreadPair)),
 	updatedAt: IsoDateTime
 });
 const OrchestrationShellStreamEvent = Schema$1.Union([
@@ -2009,6 +2030,16 @@ const OrchestrationShellStreamEvent = Schema$1.Union([
 		kind: Schema$1.Literal("thread-removed"),
 		sequence: NonNegativeInt,
 		threadId: ThreadId
+	}),
+	Schema$1.Struct({
+		kind: Schema$1.Literal("thread-pair-upserted"),
+		sequence: NonNegativeInt,
+		pair: OrchestrationThreadPair
+	}),
+	Schema$1.Struct({
+		kind: Schema$1.Literal("thread-pair-removed"),
+		sequence: NonNegativeInt,
+		pairId: ThreadPairId
 	})
 ]);
 const OrchestrationShellStreamItem = Schema$1.Union([
@@ -2275,6 +2306,20 @@ const ThreadSessionStopCommand = Schema$1.Struct({
 	threadId: ThreadId,
 	createdAt: IsoDateTime
 });
+const ThreadPairCreateCommand = Schema$1.Struct({
+	type: Schema$1.Literal("thread-pair.create"),
+	commandId: CommandId,
+	pairId: ThreadPairId,
+	implementerThreadId: ThreadId,
+	watcherThreadId: ThreadId,
+	createdAt: IsoDateTime
+});
+const ThreadPairDetachCommand = Schema$1.Struct({
+	type: Schema$1.Literal("thread-pair.detach"),
+	commandId: CommandId,
+	pairId: ThreadPairId,
+	createdAt: IsoDateTime
+});
 const DispatchableClientOrchestrationCommand = Schema$1.Union([
 	ProjectCreateCommand,
 	ProjectMetaUpdateCommand,
@@ -2297,7 +2342,9 @@ const DispatchableClientOrchestrationCommand = Schema$1.Union([
 	ThreadApprovalRespondCommand,
 	ThreadUserInputRespondCommand,
 	ThreadCheckpointRevertCommand,
-	ThreadSessionStopCommand
+	ThreadSessionStopCommand,
+	ThreadPairCreateCommand,
+	ThreadPairDetachCommand
 ]);
 const ClientOrchestrationCommand = Schema$1.Union([
 	ProjectCreateCommand,
@@ -2321,7 +2368,9 @@ const ClientOrchestrationCommand = Schema$1.Union([
 	ThreadApprovalRespondCommand,
 	ThreadUserInputRespondCommand,
 	ThreadCheckpointRevertCommand,
-	ThreadSessionStopCommand
+	ThreadSessionStopCommand,
+	ThreadPairCreateCommand,
+	ThreadPairDetachCommand
 ]);
 const ThreadSessionSetCommand = Schema$1.Struct({
 	type: Schema$1.Literal("thread.session.set"),
@@ -2330,6 +2379,26 @@ const ThreadSessionSetCommand = Schema$1.Struct({
 	session: OrchestrationSession,
 	createdAt: IsoDateTime
 });
+const ThreadTurnCompleteCommand = Schema$1.Struct({
+	type: Schema$1.Literal("thread.turn.complete"),
+	commandId: CommandId,
+	threadId: ThreadId,
+	turnId: Schema$1.optional(TurnId),
+	state: Schema$1.Literals([
+		"completed",
+		"failed",
+		"interrupted",
+		"cancelled"
+	]),
+	completedAt: IsoDateTime
+});
+const ThreadPairCursorAdvanceCommand = Schema$1.Struct({
+	type: Schema$1.Literal("thread-pair.cursor.advance"),
+	commandId: CommandId,
+	pairId: ThreadPairId,
+	implementerSequence: NonNegativeInt,
+	advancedAt: IsoDateTime
+});
 const ThreadMessageAssistantDeltaCommand = Schema$1.Struct({
 	type: Schema$1.Literal("thread.message.assistant.delta"),
 	commandId: CommandId,
@@ -2383,6 +2452,8 @@ const ThreadRevertCompleteCommand = Schema$1.Struct({
 });
 const InternalOrchestrationCommand = Schema$1.Union([
 	ThreadSessionSetCommand,
+	ThreadTurnCompleteCommand,
+	ThreadPairCursorAdvanceCommand,
 	ThreadMessageAssistantDeltaCommand,
 	ThreadMessageAssistantCompleteCommand,
 	ThreadProposedPlanUpsertCommand,
@@ -2419,9 +2490,17 @@ const OrchestrationEventType = Schema$1.Literals([
 	"thread.session-set",
 	"thread.proposed-plan-upserted",
 	"thread.turn-diff-completed",
-	"thread.activity-appended"
+	"thread.activity-appended",
+	"thread.turn-completed",
+	"thread-pair.created",
+	"thread-pair.detached",
+	"thread-pair.cursor-advanced"
+]);
+const OrchestrationAggregateKind = Schema$1.Literals([
+	"project",
+	"thread",
+	"thread-pair"
 ]);
-const OrchestrationAggregateKind = Schema$1.Literals(["project", "thread"]);
 const OrchestrationActorKind = Schema$1.Literals([
 	"client",
 	"server",
@@ -2588,6 +2667,33 @@ const ThreadSessionSetPayload$1 = Schema$1.Struct({
 	threadId: ThreadId,
 	session: OrchestrationSession
 });
+const ThreadTurnCompletedPayload = Schema$1.Struct({
+	threadId: ThreadId,
+	turnId: Schema$1.NullOr(TurnId),
+	state: Schema$1.Literals([
+		"completed",
+		"failed",
+		"interrupted",
+		"cancelled"
+	]),
+	completedAt: IsoDateTime
+});
+const ThreadPairCreatedPayload$1 = Schema$1.Struct({
+	pairId: ThreadPairId,
+	implementerThreadId: ThreadId,
+	watcherThreadId: ThreadId,
+	lastReviewedImplementerSequence: NonNegativeInt,
+	createdAt: IsoDateTime
+});
+const ThreadPairDetachedPayload$1 = Schema$1.Struct({
+	pairId: ThreadPairId,
+	detachedAt: IsoDateTime
+});
+const ThreadPairCursorAdvancedPayload$1 = Schema$1.Struct({
+	pairId: ThreadPairId,
+	implementerSequence: NonNegativeInt,
+	advancedAt: IsoDateTime
+});
 const ThreadProposedPlanUpsertedPayload$1 = Schema$1.Struct({
 	threadId: ThreadId,
 	proposedPlan: OrchestrationProposedPlan
@@ -2617,7 +2723,11 @@ const EventBaseFields = {
 	sequence: NonNegativeInt,
 	eventId: EventId,
 	aggregateKind: OrchestrationAggregateKind,
-	aggregateId: Schema$1.Union([ProjectId, ThreadId]),
+	aggregateId: Schema$1.Union([
+		ProjectId,
+		ThreadId,
+		ThreadPairId
+	]),
 	occurredAt: IsoDateTime,
 	commandId: Schema$1.NullOr(CommandId),
 	causationEventId: Schema$1.NullOr(EventId),
@@ -2764,6 +2874,26 @@ const OrchestrationEvent = Schema$1.Union([
 		...EventBaseFields,
 		type: Schema$1.Literal("thread.activity-appended"),
 		payload: ThreadActivityAppendedPayload$1
+	}),
+	Schema$1.Struct({
+		...EventBaseFields,
+		type: Schema$1.Literal("thread.turn-completed"),
+		payload: ThreadTurnCompletedPayload
+	}),
+	Schema$1.Struct({
+		...EventBaseFields,
+		type: Schema$1.Literal("thread-pair.created"),
+		payload: ThreadPairCreatedPayload$1
+	}),
+	Schema$1.Struct({
+		...EventBaseFields,
+		type: Schema$1.Literal("thread-pair.detached"),
+		payload: ThreadPairDetachedPayload$1
+	}),
+	Schema$1.Struct({
+		...EventBaseFields,
+		type: Schema$1.Literal("thread-pair.cursor-advanced"),
+		payload: ThreadPairCursorAdvancedPayload$1
 	})
 ]);
 const OrchestrationThreadStreamItem = Schema$1.Union([
@@ -11558,7 +11688,7 @@ function deriveAuthClientMetadata(input) {
 //#endregion
 //#region src/auth/EnvironmentAuthPolicy.ts
 var EnvironmentAuthPolicy = class extends Context.Service()("@p4code/cli/auth/EnvironmentAuthPolicy") {};
-const make$85 = Effect.gen(function* () {
+const make$86 = 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";
@@ -11576,7 +11706,7 @@ const make$85 = Effect.gen(function* () {
 	};
 	return EnvironmentAuthPolicy.of({ getDescriptor: () => Effect.succeed(descriptor).pipe(Effect.withSpan("EnvironmentAuthPolicy.getDescriptor")) });
 });
-const layer$77 = Layer.effect(EnvironmentAuthPolicy, make$85);
+const layer$77 = Layer.effect(EnvironmentAuthPolicy, make$86);
 //#endregion
 //#region src/persistence/Errors.ts
 function summarizeSchemaIssue(issue) {
@@ -11757,7 +11887,7 @@ function toPersistenceSqlOrDecodeError$6(sqlOperation, decodeOperation, correlat
 		cause
 	});
 }
-const make$84 = Effect.gen(function* () {
+const make$85 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const createSessionRow = SqlSchema.void({
 		Request: CreateAuthSessionInput,
@@ -11891,7 +12021,7 @@ const make$84 = Effect.gen(function* () {
 		setLastConnectedAt
 	};
 });
-const layer$76 = Layer.effect(AuthSessionRepository, make$84);
+const layer$76 = Layer.effect(AuthSessionRepository, make$85);
 //#endregion
 //#region src/auth/ServerSecretStore.ts
 const secretStoreErrorContext = {
@@ -11958,7 +12088,7 @@ const isSecretStoreError = Schema$1.is(SecretStoreError);
 const isPlatformError = (value) => Predicate.isTagged(value, "PlatformError");
 const isSecretAlreadyExistsError = (error) => "cause" in error && isPlatformError(error.cause) && error.cause.reason._tag === "AlreadyExists";
 var ServerSecretStore = class extends Context.Service()("@p4code/cli/auth/ServerSecretStore") {};
-const make$83 = Effect.gen(function* () {
+const make$84 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
@@ -12028,7 +12158,7 @@ const make$83 = Effect.gen(function* () {
 		remove
 	});
 });
-const layer$75 = Layer.effect(ServerSecretStore, make$83);
+const layer$75 = Layer.effect(ServerSecretStore, make$84);
 //#endregion
 //#region src/auth/SessionStore.ts
 var MalformedSessionTokenError = class extends Schema$1.TaggedErrorClass()("MalformedSessionTokenError", {}) {
@@ -12266,7 +12396,7 @@ function toAuthClientSession(input) {
 		current: false
 	};
 }
-const make$82 = Effect.gen(function* () {
+const make$83 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const serverConfig = yield* ServerConfig$1;
 	const secretStore = yield* ServerSecretStore;
@@ -12580,7 +12710,7 @@ const make$82 = Effect.gen(function* () {
 		markDisconnected
 	});
 });
-const layer$74 = Layer.effect(SessionStore, make$82).pipe(Layer.provideMerge(layer$76));
+const layer$74 = Layer.effect(SessionStore, make$83).pipe(Layer.provideMerge(layer$76));
 //#endregion
 //#region src/persistence/AuthPairingLinks.ts
 const AuthPairingLinkRecord = Schema$1.Struct({
@@ -12641,7 +12771,7 @@ function toPersistenceSqlOrDecodeError$5(sqlOperation, decodeOperation, correlat
 		cause
 	});
 }
-const make$81 = Effect.gen(function* () {
+const make$82 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const createPairingLinkRow = SqlSchema.void({
 		Request: CreateAuthPairingLinkInput,
@@ -12776,7 +12906,7 @@ const make$81 = Effect.gen(function* () {
 		getByCredential
 	};
 });
-const layer$73 = Layer.effect(AuthPairingLinkRepository, make$81);
+const layer$73 = Layer.effect(AuthPairingLinkRepository, make$82);
 //#endregion
 //#region src/auth/PairingGrantStore.ts
 var UnknownBootstrapCredentialError = class extends Schema$1.TaggedErrorClass()("UnknownBootstrapCredentialError", {}) {
@@ -12871,7 +13001,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$80 = Effect.gen(function* () {
+const make$81 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const config = yield* ServerConfig$1;
 	const pairingLinks = yield* AuthPairingLinkRepository;
@@ -13069,7 +13199,7 @@ const make$80 = Effect.gen(function* () {
 		consume
 	});
 });
-const layer$72 = Layer.effect(PairingGrantStore, make$80).pipe(Layer.provideMerge(layer$73));
+const layer$72 = Layer.effect(PairingGrantStore, make$81).pipe(Layer.provideMerge(layer$73));
 //#endregion
 //#region src/persistence/DatabaseSnapshot.ts
 /**
@@ -14824,6 +14954,69 @@ var _045_ProjectionThreadsBackgroundWork_default = Effect.gen(function* () {
   `;
 });
 //#endregion
+//#region src/persistence/Migrations/046_ThreadPairs.ts
+/** Persisted Fusion relationship and durable watcher cursor. */
+var _046_ThreadPairs_default = Effect.gen(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	yield* sql`
+    CREATE TABLE thread_pairs (
+      pair_id TEXT PRIMARY KEY,
+      implementer_thread_id TEXT NOT NULL,
+      watcher_thread_id TEXT NOT NULL,
+      last_reviewed_implementer_sequence INTEGER NOT NULL DEFAULT 0,
+      created_at TEXT NOT NULL,
+      detached_at TEXT,
+      CHECK (implementer_thread_id <> watcher_thread_id),
+      CHECK (last_reviewed_implementer_sequence >= 0),
+      FOREIGN KEY (implementer_thread_id) REFERENCES projection_threads(thread_id),
+      FOREIGN KEY (watcher_thread_id) REFERENCES projection_threads(thread_id)
+    )
+  `;
+	yield* sql`
+    CREATE UNIQUE INDEX thread_pairs_active_implementer_idx
+    ON thread_pairs(implementer_thread_id)
+    WHERE detached_at IS NULL
+  `;
+	yield* sql`
+    CREATE UNIQUE INDEX thread_pairs_active_watcher_idx
+    ON thread_pairs(watcher_thread_id)
+    WHERE detached_at IS NULL
+  `;
+	yield* sql`
+    CREATE TRIGGER thread_pairs_active_cross_role_insert
+    BEFORE INSERT ON thread_pairs
+    WHEN NEW.detached_at IS NULL AND EXISTS (
+      SELECT 1
+      FROM thread_pairs
+      WHERE detached_at IS NULL
+        AND (
+          implementer_thread_id IN (NEW.implementer_thread_id, NEW.watcher_thread_id)
+          OR watcher_thread_id IN (NEW.implementer_thread_id, NEW.watcher_thread_id)
+        )
+    )
+    BEGIN
+      SELECT RAISE(ABORT, 'thread already belongs to an active pair');
+    END
+  `;
+	yield* sql`
+    CREATE TRIGGER thread_pairs_active_cross_role_update
+    BEFORE UPDATE OF implementer_thread_id, watcher_thread_id, detached_at ON thread_pairs
+    WHEN NEW.detached_at IS NULL AND EXISTS (
+      SELECT 1
+      FROM thread_pairs
+      WHERE pair_id <> NEW.pair_id
+        AND detached_at IS NULL
+        AND (
+          implementer_thread_id IN (NEW.implementer_thread_id, NEW.watcher_thread_id)
+          OR watcher_thread_id IN (NEW.implementer_thread_id, NEW.watcher_thread_id)
+        )
+    )
+    BEGIN
+      SELECT RAISE(ABORT, 'thread already belongs to an active pair');
+    END
+  `;
+});
+//#endregion
 //#region src/persistence/Migrations.ts
 /**
 * MigrationsLive - Migration runner with inline loader
@@ -15069,6 +15262,11 @@ const migrationEntries = [
 		45,
 		"ProjectionThreadsBackgroundWork",
 		_045_ProjectionThreadsBackgroundWork_default
+	],
+	[
+		46,
+		"ThreadPairs",
+		_046_ThreadPairs_default
 	]
 ];
 const makeMigrationLoader = (throughId) => Migrator.fromRecord(Object.fromEntries(migrationEntries.filter(([id]) => throughId === void 0 || id <= throughId).map(([id, name, migration]) => [`${id}_${name}`, migration])));
@@ -15319,7 +15517,7 @@ function parseBearerToken(request) {
 	const token = header.slice(7).trim();
 	return token.length > 0 ? token : null;
 }
-const make$79 = Effect.gen(function* () {
+const make$80 = Effect.gen(function* () {
 	const policy = yield* EnvironmentAuthPolicy;
 	const bootstrapCredentials = yield* PairingGrantStore;
 	const sessions = yield* SessionStore;
@@ -15514,7 +15712,7 @@ const make$79 = Effect.gen(function* () {
 		issueStartupPairingUrl
 	});
 });
-const layer$71 = Layer.effect(EnvironmentAuth, make$79).pipe(Layer.provideMerge(layer$72), Layer.provideMerge(layer$74), Layer.provideMerge(layer$77));
+const layer$71 = Layer.effect(EnvironmentAuth, make$80).pipe(Layer.provideMerge(layer$72), Layer.provideMerge(layer$74), Layer.provideMerge(layer$77));
 const storageLayer = Layer.mergeAll(layer$75, layerConfig);
 const runtimeLayer = layer$71.pipe(Layer.provideMerge(storageLayer));
 //#endregion
@@ -16411,7 +16609,7 @@ const DEFAULT_LIMITS = {
 	windowMillis: FAILURE_WINDOW_MS,
 	blockMillis: BLOCK_DURATION_MS
 };
-const make$78 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_LIMITS) {
+const make$79 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_LIMITS) {
 	const state = yield* Ref.make(initialThrottleState);
 	return HubAuthThrottle.of({
 		shouldRefuse: Effect.gen(function* () {
@@ -16425,7 +16623,7 @@ const make$78 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_LI
 		})
 	});
 });
-const layer$70 = Layer.effect(HubAuthThrottle, make$78());
+const layer$70 = Layer.effect(HubAuthThrottle, make$79());
 //#endregion
 //#region src/hub/HubAuth.ts
 /**
@@ -17748,7 +17946,7 @@ function stripDefaultServerSettings(current, defaults) {
 	}
 	return Object.is(current, defaults) ? void 0 : current;
 }
-const make$77 = Effect.gen(function* () {
+const make$78 = Effect.gen(function* () {
 	const { settingsPath } = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const pathService = yield* Path.Path;
@@ -17969,7 +18167,7 @@ const make$77 = Effect.gen(function* () {
 		}
 	};
 });
-const layer$68 = Layer.effect(ServerSettingsService, make$77);
+const layer$68 = Layer.effect(ServerSettingsService, make$78);
 //#endregion
 //#region src/pathExpansion.ts
 /**
@@ -18343,7 +18541,7 @@ function claudeEntryFromRegistration(registration) {
 	};
 }
 var ClaudeMcpFiles = class extends Context.Service()("@p4code/cli/mcp/ClaudeMcpFiles") {};
-const make$76 = Effect.gen(function* () {
+const make$77 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const services = yield* Effect.context();
@@ -18408,7 +18606,7 @@ const make$76 = Effect.gen(function* () {
 		removeProject: (projectDir, name) => removeAt(Effect.succeed(projectFile(projectDir)))(name)
 	};
 });
-const layer$67 = Layer.effect(ClaudeMcpFiles, make$76);
+const layer$67 = Layer.effect(ClaudeMcpFiles, make$77);
 Layer.succeed(ClaudeMcpFiles, {
 	readUser: Effect.succeed([]),
 	upsertUser: () => Effect.fail(new McpRegistryError({ detail: "No Claude config in tests." })),
@@ -18544,7 +18742,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$75 = Effect.gen(function* () {
+const make$76 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const secrets = yield* ServerSecretStore;
 	const http = yield* HttpClient.HttpClient;
@@ -18864,7 +19062,7 @@ const make$75 = Effect.gen(function* () {
 		accessTokenFor
 	};
 });
-const layer$66 = Layer.effect(McpOAuth, make$75);
+const layer$66 = Layer.effect(McpOAuth, make$76);
 Layer.succeed(McpOAuth, {
 	statusFor: () => Effect.succeed(Option.none()),
 	begin: () => Effect.fail(new McpRegistryError({ detail: "OAuth sign-in is not available." })),
@@ -18882,7 +19080,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$74 = Effect.gen(function* () {
+const make$75 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const secrets = yield* ServerSecretStore;
 	const oauth = yield* McpOAuth;
@@ -19033,7 +19231,7 @@ const make$74 = Effect.gen(function* () {
 		}).pipe(Effect.provide(services), Effect.catchCause((cause) => Effect.logWarning("mcp registry resolve failed", { cause }).pipe(Effect.as({}))))
 	};
 });
-const layer$65 = Layer.effect(McpRegistry, make$74);
+const layer$65 = Layer.effect(McpRegistry, make$75);
 //#endregion
 //#region src/sync/skillDirectory.ts
 /**
@@ -19412,7 +19610,7 @@ const formatHubLink = (input) => encodeStoredHubLink({
 	shareMode: input.shareMode
 });
 const fromEnvironment = (environment) => validateHubLink(environment.P4CODE_HUB_URL ?? "", environment.P4CODE_HUB_TOKEN ?? "");
-const make$73 = Effect.fn("HubLink.make")(function* (environment) {
+const make$74 = Effect.fn("HubLink.make")(function* (environment) {
 	const secrets = yield* ServerSecretStore;
 	const env = environment ?? process.env;
 	const fromEnv = fromEnvironment(env);
@@ -19478,7 +19676,7 @@ const make$73 = Effect.fn("HubLink.make")(function* (environment) {
 		})
 	};
 });
-const layer$64 = Layer.effect(HubLink, make$73());
+const layer$64 = Layer.effect(HubLink, make$74());
 //#endregion
 //#region src/sync/HubAssetClient.ts
 /**
@@ -19511,7 +19709,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$72 = Effect.gen(function* () {
+const make$73 = Effect.gen(function* () {
 	const http = yield* HttpClient.HttpClient;
 	const link = yield* HubLink;
 	const requireSettings = Effect.gen(function* () {
@@ -19593,7 +19791,7 @@ const make$72 = Effect.gen(function* () {
 		remove
 	};
 });
-const layer$63 = Layer.effect(HubAssetClient, make$72);
+const layer$63 = Layer.effect(HubAssetClient, make$73);
 //#endregion
 //#region src/sync/mcpRegistrationFiles.ts
 /**
@@ -20168,7 +20366,7 @@ const EMPTY_REPORT = {
 	unavailable: null
 };
 var AssetSync = class extends Context.Service()("@p4code/cli/sync/AssetSync") {};
-const make$71 = Effect.gen(function* () {
+const make$72 = Effect.gen(function* () {
 	const client = yield* HubAssetClient;
 	const link = yield* HubLink;
 	const settingsStore = yield* ServerSettingsService;
@@ -20881,7 +21079,7 @@ const make$71 = Effect.gen(function* () {
 		removeLocal
 	};
 });
-const layer$62 = Layer.effect(AssetSync, make$71);
+const layer$62 = Layer.effect(AssetSync, make$72);
 //#endregion
 //#region src/provider/CompressPrompts.ts
 /**
@@ -21801,7 +21999,11 @@ var ProjectionSnapshotQuery = class extends Context.Service()("@p4code/cli/orche
 const OrchestrationCommandReceipt = Schema$1.Struct({
 	commandId: CommandId,
 	aggregateKind: OrchestrationAggregateKind,
-	aggregateId: Schema$1.Union([ProjectId, ThreadId]),
+	aggregateId: Schema$1.Union([
+		ProjectId,
+		ThreadId,
+		ThreadPairId
+	]),
 	acceptedAt: IsoDateTime,
 	resultSequence: NonNegativeInt,
 	status: OrchestrationCommandReceiptStatus,
@@ -21893,7 +22095,11 @@ const EventMetadataFromJsonString = Schema$1.fromJsonString(OrchestrationEventMe
 const AppendEventRequestSchema = Schema$1.Struct({
 	eventId: EventId,
 	aggregateKind: OrchestrationAggregateKind,
-	streamId: Schema$1.Union([ProjectId, ThreadId]),
+	streamId: Schema$1.Union([
+		ProjectId,
+		ThreadId,
+		ThreadPairId
+	]),
 	type: OrchestrationEventType,
 	causationEventId: Schema$1.NullOr(EventId),
 	correlationId: Schema$1.NullOr(CommandId),
@@ -21908,7 +22114,11 @@ const OrchestrationEventPersistedRowSchema = Schema$1.Struct({
 	eventId: EventId,
 	type: OrchestrationEventType,
 	aggregateKind: OrchestrationAggregateKind,
-	aggregateId: Schema$1.Union([ProjectId, ThreadId]),
+	aggregateId: Schema$1.Union([
+		ProjectId,
+		ThreadId,
+		ThreadPairId
+	]),
 	occurredAt: IsoDateTime,
 	commandId: Schema$1.NullOr(CommandId),
 	causationEventId: Schema$1.NullOr(EventId),
@@ -22267,6 +22477,9 @@ const ThreadSessionSetPayload = ThreadSessionSetPayload$1;
 const ThreadTurnDiffCompletedPayload = ThreadTurnDiffCompletedPayload$1;
 const ThreadRevertedPayload = ThreadRevertedPayload$1;
 const ThreadActivityAppendedPayload = ThreadActivityAppendedPayload$1;
+const ThreadPairCreatedPayload = ThreadPairCreatedPayload$1;
+const ThreadPairDetachedPayload = ThreadPairDetachedPayload$1;
+const ThreadPairCursorAdvancedPayload = ThreadPairCursorAdvancedPayload$1;
 //#endregion
 //#region src/orchestration/projector.ts
 function checkpointStatusToLatestTurnState(status) {
@@ -22340,6 +22553,7 @@ function createEmptyReadModel(nowIso) {
 		snapshotSequence: 0,
 		projects: [],
 		threads: [],
+		threadPairs: [],
 		updatedAt: nowIso
 	};
 }
@@ -22350,6 +22564,31 @@ function projectEvent(model, event) {
 		updatedAt: event.occurredAt
 	};
 	switch (event.type) {
+		case "thread-pair.created": return decodeForEvent(ThreadPairCreatedPayload, event.payload, event.type, "payload").pipe(Effect.map((payload) => ({
+			...nextBase,
+			threadPairs: [...(nextBase.threadPairs ?? []).filter((pair) => pair.id !== payload.pairId), {
+				id: payload.pairId,
+				implementerThreadId: payload.implementerThreadId,
+				watcherThreadId: payload.watcherThreadId,
+				lastReviewedImplementerSequence: payload.lastReviewedImplementerSequence,
+				createdAt: payload.createdAt,
+				detachedAt: null
+			}]
+		})));
+		case "thread-pair.detached": return decodeForEvent(ThreadPairDetachedPayload, event.payload, event.type, "payload").pipe(Effect.map((payload) => ({
+			...nextBase,
+			threadPairs: (nextBase.threadPairs ?? []).map((pair) => pair.id === payload.pairId ? {
+				...pair,
+				detachedAt: payload.detachedAt
+			} : pair)
+		})));
+		case "thread-pair.cursor-advanced": return decodeForEvent(ThreadPairCursorAdvancedPayload, event.payload, event.type, "payload").pipe(Effect.map((payload) => ({
+			...nextBase,
+			threadPairs: (nextBase.threadPairs ?? []).map((pair) => pair.id === payload.pairId ? {
+				...pair,
+				lastReviewedImplementerSequence: payload.implementerSequence
+			} : pair)
+		})));
 		case "project.created": return decodeForEvent(ProjectCreatedPayload, event.payload, event.type, "payload").pipe(Effect.map((payload) => {
 			const existing = nextBase.projects.find((entry) => entry.id === payload.projectId);
 			const nextProject = {
@@ -22889,6 +23128,16 @@ const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand")(funct
 				command,
 				threadId: command.threadId
 			});
+			const activePair = (readModel.threadPairs ?? []).find((pair) => pair.detachedAt === null && (pair.implementerThreadId === command.threadId || pair.watcherThreadId === command.threadId));
+			if (activePair !== void 0) return yield* decideCommandSequence({
+				readModel,
+				commands: [{
+					type: "thread-pair.detach",
+					commandId: command.commandId,
+					pairId: activePair.id,
+					createdAt: yield* nowIso$8
+				}, command]
+			});
 			const occurredAt = yield* nowIso$8;
 			return {
 				...yield* withEventBase({
@@ -22904,6 +23153,118 @@ const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand")(funct
 				}
 			};
 		}
+		case "thread-pair.create": {
+			if (command.implementerThreadId === command.watcherThreadId) return yield* new OrchestrationCommandInvariantError({
+				commandType: command.type,
+				detail: "Fusion implementer and watcher must be distinct threads."
+			});
+			const implementer = yield* requireThread({
+				readModel,
+				command,
+				threadId: command.implementerThreadId
+			});
+			const watcher = yield* requireThread({
+				readModel,
+				command,
+				threadId: command.watcherThreadId
+			});
+			if (implementer.projectId !== watcher.projectId) return yield* new OrchestrationCommandInvariantError({
+				commandType: command.type,
+				detail: "Fusion implementer and watcher must belong to the same project."
+			});
+			const activePairs = readModel.threadPairs ?? [];
+			if (activePairs.some((pair) => pair.id === command.pairId)) return yield* new OrchestrationCommandInvariantError({
+				commandType: command.type,
+				detail: `Thread pair '${command.pairId}' already exists.`
+			});
+			const occupiedThreadIds = new Set(activePairs.filter((pair) => pair.detachedAt === null).flatMap((pair) => [pair.implementerThreadId, pair.watcherThreadId]));
+			if (occupiedThreadIds.has(command.implementerThreadId) || occupiedThreadIds.has(command.watcherThreadId)) return yield* new OrchestrationCommandInvariantError({
+				commandType: command.type,
+				detail: "Each thread may belong to only one active Fusion pair."
+			});
+			return {
+				...yield* withEventBase({
+					aggregateKind: "thread-pair",
+					aggregateId: command.pairId,
+					occurredAt: command.createdAt,
+					commandId: command.commandId
+				}),
+				type: "thread-pair.created",
+				payload: {
+					pairId: command.pairId,
+					implementerThreadId: command.implementerThreadId,
+					watcherThreadId: command.watcherThreadId,
+					lastReviewedImplementerSequence: readModel.snapshotSequence,
+					createdAt: command.createdAt
+				}
+			};
+		}
+		case "thread.turn.complete":
+			yield* requireThread({
+				readModel,
+				command,
+				threadId: command.threadId
+			});
+			return {
+				...yield* withEventBase({
+					aggregateKind: "thread",
+					aggregateId: command.threadId,
+					occurredAt: command.completedAt,
+					commandId: command.commandId
+				}),
+				type: "thread.turn-completed",
+				payload: {
+					threadId: command.threadId,
+					turnId: command.turnId ?? null,
+					state: command.state,
+					completedAt: command.completedAt
+				}
+			};
+		case "thread-pair.detach": {
+			const pair = (readModel.threadPairs ?? []).find((candidate) => candidate.id === command.pairId);
+			if (pair === void 0 || pair.detachedAt !== null) return yield* new OrchestrationCommandInvariantError({
+				commandType: command.type,
+				detail: `Active thread pair '${command.pairId}' does not exist.`
+			});
+			return {
+				...yield* withEventBase({
+					aggregateKind: "thread-pair",
+					aggregateId: command.pairId,
+					occurredAt: command.createdAt,
+					commandId: command.commandId
+				}),
+				type: "thread-pair.detached",
+				payload: {
+					pairId: command.pairId,
+					detachedAt: command.createdAt
+				}
+			};
+		}
+		case "thread-pair.cursor.advance": {
+			const pair = (readModel.threadPairs ?? []).find((candidate) => candidate.id === command.pairId);
+			if (pair === void 0 || pair.detachedAt !== null) return yield* new OrchestrationCommandInvariantError({
+				commandType: command.type,
+				detail: `Active thread pair '${command.pairId}' does not exist.`
+			});
+			if (command.implementerSequence < pair.lastReviewedImplementerSequence) return yield* new OrchestrationCommandInvariantError({
+				commandType: command.type,
+				detail: `Thread pair '${command.pairId}' cursor cannot move backwards.`
+			});
+			return {
+				...yield* withEventBase({
+					aggregateKind: "thread-pair",
+					aggregateId: command.pairId,
+					occurredAt: command.advancedAt,
+					commandId: command.commandId
+				}),
+				type: "thread-pair.cursor-advanced",
+				payload: {
+					pairId: command.pairId,
+					implementerSequence: command.implementerSequence,
+					advancedAt: command.advancedAt
+				}
+			};
+		}
 		case "thread.archive": {
 			yield* requireThreadNotArchived({
 				readModel,
@@ -23594,6 +23955,12 @@ function commandToAggregateRef(command) {
 			aggregateKind: "project",
 			aggregateId: command.projectId
 		};
+		case "thread-pair.create":
+		case "thread-pair.detach":
+		case "thread-pair.cursor.advance": return {
+			aggregateKind: "thread-pair",
+			aggregateId: command.pairId
+		};
 		default: return {
 			aggregateKind: "thread",
 			aggregateId: command.threadId
@@ -25240,7 +25607,8 @@ const ORCHESTRATION_PROJECTOR_NAMES = {
 	threadSessions: "projection.thread-sessions",
 	threadTurns: "projection.thread-turns",
 	checkpoints: "projection.checkpoints",
-	pendingApprovals: "projection.pending-approvals"
+	pendingApprovals: "projection.pending-approvals",
+	threadPairs: "projection.thread-pairs"
 };
 /**
 * Turn state to settle still-running turns with when their session leaves the
@@ -25499,6 +25867,50 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
 			default: return;
 		}
 	});
+	const applyThreadPairsProjection = Effect.fn("applyThreadPairsProjection")(function* (event, _attachmentSideEffects) {
+		switch (event.type) {
+			case "thread-pair.created":
+				yield* sql`
+            INSERT INTO thread_pairs (
+              pair_id,
+              implementer_thread_id,
+              watcher_thread_id,
+              last_reviewed_implementer_sequence,
+              created_at,
+              detached_at
+            ) VALUES (
+              ${event.payload.pairId},
+              ${event.payload.implementerThreadId},
+              ${event.payload.watcherThreadId},
+              ${event.payload.lastReviewedImplementerSequence},
+              ${event.payload.createdAt},
+              NULL
+            )
+            ON CONFLICT(pair_id) DO UPDATE SET
+              implementer_thread_id = excluded.implementer_thread_id,
+              watcher_thread_id = excluded.watcher_thread_id,
+              last_reviewed_implementer_sequence = excluded.last_reviewed_implementer_sequence,
+              created_at = excluded.created_at,
+              detached_at = NULL
+          `.pipe(Effect.mapError(toPersistenceSqlError("ProjectionPipeline.threadPairs:create")));
+				return;
+			case "thread-pair.detached":
+				yield* sql`
+            UPDATE thread_pairs
+            SET detached_at = ${event.payload.detachedAt}
+            WHERE pair_id = ${event.payload.pairId}
+          `.pipe(Effect.mapError(toPersistenceSqlError("ProjectionPipeline.threadPairs:detach")));
+				return;
+			case "thread-pair.cursor-advanced":
+				yield* sql`
+            UPDATE thread_pairs
+            SET last_reviewed_implementer_sequence = ${event.payload.implementerSequence}
+            WHERE pair_id = ${event.payload.pairId}
+          `.pipe(Effect.mapError(toPersistenceSqlError("ProjectionPipeline.threadPairs:cursor")));
+				return;
+			default: return;
+		}
+	});
 	const refreshThreadShellSummary = Effect.fn("refreshThreadShellSummary")(function* (threadId) {
 		const existingRow = yield* projectionThreadRepository.getById({ threadId });
 		if (Option.isNone(existingRow)) return;
@@ -26137,6 +26549,10 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
 			name: ORCHESTRATION_PROJECTOR_NAMES.projects,
 			apply: applyProjectsProjection
 		},
+		{
+			name: ORCHESTRATION_PROJECTOR_NAMES.threadPairs,
+			apply: applyThreadPairsProjection
+		},
 		{
 			name: ORCHESTRATION_PROJECTOR_NAMES.threadMessages,
 			apply: applyThreadMessagesProjection
@@ -26732,12 +27148,12 @@ const runProcessCore = Effect.fn("processRunner.runProcessCore")(function* (spaw
 		stderrInvalidUtf8: stderr.invalidUtf8
 	};
 });
-const make$70 = Effect.fn("ProcessRunner.make")(function* () {
+const make$71 = 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$61 = Layer.effect(ProcessRunner, make$70());
+const layer$61 = Layer.effect(ProcessRunner, make$71());
 //#endregion
 //#region src/project/RepositoryIdentityResolver.ts
 const DEFAULT_REPOSITORY_IDENTITY_CACHE_CAPACITY = 512;
@@ -26828,7 +27244,7 @@ const resolveRepositoryIdentityFromCacheKey = Effect.fn("RepositoryIdentityResol
 		rootPath: cacheKey
 	}) : null;
 });
-const make$69 = Effect.fn("RepositoryIdentityResolver.make")(function* (options = {}) {
+const make$70 = 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,
@@ -26843,7 +27259,7 @@ const make$69 = Effect.fn("RepositoryIdentityResolver.make")(function* (options
 	});
 	return RepositoryIdentityResolver.of({ resolve });
 });
-const layer$60 = Layer.effect(RepositoryIdentityResolver, make$69()).pipe(Layer.provide(layer$61));
+const layer$60 = Layer.effect(RepositoryIdentityResolver, make$70()).pipe(Layer.provide(layer$61));
 //#endregion
 //#region src/orchestration/Layers/ProjectionSnapshotQuery.ts
 const decodeReadModel = Schema$1.decodeUnknownEffect(OrchestrationReadModel);
@@ -26876,7 +27292,22 @@ const ProjectionLatestTurnDbRowSchema = Schema$1.Struct({
 	sourceProposedPlanThreadId: Schema$1.NullOr(ThreadId),
 	sourceProposedPlanId: Schema$1.NullOr(OrchestrationProposedPlanId)
 });
+const ProjectionTurnSummaryDbRowSchema = Schema$1.Struct({
+	threadId: ProjectionThread.fields.threadId,
+	turnId: TurnId,
+	state: Schema$1.String,
+	startedAt: Schema$1.NullOr(IsoDateTime),
+	completedAt: Schema$1.NullOr(IsoDateTime)
+});
 const ProjectionStateDbRowSchema = ProjectionState;
+const ProjectionThreadPairDbRowSchema = Schema$1.Struct({
+	id: ThreadPairId,
+	implementerThreadId: ThreadId,
+	watcherThreadId: ThreadId,
+	lastReviewedImplementerSequence: NonNegativeInt,
+	createdAt: IsoDateTime,
+	detachedAt: Schema$1.NullOr(IsoDateTime)
+});
 const ProjectionCountsRowSchema = Schema$1.Struct({
 	projectCount: Schema$1.Number,
 	threadCount: Schema$1.Number
@@ -26924,7 +27355,8 @@ const REQUIRED_SNAPSHOT_PROJECTORS = [
 	ORCHESTRATION_PROJECTOR_NAMES.threadProposedPlans,
 	ORCHESTRATION_PROJECTOR_NAMES.threadActivities,
 	ORCHESTRATION_PROJECTOR_NAMES.threadSessions,
-	ORCHESTRATION_PROJECTOR_NAMES.checkpoints
+	ORCHESTRATION_PROJECTOR_NAMES.checkpoints,
+	ORCHESTRATION_PROJECTOR_NAMES.threadPairs
 ];
 function maxIso(left, right) {
 	if (left === null) return right;
@@ -26958,10 +27390,21 @@ function computeSnapshotSequence(stateRows) {
 	}
 	return Number.isFinite(minSequence) ? minSequence : 0;
 }
+function mapTurnState(state) {
+	return state === "error" ? "error" : state === "interrupted" ? "interrupted" : state === "completed" ? "completed" : "running";
+}
+function mapTurnSummary(row) {
+	return {
+		turnId: row.turnId,
+		state: mapTurnState(row.state),
+		startedAt: row.startedAt,
+		completedAt: row.completedAt
+	};
+}
 function mapLatestTurn(row) {
 	return {
 		turnId: row.turnId,
-		state: row.state === "error" ? "error" : row.state === "interrupted" ? "interrupted" : row.state === "completed" ? "completed" : "running",
+		state: mapTurnState(row.state),
 		requestedAt: row.requestedAt,
 		startedAt: row.startedAt,
 		completedAt: row.completedAt,
@@ -27035,6 +27478,21 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           deleted_at AS "deletedAt"
         FROM projection_projects
         ORDER BY created_at ASC, project_id ASC
+      `
+	});
+	const listThreadPairRows = SqlSchema.findAll({
+		Request: Schema$1.Void,
+		Result: ProjectionThreadPairDbRowSchema,
+		execute: () => sql`
+        SELECT
+          pair_id AS "id",
+          implementer_thread_id AS "implementerThreadId",
+          watcher_thread_id AS "watcherThreadId",
+          last_reviewed_implementer_sequence AS "lastReviewedImplementerSequence",
+          created_at AS "createdAt",
+          detached_at AS "detachedAt"
+        FROM thread_pairs
+        ORDER BY created_at ASC, pair_id ASC
       `
 	});
 	const listThreadRows = SqlSchema.findAll({
@@ -27281,6 +27739,21 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
         FROM projection_turns
         WHERE checkpoint_turn_count IS NOT NULL
         ORDER BY thread_id ASC, checkpoint_turn_count ASC
+      `
+	});
+	const listTurnSummaryRows = SqlSchema.findAll({
+		Request: Schema$1.Void,
+		Result: ProjectionTurnSummaryDbRowSchema,
+		execute: () => sql`
+        SELECT
+          thread_id AS "threadId",
+          turn_id AS "turnId",
+          state,
+          started_at AS "startedAt",
+          completed_at AS "completedAt"
+        FROM projection_turns
+        WHERE turn_id IS NOT NULL
+        ORDER BY thread_id ASC, requested_at ASC, turn_id ASC
       `
 	});
 	const listLatestTurnRows = SqlSchema.findAll({
@@ -27667,6 +28140,22 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
         WHERE thread_id = ${threadId}
           AND checkpoint_turn_count IS NOT NULL
         ORDER BY checkpoint_turn_count ASC
+      `
+	});
+	const listTurnSummaryRowsByThread = SqlSchema.findAll({
+		Request: ThreadIdLookupInput,
+		Result: ProjectionTurnSummaryDbRowSchema,
+		execute: ({ threadId }) => sql`
+        SELECT
+          thread_id AS "threadId",
+          turn_id AS "turnId",
+          state,
+          started_at AS "startedAt",
+          completed_at AS "completedAt"
+        FROM projection_turns
+        WHERE thread_id = ${threadId}
+          AND turn_id IS NOT NULL
+        ORDER BY requested_at ASC, turn_id ASC
       `
 	});
 	const getFullThreadDiffContextRow = SqlSchema.findOneOption({
@@ -27707,15 +28196,19 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 		listThreadActivityRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getSnapshot:listThreadActivities:query", "ProjectionSnapshotQuery.getSnapshot:listThreadActivities:decodeRows"))),
 		listThreadSessionRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getSnapshot:listThreadSessions:query", "ProjectionSnapshotQuery.getSnapshot:listThreadSessions:decodeRows"))),
 		listCheckpointRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getSnapshot:listCheckpoints:query", "ProjectionSnapshotQuery.getSnapshot:listCheckpoints:decodeRows"))),
+		listTurnSummaryRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getSnapshot:listTurnSummaries:query", "ProjectionSnapshotQuery.getSnapshot:listTurnSummaries:decodeRows"))),
 		listLatestTurnRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getSnapshot:listLatestTurns:query", "ProjectionSnapshotQuery.getSnapshot:listLatestTurns:decodeRows"))),
-		listProjectionStateRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getSnapshot:listProjectionState:query", "ProjectionSnapshotQuery.getSnapshot:listProjectionState:decodeRows")))
-	])).pipe(Effect.flatMap(([projectRows, threadRows, messageRows, proposedPlanRows, activityRows, sessionRows, checkpointRows, latestTurnRows, stateRows]) => Effect.gen(function* () {
+		listProjectionStateRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getSnapshot:listProjectionState:query", "ProjectionSnapshotQuery.getSnapshot:listProjectionState:decodeRows"))),
+		listThreadPairRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getSnapshot:listThreadPairs:query", "ProjectionSnapshotQuery.getSnapshot:listThreadPairs:decodeRows")))
+	])).pipe(Effect.flatMap(([projectRows, threadRows, messageRows, proposedPlanRows, activityRows, sessionRows, checkpointRows, turnRows, latestTurnRows, stateRows, threadPairRows]) => Effect.gen(function* () {
 		const messagesByThread = /* @__PURE__ */ new Map();
 		const proposedPlansByThread = /* @__PURE__ */ new Map();
 		const activitiesByThread = /* @__PURE__ */ new Map();
 		const checkpointsByThread = /* @__PURE__ */ new Map();
+		const turnsByThread = /* @__PURE__ */ new Map();
 		const sessionsByThread = /* @__PURE__ */ new Map();
 		const latestTurnByThread = /* @__PURE__ */ new Map();
+		const threadPairs = [...threadPairRows];
 		let updatedAt = null;
 		for (const row of projectRows) updatedAt = maxIso(updatedAt, row.updatedAt);
 		for (const row of threadRows) updatedAt = maxIso(updatedAt, row.updatedAt);
@@ -27778,23 +28271,17 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 			});
 			checkpointsByThread.set(row.threadId, threadCheckpoints);
 		}
+		for (const row of turnRows) {
+			const threadTurns = turnsByThread.get(row.threadId) ?? [];
+			threadTurns.push(mapTurnSummary(row));
+			turnsByThread.set(row.threadId, threadTurns);
+		}
 		for (const row of latestTurnRows) {
 			updatedAt = maxIso(updatedAt, row.requestedAt);
 			if (row.startedAt !== null) updatedAt = maxIso(updatedAt, row.startedAt);
 			if (row.completedAt !== null) updatedAt = maxIso(updatedAt, row.completedAt);
 			if (latestTurnByThread.has(row.threadId)) continue;
-			latestTurnByThread.set(row.threadId, {
-				turnId: row.turnId,
-				state: row.state === "error" ? "error" : row.state === "interrupted" ? "interrupted" : row.state === "completed" ? "completed" : "running",
-				requestedAt: row.requestedAt,
-				startedAt: row.startedAt,
-				completedAt: row.completedAt,
-				assistantMessageId: row.assistantMessageId,
-				...row.sourceProposedPlanThreadId !== null && row.sourceProposedPlanId !== null ? { sourceProposedPlan: {
-					threadId: row.sourceProposedPlanThreadId,
-					planId: row.sourceProposedPlanId
-				} } : {}
-			});
+			latestTurnByThread.set(row.threadId, mapLatestTurn(row));
 		}
 		for (const row of sessionRows) {
 			updatedAt = maxIso(updatedAt, row.updatedAt);
@@ -27833,6 +28320,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 			branch: row.branch,
 			worktreePath: row.worktreePath,
 			latestTurn: latestTurnByThread.get(row.threadId) ?? null,
+			turns: turnsByThread.get(row.threadId) ?? [],
 			createdAt: row.createdAt,
 			updatedAt: row.updatedAt,
 			archivedAt: row.archivedAt,
@@ -27851,6 +28339,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 			snapshotSequence: computeSnapshotSequence(stateRows),
 			projects,
 			threads,
+			threadPairs,
 			updatedAt: updatedAt ?? "1970-01-01T00:00:00.000Z"
 		};
 		return yield* decodeReadModel(snapshot).pipe(Effect.mapError(toPersistenceDecodeError("ProjectionSnapshotQuery.getSnapshot:decodeReadModel")));
@@ -27864,11 +28353,13 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 		listThreadProposedPlanRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getCommandReadModel:listThreadProposedPlans:query", "ProjectionSnapshotQuery.getCommandReadModel:listThreadProposedPlans:decodeRows"))),
 		listThreadSessionRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getCommandReadModel:listThreadSessions:query", "ProjectionSnapshotQuery.getCommandReadModel:listThreadSessions:decodeRows"))),
 		listLatestTurnRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getCommandReadModel:listLatestTurns:query", "ProjectionSnapshotQuery.getCommandReadModel:listLatestTurns:decodeRows"))),
-		listProjectionStateRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getCommandReadModel:listProjectionState:query", "ProjectionSnapshotQuery.getCommandReadModel:listProjectionState:decodeRows")))
-	])).pipe(Effect.flatMap(([projectRows, threadRows, proposedPlanRows, sessionRows, latestTurnRows, stateRows]) => Effect.sync(() => {
+		listProjectionStateRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getCommandReadModel:listProjectionState:query", "ProjectionSnapshotQuery.getCommandReadModel:listProjectionState:decodeRows"))),
+		listThreadPairRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getCommandReadModel:listThreadPairs:query", "ProjectionSnapshotQuery.getCommandReadModel:listThreadPairs:decodeRows")))
+	])).pipe(Effect.flatMap(([projectRows, threadRows, proposedPlanRows, sessionRows, latestTurnRows, stateRows, threadPairRows]) => Effect.sync(() => {
 		let updatedAt = null;
 		const projects = [];
 		const threads = [];
+		const threadPairs = [...threadPairRows];
 		for (let index = 0; index < projectRows.length; index += 1) {
 			const row = projectRows[index];
 			if (!row) continue;
@@ -27965,6 +28456,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 			snapshotSequence: computeSnapshotSequence(stateRows),
 			projects,
 			threads,
+			threadPairs,
 			updatedAt: updatedAt ?? "1970-01-01T00:00:00.000Z"
 		};
 	})), Effect.mapError((error) => {
@@ -27976,8 +28468,9 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 		listActiveThreadRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getShellSnapshot:listThreads:query", "ProjectionSnapshotQuery.getShellSnapshot:listThreads:decodeRows"))),
 		listActiveThreadSessionRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getShellSnapshot:listThreadSessions:query", "ProjectionSnapshotQuery.getShellSnapshot:listThreadSessions:decodeRows"))),
 		listActiveLatestTurnRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getShellSnapshot:listLatestTurns:query", "ProjectionSnapshotQuery.getShellSnapshot:listLatestTurns:decodeRows"))),
-		listProjectionStateRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getShellSnapshot:listProjectionState:query", "ProjectionSnapshotQuery.getShellSnapshot:listProjectionState:decodeRows")))
-	])).pipe(Effect.flatMap(([projectRows, threadRows, sessionRows, latestTurnRows, stateRows]) => Effect.gen(function* () {
+		listProjectionStateRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getShellSnapshot:listProjectionState:query", "ProjectionSnapshotQuery.getShellSnapshot:listProjectionState:decodeRows"))),
+		listThreadPairRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getShellSnapshot:listThreadPairs:query", "ProjectionSnapshotQuery.getShellSnapshot:listThreadPairs:decodeRows")))
+	])).pipe(Effect.flatMap(([projectRows, threadRows, sessionRows, latestTurnRows, stateRows, threadPairRows]) => Effect.gen(function* () {
 		let updatedAt = null;
 		for (const row of projectRows) updatedAt = maxIso(updatedAt, row.updatedAt);
 		for (const row of threadRows) updatedAt = maxIso(updatedAt, row.updatedAt);
@@ -28021,6 +28514,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 				hasBackgroundTasks: row.backgroundTaskCount > 0,
 				scheduledWakeAt: row.scheduledWakeAt
 			}) : Result.failVoid),
+			threadPairs: threadPairRows.filter((pair) => pair.detachedAt === null),
 			updatedAt: updatedAt ?? "1970-01-01T00:00:00.000Z"
 		};
 		return yield* decodeShellSnapshot(snapshot).pipe(Effect.mapError(toPersistenceDecodeError("ProjectionSnapshotQuery.getShellSnapshot:decodeShellSnapshot")));
@@ -28189,12 +28683,13 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 		});
 	});
 	const getThreadDetailById = (threadId) => Effect.gen(function* () {
-		const [threadRow, messageRows, proposedPlanRows, activityRows, checkpointRows, latestTurnRow, sessionRow] = yield* Effect.all([
+		const [threadRow, messageRows, proposedPlanRows, activityRows, checkpointRows, turnRows, latestTurnRow, sessionRow] = yield* Effect.all([
 			getActiveThreadRowById({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:getThread:query", "ProjectionSnapshotQuery.getThreadDetailById:getThread:decodeRow"))),
 			listThreadMessageRowsByThread({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:listMessages:query", "ProjectionSnapshotQuery.getThreadDetailById:listMessages:decodeRows"))),
 			listThreadProposedPlanRowsByThread({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:listPlans:query", "ProjectionSnapshotQuery.getThreadDetailById:listPlans:decodeRows"))),
 			listThreadActivityRowsByThread({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:listActivities:query", "ProjectionSnapshotQuery.getThreadDetailById:listActivities:decodeRows"))),
 			listCheckpointRowsByThread({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:listCheckpoints:query", "ProjectionSnapshotQuery.getThreadDetailById:listCheckpoints:decodeRows"))),
+			listTurnSummaryRowsByThread({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:listTurnSummaries:query", "ProjectionSnapshotQuery.getThreadDetailById:listTurnSummaries:decodeRows"))),
 			getLatestTurnRowByThread({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:getLatestTurn:query", "ProjectionSnapshotQuery.getThreadDetailById:getLatestTurn:decodeRow"))),
 			getThreadSessionRowByThread({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:getSession:query", "ProjectionSnapshotQuery.getThreadDetailById:getSession:decodeRow")))
 		]);
@@ -28211,6 +28706,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 			branch: threadRow.value.branch,
 			worktreePath: threadRow.value.worktreePath,
 			latestTurn: Option.isSome(latestTurnRow) ? mapLatestTurn(latestTurnRow.value) : null,
+			turns: turnRows.map(mapTurnSummary),
 			createdAt: threadRow.value.createdAt,
 			updatedAt: threadRow.value.updatedAt,
 			archivedAt: threadRow.value.archivedAt,
@@ -28805,7 +29301,7 @@ function mergeWithDefaultKeybindings(custom) {
 * Keybindings - Service tag for keybinding configuration operations.
 */
 var Keybindings = class extends Context.Service()("@p4code/cli/keybindings") {};
-const make$68 = Effect.gen(function* () {
+const make$69 = Effect.gen(function* () {
 	const { keybindingsConfigPath } = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
@@ -29066,7 +29562,7 @@ const make$68 = Effect.gen(function* () {
 		}))
 	};
 });
-const layer$59 = Layer.effect(Keybindings, make$68);
+const layer$59 = Layer.effect(Keybindings, make$69);
 //#endregion
 //#region src/process/externalLauncher.ts
 /**
@@ -29293,7 +29789,7 @@ const launchEditorProcess = Effect.fn("externalLauncher.launchEditorProcess")(fu
 		cause
 	}));
 });
-const make$67 = Effect.gen(function* () {
+const make$68 = Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
@@ -29304,7 +29800,7 @@ const make$67 = Effect.gen(function* () {
 		launchEditor: (input) => provideCommandResolutionServices(Effect.flatMap(resolveEditorLaunch(input), (launch) => launchEditorProcess(launch).pipe(Effect.provideService(ChildProcessSpawner$1.ChildProcessSpawner, spawner))))
 	});
 });
-const layer$58 = Layer.effect(ExternalLauncher, make$67);
+const layer$58 = Layer.effect(ExternalLauncher, make$68);
 //#endregion
 //#region src/orchestration/Services/OrchestrationReactor.ts
 /**
@@ -29322,7 +29818,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$66 = Effect.gen(function* () {
+const make$67 = Effect.gen(function* () {
 	const pubsub = yield* PubSub.unbounded();
 	const state = yield* Ref.make({
 		sequence: 0,
@@ -29346,7 +29842,7 @@ const make$66 = Effect.gen(function* () {
 		}
 	};
 });
-const layer$57 = Layer.effect(ServerLifecycleEvents, make$66);
+const layer$57 = Layer.effect(ServerLifecycleEvents, make$67);
 //#endregion
 //#region src/telemetry/Identify.ts
 const CodexAuthJsonSchema = Schema$1.Struct({ tokens: Schema$1.Struct({ account_id: Schema$1.String }) });
@@ -29519,7 +30015,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$65 = Effect.gen(function* () {
+const make$66 = Effect.gen(function* () {
 	const telemetryConfig = yield* TelemetryEnvConfig;
 	const posthogKey = telemetryConfig.posthogKey.trim();
 	if (!telemetryConfig.enabled || posthogKey === "") return inert;
@@ -29589,7 +30085,7 @@ const make$65 = Effect.gen(function* () {
 		flush
 	});
 });
-const layer$56 = Layer.effect(AnalyticsService, make$65);
+const layer$56 = Layer.effect(AnalyticsService, make$66);
 AnalyticsService.layerTest;
 //#endregion
 //#region src/service/pinnedRuntime.ts
@@ -29936,7 +30432,7 @@ var BootServiceInstallError = class extends Schema$1.TaggedErrorClass()("BootSer
 	}
 };
 var BootService = class extends Context.Service()("@p4code/cli/service/bootService") {};
-const make$64 = Effect.fn("cloud.boot_service.make")(function* (input) {
+const make$65 = Effect.fn("cloud.boot_service.make")(function* (input) {
 	const hostExecPath = yield* HostProcessExecutablePath;
 	const hostArguments = yield* HostProcessArguments;
 	const host = input.host ?? {
@@ -30158,7 +30654,7 @@ const make$64 = Effect.fn("cloud.boot_service.make")(function* (input) {
 		logPath
 	});
 });
-const layer$55 = (input) => Layer.effect(BootService, make$64(input));
+const layer$55 = (input) => Layer.effect(BootService, make$65(input));
 //#endregion
 //#region src/service/selfUpdate.ts
 /**
@@ -30233,7 +30729,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$63 = Effect.fn("cloud.server_self_update.make")(function* (options) {
+const make$64 = Effect.fn("cloud.server_self_update.make")(function* (options) {
 	const serverConfig = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
@@ -30383,7 +30879,7 @@ const make$63 = Effect.fn("cloud.server_self_update.make")(function* (options) {
 	});
 	return ServerSelfUpdate.of({ update });
 });
-const layer$54 = Layer.effect(ServerSelfUpdate, make$63()).pipe(Layer.provide(layer$61));
+const layer$54 = Layer.effect(ServerSelfUpdate, make$64()).pipe(Layer.provide(layer$61));
 //#endregion
 //#region src/environment/ServerEnvironmentLabel.ts
 const ServerEnvironmentLabelCommandProbe = Schema$1.Literals(["macos-computer-name", "linux-pretty-hostname"]);
@@ -30515,7 +31011,7 @@ function platformArch(architecture) {
 		default: return "other";
 	}
 }
-const make$62 = Effect.gen(function* () {
+const make$63 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const serverConfig = yield* ServerConfig$1;
@@ -30579,7 +31075,7 @@ const make$62 = Effect.gen(function* () {
 * state. It intentionally has no fallback Layer.succeed value: callers must
 * provide the external platform services and a ServerConfig.
 */
-const layer$53 = Layer.effect(ServerEnvironment, make$62).pipe(Layer.provide(layer$61));
+const layer$53 = Layer.effect(ServerEnvironment, make$63).pipe(Layer.provide(layer$61));
 //#endregion
 //#region src/provider/Services/ProviderSessionReaper.ts
 var ProviderSessionReaper = class extends Context.Service()("@p4code/cli/provider/Services/ProviderSessionReaper") {};
@@ -31657,7 +32153,7 @@ const maybeOpenBrowser = (target) => Effect.gen(function* () {
 	yield* (yield* ExternalLauncher).launchBrowser(target).pipe(Effect.catch(() => Effect.logInfo("browser auto-open unavailable", { hint: `Open ${target} in your browser.` })));
 });
 const runStartupPhase = (phase, effect) => effect.pipe(Effect.annotateSpans({ "startup.phase": phase }), Effect.withSpan(`server.startup.${phase}`));
-const make$61 = Effect.gen(function* () {
+const make$62 = Effect.gen(function* () {
 	const serverConfig = yield* ServerConfig$1;
 	const keybindings = yield* Keybindings;
 	const orchestrationReactor = yield* OrchestrationReactor;
@@ -31798,7 +32294,7 @@ const make$61 = Effect.gen(function* () {
 		enqueueCommand: commandGate.enqueueCommand
 	};
 });
-const layer$52 = Layer.effect(ServerRuntimeStartup, make$61);
+const layer$52 = Layer.effect(ServerRuntimeStartup, make$62);
 //#endregion
 //#region src/serverRuntimeState.ts
 const PersistedServerRuntimeState = Schema$1.Struct({
@@ -31955,7 +32451,7 @@ function expandHomePath$2(input, path) {
 	if (input.startsWith("~/") || input.startsWith("~\\")) return path.join(NodeOS.homedir(), input.slice(2));
 	return input;
 }
-const make$60 = Effect.gen(function* () {
+const make$61 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const statWorkspaceRoot = Effect.fn("WorkspacePaths.statWorkspaceRoot")(function* (workspaceRoot, normalizedWorkspaceRoot, phase) {
@@ -32012,7 +32508,7 @@ const make$60 = Effect.gen(function* () {
 		resolveRelativePathWithinRoot
 	});
 });
-const layer$51 = Layer.effect(WorkspacePaths, make$60);
+const layer$51 = Layer.effect(WorkspacePaths, make$61);
 //#endregion
 //#region src/cli/project.ts
 const isEnvironmentHttpCommonError = Schema$1.is(EnvironmentHttpCommonError);
@@ -33195,7 +33691,7 @@ const logP4ProjectFileLoadError = (error) => Effect.logWarning(error).pipe(Effec
 	filePath: error.filePath,
 	errorTag: error._tag
 }));
-const make$59 = Effect.gen(function* () {
+const make$60 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const load = Effect.fn("P4ProjectFileLoader.load")(function* (workspaceRoot) {
@@ -33216,7 +33712,7 @@ const make$59 = Effect.gen(function* () {
 	});
 	return P4ProjectFileLoader.of({ load });
 });
-const layer$50 = Layer.effect(P4ProjectFileLoader, make$59);
+const layer$50 = Layer.effect(P4ProjectFileLoader, make$60);
 //#endregion
 //#region src/project/ProjectFaviconResolver.ts
 /**
@@ -33291,7 +33787,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$58 = Effect.gen(function* () {
+const make$59 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const workspacePaths = yield* WorkspacePaths;
@@ -33360,7 +33856,7 @@ const make$58 = Effect.gen(function* () {
 	});
 	return ProjectFaviconResolver.of({ resolvePath });
 });
-const layer$49 = Layer.effect(ProjectFaviconResolver, make$58);
+const layer$49 = Layer.effect(ProjectFaviconResolver, make$59);
 //#endregion
 //#region src/assets/AssetAccess.ts
 const ASSET_ROUTE_PREFIX = "/api/assets";
@@ -33771,10 +34267,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$57 = (sink) => BrowserTraceCollector.of({ record: (records) => Effect.sync(() => {
+const make$58 = (sink) => BrowserTraceCollector.of({ record: (records) => Effect.sync(() => {
 	for (const record of records) sink.push(record);
 }) });
-const layer$48 = (sink) => Layer.succeed(BrowserTraceCollector, make$57(sink));
+const layer$48 = (sink) => Layer.succeed(BrowserTraceCollector, make$58(sink));
 //#endregion
 //#region src/auth/http.ts
 const CREDENTIAL_RESPONSE_HEADERS = {
@@ -36827,7 +37323,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$56 = Effect.gen(function* () {
+const make$57 = Effect.gen(function* () {
 	const processRunner = yield* ProcessRunner;
 	const run = Effect.fn("VcsProcess.run")(function* (input) {
 		const baseError = {
@@ -36886,7 +37382,7 @@ const make$56 = Effect.gen(function* () {
 	});
 	return VcsProcess.of({ run });
 });
-const layer$47 = Layer.effect(VcsProcess, make$56).pipe(Layer.provide(layer$61));
+const layer$47 = Layer.effect(VcsProcess, make$57).pipe(Layer.provide(layer$61));
 //#endregion
 //#region src/vcs/VcsDriver.ts
 var VcsDriver = class extends Context.Service()("@p4code/cli/vcs/VcsDriver") {};
@@ -37337,12 +37833,12 @@ const makeVcsDriver = Effect.gen(function* () {
 	const driver = yield* makeVcsDriverShape();
 	return VcsDriver.of(driver);
 });
-const make$55 = Effect.gen(function* () {
+const make$56 = Effect.gen(function* () {
 	const git = yield* makeGitVcsDriverCore();
 	return GitVcsDriver.of(git);
 });
 Layer.effect(VcsDriver, makeVcsDriver);
-const layer$46 = Layer.effect(GitVcsDriver, make$55);
+const layer$46 = Layer.effect(GitVcsDriver, make$56);
 //#endregion
 //#region src/vcs/VcsProjectConfig.ts
 const ProjectVcsConfigJson = fromLenientJson(Schema$1.Struct({
@@ -37374,7 +37870,7 @@ const logVcsProjectConfigError = (error) => Effect.logWarning(error).pipe(Effect
 	configPath: error.configPath,
 	errorTag: error._tag
 }));
-const make$54 = Effect.gen(function* () {
+const make$55 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const findConfigPath = Effect.fn("VcsProjectConfig.findConfigPath")(function* (cwd) {
@@ -37415,7 +37911,7 @@ const make$54 = Effect.gen(function* () {
 	});
 	return VcsProjectConfig.of({ resolveKind });
 });
-const layer$45 = Layer.effect(VcsProjectConfig, make$54);
+const layer$45 = Layer.effect(VcsProjectConfig, make$55);
 //#endregion
 //#region src/vcs/VcsDriverRegistry.ts
 const DETECTION_CACHE_CAPACITY = 2048;
@@ -37435,7 +37931,7 @@ function parseDetectionCacheKey(key) {
 		cwd: key.slice(separatorIndex + 1)
 	};
 }
-const make$53 = Effect.gen(function* () {
+const make$54 = Effect.gen(function* () {
 	const projectConfig = yield* VcsProjectConfig;
 	const git = yield* makeVcsDriver;
 	const drivers = { git };
@@ -37492,7 +37988,7 @@ const make$53 = Effect.gen(function* () {
 		resolve
 	});
 });
-const layer$44 = Layer.effect(VcsDriverRegistry, make$53).pipe(Layer.provide(layer$45));
+const layer$44 = Layer.effect(VcsDriverRegistry, make$54).pipe(Layer.provide(layer$45));
 //#endregion
 //#region src/checkpointing/CheckpointStore.ts
 /**
@@ -37512,7 +38008,7 @@ const layer$44 = Layer.effect(VcsDriverRegistry, make$53).pipe(Layer.provide(lay
 */
 /** Service tag for checkpoint persistence and restore operations. */
 var CheckpointStore = class extends Context.Service()("@p4code/cli/checkpointing/CheckpointStore") {};
-const make$52 = Effect.gen(function* () {
+const make$53 = Effect.gen(function* () {
 	const vcsRegistry = yield* VcsDriverRegistry;
 	const resolveCheckpoints = Effect.fn("CheckpointStore.resolveCheckpoints")(function* (operation, cwd) {
 		const handle = yield* vcsRegistry.resolve({ cwd });
@@ -37551,7 +38047,7 @@ const make$52 = Effect.gen(function* () {
 		deleteCheckpointRefs
 	});
 });
-const layer$43 = Layer.effect(CheckpointStore, make$52);
+const layer$43 = Layer.effect(CheckpointStore, make$53);
 //#endregion
 //#region src/checkpointing/CheckpointDiffQuery.ts
 /**
@@ -37573,7 +38069,7 @@ function buildTurnDiffResult(input, diff) {
 		diff
 	};
 }
-const make$51 = Effect.gen(function* () {
+const make$52 = Effect.gen(function* () {
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 	const checkpointStore = yield* CheckpointStore;
 	const threadActivities = yield* ProjectionThreadActivityRepository;
@@ -37744,7 +38240,7 @@ const make$51 = Effect.gen(function* () {
 		getFullThreadDiff
 	});
 });
-const layer$42 = Layer.effect(CheckpointDiffQuery, make$51);
+const layer$42 = Layer.effect(CheckpointDiffQuery, make$52);
 //#endregion
 //#region ../../packages/shared/src/toolCategory.ts
 const TOOL_CATEGORY_TITLES = {
@@ -40236,24 +40732,55 @@ const toTaskStoreError = (operation) => (cause) => Effect.logWarning("task store
 * still reading its stale snapshot. The row stays the single source of truth
 * and the agent reads it live over MCP.
 *
-* Two instructions carry their weight. The agent is told its thread is already
-* linked to the task, because otherwise its first useful move is to guess which
-* board row it is on. And it is told to leave `status` alone: the server moved
-* the task to `in_progress` when it started the thread, and where the work goes
-* after that is the user's call — the same rule the scoping prompt follows, and
-* the reason the board's columns still mean something.
+* The prompt owns the whole task lifecycle rather than merely pointing at the
+* row. It tells the agent how to orient safely, verify the acceptance criteria,
+* obtain a skeptical review, deliver repository changes through a pull request,
+* and leave the board in the state that matches the actual outcome.
 */
 const buildAutoPrompt = (task) => {
 	const reference = task.readableId ?? task.taskId;
-	return `Picking up board task \`${reference}\`: ${task.title}
+	return `Take ownership of board task \`${reference}\`: ${task.title}
+
+Start with \`task_current\` (or \`task_get\` with \`${reference}\`). Read the current body, acceptance criteria, labels, priority, relationships, and existing evidence. This thread is already linked and the task is \`in_progress\`. The live row is the source of truth; re-read it before the final update.
 
-Read the task first via \`task_current\` (or \`task_get\` with \`${reference}\`). Body, labels, project and priority live on the row, not in this message; the row may have changed since this thread started - the current row is the source of truth. Re-read it the same way whenever you need the fields again.
+Orient before acting. Read repository instructions and any skills or workflows the task names or clearly requires. Inspect the relevant code, documentation, state, recent history, and current checkout. Determine what is already complete and identify the exact remaining acceptance work.
 
-This thread is already linked to the task, status In progress. Do the work.
+Preserve unrelated changes. If the checkout is dirty, stale, on the wrong base, or otherwise unsafe for this task, create an isolated worktree from the appropriate current base. Never discard or overwrite work you do not own.
 
-Record findings via \`task_update\` as you go - decisions made, constraints hit, things the task turned out to be wrong about. That is what makes the row worth reading afterwards. Leave \`status\` alone: moving work across the board is the user's call.
+Execute the task end to end. Stay within its intent: no speculative features, unrelated refactors, or broad verification. Reuse valid existing evidence instead of repeating completed work without reason. Resolve routine in-scope problems autonomously.
 
-After reading the task, read the code it concerns. If it is specified too poorly to act on, say so and stop rather than guessing.`;
+If requirements are materially ambiguous, investigate available context first. Ask only when different interpretations would materially change the result. If a real environment, permission, or dependency blocker remains after safe task-relevant recovery, stop with the exact blocker and required next action rather than guessing.
+
+Verify the smallest sufficient proof against every acceptance criterion. Follow required skills exactly. Do not claim results you did not observe.
+
+Keep the task row useful through \`task_update\`, not as an activity diary. Record durable decisions, corrected assumptions, concise verification evidence, and blockers. Keep status current:
+
+- \`done\` only when every acceptance criterion is satisfied and no required work remains.
+- \`in_review\` when repository work is ready in a pull request or execution is complete but human review or a product decision remains.
+- \`in_progress\` when work or a blocker remains, with the exact outstanding item recorded.
+- Update related tasks only when the task requires it.
+
+For repository-changing work, unless the live task or current user explicitly forbids pull-request delivery, this prompt authorizes you to create a task branch or isolated worktree, commit only your changes, push that branch, and open a pull request. Follow repository branch, commit, rebase, pull-request template, and evidence rules. Never commit directly to \`main\` or \`master\` unless the live task explicitly requires the repository's established direct-delivery workflow. Never force-push unless the current user explicitly authorizes it.
+
+Before delivery or board completion, ask one bounded read-only sub-agent to review the task requirements, result, verification evidence, and complete diff when one exists. Its job is to find correctness defects, regressions, missed acceptance criteria, unsupported claims, and unnecessary scope. It must not edit files or spawn another agent. If no sub-agent mechanism is available, perform the same skeptical review yourself and record that limitation.
+
+Validate every finding yourself. Fix real issues, reject false positives with a concrete reason, and rerun affected verification. If review fixes or conflict resolution materially change the diff, run one final bounded review pass.
+
+Before opening the pull request:
+
+- Re-read the live task and confirm every acceptance criterion.
+- Sync with the appropriate current base using the repository's required workflow.
+- Inspect the final diff and ensure it contains only task-owned changes.
+- Stage explicit paths and commit using repository conventions.
+- Push only the task branch.
+- Reuse an existing task pull request when appropriate; never create a duplicate.
+- Include the problem, solution, verification, required visual evidence, and task reference in the pull request.
+
+Open a pull request only when the task produced repository changes. Verification, research, product-decision, and operational tasks with no diff should finish through evidence on the board instead. Do not delete files or mutate external systems unless the live task or current user explicitly authorizes that action.
+
+After opening the pull request, append its URL and concise verification evidence to the task and move it to \`in_review\`. Leave it \`in_progress\` if implementation, verification, review findings, push, or pull-request creation remains blocked. Mark a no-pull-request task \`done\` only when all acceptance criteria are satisfied.
+
+Finish by reporting the outcome, verification performed, sub-agent review outcome, pull-request URL when applicable, board status, and any remaining blocker.`;
 };
 /**
 * Render a task into the prompt that seeds its thread.
@@ -40727,7 +41254,7 @@ function makeUpdateState(input) {
 		output: input.output ?? null
 	};
 }
-const make$50 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
+const make$51 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
 	const providerRegistry = yield* ProviderRegistry;
 	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 	const httpClient = yield* HttpClient.HttpClient;
@@ -40842,7 +41369,7 @@ const make$50 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
 	});
 	return ProviderMaintenanceRunner.of({ updateProvider });
 });
-const layer$41 = Layer.effect(ProviderMaintenanceRunner, make$50());
+const layer$41 = Layer.effect(ProviderMaintenanceRunner, make$51());
 //#endregion
 //#region src/provider/Services/ProviderInstanceRegistry.ts
 var ProviderInstanceRegistry = class extends Context.Service()("@p4code/cli/provider/Services/ProviderInstanceRegistry") {};
@@ -40866,11 +41393,11 @@ const makeTextGenerationFromRegistry = (registry) => TextGeneration.of({
 		detail: "This provider does not report account usage."
 	}))))
 });
-const make$49 = Effect.gen(function* () {
+const make$50 = Effect.gen(function* () {
 	const registry = yield* ProviderInstanceRegistry;
 	return makeTextGenerationFromRegistry(registry);
 });
-const layer$40 = Layer.effect(TextGeneration, make$49);
+const layer$40 = Layer.effect(TextGeneration, make$50);
 //#endregion
 //#region src/provider/Drivers/ClaudeHome.ts
 const resolveClaudeHomePath = Effect.fn("resolveClaudeHomePath")(function* (config) {
@@ -41862,7 +42389,7 @@ Layer.succeed(UsageService, UsageService.of({ readSummary: (input) => Effect.suc
 	},
 	scanDurationMs: 0
 }) }));
-const make$48 = Effect.gen(function* () {
+const make$49 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const config = yield* ServerConfig$1;
@@ -42094,7 +42621,7 @@ const make$48 = Effect.gen(function* () {
 		};
 	}) };
 });
-const layer$39 = Layer.effect(UsageService, make$48);
+const layer$39 = Layer.effect(UsageService, make$49);
 const SKILL_MANIFEST_FILENAME = "SKILL.md";
 /**
 * Split a catalogue id (`owner/repo/skill-name`) into its parts.
@@ -42240,7 +42767,7 @@ const emptyFetch = (id, unavailable) => ({
 	skipped: [],
 	unavailable
 });
-const make$47 = Effect.gen(function* () {
+const make$48 = 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));
@@ -42311,7 +42838,7 @@ const make$47 = Effect.gen(function* () {
 		fetch
 	};
 });
-const layer$38 = Layer.effect(SkillRegistry, make$47);
+const layer$38 = Layer.effect(SkillRegistry, make$48);
 //#endregion
 //#region ../../packages/shared/src/KeyedCoalescingWorker.ts
 const makeKeyedCoalescingWorker = (options) => Effect.gen(function* () {
@@ -42610,7 +43137,7 @@ const serversEqual = (left, right) => {
 	}
 	return true;
 };
-const make$46 = Effect.gen(function* PortDiscoveryMake() {
+const make$47 = Effect.gen(function* PortDiscoveryMake() {
 	const net = yield* NetService;
 	const processRunner = yield* ProcessRunner;
 	const hostPlatform = yield* HostProcessPlatform;
@@ -42761,7 +43288,7 @@ const make$46 = Effect.gen(function* PortDiscoveryMake() {
 		unregisterTerminal
 	});
 }).pipe(Effect.withSpan("PortDiscovery.make"));
-const layer$37 = Layer.effect(PortDiscovery, make$46);
+const layer$37 = Layer.effect(PortDiscovery, make$47);
 //#endregion
 //#region src/terminal/Manager.ts
 /**
@@ -43439,7 +43966,7 @@ function normalizedRuntimeEnv(env) {
 	if (entries.length === 0) return null;
 	return Object.fromEntries(entries.toSorted(([left], [right]) => left.localeCompare(right)));
 }
-const make$45 = Effect.fn("TerminalManager.make")(function* () {
+const make$46 = Effect.fn("TerminalManager.make")(function* () {
 	const { terminalLogsDir } = yield* ServerConfig$1;
 	const ptyAdapter = yield* PtyAdapter;
 	const portDiscovery = yield* PortDiscovery;
@@ -44401,7 +44928,7 @@ const makeWithOptions$1 = Effect.fn("TerminalManager.makeWithOptions")(function*
 		subscribeMetadata
 	});
 });
-const layer$36 = Layer.effect(TerminalManager, make$45()).pipe(Layer.provide(layer$61));
+const layer$36 = Layer.effect(TerminalManager, make$46()).pipe(Layer.provide(layer$61));
 //#endregion
 //#region src/mcp/McpInvocationContext.ts
 var McpInvocationContext = class extends Context.Service()("@p4code/cli/mcp/McpInvocationContext") {};
@@ -44611,7 +45138,7 @@ const classifyResponseError = (context, error) => {
 		});
 	}
 };
-const make$44 = Effect.gen(function* PreviewAutomationBrokerMake() {
+const make$45 = Effect.gen(function* PreviewAutomationBrokerMake() {
 	const crypto = yield* Crypto.Crypto;
 	const state = yield* SynchronizedRef.make({
 		clients: /* @__PURE__ */ new Map(),
@@ -44845,7 +45372,7 @@ const make$44 = Effect.gen(function* PreviewAutomationBrokerMake() {
 		invoke
 	});
 }).pipe(Effect.withSpan("PreviewAutomationBroker.make"));
-const layer$35 = Layer.effect(PreviewAutomationBroker, make$44);
+const layer$35 = Layer.effect(PreviewAutomationBroker, make$45);
 //#endregion
 //#region src/preview/Manager.ts
 /**
@@ -44909,7 +45436,7 @@ const buildIdleSnapshot = (input) => ({
 	viewport: FILL_PREVIEW_VIEWPORT,
 	updatedAt: input.updatedAt
 });
-const make$43 = Effect.gen(function* PreviewManagerMake() {
+const make$44 = Effect.gen(function* PreviewManagerMake() {
 	const serverEpoch = NodeCrypto.randomUUID();
 	const stateRef = yield* SynchronizedRef.make(initialState);
 	const eventsPubSub = yield* PubSub.unbounded();
@@ -45140,7 +45667,7 @@ const make$43 = Effect.gen(function* PreviewManagerMake() {
 		subscribeEvents: PubSub.subscribe(eventsPubSub)
 	});
 }).pipe(Effect.withSpan("PreviewManager.make"));
-const layer$34 = Layer.effect(PreviewManager, make$43);
+const layer$34 = Layer.effect(PreviewManager, make$44);
 //#endregion
 //#region src/workspace/WorkspaceSearchIndex.ts
 const WORKSPACE_INDEX_MAX_ENTRIES = 25e3;
@@ -45274,7 +45801,7 @@ const waitForScan = (cwd, finder, onFailure) => Effect.try({
 		timeout: WORKSPACE_INDEX_SCAN_TIMEOUT
 	})
 }), Effect.withSpan("WorkspaceSearchIndex.waitForScan"));
-const make$42 = Effect.fn("WorkspaceSearchIndex.make")(function* (cwd) {
+const make$43 = Effect.fn("WorkspaceSearchIndex.make")(function* (cwd) {
 	const finder = yield* Effect.acquireRelease(createFinder(cwd), (finder) => Effect.try({
 		try: () => finder.destroy(),
 		catch: (cause) => new WorkspaceSearchIndexDestroyFailed({
@@ -45348,7 +45875,7 @@ const make$42 = Effect.fn("WorkspaceSearchIndex.make")(function* (cwd) {
 * workspace root. WorkspaceSearchIndexMap owns memoization and idle cleanup;
 * using a default cwd here would mix resources from different workspaces.
 */
-const layer$33 = (cwd) => Layer.effect(WorkspaceSearchIndex, make$42(cwd));
+const layer$33 = (cwd) => Layer.effect(WorkspaceSearchIndex, make$43(cwd));
 var WorkspaceSearchIndexMap = class extends LayerMap.Service()("@p4code/cli/workspace/WorkspaceSearchIndexMap", {
 	lookup: layer$33,
 	idleTimeToLive: WORKSPACE_INDEX_IDLE_TTL
@@ -45412,7 +45939,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$41 = Effect.gen(function* () {
+const make$42 = Effect.gen(function* () {
 	const path = yield* Path.Path;
 	const workspacePaths = yield* WorkspacePaths;
 	const workspaceSearchIndexes = yield* WorkspaceSearchIndexMap;
@@ -45486,7 +46013,7 @@ const make$41 = Effect.gen(function* () {
 		search
 	});
 });
-const layer$32 = Layer.effect(WorkspaceEntries, make$41).pipe(Layer.provide(WorkspaceSearchIndexMap.layer));
+const layer$32 = Layer.effect(WorkspaceEntries, make$42).pipe(Layer.provide(WorkspaceSearchIndexMap.layer));
 //#endregion
 //#region src/workspace/WorkspaceFileSystem.ts
 /**
@@ -45545,7 +46072,7 @@ Schema$1.Union([
 ]);
 /** Service tag for workspace file operations. */
 var WorkspaceFileSystem = class extends Context.Service()("@p4code/cli/workspace/WorkspaceFileSystem") {};
-const make$40 = Effect.gen(function* () {
+const make$41 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const workspacePaths = yield* WorkspacePaths;
@@ -45689,7 +46216,7 @@ const make$40 = Effect.gen(function* () {
 		writeFile
 	});
 });
-const layer$31 = Layer.effect(WorkspaceFileSystem, make$40);
+const layer$31 = Layer.effect(WorkspaceFileSystem, make$41);
 //#endregion
 //#region src/textGeneration/TextGenerationPresets.ts
 const conventionalCommitsTextGenerationPolicy = {
@@ -45753,7 +46280,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$39 = Effect.gen(function* () {
+const make$40 = Effect.gen(function* () {
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 	const terminalManager = yield* TerminalManager;
 	const runForThread = Effect.fn("ProjectSetupScriptRunner.runForThread")(function* (input) {
@@ -45811,7 +46338,7 @@ const make$39 = Effect.gen(function* () {
 	});
 	return ProjectSetupScriptRunner.of({ runForThread });
 });
-const layer$30 = Layer.effect(ProjectSetupScriptRunner, make$39);
+const layer$30 = Layer.effect(ProjectSetupScriptRunner, make$40);
 //#endregion
 //#region src/sourceControl/azureDevOpsPullRequests.ts
 const AzureDevOpsPullRequestSchema = Schema$1.Struct({
@@ -46135,7 +46662,7 @@ function decodeAzureDevOpsJson(raw, schema, operation, cwd) {
 		cause
 	})));
 }
-const make$38 = Effect.gen(function* () {
+const make$39 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const execute = (input) => process.run({
 		operation: "AzureDevOpsCli.execute",
@@ -46277,7 +46804,7 @@ const make$38 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$29 = Layer.effect(AzureDevOpsCli, make$38);
+const layer$29 = Layer.effect(AzureDevOpsCli, make$39);
 //#endregion
 //#region src/sourceControl/SourceControlProviderDiscovery.ts
 function firstNonEmptyLine(text) {
@@ -46480,7 +47007,7 @@ function toChangeRequest$5(summary) {
 		isCrossRepository: false
 	};
 }
-const make$37 = Effect.gen(function* () {
+const make$38 = Effect.gen(function* () {
 	const azure = yield* AzureDevOpsCli;
 	return SourceControlProvider.of({
 		kind: "azure-devops",
@@ -46572,7 +47099,7 @@ const make$37 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$37);
+Layer.effect(SourceControlProvider, make$38);
 //#endregion
 //#region src/sourceControl/bitbucketPullRequests.ts
 const BitbucketRepositoryRefSchema = Schema$1.Struct({
@@ -46949,7 +47476,7 @@ function responseError(operation, response) {
 		responseBodyLength: collected.text.length
 	}))));
 }
-const make$36 = Effect.gen(function* () {
+const make$37 = Effect.gen(function* () {
 	const config = yield* BitbucketApiEnvConfig;
 	const httpClient = yield* HttpClient.HttpClient;
 	const fileSystem = yield* FileSystem.FileSystem;
@@ -47165,7 +47692,7 @@ const make$36 = Effect.gen(function* () {
 		})))
 	});
 });
-const layer$27 = Layer.effect(BitbucketApi, make$36);
+const layer$27 = Layer.effect(BitbucketApi, make$37);
 //#endregion
 //#region src/sourceControl/BitbucketSourceControlProvider.ts
 function toChangeRequest$4(summary) {
@@ -47183,7 +47710,7 @@ function toChangeRequest$4(summary) {
 		...summary.headRepositoryOwnerLogin !== void 0 ? { headRepositoryOwnerLogin: summary.headRepositoryOwnerLogin } : {}
 	};
 }
-const make$35 = Effect.gen(function* () {
+const make$36 = Effect.gen(function* () {
 	const bitbucket = yield* BitbucketApi;
 	return SourceControlProvider.of({
 		kind: "bitbucket",
@@ -47274,7 +47801,7 @@ const make$35 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$35);
+Layer.effect(SourceControlProvider, make$36);
 const makeDiscovery = Effect.gen(function* () {
 	return {
 		type: "api",
@@ -47516,7 +48043,7 @@ function deriveRepositoryCloneUrlsFromCreateOutput(stdout, repository) {
 		sshUrl: `git@${fallbackHost}:${repository}.git`
 	};
 }
-const make$34 = Effect.gen(function* () {
+const make$35 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const execute = (input) => process.run({
 		operation: "GitHubCli.execute",
@@ -47634,7 +48161,7 @@ const make$34 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$25 = Layer.effect(GitHubCli, make$34);
+const layer$25 = Layer.effect(GitHubCli, make$35);
 //#endregion
 //#region src/sourceControl/gitHubAuthStatus.ts
 const GitHubAuthStatusAccountSchema = Schema$1.Struct({
@@ -47735,7 +48262,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$33 = Effect.gen(function* () {
+const make$34 = Effect.gen(function* () {
 	const github = yield* GitHubCli;
 	const listChangeRequests = (input) => {
 		if (input.state === "open") return github.listOpenPullRequests({
@@ -47851,7 +48378,7 @@ const make$33 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$33);
+Layer.effect(SourceControlProvider, make$34);
 //#endregion
 //#region src/sourceControl/gitLabMergeRequests.ts
 const GitLabProjectReferenceSchema = Schema$1.Struct({
@@ -48163,7 +48690,7 @@ function parseRepositoryPath(repository) {
 		projectPath
 	};
 }
-const make$32 = Effect.gen(function* () {
+const make$33 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const run = (input, mapError) => process.run({
 		operation: "GitLabCli.execute",
@@ -48314,7 +48841,7 @@ const make$32 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$23 = Layer.effect(GitLabCli, make$32);
+const layer$23 = Layer.effect(GitLabCli, make$33);
 //#endregion
 //#region src/sourceControl/gitLabAuthStatus.ts
 const HOST_LINE_PATTERN = /^(?:[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?|\[[a-f0-9:.]+\])(?::\d+)?$/iu;
@@ -48411,7 +48938,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$31 = Effect.gen(function* () {
+const make$32 = Effect.gen(function* () {
 	const gitlab = yield* GitLabCli;
 	return SourceControlProvider.of({
 		kind: "gitlab",
@@ -48499,7 +49026,7 @@ const make$31 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$31);
+Layer.effect(SourceControlProvider, make$32);
 //#endregion
 //#region src/sourceControl/SourceControlProviderRegistry.ts
 const PROVIDER_DETECTION_CACHE_CAPACITY = 2048;
@@ -48655,12 +49182,12 @@ const makeWithProviders = Effect.fn("makeSourceControlProviderRegistryWithProvid
 		})), { concurrency: "unbounded" })
 	});
 });
-const make$30 = Effect.gen(function* () {
-	const github = yield* make$33;
-	const gitlab = yield* make$31;
-	const bitbucket = yield* make$35;
+const make$31 = Effect.gen(function* () {
+	const github = yield* make$34;
+	const gitlab = yield* make$32;
+	const bitbucket = yield* make$36;
 	const bitbucketDiscovery = yield* makeDiscovery;
-	const azureDevOps = yield* make$37;
+	const azureDevOps = yield* make$38;
 	return yield* makeWithProviders([
 		{
 			kind: "github",
@@ -48684,7 +49211,7 @@ const make$30 = Effect.gen(function* () {
 		}
 	]);
 });
-const layer$21 = Layer.effect(SourceControlProviderRegistry, make$30);
+const layer$21 = Layer.effect(SourceControlProviderRegistry, make$31);
 //#endregion
 //#region src/sourceControl/PrTemplateDetection.ts
 const TEMPLATE_MAX_BYTES = 8e3;
@@ -49054,7 +49581,7 @@ function toPullRequestHeadRemoteInfo(pr) {
 		...pr.headRepositoryOwnerLogin !== void 0 ? { headRepositoryOwnerLogin: pr.headRepositoryOwnerLogin } : {}
 	};
 }
-const make$29 = Effect.gen(function* () {
+const make$30 = Effect.gen(function* () {
 	const gitCore = yield* GitVcsDriver;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
 	const textGeneration = yield* TextGeneration;
@@ -49976,7 +50503,7 @@ const make$29 = Effect.gen(function* () {
 		runStackedAction
 	});
 });
-const layer$20 = Layer.effect(GitManager, make$29);
+const layer$20 = Layer.effect(GitManager, make$30);
 //#endregion
 //#region src/git/GitWorkflowService.ts
 var GitWorkflowService = class extends Context.Service()("@p4code/cli/git/GitWorkflowService") {};
@@ -50013,7 +50540,7 @@ function nonRepositoryListRefs() {
 		totalCount: 0
 	};
 }
-const make$28 = Effect.gen(function* () {
+const make$29 = Effect.gen(function* () {
 	const registry = yield* VcsDriverRegistry;
 	const git = yield* GitVcsDriver;
 	const gitManager = yield* GitManager;
@@ -50099,7 +50626,7 @@ const make$28 = Effect.gen(function* () {
 		renameBranch: (input) => ensureGit("GitWorkflowService.renameBranch", input.cwd).pipe(Effect.andThen(git.renameBranch(input)))
 	});
 });
-const layer$19 = Layer.effect(GitWorkflowService, make$28);
+const layer$19 = Layer.effect(GitWorkflowService, make$29);
 //#endregion
 //#region src/vcs/VcsStatusBroadcaster.ts
 const DEFAULT_VCS_STATUS_REFRESH_INTERVAL = Duration.seconds(30);
@@ -50171,7 +50698,7 @@ function fingerprintStatusPart(status) {
 	return JSON.stringify(status);
 }
 const normalizeCwd = (cwd) => Effect.service(FileSystem.FileSystem).pipe(Effect.flatMap((fs) => fs.realPath(cwd)), Effect.orElseSucceed(() => cwd));
-const make$27 = Effect.gen(function* () {
+const make$28 = Effect.gen(function* () {
 	const workflow = yield* GitWorkflowService;
 	const fs = yield* FileSystem.FileSystem;
 	const changesPubSub = yield* Effect.acquireRelease(PubSub.unbounded(), (pubsub) => PubSub.shutdown(pubsub));
@@ -50395,7 +50922,7 @@ const make$27 = Effect.gen(function* () {
 		streamStatus
 	});
 });
-const layer$18 = Layer.effect(VcsStatusBroadcaster, make$27);
+const layer$18 = Layer.effect(VcsStatusBroadcaster, make$28);
 //#endregion
 //#region src/vcs/VcsProvisioningService.ts
 var VcsProvisioningService = class extends Context.Service()("@p4code/cli/vcs/VcsProvisioningService") {};
@@ -50408,7 +50935,7 @@ function resolveRequestedKind(kind) {
 	}));
 	return Effect.succeed(kind);
 }
-const make$26 = Effect.gen(function* () {
+const make$27 = Effect.gen(function* () {
 	const registry = yield* VcsDriverRegistry;
 	const initRepository = Effect.fn("VcsProvisioningService.initRepository")(function* (input) {
 		const kind = yield* resolveRequestedKind(input.kind);
@@ -50416,11 +50943,11 @@ const make$26 = Effect.gen(function* () {
 	});
 	return VcsProvisioningService.of({ initRepository });
 });
-const layer$17 = Layer.effect(VcsProvisioningService, make$26);
+const layer$17 = Layer.effect(VcsProvisioningService, make$27);
 //#endregion
 //#region src/review/ReviewService.ts
 var ReviewService = class extends Context.Service()("@p4code/cli/review/ReviewService") {};
-const make$25 = Effect.gen(function* () {
+const make$26 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
@@ -50476,7 +51003,7 @@ const make$25 = Effect.gen(function* () {
 	});
 	return ReviewService.of({ getDiffPreview });
 });
-const layer$16 = Layer.effect(ReviewService, make$25);
+const layer$16 = Layer.effect(ReviewService, make$26);
 //#endregion
 //#region src/diagnostics/ProcessDiagnostics.ts
 const PROCESS_QUERY_TIMEOUT_MS = 1e3;
@@ -50771,7 +51298,7 @@ function assertDescendantPid(pid) {
 		}));
 	}));
 }
-const make$24 = Effect.gen(function* () {
+const make$25 = Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const read = Effect.gen(function* () {
 		const readAt = yield* DateTime.now;
@@ -50815,7 +51342,7 @@ const make$24 = Effect.gen(function* () {
 		signal
 	});
 });
-const layer$15 = Layer.effect(ProcessDiagnostics, make$24);
+const layer$15 = Layer.effect(ProcessDiagnostics, make$25);
 //#endregion
 //#region src/diagnostics/ProcessResourceMonitor.ts
 const SAMPLE_INTERVAL_MS = 5e3;
@@ -50966,7 +51493,7 @@ function aggregateProcessResourceHistory(input) {
 		}) : Option.none()
 	};
 }
-const make$23 = Effect.gen(function* () {
+const make$24 = Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const state = yield* Ref.make({
 		samples: [],
@@ -51015,7 +51542,7 @@ const make$23 = Effect.gen(function* () {
 	});
 	return ProcessResourceMonitor.of({ readHistory });
 });
-const layer$14 = Layer.effect(ProcessResourceMonitor, make$23);
+const layer$14 = Layer.effect(ProcessResourceMonitor, make$24);
 //#endregion
 //#region src/diagnostics/TraceDiagnostics.ts
 var TraceFileReadError = class extends Schema$1.TaggedErrorClass()("TraceFileReadError", {
@@ -51263,7 +51790,7 @@ function readTraceFile(fileSystem, path) {
 		cause
 	})) }));
 }
-const make$22 = Effect.gen(function* () {
+const make$23 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const read = Effect.fn("TraceDiagnostics.read")(function* (options) {
 		const readAt = options.readAt ?? (yield* DateTime.now);
@@ -51307,7 +51834,7 @@ const make$22 = Effect.gen(function* () {
 	});
 	return TraceDiagnostics.of({ read });
 });
-const layer$13 = Layer.effect(TraceDiagnostics, make$22);
+const layer$13 = Layer.effect(TraceDiagnostics, make$23);
 function readTraceDiagnostics(options) {
 	return Effect.gen(function* () {
 		return yield* (yield* TraceDiagnostics).read(options);
@@ -51669,7 +52196,7 @@ function isReviewerName(value) {
 	const name = value.trim();
 	return name.length > 0 && !name.startsWith("-");
 }
-const make$21 = Effect.gen(function* () {
+const make$22 = Effect.gen(function* () {
 	const azure = yield* AzureDevOpsCli;
 	const detectArgs = ["--detect", "true"];
 	const executeJson = (input) => azure.execute({
@@ -51869,7 +52396,7 @@ const make$21 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$12 = Layer.effect(AzureDevOpsPullRequestCli, make$21);
+const layer$12 = Layer.effect(AzureDevOpsPullRequestCli, make$22);
 //#endregion
 //#region src/pullRequest/AzureDevOpsPullRequestProvider.ts
 const CAPABILITIES$3 = {
@@ -51944,7 +52471,7 @@ function toChangeRequest$1(pullRequest) {
 		labels: []
 	};
 }
-const make$20 = Effect.gen(function* () {
+const make$21 = Effect.gen(function* () {
 	const cli = yield* AzureDevOpsPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "azure-devops",
@@ -52676,7 +53203,7 @@ function mergeStrategy(method) {
 		default: return "merge_commit";
 	}
 }
-const make$19 = Effect.gen(function* () {
+const make$20 = Effect.gen(function* () {
 	const bitbucket = yield* BitbucketApi;
 	/**
 	* The repository's own path, and the workspace above it — which the people who may review are
@@ -52956,7 +53483,7 @@ const make$19 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid))
 	});
 });
-const layer$11 = Layer.effect(BitbucketPullRequestApi, make$19);
+const layer$11 = Layer.effect(BitbucketPullRequestApi, make$20);
 //#endregion
 //#region src/pullRequest/BitbucketPullRequestProvider.ts
 const CAPABILITIES$2 = {
@@ -53036,7 +53563,7 @@ function toChangeRequest(pullRequest) {
 		labels: []
 	};
 }
-const make$18 = Effect.gen(function* () {
+const make$19 = Effect.gen(function* () {
 	const api = yield* BitbucketPullRequestApi;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "bitbucket",
@@ -54917,7 +55444,7 @@ function actionArgs$1(action, mergeMethod, updateMethod) {
 		case "reopen": return ["reopen"];
 	}
 }
-const make$17 = Effect.gen(function* () {
+const make$18 = 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
@@ -55637,7 +56164,7 @@ const make$17 = Effect.gen(function* () {
 		})))
 	});
 });
-const layer$10 = Layer.effect(GitHubPullRequestCli, make$17);
+const layer$10 = Layer.effect(GitHubPullRequestCli, make$18);
 //#endregion
 //#region src/pullRequest/GitHubPullRequestProvider.ts
 const CAPABILITIES$1 = {
@@ -55752,7 +56279,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$16 = Effect.gen(function* () {
+const make$17 = Effect.gen(function* () {
 	const cli = yield* GitHubPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "github",
@@ -56766,7 +57293,7 @@ function actionArgs(action, mergeMethod) {
 		case "reopen": return ["reopen"];
 	}
 }
-const make$15 = Effect.gen(function* () {
+const make$16 = Effect.gen(function* () {
 	const gitlab = yield* GitLabCli;
 	const api = (input) => gitlab.execute({
 		cwd: input.cwd,
@@ -57337,7 +57864,7 @@ const make$15 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$9 = Layer.effect(GitLabPullRequestCli, make$15);
+const layer$9 = Layer.effect(GitLabPullRequestCli, make$16);
 //#endregion
 //#region src/pullRequest/GitLabPullRequestProvider.ts
 const CAPABILITIES = {
@@ -57417,7 +57944,7 @@ function reasonFor(error) {
 	if (error._tag === "GitLabCliAuthenticationError") return "unauthenticated";
 	return "failed";
 }
-const make$14 = Effect.gen(function* () {
+const make$15 = Effect.gen(function* () {
 	const cli = yield* GitLabPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "gitlab",
@@ -57560,13 +58087,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$13 = Effect.map(Effect.all([
-	make$16,
-	make$14,
-	make$18,
-	make$20
+const make$14 = Effect.map(Effect.all([
+	make$17,
+	make$15,
+	make$19,
+	make$21
 ]), fromProviders);
-const layer$8 = Layer.effect(PullRequestProviderRegistry, make$13).pipe(Layer.provide(layer$10.pipe(Layer.provide(layer$25))), Layer.provide(layer$9.pipe(Layer.provide(layer$23))), Layer.provide(layer$11.pipe(Layer.provide(layer$27))), Layer.provide(layer$12.pipe(Layer.provide(layer$29))));
+const layer$8 = Layer.effect(PullRequestProviderRegistry, make$14).pipe(Layer.provide(layer$10.pipe(Layer.provide(layer$25))), Layer.provide(layer$9.pipe(Layer.provide(layer$23))), Layer.provide(layer$11.pipe(Layer.provide(layer$27))), Layer.provide(layer$12.pipe(Layer.provide(layer$29))));
 //#endregion
 //#region src/pullRequest/PullRequestService.ts
 /**
@@ -57754,7 +58281,7 @@ function repositoryIdentityOf(project) {
 	if (identity.displayName) return identity.displayName;
 	return identity.owner && identity.name ? `${identity.owner}/${identity.name}` : null;
 }
-const make$12 = Effect.gen(function* () {
+const make$13 = Effect.gen(function* () {
 	const registry = yield* PullRequestProviderRegistry;
 	const projections = yield* ProjectionSnapshotQuery;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
@@ -58722,7 +59249,7 @@ const make$12 = Effect.gen(function* () {
 		invalidate
 	});
 });
-const layer$7 = Layer.effect(PullRequestService, make$12);
+const layer$7 = Layer.effect(PullRequestService, make$13);
 //#endregion
 //#region src/sourceControl/SourceControlDiscovery.ts
 const VCS_PROBES = [{
@@ -58741,7 +59268,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$11 = Effect.gen(function* () {
+const make$12 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const process = yield* VcsProcess;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
@@ -58790,7 +59317,7 @@ const make$11 = Effect.gen(function* () {
 		sourceControlProviders: sourceControlProviders.discover
 	}) });
 });
-const layer$6 = Layer.effect(SourceControlDiscovery, make$11);
+const layer$6 = Layer.effect(SourceControlDiscovery, make$12);
 //#endregion
 //#region src/sourceControl/SourceControlRepositoryService.ts
 const isSourceControlRepositoryError = Schema$1.is(SourceControlRepositoryError);
@@ -58823,7 +59350,7 @@ function expandHomePath(input, path) {
 	if (input.startsWith("~/") || input.startsWith("~\\")) return path.join(NodeOS.homedir(), input.slice(2));
 	return input;
 }
-const make$10 = Effect.gen(function* () {
+const make$11 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const git = yield* GitVcsDriver;
@@ -58962,7 +59489,7 @@ const make$10 = Effect.gen(function* () {
 		publishRepository: (input) => publishRepository(input).pipe(mapRepositoryError("publishRepository", input.provider))
 	});
 });
-const layer$5 = Layer.effect(SourceControlRepositoryService, make$10);
+const layer$5 = Layer.effect(SourceControlRepositoryService, make$11);
 //#endregion
 //#region src/ws.ts
 /** Matches `p4c hub token add`, so a token minted here and one minted there are the same thing. */
@@ -59365,6 +59892,23 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker) => WsRpcGroup.t
 				threadId: event.payload.threadId
 			}));
 			case "thread.unarchived": return threadUpsertOrRemove(event.payload.threadId, event.sequence);
+			case "thread-pair.created": return Effect.succeed(Option.some({
+				kind: "thread-pair-upserted",
+				sequence: event.sequence,
+				pair: {
+					id: event.payload.pairId,
+					implementerThreadId: event.payload.implementerThreadId,
+					watcherThreadId: event.payload.watcherThreadId,
+					lastReviewedImplementerSequence: event.payload.lastReviewedImplementerSequence,
+					createdAt: event.payload.createdAt,
+					detachedAt: null
+				}
+			}));
+			case "thread-pair.detached": return Effect.succeed(Option.some({
+				kind: "thread-pair-removed",
+				sequence: event.sequence,
+				pairId: event.payload.pairId
+			}));
 			default:
 				if (event.aggregateKind !== "thread") return Effect.succeed(Option.none());
 				return threadUpsertOrRemove(ThreadId.make(event.aggregateId), event.sequence);
@@ -60186,7 +60730,7 @@ function toPersistenceSqlOrDecodeError(sqlOperation, decodeOperation, correlatio
 		cause
 	});
 }
-const make$9 = Effect.gen(function* () {
+const make$10 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const upsertRuntimeRow = SqlSchema.void({
 		Request: ProviderSessionRuntimeDbRowSchema,
@@ -60289,7 +60833,7 @@ const make$9 = Effect.gen(function* () {
 		deleteByThreadId
 	};
 });
-const layer$4 = Layer.effect(ProviderSessionRuntimeRepository, make$9);
+const layer$4 = Layer.effect(ProviderSessionRuntimeRepository, make$10);
 //#endregion
 //#region src/provider/Errors.ts
 /**
@@ -60943,6 +61487,54 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 			};
 		});
 	});
+	const grantWatchThread = Effect.fn("McpSessionRegistry.grantWatchThread")(function* ({ watcherThreadId, watchedThreadId }) {
+		yield* SynchronizedRef.update(state, ({ records, spawnedThreadIds }) => {
+			const next = new Map(records);
+			for (const [tokenHash, record] of records) {
+				if (record.scope.threadId !== watcherThreadId) continue;
+				next.set(tokenHash, {
+					...record,
+					scope: {
+						...record.scope,
+						capabilities: /* @__PURE__ */ new Set([...record.scope.capabilities, "watch"]),
+						watchThreadIds: /* @__PURE__ */ new Set([...record.scope.watchThreadIds ?? [], watchedThreadId])
+					}
+				});
+			}
+			return {
+				records: next,
+				spawnedThreadIds
+			};
+		});
+	});
+	const revokeWatchThread = Effect.fn("McpSessionRegistry.revokeWatchThread")(function* ({ watcherThreadId, watchedThreadId }) {
+		yield* SynchronizedRef.update(state, ({ records, spawnedThreadIds }) => {
+			const next = new Map(records);
+			for (const [tokenHash, record] of records) {
+				if (record.scope.threadId !== watcherThreadId) continue;
+				const watchThreadIds = new Set(record.scope.watchThreadIds ?? []);
+				watchThreadIds.delete(watchedThreadId);
+				const capabilities = new Set(record.scope.capabilities);
+				if (watchThreadIds.size === 0) capabilities.delete("watch");
+				const { watchThreadIds: _previousWatchThreadIds, ...scopeWithoutWatch } = record.scope;
+				next.set(tokenHash, {
+					...record,
+					scope: watchThreadIds.size > 0 ? {
+						...scopeWithoutWatch,
+						capabilities,
+						watchThreadIds
+					} : {
+						...scopeWithoutWatch,
+						capabilities
+					}
+				});
+			}
+			return {
+				records: next,
+				spawnedThreadIds
+			};
+		});
+	});
 	const recordSpawnedThread = Effect.fn("McpSessionRegistry.recordSpawnedThread")(function* (input) {
 		yield* SynchronizedRef.update(state, ({ records, spawnedThreadIds }) => {
 			const next = new Map(records);
@@ -60964,6 +61556,8 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 		issue,
 		resolve,
 		touch,
+		grantWatchThread,
+		revokeWatchThread,
 		recordSpawnedThread,
 		revokeProviderSession: Effect.fn("McpSessionRegistry.revokeProviderSession")(function* (providerSessionId) {
 			yield* revokeWhere((record) => record.scope.providerSessionId === providerSessionId);
@@ -60978,18 +61572,20 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 	});
 });
 let activeMcpSessionRegistry;
-const make$8 = Effect.acquireRelease(makeWithOptions().pipe(Effect.tap((registry) => Effect.sync(() => {
+const make$9 = Effect.acquireRelease(makeWithOptions().pipe(Effect.tap((registry) => Effect.sync(() => {
 	activeMcpSessionRegistry = registry;
 }))), (registry) => Effect.sync(() => {
 	if (activeMcpSessionRegistry === registry) activeMcpSessionRegistry = void 0;
 }));
-const layer$3 = Layer.effect(McpSessionRegistry, make$8);
+const layer$3 = Layer.effect(McpSessionRegistry, make$9);
 const issueActiveMcpCredential = (request) => activeMcpSessionRegistry ? activeMcpSessionRegistry.revokeThread(request.threadId).pipe(Effect.andThen(activeMcpSessionRegistry.issue(request))) : Effect.sync(() => void 0);
 /**
 * Refreshes the liveness of a thread's MCP credential. Called on every provider
 * turn so an active session is never mistaken for an abandoned one.
 */
 const touchActiveMcpThread = (threadId) => activeMcpSessionRegistry ? activeMcpSessionRegistry.touch(threadId) : Effect.void;
+const grantActiveMcpWatchThread = (input) => activeMcpSessionRegistry ? activeMcpSessionRegistry.grantWatchThread(input) : Effect.void;
+const revokeActiveMcpWatchThread = (input) => activeMcpSessionRegistry ? activeMcpSessionRegistry.revokeWatchThread(input) : Effect.void;
 const revokeActiveMcpThread = (threadId) => activeMcpSessionRegistry ? activeMcpSessionRegistry.revokeThread(threadId) : Effect.void;
 const revokeAllActiveMcpCredentials = () => activeMcpSessionRegistry ? activeMcpSessionRegistry.revokeAll : Effect.void;
 //#endregion
@@ -61075,9 +61671,10 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (options)
 	const directory = yield* ProviderSessionDirectory;
 	const runtimeEventPubSub = yield* PubSub.unbounded();
 	const nowIso = Effect.map(DateTime.now, DateTime.formatIso);
-	const prepareMcpSession = (threadId, providerInstanceId) => issueActiveMcpCredential({
+	const prepareMcpSession = (threadId, providerInstanceId, watchThreadIds) => issueActiveMcpCredential({
 		threadId,
-		providerInstanceId
+		providerInstanceId,
+		...watchThreadIds !== void 0 ? { watchThreadIds } : {}
 	}).pipe(Effect.tap((credential) => credential ? Effect.sync(() => setMcpProviderSession(credential.config)) : Effect.void));
 	const clearMcpSession = (threadId) => revokeActiveMcpThread(threadId).pipe(Effect.tap(() => Effect.sync(() => clearMcpProviderSession(threadId))));
 	const publishRuntimeEvent = (event) => Effect.succeed(event).pipe(Effect.tap((canonicalEvent) => canonicalEventLogger ? canonicalEventLogger.write(canonicalEvent, canonicalEvent.threadId) : Effect.void), Effect.flatMap((canonicalEvent) => PubSub.publish(runtimeEventPubSub, canonicalEvent)), Effect.asVoid);
@@ -61222,7 +61819,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (options)
 			})));
 		}), { discard: true });
 	});
-	const startSession = Effect.fn("startSession")(function* (threadId, rawInput) {
+	const startSession = Effect.fn("startSession")(function* (threadId, rawInput, options) {
 		const parsed = yield* decodeInputOrValidationError({
 			operation: "ProviderService.startSession",
 			schema: ProviderSessionStartInput,
@@ -61258,7 +61855,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (options)
 				"provider.cwd.effective": effectiveCwd ?? ""
 			});
 			const adapter = yield* registry.getByInstance(resolvedInstanceId);
-			yield* prepareMcpSession(threadId, resolvedInstanceId);
+			yield* prepareMcpSession(threadId, resolvedInstanceId, options?.watchThreadIds);
 			const session = yield* adapter.startSession({
 				...input,
 				providerInstanceId: resolvedInstanceId,
@@ -63764,6 +64361,14 @@ function isClaudeInterruptedCause(cause) {
 function resultErrorsText(result) {
 	return "errors" in result && Array.isArray(result.errors) ? result.errors.join(" ").toLowerCase() : "";
 }
+const EDE_DIAGNOSTIC_PREFIX = "[ede_diagnostic]";
+const CLAUDE_PENDING_TOOL_FAILURE_MESSAGE = "Claude stopped while a tool call was still pending.";
+function resultErrorMessage(result) {
+	if (result.subtype === "success") return;
+	const userFacingError = result.errors.find((error) => !error.trimStart().startsWith(EDE_DIAGNOSTIC_PREFIX));
+	if (userFacingError !== void 0) return userFacingError;
+	return result.stop_reason === "tool_use" && result.errors.length > 0 ? CLAUDE_PENDING_TOOL_FAILURE_MESSAGE : void 0;
+}
 function isInterruptedResult(result) {
 	const errors = resultErrorsText(result);
 	if (errors.includes("interrupt")) return true;
@@ -65525,7 +66130,7 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 		const interruptRequested = context.interruptRequested;
 		context.interruptRequested = false;
 		const status = turnStatusFromResult(message, interruptRequested);
-		const errorMessage = message.subtype === "success" ? void 0 : message.errors[0];
+		const errorMessage = resultErrorMessage(message);
 		if (status === "failed") yield* emitRuntimeError(context, errorMessage ?? "Claude turn failed.");
 		yield* completeTurn(context, status, errorMessage, message);
 		yield* drainPendingTurns(context);
@@ -85025,7 +85630,7 @@ const makeTerminationError$1 = (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$7 = Effect.fn("effect-codex-app-server/CodexAppServerClient.make")(function* (stdio, options = {}, terminationError) {
+const make$8 = Effect.fn("effect-codex-app-server/CodexAppServerClient.make")(function* (stdio, options = {}, terminationError) {
 	const requestHandlers = /* @__PURE__ */ new Map();
 	const notificationHandlers = /* @__PURE__ */ new Map();
 	let unknownRequestHandler;
@@ -85092,7 +85697,7 @@ const make$7 = Effect.fn("effect-codex-app-server/CodexAppServerClient.make")(fu
 const layerChildProcess$1 = (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$7(makeChildStdio$1(handle), options, makeTerminationError$1(handle));
+	return yield* make$8(makeChildStdio$1(handle), options, makeTerminationError$1(handle));
 });
 //#endregion
 //#region src/provider/Layers/CodexProvider.ts
@@ -91150,7 +91755,7 @@ const makeTerminationError = (handle) => Effect.match(handle.exitCode, {
 //#endregion
 //#region ../../packages/effect-acp/src/client.ts
 var AcpClient = class extends Context.Service()("effect-acp/client/AcpClient") {};
-const make$6 = Effect.fn("effect-acp/AcpClient.make")(function* (stdio, options = {}, terminationError) {
+const make$7 = Effect.fn("effect-acp/AcpClient.make")(function* (stdio, options = {}, terminationError) {
 	const coreHandlers = {};
 	const notificationHandlers = {
 		sessionUpdate: {
@@ -91308,7 +91913,7 @@ const make$6 = Effect.fn("effect-acp/AcpClient.make")(function* (stdio, options
 const layerChildProcess = (handle, options = {}) => {
 	const stdio = makeChildStdio(handle);
 	const terminationError = makeTerminationError(handle);
-	return Layer.effect(AcpClient, make$6(stdio, options, terminationError));
+	return Layer.effect(AcpClient, make$7(stdio, options, terminationError));
 };
 //#endregion
 //#region ../../packages/shared/src/toolActivity.ts
@@ -91768,7 +92373,7 @@ function formatConfigOptionValue(value) {
 const defaultSessionLoadTimeout = Duration.seconds(90);
 const defaultSessionLoadReplayIdleGap = Duration.seconds(2);
 var AcpSessionRuntime = class extends Context.Service()("@p4code/cli/provider/acp/AcpSessionRuntime") {};
-const make$5 = (options) => Effect.gen(function* () {
+const make$6 = (options) => Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const runtimeScope = yield* Scope.Scope;
@@ -92077,7 +92682,7 @@ const make$5 = (options) => Effect.gen(function* () {
 		notify: acp.raw.notify
 	};
 });
-const layer$2 = (options) => Layer.effect(AcpSessionRuntime, make$5(options));
+const layer$2 = (options) => Layer.effect(AcpSessionRuntime, make$6(options));
 function sessionConfigOptionsFromSetup(response) {
 	return response?.configOptions ?? [];
 }
@@ -99464,7 +100069,7 @@ const stringField = (record, key) => {
 	const value = record[key];
 	return typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
 };
-const make$4 = Effect.gen(function* () {
+const make$5 = Effect.gen(function* () {
 	const linear = yield* LinearClient;
 	return { resolve: Effect.fn("TicketResolver.resolve")(function* (reference) {
 		const identifier = parseTicketReference(reference);
@@ -99495,7 +100100,7 @@ const make$4 = Effect.gen(function* () {
 		};
 	}) };
 });
-const layer$1 = Layer.effect(TicketResolver, make$4);
+const layer$1 = Layer.effect(TicketResolver, make$5);
 //#endregion
 //#region src/mcp/toolkits/tasks/tools.ts
 const dependencies = [McpInvocationContext, TaskRepository];
@@ -100601,17 +101206,22 @@ var ProviderRuntimeIngestionService = class extends Context.Service()("@p4code/c
 */
 var ThreadDeletionReactor = class extends Context.Service()("@p4code/cli/orchestration/Services/ThreadDeletionReactor") {};
 //#endregion
+//#region src/orchestration/Services/FusionWatcherReactor.ts
+var FusionWatcherReactor = class extends Context.Service()("@p4code/cli/orchestration/Services/FusionWatcherReactor") {};
+//#endregion
 //#region src/orchestration/Layers/OrchestrationReactor.ts
 const makeOrchestrationReactor = Effect.gen(function* () {
 	const providerRuntimeIngestion = yield* ProviderRuntimeIngestionService;
 	const providerCommandReactor = yield* ProviderCommandReactor;
 	const checkpointReactor = yield* CheckpointReactor;
 	const threadDeletionReactor = yield* ThreadDeletionReactor;
+	const fusionWatcherReactor = yield* FusionWatcherReactor;
 	return { start: Effect.fn("start")(function* () {
 		yield* providerRuntimeIngestion.start();
 		yield* providerCommandReactor.start();
 		yield* checkpointReactor.start();
 		yield* threadDeletionReactor.start();
+		yield* fusionWatcherReactor.start();
 	}) };
 });
 const OrchestrationReactorLive = Layer.effect(OrchestrationReactor, makeOrchestrationReactor);
@@ -101193,7 +101803,7 @@ function runtimeEventToActivities(event, taskTitle, compressMode) {
 	}
 	return [];
 }
-const make$3 = Effect.gen(function* () {
+const make$4 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const orchestrationEngine = yield* OrchestrationEngineService;
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
@@ -101696,6 +102306,14 @@ const make$3 = Effect.gen(function* () {
 					updatedAt: now
 				});
 			}
+			if (shouldApplyThreadLifecycle) yield* orchestrationEngine.dispatch({
+				type: "thread.turn.complete",
+				commandId: yield* providerCommandId(event, "thread-turn-complete"),
+				threadId: thread.id,
+				...turnId ? { turnId } : {},
+				state: normalizeRuntimeTurnState(event.payload.state),
+				completedAt: now
+			});
 		}
 		if (event.type === "session.exited") yield* clearTurnStateForSession(thread.id);
 		if (event.type === "runtime.error") {
@@ -101794,7 +102412,7 @@ const make$3 = Effect.gen(function* () {
 		drain: worker.drain
 	};
 });
-const ProviderRuntimeIngestionLive = Layer.effect(ProviderRuntimeIngestionService, make$3).pipe(Layer.provide(ProjectionTurnRepositoryLive));
+const ProviderRuntimeIngestionLive = Layer.effect(ProviderRuntimeIngestionService, make$4).pipe(Layer.provide(ProjectionTurnRepositoryLive));
 //#endregion
 //#region src/provider/userInvokedSkills.ts
 /**
@@ -101980,7 +102598,7 @@ function buildGeneratedWorktreeBranchName(raw) {
 	const branchFragment = (normalized.startsWith(`p4code/`) ? normalized.slice(`${WORKTREE_BRANCH_PREFIX}/`.length) : normalized).replace(/[^a-z0-9/_-]+/g, "-").replace(/\/+/g, "/").replace(/-+/g, "-").replace(/^[./_-]+|[./_-]+$/g, "").slice(0, 64).replace(/[./_-]+$/g, "");
 	return `${WORKTREE_BRANCH_PREFIX}/${branchFragment.length > 0 ? branchFragment : "update"}`;
 }
-const make$2 = Effect.gen(function* () {
+const make$3 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const orchestrationEngine = yield* OrchestrationEngineService;
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
@@ -102188,6 +102806,11 @@ const make$2 = Effect.gen(function* () {
 		if (!thread) return yield* Effect.die(/* @__PURE__ */ new Error(`Thread '${threadId}' was not found in read model.`));
 		const desiredRuntimeMode = thread.runtimeMode;
 		const requestedModelSelection = options?.modelSelection;
+		const watchThreadIds = ((yield* projectionSnapshotQuery.getCommandReadModel()).threadPairs ?? []).filter((pair) => pair.detachedAt === null && pair.watcherThreadId === threadId).map((pair) => pair.implementerThreadId);
+		yield* Effect.forEach(watchThreadIds, (watchedThreadId) => grantActiveMcpWatchThread({
+			watcherThreadId: threadId,
+			watchedThreadId
+		}), { discard: true });
 		const resolveActiveSession = (threadId) => providerService.listSessions().pipe(Effect.map((sessions) => sessions.find((session) => session.threadId === threadId)));
 		const activeSession = yield* resolveActiveSession(threadId);
 		const activeThreadSession = thread.session !== null && thread.session.status !== "stopped" && activeSession ? thread.session : null;
@@ -102277,7 +102900,7 @@ const make$2 = Effect.gen(function* () {
 				runtimeMode: desiredRuntimeMode,
 				compressMode: thread.compressMode,
 				unpromptedSubagents: thread.unpromptedSubagents
-			});
+			}, watchThreadIds.length > 0 ? { watchThreadIds } : void 0);
 		};
 		const bindSessionToThread = (session) => Effect.gen(function* () {
 			if (session.providerInstanceId === void 0) return yield* new ProviderAdapterRequestError({
@@ -102386,7 +103009,7 @@ const make$2 = Effect.gen(function* () {
 		const modelForTurn = sessionModelSwitch === "unsupported" && input.modelSelection === void 0 ? activeSession?.model !== void 0 ? {
 			...requestedModelSelection,
 			model: activeSession.model
-		} : requestedModelSelection : input.modelSelection;
+		} : requestedModelSelection : requestedModelSelection;
 		const compressMode = thread.compressMode;
 		const hasSessionLevelRuleset = activeSession?.provider === "claudeAgent" || activeSession?.provider === "codex";
 		const rebuildsRulesetEachTurn = activeSession?.provider === "codex";
@@ -102695,7 +103318,7 @@ const make$2 = Effect.gen(function* () {
 		drain: worker.drain
 	};
 });
-const ProviderCommandReactorLive = Layer.effect(ProviderCommandReactor, make$2);
+const ProviderCommandReactorLive = Layer.effect(ProviderCommandReactor, make$3);
 //#endregion
 //#region src/checkpointing/Diffs.ts
 function parseTurnDiffFilesFromUnifiedDiff(diff) {
@@ -102725,7 +103348,7 @@ function checkpointStatusFromRuntime(status) {
 		default: return "ready";
 	}
 }
-const make$1 = Effect.gen(function* () {
+const make$2 = 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}`)));
@@ -103207,7 +103830,106 @@ const make$1 = Effect.gen(function* () {
 		drain: worker.drain
 	};
 });
-const CheckpointReactorLive = Layer.effect(CheckpointReactor, make$1);
+const CheckpointReactorLive = Layer.effect(CheckpointReactor, make$2);
+//#endregion
+//#region src/orchestration/Layers/FusionWatcherReactor.ts
+const reviewCommandId = (pairId, sequence) => CommandId.make(`server:fusion:${pairId}:review:${sequence}`);
+const cursorCommandId = (pairId, sequence) => CommandId.make(`server:fusion:${pairId}:cursor:${sequence}`);
+const reviewMessageId = (pairId, sequence) => MessageId.make(`fusion-review:${pairId}:${sequence}`);
+const watcherPrompt = (input) => `${FUSION_REVIEW_PROMPT_PREFIX}
+Review implementer thread ${input.implementerThreadId} after its accepted turn completion.
+
+Call thread_watch_events with threadId ${input.implementerThreadId} and afterSequence ${input.afterSequence}. Continue paging through sequence ${input.throughSequence}. Inspect repository state when useful.
+
+Report only a concrete objection: correctness risk, missed requirement, regression, unsafe change, or unnecessary scope. Cite evidence. If no objection exists, return exactly ${FUSION_NO_OBJECTION_TEXT} and nothing else. This marker is hidden from the transcript.`;
+const make$1 = Effect.gen(function* () {
+	const orchestrationEngine = yield* OrchestrationEngineService;
+	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
+	const processReview = Effect.fn("FusionWatcherReactor.processReview")(function* (pair, completion) {
+		const readModel = yield* projectionSnapshotQuery.getCommandReadModel();
+		const currentPair = (readModel.threadPairs ?? []).find((candidate) => candidate.id === pair.id);
+		if (currentPair === void 0 || currentPair.detachedAt !== null || completion.sequence <= currentPair.lastReviewedImplementerSequence) return;
+		const watcher = readModel.threads.find((thread) => thread.id === currentPair.watcherThreadId && thread.deletedAt === null);
+		if (watcher === void 0) return;
+		yield* orchestrationEngine.dispatch({
+			type: "thread.turn.start",
+			commandId: reviewCommandId(currentPair.id, completion.sequence),
+			threadId: watcher.id,
+			message: {
+				messageId: reviewMessageId(currentPair.id, completion.sequence),
+				role: "user",
+				text: watcherPrompt({
+					implementerThreadId: currentPair.implementerThreadId,
+					afterSequence: currentPair.lastReviewedImplementerSequence,
+					throughSequence: completion.sequence
+				}),
+				attachments: []
+			},
+			runtimeMode: watcher.runtimeMode,
+			interactionMode: watcher.interactionMode,
+			compressMode: watcher.compressMode,
+			unpromptedSubagents: watcher.unpromptedSubagents,
+			createdAt: completion.occurredAt
+		});
+		yield* orchestrationEngine.dispatch({
+			type: "thread-pair.cursor.advance",
+			commandId: cursorCommandId(currentPair.id, completion.sequence),
+			pairId: currentPair.id,
+			implementerSequence: completion.sequence,
+			advancedAt: completion.occurredAt
+		});
+	});
+	const catchUpPair = Effect.fn("FusionWatcherReactor.catchUpPair")(function* (pair, throughSequence) {
+		if (throughSequence <= pair.lastReviewedImplementerSequence) return;
+		const completions = (yield* orchestrationEngine.readEvents(pair.lastReviewedImplementerSequence, throughSequence - pair.lastReviewedImplementerSequence).pipe(Stream.takeWhile((event) => event.sequence <= throughSequence), Stream.runCollect)).filter((event) => event.type === "thread.turn-completed" && event.payload.threadId === pair.implementerThreadId);
+		for (const completion of completions) yield* processReview(pair, completion);
+	});
+	const processCompletion = Effect.fn("FusionWatcherReactor.processCompletion")(function* (event) {
+		const pairs = ((yield* projectionSnapshotQuery.getCommandReadModel()).threadPairs ?? []).filter((pair) => pair.detachedAt === null && pair.implementerThreadId === event.payload.threadId && event.sequence > pair.lastReviewedImplementerSequence);
+		yield* Effect.forEach(pairs, (pair) => catchUpPair(pair, event.sequence), {
+			concurrency: 1,
+			discard: true
+		});
+	});
+	const processEvent = Effect.fn("FusionWatcherReactor.processEvent")(function* (event) {
+		if (event.type === "thread.turn-completed") {
+			yield* processCompletion(event);
+			return;
+		}
+		if (event.type === "thread-pair.created") {
+			yield* grantActiveMcpWatchThread({
+				watcherThreadId: event.payload.watcherThreadId,
+				watchedThreadId: event.payload.implementerThreadId
+			});
+			return;
+		}
+		const pair = ((yield* projectionSnapshotQuery.getCommandReadModel()).threadPairs ?? []).find((candidate) => candidate.id === event.payload.pairId);
+		if (pair === void 0) return;
+		yield* revokeActiveMcpWatchThread({
+			watcherThreadId: pair.watcherThreadId,
+			watchedThreadId: pair.implementerThreadId
+		});
+	});
+	const processSafely = (event) => processEvent(event).pipe(Effect.catchCause((cause) => {
+		if (Cause.hasInterruptsOnly(cause)) return Effect.failCause(cause);
+		return Effect.logWarning("fusion watcher reactor failed to process completion", {
+			eventType: event.type,
+			sequence: event.sequence,
+			cause: Cause.pretty(cause)
+		});
+	}));
+	const worker = yield* makeDrainableWorker(processSafely);
+	const enqueueEvent = (event) => event.type === "thread.turn-completed" || event.type === "thread-pair.created" || event.type === "thread-pair.detached" ? worker.enqueue(event) : Effect.void;
+	return {
+		start: Effect.fn("FusionWatcherReactor.start")(function* () {
+			yield* Effect.forkScoped(Stream.runForEach(orchestrationEngine.streamDomainEvents, enqueueEvent));
+			const headSequence = yield* orchestrationEngine.latestSequence;
+			yield* Stream.runForEach(orchestrationEngine.readEvents(0, Math.max(1, headSequence)), enqueueEvent).pipe(Effect.catchCause((cause) => Effect.logWarning("fusion watcher reactor failed historical replay", { cause: Cause.pretty(cause) })));
+		}),
+		drain: worker.drain
+	};
+});
+const FusionWatcherReactorLive = Layer.effect(FusionWatcherReactor, make$1);
 //#endregion
 //#region src/orchestration/Layers/ThreadDeletionReactor.ts
 const logCleanupCauseUnlessInterrupted = ({ effect, message, threadId }) => effect.pipe(Effect.catchCause((cause) => {
@@ -103969,7 +104691,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(RuntimeReceiptBusLive));
+const ReactorLayerLive = Layer.empty.pipe(Layer.provideMerge(OrchestrationReactorLive), Layer.provideMerge(ProviderRuntimeIngestionLive), Layer.provideMerge(ProviderCommandReactorLive), Layer.provideMerge(CheckpointReactorLive), Layer.provideMerge(ThreadDeletionReactorLive), Layer.provideMerge(FusionWatcherReactorLive), Layer.provideMerge(RuntimeReceiptBusLive));
 const ProviderSessionDirectoryLayerLive = ProviderSessionDirectoryLive.pipe(Layer.provide(layer$4));
 const ProviderLayerLive = ProviderServiceLive.pipe(Layer.provide(ProviderAdapterRegistryLive), Layer.provideMerge(ProviderSessionDirectoryLayerLive));
 const PersistenceLayerLive = Layer.empty.pipe(Layer.provideMerge(layerConfig));