@p4code/cli 0.3.24 → 0.3.26

package/dist/bin.mjs

@@ -127,7 +127,7 @@ const closeServer = (server) => {
 * NetService - Service tag for startup networking helpers.
 */
 var NetService = class extends Context.Service()("@p4code/shared/Net/NetService") {};
-const make$91 = () => {
+const make$92 = () => {
 	/**
 	* Returns true when a TCP server can bind to {host, port}.
 	* `EADDRNOTAVAIL` is treated as available so IPv6-absent hosts don't fail
@@ -236,10 +236,10 @@ const make$91 = () => {
 		})
 	};
 };
-const layer$82 = Layer.sync(NetService, make$91);
+const layer$82 = Layer.sync(NetService, make$92);
 //#endregion
 //#region package.json
-var version = "0.3.24";
+var version = "0.3.26";
 //#endregion
 //#region src/config.ts
 /**
@@ -260,8 +260,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$90 = (config) => ServerConfig$1.of(config);
-const layer$81 = (config) => Layer.succeed(ServerConfig$1, make$90(config));
+const make$91 = (config) => ServerConfig$1.of(config);
+const layer$81 = (config) => Layer.succeed(ServerConfig$1, make$91(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");
@@ -1333,6 +1333,12 @@ const ExecutionEnvironmentCapabilities = Schema$1.Struct({
 	/** Server understands thread.pin / thread.unpin / thread.pin.reorder
 	commands. Same version-skew contract as threadSettlement. */
 	threadPinning: Schema$1.optionalKey(Schema$1.Boolean),
+	/** Server understands the thread.fork command. Same version-skew contract
+	as threadSettlement. */
+	threadFork: Schema$1.optionalKey(Schema$1.Boolean),
+	/** Server understands thread.scheduled-task.create / cancel and fires
+	pending tasks. Same version-skew contract as threadSettlement. */
+	threadScheduledTasks: Schema$1.optionalKey(Schema$1.Boolean),
 	/** Server exposes the pull-request list, detail, activity, diff, and mutation APIs. Absent on
 	servers from before the pull-request workspace shipped, so clients must not probe them. */
 	pullRequests: Schema$1.optionalKey(Schema$1.Boolean),
@@ -1595,7 +1601,7 @@ const PREFERRED_DEFAULT_CODEX_MODELS = ["gpt-5.6-sol", "gpt-5.6-terra"];
 const DEFAULT_TEXT_GENERATION_MODEL = "gpt-5.6-luna";
 const DEFAULT_MODEL_BY_PROVIDER = {
 	[CODEX_DRIVER_KIND]: DEFAULT_MODEL,
-	[CLAUDE_DRIVER_KIND]: "claude-sonnet-5",
+	[CLAUDE_DRIVER_KIND]: "claude-fable-5-1",
 	[CURSOR_DRIVER_KIND]: "auto",
 	[GROK_DRIVER_KIND$1]: "grok-build",
 	[MUSE_DRIVER_KIND]: "muse-spark-1.2",
@@ -1877,6 +1883,31 @@ const OrchestrationProposedPlan = Schema$1.Struct({
 	createdAt: IsoDateTime,
 	updatedAt: IsoDateTime
 });
+const OrchestrationScheduledTaskId = TrimmedNonEmptyString;
+const OrchestrationScheduledTaskStatus = Schema$1.Literals([
+	"pending",
+	"fired",
+	"failed",
+	"cancelled"
+]);
+/**
+* A prompt the server sends to a thread at a chosen time. Pending tasks are
+* the live ones: firing starts a turn with `prompt`, cancelling is the way
+* out before that. A task whose turn could not start after bounded retries
+* ends `failed` with `failure` explaining why; it can be dismissed or
+* scheduled again from the client.
+*/
+const OrchestrationScheduledTask = Schema$1.Struct({
+	id: OrchestrationScheduledTaskId,
+	prompt: TrimmedNonEmptyString,
+	runAt: IsoDateTime,
+	status: OrchestrationScheduledTaskStatus,
+	createdAt: IsoDateTime,
+	updatedAt: IsoDateTime,
+	firedAt: Schema$1.NullOr(IsoDateTime).pipe(Schema$1.withDecodingDefault(Effect.succeed(null))),
+	cancelledAt: Schema$1.NullOr(IsoDateTime).pipe(Schema$1.withDecodingDefault(Effect.succeed(null))),
+	failure: Schema$1.NullOr(Schema$1.String).pipe(Schema$1.withDecodingDefault(Effect.succeed(null)))
+});
 const SourceProposedPlanReference = Schema$1.Struct({
 	threadId: ThreadId,
 	planId: OrchestrationProposedPlanId
@@ -1996,6 +2027,7 @@ const OrchestrationThread = Schema$1.Struct({
 	deletedAt: Schema$1.NullOr(IsoDateTime),
 	messages: Schema$1.Array(OrchestrationMessage),
 	proposedPlans: Schema$1.Array(OrchestrationProposedPlan).pipe(Schema$1.withDecodingDefault(Effect.succeed([]))),
+	scheduledTasks: Schema$1.optional(Schema$1.Array(OrchestrationScheduledTask)),
 	activities: Schema$1.Array(OrchestrationThreadActivity),
 	checkpoints: Schema$1.Array(OrchestrationCheckpointSummary),
 	session: Schema$1.NullOr(OrchestrationSession)
@@ -2266,6 +2298,44 @@ const ThreadCreateCommand = Schema$1.Struct({
 	worktreePath: Schema$1.NullOr(TrimmedNonEmptyString),
 	createdAt: IsoDateTime
 });
+/**
+* Creates a new thread from an existing one. The decider copies the source
+* thread's configuration and the projections copy its conversation, so the
+* fork opens with the same context while the source stays untouched.
+*/
+const ThreadForkCommand = Schema$1.Struct({
+	type: Schema$1.Literal("thread.fork"),
+	commandId: CommandId,
+	sourceThreadId: ThreadId,
+	threadId: ThreadId,
+	title: Schema$1.optional(TrimmedNonEmptyString),
+	createdAt: IsoDateTime
+});
+const ThreadScheduledTaskCreateCommand = Schema$1.Struct({
+	type: Schema$1.Literal("thread.scheduled-task.create"),
+	commandId: CommandId,
+	threadId: ThreadId,
+	taskId: OrchestrationScheduledTaskId,
+	prompt: TrimmedNonEmptyString,
+	runAt: IsoDateTime,
+	createdAt: IsoDateTime
+});
+const ThreadScheduledTaskCancelCommand = Schema$1.Struct({
+	type: Schema$1.Literal("thread.scheduled-task.cancel"),
+	commandId: CommandId,
+	threadId: ThreadId,
+	taskId: OrchestrationScheduledTaskId,
+	cancelledAt: IsoDateTime
+});
+/** Server-only: records that the scheduler fired (or failed to fire) a task. */
+const ThreadScheduledTaskFireCommand = Schema$1.Struct({
+	type: Schema$1.Literal("thread.scheduled-task.fire"),
+	commandId: CommandId,
+	threadId: ThreadId,
+	taskId: OrchestrationScheduledTaskId,
+	firedAt: IsoDateTime,
+	failure: Schema$1.optional(Schema$1.String)
+});
 const ThreadDeleteCommand = Schema$1.Struct({
 	type: Schema$1.Literal("thread.delete"),
 	commandId: CommandId,
@@ -2513,6 +2583,9 @@ const DispatchableClientOrchestrationCommand = Schema$1.Union([
 	ProjectMetaUpdateCommand,
 	ProjectDeleteCommand,
 	ThreadCreateCommand,
+	ThreadForkCommand,
+	ThreadScheduledTaskCreateCommand,
+	ThreadScheduledTaskCancelCommand,
 	ThreadDeleteCommand,
 	ThreadArchiveCommand,
 	ThreadUnarchiveCommand,
@@ -2544,6 +2617,9 @@ const ClientOrchestrationCommand = Schema$1.Union([
 	ProjectMetaUpdateCommand,
 	ProjectDeleteCommand,
 	ThreadCreateCommand,
+	ThreadForkCommand,
+	ThreadScheduledTaskCreateCommand,
+	ThreadScheduledTaskCancelCommand,
 	ThreadDeleteCommand,
 	ThreadArchiveCommand,
 	ThreadUnarchiveCommand,
@@ -2698,7 +2774,8 @@ const InternalOrchestrationCommand = Schema$1.Union([
 	ThreadProposedPlanUpsertCommand,
 	ThreadTurnDiffCompleteCommand,
 	ThreadActivityAppendCommand,
-	ThreadRevertCompleteCommand
+	ThreadRevertCompleteCommand,
+	ThreadScheduledTaskFireCommand
 ]);
 Schema$1.Union([DispatchableClientOrchestrationCommand, InternalOrchestrationCommand]);
 const OrchestrationEventType = Schema$1.Literals([
@@ -2732,6 +2809,9 @@ const OrchestrationEventType = Schema$1.Literals([
 	"thread.session-force-stop-requested",
 	"thread.session-set",
 	"thread.proposed-plan-upserted",
+	"thread.scheduled-task.created",
+	"thread.scheduled-task.cancelled",
+	"thread.scheduled-task.fired",
 	"thread.turn-diff-completed",
 	"thread.activity-appended",
 	"thread.turn-completed",
@@ -2786,6 +2866,11 @@ const ThreadCreatedPayload$1 = Schema$1.Struct({
 	unpromptedSubagents: Schema$1.Boolean.pipe(Schema$1.withDecodingDefault(Effect.succeed(true))),
 	branch: Schema$1.NullOr(TrimmedNonEmptyString),
 	worktreePath: Schema$1.NullOr(TrimmedNonEmptyString),
+	/**
+	* Set when the thread was forked: projections copy the source thread's
+	* messages into this one. Optional so events from pre-fork servers decode.
+	*/
+	forkedFromThreadId: Schema$1.optional(ThreadId),
 	createdAt: IsoDateTime,
 	updatedAt: IsoDateTime
 });
@@ -2998,6 +3083,21 @@ const ThreadProposedPlanUpsertedPayload$1 = Schema$1.Struct({
 	threadId: ThreadId,
 	proposedPlan: OrchestrationProposedPlan
 });
+const ThreadScheduledTaskCreatedPayload$1 = Schema$1.Struct({
+	threadId: ThreadId,
+	task: OrchestrationScheduledTask
+});
+const ThreadScheduledTaskCancelledPayload$1 = Schema$1.Struct({
+	threadId: ThreadId,
+	taskId: OrchestrationScheduledTaskId,
+	cancelledAt: IsoDateTime
+});
+const ThreadScheduledTaskFiredPayload$1 = Schema$1.Struct({
+	threadId: ThreadId,
+	taskId: OrchestrationScheduledTaskId,
+	firedAt: IsoDateTime,
+	failure: Schema$1.NullOr(Schema$1.String).pipe(Schema$1.withDecodingDefault(Effect.succeed(null)))
+});
 const ThreadTurnDiffCompletedPayload$1 = Schema$1.Struct({
 	threadId: ThreadId,
 	turnId: TurnId,
@@ -3185,6 +3285,21 @@ const OrchestrationEvent = Schema$1.Union([
 		type: Schema$1.Literal("thread.proposed-plan-upserted"),
 		payload: ThreadProposedPlanUpsertedPayload$1
 	}),
+	Schema$1.Struct({
+		...EventBaseFields,
+		type: Schema$1.Literal("thread.scheduled-task.created"),
+		payload: ThreadScheduledTaskCreatedPayload$1
+	}),
+	Schema$1.Struct({
+		...EventBaseFields,
+		type: Schema$1.Literal("thread.scheduled-task.cancelled"),
+		payload: ThreadScheduledTaskCancelledPayload$1
+	}),
+	Schema$1.Struct({
+		...EventBaseFields,
+		type: Schema$1.Literal("thread.scheduled-task.fired"),
+		payload: ThreadScheduledTaskFiredPayload$1
+	}),
 	Schema$1.Struct({
 		...EventBaseFields,
 		type: Schema$1.Literal("thread.turn-diff-completed"),
@@ -5163,6 +5278,11 @@ const PREVIEW_AUTOMATION_OPERATIONS = [
 const PreviewAutomationOperation = Schema.Literals(PREVIEW_AUTOMATION_OPERATIONS);
 const PreviewAutomationTabTargetFields = { tabId: Schema.optional(PreviewTabId.annotate({ description: "Exact collaborative browser tab to target. Omit to use this agent session's current tab." })).annotate({ description: "Exact collaborative browser tab to target. Omit to use this agent session's current tab." }) };
 const PreviewAutomationTabTargetInput = Schema.Struct(PreviewAutomationTabTargetFields);
+const INCLUDE_SCREENSHOT_DESCRIPTION = "Attach a PNG screenshot to the result. Omit it for the text-only page state, which already carries locators, visible text, and diagnostics; every attached image stays in the agent's context for the rest of the session.";
+const PreviewAutomationSnapshotInput = Schema.Struct({
+	...PreviewAutomationTabTargetFields,
+	includeScreenshot: Schema.optional(Schema.Boolean.annotate({ description: INCLUDE_SCREENSHOT_DESCRIPTION })).annotate({ description: INCLUDE_SCREENSHOT_DESCRIPTION })
+});
 const PreviewAutomationStatus = Schema.Struct({
 	available: Schema.Boolean,
 	visible: Schema.Boolean,
@@ -5834,6 +5954,7 @@ const ContextMenuItemSchema = Schema$1.Struct({
 	header: Schema$1.optionalKey(Schema$1.Boolean),
 	separator: Schema$1.optionalKey(Schema$1.Boolean),
 	icon: Schema$1.optionalKey(Schema$1.String),
+	shortcut: Schema$1.optionalKey(Schema$1.String),
 	children: Schema$1.optionalKey(Schema$1.Array(Schema$1.suspend(() => ContextMenuItemSchema)))
 });
 const DesktopUpdateStatusSchema = Schema$1.Literals([
@@ -8156,7 +8277,9 @@ const ClientSettingsSchema = Schema$1.Struct({
 	})).pipe(Schema$1.withDecodingDefault(Effect.succeed([]))),
 	providerModelPreferences: Schema$1.Record(ProviderInstanceId, Schema$1.Struct({
 		hiddenModels: Schema$1.Array(Schema$1.String).pipe(Schema$1.withDecodingDefault(Effect.succeed([]))),
-		modelOrder: Schema$1.Array(Schema$1.String).pipe(Schema$1.withDecodingDefault(Effect.succeed([])))
+		modelOrder: Schema$1.Array(Schema$1.String).pipe(Schema$1.withDecodingDefault(Effect.succeed([]))),
+		/** Option values a model starts with in this instance until the user picks others. */
+		modelOptionDefaults: Schema$1.Record(TrimmedNonEmptyString, ProviderOptionSelections).pipe(Schema$1.withDecodingDefault(Effect.succeed({})))
 	})).pipe(Schema$1.withDecodingDefault(Effect.succeed({}))),
 	showBuildModeToggle: Schema$1.Boolean.pipe(Schema$1.withDecodingDefault(Effect.succeed(false))),
 	sidebarAutoSettleAfterDays: Schema$1.NullOr(SidebarAutoSettleAfterDays).pipe(Schema$1.withDecodingDefault(Effect.succeed(3))),
@@ -8614,7 +8737,8 @@ Schema$1.Struct({
 	}))),
 	providerModelPreferences: Schema$1.optionalKey(Schema$1.Record(ProviderInstanceId, Schema$1.Struct({
 		hiddenModels: Schema$1.Array(Schema$1.String).pipe(Schema$1.withDecodingDefault(Effect.succeed([]))),
-		modelOrder: Schema$1.Array(Schema$1.String).pipe(Schema$1.withDecodingDefault(Effect.succeed([])))
+		modelOrder: Schema$1.Array(Schema$1.String).pipe(Schema$1.withDecodingDefault(Effect.succeed([]))),
+		modelOptionDefaults: Schema$1.Record(TrimmedNonEmptyString, ProviderOptionSelections).pipe(Schema$1.withDecodingDefault(Effect.succeed({})))
 	}))),
 	showBuildModeToggle: Schema$1.optionalKey(Schema$1.Boolean),
 	sidebarAutoSettleAfterDays: Schema$1.optionalKey(Schema$1.NullOr(SidebarAutoSettleAfterDays)),
@@ -12493,7 +12617,7 @@ function deriveAuthClientMetadata(input) {
 //#endregion
 //#region src/auth/EnvironmentAuthPolicy.ts
 var EnvironmentAuthPolicy = class extends Context.Service()("@p4code/cli/auth/EnvironmentAuthPolicy") {};
-const make$89 = Effect.gen(function* () {
+const make$90 = 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";
@@ -12511,7 +12635,7 @@ const make$89 = Effect.gen(function* () {
 	};
 	return EnvironmentAuthPolicy.of({ getDescriptor: () => Effect.succeed(descriptor).pipe(Effect.withSpan("EnvironmentAuthPolicy.getDescriptor")) });
 });
-const layer$80 = Layer.effect(EnvironmentAuthPolicy, make$89);
+const layer$80 = Layer.effect(EnvironmentAuthPolicy, make$90);
 //#endregion
 //#region src/persistence/Errors.ts
 function summarizeSchemaIssue(issue) {
@@ -12692,7 +12816,7 @@ function toPersistenceSqlOrDecodeError$6(sqlOperation, decodeOperation, correlat
 		cause
 	});
 }
-const make$88 = Effect.gen(function* () {
+const make$89 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const createSessionRow = SqlSchema.void({
 		Request: CreateAuthSessionInput,
@@ -12826,7 +12950,7 @@ const make$88 = Effect.gen(function* () {
 		setLastConnectedAt
 	};
 });
-const layer$79 = Layer.effect(AuthSessionRepository, make$88);
+const layer$79 = Layer.effect(AuthSessionRepository, make$89);
 //#endregion
 //#region src/auth/ServerSecretStore.ts
 const secretStoreErrorContext = {
@@ -12893,7 +13017,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$87 = Effect.gen(function* () {
+const make$88 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
@@ -12969,7 +13093,7 @@ const make$87 = Effect.gen(function* () {
 		remove
 	});
 });
-const layer$78 = Layer.effect(ServerSecretStore, make$87);
+const layer$78 = Layer.effect(ServerSecretStore, make$88);
 //#endregion
 //#region src/auth/SessionStore.ts
 var MalformedSessionTokenError = class extends Schema$1.TaggedErrorClass()("MalformedSessionTokenError", {}) {
@@ -13207,7 +13331,7 @@ function toAuthClientSession(input) {
 		current: false
 	};
 }
-const make$86 = Effect.gen(function* () {
+const make$87 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const serverConfig = yield* ServerConfig$1;
 	const secretStore = yield* ServerSecretStore;
@@ -13521,7 +13645,7 @@ const make$86 = Effect.gen(function* () {
 		markDisconnected
 	});
 });
-const layer$77 = Layer.effect(SessionStore, make$86).pipe(Layer.provideMerge(layer$79));
+const layer$77 = Layer.effect(SessionStore, make$87).pipe(Layer.provideMerge(layer$79));
 //#endregion
 //#region src/persistence/AuthPairingLinks.ts
 const AuthPairingLinkRecord = Schema$1.Struct({
@@ -13582,7 +13706,7 @@ function toPersistenceSqlOrDecodeError$5(sqlOperation, decodeOperation, correlat
 		cause
 	});
 }
-const make$85 = Effect.gen(function* () {
+const make$86 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const createPairingLinkRow = SqlSchema.void({
 		Request: CreateAuthPairingLinkInput,
@@ -13717,7 +13841,7 @@ const make$85 = Effect.gen(function* () {
 		getByCredential
 	};
 });
-const layer$76 = Layer.effect(AuthPairingLinkRepository, make$85);
+const layer$76 = Layer.effect(AuthPairingLinkRepository, make$86);
 //#endregion
 //#region src/auth/PairingGrantStore.ts
 var UnknownBootstrapCredentialError = class extends Schema$1.TaggedErrorClass()("UnknownBootstrapCredentialError", {}) {
@@ -13812,7 +13936,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$84 = Effect.gen(function* () {
+const make$85 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const config = yield* ServerConfig$1;
 	const pairingLinks = yield* AuthPairingLinkRepository;
@@ -14010,7 +14134,7 @@ const make$84 = Effect.gen(function* () {
 		consume
 	});
 });
-const layer$75 = Layer.effect(PairingGrantStore, make$84).pipe(Layer.provideMerge(layer$76));
+const layer$75 = Layer.effect(PairingGrantStore, make$85).pipe(Layer.provideMerge(layer$76));
 //#endregion
 //#region src/persistence/DatabaseSnapshot.ts
 /**
@@ -15929,6 +16053,33 @@ var _053_ProjectionTurnsKeysetIndex_default = Effect.gen(function* () {
   `;
 });
 //#endregion
+//#region src/persistence/Migrations/054_ProjectionThreadScheduledTasks.ts
+/**
+* User-created scheduled tasks: a prompt the server sends to a thread at a
+* chosen time. Pending rows are what the scheduler re-arms after a restart.
+*/
+var _054_ProjectionThreadScheduledTasks_default = Effect.gen(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	yield* sql`
+    CREATE TABLE IF NOT EXISTS projection_thread_scheduled_tasks (
+      task_id TEXT PRIMARY KEY,
+      thread_id TEXT NOT NULL,
+      prompt TEXT NOT NULL,
+      run_at TEXT NOT NULL,
+      status TEXT NOT NULL,
+      created_at TEXT NOT NULL,
+      updated_at TEXT NOT NULL,
+      fired_at TEXT,
+      cancelled_at TEXT,
+      failure TEXT
+    )
+  `;
+	yield* sql`
+    CREATE INDEX IF NOT EXISTS idx_projection_thread_scheduled_tasks_thread_run
+    ON projection_thread_scheduled_tasks(thread_id, run_at)
+  `;
+});
+//#endregion
 //#region src/persistence/Migrations.ts
 /**
 * MigrationsLive - Migration runner with inline loader
@@ -16214,6 +16365,11 @@ const migrationEntries = [
 		53,
 		"ProjectionTurnsKeysetIndex",
 		_053_ProjectionTurnsKeysetIndex_default
+	],
+	[
+		54,
+		"ProjectionThreadScheduledTasks",
+		_054_ProjectionThreadScheduledTasks_default
 	]
 ];
 const makeMigrationLoader = (throughId) => Migrator.fromRecord(Object.fromEntries(migrationEntries.filter(([id]) => throughId === void 0 || id <= throughId).map(([id, name, migration]) => [`${id}_${name}`, migration])));
@@ -17204,7 +17360,7 @@ function parseBearerToken(request) {
 	const token = header.slice(7).trim();
 	return token.length > 0 ? token : null;
 }
-const make$83 = Effect.gen(function* () {
+const make$84 = Effect.gen(function* () {
 	const policy = yield* EnvironmentAuthPolicy;
 	const bootstrapCredentials = yield* PairingGrantStore;
 	const sessions = yield* SessionStore;
@@ -17399,7 +17555,7 @@ const make$83 = Effect.gen(function* () {
 		issueStartupPairingUrl
 	});
 });
-const layer$74 = Layer.effect(EnvironmentAuth, make$83).pipe(Layer.provideMerge(layer$75), Layer.provideMerge(layer$77), Layer.provideMerge(layer$80));
+const layer$74 = Layer.effect(EnvironmentAuth, make$84).pipe(Layer.provideMerge(layer$75), Layer.provideMerge(layer$77), Layer.provideMerge(layer$80));
 const storageLayer = Layer.mergeAll(layer$78, layerConfig);
 const runtimeLayer = layer$74.pipe(Layer.provideMerge(storageLayer));
 //#endregion
@@ -19237,7 +19393,7 @@ const DEFAULT_LIMITS = {
 	windowMillis: FAILURE_WINDOW_MS,
 	blockMillis: BLOCK_DURATION_MS
 };
-const make$82 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_LIMITS) {
+const make$83 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_LIMITS) {
 	const state = yield* Ref.make(initialThrottleState);
 	return HubAuthThrottle.of({
 		shouldRefuse: Effect.gen(function* () {
@@ -19251,7 +19407,7 @@ const make$82 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_LI
 		})
 	});
 });
-const layer$73 = Layer.effect(HubAuthThrottle, make$82());
+const layer$73 = Layer.effect(HubAuthThrottle, make$83());
 //#endregion
 //#region src/hub/HubAuth.ts
 /**
@@ -20971,7 +21127,7 @@ function stripDefaultServerSettings(current, defaults) {
 	}
 	return Object.is(current, defaults) ? void 0 : current;
 }
-const make$81 = Effect.gen(function* () {
+const make$82 = Effect.gen(function* () {
 	const { settingsPath } = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const pathService = yield* Path.Path;
@@ -21192,7 +21348,7 @@ const make$81 = Effect.gen(function* () {
 		}
 	};
 });
-const layer$71 = Layer.effect(ServerSettingsService, make$81);
+const layer$71 = Layer.effect(ServerSettingsService, make$82);
 //#endregion
 //#region src/pathExpansion.ts
 /**
@@ -21569,7 +21725,7 @@ function claudeEntryFromRegistration(registration) {
 	};
 }
 var ClaudeMcpFiles = class extends Context.Service()("@p4code/cli/mcp/ClaudeMcpFiles") {};
-const make$80 = Effect.gen(function* () {
+const make$81 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const services = yield* Effect.context();
@@ -21636,7 +21792,7 @@ const make$80 = Effect.gen(function* () {
 		removeProject: (projectDir, name) => removeAt(Effect.succeed(projectFile(projectDir)))(name)
 	};
 });
-const layer$70 = Layer.effect(ClaudeMcpFiles, make$80);
+const layer$70 = Layer.effect(ClaudeMcpFiles, make$81);
 Layer.succeed(ClaudeMcpFiles, {
 	readUser: Effect.succeed([]),
 	readUserAt: () => Effect.succeed([]),
@@ -21774,7 +21930,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$79 = Effect.gen(function* () {
+const make$80 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const secrets = yield* ServerSecretStore;
 	const http = yield* HttpClient.HttpClient;
@@ -22094,7 +22250,7 @@ const make$79 = Effect.gen(function* () {
 		accessTokenFor
 	};
 });
-const layer$69 = Layer.effect(McpOAuth, make$79);
+const layer$69 = Layer.effect(McpOAuth, make$80);
 Layer.succeed(McpOAuth, {
 	statusFor: () => Effect.succeed(Option.none()),
 	begin: () => Effect.fail(new McpRegistryError({ detail: "OAuth sign-in is not available." })),
@@ -22112,7 +22268,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$78 = Effect.gen(function* () {
+const make$79 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const secrets = yield* ServerSecretStore;
 	const oauth = yield* McpOAuth;
@@ -22286,7 +22442,7 @@ const make$78 = Effect.gen(function* () {
 		resolveForSessionAtClaudeUserConfigPath
 	};
 });
-const layer$68 = Layer.effect(McpRegistry, make$78);
+const layer$68 = Layer.effect(McpRegistry, make$79);
 //#endregion
 //#region src/sync/skillDirectory.ts
 /**
@@ -22665,7 +22821,7 @@ const formatHubLink = (input) => encodeStoredHubLink({
 	shareMode: input.shareMode
 });
 const fromEnvironment = (environment) => validateHubLink(environment.P4CODE_HUB_URL ?? "", environment.P4CODE_HUB_TOKEN ?? "");
-const make$77 = Effect.fn("HubLink.make")(function* (environment) {
+const make$78 = Effect.fn("HubLink.make")(function* (environment) {
 	const secrets = yield* ServerSecretStore;
 	const env = environment ?? process.env;
 	const fromEnv = fromEnvironment(env);
@@ -22731,7 +22887,7 @@ const make$77 = Effect.fn("HubLink.make")(function* (environment) {
 		})
 	};
 });
-const layer$67 = Layer.effect(HubLink, make$77());
+const layer$67 = Layer.effect(HubLink, make$78());
 //#endregion
 //#region src/sync/HubAssetClient.ts
 /**
@@ -22764,7 +22920,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$76 = Effect.gen(function* () {
+const make$77 = Effect.gen(function* () {
 	const http = yield* HttpClient.HttpClient;
 	const link = yield* HubLink;
 	const requireSettings = Effect.gen(function* () {
@@ -22846,7 +23002,7 @@ const make$76 = Effect.gen(function* () {
 		remove
 	};
 });
-const layer$66 = Layer.effect(HubAssetClient, make$76);
+const layer$66 = Layer.effect(HubAssetClient, make$77);
 //#endregion
 //#region src/sync/mcpRegistrationFiles.ts
 /**
@@ -23452,7 +23608,7 @@ const EMPTY_REPORT = {
 	unavailable: null
 };
 var AssetSync = class extends Context.Service()("@p4code/cli/sync/AssetSync") {};
-const make$75 = Effect.gen(function* () {
+const make$76 = Effect.gen(function* () {
 	const client = yield* HubAssetClient;
 	const link = yield* HubLink;
 	const settingsStore = yield* ServerSettingsService;
@@ -24162,7 +24318,7 @@ const make$75 = Effect.gen(function* () {
 		removeLocal
 	};
 });
-const layer$65 = Layer.effect(AssetSync, make$75);
+const layer$65 = Layer.effect(AssetSync, make$76);
 //#endregion
 //#region src/provider/CompressPrompts.ts
 /**
@@ -25610,6 +25766,306 @@ function requireThreadAbsent(input) {
 	return Effect.fail(invariantError(input.command.type, `Thread '${input.threadId}' already exists and cannot be created twice.`));
 }
 //#endregion
+//#region src/attachmentPaths.ts
+function normalizeAttachmentRelativePath(rawRelativePath) {
+	const normalized = NodePath.normalize(rawRelativePath).replace(/^[/\\]+/, "");
+	if (normalized.length === 0 || normalized.startsWith("..") || normalized.includes("\0")) return null;
+	return normalized.replace(/\\/g, "/");
+}
+function resolveAttachmentRelativePath(input) {
+	const normalizedRelativePath = normalizeAttachmentRelativePath(input.relativePath);
+	if (!normalizedRelativePath) return null;
+	const attachmentsRoot = NodePath.resolve(input.attachmentsDir);
+	const filePath = NodePath.resolve(NodePath.join(attachmentsRoot, normalizedRelativePath));
+	if (!filePath.startsWith(`${attachmentsRoot}${NodePath.sep}`)) return null;
+	return filePath;
+}
+//#endregion
+//#region src/imageMime.ts
+const IMAGE_EXTENSION_BY_MIME_TYPE = {
+	"image/avif": ".avif",
+	"image/bmp": ".bmp",
+	"image/gif": ".gif",
+	"image/heic": ".heic",
+	"image/heif": ".heif",
+	"image/jpeg": ".jpg",
+	"image/jpg": ".jpg",
+	"image/png": ".png",
+	"image/svg+xml": ".svg",
+	"image/tiff": ".tiff",
+	"image/webp": ".webp"
+};
+const SAFE_IMAGE_FILE_EXTENSIONS = /* @__PURE__ */ new Set([
+	".avif",
+	".bmp",
+	".gif",
+	".heic",
+	".heif",
+	".ico",
+	".jpeg",
+	".jpg",
+	".png",
+	".svg",
+	".tiff",
+	".webp"
+]);
+function isBase64Char(code) {
+	return code >= 97 && code <= 122 || code >= 65 && code <= 90 || code >= 48 && code <= 57 || code === 43 || code === 47 || code === 61;
+}
+function isBase64Whitespace(code) {
+	return code === 13 || code === 10 || code === 32;
+}
+function parseBase64DataUrl(dataUrl) {
+	const trimmed = dataUrl.trim();
+	if (trimmed.slice(0, 5).toLowerCase() !== "data:") return null;
+	const commaIndex = trimmed.indexOf(",");
+	if (commaIndex === -1) return null;
+	const header = trimmed.slice(5, commaIndex);
+	if (header.length === 0) return null;
+	const headerParts = [];
+	for (const part of header.split(";")) {
+		const partTrimmed = part.trim();
+		if (partTrimmed.length > 0) headerParts.push(partTrimmed);
+	}
+	if (headerParts.length < 2) return null;
+	if (headerParts.at(-1)?.toLowerCase() !== "base64") return null;
+	const mimeType = headerParts[0]?.toLowerCase();
+	if (!mimeType) return null;
+	const payload = trimmed.slice(commaIndex + 1);
+	const runs = [];
+	let runStart = -1;
+	for (let index = 0; index < payload.length; index += 1) {
+		const code = payload.charCodeAt(index);
+		if (isBase64Char(code)) {
+			if (runStart === -1) runStart = index;
+			continue;
+		}
+		if (!isBase64Whitespace(code)) return null;
+		if (runStart !== -1) {
+			runs.push(payload.slice(runStart, index));
+			runStart = -1;
+		}
+	}
+	if (runStart !== -1) runs.push(payload.slice(runStart));
+	const base64 = runs.length === 1 ? runs[0] : runs.join("");
+	if (base64.length === 0 || base64.length % 4 !== 0) return null;
+	const firstPad = base64.indexOf("=");
+	if (firstPad !== -1) {
+		if (base64.length - firstPad > 2) return null;
+		for (let index = firstPad; index < base64.length; index += 1) if (base64.charCodeAt(index) !== 61) return null;
+	}
+	return {
+		mimeType,
+		base64
+	};
+}
+function inferImageExtension(input) {
+	const key = input.mimeType.toLowerCase();
+	const fromMime = Object.hasOwn(IMAGE_EXTENSION_BY_MIME_TYPE, key) ? IMAGE_EXTENSION_BY_MIME_TYPE[key] : void 0;
+	if (fromMime) return fromMime;
+	const fromMimeExtension = Mime.getExtension(input.mimeType);
+	if (fromMimeExtension && SAFE_IMAGE_FILE_EXTENSIONS.has(fromMimeExtension)) return fromMimeExtension;
+	const fileName = input.fileName?.trim() ?? "";
+	const extensionMatch = /\.([a-z0-9]{1,8})$/i.exec(fileName);
+	const fileNameExtension = extensionMatch ? `.${extensionMatch[1].toLowerCase()}` : "";
+	if (SAFE_IMAGE_FILE_EXTENSIONS.has(fileNameExtension)) return fileNameExtension;
+	return ".bin";
+}
+//#endregion
+//#region src/attachmentStore.ts
+const ATTACHMENT_FILENAME_EXTENSIONS = [
+	...SAFE_IMAGE_FILE_EXTENSIONS,
+	".pdf",
+	".bin"
+];
+const ATTACHMENT_ID_THREAD_SEGMENT_MAX_CHARS = 80;
+const ATTACHMENT_ID_PATTERN = new RegExp(`^([a-z0-9_]+(?:-[a-z0-9_]+)*)-([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$`, "i");
+function toSafeThreadAttachmentSegment(threadId) {
+	const segment = threadId.trim().toLowerCase().replace(/[^a-z0-9_-]+/gi, "-").replace(/-+/g, "-").replace(/^[-_]+|[-_]+$/g, "").slice(0, ATTACHMENT_ID_THREAD_SEGMENT_MAX_CHARS).replace(/[-_]+$/g, "");
+	if (segment.length === 0) return null;
+	return segment;
+}
+function createAttachmentId(threadId) {
+	const threadSegment = toSafeThreadAttachmentSegment(threadId);
+	if (!threadSegment) return null;
+	return `${threadSegment}-${NodeCrypto.randomUUID()}`;
+}
+function parseThreadSegmentFromAttachmentId(attachmentId) {
+	const normalizedId = normalizeAttachmentRelativePath(attachmentId);
+	if (!normalizedId || normalizedId.includes("/") || normalizedId.includes(".")) return null;
+	const match = normalizedId.match(ATTACHMENT_ID_PATTERN);
+	if (!match) return null;
+	return match[1]?.toLowerCase() ?? null;
+}
+function attachmentRelativePath(attachment) {
+	switch (attachment.type) {
+		case "image": {
+			const extension = inferImageExtension({
+				mimeType: attachment.mimeType,
+				fileName: attachment.name
+			});
+			return `${attachment.id}${extension}`;
+		}
+		case "document": return `${attachment.id}.pdf`;
+	}
+}
+function resolveAttachmentPath(input) {
+	return resolveAttachmentRelativePath({
+		attachmentsDir: input.attachmentsDir,
+		relativePath: attachmentRelativePath(input.attachment)
+	});
+}
+function resolveAttachmentPathById(input) {
+	const normalizedId = normalizeAttachmentRelativePath(input.attachmentId);
+	if (!normalizedId || normalizedId.includes("/") || normalizedId.includes(".")) return null;
+	for (const extension of ATTACHMENT_FILENAME_EXTENSIONS) {
+		const maybePath = resolveAttachmentRelativePath({
+			attachmentsDir: input.attachmentsDir,
+			relativePath: `${normalizedId}${extension}`
+		});
+		if (maybePath && NodeFS.existsSync(maybePath)) return maybePath;
+	}
+	return null;
+}
+function parseAttachmentIdFromRelativePath(relativePath) {
+	const normalized = normalizeAttachmentRelativePath(relativePath);
+	if (!normalized || normalized.includes("/")) return null;
+	const extensionIndex = normalized.lastIndexOf(".");
+	if (extensionIndex <= 0) return null;
+	const id = normalized.slice(0, extensionIndex);
+	return id.length > 0 && !id.includes(".") ? id : null;
+}
+//#endregion
+//#region src/orchestration/threadFork.ts
+/** Providers whose adapter can open a new session on top of a saved one. */
+const FORKABLE_PROVIDERS = /* @__PURE__ */ new Set(["claudeAgent"]);
+/**
+* Message ids are unique across threads, so a copied message needs an id
+* that ties it to the fork while staying derivable from the original.
+*/
+function forkedMessageId(threadId, messageId) {
+	return `${threadId}:fork:${messageId}`;
+}
+/**
+* Attachment ids must look like `<thread-segment>-<uuid>` and the file lives
+* beside the id, so a copy gets a fresh id under the fork's segment. The uuid
+* is derived from the source id: the pure read-model projector and the SQLite
+* projection must agree on it without sharing state.
+*/
+function forkedAttachmentId(threadId, attachmentId) {
+	const segment = toSafeThreadAttachmentSegment(threadId);
+	if (!segment) return null;
+	const digest = NodeCrypto.createHash("sha256").update(`${threadId} ${attachmentId}`).digest("hex");
+	return `${segment}-${[
+		digest.slice(0, 8),
+		digest.slice(8, 12),
+		digest.slice(12, 16),
+		digest.slice(16, 20),
+		digest.slice(20, 32)
+	].join("-")}`;
+}
+function copyForkedAttachments(threadId, attachments) {
+	if (attachments === void 0) return void 0;
+	const copies = [];
+	for (const attachment of attachments) {
+		const id = forkedAttachmentId(threadId, attachment.id);
+		if (id === null) continue;
+		copies.push({
+			...attachment,
+			id
+		});
+	}
+	return copies;
+}
+/**
+* Copies a source thread's conversation for the fork read model. Turn ids
+* belong to the source thread's turns, so copies carry none; attachments are
+* re-keyed to the fork so their files can be copied beside them; a streaming
+* message is frozen as-is.
+*/
+function copyForkedMessages(threadId, messages) {
+	return messages.map((message) => {
+		const attachments = copyForkedAttachments(threadId, message.attachments);
+		return {
+			id: forkedMessageId(threadId, message.id),
+			role: message.role,
+			text: message.text,
+			...attachments !== void 0 ? { attachments } : {},
+			turnId: null,
+			streaming: false,
+			createdAt: message.createdAt,
+			updatedAt: message.updatedAt
+		};
+	});
+}
+/** Same copy as {@link copyForkedMessages}, for the SQLite message projection. */
+function copyForkedProjectionMessages(threadId, rows) {
+	return rows.map((row) => {
+		const attachments = copyForkedAttachments(threadId, row.attachments);
+		return {
+			messageId: forkedMessageId(threadId, row.messageId),
+			threadId,
+			turnId: null,
+			role: row.role,
+			text: row.text,
+			...attachments !== void 0 ? { attachments } : {},
+			isStreaming: false,
+			createdAt: row.createdAt,
+			updatedAt: row.updatedAt
+		};
+	});
+}
+/** File copies that make the re-keyed attachment references resolve. */
+function collectForkedAttachmentCopies(threadId, rows) {
+	const copies = [];
+	for (const row of rows) for (const attachment of row.attachments ?? []) {
+		const id = forkedAttachmentId(threadId, attachment.id);
+		if (id === null) continue;
+		copies.push({
+			fromRelativePath: attachmentRelativePath(attachment),
+			toRelativePath: attachmentRelativePath({
+				...attachment,
+				id
+			})
+		});
+	}
+	return copies;
+}
+function isRecord$6(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+/**
+* Provider binding for a fork, or the reason there is none. The resume cursor
+* is re-keyed to the fork and flagged so the adapter opens a new provider
+* session from the saved one instead of continuing the source's session.
+*/
+function buildForkedProviderBinding(threadId, source) {
+	if (source === void 0) return { rejection: "no-binding" };
+	if (!FORKABLE_PROVIDERS.has(source.provider)) return { rejection: "provider-cannot-fork" };
+	if (!isRecord$6(source.resumeCursor) || typeof source.resumeCursor.resume !== "string") return { rejection: "no-resume-cursor" };
+	return { binding: {
+		threadId,
+		provider: source.provider,
+		...source.providerInstanceId ? { providerInstanceId: source.providerInstanceId } : {},
+		...source.adapterKey ? { adapterKey: source.adapterKey } : {},
+		...source.runtimeMode ? { runtimeMode: source.runtimeMode } : {},
+		status: "stopped",
+		resumeCursor: {
+			...source.resumeCursor,
+			threadId,
+			forkSession: true
+		},
+		runtimePayload: source.runtimePayload ?? null
+	} };
+}
+function describeThreadForkRejection(rejection) {
+	switch (rejection) {
+		case "no-binding": return "This thread has no provider session to fork yet. Send a message first.";
+		case "provider-cannot-fork": return "This thread's provider cannot fork a session. Fork is available for Claude threads.";
+		case "no-resume-cursor": return "This thread's provider session cannot be resumed, so it cannot be forked.";
+	}
+}
+//#endregion
 //#region src/orchestration/Schemas.ts
 const ProjectCreatedPayload = ProjectCreatedPayload$1;
 const ProjectMetaUpdatedPayload = ProjectMetaUpdatedPayload$1;
@@ -25632,6 +26088,9 @@ const ThreadSnoozedPayload = ThreadSnoozedPayload$1;
 const ThreadUnsnoozedPayload = ThreadUnsnoozedPayload$1;
 const MessageSentPayloadSchema = ThreadMessageSentPayload;
 const ThreadProposedPlanUpsertedPayload = ThreadProposedPlanUpsertedPayload$1;
+const ThreadScheduledTaskCreatedPayload = ThreadScheduledTaskCreatedPayload$1;
+const ThreadScheduledTaskCancelledPayload = ThreadScheduledTaskCancelledPayload$1;
+const ThreadScheduledTaskFiredPayload = ThreadScheduledTaskFiredPayload$1;
 const ThreadSessionSetPayload = ThreadSessionSetPayload$1;
 const ThreadTurnDiffCompletedPayload = ThreadTurnDiffCompletedPayload$1;
 const ThreadRevertedPayload = ThreadRevertedPayload$1;
@@ -25814,6 +26273,7 @@ function projectEvent(model, event) {
 		})));
 		case "thread.created": return Effect.gen(function* () {
 			const payload = yield* decodeForEvent(ThreadCreatedPayload, event.payload, event.type, "payload");
+			const forkSource = payload.forkedFromThreadId === void 0 ? void 0 : nextBase.threads.find((entry) => entry.id === payload.forkedFromThreadId);
 			const thread = yield* decodeForEvent(OrchestrationThread, {
 				id: payload.threadId,
 				projectId: payload.projectId,
@@ -25834,7 +26294,7 @@ function projectEvent(model, event) {
 				snoozedUntil: null,
 				snoozedAt: null,
 				deletedAt: null,
-				messages: [],
+				messages: forkSource ? copyForkedMessages(payload.threadId, forkSource.messages) : [],
 				activities: [],
 				checkpoints: [],
 				session: null
@@ -26016,6 +26476,42 @@ function projectEvent(model, event) {
 				})
 			};
 		});
+		case "thread.scheduled-task.created": return Effect.gen(function* () {
+			const payload = yield* decodeForEvent(ThreadScheduledTaskCreatedPayload, event.payload, event.type, "payload");
+			const thread = nextBase.threads.find((entry) => entry.id === payload.threadId);
+			if (!thread) return nextBase;
+			return {
+				...nextBase,
+				threads: updateThread(nextBase.threads, payload.threadId, {
+					scheduledTasks: [...(thread.scheduledTasks ?? []).filter((entry) => entry.id !== payload.task.id), payload.task],
+					updatedAt: event.occurredAt
+				})
+			};
+		});
+		case "thread.scheduled-task.cancelled":
+		case "thread.scheduled-task.fired": return Effect.gen(function* () {
+			const payload = event.type === "thread.scheduled-task.cancelled" ? yield* decodeForEvent(ThreadScheduledTaskCancelledPayload, event.payload, event.type, "payload") : yield* decodeForEvent(ThreadScheduledTaskFiredPayload, event.payload, event.type, "payload");
+			const thread = nextBase.threads.find((entry) => entry.id === payload.threadId);
+			if (!thread) return nextBase;
+			return {
+				...nextBase,
+				threads: updateThread(nextBase.threads, payload.threadId, {
+					scheduledTasks: (thread.scheduledTasks ?? []).map((task) => task.id !== payload.taskId ? task : "cancelledAt" in payload ? {
+						...task,
+						status: "cancelled",
+						cancelledAt: payload.cancelledAt,
+						updatedAt: event.occurredAt
+					} : {
+						...task,
+						status: payload.failure === null ? "fired" : "failed",
+						firedAt: payload.firedAt,
+						failure: payload.failure,
+						updatedAt: event.occurredAt
+					}),
+					updatedAt: event.occurredAt
+				})
+			};
+		});
 		case "thread.proposed-plan-upserted": return Effect.gen(function* () {
 			const payload = yield* decodeForEvent(ThreadProposedPlanUpsertedPayload, event.payload, event.type, "payload");
 			const thread = nextBase.threads.find((entry) => entry.id === payload.threadId);
@@ -26336,6 +26832,113 @@ const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand")(funct
 					updatedAt: command.createdAt
 				}
 			};
+		case "thread.fork": {
+			const source = yield* requireThread({
+				readModel,
+				command,
+				threadId: command.sourceThreadId
+			});
+			yield* requireThreadAbsent({
+				readModel,
+				command,
+				threadId: command.threadId
+			});
+			return {
+				...yield* withEventBase({
+					aggregateKind: "thread",
+					aggregateId: command.threadId,
+					occurredAt: command.createdAt,
+					commandId: command.commandId
+				}),
+				type: "thread.created",
+				payload: {
+					threadId: command.threadId,
+					projectId: source.projectId,
+					title: command.title ?? `${source.title} (fork)`,
+					modelSelection: source.modelSelection,
+					runtimeMode: source.runtimeMode,
+					interactionMode: source.interactionMode,
+					compressMode: source.compressMode,
+					unpromptedSubagents: source.unpromptedSubagents,
+					branch: source.branch,
+					worktreePath: source.worktreePath,
+					forkedFromThreadId: source.id,
+					createdAt: command.createdAt,
+					updatedAt: command.createdAt
+				}
+			};
+		}
+		case "thread.scheduled-task.create":
+			if (((yield* requireThread({
+				readModel,
+				command,
+				threadId: command.threadId
+			})).scheduledTasks ?? []).some((task) => task.id === command.taskId)) return yield* new OrchestrationCommandInvariantError({
+				commandType: command.type,
+				detail: `Scheduled task '${command.taskId}' already exists on thread '${command.threadId}'.`
+			});
+			return {
+				...yield* withEventBase({
+					aggregateKind: "thread",
+					aggregateId: command.threadId,
+					occurredAt: command.createdAt,
+					commandId: command.commandId
+				}),
+				type: "thread.scheduled-task.created",
+				payload: {
+					threadId: command.threadId,
+					task: {
+						id: command.taskId,
+						prompt: command.prompt,
+						runAt: command.runAt,
+						status: "pending",
+						createdAt: command.createdAt,
+						updatedAt: command.createdAt,
+						firedAt: null,
+						cancelledAt: null,
+						failure: null
+					}
+				}
+			};
+		case "thread.scheduled-task.cancel":
+		case "thread.scheduled-task.fire": {
+			const task = ((yield* requireThread({
+				readModel,
+				command,
+				threadId: command.threadId
+			})).scheduledTasks ?? []).find((entry) => entry.id === command.taskId);
+			const cancellable = task?.status === "pending" || task?.status === "failed";
+			if (task === void 0 || (command.type === "thread.scheduled-task.fire" ? task.status !== "pending" : !cancellable)) return yield* new OrchestrationCommandInvariantError({
+				commandType: command.type,
+				detail: `Scheduled task '${command.taskId}' is not ${command.type === "thread.scheduled-task.fire" ? "pending" : "pending or failed"} on thread '${command.threadId}'.`
+			});
+			const occurredAt = command.type === "thread.scheduled-task.cancel" ? command.cancelledAt : command.firedAt;
+			const base = yield* withEventBase({
+				aggregateKind: "thread",
+				aggregateId: command.threadId,
+				occurredAt,
+				commandId: command.commandId
+			});
+			if (command.type === "thread.scheduled-task.cancel") return {
+				...base,
+				type: "thread.scheduled-task.cancelled",
+				payload: {
+					threadId: command.threadId,
+					taskId: command.taskId,
+					cancelledAt: command.cancelledAt
+				}
+			};
+			return {
+				...base,
+				type: "thread.scheduled-task.fired",
+				payload: {
+					threadId: command.threadId,
+					taskId: command.taskId,
+					firedAt: command.firedAt,
+					failure: command.failure ?? null
+				}
+			};
+		}
 		case "thread.delete": {
 			yield* requireThread({
 				readModel,
@@ -27903,6 +28506,23 @@ const ListProjectionThreadProposedPlansInput = Schema$1.Struct({ threadId: Threa
 const DeleteProjectionThreadProposedPlansInput = Schema$1.Struct({ threadId: ThreadId });
 var ProjectionThreadProposedPlanRepository = class extends Context.Service()("@p4code/cli/persistence/Services/ProjectionThreadProposedPlans/ProjectionThreadProposedPlanRepository") {};
 //#endregion
+//#region src/persistence/Services/ProjectionThreadScheduledTasks.ts
+const ProjectionThreadScheduledTask = Schema$1.Struct({
+	taskId: OrchestrationScheduledTaskId,
+	threadId: ThreadId,
+	prompt: TrimmedNonEmptyString,
+	runAt: IsoDateTime,
+	status: OrchestrationScheduledTaskStatus,
+	createdAt: IsoDateTime,
+	updatedAt: IsoDateTime,
+	firedAt: Schema$1.NullOr(IsoDateTime),
+	cancelledAt: Schema$1.NullOr(IsoDateTime),
+	failure: Schema$1.NullOr(Schema$1.String)
+});
+const GetProjectionThreadScheduledTaskInput = Schema$1.Struct({ taskId: OrchestrationScheduledTaskId });
+const ListProjectionThreadScheduledTasksInput = Schema$1.Struct({ threadId: ThreadId });
+var ProjectionThreadScheduledTaskRepository = class extends Context.Service()("@p4code/cli/persistence/Services/ProjectionThreadScheduledTasks/ProjectionThreadScheduledTaskRepository") {};
+//#endregion
 //#region src/persistence/Services/ProjectionThreadSessions.ts
 /**
 * ProjectionThreadSessionRepository - Repository interface for thread sessions.
@@ -28598,6 +29218,91 @@ const makeProjectionThreadProposedPlanRepository = Effect.gen(function* () {
 });
 const ProjectionThreadProposedPlanRepositoryLive = Layer.effect(ProjectionThreadProposedPlanRepository, makeProjectionThreadProposedPlanRepository);
 //#endregion
+//#region src/persistence/Layers/ProjectionThreadScheduledTasks.ts
+const makeProjectionThreadScheduledTaskRepository = Effect.gen(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	const upsertRow = SqlSchema.void({
+		Request: ProjectionThreadScheduledTask,
+		execute: (row) => sql`
+      INSERT INTO projection_thread_scheduled_tasks (
+        task_id,
+        thread_id,
+        prompt,
+        run_at,
+        status,
+        created_at,
+        updated_at,
+        fired_at,
+        cancelled_at,
+        failure
+      )
+      VALUES (
+        ${row.taskId},
+        ${row.threadId},
+        ${row.prompt},
+        ${row.runAt},
+        ${row.status},
+        ${row.createdAt},
+        ${row.updatedAt},
+        ${row.firedAt},
+        ${row.cancelledAt},
+        ${row.failure}
+      )
+      ON CONFLICT (task_id)
+      DO UPDATE SET
+        thread_id = excluded.thread_id,
+        prompt = excluded.prompt,
+        run_at = excluded.run_at,
+        status = excluded.status,
+        created_at = excluded.created_at,
+        updated_at = excluded.updated_at,
+        fired_at = excluded.fired_at,
+        cancelled_at = excluded.cancelled_at,
+        failure = excluded.failure
+    `
+	});
+	const selectColumns = sql`
+    task_id AS "taskId",
+    thread_id AS "threadId",
+    prompt,
+    run_at AS "runAt",
+    status,
+    created_at AS "createdAt",
+    updated_at AS "updatedAt",
+    fired_at AS "firedAt",
+    cancelled_at AS "cancelledAt",
+    failure
+  `;
+	const getRow = SqlSchema.findOneOption({
+		Request: GetProjectionThreadScheduledTaskInput,
+		Result: ProjectionThreadScheduledTask,
+		execute: ({ taskId }) => sql`
+      SELECT ${selectColumns}
+      FROM projection_thread_scheduled_tasks
+      WHERE task_id = ${taskId}
+    `
+	});
+	const listRows = SqlSchema.findAll({
+		Request: ListProjectionThreadScheduledTasksInput,
+		Result: ProjectionThreadScheduledTask,
+		execute: ({ threadId }) => sql`
+      SELECT ${selectColumns}
+      FROM projection_thread_scheduled_tasks
+      WHERE thread_id = ${threadId}
+      ORDER BY run_at ASC, task_id ASC
+    `
+	});
+	const upsert = (row) => upsertRow(row).pipe(Effect.mapError(toPersistenceSqlError("ProjectionThreadScheduledTaskRepository.upsert:query")));
+	const getByTaskId = (input) => getRow(input).pipe(Effect.map(Option.getOrNull), Effect.mapError(toPersistenceSqlError("ProjectionThreadScheduledTaskRepository.getByTaskId:query")));
+	const listByThreadId = (input) => listRows(input).pipe(Effect.mapError(toPersistenceSqlError("ProjectionThreadScheduledTaskRepository.listByThreadId:query")));
+	return {
+		upsert,
+		getByTaskId,
+		listByThreadId
+	};
+});
+const ProjectionThreadScheduledTaskRepositoryLive = Layer.effect(ProjectionThreadScheduledTaskRepository, makeProjectionThreadScheduledTaskRepository);
+//#endregion
 //#region src/persistence/Layers/ProjectionThreadSessions.ts
 const makeProjectionThreadSessionRepository = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
@@ -29093,182 +29798,13 @@ const makeProjectionThreadRepository = Effect.gen(function* () {
 });
 const ProjectionThreadRepositoryLive = Layer.effect(ProjectionThreadRepository, makeProjectionThreadRepository);
 //#endregion
-//#region src/attachmentPaths.ts
-function normalizeAttachmentRelativePath(rawRelativePath) {
-	const normalized = NodePath.normalize(rawRelativePath).replace(/^[/\\]+/, "");
-	if (normalized.length === 0 || normalized.startsWith("..") || normalized.includes("\0")) return null;
-	return normalized.replace(/\\/g, "/");
-}
-function resolveAttachmentRelativePath(input) {
-	const normalizedRelativePath = normalizeAttachmentRelativePath(input.relativePath);
-	if (!normalizedRelativePath) return null;
-	const attachmentsRoot = NodePath.resolve(input.attachmentsDir);
-	const filePath = NodePath.resolve(NodePath.join(attachmentsRoot, normalizedRelativePath));
-	if (!filePath.startsWith(`${attachmentsRoot}${NodePath.sep}`)) return null;
-	return filePath;
-}
-//#endregion
-//#region src/imageMime.ts
-const IMAGE_EXTENSION_BY_MIME_TYPE = {
-	"image/avif": ".avif",
-	"image/bmp": ".bmp",
-	"image/gif": ".gif",
-	"image/heic": ".heic",
-	"image/heif": ".heif",
-	"image/jpeg": ".jpg",
-	"image/jpg": ".jpg",
-	"image/png": ".png",
-	"image/svg+xml": ".svg",
-	"image/tiff": ".tiff",
-	"image/webp": ".webp"
-};
-const SAFE_IMAGE_FILE_EXTENSIONS = /* @__PURE__ */ new Set([
-	".avif",
-	".bmp",
-	".gif",
-	".heic",
-	".heif",
-	".ico",
-	".jpeg",
-	".jpg",
-	".png",
-	".svg",
-	".tiff",
-	".webp"
-]);
-function isBase64Char(code) {
-	return code >= 97 && code <= 122 || code >= 65 && code <= 90 || code >= 48 && code <= 57 || code === 43 || code === 47 || code === 61;
-}
-function isBase64Whitespace(code) {
-	return code === 13 || code === 10 || code === 32;
-}
-function parseBase64DataUrl(dataUrl) {
-	const trimmed = dataUrl.trim();
-	if (trimmed.slice(0, 5).toLowerCase() !== "data:") return null;
-	const commaIndex = trimmed.indexOf(",");
-	if (commaIndex === -1) return null;
-	const header = trimmed.slice(5, commaIndex);
-	if (header.length === 0) return null;
-	const headerParts = [];
-	for (const part of header.split(";")) {
-		const partTrimmed = part.trim();
-		if (partTrimmed.length > 0) headerParts.push(partTrimmed);
-	}
-	if (headerParts.length < 2) return null;
-	if (headerParts.at(-1)?.toLowerCase() !== "base64") return null;
-	const mimeType = headerParts[0]?.toLowerCase();
-	if (!mimeType) return null;
-	const payload = trimmed.slice(commaIndex + 1);
-	const runs = [];
-	let runStart = -1;
-	for (let index = 0; index < payload.length; index += 1) {
-		const code = payload.charCodeAt(index);
-		if (isBase64Char(code)) {
-			if (runStart === -1) runStart = index;
-			continue;
-		}
-		if (!isBase64Whitespace(code)) return null;
-		if (runStart !== -1) {
-			runs.push(payload.slice(runStart, index));
-			runStart = -1;
-		}
-	}
-	if (runStart !== -1) runs.push(payload.slice(runStart));
-	const base64 = runs.length === 1 ? runs[0] : runs.join("");
-	if (base64.length === 0 || base64.length % 4 !== 0) return null;
-	const firstPad = base64.indexOf("=");
-	if (firstPad !== -1) {
-		if (base64.length - firstPad > 2) return null;
-		for (let index = firstPad; index < base64.length; index += 1) if (base64.charCodeAt(index) !== 61) return null;
-	}
-	return {
-		mimeType,
-		base64
-	};
-}
-function inferImageExtension(input) {
-	const key = input.mimeType.toLowerCase();
-	const fromMime = Object.hasOwn(IMAGE_EXTENSION_BY_MIME_TYPE, key) ? IMAGE_EXTENSION_BY_MIME_TYPE[key] : void 0;
-	if (fromMime) return fromMime;
-	const fromMimeExtension = Mime.getExtension(input.mimeType);
-	if (fromMimeExtension && SAFE_IMAGE_FILE_EXTENSIONS.has(fromMimeExtension)) return fromMimeExtension;
-	const fileName = input.fileName?.trim() ?? "";
-	const extensionMatch = /\.([a-z0-9]{1,8})$/i.exec(fileName);
-	const fileNameExtension = extensionMatch ? `.${extensionMatch[1].toLowerCase()}` : "";
-	if (SAFE_IMAGE_FILE_EXTENSIONS.has(fileNameExtension)) return fileNameExtension;
-	return ".bin";
-}
-//#endregion
-//#region src/attachmentStore.ts
-const ATTACHMENT_FILENAME_EXTENSIONS = [
-	...SAFE_IMAGE_FILE_EXTENSIONS,
-	".pdf",
-	".bin"
-];
-const ATTACHMENT_ID_THREAD_SEGMENT_MAX_CHARS = 80;
-const ATTACHMENT_ID_PATTERN = new RegExp(`^([a-z0-9_]+(?:-[a-z0-9_]+)*)-([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$`, "i");
-function toSafeThreadAttachmentSegment(threadId) {
-	const segment = threadId.trim().toLowerCase().replace(/[^a-z0-9_-]+/gi, "-").replace(/-+/g, "-").replace(/^[-_]+|[-_]+$/g, "").slice(0, ATTACHMENT_ID_THREAD_SEGMENT_MAX_CHARS).replace(/[-_]+$/g, "");
-	if (segment.length === 0) return null;
-	return segment;
-}
-function createAttachmentId(threadId) {
-	const threadSegment = toSafeThreadAttachmentSegment(threadId);
-	if (!threadSegment) return null;
-	return `${threadSegment}-${NodeCrypto.randomUUID()}`;
-}
-function parseThreadSegmentFromAttachmentId(attachmentId) {
-	const normalizedId = normalizeAttachmentRelativePath(attachmentId);
-	if (!normalizedId || normalizedId.includes("/") || normalizedId.includes(".")) return null;
-	const match = normalizedId.match(ATTACHMENT_ID_PATTERN);
-	if (!match) return null;
-	return match[1]?.toLowerCase() ?? null;
-}
-function attachmentRelativePath(attachment) {
-	switch (attachment.type) {
-		case "image": {
-			const extension = inferImageExtension({
-				mimeType: attachment.mimeType,
-				fileName: attachment.name
-			});
-			return `${attachment.id}${extension}`;
-		}
-		case "document": return `${attachment.id}.pdf`;
-	}
-}
-function resolveAttachmentPath(input) {
-	return resolveAttachmentRelativePath({
-		attachmentsDir: input.attachmentsDir,
-		relativePath: attachmentRelativePath(input.attachment)
-	});
-}
-function resolveAttachmentPathById(input) {
-	const normalizedId = normalizeAttachmentRelativePath(input.attachmentId);
-	if (!normalizedId || normalizedId.includes("/") || normalizedId.includes(".")) return null;
-	for (const extension of ATTACHMENT_FILENAME_EXTENSIONS) {
-		const maybePath = resolveAttachmentRelativePath({
-			attachmentsDir: input.attachmentsDir,
-			relativePath: `${normalizedId}${extension}`
-		});
-		if (maybePath && NodeFS.existsSync(maybePath)) return maybePath;
-	}
-	return null;
-}
-function parseAttachmentIdFromRelativePath(relativePath) {
-	const normalized = normalizeAttachmentRelativePath(relativePath);
-	if (!normalized || normalized.includes("/")) return null;
-	const extensionIndex = normalized.lastIndexOf(".");
-	if (extensionIndex <= 0) return null;
-	const id = normalized.slice(0, extensionIndex);
-	return id.length > 0 && !id.includes(".") ? id : null;
-}
-//#endregion
 //#region src/orchestration/Layers/ProjectionPipeline.ts
 const ORCHESTRATION_PROJECTOR_NAMES = {
 	projects: "projection.projects",
 	threads: "projection.threads",
 	threadMessages: "projection.thread-messages",
 	threadProposedPlans: "projection.thread-proposed-plans",
+	threadScheduledTasks: "projection.thread-scheduled-tasks",
 	threadActivities: "projection.thread-activities",
 	threadSessions: "projection.thread-sessions",
 	threadTurns: "projection.thread-turns",
@@ -29487,6 +30023,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
 	const projectionThreadRepository = yield* ProjectionThreadRepository;
 	const projectionThreadMessageRepository = yield* ProjectionThreadMessageRepository;
 	const projectionThreadProposedPlanRepository = yield* ProjectionThreadProposedPlanRepository;
+	const projectionThreadScheduledTaskRepository = yield* ProjectionThreadScheduledTaskRepository;
 	const projectionThreadActivityRepository = yield* ProjectionThreadActivityRepository;
 	const projectionThreadSessionRepository = yield* ProjectionThreadSessionRepository;
 	const projectionTurnRepository = yield* ProjectionTurnRepository;
@@ -29494,6 +30031,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const serverConfig = yield* ServerConfig$1;
+	const attachmentsRootDir = serverConfig.attachmentsDir;
 	const applyProjectsProjection = Effect.fn("applyProjectsProjection")(function* (event, _attachmentSideEffects) {
 		switch (event.type) {
 			case "project.created":
@@ -29893,8 +30431,34 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
 			default: return;
 		}
 	});
+	const copyForkedAttachmentFile = Effect.fn("copyForkedAttachmentFile")(function* (copy) {
+		const fromPath = resolveAttachmentRelativePath({
+			attachmentsDir: attachmentsRootDir,
+			relativePath: copy.fromRelativePath
+		});
+		const toPath = resolveAttachmentRelativePath({
+			attachmentsDir: attachmentsRootDir,
+			relativePath: copy.toRelativePath
+		});
+		if (!fromPath || !toPath) return yield* new PersistenceSqlError({
+			operation: "ProjectionPipeline.copyForkedAttachmentFile",
+			detail: `Unsafe attachment path while forking: ${copy.fromRelativePath}`
+		});
+		yield* fileSystem.copyFile(fromPath, toPath).pipe(Effect.catch((error) => error.reason._tag === "NotFound" ? Effect.logWarning("thread fork skipped a missing source attachment", { from: copy.fromRelativePath }) : Effect.fail(new PersistenceSqlError({
+			operation: "ProjectionPipeline.copyForkedAttachmentFile",
+			detail: `Could not copy attachment ${copy.fromRelativePath}: ${error.message}`,
+			cause: error
+		}))));
+	});
 	const applyThreadMessagesProjection = Effect.fn("applyThreadMessagesProjection")(function* (event, attachmentSideEffects) {
 		switch (event.type) {
+			case "thread.created": {
+				if (event.payload.forkedFromThreadId === void 0) return;
+				const sourceRows = yield* projectionThreadMessageRepository.listByThreadId({ threadId: event.payload.forkedFromThreadId });
+				yield* Effect.forEach(collectForkedAttachmentCopies(event.payload.threadId, sourceRows), copyForkedAttachmentFile, { concurrency: 1 });
+				yield* Effect.forEach(copyForkedProjectionMessages(event.payload.threadId, sourceRows), projectionThreadMessageRepository.upsert, { concurrency: 1 }).pipe(Effect.asVoid);
+				return;
+			}
 			case "thread.message-sent": {
 				const existingMessage = yield* projectionThreadMessageRepository.getByMessageId({ messageId: event.payload.messageId });
 				const previousMessage = Option.getOrUndefined(existingMessage);
@@ -29933,6 +30497,43 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
 			default: return;
 		}
 	});
+	const applyThreadScheduledTasksProjection = Effect.fn("applyThreadScheduledTasksProjection")(function* (event) {
+		switch (event.type) {
+			case "thread.scheduled-task.created":
+				yield* projectionThreadScheduledTaskRepository.upsert({
+					taskId: event.payload.task.id,
+					threadId: event.payload.threadId,
+					prompt: event.payload.task.prompt,
+					runAt: event.payload.task.runAt,
+					status: event.payload.task.status,
+					createdAt: event.payload.task.createdAt,
+					updatedAt: event.payload.task.updatedAt,
+					firedAt: event.payload.task.firedAt,
+					cancelledAt: event.payload.task.cancelledAt,
+					failure: event.payload.task.failure
+				});
+				return;
+			case "thread.scheduled-task.cancelled":
+			case "thread.scheduled-task.fired": {
+				const existing = yield* projectionThreadScheduledTaskRepository.getByTaskId({ taskId: event.payload.taskId });
+				if (existing === null) return;
+				yield* projectionThreadScheduledTaskRepository.upsert(event.type === "thread.scheduled-task.cancelled" ? {
+					...existing,
+					status: "cancelled",
+					cancelledAt: event.payload.cancelledAt,
+					updatedAt: event.occurredAt
+				} : {
+					...existing,
+					status: event.payload.failure === null ? "fired" : "failed",
+					firedAt: event.payload.firedAt,
+					failure: event.payload.failure,
+					updatedAt: event.occurredAt
+				});
+				return;
+			}
+			default: return;
+		}
+	});
 	const applyThreadProposedPlansProjection = Effect.fn("applyThreadProposedPlansProjection")(function* (event, _attachmentSideEffects) {
 		switch (event.type) {
 			case "thread.proposed-plan-upserted":
@@ -30292,6 +30893,10 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
 			name: ORCHESTRATION_PROJECTOR_NAMES.threadProposedPlans,
 			apply: applyThreadProposedPlansProjection
 		},
+		{
+			name: ORCHESTRATION_PROJECTOR_NAMES.threadScheduledTasks,
+			apply: applyThreadScheduledTasksProjection
+		},
 		{
 			name: ORCHESTRATION_PROJECTOR_NAMES.threadActivities,
 			apply: applyThreadActivitiesProjection
@@ -30341,7 +30946,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
 		projectEvent
 	};
 });
-const OrchestrationProjectionPipelineLive = Layer.effect(OrchestrationProjectionPipeline, makeOrchestrationProjectionPipeline()).pipe(Layer.provideMerge(ProjectionProjectRepositoryLive), Layer.provideMerge(ProjectionThreadRepositoryLive), Layer.provideMerge(ProjectionThreadMessageRepositoryLive), Layer.provideMerge(ProjectionThreadProposedPlanRepositoryLive), Layer.provideMerge(ProjectionThreadActivityRepositoryLive), Layer.provideMerge(ProjectionThreadSessionRepositoryLive), Layer.provideMerge(ProjectionTurnRepositoryLive), Layer.provideMerge(ProjectionPendingApprovalRepositoryLive), Layer.provideMerge(ProjectionStateRepositoryLive));
+const OrchestrationProjectionPipelineLive = Layer.effect(OrchestrationProjectionPipeline, makeOrchestrationProjectionPipeline()).pipe(Layer.provideMerge(ProjectionProjectRepositoryLive), Layer.provideMerge(ProjectionThreadRepositoryLive), Layer.provideMerge(ProjectionThreadMessageRepositoryLive), Layer.provideMerge(ProjectionThreadProposedPlanRepositoryLive), Layer.provideMerge(ProjectionThreadScheduledTaskRepositoryLive), Layer.provideMerge(ProjectionThreadActivityRepositoryLive), Layer.provideMerge(ProjectionThreadSessionRepositoryLive), Layer.provideMerge(ProjectionTurnRepositoryLive), Layer.provideMerge(ProjectionPendingApprovalRepositoryLive), Layer.provideMerge(ProjectionStateRepositoryLive));
 //#endregion
 //#region src/orchestration/ThreadBackgroundLiveness.ts
 /**
@@ -30369,7 +30974,7 @@ const TERMINAL_STATUSES = /* @__PURE__ */ new Set([
 	"interrupted"
 ]);
 var ThreadBackgroundLivenessService = class extends Context.Service()("@p4code/cli/orchestration/ThreadBackgroundLiveness/ThreadBackgroundLivenessService") {};
-function make$74() {
+function make$75() {
 	const stateByThreadId = /* @__PURE__ */ new Map();
 	const stateFor = (threadId) => {
 		const existing = stateByThreadId.get(threadId);
@@ -30419,7 +31024,7 @@ function make$74() {
 		}
 	};
 }
-const layer$64 = Layer.effect(ThreadBackgroundLivenessService, Effect.sync(make$74));
+const layer$64 = Layer.effect(ThreadBackgroundLivenessService, Effect.sync(make$75));
 //#endregion
 //#region src/persistence/Services/ProjectionCheckpoints.ts
 /**
@@ -30988,12 +31593,12 @@ const runProcessCore = Effect.fn("processRunner.runProcessCore")(function* (spaw
 		stderrInvalidUtf8: stderr.invalidUtf8
 	};
 });
-const make$73 = Effect.fn("ProcessRunner.make")(function* () {
+const make$74 = 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$63 = Layer.effect(ProcessRunner, make$73());
+const layer$63 = Layer.effect(ProcessRunner, make$74());
 //#endregion
 //#region src/project/RepositoryIdentityResolver.ts
 const DEFAULT_REPOSITORY_IDENTITY_CACHE_CAPACITY = 512;
@@ -31084,7 +31689,7 @@ const resolveRepositoryIdentityFromCacheKey = Effect.fn("RepositoryIdentityResol
 		rootPath: cacheKey
 	}) : null;
 });
-const make$72 = Effect.fn("RepositoryIdentityResolver.make")(function* (options = {}) {
+const make$73 = 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,
@@ -31099,7 +31704,7 @@ const make$72 = Effect.fn("RepositoryIdentityResolver.make")(function* (options
 	});
 	return RepositoryIdentityResolver.of({ resolve });
 });
-const layer$62 = Layer.effect(RepositoryIdentityResolver, make$72()).pipe(Layer.provide(layer$63));
+const layer$62 = Layer.effect(RepositoryIdentityResolver, make$73()).pipe(Layer.provide(layer$63));
 //#endregion
 //#region src/orchestration/Layers/ProjectionSnapshotQuery.ts
 const decodeReadModel = Schema$1.decodeUnknownEffect(OrchestrationReadModel);
@@ -31114,6 +31719,7 @@ const ProjectionThreadMessageDbRowSchema = ProjectionThreadMessage.mapFields(Str
 	attachments: Schema$1.NullOr(Schema$1.fromJsonString(Schema$1.Array(ChatAttachment)))
 }));
 const ProjectionThreadProposedPlanDbRowSchema = ProjectionThreadProposedPlan;
+const ProjectionThreadScheduledTaskDbRowSchema = ProjectionThreadScheduledTask;
 const ProjectionThreadDbRowSchema = ProjectionThread.mapFields(Struct.assign({
 	modelSelection: Schema$1.fromJsonString(ModelSelection),
 	workspaceLifecycle: Schema$1.NullOr(Schema$1.fromJsonString(ThreadWorkspaceLifecycle))
@@ -31314,6 +31920,28 @@ function mapProjectShellRow(row, repositoryIdentity) {
 		updatedAt: row.updatedAt
 	};
 }
+function mapScheduledTaskRow(row) {
+	return {
+		id: row.taskId,
+		prompt: row.prompt,
+		runAt: row.runAt,
+		status: row.status,
+		createdAt: row.createdAt,
+		updatedAt: row.updatedAt,
+		firedAt: row.firedAt,
+		cancelledAt: row.cancelledAt,
+		failure: row.failure
+	};
+}
+function groupScheduledTasksByThread(rows) {
+	const byThread = /* @__PURE__ */ new Map();
+	for (const row of rows) {
+		const tasks = byThread.get(row.threadId) ?? [];
+		tasks.push(mapScheduledTaskRow(row));
+		byThread.set(row.threadId, tasks);
+	}
+	return byThread;
+}
 function mapProposedPlanRow(row) {
 	return {
 		id: row.planId,
@@ -31542,6 +32170,45 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           updated_at AS "updatedAt"
         FROM projection_thread_proposed_plans
         ORDER BY thread_id ASC, created_at ASC, plan_id ASC
+      `
+	});
+	const listThreadScheduledTaskRows = SqlSchema.findAll({
+		Request: Schema$1.Void,
+		Result: ProjectionThreadScheduledTaskDbRowSchema,
+		execute: () => sql`
+        SELECT
+          task_id AS "taskId",
+          thread_id AS "threadId",
+          prompt,
+          run_at AS "runAt",
+          status,
+          created_at AS "createdAt",
+          updated_at AS "updatedAt",
+          fired_at AS "firedAt",
+          cancelled_at AS "cancelledAt",
+          failure
+        FROM projection_thread_scheduled_tasks
+        ORDER BY thread_id ASC, run_at ASC, task_id ASC
+      `
+	});
+	const listThreadScheduledTaskRowsByThread = SqlSchema.findAll({
+		Request: ThreadIdLookupInput,
+		Result: ProjectionThreadScheduledTaskDbRowSchema,
+		execute: ({ threadId }) => sql`
+        SELECT
+          task_id AS "taskId",
+          thread_id AS "threadId",
+          prompt,
+          run_at AS "runAt",
+          status,
+          created_at AS "createdAt",
+          updated_at AS "updatedAt",
+          fired_at AS "firedAt",
+          cancelled_at AS "cancelledAt",
+          failure
+        FROM projection_thread_scheduled_tasks
+        WHERE thread_id = ${threadId}
+        ORDER BY run_at ASC, task_id ASC
       `
 	});
 	const listThreadActivityRows = SqlSchema.findAll({
@@ -32330,8 +32997,10 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 		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"))),
-		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* () {
+		listThreadPairRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getSnapshot:listThreadPairs:query", "ProjectionSnapshotQuery.getSnapshot:listThreadPairs:decodeRows"))),
+		listThreadScheduledTaskRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getSnapshot:listThreadScheduledTasks:query", "ProjectionSnapshotQuery.getSnapshot:listThreadScheduledTasks:decodeRows")))
+	])).pipe(Effect.flatMap(([projectRows, threadRows, messageRows, proposedPlanRows, activityRows, sessionRows, checkpointRows, turnRows, latestTurnRows, stateRows, threadPairRows, scheduledTaskRows]) => Effect.gen(function* () {
+		const scheduledTasksByThread = groupScheduledTasksByThread(scheduledTaskRows);
 		const messagesByThread = /* @__PURE__ */ new Map();
 		const proposedPlansByThread = /* @__PURE__ */ new Map();
 		const activitiesByThread = /* @__PURE__ */ new Map();
@@ -32465,6 +33134,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 			deletedAt: row.deletedAt,
 			messages: messagesByThread.get(row.threadId) ?? [],
 			proposedPlans: proposedPlansByThread.get(row.threadId) ?? [],
+			scheduledTasks: scheduledTasksByThread.get(row.threadId) ?? [],
 			activities: activitiesByThread.get(row.threadId) ?? [],
 			checkpoints: checkpointsByThread.get(row.threadId) ?? [],
 			session: sessionsByThread.get(row.threadId) ?? null
@@ -32509,8 +33179,10 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 		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"))),
-		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(() => {
+		listThreadPairRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getCommandReadModel:listThreadPairs:query", "ProjectionSnapshotQuery.getCommandReadModel:listThreadPairs:decodeRows"))),
+		listThreadScheduledTaskRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getCommandReadModel:listThreadScheduledTasks:query", "ProjectionSnapshotQuery.getCommandReadModel:listThreadScheduledTasks:decodeRows")))
+	])).pipe(Effect.flatMap(([projectRows, threadRows, proposedPlanRows, sessionRows, latestTurnRows, stateRows, threadPairRows, scheduledTaskRows]) => Effect.sync(() => {
+		const scheduledTasksByThread = groupScheduledTasksByThread(scheduledTaskRows);
 		let updatedAt = null;
 		const projects = [];
 		const threads = [];
@@ -32605,6 +33277,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 				deletedAt: row.deletedAt,
 				messages: [],
 				proposedPlans: proposedPlansByThread.get(row.threadId) ?? [],
+				scheduledTasks: scheduledTasksByThread.get(row.threadId) ?? [],
 				activities: [],
 				checkpoints: [],
 				session: sessionByThread.get(row.threadId) ?? null
@@ -32857,7 +33530,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 		});
 	});
 	const getThreadDetailByIdBounded = (threadId, bounds) => Effect.gen(function* () {
-		const [threadRow, messageRows, proposedPlanRows, activityRows, checkpointRows, turnRows, latestTurnRow, sessionRow] = yield* Effect.all([
+		const [threadRow, messageRows, proposedPlanRows, activityRows, checkpointRows, turnRows, latestTurnRow, sessionRow, scheduledTaskRows] = yield* Effect.all([
 			getActiveThreadRowById({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:getThread:query", "ProjectionSnapshotQuery.getThreadDetailById:getThread:decodeRow"))),
 			(bounds === void 0 ? listThreadMessageRowsByThread({ threadId }) : listThreadMessageRowsByThreadWindow({
 				threadId,
@@ -32871,7 +33544,8 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 			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")))
+			getThreadSessionRowByThread({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:getSession:query", "ProjectionSnapshotQuery.getThreadDetailById:getSession:decodeRow"))),
+			listThreadScheduledTaskRowsByThread({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:listScheduledTasks:query", "ProjectionSnapshotQuery.getThreadDetailById:listScheduledTasks:decodeRows")))
 		]);
 		if (Option.isNone(threadRow)) return Option.none();
 		const thread = {
@@ -32912,6 +33586,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 				return message;
 			}),
 			proposedPlans: proposedPlanRows.map(mapProposedPlanRow),
+			scheduledTasks: scheduledTaskRows.map(mapScheduledTaskRow),
 			activities: activityRows.map((row) => {
 				const activity = {
 					id: row.activityId,
@@ -33564,7 +34239,7 @@ function mergeWithDefaultKeybindings(custom) {
 * Keybindings - Service tag for keybinding configuration operations.
 */
 var Keybindings = class extends Context.Service()("@p4code/cli/keybindings") {};
-const make$71 = Effect.gen(function* () {
+const make$72 = Effect.gen(function* () {
 	const { keybindingsConfigPath } = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
@@ -33825,7 +34500,7 @@ const make$71 = Effect.gen(function* () {
 		}))
 	};
 });
-const layer$61 = Layer.effect(Keybindings, make$71);
+const layer$61 = Layer.effect(Keybindings, make$72);
 //#endregion
 //#region src/process/externalLauncher.ts
 /**
@@ -34052,7 +34727,7 @@ const launchEditorProcess = Effect.fn("externalLauncher.launchEditorProcess")(fu
 		cause
 	}));
 });
-const make$70 = Effect.gen(function* () {
+const make$71 = Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
@@ -34063,7 +34738,7 @@ const make$70 = Effect.gen(function* () {
 		launchEditor: (input) => provideCommandResolutionServices(Effect.flatMap(resolveEditorLaunch(input), (launch) => launchEditorProcess(launch).pipe(Effect.provideService(ChildProcessSpawner$1.ChildProcessSpawner, spawner))))
 	});
 });
-const layer$60 = Layer.effect(ExternalLauncher, make$70);
+const layer$60 = Layer.effect(ExternalLauncher, make$71);
 //#endregion
 //#region src/orchestration/Services/OrchestrationReactor.ts
 /**
@@ -34081,7 +34756,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$69 = Effect.gen(function* () {
+const make$70 = Effect.gen(function* () {
 	const pubsub = yield* PubSub.unbounded();
 	const state = yield* Ref.make({
 		sequence: 0,
@@ -34105,7 +34780,7 @@ const make$69 = Effect.gen(function* () {
 		}
 	};
 });
-const layer$59 = Layer.effect(ServerLifecycleEvents, make$69);
+const layer$59 = Layer.effect(ServerLifecycleEvents, make$70);
 //#endregion
 //#region src/telemetry/Identify.ts
 const CodexAuthJsonSchema = Schema$1.Struct({ tokens: Schema$1.Struct({ account_id: Schema$1.String }) });
@@ -34278,7 +34953,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$68 = Effect.gen(function* () {
+const make$69 = Effect.gen(function* () {
 	const telemetryConfig = yield* TelemetryEnvConfig;
 	const posthogKey = telemetryConfig.posthogKey.trim();
 	if (!telemetryConfig.enabled || posthogKey === "") return inert;
@@ -34348,7 +35023,7 @@ const make$68 = Effect.gen(function* () {
 		flush
 	});
 });
-const layer$58 = Layer.effect(AnalyticsService, make$68);
+const layer$58 = Layer.effect(AnalyticsService, make$69);
 AnalyticsService.layerTest;
 //#endregion
 //#region src/service/pinnedRuntime.ts
@@ -34695,7 +35370,7 @@ var BootServiceInstallError = class extends Schema$1.TaggedErrorClass()("BootSer
 	}
 };
 var BootService = class extends Context.Service()("@p4code/cli/service/bootService") {};
-const make$67 = Effect.fn("cloud.boot_service.make")(function* (input) {
+const make$68 = Effect.fn("cloud.boot_service.make")(function* (input) {
 	const hostExecPath = yield* HostProcessExecutablePath;
 	const hostArguments = yield* HostProcessArguments;
 	const host = input.host ?? {
@@ -34917,7 +35592,7 @@ const make$67 = Effect.fn("cloud.boot_service.make")(function* (input) {
 		logPath
 	});
 });
-const layer$57 = (input) => Layer.effect(BootService, make$67(input));
+const layer$57 = (input) => Layer.effect(BootService, make$68(input));
 //#endregion
 //#region src/service/selfUpdate.ts
 /**
@@ -34992,7 +35667,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$66 = Effect.fn("cloud.server_self_update.make")(function* (options) {
+const make$67 = Effect.fn("cloud.server_self_update.make")(function* (options) {
 	const serverConfig = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
@@ -35142,7 +35817,7 @@ const make$66 = Effect.fn("cloud.server_self_update.make")(function* (options) {
 	});
 	return ServerSelfUpdate.of({ update });
 });
-const layer$56 = Layer.effect(ServerSelfUpdate, make$66()).pipe(Layer.provide(layer$63));
+const layer$56 = Layer.effect(ServerSelfUpdate, make$67()).pipe(Layer.provide(layer$63));
 //#endregion
 //#region src/environment/ServerEnvironmentLabel.ts
 const ServerEnvironmentLabelCommandProbe = Schema$1.Literals(["macos-computer-name", "linux-pretty-hostname"]);
@@ -35274,7 +35949,7 @@ function platformArch(architecture) {
 		default: return "other";
 	}
 }
-const make$65 = Effect.gen(function* () {
+const make$66 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const serverConfig = yield* ServerConfig$1;
@@ -35325,6 +36000,8 @@ const make$65 = Effect.gen(function* () {
 			threadSettlement: true,
 			threadSnooze: true,
 			threadPinning: true,
+			threadFork: true,
+			threadScheduledTasks: true,
 			...serverSelfUpdate === null ? {} : { serverSelfUpdate },
 			...serverServiceSupervised ? { serverServiceSupervised } : {}
 		}
@@ -35339,7 +36016,7 @@ const make$65 = Effect.gen(function* () {
 * state. It intentionally has no fallback Layer.succeed value: callers must
 * provide the external platform services and a ServerConfig.
 */
-const layer$55 = Layer.effect(ServerEnvironment, make$65).pipe(Layer.provide(layer$63));
+const layer$55 = Layer.effect(ServerEnvironment, make$66).pipe(Layer.provide(layer$63));
 //#endregion
 //#region src/provider/Services/ProviderSessionReaper.ts
 var ProviderSessionReaper = class extends Context.Service()("@p4code/cli/provider/Services/ProviderSessionReaper") {};
@@ -35481,7 +36158,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$64 = Effect.gen(function* () {
+const make$65 = Effect.gen(function* () {
 	const serverConfig = yield* ServerConfig$1;
 	const keybindings = yield* Keybindings;
 	const orchestrationReactor = yield* OrchestrationReactor;
@@ -35622,7 +36299,7 @@ const make$64 = Effect.gen(function* () {
 		enqueueCommand: commandGate.enqueueCommand
 	};
 });
-const layer$54 = Layer.effect(ServerRuntimeStartup, make$64);
+const layer$54 = Layer.effect(ServerRuntimeStartup, make$65);
 //#endregion
 //#region src/serverRuntimeState.ts
 const PersistedServerRuntimeState = Schema$1.Struct({
@@ -35779,7 +36456,7 @@ function expandHomePath$2(input, path) {
 	if (input.startsWith("~/") || input.startsWith("~\\")) return path.join(NodeOS.homedir(), input.slice(2));
 	return input;
 }
-const make$63 = Effect.gen(function* () {
+const make$64 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const statWorkspaceRoot = Effect.fn("WorkspacePaths.statWorkspaceRoot")(function* (workspaceRoot, normalizedWorkspaceRoot, phase) {
@@ -35836,7 +36513,7 @@ const make$63 = Effect.gen(function* () {
 		resolveRelativePathWithinRoot
 	});
 });
-const layer$53 = Layer.effect(WorkspacePaths, make$63);
+const layer$53 = Layer.effect(WorkspacePaths, make$64);
 //#endregion
 //#region src/cli/project.ts
 const isEnvironmentHttpCommonError = Schema$1.is(EnvironmentHttpCommonError);
@@ -37019,7 +37696,7 @@ const logP4ProjectFileLoadError = (error) => Effect.logWarning(error).pipe(Effec
 	filePath: error.filePath,
 	errorTag: error._tag
 }));
-const make$62 = Effect.gen(function* () {
+const make$63 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const load = Effect.fn("P4ProjectFileLoader.load")(function* (workspaceRoot) {
@@ -37040,7 +37717,7 @@ const make$62 = Effect.gen(function* () {
 	});
 	return P4ProjectFileLoader.of({ load });
 });
-const layer$52 = Layer.effect(P4ProjectFileLoader, make$62);
+const layer$52 = Layer.effect(P4ProjectFileLoader, make$63);
 //#endregion
 //#region src/project/ProjectFaviconResolver.ts
 /**
@@ -37115,7 +37792,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$61 = Effect.gen(function* () {
+const make$62 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const workspacePaths = yield* WorkspacePaths;
@@ -37184,7 +37861,7 @@ const make$61 = Effect.gen(function* () {
 	});
 	return ProjectFaviconResolver.of({ resolvePath });
 });
-const layer$51 = Layer.effect(ProjectFaviconResolver, make$61);
+const layer$51 = Layer.effect(ProjectFaviconResolver, make$62);
 //#endregion
 //#region src/assets/AssetAccess.ts
 const ASSET_ROUTE_PREFIX = "/api/assets";
@@ -37595,10 +38272,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$60 = (sink) => BrowserTraceCollector.of({ record: (records) => Effect.sync(() => {
+const make$61 = (sink) => BrowserTraceCollector.of({ record: (records) => Effect.sync(() => {
 	for (const record of records) sink.push(record);
 }) });
-const layer$50 = (sink) => Layer.succeed(BrowserTraceCollector, make$60(sink));
+const layer$50 = (sink) => Layer.succeed(BrowserTraceCollector, make$61(sink));
 //#endregion
 //#region src/auth/http.ts
 const CREDENTIAL_RESPONSE_HEADERS = {
@@ -40651,7 +41328,7 @@ const classifyNonZeroExit = (command, stderr) => {
 	if (command === "gh" && (normalized.includes("could not resolve to a pullrequest") || normalized.includes("repository.pullrequest") || normalized.includes("no pull requests found for branch") || normalized.includes("pull request not found")) || command === "glab" && (normalized.includes("merge request not found") || normalized.includes("not found") || normalized.includes("404")) || command === "az" && normalized.includes("pull request") && (normalized.includes("not found") || normalized.includes("does not exist"))) return "not-found";
 	return "command-failed";
 };
-const make$59 = Effect.gen(function* () {
+const make$60 = Effect.gen(function* () {
 	const processRunner = yield* ProcessRunner;
 	const run = Effect.fn("VcsProcess.run")(function* (input) {
 		const baseError = {
@@ -40710,7 +41387,7 @@ const make$59 = Effect.gen(function* () {
 	});
 	return VcsProcess.of({ run });
 });
-const layer$49 = Layer.effect(VcsProcess, make$59).pipe(Layer.provide(layer$63));
+const layer$49 = Layer.effect(VcsProcess, make$60).pipe(Layer.provide(layer$63));
 //#endregion
 //#region src/vcs/VcsDriver.ts
 var VcsDriver = class extends Context.Service()("@p4code/cli/vcs/VcsDriver") {};
@@ -41161,12 +41838,12 @@ const makeVcsDriver = Effect.gen(function* () {
 	const driver = yield* makeVcsDriverShape();
 	return VcsDriver.of(driver);
 });
-const make$58 = Effect.gen(function* () {
+const make$59 = Effect.gen(function* () {
 	const git = yield* makeGitVcsDriverCore();
 	return GitVcsDriver.of(git);
 });
 Layer.effect(VcsDriver, makeVcsDriver);
-const layer$48 = Layer.effect(GitVcsDriver, make$58);
+const layer$48 = Layer.effect(GitVcsDriver, make$59);
 //#endregion
 //#region src/vcs/VcsProjectConfig.ts
 const ProjectVcsConfigJson = fromLenientJson(Schema$1.Struct({
@@ -41198,7 +41875,7 @@ const logVcsProjectConfigError = (error) => Effect.logWarning(error).pipe(Effect
 	configPath: error.configPath,
 	errorTag: error._tag
 }));
-const make$57 = Effect.gen(function* () {
+const make$58 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const findConfigPath = Effect.fn("VcsProjectConfig.findConfigPath")(function* (cwd) {
@@ -41239,7 +41916,7 @@ const make$57 = Effect.gen(function* () {
 	});
 	return VcsProjectConfig.of({ resolveKind });
 });
-const layer$47 = Layer.effect(VcsProjectConfig, make$57);
+const layer$47 = Layer.effect(VcsProjectConfig, make$58);
 //#endregion
 //#region src/vcs/VcsDriverRegistry.ts
 const DETECTION_CACHE_CAPACITY = 2048;
@@ -41259,7 +41936,7 @@ function parseDetectionCacheKey(key) {
 		cwd: key.slice(separatorIndex + 1)
 	};
 }
-const make$56 = Effect.gen(function* () {
+const make$57 = Effect.gen(function* () {
 	const projectConfig = yield* VcsProjectConfig;
 	const git = yield* makeVcsDriver;
 	const drivers = { git };
@@ -41316,7 +41993,7 @@ const make$56 = Effect.gen(function* () {
 		resolve
 	});
 });
-const layer$46 = Layer.effect(VcsDriverRegistry, make$56).pipe(Layer.provide(layer$47));
+const layer$46 = Layer.effect(VcsDriverRegistry, make$57).pipe(Layer.provide(layer$47));
 //#endregion
 //#region src/checkpointing/CheckpointStore.ts
 /**
@@ -41336,7 +42013,7 @@ const layer$46 = Layer.effect(VcsDriverRegistry, make$56).pipe(Layer.provide(lay
 */
 /** Service tag for checkpoint persistence and restore operations. */
 var CheckpointStore = class extends Context.Service()("@p4code/cli/checkpointing/CheckpointStore") {};
-const make$55 = Effect.gen(function* () {
+const make$56 = Effect.gen(function* () {
 	const vcsRegistry = yield* VcsDriverRegistry;
 	const resolveCheckpoints = Effect.fn("CheckpointStore.resolveCheckpoints")(function* (operation, cwd) {
 		const handle = yield* vcsRegistry.resolve({ cwd });
@@ -41375,7 +42052,7 @@ const make$55 = Effect.gen(function* () {
 		deleteCheckpointRefs
 	});
 });
-const layer$45 = Layer.effect(CheckpointStore, make$55);
+const layer$45 = Layer.effect(CheckpointStore, make$56);
 //#endregion
 //#region src/checkpointing/CheckpointDiffQuery.ts
 /**
@@ -41397,7 +42074,7 @@ function buildTurnDiffResult(input, diff) {
 		diff
 	};
 }
-const make$54 = Effect.gen(function* () {
+const make$55 = Effect.gen(function* () {
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 	const checkpointStore = yield* CheckpointStore;
 	const threadActivities = yield* ProjectionThreadActivityRepository;
@@ -41568,7 +42245,7 @@ const make$54 = Effect.gen(function* () {
 		getFullThreadDiff
 	});
 });
-const layer$44 = Layer.effect(CheckpointDiffQuery, make$54);
+const layer$44 = Layer.effect(CheckpointDiffQuery, make$55);
 //#endregion
 //#region src/orchestration/Normalizer.ts
 const canonicalizeClientCommandTimestamps = (command, receivedAt) => {
@@ -41683,11 +42360,11 @@ const makeTextGenerationFromRegistry = (registry) => TextGeneration.of({
 		detail: "This provider does not report account usage."
 	}))))
 });
-const make$53 = Effect.gen(function* () {
+const make$54 = Effect.gen(function* () {
 	const registry = yield* ProviderInstanceRegistry;
 	return makeTextGenerationFromRegistry(registry);
 });
-const layer$43 = Layer.effect(TextGeneration, make$53);
+const layer$43 = Layer.effect(TextGeneration, make$54);
 //#endregion
 //#region src/textGeneration/TextGenerationPresets.ts
 const conventionalCommitsTextGenerationPolicy = {
@@ -42019,7 +42696,7 @@ const serversEqual = (left, right) => {
 	}
 	return true;
 };
-const make$52 = Effect.gen(function* PortDiscoveryMake() {
+const make$53 = Effect.gen(function* PortDiscoveryMake() {
 	const net = yield* NetService;
 	const processRunner = yield* ProcessRunner;
 	const hostPlatform = yield* HostProcessPlatform;
@@ -42170,7 +42847,7 @@ const make$52 = Effect.gen(function* PortDiscoveryMake() {
 		unregisterTerminal
 	});
 }).pipe(Effect.withSpan("PortDiscovery.make"));
-const layer$42 = Layer.effect(PortDiscovery, make$52);
+const layer$42 = Layer.effect(PortDiscovery, make$53);
 //#endregion
 //#region src/terminal/Manager.ts
 /**
@@ -42848,7 +43525,7 @@ function normalizedRuntimeEnv(env) {
 	if (entries.length === 0) return null;
 	return Object.fromEntries(entries.toSorted(([left], [right]) => left.localeCompare(right)));
 }
-const make$51 = Effect.fn("TerminalManager.make")(function* () {
+const make$52 = Effect.fn("TerminalManager.make")(function* () {
 	const { terminalLogsDir } = yield* ServerConfig$1;
 	const ptyAdapter = yield* PtyAdapter;
 	const portDiscovery = yield* PortDiscovery;
@@ -43810,7 +44487,7 @@ const makeWithOptions$1 = Effect.fn("TerminalManager.makeWithOptions")(function*
 		subscribeMetadata
 	});
 });
-const layer$41 = Layer.effect(TerminalManager, make$51()).pipe(Layer.provide(layer$63));
+const layer$41 = Layer.effect(TerminalManager, make$52()).pipe(Layer.provide(layer$63));
 //#endregion
 //#region src/project/ProjectSetupScriptRunner.ts
 var ProjectSetupScriptOperationError = class extends Schema$1.TaggedErrorClass()("ProjectSetupScriptOperationError", {
@@ -43841,7 +44518,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$50 = Effect.gen(function* () {
+const make$51 = Effect.gen(function* () {
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 	const terminalManager = yield* TerminalManager;
 	const runForThread = Effect.fn("ProjectSetupScriptRunner.runForThread")(function* (input) {
@@ -43899,7 +44576,7 @@ const make$50 = Effect.gen(function* () {
 	});
 	return ProjectSetupScriptRunner.of({ runForThread });
 });
-const layer$40 = Layer.effect(ProjectSetupScriptRunner, make$50);
+const layer$40 = Layer.effect(ProjectSetupScriptRunner, make$51);
 //#endregion
 //#region src/provider/Services/ProviderRegistry.ts
 var ProviderRegistry = class extends Context.Service()("@p4code/cli/provider/Services/ProviderRegistry") {};
@@ -44226,7 +44903,7 @@ function decodeAzureDevOpsJson(raw, schema, operation, cwd) {
 		cause
 	})));
 }
-const make$49 = Effect.gen(function* () {
+const make$50 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const execute = (input) => process.run({
 		operation: "AzureDevOpsCli.execute",
@@ -44368,7 +45045,7 @@ const make$49 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$39 = Layer.effect(AzureDevOpsCli, make$49);
+const layer$39 = Layer.effect(AzureDevOpsCli, make$50);
 //#endregion
 //#region src/sourceControl/SourceControlProviderDiscovery.ts
 function firstNonEmptyLine(text) {
@@ -44571,7 +45248,7 @@ function toChangeRequest$5(summary) {
 		isCrossRepository: false
 	};
 }
-const make$48 = Effect.gen(function* () {
+const make$49 = Effect.gen(function* () {
 	const azure = yield* AzureDevOpsCli;
 	return SourceControlProvider.of({
 		kind: "azure-devops",
@@ -44663,7 +45340,7 @@ const make$48 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$48);
+Layer.effect(SourceControlProvider, make$49);
 //#endregion
 //#region src/sourceControl/bitbucketPullRequests.ts
 const BitbucketRepositoryRefSchema = Schema$1.Struct({
@@ -45040,7 +45717,7 @@ function responseError(operation, response) {
 		responseBodyLength: collected.text.length
 	}))));
 }
-const make$47 = Effect.gen(function* () {
+const make$48 = Effect.gen(function* () {
 	const config = yield* BitbucketApiEnvConfig;
 	const httpClient = yield* HttpClient.HttpClient;
 	const fileSystem = yield* FileSystem.FileSystem;
@@ -45256,7 +45933,7 @@ const make$47 = Effect.gen(function* () {
 		})))
 	});
 });
-const layer$37 = Layer.effect(BitbucketApi, make$47);
+const layer$37 = Layer.effect(BitbucketApi, make$48);
 //#endregion
 //#region src/sourceControl/BitbucketSourceControlProvider.ts
 function toChangeRequest$4(summary) {
@@ -45274,7 +45951,7 @@ function toChangeRequest$4(summary) {
 		...summary.headRepositoryOwnerLogin !== void 0 ? { headRepositoryOwnerLogin: summary.headRepositoryOwnerLogin } : {}
 	};
 }
-const make$46 = Effect.gen(function* () {
+const make$47 = Effect.gen(function* () {
 	const bitbucket = yield* BitbucketApi;
 	return SourceControlProvider.of({
 		kind: "bitbucket",
@@ -45365,7 +46042,7 @@ const make$46 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$46);
+Layer.effect(SourceControlProvider, make$47);
 const makeDiscovery = Effect.gen(function* () {
 	return {
 		type: "api",
@@ -45607,7 +46284,7 @@ function deriveRepositoryCloneUrlsFromCreateOutput(stdout, repository) {
 		sshUrl: `git@${fallbackHost}:${repository}.git`
 	};
 }
-const make$45 = Effect.gen(function* () {
+const make$46 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const execute = (input) => process.run({
 		operation: "GitHubCli.execute",
@@ -45725,7 +46402,7 @@ const make$45 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$35 = Layer.effect(GitHubCli, make$45);
+const layer$35 = Layer.effect(GitHubCli, make$46);
 //#endregion
 //#region src/sourceControl/gitHubAuthStatus.ts
 const GitHubAuthStatusAccountSchema = Schema$1.Struct({
@@ -45826,7 +46503,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$44 = Effect.gen(function* () {
+const make$45 = Effect.gen(function* () {
 	const github = yield* GitHubCli;
 	const listChangeRequests = (input) => {
 		if (input.state === "open") return github.listOpenPullRequests({
@@ -45942,7 +46619,7 @@ const make$44 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$44);
+Layer.effect(SourceControlProvider, make$45);
 //#endregion
 //#region src/sourceControl/gitLabMergeRequests.ts
 const GitLabProjectReferenceSchema = Schema$1.Struct({
@@ -46254,7 +46931,7 @@ function parseRepositoryPath(repository) {
 		projectPath
 	};
 }
-const make$43 = Effect.gen(function* () {
+const make$44 = Effect.gen(function* () {
 	const process = yield* VcsProcess;
 	const run = (input, mapError) => process.run({
 		operation: "GitLabCli.execute",
@@ -46405,7 +47082,7 @@ const make$43 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$33 = Layer.effect(GitLabCli, make$43);
+const layer$33 = Layer.effect(GitLabCli, make$44);
 //#endregion
 //#region src/sourceControl/gitLabAuthStatus.ts
 const HOST_LINE_PATTERN = /^(?:[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?|\[[a-f0-9:.]+\])(?::\d+)?$/iu;
@@ -46502,7 +47179,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$42 = Effect.gen(function* () {
+const make$43 = Effect.gen(function* () {
 	const gitlab = yield* GitLabCli;
 	return SourceControlProvider.of({
 		kind: "gitlab",
@@ -46590,7 +47267,7 @@ const make$42 = Effect.gen(function* () {
 		})))
 	});
 });
-Layer.effect(SourceControlProvider, make$42);
+Layer.effect(SourceControlProvider, make$43);
 //#endregion
 //#region src/sourceControl/SourceControlProviderRegistry.ts
 const PROVIDER_DETECTION_CACHE_CAPACITY = 2048;
@@ -46746,12 +47423,12 @@ const makeWithProviders = Effect.fn("makeSourceControlProviderRegistryWithProvid
 		})), { concurrency: "unbounded" })
 	});
 });
-const make$41 = Effect.gen(function* () {
-	const github = yield* make$44;
-	const gitlab = yield* make$42;
-	const bitbucket = yield* make$46;
+const make$42 = Effect.gen(function* () {
+	const github = yield* make$45;
+	const gitlab = yield* make$43;
+	const bitbucket = yield* make$47;
 	const bitbucketDiscovery = yield* makeDiscovery;
-	const azureDevOps = yield* make$48;
+	const azureDevOps = yield* make$49;
 	return yield* makeWithProviders([
 		{
 			kind: "github",
@@ -46775,7 +47452,7 @@ const make$41 = Effect.gen(function* () {
 		}
 	]);
 });
-const layer$31 = Layer.effect(SourceControlProviderRegistry, make$41);
+const layer$31 = Layer.effect(SourceControlProviderRegistry, make$42);
 //#endregion
 //#region src/sourceControl/PrTemplateDetection.ts
 const TEMPLATE_MAX_BYTES = 8e3;
@@ -47145,7 +47822,7 @@ function toPullRequestHeadRemoteInfo(pr) {
 		...pr.headRepositoryOwnerLogin !== void 0 ? { headRepositoryOwnerLogin: pr.headRepositoryOwnerLogin } : {}
 	};
 }
-const make$40 = Effect.gen(function* () {
+const make$41 = Effect.gen(function* () {
 	const gitCore = yield* GitVcsDriver;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
 	const textGeneration = yield* TextGeneration;
@@ -48067,7 +48744,7 @@ const make$40 = Effect.gen(function* () {
 		runStackedAction
 	});
 });
-const layer$30 = Layer.effect(GitManager, make$40);
+const layer$30 = Layer.effect(GitManager, make$41);
 //#endregion
 //#region src/git/GitWorkflowService.ts
 var GitWorkflowService = class extends Context.Service()("@p4code/cli/git/GitWorkflowService") {};
@@ -48104,7 +48781,7 @@ function nonRepositoryListRefs() {
 		totalCount: 0
 	};
 }
-const make$39 = Effect.gen(function* () {
+const make$40 = Effect.gen(function* () {
 	const registry = yield* VcsDriverRegistry;
 	const git = yield* GitVcsDriver;
 	const gitManager = yield* GitManager;
@@ -48190,7 +48867,7 @@ const make$39 = Effect.gen(function* () {
 		renameBranch: (input) => ensureGit("GitWorkflowService.renameBranch", input.cwd).pipe(Effect.andThen(git.renameBranch(input)))
 	});
 });
-const layer$29 = Layer.effect(GitWorkflowService, make$39);
+const layer$29 = Layer.effect(GitWorkflowService, make$40);
 //#endregion
 //#region src/pullRequest/PullRequestProvider.ts
 /**
@@ -48551,7 +49228,7 @@ function isReviewerName(value) {
 	const name = value.trim();
 	return name.length > 0 && !name.startsWith("-");
 }
-const make$38 = Effect.gen(function* () {
+const make$39 = Effect.gen(function* () {
 	const azure = yield* AzureDevOpsCli;
 	const detectArgs = ["--detect", "true"];
 	const executeJson = (input) => azure.execute({
@@ -48751,7 +49428,7 @@ const make$38 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$28 = Layer.effect(AzureDevOpsPullRequestCli, make$38);
+const layer$28 = Layer.effect(AzureDevOpsPullRequestCli, make$39);
 //#endregion
 //#region src/pullRequest/AzureDevOpsPullRequestProvider.ts
 const CAPABILITIES$3 = {
@@ -48826,7 +49503,7 @@ function toChangeRequest$1(pullRequest) {
 		labels: []
 	};
 }
-const make$37 = Effect.gen(function* () {
+const make$38 = Effect.gen(function* () {
 	const cli = yield* AzureDevOpsPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "azure-devops",
@@ -49566,7 +50243,7 @@ function mergeStrategy(method) {
 		default: return "merge_commit";
 	}
 }
-const make$36 = Effect.gen(function* () {
+const make$37 = Effect.gen(function* () {
 	const bitbucket = yield* BitbucketApi;
 	/**
 	* The repository's own path, and the workspace above it — which the people who may review are
@@ -49846,7 +50523,7 @@ const make$36 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid))
 	});
 });
-const layer$27 = Layer.effect(BitbucketPullRequestApi, make$36);
+const layer$27 = Layer.effect(BitbucketPullRequestApi, make$37);
 //#endregion
 //#region src/pullRequest/BitbucketPullRequestProvider.ts
 const CAPABILITIES$2 = {
@@ -49926,7 +50603,7 @@ function toChangeRequest(pullRequest) {
 		labels: []
 	};
 }
-const make$35 = Effect.gen(function* () {
+const make$36 = Effect.gen(function* () {
 	const api = yield* BitbucketPullRequestApi;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "bitbucket",
@@ -51813,7 +52490,7 @@ function actionArgs$1(action, mergeMethod, updateMethod) {
 		case "reopen": return ["reopen"];
 	}
 }
-const make$34 = Effect.gen(function* () {
+const make$35 = Effect.gen(function* () {
 	const github = yield* GitHubCli;
 	/**
 	* The pull request's own node id, which is what a mutation against the pull request itself is
@@ -52533,7 +53210,7 @@ const make$34 = Effect.gen(function* () {
 		})))
 	});
 });
-const layer$26 = Layer.effect(GitHubPullRequestCli, make$34);
+const layer$26 = Layer.effect(GitHubPullRequestCli, make$35);
 //#endregion
 //#region src/pullRequest/GitHubPullRequestProvider.ts
 const CAPABILITIES$1 = {
@@ -52648,7 +53325,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$33 = Effect.gen(function* () {
+const make$34 = Effect.gen(function* () {
 	const cli = yield* GitHubPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "github",
@@ -53667,7 +54344,7 @@ function actionArgs(action, mergeMethod) {
 		case "reopen": return ["reopen"];
 	}
 }
-const make$32 = Effect.gen(function* () {
+const make$33 = Effect.gen(function* () {
 	const gitlab = yield* GitLabCli;
 	const api = (input) => gitlab.execute({
 		cwd: input.cwd,
@@ -54238,7 +54915,7 @@ const make$32 = Effect.gen(function* () {
 		}).pipe(Effect.asVoid)
 	});
 });
-const layer$25 = Layer.effect(GitLabPullRequestCli, make$32);
+const layer$25 = Layer.effect(GitLabPullRequestCli, make$33);
 //#endregion
 //#region src/pullRequest/GitLabPullRequestProvider.ts
 const CAPABILITIES = {
@@ -54318,7 +54995,7 @@ function reasonFor(error) {
 	if (error._tag === "GitLabCliAuthenticationError") return "unauthenticated";
 	return "failed";
 }
-const make$31 = Effect.gen(function* () {
+const make$32 = Effect.gen(function* () {
 	const cli = yield* GitLabPullRequestCli;
 	const fail = (operation) => (error) => new PullRequestProviderError({
 		provider: "gitlab",
@@ -54461,13 +55138,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$30 = Effect.map(Effect.all([
-	make$33,
-	make$31,
-	make$35,
-	make$37
+const make$31 = Effect.map(Effect.all([
+	make$34,
+	make$32,
+	make$36,
+	make$38
 ]), fromProviders);
-const layer$24 = Layer.effect(PullRequestProviderRegistry, make$30).pipe(Layer.provide(layer$26.pipe(Layer.provide(layer$35))), Layer.provide(layer$25.pipe(Layer.provide(layer$33))), Layer.provide(layer$27.pipe(Layer.provide(layer$37))), Layer.provide(layer$28.pipe(Layer.provide(layer$39))));
+const layer$24 = Layer.effect(PullRequestProviderRegistry, make$31).pipe(Layer.provide(layer$26.pipe(Layer.provide(layer$35))), Layer.provide(layer$25.pipe(Layer.provide(layer$33))), Layer.provide(layer$27.pipe(Layer.provide(layer$37))), Layer.provide(layer$28.pipe(Layer.provide(layer$39))));
 //#endregion
 //#region src/pullRequest/PullRequestService.ts
 /**
@@ -54655,7 +55332,7 @@ function repositoryIdentityOf(project) {
 	if (identity.displayName) return identity.displayName;
 	return identity.owner && identity.name ? `${identity.owner}/${identity.name}` : null;
 }
-const make$29 = Effect.gen(function* () {
+const make$30 = Effect.gen(function* () {
 	const registry = yield* PullRequestProviderRegistry;
 	const projections = yield* ProjectionSnapshotQuery;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
@@ -55625,7 +56302,7 @@ const make$29 = Effect.gen(function* () {
 		invalidate
 	});
 });
-const layer$23 = Layer.effect(PullRequestService, make$29);
+const layer$23 = Layer.effect(PullRequestService, make$30);
 //#endregion
 //#region src/orchestration/ThreadWorkspaceLifecycle.ts
 var ThreadWorkspaceLifecycleError = class extends Data.TaggedError("ThreadWorkspaceLifecycleError") {};
@@ -55635,6 +56312,16 @@ function resolveWorkspaceCleanupRefusal(input) {
 	if (!input.isMerged) return "Cleanup refused because branch is not merged into default branch.";
 	return null;
 }
+/**
+* A thread on a detached HEAD has no branch to merge, so its worktree is safe
+* to drop as soon as nothing in it is unsaved and every commit it points at is
+* already on the default branch.
+*/
+function resolveDetachedWorkspaceCleanupRefusal(input) {
+	if (input.hasUncommittedChanges) return "Cleanup refused because worktree has uncommitted changes.";
+	if (!input.headIsAncestorOfDefault) return "Cleanup refused because the detached worktree has commits that are not on the default branch.";
+	return null;
+}
 function resolveMergedWorkspaceContext(input) {
 	const pullRequest = input.pullRequest;
 	if (input.branchIsAncestor && input.branchCommitSha !== null) return {
@@ -55659,7 +56346,7 @@ const mapLifecycleError = Effect.mapError((cause) => cause instanceof ThreadWork
 	detail: "Thread workspace lifecycle operation failed.",
 	cause
 }));
-const make$28 = Effect.gen(function* () {
+const make$29 = Effect.gen(function* () {
 	const snapshots = yield* ProjectionSnapshotQuery;
 	const engine = yield* OrchestrationEngineService;
 	const gitWorkflow = yield* GitWorkflowService;
@@ -55675,6 +56362,72 @@ const make$28 = Effect.gen(function* () {
 		}))), { discard: true });
 	});
 	const record = (input) => recordRaw(input).pipe(mapLifecycleError);
+	const cleanupDetachedWorktree = Effect.fn("threadWorkspaceLifecycle.cleanupDetached")(function* (input) {
+		const { threadIds, project, worktreePath, refusal, now } = input;
+		if ((yield* git.statusDetailsLocal(worktreePath).pipe(Effect.mapError((cause) => new ThreadWorkspaceLifecycleError({
+			detail: "Could not inspect thread worktree before cleanup.",
+			cause
+		})))).hasWorkingTreeChanges) return yield* refusal(resolveDetachedWorkspaceCleanupRefusal({
+			hasUncommittedChanges: true,
+			headIsAncestorOfDefault: true
+		}));
+		const defaultRef = (yield* gitWorkflow.listRefs({
+			cwd: project.workspaceRoot,
+			includeMatchingRemoteRefs: true,
+			refresh: true
+		})).refs.find((ref) => ref.isRemote === true && ref.isDefault);
+		if (defaultRef === void 0 || defaultRef.remoteName === void 0) return yield* refusal("Cleanup refused because the default remote branch could not be resolved.");
+		yield* gitWorkflow.fetchRemote({
+			cwd: project.workspaceRoot,
+			remoteName: defaultRef.remoteName
+		});
+		const ancestorResult = yield* git.execute({
+			operation: "ThreadWorkspaceLifecycle.detachedMergeBase",
+			cwd: worktreePath,
+			args: [
+				"merge-base",
+				"--is-ancestor",
+				"HEAD",
+				`refs/remotes/${defaultRef.name}`
+			],
+			allowNonZeroExit: true
+		});
+		if (ancestorResult.exitCode !== 0 && ancestorResult.exitCode !== 1) return yield* refusal("Cleanup refused because worktree ancestry could not be verified.");
+		const ancestryRefusal = resolveDetachedWorkspaceCleanupRefusal({
+			hasUncommittedChanges: false,
+			headIsAncestorOfDefault: ancestorResult.exitCode === 0
+		});
+		if (ancestryRefusal !== null) return yield* refusal(ancestryRefusal);
+		yield* record({
+			threadIds,
+			lifecycle: {
+				status: "cleanup-pending",
+				detail: "Detached worktree verified; workspace cleanup is pending.",
+				pullRequestNumber: null,
+				mergeCommitSha: null,
+				updatedAt: now
+			}
+		});
+		yield* gitWorkflow.removeWorktree({
+			cwd: project.workspaceRoot,
+			path: worktreePath
+		});
+		const detail = "Detached worktree removed; thread context preserved.";
+		yield* record({
+			threadIds,
+			lifecycle: {
+				status: "cleaned",
+				detail,
+				pullRequestNumber: null,
+				mergeCommitSha: null,
+				updatedAt: DateTime.formatIso(yield* DateTime.now)
+			}
+		});
+		return {
+			outcome: "cleaned",
+			detail
+		};
+	});
 	const cleanupRaw = Effect.fn("threadWorkspaceLifecycle.cleanup")(function* (threadId) {
 		const snapshot = yield* snapshots.getCommandReadModel();
 		const threadIds = activePairThreadIds(threadId, snapshot.threadPairs ?? []);
@@ -55710,8 +56463,15 @@ const make$28 = Effect.gen(function* () {
 		if (threads.some((thread) => thread.archivedAt === null)) return yield* refusal("Cleanup refused because thread is not archived.");
 		const branch = requestedThread.branch;
 		const worktreePath = requestedThread.worktreePath;
-		if (branch === null || worktreePath === null) return yield* refusal("Cleanup refused because thread has no worktree and branch binding.");
+		if (worktreePath === null) return yield* refusal("Cleanup refused because thread has no worktree.");
 		if (threads.some((thread) => thread.branch !== branch || thread.worktreePath !== worktreePath)) return yield* refusal("Cleanup refused because Fusion threads do not share one workspace.");
+		if (branch === null) return yield* cleanupDetachedWorktree({
+			threadIds,
+			project,
+			worktreePath,
+			refusal,
+			now
+		});
 		const dirtyRefusal = resolveWorkspaceCleanupRefusal({
 			hasLiveSession: false,
 			hasUncommittedChanges: (yield* git.statusDetailsLocal(worktreePath).pipe(Effect.mapError((cause) => new ThreadWorkspaceLifecycleError({
@@ -55840,7 +56600,7 @@ const make$28 = Effect.gen(function* () {
 		record
 	};
 });
-const layer$22 = Layer.effect(ThreadWorkspaceLifecycleService, make$28);
+const layer$22 = Layer.effect(ThreadWorkspaceLifecycleService, make$29);
 //#endregion
 //#region src/textGeneration/BtwRequestCoordinator.ts
 const MAX_PENDING_BTW_CANCELLATIONS = 256;
@@ -57994,6 +58754,9 @@ const observeRpcStreamEffect = (method, effect, traceAttributes) => {
 	return withRpcStreamTracing(method, instrumented, traceAttributes);
 };
 //#endregion
+//#region src/provider/Services/ProviderSessionDirectory.ts
+var ProviderSessionDirectory = class extends Context.Service()("@p4code/cli/provider/Services/ProviderSessionDirectory") {};
+//#endregion
 //#region src/provider/providerMaintenanceCommandCoordinator.ts
 const makeProviderMaintenanceCommandCoordinator = Effect.fn("makeProviderMaintenanceCommandCoordinator")(function* (input) {
 	const runningTargetsRef = yield* Ref.make(/* @__PURE__ */ new Set());
@@ -58381,7 +59144,7 @@ function makeUpdateState(input) {
 		output: input.output ?? null
 	};
 }
-const make$27 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
+const make$28 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
 	const providerRegistry = yield* ProviderRegistry;
 	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 	const httpClient = yield* HttpClient.HttpClient;
@@ -58496,7 +59259,7 @@ const make$27 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
 	});
 	return ProviderMaintenanceRunner.of({ updateProvider });
 });
-const layer$21 = Layer.effect(ProviderMaintenanceRunner, make$27());
+const layer$21 = Layer.effect(ProviderMaintenanceRunner, make$28());
 //#endregion
 //#region src/provider/Drivers/ClaudeHome.ts
 const resolveClaudeHomePath = Effect.fn("resolveClaudeHomePath")(function* (config) {
@@ -59512,7 +60275,7 @@ Layer.succeed(UsageService, UsageService.of({ readSummary: (input) => Effect.suc
 	},
 	scanDurationMs: 0
 }) }));
-const make$26 = Effect.gen(function* () {
+const make$27 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const config = yield* ServerConfig$1;
@@ -59744,7 +60507,7 @@ const make$26 = Effect.gen(function* () {
 		};
 	}) };
 });
-const layer$20 = Layer.effect(UsageService, make$26);
+const layer$20 = Layer.effect(UsageService, make$27);
 //#endregion
 //#region src/feed/FeedStore.ts
 const storageFailure = (message) => new FeedError({
@@ -60108,7 +60871,7 @@ const jsonRequest = Effect.fn("FeedService.jsonRequest")(function* (url, token,
 		catch: () => fail("hub_unavailable", "Hub returned invalid JSON.")
 	});
 });
-const make$25 = Effect.gen(function* () {
+const make$26 = Effect.gen(function* () {
 	const hubLink = yield* HubLink;
 	const providers = yield* ProviderInstanceRegistry;
 	const config = yield* ServerConfig$1;
@@ -60346,7 +61109,7 @@ var FeedService = class extends Context.Reference("@p4code/cli/feed/FeedService"
 	markRead: unavailable,
 	cleanup: unavailable
 }) }) {};
-const layer$19 = Layer.effect(FeedService, make$25);
+const layer$19 = Layer.effect(FeedService, make$26);
 const SKILL_MANIFEST_FILENAME = "SKILL.md";
 /**
 * Split a catalogue id (`owner/repo/skill-name`) into its parts.
@@ -60492,7 +61255,7 @@ const emptyFetch = (id, unavailable) => ({
 	skipped: [],
 	unavailable
 });
-const make$24 = Effect.gen(function* () {
+const make$25 = Effect.gen(function* () {
 	const http = yield* HttpClient.HttpClient;
 	const request = Effect.fn("SkillRegistry.request")(function* (url) {
 		return yield* http.execute(HttpClientRequest.get(url).pipe(HttpClientRequest.setHeader("accept", "application/json"), HttpClientRequest.setHeader("user-agent", "p4code"))).pipe(Effect.timeout(REQUEST_TIMEOUT_MS));
@@ -60563,7 +61326,7 @@ const make$24 = Effect.gen(function* () {
 		fetch
 	};
 });
-const layer$18 = Layer.effect(SkillRegistry, make$24);
+const layer$18 = Layer.effect(SkillRegistry, make$25);
 //#endregion
 //#region src/mcp/McpInvocationContext.ts
 var McpInvocationContext = class extends Context.Service()("@p4code/cli/mcp/McpInvocationContext") {};
@@ -60791,7 +61554,7 @@ const classifyResponseError = (context, error) => {
 		});
 	}
 };
-const make$23 = Effect.gen(function* PreviewAutomationBrokerMake() {
+const make$24 = Effect.gen(function* PreviewAutomationBrokerMake() {
 	const crypto = yield* Crypto.Crypto;
 	const state = yield* SynchronizedRef.make({
 		clients: /* @__PURE__ */ new Map(),
@@ -61025,7 +61788,7 @@ const make$23 = Effect.gen(function* PreviewAutomationBrokerMake() {
 		invoke
 	});
 }).pipe(Effect.withSpan("PreviewAutomationBroker.make"));
-const layer$17 = Layer.effect(PreviewAutomationBroker, make$23);
+const layer$17 = Layer.effect(PreviewAutomationBroker, make$24);
 //#endregion
 //#region src/preview/Manager.ts
 /**
@@ -61089,7 +61852,7 @@ const buildIdleSnapshot = (input) => ({
 	viewport: FILL_PREVIEW_VIEWPORT,
 	updatedAt: input.updatedAt
 });
-const make$22 = Effect.gen(function* PreviewManagerMake() {
+const make$23 = Effect.gen(function* PreviewManagerMake() {
 	const serverEpoch = NodeCrypto.randomUUID();
 	const stateRef = yield* SynchronizedRef.make(initialState);
 	const eventsPubSub = yield* PubSub.unbounded();
@@ -61320,7 +62083,7 @@ const make$22 = Effect.gen(function* PreviewManagerMake() {
 		subscribeEvents: PubSub.subscribe(eventsPubSub)
 	});
 }).pipe(Effect.withSpan("PreviewManager.make"));
-const layer$16 = Layer.effect(PreviewManager, make$22);
+const layer$16 = Layer.effect(PreviewManager, make$23);
 //#endregion
 //#region src/workspace/WorkspaceSearchIndex.ts
 const WORKSPACE_INDEX_MAX_ENTRIES = 25e3;
@@ -61454,7 +62217,7 @@ const waitForScan = (cwd, finder, onFailure) => Effect.try({
 		timeout: WORKSPACE_INDEX_SCAN_TIMEOUT
 	})
 }), Effect.withSpan("WorkspaceSearchIndex.waitForScan"));
-const make$21 = Effect.fn("WorkspaceSearchIndex.make")(function* (cwd) {
+const make$22 = Effect.fn("WorkspaceSearchIndex.make")(function* (cwd) {
 	const finder = yield* Effect.acquireRelease(createFinder(cwd), (finder) => Effect.try({
 		try: () => finder.destroy(),
 		catch: (cause) => new WorkspaceSearchIndexDestroyFailed({
@@ -61528,7 +62291,7 @@ const make$21 = 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$15 = (cwd) => Layer.effect(WorkspaceSearchIndex, make$21(cwd));
+const layer$15 = (cwd) => Layer.effect(WorkspaceSearchIndex, make$22(cwd));
 var WorkspaceSearchIndexMap = class extends LayerMap.Service()("@p4code/cli/workspace/WorkspaceSearchIndexMap", {
 	lookup: layer$15,
 	idleTimeToLive: WORKSPACE_INDEX_IDLE_TTL
@@ -61592,7 +62355,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$20 = Effect.gen(function* () {
+const make$21 = Effect.gen(function* () {
 	const path = yield* Path.Path;
 	const workspacePaths = yield* WorkspacePaths;
 	const workspaceSearchIndexes = yield* WorkspaceSearchIndexMap;
@@ -61666,7 +62429,7 @@ const make$20 = Effect.gen(function* () {
 		search
 	});
 });
-const layer$14 = Layer.effect(WorkspaceEntries, make$20).pipe(Layer.provide(WorkspaceSearchIndexMap.layer));
+const layer$14 = Layer.effect(WorkspaceEntries, make$21).pipe(Layer.provide(WorkspaceSearchIndexMap.layer));
 //#endregion
 //#region src/workspace/WorkspaceFileSystem.ts
 /**
@@ -61725,7 +62488,7 @@ Schema$1.Union([
 ]);
 /** Service tag for workspace file operations. */
 var WorkspaceFileSystem = class extends Context.Service()("@p4code/cli/workspace/WorkspaceFileSystem") {};
-const make$19 = Effect.gen(function* () {
+const make$20 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const workspacePaths = yield* WorkspacePaths;
@@ -61869,7 +62632,7 @@ const make$19 = Effect.gen(function* () {
 		writeFile
 	});
 });
-const layer$13 = Layer.effect(WorkspaceFileSystem, make$19);
+const layer$13 = Layer.effect(WorkspaceFileSystem, make$20);
 //#endregion
 //#region src/vcs/VcsStatusBroadcaster.ts
 const DEFAULT_VCS_STATUS_REFRESH_INTERVAL = Duration.seconds(30);
@@ -61941,7 +62704,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$18 = Effect.gen(function* () {
+const make$19 = Effect.gen(function* () {
 	const workflow = yield* GitWorkflowService;
 	const fs = yield* FileSystem.FileSystem;
 	const changesPubSub = yield* Effect.acquireRelease(PubSub.unbounded(), (pubsub) => PubSub.shutdown(pubsub));
@@ -62165,7 +62928,7 @@ const make$18 = Effect.gen(function* () {
 		streamStatus
 	});
 });
-const layer$12 = Layer.effect(VcsStatusBroadcaster, make$18);
+const layer$12 = Layer.effect(VcsStatusBroadcaster, make$19);
 //#endregion
 //#region src/vcs/VcsProvisioningService.ts
 var VcsProvisioningService = class extends Context.Service()("@p4code/cli/vcs/VcsProvisioningService") {};
@@ -62178,7 +62941,7 @@ function resolveRequestedKind(kind) {
 	}));
 	return Effect.succeed(kind);
 }
-const make$17 = Effect.gen(function* () {
+const make$18 = Effect.gen(function* () {
 	const registry = yield* VcsDriverRegistry;
 	const initRepository = Effect.fn("VcsProvisioningService.initRepository")(function* (input) {
 		const kind = yield* resolveRequestedKind(input.kind);
@@ -62186,11 +62949,11 @@ const make$17 = Effect.gen(function* () {
 	});
 	return VcsProvisioningService.of({ initRepository });
 });
-const layer$11 = Layer.effect(VcsProvisioningService, make$17);
+const layer$11 = Layer.effect(VcsProvisioningService, make$18);
 //#endregion
 //#region src/review/ReviewService.ts
 var ReviewService = class extends Context.Service()("@p4code/cli/review/ReviewService") {};
-const make$16 = Effect.gen(function* () {
+const make$17 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
@@ -62246,7 +63009,7 @@ const make$16 = Effect.gen(function* () {
 	});
 	return ReviewService.of({ getDiffPreview });
 });
-const layer$10 = Layer.effect(ReviewService, make$16);
+const layer$10 = Layer.effect(ReviewService, make$17);
 //#endregion
 //#region src/diagnostics/ProcessDiagnostics.ts
 const PROCESS_QUERY_TIMEOUT_MS = 1e3;
@@ -62541,7 +63304,7 @@ function assertDescendantPid(pid) {
 		}));
 	}));
 }
-const make$15 = Effect.gen(function* () {
+const make$16 = Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const read = Effect.gen(function* () {
 		const readAt = yield* DateTime.now;
@@ -62585,7 +63348,7 @@ const make$15 = Effect.gen(function* () {
 		signal
 	});
 });
-const layer$9 = Layer.effect(ProcessDiagnostics, make$15);
+const layer$9 = Layer.effect(ProcessDiagnostics, make$16);
 //#endregion
 //#region src/diagnostics/ProcessResourceMonitor.ts
 const SAMPLE_INTERVAL_MS = 5e3;
@@ -62736,7 +63499,7 @@ function aggregateProcessResourceHistory(input) {
 		}) : Option.none()
 	};
 }
-const make$14 = Effect.gen(function* () {
+const make$15 = Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const state = yield* Ref.make({
 		samples: [],
@@ -62785,7 +63548,7 @@ const make$14 = Effect.gen(function* () {
 	});
 	return ProcessResourceMonitor.of({ readHistory });
 });
-const layer$8 = Layer.effect(ProcessResourceMonitor, make$14);
+const layer$8 = Layer.effect(ProcessResourceMonitor, make$15);
 //#endregion
 //#region src/diagnostics/TraceDiagnostics.ts
 var TraceFileReadError = class extends Schema$1.TaggedErrorClass()("TraceFileReadError", {
@@ -63033,7 +63796,7 @@ function readTraceFile(fileSystem, path) {
 		cause
 	})) }));
 }
-const make$13 = Effect.gen(function* () {
+const make$14 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const read = Effect.fn("TraceDiagnostics.read")(function* (options) {
 		const readAt = options.readAt ?? (yield* DateTime.now);
@@ -63077,7 +63840,7 @@ const make$13 = Effect.gen(function* () {
 	});
 	return TraceDiagnostics.of({ read });
 });
-const layer$7 = Layer.effect(TraceDiagnostics, make$13);
+const layer$7 = Layer.effect(TraceDiagnostics, make$14);
 function readTraceDiagnostics(options) {
 	return Effect.gen(function* () {
 		return yield* (yield* TraceDiagnostics).read(options);
@@ -63101,7 +63864,7 @@ const VCS_PROBES = [{
 	installHint: "Install Jujutsu with `brew install jj` or from https://github.com/jj-vcs/jj."
 }];
 var SourceControlDiscovery = class extends Context.Service()("@p4code/cli/sourceControl/SourceControlDiscovery") {};
-const make$12 = Effect.gen(function* () {
+const make$13 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const process = yield* VcsProcess;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
@@ -63150,7 +63913,7 @@ const make$12 = Effect.gen(function* () {
 		sourceControlProviders: sourceControlProviders.discover
 	}) });
 });
-const layer$6 = Layer.effect(SourceControlDiscovery, make$12);
+const layer$6 = Layer.effect(SourceControlDiscovery, make$13);
 //#endregion
 //#region src/sourceControl/SourceControlRepositoryService.ts
 const isSourceControlRepositoryError = Schema$1.is(SourceControlRepositoryError);
@@ -63183,7 +63946,7 @@ function expandHomePath(input, path) {
 	if (input.startsWith("~/") || input.startsWith("~\\")) return path.join(NodeOS.homedir(), input.slice(2));
 	return input;
 }
-const make$11 = Effect.gen(function* () {
+const make$12 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const git = yield* GitVcsDriver;
@@ -63322,7 +64085,7 @@ const make$11 = Effect.gen(function* () {
 		publishRepository: (input) => publishRepository(input).pipe(mapRepositoryError("publishRepository", input.provider))
 	});
 });
-const layer$5 = Layer.effect(SourceControlRepositoryService, make$11);
+const layer$5 = Layer.effect(SourceControlRepositoryService, make$12);
 //#endregion
 //#region src/ws.ts
 /** Matches `p4c hub token add`, so a token minted here and one minted there are the same thing. */
@@ -63424,7 +64187,7 @@ function projectSetupScriptCompatibilityDetail(error) {
 	}
 }
 function isThreadDetailEvent(event) {
-	return event.type === "thread.message-sent" || event.type === "thread.proposed-plan-upserted" || event.type === "thread.activity-appended" || event.type === "thread.turn-diff-completed" || event.type === "thread.reverted" || event.type === "thread.session-set";
+	return event.type === "thread.message-sent" || event.type === "thread.proposed-plan-upserted" || event.type === "thread.scheduled-task.created" || event.type === "thread.scheduled-task.cancelled" || event.type === "thread.scheduled-task.fired" || event.type === "thread.activity-appended" || event.type === "thread.turn-diff-completed" || event.type === "thread.reverted" || event.type === "thread.session-set";
 }
 const PROVIDER_STATUS_DEBOUNCE_MS = 200;
 const SHELL_RESUME_MAX_GAP = 1e3;
@@ -63622,6 +64385,7 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker) => WsRpcGroup.t
 	const previewManager = yield* PreviewManager;
 	const portDiscovery = yield* PortDiscovery;
 	const providerRegistry = yield* ProviderRegistry;
+	const providerSessionDirectory = yield* ProviderSessionDirectory;
 	const providerMaintenanceRunner = yield* ProviderMaintenanceRunner;
 	const serverSelfUpdate = yield* ServerSelfUpdate;
 	const textGeneration = yield* TextGeneration;
@@ -64018,7 +64782,22 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker) => WsRpcGroup.t
 				onNone: () => false,
 				onSome: (thread) => thread.session !== null && thread.session.status !== "stopped"
 			})), Effect.orElseSucceed(() => false)) : false;
-			const result = yield* dispatchNormalizedCommand(normalizedCommand);
+			const result = normalizedCommand.type === "thread.fork" ? yield* Effect.uninterruptible(Effect.gen(function* () {
+				if (yield* projectionSnapshotQuery.getThreadShellById(normalizedCommand.threadId).pipe(Effect.map(Option.isSome), Effect.orElseSucceed(() => false))) return yield* dispatchNormalizedCommand(normalizedCommand);
+				const forkBinding = yield* providerSessionDirectory.getBinding(normalizedCommand.sourceThreadId).pipe(Effect.map((source) => buildForkedProviderBinding(normalizedCommand.threadId, Option.getOrUndefined(source))), Effect.mapError((error) => new OrchestrationDispatchCommandError({
+					message: `Could not read the source thread's provider session: ${error.message}`,
+					cause: error
+				})));
+				if (forkBinding.rejection !== void 0) return yield* new OrchestrationDispatchCommandError({ message: describeThreadForkRejection(forkBinding.rejection) });
+				yield* providerSessionDirectory.upsert(forkBinding.binding).pipe(Effect.mapError((error) => new OrchestrationDispatchCommandError({
+					message: `Could not save the fork's provider session: ${error.message}`,
+					cause: error
+				})));
+				return yield* dispatchNormalizedCommand(normalizedCommand).pipe(Effect.tapError(() => providerSessionDirectory.remove(normalizedCommand.threadId).pipe(Effect.catchCause((cause) => Effect.logWarning("failed to remove fork binding after dispatch failure", {
+					threadId: normalizedCommand.threadId,
+					cause
+				})))));
+			})) : yield* dispatchNormalizedCommand(normalizedCommand);
 			if (normalizedCommand.type === "thread.archive") {
 				const archivedThreadIds = result.events?.filter((event) => event.type === "thread.archived").map((event) => event.payload.threadId);
 				if (archivedThreadIds === void 0 || archivedThreadIds.length === 0) return yield* new OrchestrationDispatchCommandError({ message: "Archive command completed without authoritative archive events." });
@@ -64609,7 +65388,7 @@ function toPersistenceSqlOrDecodeError(sqlOperation, decodeOperation, correlatio
 		cause
 	});
 }
-const make$10 = Effect.gen(function* () {
+const make$11 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const upsertRuntimeRow = SqlSchema.void({
 		Request: ProviderSessionRuntimeDbRowSchema,
@@ -64712,7 +65491,7 @@ const make$10 = Effect.gen(function* () {
 		deleteByThreadId
 	};
 });
-const layer$4 = Layer.effect(ProviderSessionRuntimeRepository, make$10);
+const layer$4 = Layer.effect(ProviderSessionRuntimeRepository, make$11);
 //#endregion
 //#region src/provider/Errors.ts
 /**
@@ -64837,9 +65616,6 @@ var ProviderSessionDirectoryPersistenceError = class extends Schema$1.TaggedErro
 	}
 };
 //#endregion
-//#region src/provider/Services/ProviderSessionDirectory.ts
-var ProviderSessionDirectory = class extends Context.Service()("@p4code/cli/provider/Services/ProviderSessionDirectory") {};
-//#endregion
 //#region src/provider/Layers/ProviderSessionDirectory.ts
 const decodeProviderDriverKindValue = Schema$1.decodeUnknownEffect(ProviderDriverKind);
 function toPersistenceError(operation) {
@@ -64920,12 +65696,14 @@ const makeProviderSessionDirectory = Effect.gen(function* () {
 			detail: `No persisted provider binding found for thread '${threadId}'.`
 		}))
 	})));
+	const remove = (threadId) => repository.deleteByThreadId({ threadId }).pipe(Effect.mapError(toPersistenceError("ProviderSessionDirectory.remove:deleteByThreadId")));
 	const listThreadIds = () => repository.list().pipe(Effect.mapError(toPersistenceError("ProviderSessionDirectory.listThreadIds:list")), Effect.map((rows) => rows.map((row) => row.threadId)));
 	const listBindings = () => repository.list().pipe(Effect.mapError(toPersistenceError("ProviderSessionDirectory.listBindings:list")), Effect.flatMap((rows) => Effect.forEach(rows, (row) => toRuntimeBinding(row, "ProviderSessionDirectory.listBindings"), { concurrency: "unbounded" })));
 	return {
 		upsert,
 		getProvider,
 		getBinding,
+		remove,
 		listThreadIds,
 		listBindings
 	};
@@ -65600,12 +66378,12 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 	});
 });
 let activeMcpSessionRegistry;
-const make$9 = Effect.acquireRelease(makeWithOptions().pipe(Effect.tap((registry) => Effect.sync(() => {
+const make$10 = 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$9);
+const layer$3 = Layer.effect(McpSessionRegistry, make$10);
 const issueActiveMcpCredential = (request) => activeMcpSessionRegistry ? activeMcpSessionRegistry.revokeThread(request.threadId).pipe(Effect.andThen(activeMcpSessionRegistry.issue(request))) : Effect.sync(() => void 0);
 /**
 * Refreshes the liveness of a thread's MCP credential. Called on every provider
@@ -67229,53 +68007,84 @@ const MINIMUM_CLAUDE_OPUS_5_VERSION = "2.1.219";
 const MINIMUM_CLAUDE_FABLE_5_VERSION = "2.1.169";
 const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
 const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";
-const CLAUDE_FABLE_CAPABILITIES = createModelCapabilities({ optionDescriptors: [buildSelectOptionDescriptor({
-	id: "effort",
-	label: "Reasoning",
-	options: [
-		{
-			value: "low",
-			label: "Low"
-		},
-		{
-			value: "medium",
-			label: "Medium"
-		},
-		{
-			value: "high",
-			label: "High",
+const AUTO_COMPACT_WINDOW_OPTION_ID = "autoCompactWindow";
+const AUTO_COMPACT_WINDOW_AUTO = "auto";
+/** Token counts behind each explicit auto-compact choice. */
+const AUTO_COMPACT_WINDOW_TOKENS = {
+	"200k": 2e5,
+	"400k": 4e5,
+	"600k": 6e5
+};
+/**
+* Where Claude Code starts summarising the conversation. "Auto" keeps Claude
+* Code's own per-model threshold, which on 1M-context models lets a session
+* grow close to 1M tokens and re-read all of it on every call.
+*/
+function buildAutoCompactWindowDescriptor() {
+	return buildSelectOptionDescriptor({
+		id: AUTO_COMPACT_WINDOW_OPTION_ID,
+		label: "Auto-compact At",
+		options: [{
+			value: AUTO_COMPACT_WINDOW_AUTO,
+			label: "Auto",
 			isDefault: true
-		},
-		{
-			value: "xhigh",
-			label: "Extra High"
-		},
-		{
-			value: "max",
-			label: "Max"
-		},
-		{
-			value: "ultracode",
-			label: "Ultracode"
-		},
-		{
-			value: "ultrathink",
-			label: "Ultrathink"
-		}
-	],
-	promptInjectedValues: ["ultrathink"]
-}), buildSelectOptionDescriptor({
-	id: "contextWindow",
-	label: "Context Window",
-	options: [{
-		value: "200k",
-		label: "200k"
-	}, {
-		value: "1m",
-		label: "1M",
-		isDefault: true
-	}]
-})] });
+		}, ...Object.keys(AUTO_COMPACT_WINDOW_TOKENS).map((value) => ({
+			value,
+			label: value
+		}))]
+	});
+}
+const CLAUDE_FABLE_CAPABILITIES = createModelCapabilities({ optionDescriptors: [
+	buildSelectOptionDescriptor({
+		id: "effort",
+		label: "Reasoning",
+		options: [
+			{
+				value: "low",
+				label: "Low"
+			},
+			{
+				value: "medium",
+				label: "Medium"
+			},
+			{
+				value: "high",
+				label: "High",
+				isDefault: true
+			},
+			{
+				value: "xhigh",
+				label: "Extra High"
+			},
+			{
+				value: "max",
+				label: "Max"
+			},
+			{
+				value: "ultracode",
+				label: "Ultracode"
+			},
+			{
+				value: "ultrathink",
+				label: "Ultrathink"
+			}
+		],
+		promptInjectedValues: ["ultrathink"]
+	}),
+	buildSelectOptionDescriptor({
+		id: "contextWindow",
+		label: "Context Window",
+		options: [{
+			value: "200k",
+			label: "200k"
+		}, {
+			value: "1m",
+			label: "1M",
+			isDefault: true
+		}]
+	}),
+	buildAutoCompactWindowDescriptor()
+] });
 const BUILT_IN_MODELS = [
 	{
 		slug: "claude-fable-5-1",
@@ -67345,12 +68154,157 @@ const BUILT_IN_MODELS = [
 					label: "1M",
 					isDefault: true
 				}]
-			})
+			}),
+			buildAutoCompactWindowDescriptor()
+		] })
+	},
+	{
+		slug: "claude-opus-4-8",
+		name: "Claude Opus 4.8",
+		isCustom: false,
+		capabilities: createModelCapabilities({ optionDescriptors: [
+			buildSelectOptionDescriptor({
+				id: "effort",
+				label: "Reasoning",
+				options: [
+					{
+						value: "low",
+						label: "Low"
+					},
+					{
+						value: "medium",
+						label: "Medium"
+					},
+					{
+						value: "high",
+						label: "High",
+						isDefault: true
+					},
+					{
+						value: "xhigh",
+						label: "Extra High"
+					},
+					{
+						value: "max",
+						label: "Max"
+					},
+					{
+						value: "ultracode",
+						label: "Ultracode"
+					},
+					{
+						value: "ultrathink",
+						label: "Ultrathink"
+					}
+				],
+				promptInjectedValues: ["ultrathink"]
+			}),
+			buildBooleanOptionDescriptor({
+				id: "fastMode",
+				label: "Fast Mode"
+			}),
+			buildAutoCompactWindowDescriptor()
+		] })
+	},
+	{
+		slug: "claude-opus-4-7",
+		name: "Claude Opus 4.7",
+		isCustom: false,
+		capabilities: createModelCapabilities({ optionDescriptors: [
+			buildSelectOptionDescriptor({
+				id: "effort",
+				label: "Reasoning",
+				options: [
+					{
+						value: "low",
+						label: "Low"
+					},
+					{
+						value: "medium",
+						label: "Medium"
+					},
+					{
+						value: "high",
+						label: "High"
+					},
+					{
+						value: "xhigh",
+						label: "Extra High",
+						isDefault: true
+					},
+					{
+						value: "max",
+						label: "Max"
+					},
+					{
+						value: "ultrathink",
+						label: "Ultrathink"
+					}
+				],
+				promptInjectedValues: ["ultrathink"]
+			}),
+			buildBooleanOptionDescriptor({
+				id: "fastMode",
+				label: "Fast Mode"
+			}),
+			buildAutoCompactWindowDescriptor()
+		] })
+	},
+	{
+		slug: "claude-opus-4-6",
+		name: "Claude Opus 4.6",
+		isCustom: false,
+		capabilities: createModelCapabilities({ optionDescriptors: [
+			buildSelectOptionDescriptor({
+				id: "effort",
+				label: "Reasoning",
+				options: [
+					{
+						value: "low",
+						label: "Low"
+					},
+					{
+						value: "medium",
+						label: "Medium"
+					},
+					{
+						value: "high",
+						label: "High",
+						isDefault: true
+					},
+					{
+						value: "max",
+						label: "Max"
+					},
+					{
+						value: "ultrathink",
+						label: "Ultrathink"
+					}
+				],
+				promptInjectedValues: ["ultrathink"]
+			}),
+			buildBooleanOptionDescriptor({
+				id: "fastMode",
+				label: "Fast Mode"
+			}),
+			buildSelectOptionDescriptor({
+				id: "contextWindow",
+				label: "Context Window",
+				options: [{
+					value: "200k",
+					label: "200k"
+				}, {
+					value: "1m",
+					label: "1M",
+					isDefault: true
+				}]
+			}),
+			buildAutoCompactWindowDescriptor()
 		] })
 	},
 	{
-		slug: "claude-opus-4-8",
-		name: "Claude Opus 4.8",
+		slug: "claude-opus-4-5",
+		name: "Claude Opus 4.5",
 		isCustom: false,
 		capabilities: createModelCapabilities({ optionDescriptors: [buildSelectOptionDescriptor({
 			id: "effort",
@@ -67369,72 +68323,19 @@ const BUILT_IN_MODELS = [
 					label: "High",
 					isDefault: true
 				},
-				{
-					value: "xhigh",
-					label: "Extra High"
-				},
-				{
-					value: "max",
-					label: "Max"
-				},
-				{
-					value: "ultracode",
-					label: "Ultracode"
-				},
-				{
-					value: "ultrathink",
-					label: "Ultrathink"
-				}
-			],
-			promptInjectedValues: ["ultrathink"]
-		}), buildBooleanOptionDescriptor({
-			id: "fastMode",
-			label: "Fast Mode"
-		})] })
-	},
-	{
-		slug: "claude-opus-4-7",
-		name: "Claude Opus 4.7",
-		isCustom: false,
-		capabilities: createModelCapabilities({ optionDescriptors: [buildSelectOptionDescriptor({
-			id: "effort",
-			label: "Reasoning",
-			options: [
-				{
-					value: "low",
-					label: "Low"
-				},
-				{
-					value: "medium",
-					label: "Medium"
-				},
-				{
-					value: "high",
-					label: "High"
-				},
-				{
-					value: "xhigh",
-					label: "Extra High",
-					isDefault: true
-				},
 				{
 					value: "max",
 					label: "Max"
-				},
-				{
-					value: "ultrathink",
-					label: "Ultrathink"
 				}
-			],
-			promptInjectedValues: ["ultrathink"]
+			]
 		}), buildBooleanOptionDescriptor({
 			id: "fastMode",
 			label: "Fast Mode"
 		})] })
 	},
 	{
-		slug: "claude-opus-4-6",
-		name: "Claude Opus 4.6",
+		slug: "claude-sonnet-5",
+		name: "Claude Sonnet 5",
 		isCustom: false,
 		capabilities: createModelCapabilities({ optionDescriptors: [
 			buildSelectOptionDescriptor({
@@ -67454,6 +68355,10 @@ const BUILT_IN_MODELS = [
 						label: "High",
 						isDefault: true
 					},
+					{
+						value: "xhigh",
+						label: "Extra High"
+					},
 					{
 						value: "max",
 						label: "Max"
@@ -67465,146 +68370,68 @@ const BUILT_IN_MODELS = [
 				],
 				promptInjectedValues: ["ultrathink"]
 			}),
-			buildBooleanOptionDescriptor({
-				id: "fastMode",
-				label: "Fast Mode"
-			}),
 			buildSelectOptionDescriptor({
 				id: "contextWindow",
 				label: "Context Window",
 				options: [{
 					value: "200k",
-					label: "200k"
+					label: "200k",
+					isDefault: true
 				}, {
 					value: "1m",
-					label: "1M",
-					isDefault: true
+					label: "1M"
 				}]
-			})
+			}),
+			buildAutoCompactWindowDescriptor()
 		] })
 	},
-	{
-		slug: "claude-opus-4-5",
-		name: "Claude Opus 4.5",
-		isCustom: false,
-		capabilities: createModelCapabilities({ optionDescriptors: [buildSelectOptionDescriptor({
-			id: "effort",
-			label: "Reasoning",
-			options: [
-				{
-					value: "low",
-					label: "Low"
-				},
-				{
-					value: "medium",
-					label: "Medium"
-				},
-				{
-					value: "high",
-					label: "High",
-					isDefault: true
-				},
-				{
-					value: "max",
-					label: "Max"
-				}
-			]
-		}), buildBooleanOptionDescriptor({
-			id: "fastMode",
-			label: "Fast Mode"
-		})] })
-	},
-	{
-		slug: "claude-sonnet-5",
-		name: "Claude Sonnet 5",
-		isCustom: false,
-		capabilities: createModelCapabilities({ optionDescriptors: [buildSelectOptionDescriptor({
-			id: "effort",
-			label: "Reasoning",
-			options: [
-				{
-					value: "low",
-					label: "Low"
-				},
-				{
-					value: "medium",
-					label: "Medium"
-				},
-				{
-					value: "high",
-					label: "High",
-					isDefault: true
-				},
-				{
-					value: "xhigh",
-					label: "Extra High"
-				},
-				{
-					value: "max",
-					label: "Max"
-				},
-				{
-					value: "ultrathink",
-					label: "Ultrathink"
-				}
-			],
-			promptInjectedValues: ["ultrathink"]
-		}), buildSelectOptionDescriptor({
-			id: "contextWindow",
-			label: "Context Window",
-			options: [{
-				value: "200k",
-				label: "200k",
-				isDefault: true
-			}, {
-				value: "1m",
-				label: "1M"
-			}]
-		})] })
-	},
 	{
 		slug: "claude-sonnet-4-6",
 		name: "Claude Sonnet 4.6",
 		isCustom: false,
-		capabilities: createModelCapabilities({ optionDescriptors: [buildSelectOptionDescriptor({
-			id: "effort",
-			label: "Reasoning",
-			options: [
-				{
-					value: "low",
-					label: "Low"
-				},
-				{
-					value: "medium",
-					label: "Medium"
-				},
-				{
-					value: "high",
-					label: "High",
+		capabilities: createModelCapabilities({ optionDescriptors: [
+			buildSelectOptionDescriptor({
+				id: "effort",
+				label: "Reasoning",
+				options: [
+					{
+						value: "low",
+						label: "Low"
+					},
+					{
+						value: "medium",
+						label: "Medium"
+					},
+					{
+						value: "high",
+						label: "High",
+						isDefault: true
+					},
+					{
+						value: "max",
+						label: "Max"
+					},
+					{
+						value: "ultrathink",
+						label: "Ultrathink"
+					}
+				],
+				promptInjectedValues: ["ultrathink"]
+			}),
+			buildSelectOptionDescriptor({
+				id: "contextWindow",
+				label: "Context Window",
+				options: [{
+					value: "200k",
+					label: "200k",
 					isDefault: true
-				},
-				{
-					value: "max",
-					label: "Max"
-				},
-				{
-					value: "ultrathink",
-					label: "Ultrathink"
-				}
-			],
-			promptInjectedValues: ["ultrathink"]
-		}), buildSelectOptionDescriptor({
-			id: "contextWindow",
-			label: "Context Window",
-			options: [{
-				value: "200k",
-				label: "200k",
-				isDefault: true
-			}, {
-				value: "1m",
-				label: "1M"
-			}]
-		})] })
+				}, {
+					value: "1m",
+					label: "1M"
+				}]
+			}),
+			buildAutoCompactWindowDescriptor()
+		] })
 	},
 	{
 		slug: "claude-haiku-4-5",
@@ -67702,6 +68529,11 @@ function resolveClaudeContextWindow(modelSelection) {
 	}).find((candidate) => candidate.id === "contextWindow"));
 	return typeof value === "string" ? value : void 0;
 }
+/** Tokens at which Claude Code should auto-compact, or undefined for its default. */
+function resolveClaudeAutoCompactWindow(modelSelection) {
+	const raw = getModelSelectionStringOptionValue(modelSelection, AUTO_COMPACT_WINDOW_OPTION_ID);
+	return raw === void 0 ? void 0 : AUTO_COMPACT_WINDOW_TOKENS[raw];
+}
 function resolveClaudeApiModelId(modelSelection) {
 	switch (resolveClaudeContextWindow(modelSelection)) {
 		case "1m": return `${modelSelection.model}[1m]`;
@@ -68433,7 +69265,7 @@ function formatAskUserQuestionAnswers(answers) {
 /** Fresh-evidence gate adapted from superpowers' verification skill. */
 const VERIFY_BEFORE_COMPLETION_PROMPT = "NO COMPLETION CLAIMS WITHOUT FRESH VERIFICATION EVIDENCE. Before claiming complete, fixed, or passing: 1) identify proving command; 2) run it fresh and fully; 3) read full output, exit code, failure count; 4) confirm evidence matches claim; 5) state claim with evidence. Missing or failed proof: report actual status.";
 /** Visual-proof gate for user-visible frontend work. */
-const SCREENSHOTS_AFTER_UI_WORK_PROMPT = "AFTER USER-VISIBLE FRONTEND WORK, FRESH VISUAL PROOF IS MANDATORY. Before completing: 1) run the relevant real client; 2) inspect the full changed surface; 3) when P4Code preview is available, use preview_snapshot for inspection, then call preview_save_screenshot once after verification passes so P4Code saves the final state under Settings > Screenshots; 4) otherwise capture the verified final state with the relevant approved browser, simulator, or computer tool; 5) verify the screenshot shows the requested result without visible errors; 6) include it in the final response. Ask before launching browser or computer use when approval is required. Skip only work with no user-visible frontend change.";
+const SCREENSHOTS_AFTER_UI_WORK_PROMPT = "AFTER USER-VISIBLE FRONTEND WORK, FRESH VISUAL PROOF IS MANDATORY. Before completing: 1) run the relevant real client; 2) inspect the full changed surface; 3) when P4Code preview is available, inspect with preview_snapshot (text state by default; pass includeScreenshot: true only for the final visual check), then call preview_save_screenshot once after verification passes so P4Code saves the final state under Settings > Screenshots; 4) otherwise capture the verified final state with the relevant approved browser, simulator, or computer tool; 5) verify the screenshot shows the requested result without visible errors; 6) include it in the final response. Keep screenshots out of your own context where possible: delegate repeated visual inspection to a read-only visual review subagent when one is available and only pull the final proof yourself. Ask before launching browser or computer use when approval is required. Skip only work with no user-visible frontend change.";
 /** Root-cause gate adapted from superpowers' systematic-debugging skill. */
 const ROOT_CAUSE_BEFORE_FIX_PROMPT = "NO FIXES WITHOUT ROOT CAUSE INVESTIGATION FIRST. For bugs or unexpected behavior: 1) read errors, reproduce, inspect recent changes, trace data to source; 2) compare working patterns; 3) state one hypothesis and test smallest change; 4) add failing regression test, implement one fix, verify. After 3 failed fixes, question architecture.";
 function guardrailPromptsFor(settings) {
@@ -68889,7 +69721,8 @@ function readClaudeResumeState(resumeCursor) {
 		...threadId ? { threadId } : {},
 		...resume ? { resume } : {},
 		...resumeSessionAt ? { resumeSessionAt } : {},
-		...turnCountValue !== void 0 && Number.isInteger(turnCountValue) && turnCountValue >= 0 ? { turnCount: turnCountValue } : {}
+		...turnCountValue !== void 0 && Number.isInteger(turnCountValue) && turnCountValue >= 0 ? { turnCount: turnCountValue } : {},
+		...cursor.forkSession === true && resume ? { forkSession: true } : {}
 	};
 }
 function classifyToolItemType(toolName) {
@@ -70853,8 +71686,9 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 		const resumeState = readClaudeResumeState(input.resumeCursor);
 		const threadId = input.threadId;
 		const existingResumeSessionId = resumeState?.resume;
-		const newSessionId = existingResumeSessionId === void 0 ? yield* randomUUIDv4 : void 0;
-		const sessionId = existingResumeSessionId ?? newSessionId;
+		const forkSession = resumeState?.forkSession === true && existingResumeSessionId !== void 0;
+		const newSessionId = existingResumeSessionId === void 0 || forkSession ? yield* randomUUIDv4 : void 0;
+		const sessionId = forkSession ? newSessionId : existingResumeSessionId ?? newSessionId;
 		const runtimeContext = yield* Effect.context();
 		const runFork = Effect.runForkWith(runtimeContext);
 		const runPromise = Effect.runPromiseWith(runtimeContext);
@@ -71059,6 +71893,7 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 		const descriptors = getProviderOptionDescriptors({ caps });
 		const apiModelId = modelSelection ? resolveClaudeApiModelId(modelSelection) : void 0;
 		const initialContextWindow = selectedClaudeContextWindow(modelSelection);
+		const autoCompactWindow = resolveClaudeAutoCompactWindow(modelSelection);
 		const effort = resolveClaudeEffort(caps, getModelSelectionStringOptionValue(modelSelection, "effort")) ?? null;
 		const fastModeSupported = descriptors.some((descriptor) => descriptor.type === "boolean" && descriptor.id === "fastMode");
 		const thinkingSupported = descriptors.some((descriptor) => descriptor.type === "boolean" && descriptor.id === "thinking");
@@ -71118,11 +71953,16 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 			...permissionMode === "bypassPermissions" ? { allowDangerouslySkipPermissions: true } : {},
 			...Object.keys(settings).length > 0 ? { settings } : {},
 			...existingResumeSessionId ? { resume: existingResumeSessionId } : {},
+			...forkSession ? { forkSession: true } : {},
 			...newSessionId ? { sessionId: newSessionId } : {},
 			includePartialMessages: true,
 			canUseTool,
 			hooks: { SubagentStart: [{ hooks: [compressionSubagentHook] }] },
-			env: claudeEnvironment,
+			env: {
+				...claudeEnvironment,
+				CLAUDE_CODE_ENABLE_TODO_TOOLS: claudeEnvironment.CLAUDE_CODE_ENABLE_TODO_TOOLS ?? "1",
+				...autoCompactWindow === void 0 ? {} : { CLAUDE_CODE_AUTO_COMPACT_WINDOW: String(autoCompactWindow) }
+			},
 			...input.cwd ? { additionalDirectories: [input.cwd] } : {},
 			...Object.keys(extraArgs).length > 0 ? { extraArgs } : {},
 			...mcpSession || Object.keys(externalMcpServers).length > 0 ? { mcpServers: {
@@ -71138,7 +71978,7 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 			"provider.kind": PROVIDER$6,
 			"provider.thread_id": threadId,
 			"provider.runtime_mode": input.runtimeMode,
-			"claude.resume.source": existingResumeSessionId !== void 0 ? "resume-session" : "generated-session",
+			"claude.resume.source": forkSession ? "fork-session" : existingResumeSessionId !== void 0 ? "resume-session" : "generated-session",
 			"claude.resume.thread_id": resumeState?.threadId ?? "",
 			"claude.resume.session_id": existingResumeSessionId ?? "",
 			"claude.resume.session_at": resumeState?.resumeSessionAt ?? "",
@@ -89646,7 +90486,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$8 = Effect.fn("effect-codex-app-server/CodexAppServerClient.make")(function* (stdio, options = {}, terminationError) {
+const make$9 = Effect.fn("effect-codex-app-server/CodexAppServerClient.make")(function* (stdio, options = {}, terminationError) {
 	const requestHandlers = /* @__PURE__ */ new Map();
 	const notificationHandlers = /* @__PURE__ */ new Map();
 	let unknownRequestHandler;
@@ -89713,7 +90553,7 @@ const make$8 = 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$8(makeChildStdio$1(handle), options, makeTerminationError$1(handle));
+	return yield* make$9(makeChildStdio$1(handle), options, makeTerminationError$1(handle));
 });
 const resolveCodexLaunchArgs = (launchArgs, environment = process.env) => environment["P4CODE_CODEX_LAUNCH_ARGS"]?.trim() || launchArgs?.trim() || "";
 const codexLaunchArgv = (launchArgs) => tokenizeCliArgs(launchArgs);
@@ -91803,10 +92643,15 @@ function collabTaskEvents(event, canonicalThreadId, item, defaults) {
 	}
 	return events;
 }
-function itemTitle(itemType, item) {
+function itemTitle(itemType, item, agentNames) {
 	if (itemType === "mcp_tool_call" && item?.type === "mcpToolCall") return `${item.server} · ${item.tool}`;
 	if (item?.type === "collabAgentToolCall") {
 		const title = COLLAB_TOOL_TITLES[item.tool] ?? "Agent tool call";
+		const names = item.receiverThreadIds.flatMap((threadId) => {
+			const name = agentNames?.get(threadId);
+			return name ? [name] : [];
+		});
+		if (names.length > 0) return `${title} · ${names.join(", ")}`;
 		const model = trimText$1(item.model);
 		return model ? `${title} · ${model}` : title;
 	}
@@ -91958,12 +92803,13 @@ function runtimeEventBase(event, canonicalThreadId) {
 		}
 	};
 }
-function mapItemLifecycle(event, canonicalThreadId, lifecycle) {
+function mapItemLifecycle(event, canonicalThreadId, lifecycle, agentNames) {
 	const item = (readPayload(V2ItemStartedNotification, event.payload) ?? readPayload(V2ItemCompletedNotification, event.payload))?.item;
 	if (!item) return;
 	const itemType = toCanonicalItemType(item.type);
 	if (itemType === "unknown" && lifecycle !== "item.updated") return;
 	const detail = itemDetail(itemType, item);
+	const title = itemTitle(itemType, item, agentNames);
 	const status = lifecycle === "item.started" ? "inProgress" : lifecycle === "item.completed" ? "completed" : void 0;
 	return {
 		...runtimeEventBase(event, canonicalThreadId),
@@ -91971,12 +92817,17 @@ function mapItemLifecycle(event, canonicalThreadId, lifecycle) {
 		payload: {
 			itemType,
 			...status ? { status } : {},
-			...itemTitle(itemType, item) ? { title: itemTitle(itemType, item) } : {},
+			...title ? { title } : {},
 			...detail ? { detail } : {},
 			...event.payload !== void 0 ? { data: event.payload } : {}
 		}
 	};
 }
+function rememberAgentName(item, collabDefaults) {
+	if (item.type !== "subAgentActivity" || collabDefaults === void 0) return;
+	const name = agentNameFromPath(item.agentPath);
+	if (name) collabDefaults.agentNames.set(item.agentThreadId, name);
+}
 function mapToRuntimeEvents(event, canonicalThreadId, collabDefaults) {
 	if (event.kind === "error") {
 		if (!event.message) return [];
@@ -92169,8 +93020,9 @@ function mapToRuntimeEvents(event, canonicalThreadId, collabDefaults) {
 		}];
 	}
 	if (event.method === "item/started") {
-		const started = mapItemLifecycle(event, canonicalThreadId, "item.started");
 		const item = readPayload(V2ItemStartedNotification, event.payload)?.item;
+		if (item) rememberAgentName(item, collabDefaults);
+		const started = mapItemLifecycle(event, canonicalThreadId, "item.started", collabDefaults?.agentNames);
 		const taskEvents = item ? collabTaskEvents(event, canonicalThreadId, item, collabDefaults) : [];
 		return started ? [started, ...taskEvents] : taskEvents;
 	}
@@ -92187,7 +93039,8 @@ function mapToRuntimeEvents(event, canonicalThreadId, collabDefaults) {
 				payload: { planMarkdown: detail }
 			}];
 		}
-		const completed = mapItemLifecycle(event, canonicalThreadId, "item.completed");
+		rememberAgentName(item, collabDefaults);
+		const completed = mapItemLifecycle(event, canonicalThreadId, "item.completed", collabDefaults?.agentNames);
 		const taskEvents = collabTaskEvents(event, canonicalThreadId, item, collabDefaults);
 		return completed ? [completed, ...taskEvents] : taskEvents;
 	}
@@ -92561,6 +93414,7 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 			cause
 		})));
 		const collabDefaults = {
+			agentNames: /* @__PURE__ */ new Map(),
 			model: input.modelSelection?.instanceId === boundInstanceId ? input.modelSelection.model : void 0,
 			reasoningEffort: input.modelSelection?.instanceId === boundInstanceId ? getModelSelectionStringOptionValue(input.modelSelection, "reasoningEffort") : void 0
 		};
@@ -96499,7 +97353,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$7 = Effect.fn("effect-acp/AcpClient.make")(function* (stdio, options = {}, terminationError) {
+const make$8 = Effect.fn("effect-acp/AcpClient.make")(function* (stdio, options = {}, terminationError) {
 	const coreHandlers = {};
 	const notificationHandlers = {
 		sessionUpdate: {
@@ -96657,7 +97511,7 @@ const make$7 = 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$7(stdio, options, terminationError));
+	return Layer.effect(AcpClient, make$8(stdio, options, terminationError));
 };
 //#endregion
 //#region ../../packages/shared/src/toolActivity.ts
@@ -97117,7 +97971,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$6 = (options) => Effect.gen(function* () {
+const make$7 = (options) => Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const spawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
 	const runtimeScope = yield* Scope.Scope;
@@ -97433,7 +98287,7 @@ const make$6 = (options) => Effect.gen(function* () {
 		notify: acp.raw.notify
 	};
 });
-const layer$2 = (options) => Layer.effect(AcpSessionRuntime, make$6(options));
+const layer$2 = (options) => Layer.effect(AcpSessionRuntime, make$7(options));
 function sessionConfigOptionsFromSetup(response) {
 	return response?.configOptions ?? [];
 }
@@ -104754,8 +105608,8 @@ const PreviewSetAppearanceTool = safeBrowserTool(Tool.make("preview_set_appearan
 	dependencies: dependencies$1
 }).annotate(Tool.Title, "Set preview appearance").annotate(Tool.Idempotent, true));
 const PreviewSnapshotTool = readonlyBrowserTool(Tool.make("preview_snapshot", {
-	description: "Inspect a page before interacting. Pass tabId to inspect a specific tab; omit it to use this agent session's current tab. Returns page state, semantic elements, diagnostics, action history, and a PNG screenshot.",
-	parameters: PreviewAutomationTabTargetInput,
+	description: "Inspect a page before interacting. Pass tabId to inspect a specific tab; omit it to use this agent session's current tab. Returns page state, semantic elements, diagnostics, and action history as text. Pass includeScreenshot: true only when you need to see the rendering; the text state is enough for locators and assertions.",
+	parameters: PreviewAutomationSnapshotInput,
 	success: PreviewAutomationSnapshot,
 	failure: PreviewAutomationError,
 	dependencies: dependencies$1
@@ -104857,7 +105711,7 @@ const handlers$4 = {
 	preview_navigate: (input) => invokeTargeted("navigate", input, input.timeoutMs),
 	preview_resize: (input) => invokeTargeted("resize", input, input.timeoutMs),
 	preview_set_appearance: (input) => invokeTargeted("setColorScheme", input),
-	preview_snapshot: (input) => invokeTargeted("snapshot", input ?? {}),
+	preview_snapshot: (input) => invokeTargeted("snapshot", input?.tabId ? { tabId: input.tabId } : {}),
 	preview_save_screenshot: (input) => invokeTargeted("saveScreenshot", input ?? {}),
 	preview_click: (input) => invokeTargeted("click", input, input.timeoutMs).pipe(Effect.as(null)),
 	preview_type: (input) => invokeTargeted("type", input, input.timeoutMs).pipe(Effect.as(null)),
@@ -104879,7 +105733,7 @@ const stringField = (record, key) => {
 	const value = record[key];
 	return typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
 };
-const make$5 = Effect.gen(function* () {
+const make$6 = Effect.gen(function* () {
 	const linear = yield* LinearClient;
 	return { resolve: Effect.fn("TicketResolver.resolve")(function* (reference) {
 		const identifier = parseTicketReference(reference);
@@ -104910,7 +105764,7 @@ const make$5 = Effect.gen(function* () {
 		};
 	}) };
 });
-const layer$1 = Layer.effect(TicketResolver, make$5);
+const layer$1 = Layer.effect(TicketResolver, make$6);
 //#endregion
 //#region src/mcp/toolkits/tasks/tools.ts
 const dependencies = [McpInvocationContext, TaskRepository];
@@ -106419,6 +107273,7 @@ const registerPreviewSnapshot = Effect.fn("McpHttpServer.registerPreviewSnapshot
 			return built.handle("preview_snapshot", payload).pipe(Stream.unwrap, Stream.run(Sink.last()), Effect.flatMap(Effect.fromOption), Effect.provideService(PreviewAutomationBroker, broker), Effect.provideService(McpInvocationContext, invocation), Effect.matchCauseEffect({
 				onFailure: previewSnapshotFailure,
 				onSuccess: ({ encodedResult }) => {
+					const includeScreenshot = payload?.includeScreenshot === true;
 					const { screenshot, ...page } = encodedResult;
 					const metadata = {
 						...page,
@@ -106434,11 +107289,11 @@ const registerPreviewSnapshot = Effect.fn("McpHttpServer.registerPreviewSnapshot
 						content: [{
 							type: "text",
 							text: JSON.stringify(metadata)
-						}, {
+						}, ...includeScreenshot ? [{
 							type: "image",
 							data: new Uint8Array(Buffer.from(screenshot.data, "base64")),
 							mimeType: screenshot.mimeType
-						}]
+						}] : []]
 					}));
 				}
 			}));
@@ -106518,6 +107373,18 @@ var ThreadDeletionReactor = class extends Context.Service()("@p4code/cli/orchest
 //#region src/orchestration/Services/FusionWatcherReactor.ts
 var FusionWatcherReactor = class extends Context.Service()("@p4code/cli/orchestration/Services/FusionWatcherReactor") {};
 //#endregion
+//#region src/orchestration/Services/ScheduledTaskReactor.ts
+/**
+* ScheduledTaskReactor - fires user-created scheduled tasks.
+*
+* Arms one timer per pending task (from the read model at start and from
+* `thread.scheduled-task.created` events afterwards), starts the thread turn
+* when the time comes, and records the outcome on the task.
+*
+* @module ScheduledTaskReactor
+*/
+var ScheduledTaskReactor = class extends Context.Service()("@p4code/cli/orchestration/Services/ScheduledTaskReactor") {};
+//#endregion
 //#region src/orchestration/Layers/OrchestrationReactor.ts
 const makeOrchestrationReactor = Effect.gen(function* () {
 	const providerRuntimeIngestion = yield* ProviderRuntimeIngestionService;
@@ -106525,12 +107392,14 @@ const makeOrchestrationReactor = Effect.gen(function* () {
 	const checkpointReactor = yield* CheckpointReactor;
 	const threadDeletionReactor = yield* ThreadDeletionReactor;
 	const fusionWatcherReactor = yield* FusionWatcherReactor;
+	const scheduledTaskReactor = yield* ScheduledTaskReactor;
 	return { start: Effect.fn("start")(function* () {
 		yield* providerRuntimeIngestion.start();
 		yield* providerCommandReactor.start();
 		yield* checkpointReactor.start();
 		yield* threadDeletionReactor.start();
 		yield* fusionWatcherReactor.start();
+		yield* scheduledTaskReactor.start();
 	}) };
 });
 const OrchestrationReactorLive = Layer.effect(OrchestrationReactor, makeOrchestrationReactor);
@@ -107116,7 +107985,7 @@ function runtimeEventToActivities(event, taskTitle, compressMode) {
 	}
 	return [];
 }
-const make$4 = Effect.gen(function* () {
+const make$5 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const orchestrationEngine = yield* OrchestrationEngineService;
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
@@ -107746,7 +108615,7 @@ const make$4 = Effect.gen(function* () {
 		drain: worker.drain
 	};
 });
-const ProviderRuntimeIngestionLive = Layer.effect(ProviderRuntimeIngestionService, make$4).pipe(Layer.provide(ProjectionTurnRepositoryLive), Layer.provide(layer$64));
+const ProviderRuntimeIngestionLive = Layer.effect(ProviderRuntimeIngestionService, make$5).pipe(Layer.provide(ProjectionTurnRepositoryLive), Layer.provide(layer$64));
 //#endregion
 //#region src/provider/userInvokedSkills.ts
 /**
@@ -107922,8 +108791,8 @@ const DEFAULT_RUNTIME_MODE = "full-access";
 const DEFAULT_THREAD_TITLE = "New thread";
 const NON_SYSTEM_PROVIDER_STRUCTURED_USER_QUESTIONS = structuredUserQuestionPrompt("your provider's structured user-input question tool");
 const FUSION_PROMOTION_INSTRUCTIONS = `Work independently in this normal thread. Fusion is a silent escalation path, not a startup procedure. Do not inspect Fusion tools/skill, mention Fusion status, or announce that Fusion was not invoked. First analyze the task normally. Only if that analysis reveals a concrete unresolved tradeoff, correctness risk, or design decision materially needing a second opinion, stop before implementation, propose Fusion, and ask the user for explicit approval. The user may approve with ordinary affirmative text such as "approved"; /fusion or $fusion also authorizes Fusion directly without a prior proposal. Do not activate, spawn, or promote until one of those authorizations arrives. UI work, complex logic, task size, unfamiliarity, or duration alone never qualifies.`;
-const FUSION_BUILDER_INSTRUCTIONS = `You are Fusion Builder in an already-created native server pair. Server owns pairing and coordination. Do not inspect or invoke the Fusion skill, create/pair/rename threads, or announce/setup Fusion. Start the user's task directly. Before editing, create and maintain the phase list in the same plan/todo tool you use for ordinary step tracking, never the MCP task board tools - one entry per phase in order, exactly one in progress at a time, marked completed at each phase end - so phases render in the task banner. That list holds phase entries only for the whole task; keep step-level or per-file todos out of it. Prose alone leaves the banner empty. Split it into the fewest substantial phases the task genuinely needs plus a final integration/whole-task phase; most tasks need one to three work phases. Each phase is a complete reviewable slice of behavior. Never split per file, per function, or per trivial step: over-splitting spends review turns instead of finishing the job. Add a phase only when a real review boundary, risky decision, or independent behavior separates the work. Complete exactly one phase per turn, and finish the whole phase in that turn rather than stopping early. Do not run tests, typecheck, lint, or builds per phase; write the tests the change needs, then run verification once in the final phase over the whole task. Exception: a phase whose own correctness is unclear may run the single narrowest check that resolves it. End every phase turn with phase completed, todo status, changed behavior/files, and remaining phases; do not start the next phase in the same turn. Server then wakes the paired Supervisor, which resumes you through ${FUSION_ADVICE_PROMPT_PREFIX}; a user message may also revise or resume the work. Final phase verifies the entire task against the original request and labels it ready for whole-task review. Supervisor is unreachable during your turn. Never spawn/use another Supervisor thread/subagent or attribute Supervisor decisions without ${FUSION_ADVICE_PROMPT_PREFIX}. Within the current phase, continue when straightforward or evidence is clear. For a concrete unresolved tradeoff, correctness risk, or design decision materially needing judgment, stop safely before the risky choice; final response states the exact question and why review is needed. Evaluate/follow Supervisor advice unless conflicting with user request or verified repo state.`;
-const FUSION_WATCHER_INSTRUCTIONS = `You are Fusion Supervisor (watcher) in an already-created native server pair. Server owns pairing and coordination and wakes you with ${FUSION_REVIEW_PROMPT_PREFIX} or ${FUSION_GATE_PROMPT_PREFIX} prompts at builder turn boundaries; this message arrived outside such a wake, so your conversational memory of the pair may be gone. The pair metadata below is authoritative: the builder thread exists and is the counterpart thread id. Never report that no builder thread exists. To resume supervision, read builder events with thread_watch_events from lastReviewedImplementerSequence with limit 50, paging forward with the last returned sequence rather than requesting a whole range at once, derive phase from artifacts (git log/status, PR, builder events), steer with thread_advise, and answer an open gate with thread_gate_respond. When a review or gate wake prompt specifies an explicit event range, that range wins over this metadata. Never poll or wait for the builder; deliver review or advice, then end the turn.`;
+const FUSION_BUILDER_INSTRUCTIONS = `You are Fusion Builder in an already-created native server pair. Server owns pairing and coordination. Do not inspect or invoke the Fusion skill, create/pair/rename threads, or announce/setup Fusion. Start the user's task directly. Before editing, create and maintain the phase list with your provider's step-tracking tool (Claude Code: TaskCreate for each phase, then TaskUpdate for status, or TodoWrite when that is the tool offered; Codex: update_plan), never the MCP task board tools - one entry per phase in order, exactly one in progress at a time, marked completed at each phase end - so phases render in the task banner. That list holds phase entries only for the whole task; keep step-level or per-file todos out of it. Prose alone leaves the banner empty. Split it into the fewest substantial phases the task genuinely needs plus a final integration/whole-task phase; most tasks need one to three work phases. Each phase is a complete reviewable slice of behavior. Never split per file, per function, or per trivial step: over-splitting spends review turns instead of finishing the job. Add a phase only when a real review boundary, risky decision, or independent behavior separates the work. Complete exactly one phase per turn, and finish the whole phase in that turn rather than stopping early. Do not run tests, typecheck, lint, or builds per phase; write the tests the change needs, then run verification once in the final phase over the whole task. Exception: a phase whose own correctness is unclear may run the single narrowest check that resolves it. End every phase turn with phase completed, todo status, changed behavior/files, and remaining phases; do not start the next phase in the same turn. Server then wakes the paired Supervisor, which resumes you through ${FUSION_ADVICE_PROMPT_PREFIX}; a user message may also revise or resume the work. Final phase verifies the entire task against the original request and labels it ready for whole-task review. Supervisor is unreachable during your turn. Never spawn/use another Supervisor thread/subagent or attribute Supervisor decisions without ${FUSION_ADVICE_PROMPT_PREFIX}. Within the current phase, continue when straightforward or evidence is clear. For a concrete unresolved tradeoff, correctness risk, or design decision materially needing judgment, stop safely before the risky choice; final response states the exact question and why review is needed. Evaluate/follow Supervisor advice unless conflicting with user request or verified repo state.`;
+const FUSION_WATCHER_INSTRUCTIONS = `You are Fusion Supervisor (watcher) in an already-created native server pair. Server owns pairing and coordination and wakes you with ${FUSION_REVIEW_PROMPT_PREFIX} or ${FUSION_GATE_PROMPT_PREFIX} prompts at builder turn boundaries; this message arrived outside such a wake, so your conversational memory of the pair may be gone. The pair metadata below is authoritative: the builder thread exists and is the counterpart thread id. Never report that no builder thread exists. To resume supervision, read builder events with thread_watch_events from lastReviewedImplementerSequence with limit 50, paging forward with the last returned sequence rather than requesting a whole range at once, derive phase from artifacts (git log/status, PR, builder events, including its turn.plan.updated phase list), steer with thread_advise, and answer an open gate with thread_gate_respond. When a review or gate wake prompt specifies an explicit event range, that range wins over this metadata. Never poll or wait for the builder; deliver review or advice, then end the turn.`;
 const isFusionWatcherWakeMessageId = (messageId) => messageId.startsWith("fusion-review:") || messageId.startsWith("fusion-gate:");
 const fusionPairContext = (pair, role) => {
 	const counterpartThreadId = role === "implementer" ? pair.watcherThreadId : pair.implementerThreadId;
@@ -108011,7 +108880,7 @@ function resolvePendingWorkspaceCleanupGroups(input) {
 	}
 	return groups;
 }
-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;
@@ -108890,7 +109759,7 @@ const make$3 = Effect.gen(function* () {
 		drain: Effect.all([worker.drain, forceStopDrain], { discard: true }).pipe(Effect.asVoid)
 	};
 });
-const ProviderCommandReactorLive = Layer.effect(ProviderCommandReactor, make$3);
+const ProviderCommandReactorLive = Layer.effect(ProviderCommandReactor, make$4);
 //#endregion
 //#region src/checkpointing/Diffs.ts
 function parseTurnDiffFilesFromUnifiedDiff(diff) {
@@ -108920,7 +109789,7 @@ function checkpointStatusFromRuntime(status) {
 		default: return "ready";
 	}
 }
-const make$2 = Effect.gen(function* () {
+const make$3 = 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}`)));
@@ -109402,7 +110271,7 @@ const make$2 = Effect.gen(function* () {
 		drain: worker.drain
 	};
 });
-const CheckpointReactorLive = Layer.effect(CheckpointReactor, make$2);
+const CheckpointReactorLive = Layer.effect(CheckpointReactor, make$3);
 //#endregion
 //#region src/orchestration/Layers/FusionWatcherReactor.ts
 const GATE_TIMEOUT_SWEEP_INTERVAL = "10 seconds";
@@ -109492,7 +110361,7 @@ Then thread_gate_respond, threadId ${input.implementerThreadId}, gateId ${input.
 - "object" plus message: send objection, spend round. After ${input.roundCap} objections, escalate to user.
 
 No answer within ${Math.round(input.gateTimeoutMs / 1e3)} seconds: fail open, record unwatched. Answer, briefly explain to user, end turn; never wait for builder.`;
-const make$1 = Effect.gen(function* () {
+const make$2 = Effect.gen(function* () {
 	const orchestrationEngine = yield* OrchestrationEngineService;
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 	/**
@@ -110092,7 +110961,7 @@ const make$1 = Effect.gen(function* () {
 		sweepGates: sweepGateTimeouts.pipe(Effect.catchCause((cause) => Effect.logWarning("fusion gate timeout sweep failed", { cause: Cause.pretty(cause) })))
 	};
 });
-const FusionWatcherReactorLive = Layer.effect(FusionWatcherReactor, make$1);
+const FusionWatcherReactorLive = Layer.effect(FusionWatcherReactor, make$2);
 //#endregion
 //#region src/orchestration/Layers/ThreadDeletionReactor.ts
 const logCleanupCauseUnlessInterrupted = ({ effect, message, threadId }) => effect.pipe(Effect.catchCause((cause) => {
@@ -110102,7 +110971,7 @@ const logCleanupCauseUnlessInterrupted = ({ effect, message, threadId }) => effe
 		cause: Cause.pretty(cause)
 	});
 }));
-const make = Effect.gen(function* () {
+const make$1 = Effect.gen(function* () {
 	const orchestrationEngine = yield* OrchestrationEngineService;
 	const providerService = yield* ProviderService;
 	const terminalManager = yield* TerminalManager;
@@ -110143,7 +111012,213 @@ const make = Effect.gen(function* () {
 		drain: worker.drain
 	};
 });
-const ThreadDeletionReactorLive = Layer.effect(ThreadDeletionReactor, make);
+const ThreadDeletionReactorLive = Layer.effect(ThreadDeletionReactor, make$1);
+//#endregion
+//#region src/orchestration/scheduledTasks.ts
+/** Milliseconds until a task is due; 0 for anything already overdue. */
+function scheduledTaskDelayMs(runAt, nowMs) {
+	const runAtMs = Date.parse(runAt);
+	if (Number.isNaN(runAtMs)) return 0;
+	return Math.max(0, runAtMs - nowMs);
+}
+function pendingScheduledTasks(threads) {
+	return threads.flatMap((thread) => thread.deletedAt !== null ? [] : (thread.scheduledTasks ?? []).filter((task) => task.status === "pending").map((task) => ({
+		threadId: thread.id,
+		task
+	})));
+}
+/**
+* Task ids are unique per thread only, so every key derived from a task is
+* scoped by its thread.
+*/
+function scheduledTaskKey(threadId, taskId) {
+	return `${threadId}:${taskId}`;
+}
+/**
+* Every turn-start attempt gets its own command id: the engine keeps a
+* rejected receipt per command id, so reusing one would replay the first
+* rejection (a busy thread) on every retry. Crash idempotence comes from the
+* deterministic message id instead: a turn that already sent
+* {@link scheduledTaskMessageId} is never started again.
+*/
+function scheduledTaskTurnCommandId(threadId, taskId, attemptToken) {
+	return CommandId.make(`scheduled-task:${threadId}:${taskId}:turn:${attemptToken}`);
+}
+function scheduledTaskFireCommandId(threadId, taskId) {
+	return CommandId.make(`scheduled-task:${threadId}:${taskId}:fire`);
+}
+function scheduledTaskMessageId(threadId, taskId) {
+	return MessageId.make(`scheduled-task:${threadId}:${taskId}`);
+}
+//#endregion
+//#region src/orchestration/Layers/ScheduledTaskReactor.ts
+/**
+* A turn that cannot start (thread busy, provider down) is retried on this
+* cadence before the task is marked failed; the count resets with the process,
+* and the periodic reconcile re-arms anything still pending.
+*/
+const SCHEDULED_TASK_TURN_RETRY_DELAY = Duration.minutes(2);
+/** Re-arms pending tasks that lost their timer (fire failure, missed event). */
+const SCHEDULED_TASK_RECONCILE_INTERVAL = Duration.minutes(5);
+/** Engine-level failures while firing (e.g. persistence) back off briefly and retry. */
+const FIRE_RETRY = {
+	schedule: Schedule.exponential(Duration.seconds(10)),
+	times: 3
+};
+const make = Effect.gen(function* () {
+	const orchestrationEngine = yield* OrchestrationEngineService;
+	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
+	const threadMessages = yield* ProjectionThreadMessageRepository;
+	const timers = /* @__PURE__ */ new Map();
+	const turnAttempts = /* @__PURE__ */ new Map();
+	const nowIso = Effect.map(DateTime.now, DateTime.formatIso);
+	const disarm = (threadId, taskId) => Effect.gen(function* () {
+		const key = scheduledTaskKey(threadId, taskId);
+		turnAttempts.delete(key);
+		const fiber = timers.get(key);
+		if (fiber === void 0) return;
+		timers.delete(key);
+		yield* Fiber.interrupt(fiber);
+	});
+	const describeFailure = (failure) => failure instanceof Error ? failure.message : String(failure);
+	/**
+	* Starts the turn, then marks the task fired. The turn's user message has a
+	* deterministic id, so a crash between the two steps re-fires on the next
+	* boot without a second turn: an existing message means the turn already
+	* started. Each attempt uses a fresh command id because the engine replays
+	* a rejected receipt for a reused one. A turn that cannot start re-arms the
+	* task for a bounded number of retries and only then records the failure.
+	*/
+	const fire = Effect.fn("ScheduledTaskReactor.fire")(function* (threadId, task) {
+		const key = scheduledTaskKey(threadId, task.id);
+		timers.delete(key);
+		const thread = (yield* projectionSnapshotQuery.getCommandReadModel()).threads.find((entry) => entry.id === threadId);
+		const current = thread?.scheduledTasks?.find((entry) => entry.id === task.id);
+		if (thread === void 0 || thread.deletedAt !== null || current?.status !== "pending") {
+			turnAttempts.delete(key);
+			return;
+		}
+		const messageId = scheduledTaskMessageId(threadId, task.id);
+		const turnResult = Option.isSome(yield* threadMessages.getByMessageId({ messageId })) ? { _tag: "Success" } : yield* orchestrationEngine.dispatch({
+			type: "thread.turn.start",
+			commandId: scheduledTaskTurnCommandId(threadId, task.id, String(yield* Clock.currentTimeMillis)),
+			threadId,
+			message: {
+				messageId,
+				role: "user",
+				text: task.prompt,
+				attachments: []
+			},
+			runtimeMode: thread.runtimeMode,
+			interactionMode: thread.interactionMode,
+			compressMode: thread.compressMode,
+			unpromptedSubagents: thread.unpromptedSubagents,
+			createdAt: yield* nowIso
+		}).pipe(Effect.result);
+		if (turnResult._tag === "Failure") {
+			const attempts = (turnAttempts.get(key) ?? 0) + 1;
+			if (attempts < 10) {
+				turnAttempts.set(key, attempts);
+				yield* Effect.logInfo("scheduled task turn could not start; retrying", {
+					threadId,
+					taskId: task.id,
+					attempt: attempts,
+					failure: describeFailure(turnResult.failure)
+				});
+				yield* armAfter(threadId, task, SCHEDULED_TASK_TURN_RETRY_DELAY);
+				return;
+			}
+			turnAttempts.delete(key);
+			yield* orchestrationEngine.dispatch({
+				type: "thread.scheduled-task.fire",
+				commandId: scheduledTaskFireCommandId(threadId, task.id),
+				threadId,
+				taskId: task.id,
+				firedAt: yield* nowIso,
+				failure: `Could not start the turn after ${attempts} attempts: ${describeFailure(turnResult.failure)}`
+			});
+			return;
+		}
+		turnAttempts.delete(key);
+		yield* orchestrationEngine.dispatch({
+			type: "thread.scheduled-task.fire",
+			commandId: scheduledTaskFireCommandId(threadId, task.id),
+			threadId,
+			taskId: task.id,
+			firedAt: yield* nowIso
+		});
+	});
+	const armAfter = (threadId, task, delay) => Effect.gen(function* () {
+		const key = scheduledTaskKey(threadId, task.id);
+		const existing = timers.get(key);
+		if (existing !== void 0) {
+			timers.delete(key);
+			yield* Fiber.interrupt(existing);
+		}
+		const fiber = yield* Effect.forkDetach(Effect.sleep(delay).pipe(Effect.flatMap(() => fire(threadId, task).pipe(Effect.retry(FIRE_RETRY))), Effect.catchCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.void : Effect.logWarning("scheduled task failed to fire; it stays pending until reconcile re-arms it", {
+			threadId,
+			taskId: task.id,
+			cause: Cause.pretty(cause)
+		}))));
+		timers.set(key, fiber);
+	});
+	const arm = (threadId, task) => Effect.gen(function* () {
+		const delayMs = scheduledTaskDelayMs(task.runAt, yield* Clock.currentTimeMillis);
+		yield* armAfter(threadId, task, Duration.millis(delayMs));
+	});
+	/** Arms every pending task that has no live timer; the read model is authoritative. */
+	const reconcile = Effect.fn("ScheduledTaskReactor.reconcile")(function* () {
+		const readModel = yield* projectionSnapshotQuery.getCommandReadModel();
+		for (const pending of pendingScheduledTasks(readModel.threads)) {
+			if (timers.has(scheduledTaskKey(pending.threadId, pending.task.id))) continue;
+			yield* arm(pending.threadId, pending.task);
+		}
+	});
+	const processEvent = Effect.fn("ScheduledTaskReactor.processEvent")(function* (event) {
+		switch (event.type) {
+			case "thread.scheduled-task.created":
+				yield* arm(event.payload.threadId, event.payload.task);
+				return;
+			case "thread.scheduled-task.cancelled":
+			case "thread.scheduled-task.fired":
+				yield* disarm(event.payload.threadId, event.payload.taskId);
+				return;
+			case "thread.deleted":
+				for (const key of Array.from(timers.keys())) {
+					if (!key.startsWith(`${event.payload.threadId}:`)) continue;
+					const fiber = timers.get(key);
+					timers.delete(key);
+					turnAttempts.delete(key);
+					if (fiber !== void 0) yield* Fiber.interrupt(fiber);
+				}
+				return;
+		}
+	});
+	const processEventSafely = (event) => processEvent(event).pipe(Effect.catchCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.failCause(cause) : Effect.logWarning("scheduled task reactor failed to process event", {
+		eventType: event.type,
+		cause: Cause.pretty(cause)
+	})));
+	const worker = yield* makeDrainableWorker(processEventSafely);
+	const logReconcileFailure = (cause) => Effect.logWarning("scheduled task reconcile failed", { cause: Cause.pretty(cause) });
+	return {
+		start: Effect.fn("start")(function* () {
+			yield* Effect.forkScoped(Stream.runForEach(orchestrationEngine.streamDomainEvents, (event) => {
+				switch (event.type) {
+					case "thread.scheduled-task.created":
+					case "thread.scheduled-task.cancelled":
+					case "thread.scheduled-task.fired":
+					case "thread.deleted": return worker.enqueue(event);
+					default: return Effect.void;
+				}
+			}));
+			yield* reconcile().pipe(Effect.catchCause(logReconcileFailure));
+			yield* Effect.forkScoped(Effect.repeat(reconcile().pipe(Effect.catchCause(logReconcileFailure)), Schedule.spaced(SCHEDULED_TASK_RECONCILE_INTERVAL)).pipe(Effect.delay(SCHEDULED_TASK_RECONCILE_INTERVAL)));
+			yield* Effect.addFinalizer(() => Effect.forEach([...timers.values()], (fiber) => Fiber.interrupt(fiber), { discard: true }).pipe(Effect.tap(() => Effect.sync(() => timers.clear()))));
+		}),
+		drain: worker.drain
+	};
+});
+const ScheduledTaskReactorLive = Layer.effect(ScheduledTaskReactor, make);
 //#endregion
 //#region src/provider/providerStatusCache.ts
 const decodeProviderStatusCache = Schema$1.decodeUnknownEffect(Schema$1.fromJsonString(ServerProvider));
@@ -110924,7 +111999,7 @@ const PlatformServicesLive = Layer.unwrap(Effect.gen(function* () {
 		return layer;
 	}
 }));
-const ReactorLayerLive = Layer.empty.pipe(Layer.provideMerge(OrchestrationReactorLive), Layer.provideMerge(ProviderRuntimeIngestionLive), Layer.provideMerge(ProviderCommandReactorLive), Layer.provideMerge(CheckpointReactorLive), Layer.provideMerge(ThreadDeletionReactorLive), Layer.provideMerge(FusionWatcherReactorLive), 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(ScheduledTaskReactorLive), 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));