ryco-cli 0.1.13 → 0.1.15

package/dist/bin.cjs

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-LGfotAqq.cjs");
-const require_collectUint8StreamText = require("./collectUint8StreamText-Bb52hlpd.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-Dsbmrw73.cjs");
 const require_Metrics = require("./Metrics-DIjMQ5pa.cjs");
-const require_SourceControlProviderDiscoveryCatalog = require("./SourceControlProviderDiscoveryCatalog-DJWDCoup.cjs");
+const require_SourceControlProviderDiscoveryCatalog = require("./SourceControlProviderDiscoveryCatalog-CPO3a9_U.cjs");
 const require_sourceControl = require("./sourceControl-B0D1Op29.cjs");
 let _effect_platform_node_NodeRuntime = require("@effect/platform-node/NodeRuntime");
 _effect_platform_node_NodeRuntime = require_rolldown_runtime.__toESM(_effect_platform_node_NodeRuntime, 1);
@@ -75,7 +75,6 @@ let node_http = require("node:http");
 let effect_unstable_sql_SqlSchema = require("effect/unstable/sql/SqlSchema");
 effect_unstable_sql_SqlSchema = require_rolldown_runtime.__toESM(effect_unstable_sql_SqlSchema, 1);
 let effect_Number = require("effect/Number");
-let node_url = require("node:url");
 let _pierre_diffs = require("@pierre/diffs");
 let effect_unstable_http_HttpServerRequest = require("effect/unstable/http/HttpServerRequest");
 effect_unstable_http_HttpServerRequest = require_rolldown_runtime.__toESM(effect_unstable_http_HttpServerRequest, 1);
@@ -1539,6 +1538,7 @@ function attachmentRelativePath(attachment) {
 			});
 			return `${attachment.id}${extension}`;
 		}
+		case "file": return `${attachment.id}.bin`;
 	}
 }
 function resolveAttachmentPath(input) {
@@ -1547,6 +1547,64 @@ function resolveAttachmentPath(input) {
 		relativePath: attachmentRelativePath(input.attachment)
 	});
 }
+function attachmentByteLimit(attachment) {
+	return attachment.type === "image" ? require_collectUint8StreamText.PROVIDER_SEND_TURN_MAX_IMAGE_BYTES : require_collectUint8StreamText.PROVIDER_SEND_TURN_MAX_FILE_BYTES;
+}
+/**
+* Opens and reads a persisted attachment through one descriptor. Comparing
+* the path's lstat identity with the opened descriptor prevents a path or
+* symlink swap between validation and read, including on platforms without a
+* useful O_NOFOLLOW flag.
+*/
+function readPersistedAttachment(input) {
+	const attachmentPath = resolveAttachmentPath(input);
+	if (!attachmentPath) return {
+		ok: false,
+		reason: `Invalid attachment id '${input.attachment.id}'.`
+	};
+	let descriptor;
+	try {
+		const pathInfo = (0, node_fs.lstatSync)(attachmentPath);
+		if (!pathInfo.isFile()) return {
+			ok: false,
+			reason: `Attachment '${input.attachment.name}' is not a regular file.`
+		};
+		const noFollow = typeof node_fs.constants.O_NOFOLLOW === "number" ? node_fs.constants.O_NOFOLLOW : 0;
+		descriptor = (0, node_fs.openSync)(attachmentPath, node_fs.constants.O_RDONLY | noFollow);
+		const openedInfo = (0, node_fs.fstatSync)(descriptor);
+		if (!openedInfo.isFile() || openedInfo.dev !== pathInfo.dev || openedInfo.ino !== pathInfo.ino) return {
+			ok: false,
+			reason: `Attachment '${input.attachment.name}' changed while it was being opened. Attach it again and retry.`
+		};
+		const limit = attachmentByteLimit(input.attachment);
+		if (openedInfo.size <= 0 || openedInfo.size > limit) return {
+			ok: false,
+			reason: `Attachment '${input.attachment.name}' is ${openedInfo.size} bytes; limit is ${limit} bytes.`
+		};
+		if (openedInfo.size !== input.attachment.sizeBytes) return {
+			ok: false,
+			reason: `Attachment '${input.attachment.name}' changed after upload; expected ${input.attachment.sizeBytes} bytes but found ${openedInfo.size}.`
+		};
+		const bytes = (0, node_fs.readFileSync)(descriptor);
+		const completedInfo = (0, node_fs.fstatSync)(descriptor);
+		if (completedInfo.dev !== openedInfo.dev || completedInfo.ino !== openedInfo.ino || completedInfo.size !== openedInfo.size || bytes.byteLength !== openedInfo.size) return {
+			ok: false,
+			reason: `Attachment '${input.attachment.name}' changed while it was being read. Attach it again and retry.`
+		};
+		return {
+			ok: true,
+			bytes,
+			sizeBytes: bytes.byteLength
+		};
+	} catch {
+		return {
+			ok: false,
+			reason: `Attachment '${input.attachment.name}' is missing, unreadable, or not a safe regular file.`
+		};
+	} finally {
+		if (descriptor !== void 0) (0, node_fs.closeSync)(descriptor);
+	}
+}
 function resolveAttachmentPathById(input) {
 	const normalizedId = normalizeAttachmentRelativePath(input.attachmentId);
 	if (!normalizedId || normalizedId.includes("/") || normalizedId.includes(".")) return null;
@@ -1996,7 +2054,7 @@ const authClientsRevokeOthersRouteLayer = effect_unstable_http.HttpRouter.add("P
 var ServerEnvironment = class extends effect.Context.Service()("ryco/environment/Services/ServerEnvironment") {};
 //#endregion
 //#region src/http.ts
-const PROJECT_FAVICON_CACHE_CONTROL = "public, max-age=3600";
+const PROJECT_FAVICON_CACHE_CONTROL = "private, max-age=3600";
 const PROJECT_AVATAR_MAX_BYTES = 2097152;
 const PROJECT_AVATAR_CACHE_CONTROL = "private, max-age=0, must-revalidate";
 const STATIC_INDEX_CACHE_CONTROL = "no-cache";
@@ -2010,6 +2068,19 @@ const LOOPBACK_HOSTNAMES = /* @__PURE__ */ new Set([
 	"::1",
 	"localhost"
 ]);
+const SVG_CONTENT_SECURITY_POLICY = "default-src 'none'; style-src 'unsafe-inline'; sandbox";
+const DOWNLOAD_CONTENT_SECURITY_POLICY = "default-src 'none'; sandbox";
+const INLINE_ATTACHMENT_EXTENSIONS = /* @__PURE__ */ new Set([
+	".avif",
+	".bmp",
+	".gif",
+	".ico",
+	".jpeg",
+	".jpg",
+	".png",
+	".svg",
+	".webp"
+]);
 const STATIC_CONTENT_TYPES = {
 	".css": "text/css; charset=utf-8",
 	".html": "text/html; charset=utf-8",
@@ -2054,6 +2125,33 @@ function resolveStaticCacheControl(staticRelativePath) {
 	const basename = normalized.split("/").at(-1) ?? normalized;
 	return /(?:^|[-.])[a-zA-Z0-9_-]{8,}\.[a-zA-Z0-9]+$/u.test(basename) ? STATIC_IMMUTABLE_CACHE_CONTROL : STATIC_INDEX_CACHE_CONTROL;
 }
+/** Build a download disposition with a safe ASCII fallback and UTF-8 filename. */
+function downloadContentDisposition(fileName) {
+	if (fileName === void 0) return "attachment";
+	const sanitized = fileName.toWellFormed().replace(/[\u0000-\u001f"\\]/g, "_");
+	const asciiFallback = sanitized.replace(/[^\u0020-\u007e]/g, "_");
+	const extendedName = encodeURIComponent(sanitized).replace(/['()*]/g, (character) => `%${character.charCodeAt(0).toString(16).toUpperCase()}`);
+	return `attachment; filename="${asciiFallback}"${asciiFallback === sanitized ? "" : `; filename*=UTF-8''${extendedName}`}`;
+}
+function userAssetResponseHeaders(filePath, path) {
+	const extension = path.extname(filePath).toLowerCase();
+	return {
+		"Cache-Control": "private, max-age=3600",
+		"X-Content-Type-Options": "nosniff",
+		...!INLINE_ATTACHMENT_EXTENSIONS.has(extension) ? {
+			"Content-Disposition": downloadContentDisposition(path.basename(filePath)),
+			"Content-Security-Policy": DOWNLOAD_CONTENT_SECURITY_POLICY,
+			"Content-Type": "application/octet-stream"
+		} : extension === ".svg" ? { "Content-Security-Policy": SVG_CONTENT_SECURITY_POLICY } : {}
+	};
+}
+function inlineImageResponseHeaders(filePath) {
+	return {
+		"Cache-Control": PROJECT_FAVICON_CACHE_CONTROL,
+		"X-Content-Type-Options": "nosniff",
+		...filePath.toLowerCase().endsWith(".svg") ? { "Content-Security-Policy": SVG_CONTENT_SECURITY_POLICY } : {}
+	};
+}
 function resolveStaticContentType(filePath, path) {
 	return STATIC_CONTENT_TYPES[path.extname(filePath).toLowerCase()] ?? "application/octet-stream";
 }
@@ -2116,11 +2214,13 @@ const attachmentsRouteLayer = effect_unstable_http.HttpRouter.add("GET", `${ATTA
 		relativePath: normalizedRelativePath
 	});
 	if (!filePath) return effect_unstable_http.HttpServerResponse.text(isIdLookup ? "Not Found" : "Invalid attachment path", { status: isIdLookup ? 404 : 400 });
-	const fileInfo = yield* (yield* effect.FileSystem.FileSystem).stat(filePath).pipe(effect.Effect.catch(() => effect.Effect.succeed(null)));
+	const fileSystem = yield* effect.FileSystem.FileSystem;
+	const path = yield* effect.Path.Path;
+	const fileInfo = yield* fileSystem.stat(filePath).pipe(effect.Effect.catch(() => effect.Effect.succeed(null)));
 	if (!fileInfo || fileInfo.type !== "File") return effect_unstable_http.HttpServerResponse.text("Not Found", { status: 404 });
 	return yield* effect_unstable_http.HttpServerResponse.file(filePath, {
 		status: 200,
-		headers: { "Cache-Control": "public, max-age=31536000, immutable" }
+		headers: userAssetResponseHeaders(filePath, path)
 	}).pipe(effect.Effect.catch(() => effect.Effect.succeed(effect_unstable_http.HttpServerResponse.text("Internal Server Error", { status: 500 }))));
 }).pipe(effect.Effect.catchTag("AuthError", respondToAuthError)));
 const projectFaviconRouteLayer = effect_unstable_http.HttpRouter.add("GET", "/api/project-favicon", effect.Effect.gen(function* () {
@@ -2134,11 +2234,11 @@ const projectFaviconRouteLayer = effect_unstable_http.HttpRouter.add("GET", "/ap
 	if (!faviconFilePath) return effect_unstable_http.HttpServerResponse.text(FALLBACK_PROJECT_FAVICON_SVG, {
 		status: 200,
 		contentType: "image/svg+xml",
-		headers: { "Cache-Control": PROJECT_FAVICON_CACHE_CONTROL }
+		headers: inlineImageResponseHeaders("fallback.svg")
 	});
 	return yield* effect_unstable_http.HttpServerResponse.file(faviconFilePath, {
 		status: 200,
-		headers: { "Cache-Control": PROJECT_FAVICON_CACHE_CONTROL }
+		headers: inlineImageResponseHeaders(faviconFilePath)
 	}).pipe(effect.Effect.catch(() => effect.Effect.succeed(effect_unstable_http.HttpServerResponse.text("Internal Server Error", { status: 500 }))));
 }).pipe(effect.Effect.catchTag("AuthError", respondToAuthError)));
 const AvatarFormSchema = effect_Schema.Struct({ avatar: effect_unstable_http.Multipart.SingleFileSchema });
@@ -5893,6 +5993,7 @@ const makeRuntimeSqliteLayer = effect.Effect.fn("makeRuntimeSqliteLayer")(functi
 const setup = effect.Layer.effectDiscard(effect.Effect.gen(function* () {
 	const startedAt = Date.now();
 	const sql = yield* effect_unstable_sql_SqlClient.SqlClient;
+	yield* sql`PRAGMA busy_timeout = 5000;`;
 	yield* sql`PRAGMA journal_mode = WAL;`;
 	yield* sql`PRAGMA foreign_keys = ON;`;
 	yield* runMigrations();
@@ -7901,6 +8002,31 @@ const makeGitVcsDriverCore = effect.Effect.fn("makeGitVcsDriverCore")(function*
 		}
 		const currentUpstream = yield* resolveCurrentUpstream(cwd).pipe(effect.Effect.catch(() => effect.Effect.succeed(null)));
 		if (currentUpstream) {
+			if (!(branch === currentUpstream.branchName || branch.endsWith(`/${currentUpstream.branchName}`) && currentUpstream.upstreamRef.endsWith(`/${branch}`))) {
+				const remoteName = (yield* resolvePushRemoteName(cwd, branch).pipe(effect.Effect.catch(() => effect.Effect.succeed(null)))) ?? currentUpstream.remoteName;
+				const publishBranch = yield* resolvePublishBranchName(cwd, branch);
+				if ((yield* runGitStdout("GitVcsDriver.pushCurrentBranch.readMergeBase", cwd, [
+					"config",
+					"--get",
+					`branch.${branch}.gh-merge-base`
+				], true).pipe(effect.Effect.map((stdout) => stdout.trim()))).length === 0) yield* runGit("GitVcsDriver.pushCurrentBranch.recordMergeBase", cwd, [
+					"config",
+					`branch.${branch}.gh-merge-base`,
+					currentUpstream.branchName
+				]);
+				yield* runGit("GitVcsDriver.pushCurrentBranch.pushOwnBranch", cwd, [
+					"push",
+					"-u",
+					remoteName,
+					`HEAD:refs/heads/${publishBranch}`
+				]);
+				return {
+					status: "pushed",
+					branch,
+					upstreamBranch: `${remoteName}/${publishBranch}`,
+					setUpstream: true
+				};
+			}
 			yield* runGit("GitVcsDriver.pushCurrentBranch.pushUpstream", cwd, [
 				"push",
 				currentUpstream.remoteName,
@@ -8129,6 +8255,25 @@ const makeGitVcsDriverCore = effect.Effect.fn("makeGitVcsDriverCore")(function*
 			input.refName
 		];
 		yield* executeGit("GitVcsDriver.createWorktree", input.cwd, args, { fallbackErrorMessage: "git worktree add failed" });
+		const gitmodulesPath = path.join(worktreePath, ".gitmodules");
+		if (yield* fileSystem.exists(gitmodulesPath).pipe(effect.Effect.mapError((cause) => new require_collectUint8StreamText.GitCommandError({
+			operation: "GitVcsDriver.createWorktree.inspectSubmodules",
+			command: "inspect .gitmodules",
+			cwd: worktreePath,
+			detail: `Failed to inspect ${gitmodulesPath} after creating the worktree.`,
+			cause
+		})))) {
+			const submoduleArgs = [
+				"submodule",
+				"update",
+				"--init",
+				"--recursive"
+			];
+			yield* executeGit("GitVcsDriver.createWorktree.initializeSubmodules", worktreePath, submoduleArgs, {
+				timeoutMs: 12e4,
+				fallbackErrorMessage: "git submodule initialization failed"
+			}).pipe(effect.Effect.mapError((error) => createGitCommandError("GitVcsDriver.createWorktree.initializeSubmodules", worktreePath, submoduleArgs, `The worktree was created, but its submodules could not be initialized: ${error.detail}`, error)));
+		}
 		if (input.dependencyHydration === "copyInstallDirs") yield* copyWorktreeDependencyInstallDirs({
 			cwd: input.cwd,
 			worktreePath
@@ -8193,6 +8338,15 @@ const makeGitVcsDriverCore = effect.Effect.fn("makeGitVcsDriverCore")(function*
 			fallbackErrorMessage: "git worktree remove failed"
 		}).pipe(effect.Effect.mapError((error) => createGitCommandError("GitVcsDriver.removeWorktree", input.cwd, args, `${commandLabel$1(args)} failed (cwd: ${input.cwd}): ${error.message}`, error)));
 	});
+	const pruneWorktrees = (cwd) => executeGit("GitVcsDriver.pruneWorktrees", cwd, [
+		"worktree",
+		"prune",
+		"--expire",
+		"now"
+	], {
+		timeoutMs: 1e4,
+		fallbackErrorMessage: "git worktree prune failed"
+	}).pipe(effect.Effect.asVoid);
 	const renameBranch = effect.Effect.fn("renameBranch")(function* (input) {
 		if (input.oldBranch === input.newBranch) return { branch: input.newBranch };
 		const targetBranch = yield* resolveAvailableBranchName(input.cwd, input.newBranch);
@@ -8319,6 +8473,7 @@ const makeGitVcsDriverCore = effect.Effect.fn("makeGitVcsDriverCore")(function*
 		fetchRemoteTrackingBranch,
 		setBranchUpstream,
 		removeWorktree,
+		pruneWorktrees,
 		renameBranch,
 		createRef,
 		deleteBranch,
@@ -12697,26 +12852,26 @@ const make$12 = effect.Effect.fn("makeSourceControlProviderRegistry")(function*
 	const azureDevOpsCli = yield* AzureDevOpsCli;
 	const fileSystem = yield* effect.FileSystem.FileSystem;
 	const github = yield* makeLazyProvider("github", effect.Effect.tryPromise({
-		try: () => Promise.resolve().then(() => require("./GitHubSourceControlProvider-DfFR9O2o.cjs")),
+		try: () => Promise.resolve().then(() => require("./GitHubSourceControlProvider-CrYNFu8S.cjs")),
 		catch: (cause) => providerLoadError("github", cause)
 	}).pipe(effect.Effect.flatMap((module) => module.make()), effect.Effect.provideService(GitHubCli, githubCli), effect.Effect.provideService(effect.FileSystem.FileSystem, fileSystem)));
 	const gitlab = yield* makeLazyProvider("gitlab", effect.Effect.tryPromise({
-		try: () => Promise.resolve().then(() => require("./GitLabSourceControlProvider-DGoelNmL.cjs")),
+		try: () => Promise.resolve().then(() => require("./GitLabSourceControlProvider-jbX5M34A.cjs")),
 		catch: (cause) => providerLoadError("gitlab", cause)
 	}).pipe(effect.Effect.flatMap((module) => module.make()), effect.Effect.provideService(GitLabCli, gitlabCli)));
 	const bitbucket = yield* makeLazyProvider("bitbucket", effect.Effect.tryPromise({
-		try: () => Promise.resolve().then(() => require("./BitbucketSourceControlProvider-CEZEd4PX.cjs")),
+		try: () => Promise.resolve().then(() => require("./BitbucketSourceControlProvider-3VHGKSl1.cjs")),
 		catch: (cause) => providerLoadError("bitbucket", cause)
 	}).pipe(effect.Effect.flatMap((module) => module.make()), effect.Effect.provideService(BitbucketApi, bitbucketApi)), {
 		searchRepositories: true,
 		cloneAuthentication: true
 	});
 	const forgejo = yield* makeLazyProvider("forgejo", effect.Effect.tryPromise({
-		try: () => Promise.resolve().then(() => require("./ForgejoSourceControlProvider-CzmmcAZO.cjs")),
+		try: () => Promise.resolve().then(() => require("./ForgejoSourceControlProvider-CJLksvL_.cjs")),
 		catch: (cause) => providerLoadError("forgejo", cause)
 	}).pipe(effect.Effect.flatMap((module) => module.make()), effect.Effect.provideService(ForgejoApi, forgejoApi)));
 	const azureDevOps = yield* makeLazyProvider("azure-devops", effect.Effect.tryPromise({
-		try: () => Promise.resolve().then(() => require("./AzureDevOpsSourceControlProvider-CVj-F-pW.cjs")),
+		try: () => Promise.resolve().then(() => require("./AzureDevOpsSourceControlProvider-Dyu8KQ_S.cjs")),
 		catch: (cause) => providerLoadError("azure-devops", cause)
 	}).pipe(effect.Effect.flatMap((module) => module.make()), effect.Effect.provideService(AzureDevOpsCli, azureDevOpsCli)));
 	const bitbucketDiscovery = require_SourceControlProviderDiscoveryCatalog.makeBitbucketDiscovery(bitbucketApi);
@@ -12955,6 +13110,11 @@ const DEFAULT_KEYBINDINGS = [
 		command: "thread.find",
 		when: "!terminalFocus"
 	},
+	{
+		key: "mod+alt+p",
+		command: "thread.pinToggle",
+		when: "!terminalFocus"
+	},
 	{
 		key: "mod+shift+[",
 		command: "thread.previous"
@@ -14541,7 +14701,8 @@ const ServerNotification__SpendControlLimitSnapshot = effect_Schema.Struct({
 const ServerNotification__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const ServerNotification__TerminalInteractionNotification = effect_Schema.Struct({
 	itemId: effect_Schema.String,
@@ -15428,7 +15589,8 @@ const V2ItemCompletedNotification__ReasoningEffort = effect_Schema.String.annota
 const V2ItemCompletedNotification__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2ItemCompletedNotification__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -15612,7 +15774,8 @@ const V2ItemStartedNotification__ReasoningEffort = effect_Schema.String.annotate
 const V2ItemStartedNotification__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2ItemStartedNotification__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -16107,7 +16270,8 @@ const V2ReviewStartResponse__ReasoningEffort = effect_Schema.String.annotate({ d
 const V2ReviewStartResponse__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2ReviewStartResponse__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -16292,7 +16456,8 @@ const V2ThreadForkResponse__ReasoningEffort = effect_Schema.String.annotate({ de
 const V2ThreadForkResponse__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2ThreadForkResponse__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -16474,7 +16639,8 @@ const V2ThreadListResponse__ReasoningEffort = effect_Schema.String.annotate({ de
 const V2ThreadListResponse__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2ThreadListResponse__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -16610,7 +16776,8 @@ const V2ThreadMetadataUpdateResponse__ReasoningEffort = effect_Schema.String.ann
 const V2ThreadMetadataUpdateResponse__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2ThreadMetadataUpdateResponse__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -16741,7 +16908,8 @@ const V2ThreadReadResponse__ReasoningEffort = effect_Schema.String.annotate({ de
 const V2ThreadReadResponse__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2ThreadReadResponse__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -16983,7 +17151,8 @@ const V2ThreadResumeResponse__ReasoningEffort = effect_Schema.String.annotate({
 const V2ThreadResumeResponse__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2ThreadResumeResponse__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -17114,7 +17283,8 @@ const V2ThreadRollbackResponse__ReasoningEffort = effect_Schema.String.annotate(
 const V2ThreadRollbackResponse__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2ThreadRollbackResponse__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -17278,7 +17448,8 @@ const V2ThreadStartedNotification__ReasoningEffort = effect_Schema.String.annota
 const V2ThreadStartedNotification__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2ThreadStartedNotification__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -17456,7 +17627,8 @@ const V2ThreadStartResponse__ReasoningEffort = effect_Schema.String.annotate({ d
 const V2ThreadStartResponse__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2ThreadStartResponse__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -17599,7 +17771,8 @@ const V2ThreadUnarchiveResponse__ReasoningEffort = effect_Schema.String.annotate
 const V2ThreadUnarchiveResponse__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2ThreadUnarchiveResponse__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -17729,7 +17902,8 @@ const V2TurnCompletedNotification__ReasoningEffort = effect_Schema.String.annota
 const V2TurnCompletedNotification__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2TurnCompletedNotification__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -17856,7 +18030,8 @@ const V2TurnStartedNotification__ReasoningEffort = effect_Schema.String.annotate
 const V2TurnStartedNotification__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2TurnStartedNotification__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -18022,7 +18197,8 @@ const V2TurnStartResponse__ReasoningEffort = effect_Schema.String.annotate({ des
 const V2TurnStartResponse__SubAgentActivityKind = effect_Schema.Literals([
 	"started",
 	"interacted",
-	"interrupted"
+	"interrupted",
+	"completed"
 ]);
 const V2TurnStartResponse__TextElement = effect_Schema.Struct({
 	byteRange: effect_Schema.Struct({
@@ -21933,14 +22109,19 @@ const ServerNotification__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -22338,14 +22519,19 @@ const V2ItemCompletedNotification__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -22532,14 +22718,19 @@ const V2ItemStartedNotification__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -22775,14 +22966,19 @@ const V2ReviewStartResponse__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -22956,14 +23152,19 @@ const V2ThreadForkResponse__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -23127,14 +23328,19 @@ const V2ThreadListResponse__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -23298,14 +23504,19 @@ const V2ThreadMetadataUpdateResponse__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -23469,14 +23680,19 @@ const V2ThreadReadResponse__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -23641,14 +23857,19 @@ const V2ThreadResumeResponse__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -23812,14 +24033,19 @@ const V2ThreadRollbackResponse__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -23987,14 +24213,19 @@ const V2ThreadStartedNotification__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -24158,14 +24389,19 @@ const V2ThreadStartResponse__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -24329,14 +24565,19 @@ const V2ThreadUnarchiveResponse__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -24500,14 +24741,19 @@ const V2TurnCompletedNotification__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -24671,14 +24917,19 @@ const V2TurnStartedNotification__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -24842,14 +25093,19 @@ const V2TurnStartResponse__ThreadItem = effect_Schema.Union([
 		status: effect_Schema.Literals([
 			"inProgress",
 			"completed",
-			"failed"
+			"failed",
+			"interrupted"
 		]).annotate({ description: "Current status of the collab tool call." }),
 		tool: effect_Schema.Literals([
 			"spawnAgent",
 			"sendInput",
 			"resumeAgent",
 			"wait",
-			"closeAgent"
+			"closeAgent",
+			"sendMessage",
+			"followupTask",
+			"interruptAgent",
+			"listAgents"
 		]).annotate({ description: "Name of the collab tool that was invoked." }),
 		type: effect_Schema.Literal("collabAgentToolCall").annotate({ title: "CollabAgentToolCallThreadItemType" })
 	}).annotate({ title: "CollabAgentToolCallThreadItem" }),
@@ -28107,12 +28363,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals(["stdout", "stderr"]).annotate({ description: "Stream label for `command/exec/outputDelta` notifications." });
 effect_Schema.Literals([
@@ -28836,12 +29097,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -28902,12 +29168,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -29264,12 +29535,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -29400,12 +29676,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -29511,12 +29792,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -29576,12 +29862,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -29634,12 +29925,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -29928,12 +30224,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -30062,12 +30363,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -30178,12 +30484,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -30328,12 +30639,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -30409,12 +30725,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -30464,12 +30785,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -30519,12 +30845,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -30581,12 +30912,17 @@ effect_Schema.Literals([
 	"sendInput",
 	"resumeAgent",
 	"wait",
-	"closeAgent"
+	"closeAgent",
+	"sendMessage",
+	"followupTask",
+	"interruptAgent",
+	"listAgents"
 ]);
 effect_Schema.Literals([
 	"inProgress",
 	"completed",
-	"failed"
+	"failed",
+	"interrupted"
 ]);
 effect_Schema.Literals([
 	"agent",
@@ -31190,7 +31526,10 @@ const makeCodexAppServerPatchedProtocol = effect_Effect.fn("makeCodexAppServerPa
 	const incomingRequests = yield* options.onRequest ? effect_Queue.sliding(PROTOCOL_QUEUE_CAPACITY) : effect_Queue.bounded(PROTOCOL_QUEUE_CAPACITY);
 	const pending = yield* effect_Ref.make(/* @__PURE__ */ new Map());
 	const nextRequestId = yield* effect_Ref.make(1);
-	const remainder = yield* effect_Ref.make("");
+	const remainder = {
+		fragments: [],
+		byteLength: 0
+	};
 	const terminationHandled = yield* effect_Ref.make(false);
 	const logProtocol = (event) => {
 		if (event.direction === "incoming" && !options.logIncoming) return effect_Effect.void;
@@ -31289,19 +31628,39 @@ const makeCodexAppServerPatchedProtocol = effect_Effect.fn("makeCodexAppServerPa
 			}
 		})), effect_Effect.flatMap(routeMessage));
 	};
-	yield* options.stdio.stdin.pipe(effect_Stream.decodeText(), effect_Stream.runForEach((chunk) => effect_Ref.modify(remainder, (current) => {
-		const lines = (current + chunk).split("\n");
-		const nextRemainder = lines.pop() ?? "";
-		return [{
-			lines: lines.map((line) => line.replace(/\r$/, "")),
-			remainderBytes: new TextEncoder().encode(nextRemainder).byteLength
-		}, nextRemainder];
-	}).pipe(effect_Effect.flatMap(({ lines, remainderBytes }) => remainderBytes > PROTOCOL_MAX_FRAME_BYTES ? effect_Effect.fail(new CodexAppServerProtocolOverloadedError({
-		queue: "incoming-frame-bytes",
-		capacity: PROTOCOL_MAX_FRAME_BYTES
-	})) : effect_Effect.forEach(lines, handleLine, { discard: true })))), effect_Effect.matchEffect({
+	yield* options.stdio.stdin.pipe(effect_Stream.decodeText(), effect_Stream.runForEach((chunk) => effect_Effect.gen(function* () {
+		const lines = [];
+		let start = 0;
+		for (let newline = chunk.indexOf("\n"); newline !== -1; newline = chunk.indexOf("\n", start)) {
+			const fragment = chunk.slice(start, newline);
+			if (remainder.byteLength + new TextEncoder().encode(fragment).byteLength > PROTOCOL_MAX_FRAME_BYTES) return yield* effect_Effect.fail(new CodexAppServerProtocolOverloadedError({
+				queue: "incoming-frame-bytes",
+				capacity: PROTOCOL_MAX_FRAME_BYTES
+			}));
+			remainder.fragments.push(fragment);
+			lines.push(remainder.fragments.join("").replace(/\r$/, ""));
+			remainder.fragments.length = 0;
+			remainder.byteLength = 0;
+			start = newline + 1;
+		}
+		if (start < chunk.length) {
+			const fragment = chunk.slice(start);
+			remainder.byteLength += new TextEncoder().encode(fragment).byteLength;
+			if (remainder.byteLength > PROTOCOL_MAX_FRAME_BYTES) return yield* effect_Effect.fail(new CodexAppServerProtocolOverloadedError({
+				queue: "incoming-frame-bytes",
+				capacity: PROTOCOL_MAX_FRAME_BYTES
+			}));
+			remainder.fragments.push(fragment);
+		}
+		yield* effect_Effect.forEach(lines, handleLine, { discard: true });
+	})), effect_Effect.matchEffect({
 		onFailure: (error) => handleTermination(() => effect_Effect.succeed(normalizeProtocolError(error, "Codex App Server input stream failed"))),
-		onSuccess: () => effect_Ref.get(remainder).pipe(effect_Effect.flatMap((line) => line.trim().length === 0 ? effect_Effect.void : handleLine(line)), effect_Effect.matchEffect({
+		onSuccess: () => effect_Effect.sync(() => {
+			const line = remainder.fragments.join("");
+			remainder.fragments.length = 0;
+			remainder.byteLength = 0;
+			return line;
+		}).pipe(effect_Effect.flatMap((line) => line.trim().length === 0 ? effect_Effect.void : handleLine(line)), effect_Effect.matchEffect({
 			onFailure: (error) => handleTermination(() => effect_Effect.succeed(error)),
 			onSuccess: () => handleTermination(() => options.terminationError ?? effect_Effect.succeed(new CodexAppServerTransportError({
 				detail: "Codex App Server input stream ended",
@@ -32409,7 +32768,7 @@ const DEVICE_TOOL_DEFINITIONS = [
 		}
 	}
 ];
-function asRecord$5(value) {
+function asRecord$6(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error("Tool arguments must be a JSON object.");
 	return value;
 }
@@ -32632,7 +32991,7 @@ async function startDeviceToolGateway(manager) {
 			if (typeof method !== "string") return json(response, 400, mcpError$1(id, -32600, "Missing method."));
 			if (method === "notifications/initialized" || method === "notifications/cancelled") return empty(response, 202);
 			if (method === "initialize") {
-				const requested = asRecord$5(message.params ?? {}).protocolVersion;
+				const requested = asRecord$6(message.params ?? {}).protocolVersion;
 				return json(response, 200, mcpSuccess(id, {
 					protocolVersion: typeof requested === "string" ? requested : "2025-06-18",
 					capabilities: { tools: { listChanged: false } },
@@ -32652,7 +33011,7 @@ async function startDeviceToolGateway(manager) {
 					text: "Device tools are only available during an active Ryco turn."
 				}]
 			}));
-			const params = asRecord$5(message.params ?? {});
+			const params = asRecord$6(message.params ?? {});
 			const name = params.name;
 			if (typeof name !== "string" || !DEVICE_TOOL_NAMES.includes(name)) return json(response, 200, mcpError$1(id, -32602, "Unknown device tool."));
 			if (agentControlBlocksLegacyTool(binding.threadId, name)) return json(response, 200, mcpSuccess(id, {
@@ -32667,7 +33026,7 @@ async function startDeviceToolGateway(manager) {
 					manager,
 					threadId: binding.threadId,
 					name,
-					args: asRecord$5(params.arguments ?? {})
+					args: asRecord$6(params.arguments ?? {})
 				});
 				return json(response, 200, mcpSuccess(id, { content: value && typeof value === "object" && "_mcpContent" in value ? value._mcpContent : [{
 					type: "text",
@@ -32966,7 +33325,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: require_collectUint8StreamText.CodexSettings,
 		defaultConfig: () => effect.Schema.decodeSync(require_collectUint8StreamText.CodexSettings)({}),
 		create: (input) => effect.Effect.tryPromise({
-			try: () => Promise.resolve().then(() => require("./CodexDriver-CZCIJSLV.cjs")),
+			try: () => Promise.resolve().then(() => require("./CodexDriver-3TZPgrGk.cjs")),
 			catch: (cause) => driverImportError(codexDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ CodexDriver }) => CodexDriver.create(input)))
 	},
@@ -32980,7 +33339,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: require_collectUint8StreamText.ClaudeSettings,
 		defaultConfig: () => effect.Schema.decodeSync(require_collectUint8StreamText.ClaudeSettings)({}),
 		create: (input) => effect.Effect.tryPromise({
-			try: () => Promise.resolve().then(() => require("./ClaudeDriver-lBU7EyUX.cjs")),
+			try: () => Promise.resolve().then(() => require("./ClaudeDriver-CBCy0_WX.cjs")),
 			catch: (cause) => driverImportError(claudeDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ ClaudeDriver }) => ClaudeDriver.create(input)))
 	},
@@ -32994,7 +33353,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: require_collectUint8StreamText.CopilotSettings,
 		defaultConfig: () => effect.Schema.decodeSync(require_collectUint8StreamText.CopilotSettings)({}),
 		create: (input) => effect.Effect.tryPromise({
-			try: () => Promise.resolve().then(() => require("./CopilotDriver-CX5zhEdZ.cjs")),
+			try: () => Promise.resolve().then(() => require("./CopilotDriver-C7a8IhyK.cjs")),
 			catch: (cause) => driverImportError(copilotDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ CopilotDriver }) => CopilotDriver.create(input)))
 	},
@@ -33008,7 +33367,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: require_collectUint8StreamText.CursorSettings,
 		defaultConfig: () => effect.Schema.decodeSync(require_collectUint8StreamText.CursorSettings)({}),
 		create: (input) => effect.Effect.tryPromise({
-			try: () => Promise.resolve().then(() => require("./CursorDriver-CPBVeesr.cjs")),
+			try: () => Promise.resolve().then(() => require("./CursorDriver-uNsDetA3.cjs")),
 			catch: (cause) => driverImportError(cursorDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ CursorDriver }) => CursorDriver.create(input)))
 	},
@@ -33022,7 +33381,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: require_collectUint8StreamText.GrokSettings,
 		defaultConfig: () => effect.Schema.decodeSync(require_collectUint8StreamText.GrokSettings)({}),
 		create: (input) => effect.Effect.tryPromise({
-			try: () => Promise.resolve().then(() => require("./GrokDriver-CIXj_4ry.cjs")),
+			try: () => Promise.resolve().then(() => require("./GrokDriver-BJ00ZiYg.cjs")),
 			catch: (cause) => driverImportError(grokDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ GrokDriver }) => GrokDriver.create(input)))
 	},
@@ -33036,7 +33395,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: require_collectUint8StreamText.OpenCodeSettings,
 		defaultConfig: () => effect.Schema.decodeSync(require_collectUint8StreamText.OpenCodeSettings)({}),
 		create: (input) => effect.Effect.tryPromise({
-			try: () => Promise.resolve().then(() => require("./OpenCodeDriver-DDEuwtXl.cjs")),
+			try: () => Promise.resolve().then(() => require("./OpenCodeDriver-BTxd2Q3Q.cjs")),
 			catch: (cause) => driverImportError(openCodeDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ OpenCodeDriver }) => OpenCodeDriver.create(input)))
 	}
@@ -33751,7 +34110,7 @@ const scopedSafeTeardown = (label) => (effect$28) => effect.Effect.gen(function*
 });
 //#endregion
 //#region package.json
-var version$1 = "0.1.13";
+var version$1 = "0.1.15";
 //#endregion
 //#region src/provider/Layers/CodexProvider.ts
 const PROVIDER_PROBE_TIMEOUT_MS = 8e3;
@@ -34236,7 +34595,7 @@ function sortProviderSupport(left, right) {
 	};
 	return statusRank[left.status] - statusRank[right.status] || Number(right.enabled) - Number(left.enabled) || left.driver.localeCompare(right.driver) || left.instanceId.localeCompare(right.instanceId);
 }
-function asRecord$4(value) {
+function asRecord$5(value) {
 	if (value === null || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
 }
@@ -34244,7 +34603,7 @@ function asStringArray(value) {
 	return Array.isArray(value) ? value.filter((entry) => typeof entry === "string") : [];
 }
 function asStringRecord(value) {
-	const record = asRecord$4(value);
+	const record = asRecord$5(value);
 	if (!record) return {};
 	const entries = Object.entries(record).filter((entry) => {
 		const [, entryValue] = entry;
@@ -34269,7 +34628,7 @@ function asOptionalNumber(value) {
 	return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
 function sourceFromOrigin(origin) {
-	const type = asRecord$4(asRecord$4(origin)?.name)?.type;
+	const type = asRecord$5(asRecord$5(origin)?.name)?.type;
 	if (type === "user" || type === "project" || type === "system") return type;
 	if (type === "mdm") return "managed";
 	return "unknown";
@@ -34289,13 +34648,13 @@ function collectLayerServers(layers) {
 	if (!layers) return [];
 	const layerServers = [];
 	for (const layer of layers) {
-		const servers = asRecord$4(asRecord$4(layer.config)?.mcp_servers);
+		const servers = asRecord$5(asRecord$5(layer.config)?.mcp_servers);
 		if (servers) layerServers.push(servers);
 	}
 	return layerServers;
 }
 function decodeServerConfig(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	if (!record) return effect.Schema.decodeSync(require_collectUint8StreamText.McpServerConfig)({ transport: "unknown" });
 	const input = {
 		transport: typeof record.url === "string" ? "http" : typeof record.command === "string" ? "stdio" : "unknown",
@@ -34412,15 +34771,15 @@ function toStartupStatus(config, status) {
 }
 function extractConfigPath(layers) {
 	const userLayer = layers?.find((layer) => {
-		const name = asRecord$4(layer.name);
+		const name = asRecord$5(layer.name);
 		return name?.type === "user" && typeof name.file === "string";
 	});
-	const file = asRecord$4(userLayer?.name)?.file;
+	const file = asRecord$5(userLayer?.name)?.file;
 	return typeof file === "string" ? file : void 0;
 }
 function buildServers(input) {
 	const configRecord = input.configResponse.config;
-	const configuredServers = asRecord$4(configRecord.mcp_servers) ?? {};
+	const configuredServers = asRecord$5(configRecord.mcp_servers) ?? {};
 	const statusByName = new Map(input.statuses.map((status) => [status.name, status]));
 	const names = [.../* @__PURE__ */ new Set([...Object.keys(configuredServers), ...statusByName.keys()])].toSorted((left, right) => left.localeCompare(right));
 	const layerServers = collectLayerServers(input.configResponse.layers);
@@ -34645,7 +35004,7 @@ const makeCodexMcpService = effect.Effect.gen(function* () {
 				cwd: serverConfig.cwd,
 				includeLayers: false
 			})).config;
-			const config = mergeServerSecrets((asRecord$4(configRecord.mcp_servers) ?? {})[input.name], input);
+			const config = mergeServerSecrets((asRecord$5(configRecord.mcp_servers) ?? {})[input.name], input);
 			return yield* client.request("config/batchWrite", {
 				edits: [{
 					keyPath: `mcp_servers.${input.name}`,
@@ -37158,6 +37517,20 @@ const OpenLive = effect.Layer.effect(Open, make$10);
 */
 var OrchestrationEngineService = class extends effect.Context.Service()("ryco/orchestration/Services/OrchestrationEngine/OrchestrationEngineService") {};
 //#endregion
+//#region src/orchestration/Services/ThreadDeletionReactor.ts
+/**
+* ThreadDeletionReactor - Thread deletion cleanup reactor service interface.
+*
+* Owns background workers that react to thread deletion domain events and
+* perform best-effort runtime cleanup for provider sessions and terminals.
+*
+* @module ThreadDeletionReactor
+*/
+/**
+* ThreadDeletionReactor - Service tag for thread deletion cleanup workers.
+*/
+var ThreadDeletionReactor = class extends effect.Context.Service()("ryco/orchestration/Services/ThreadDeletionReactor") {};
+//#endregion
 //#region src/orchestration/Services/ContextHandoffInspection.ts
 var ContextHandoffInspection = class extends effect.Context.Service()("ryco/orchestration/Services/ContextHandoffInspection") {};
 //#endregion
@@ -38703,6 +39076,9 @@ var WorkspaceAccessPolicy = class extends effect.Context.Service()("ryco/workspa
 //#region src/provider/Services/ProviderSessionReaper.ts
 var ProviderSessionReaper = class extends effect.Context.Service()("ryco/provider/Services/ProviderSessionReaper") {};
 //#endregion
+//#region src/provider/Services/ProviderSessionDirectory.ts
+var ProviderSessionDirectory = class extends effect.Context.Service()("ryco/provider/Services/ProviderSessionDirectory") {};
+//#endregion
 //#region ../../packages/shared/src/qrCode.ts
 var QrCode = class QrCode {
 	static Ecc;
@@ -39917,6 +40293,86 @@ const validateRestrictedWorkspaceSnapshot = (snapshot) => effect.Effect.gen(func
 		operation: "persisted worktree startup validation"
 	}), { discard: true });
 }).pipe(effect.Effect.mapError(incompatibleWorkspaceStateError));
+const ORPHANED_PROVIDER_SESSION_ERROR = "Provider session did not survive a server restart. Send a new message to continue.";
+function clearRuntimePayloadActiveTurn(runtimePayload) {
+	if (typeof runtimePayload === "object" && runtimePayload !== null && !Array.isArray(runtimePayload)) return {
+		...runtimePayload,
+		activeTurnId: null
+	};
+	return { activeTurnId: null };
+}
+/**
+* Settle projected provider sessions whose native process did not survive this
+* server process. This runs after the provider/orchestration roots subscribe,
+* but before the startup command gate opens, so repaired state is authoritative
+* before clients can mutate it.
+*/
+const reconcileOrphanedProviderSessions = effect.Effect.gen(function* () {
+	const directory = yield* ProviderSessionDirectory;
+	const orchestrationEngine = yield* OrchestrationEngineService;
+	const providerService = yield* ProviderService;
+	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
+	const liveSessionsExit = yield* effect.Effect.exit(providerService.listSessions());
+	if (effect.Exit.isFailure(liveSessionsExit)) {
+		if (effect.Cause.hasInterrupts(liveSessionsExit.cause)) return yield* effect.Effect.failCause(liveSessionsExit.cause);
+		yield* effect.Effect.logWarning("provider session startup inventory failed", { cause: effect.Cause.pretty(liveSessionsExit.cause) });
+		return;
+	}
+	const liveThreadIds = new Set(liveSessionsExit.value.map((session) => session.threadId));
+	const orphanedThreads = (yield* projectionSnapshotQuery.getCommandReadModel()).threads.filter((thread) => thread.session !== null && (thread.session.status === "starting" || thread.session.status === "running" || thread.session.activeTurnId !== null) && !liveThreadIds.has(thread.id));
+	for (const thread of orphanedThreads) {
+		const session = thread.session;
+		if (session === null) continue;
+		yield* effect.Effect.gen(function* () {
+			const binding = yield* directory.getBinding(thread.id);
+			if (effect.Option.isNone(binding)) return;
+			yield* providerService.stopSessionBinding(binding.value).pipe(effect.Effect.catchCause((cause) => effect.Cause.hasInterrupts(cause) ? effect.Effect.failCause(cause) : effect.Effect.logWarning("failed to stop orphaned provider runtime binding", {
+				threadId: thread.id,
+				cause: effect.Cause.pretty(cause)
+			})));
+			yield* directory.upsert({
+				...binding.value,
+				status: "stopped",
+				runtimePayload: clearRuntimePayloadActiveTurn(binding.value.runtimePayload)
+			});
+		}).pipe(effect.Effect.catchCause((cause) => effect.Cause.hasInterrupts(cause) ? effect.Effect.failCause(cause) : effect.Effect.logWarning("failed to reconcile orphaned provider session binding", {
+			threadId: thread.id,
+			cause: effect.Cause.pretty(cause)
+		})));
+		const reconciledAt = (/* @__PURE__ */ new Date()).toISOString();
+		if (session.activeTurnId !== null) {
+			const interruptCommand = {
+				type: "thread.turn.interrupt",
+				commandId: require_collectUint8StreamText.CommandId.make(`provider:startup-reconciliation:turn-interrupt:${crypto.randomUUID()}`),
+				threadId: thread.id,
+				turnId: session.activeTurnId,
+				createdAt: reconciledAt
+			};
+			yield* effect.Effect.suspend(() => orchestrationEngine.dispatch(interruptCommand)).pipe(effect.Effect.retry(effect.Schedule.recurs(1)), effect.Effect.catchCause((cause) => effect.Cause.hasInterrupts(cause) ? effect.Effect.failCause(cause) : effect.Effect.logWarning("failed to settle orphaned provider turn projection", {
+				threadId: thread.id,
+				turnId: session.activeTurnId,
+				cause: effect.Cause.pretty(cause)
+			})));
+		}
+		const sessionCommand = {
+			type: "thread.session.set",
+			commandId: require_collectUint8StreamText.CommandId.make(`server:startup-reconciliation:${crypto.randomUUID()}`),
+			threadId: thread.id,
+			session: {
+				...session,
+				status: "error",
+				activeTurnId: null,
+				lastError: ORPHANED_PROVIDER_SESSION_ERROR,
+				updatedAt: reconciledAt
+			},
+			createdAt: reconciledAt
+		};
+		yield* effect.Effect.suspend(() => orchestrationEngine.dispatch(sessionCommand)).pipe(effect.Effect.retry(effect.Schedule.recurs(1)), effect.Effect.catchCause((cause) => effect.Cause.hasInterrupts(cause) ? effect.Effect.failCause(cause) : effect.Effect.logWarning("failed to settle orphaned provider session projection", {
+			threadId: thread.id,
+			cause: effect.Cause.pretty(cause)
+		})));
+	}
+}).pipe(effect.Effect.catchCause((cause) => effect.Cause.hasInterrupts(cause) ? effect.Effect.failCause(cause) : effect.Effect.logWarning("provider session startup reconciliation failed", { cause: effect.Cause.pretty(cause) })));
 const makeServerRuntimeStartup = effect.Effect.gen(function* () {
 	const runtimeStartedAt = Date.now();
 	const serverConfig = yield* require_Metrics.ServerConfig;
@@ -39951,6 +40407,8 @@ const makeServerRuntimeStartup = effect.Effect.gen(function* () {
 			concurrency: "unbounded",
 			discard: true
 		}));
+		yield* effect.Effect.logDebug("startup phase: reconciling orphaned provider sessions");
+		yield* runStartupPhase("provider-sessions.reconcile", reconcileOrphanedProviderSessions);
 		const welcomeBase = yield* resolveWelcomeBase;
 		const environment = yield* serverEnvironment.getDescriptor;
 		yield* effect.Effect.logDebug("startup phase: preparing welcome payload");
@@ -41035,17 +41493,40 @@ const makeGitManager = effect.Effect.fn("makeGitManager")(function* () {
 		timeToLive: (exit) => effect.Exit.isSuccess(exit) ? STATUS_RESULT_CACHE_TTL : effect.Duration.zero
 	});
 	const invalidateLocalStatusResultCache = (cwd) => normalizeStatusCacheKey(cwd).pipe(effect.Effect.flatMap((cacheKey) => effect.Cache.invalidate(localStatusResultCache, cacheKey)));
+	const probeBranchPublished = effect.Effect.fn("probeBranchPublished")(function* (cwd, branch, upstreamRef) {
+		if (upstreamRef !== null) return true;
+		return yield* effect.Effect.gen(function* () {
+			const remotes = (yield* gitCore.execute({
+				operation: "GitManager.probeBranchPublished.remotes",
+				cwd,
+				args: ["remote"]
+			})).stdout.split("\n").map((remote) => remote.trim()).filter((remote) => remote.length > 0);
+			if (remotes.length === 0) return null;
+			const refsResult = yield* gitCore.execute({
+				operation: "GitManager.probeBranchPublished.remoteRefs",
+				cwd,
+				args: [
+					"for-each-ref",
+					"--format=%(refname:short)",
+					"refs/remotes"
+				]
+			});
+			const remoteRefs = new Set(refsResult.stdout.split("\n").map((ref) => ref.trim()).filter((ref) => ref.length > 0));
+			return remotes.some((remote) => remoteRefs.has(`${remote}/${branch}`));
+		}).pipe(effect.Effect.catch(() => effect.Effect.succeed(null)));
+	});
 	const readRemoteStatus = effect.Effect.fn("readRemoteStatus")(function* (cwd) {
 		const details = yield* gitCore.statusDetails(cwd).pipe(effect.Effect.catchIf(isNotGitRepositoryError, () => effect.Effect.succeed(null)));
 		if (details === null || !details.isRepo) return null;
-		const pr = details.branch !== null ? yield* findLatestPr(cwd, {
+		const shouldQueryPullRequests = details.branch === null ? false : (yield* probeBranchPublished(cwd, details.branch, details.upstreamRef)) ?? true;
+		const pr = details.branch !== null && shouldQueryPullRequests ? yield* findLatestPr(cwd, {
 			branch: details.branch,
 			upstreamRef: details.upstreamRef
 		}).pipe(effect.Effect.map((latest) => {
 			if (!latest) return null;
 			if (details.isDefaultBranch && latest.state !== "open") return null;
 			return toStatusPr(latest);
-		}), effect.Effect.catch(() => effect.Effect.succeed(null))) : null;
+		})) : null;
 		return {
 			hasUpstream: details.hasUpstream,
 			aheadCount: details.aheadCount,
@@ -41707,6 +42188,7 @@ const make$9 = effect.Effect.fn("makeGitWorkflowService")(function* () {
 		listRefs: (input) => detectGitRepositoryForCommand("GitWorkflowService.listRefs", input.cwd).pipe(effect.Effect.flatMap((isGitRepository) => isGitRepository ? git.listRefs(input).pipe(effect.Effect.catch(recoverMissingCwd(input.cwd, nonRepositoryListRefs()))) : effect.Effect.succeed(nonRepositoryListRefs()))),
 		createWorktree: (input) => ensureGitCommand("GitWorkflowService.createWorktree", input.cwd).pipe(effect.Effect.andThen(git.createWorktree(input))),
 		removeWorktree: (input) => ensureGitCommand("GitWorkflowService.removeWorktree", input.cwd).pipe(effect.Effect.andThen(git.removeWorktree(input))),
+		pruneWorktrees: (cwd) => ensureGitCommand("GitWorkflowService.pruneWorktrees", cwd).pipe(effect.Effect.andThen(git.pruneWorktrees(cwd))),
 		listWorktreePaths: (cwd) => {
 			const empty = [];
 			return detectGitRepositoryForCommand("GitWorkflowService.listWorktreePaths", cwd).pipe(effect.Effect.flatMap((isGitRepository) => isGitRepository ? git.listWorktreePaths(cwd).pipe(effect.Effect.catch(recoverMissingCwd(cwd, empty))) : effect.Effect.succeed(empty)));
@@ -44882,6 +45364,7 @@ const makeWsRpcContext = (principal) => effect.Effect.gen(function* () {
 	const usageServiceOption = yield* effect.Effect.serviceOption(UsageService);
 	const usageService = effect.Option.getOrElse(usageServiceOption, () => UsageServiceTest);
 	const orchestrationEngine = yield* OrchestrationEngineService;
+	const threadDeletionReactor = yield* ThreadDeletionReactor;
 	const contextHandoffInspection = yield* effect.Effect.serviceOption(ContextHandoffInspection);
 	const threadPriorityCoordinator = yield* effect.Effect.serviceOption(ThreadPriorityCoordinator);
 	const agentControlProposals = yield* effect.Effect.serviceOption(AgentControlProposalService);
@@ -45099,7 +45582,7 @@ const makeWsRpcContext = (principal) => effect.Effect.gen(function* () {
 		})() : effect.Effect.void;
 		return yield* effect.Effect.gen(function* () {
 			if (bootstrap?.createThread) {
-				yield* orchestrationEngine.dispatch({
+				const created = yield* orchestrationEngine.dispatch({
 					type: "thread.create",
 					commandId: serverCommandId("bootstrap-thread-create"),
 					threadId: command.threadId,
@@ -45112,6 +45595,7 @@ const makeWsRpcContext = (principal) => effect.Effect.gen(function* () {
 					worktreePath: bootstrap.createThread.worktreePath,
 					createdAt: bootstrap.createThread.createdAt
 				});
+				yield* threadDeletionReactor.drainThrough(created.sequence);
 				createdThread = true;
 			}
 			if (bootstrap?.prepareWorktree) {
@@ -45148,7 +45632,7 @@ const makeWsRpcContext = (principal) => effect.Effect.gen(function* () {
 		}));
 	});
 	const dispatchNormalizedCommand = (normalizedCommand) => {
-		const dispatchEffect = normalizedCommand.type === "thread.turn.start" && normalizedCommand.bootstrap ? dispatchBootstrapTurnStart(normalizedCommand) : orchestrationEngine.dispatch(normalizedCommand).pipe(effect.Effect.mapError((cause) => toDispatchCommandError(cause, "Failed to dispatch orchestration command")));
+		const dispatchEffect = normalizedCommand.type === "thread.turn.start" && normalizedCommand.bootstrap ? dispatchBootstrapTurnStart(normalizedCommand) : orchestrationEngine.dispatch(normalizedCommand).pipe(effect.Effect.tap(({ sequence }) => normalizedCommand.type === "thread.create" ? threadDeletionReactor.drainThrough(sequence) : effect.Effect.void), effect.Effect.mapError((cause) => toDispatchCommandError(cause, "Failed to dispatch orchestration command")));
 		return startup.enqueueCommand(dispatchEffect).pipe(effect.Effect.mapError((cause) => toDispatchCommandError(cause, "Failed to dispatch orchestration command")));
 	};
 	const loadDiagnosticsMetrics = localDiagnosticsMetrics.snapshot;
@@ -45536,18 +46020,24 @@ const normalizeDispatchCommand = (command) => effect.Effect.gen(function* () {
 		...command.projectMetadataDir !== void 0 ? { projectMetadataDir: yield* normalizeProjectMetadataDir(command.projectMetadataDir) } : {}
 	};
 	if (command.type !== "thread.turn.start" && command.type !== "thread.turn.steer") return command;
-	const normalizedAttachments = yield* effect.Effect.forEach(command.message.attachments, (attachment) => effect.Effect.gen(function* () {
+	const preparedAttachments = yield* effect.Effect.forEach(command.message.attachments, (attachment) => effect.Effect.gen(function* () {
 		const parsed = parseBase64DataUrl(attachment.dataUrl);
-		if (!parsed || !parsed.mimeType.startsWith("image/")) return yield* new require_collectUint8StreamText.OrchestrationDispatchCommandError({ message: `Invalid image attachment payload for '${attachment.name}'.` });
-		const bytes = Buffer.from(parsed.base64, "base64");
-		if (bytes.byteLength === 0 || bytes.byteLength > 10485760) return yield* new require_collectUint8StreamText.OrchestrationDispatchCommandError({ message: `Image attachment '${attachment.name}' is empty or too large.` });
+		if (!parsed) return yield* new require_collectUint8StreamText.OrchestrationDispatchCommandError({ message: `Attachment '${attachment.name}' must use a valid base64 data URL.` });
+		const normalizedMimeType = parsed.mimeType.toLowerCase();
+		if (normalizedMimeType !== attachment.mimeType.toLowerCase()) return yield* new require_collectUint8StreamText.OrchestrationDispatchCommandError({ message: `Attachment '${attachment.name}' declares '${attachment.mimeType}' but its payload is '${parsed.mimeType}'.` });
+		if (attachment.type === "image" && !normalizedMimeType.startsWith("image/")) return yield* new require_collectUint8StreamText.OrchestrationDispatchCommandError({ message: `Image attachment '${attachment.name}' must use an image MIME type.` });
+		const normalizedBase64 = parsed.base64.replace(/\s+/g, "");
+		const bytes = Buffer.from(normalizedBase64, "base64");
+		if (bytes.byteLength === 0 || bytes.toString("base64") !== normalizedBase64 || bytes.byteLength !== attachment.sizeBytes) return yield* new require_collectUint8StreamText.OrchestrationDispatchCommandError({ message: `Attachment '${attachment.name}' has invalid base64 data or mismatched size metadata.` });
+		const attachmentLimit = attachment.type === "image" ? require_collectUint8StreamText.PROVIDER_SEND_TURN_MAX_IMAGE_BYTES : require_collectUint8StreamText.PROVIDER_SEND_TURN_MAX_FILE_BYTES;
+		if (bytes.byteLength > attachmentLimit) return yield* new require_collectUint8StreamText.OrchestrationDispatchCommandError({ message: `Attachment '${attachment.name}' is ${bytes.byteLength} bytes; limit is ${attachmentLimit} bytes.` });
 		const attachmentId = createAttachmentId(command.threadId);
 		if (!attachmentId) return yield* new require_collectUint8StreamText.OrchestrationDispatchCommandError({ message: "Failed to create a safe attachment id." });
 		const persistedAttachment = {
-			type: "image",
+			type: attachment.type,
 			id: attachmentId,
 			name: attachment.name,
-			mimeType: parsed.mimeType.toLowerCase(),
+			mimeType: normalizedMimeType,
 			sizeBytes: bytes.byteLength
 		};
 		const attachmentPath = resolveAttachmentPath({
@@ -45555,10 +46045,22 @@ const normalizeDispatchCommand = (command) => effect.Effect.gen(function* () {
 			attachment: persistedAttachment
 		});
 		if (!attachmentPath) return yield* new require_collectUint8StreamText.OrchestrationDispatchCommandError({ message: `Failed to resolve persisted path for '${attachment.name}'.` });
-		yield* fileSystem.makeDirectory(path.dirname(attachmentPath), { recursive: true }).pipe(effect.Effect.mapError(() => new require_collectUint8StreamText.OrchestrationDispatchCommandError({ message: `Failed to create attachment directory for '${attachment.name}'.` })));
-		yield* fileSystem.writeFile(attachmentPath, bytes).pipe(effect.Effect.mapError(() => new require_collectUint8StreamText.OrchestrationDispatchCommandError({ message: `Failed to persist attachment '${attachment.name}'.` })));
-		return persistedAttachment;
+		return {
+			attachment: persistedAttachment,
+			attachmentPath,
+			bytes
+		};
 	}), { concurrency: 1 });
+	const totalAttachmentBytes = preparedAttachments.reduce((total, prepared) => total + prepared.bytes.byteLength, 0);
+	if (totalAttachmentBytes > 52428800) return yield* new require_collectUint8StreamText.OrchestrationDispatchCommandError({ message: `Attachments total ${totalAttachmentBytes} bytes; limit is ${require_collectUint8StreamText.PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES} bytes.` });
+	yield* effect.Effect.forEach(preparedAttachments, ({ attachment, attachmentPath, bytes }) => fileSystem.makeDirectory(path.dirname(attachmentPath), { recursive: true }).pipe(effect.Effect.mapError(() => new require_collectUint8StreamText.OrchestrationDispatchCommandError({ message: `Failed to create attachment directory for '${attachment.name}'.` })), effect.Effect.andThen(fileSystem.writeFile(attachmentPath, bytes).pipe(effect.Effect.mapError(() => new require_collectUint8StreamText.OrchestrationDispatchCommandError({ message: `Failed to persist attachment '${attachment.name}'.` }))))), {
+		concurrency: 1,
+		discard: true
+	}).pipe(effect.Effect.onError(() => effect.Effect.forEach(preparedAttachments, ({ attachmentPath }) => fileSystem.remove(attachmentPath).pipe(effect.Effect.ignore), {
+		concurrency: 1,
+		discard: true
+	})));
+	const normalizedAttachments = preparedAttachments.map(({ attachment }) => attachment);
 	return {
 		...command,
 		message: {
@@ -47776,10 +48278,10 @@ const ContextHandoffDocument = effect.Schema.Struct({
 	subagents: effect.Schema.Array(ContextHandoffSubagentEntry),
 	priorHandoffs: effect.Schema.Array(ContextHandoffBoundaryEntry)
 });
-function asRecord$3(value) {
+function asRecord$4(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
-function asTrimmedString$1(value) {
+function asTrimmedString$2(value) {
 	if (typeof value !== "string") return;
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : void 0;
@@ -47798,7 +48300,7 @@ function truncateUnicodeSafe(value, maxChars) {
 	return value.slice(0, end);
 }
 function boundedString(value, maxChars) {
-	const normalized = asTrimmedString$1(value);
+	const normalized = asTrimmedString$2(value);
 	if (!normalized) return { truncated: false };
 	const bounded = truncateUnicodeSafe(normalized, maxChars);
 	return {
@@ -47850,7 +48352,7 @@ function boundedEndpoint(endpoint) {
 	};
 }
 function activityPayload(activity) {
-	return asRecord$3(activity.payload);
+	return asRecord$4(activity.payload);
 }
 function decodeHandoffPayload(activity) {
 	if (activity.kind !== "context-handoff") return;
@@ -47937,7 +48439,7 @@ function collectRuntimePlan(activities) {
 		if (!Array.isArray(payload?.plan)) continue;
 		let truncated = payload.plan.length > MAX_PLAN_STEPS;
 		const steps = payload.plan.slice(0, MAX_PLAN_STEPS).flatMap((entry) => {
-			const record = asRecord$3(entry);
+			const record = asRecord$4(entry);
 			const step = boundedString(record?.step, DETAIL_MAX_CHARS);
 			if (!step.value) return [];
 			truncated ||= step.truncated;
@@ -47964,21 +48466,21 @@ function collectRuntimePlan(activities) {
 	return latest ? [latest] : [];
 }
 function normalizeCommand(value) {
-	const direct = asTrimmedString$1(value);
+	const direct = asTrimmedString$2(value);
 	if (direct) return direct;
 	if (!Array.isArray(value)) return;
 	const parts = value.flatMap((entry) => {
-		const part = asTrimmedString$1(entry);
+		const part = asTrimmedString$2(entry);
 		return part ? [part] : [];
 	});
 	return parts.length > 0 ? parts.join(" ") : void 0;
 }
 function extractCommand(payload) {
-	const data = asRecord$3(payload.data);
-	const item = asRecord$3(data?.item);
-	const input = asRecord$3(item?.input);
-	const result = asRecord$3(item?.result);
-	const rawInput = asRecord$3(data?.rawInput);
+	const data = asRecord$4(payload.data);
+	const item = asRecord$4(data?.item);
+	const input = asRecord$4(item?.input);
+	const result = asRecord$4(item?.result);
+	const rawInput = asRecord$4(data?.rawInput);
 	for (const candidate of [
 		item?.command,
 		input?.command,
@@ -47989,7 +48491,7 @@ function extractCommand(payload) {
 		const command = normalizeCommand(candidate);
 		if (command) return command;
 	}
-	const executable = asTrimmedString$1(rawInput?.executable);
+	const executable = asTrimmedString$2(rawInput?.executable);
 	const args = normalizeCommand(rawInput?.args);
 	return executable ? args ? `${executable} ${args}` : executable : void 0;
 }
@@ -47997,36 +48499,36 @@ function textFromContentArray(value) {
 	if (!Array.isArray(value)) return;
 	const chunks = [];
 	for (const entry of value) {
-		const record = asRecord$3(entry);
-		const direct = asTrimmedString$1(record?.text);
-		const nested = asTrimmedString$1(asRecord$3(record?.content)?.text);
+		const record = asRecord$4(entry);
+		const direct = asTrimmedString$2(record?.text);
+		const nested = asTrimmedString$2(asRecord$4(record?.content)?.text);
 		if (direct) chunks.push(direct);
 		else if (nested) chunks.push(nested);
 	}
 	return chunks.length > 0 ? chunks.join("\n") : void 0;
 }
 function extractOutput(payload) {
-	const data = asRecord$3(payload.data);
-	const item = asRecord$3(data?.item);
-	if (item?.type === "commandExecution") return asTrimmedString$1(item.aggregatedOutput);
+	const data = asRecord$4(payload.data);
+	const item = asRecord$4(data?.item);
+	if (item?.type === "commandExecution") return asTrimmedString$2(item.aggregatedOutput);
 	if (item?.type === "mcpToolCall") {
-		const error = asTrimmedString$1(asRecord$3(item.error)?.message);
+		const error = asTrimmedString$2(asRecord$4(item.error)?.message);
 		if (error) return error;
-		const content = textFromContentArray(asRecord$3(item.result)?.content);
+		const content = textFromContentArray(asRecord$4(item.result)?.content);
 		if (content) return content;
 	}
 	if (item?.type === "dynamicToolCall") {
 		const content = textFromContentArray(item.contentItems);
 		if (content) return content;
 	}
-	const rawOutput = asRecord$3(data?.rawOutput);
-	return asTrimmedString$1(rawOutput?.stdout) ?? asTrimmedString$1(rawOutput?.stderr) ?? asTrimmedString$1(rawOutput?.content) ?? textFromContentArray(data?.content);
+	const rawOutput = asRecord$4(data?.rawOutput);
+	return asTrimmedString$2(rawOutput?.stdout) ?? asTrimmedString$2(rawOutput?.stderr) ?? asTrimmedString$2(rawOutput?.content) ?? textFromContentArray(data?.content);
 }
 function extractExitCode(payload) {
-	const data = asRecord$3(payload.data);
-	const item = asRecord$3(data?.item);
-	const itemResult = asRecord$3(item?.result);
-	const rawOutput = asRecord$3(data?.rawOutput);
+	const data = asRecord$4(payload.data);
+	const item = asRecord$4(data?.item);
+	const itemResult = asRecord$4(item?.result);
+	const rawOutput = asRecord$4(data?.rawOutput);
 	for (const candidate of [
 		item?.exitCode,
 		itemResult?.exitCode,
@@ -48035,7 +48537,7 @@ function extractExitCode(payload) {
 		const exitCode = asInteger(candidate);
 		if (exitCode !== void 0) return exitCode;
 	}
-	const detail = asTrimmedString$1(payload.detail);
+	const detail = asTrimmedString$2(payload.detail);
 	const match = detail ? /<exited with exit code (?<code>-?\d+)>\s*$/iu.exec(detail) : null;
 	const parsed = Number.parseInt(match?.groups?.code ?? "", 10);
 	return Number.isInteger(parsed) ? parsed : void 0;
@@ -48049,7 +48551,7 @@ function pathFromRecord(record) {
 		"newPath",
 		"oldPath"
 	]) {
-		const path = asTrimmedString$1(record[key]);
+		const path = asTrimmedString$2(record[key]);
 		if (path) return truncateUnicodeSafe(path, PATH_MAX_CHARS);
 	}
 }
@@ -48070,7 +48572,7 @@ function collectPathsAndChanges(value) {
 			for (const entry of current) visit(entry, depth + 1);
 			return;
 		}
-		const record = asRecord$3(current);
+		const record = asRecord$4(current);
 		if (!record || seenObjects.has(record)) return;
 		seenObjects.add(record);
 		const path = pathFromRecord(record);
@@ -48124,10 +48626,10 @@ function extractTool(activity) {
 	const lifecycle = toolLifecycle(activity.kind);
 	const payload = activityPayload(activity);
 	if (!lifecycle || !payload || !effect.Schema.is(require_collectUint8StreamText.ToolLifecycleItemType)(payload.itemType)) return;
-	const data = asRecord$3(payload.data);
-	const providerRefs = asRecord$3(payload.providerRefs);
-	const providerItemId = asTrimmedString$1(payload.providerItemId) ?? asTrimmedString$1(providerRefs?.providerItemId);
-	const toolCallId = asTrimmedString$1(data?.toolCallId);
+	const data = asRecord$4(payload.data);
+	const providerRefs = asRecord$4(payload.providerRefs);
+	const providerItemId = asTrimmedString$2(payload.providerItemId) ?? asTrimmedString$2(providerRefs?.providerItemId);
+	const toolCallId = asTrimmedString$2(data?.toolCallId);
 	const command = boundedString(extractCommand(payload), TOOL_COMMAND_MAX_CHARS);
 	const output = boundedString(extractOutput(payload), TOOL_OUTPUT_MAX_CHARS);
 	const detail = boundedString(payload.detail, DETAIL_MAX_CHARS);
@@ -48219,7 +48721,7 @@ function parseQuestions(payload) {
 	let truncated = payload.questions.length > MAX_QUESTIONS_PER_REQUEST;
 	return {
 		questions: payload.questions.slice(0, MAX_QUESTIONS_PER_REQUEST).flatMap((value) => {
-			const record = asRecord$3(value);
+			const record = asRecord$4(value);
 			const id = boundedString(record?.id, LABEL_MAX_CHARS);
 			const header = boundedString(record?.header, LABEL_MAX_CHARS);
 			const question = boundedString(record?.question, QUESTION_MAX_CHARS);
@@ -48228,7 +48730,7 @@ function parseQuestions(payload) {
 			const rawOptions = Array.isArray(record?.options) ? record.options : [];
 			truncated ||= rawOptions.length > MAX_OPTIONS_PER_QUESTION;
 			const options = rawOptions.slice(0, MAX_OPTIONS_PER_QUESTION).flatMap((option) => {
-				const label = boundedString(asRecord$3(option)?.label, LABEL_MAX_CHARS);
+				const label = boundedString(asRecord$4(option)?.label, LABEL_MAX_CHARS);
 				truncated ||= label.truncated;
 				return label.value ? [label.value] : [];
 			});
@@ -48269,7 +48771,7 @@ function collectNotices(activities) {
 		const failure = failureFromActivity(activity);
 		if (failure) failures.push(failure);
 		const payload = activityPayload(activity);
-		const requestId = asTrimmedString$1(payload?.requestId);
+		const requestId = asTrimmedString$2(payload?.requestId);
 		if (!requestId) continue;
 		if (activity.kind === "user-input.resolved") {
 			pendingQuestions.delete(requestId);
@@ -48296,7 +48798,7 @@ function collectSubagents(activities) {
 	for (const activity of activities.toSorted(compareOrdered)) {
 		if (activity.kind !== "subagent.completed") continue;
 		const payload = activityPayload(activity);
-		const subagent = asRecord$3(payload?.subagent);
+		const subagent = asRecord$4(payload?.subagent);
 		const subagentId = boundedString(subagent?.subagentId, LABEL_MAX_CHARS);
 		const status = payload?.status;
 		if (!subagentId.value || !effect.Schema.is(require_collectUint8StreamText.RuntimeSubagentStatus)(status)) continue;
@@ -50315,10 +50817,10 @@ const DEVICE_CAPABILITY_IDS = [
 	"accessibility",
 	"encoder"
 ];
-const asRecord$2 = (value) => typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
+const asRecord$3 = (value) => typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
 const asNonEmptyString = (value) => typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
 const parseToolchain = (value) => {
-	const record = asRecord$2(value);
+	const record = asRecord$3(value);
 	if (!record) return void 0;
 	const toolchain = {
 		xcodeVersion: asNonEmptyString(record["xcodeVersion"]),
@@ -50340,7 +50842,7 @@ const parseCapability = (id, raw) => {
 		id,
 		ok: true
 	};
-	const record = asRecord$2(raw);
+	const record = asRecord$3(raw);
 	if (!record) return {
 		id,
 		ok: false,
@@ -50373,7 +50875,7 @@ const parseHelperProbe = (stdout) => {
 			error: "The device helper preflight returned unreadable output."
 		};
 	}
-	const record = asRecord$2(parsed);
+	const record = asRecord$3(parsed);
 	if (!record) return {
 		ok: false,
 		capabilities: DEVICE_CAPABILITY_IDS.map((id) => ({
@@ -50384,7 +50886,7 @@ const parseHelperProbe = (stdout) => {
 		toolchain: void 0,
 		error: "The device helper preflight returned unreadable output."
 	};
-	const capabilitiesRecord = asRecord$2(record["capabilities"]);
+	const capabilitiesRecord = asRecord$3(record["capabilities"]);
 	const error = asNonEmptyString(record["error"]);
 	if (!capabilitiesRecord) {
 		const ok = record["ok"] === true;
@@ -50637,7 +51139,7 @@ var DeviceHelperError = class extends Error {
 		this.code = code;
 	}
 };
-function asRecord$1(value) {
+function asRecord$2(value) {
 	return typeof value === "object" && value !== null ? value : {};
 }
 /**
@@ -50773,8 +51275,8 @@ var HelperClient = class {
 	async attach(udid, options = {}) {
 		if (!options.force && this.attachment?.udid === udid) return this.attachment;
 		this.attachment = null;
-		const result = asRecord$1(await this.request(HELPER_METHODS.attach, { udid }));
-		const capabilities = asRecord$1(result.capabilities);
+		const result = asRecord$2(await this.request(HELPER_METHODS.attach, { udid }));
+		const capabilities = asRecord$2(result.capabilities);
 		const pixelWidth = readNumber(result, "pixelWidth", 0);
 		const pixelHeight = readNumber(result, "pixelHeight", 0);
 		const scale = readNumber(result, "scale", 3);
@@ -50928,14 +51430,14 @@ var HelperClient = class {
 		} catch {
 			return;
 		}
-		const record = asRecord$1(message);
+		const record = asRecord$2(message);
 		if (typeof record.id !== "number") return;
 		const request = this.pending.get(record.id);
 		if (!request) return;
 		this.pending.delete(record.id);
 		clearTimeout(request.timer);
 		if (record.error !== void 0 && record.error !== null) {
-			const error = asRecord$1(record.error);
+			const error = asRecord$2(record.error);
 			request.reject(new DeviceHelperError(typeof error.code === "number" ? `helper_${error.code}` : "helper_error", typeof error.message === "string" ? error.message : "Device helper reported an error"));
 			return;
 		}
@@ -75007,9 +75509,6 @@ effect.Schema.Struct({ threadId: require_collectUint8StreamText.ThreadId });
 */
 var ProviderSessionRuntimeRepository = class extends effect.Context.Service()("ryco/persistence/Services/ProviderSessionRuntime/ProviderSessionRuntimeRepository") {};
 //#endregion
-//#region src/provider/Services/ProviderSessionDirectory.ts
-var ProviderSessionDirectory = class extends effect.Context.Service()("ryco/provider/Services/ProviderSessionDirectory") {};
-//#endregion
 //#region src/provider/Layers/ProviderSessionDirectory.ts
 function toPersistenceError(operation) {
 	return (cause) => new ProviderSessionDirectoryPersistenceError({
@@ -75694,6 +76193,12 @@ const ProviderEventLoggersLive = effect.Layer.effect(ProviderEventLoggers, effec
 	};
 }));
 //#endregion
+//#region ../../packages/shared/src/providerCapabilities.ts
+/** Drivers whose native turn API accepts arbitrary file bytes, not only images. */
+function providerSupportsGeneralFileAttachments(provider) {
+	return provider === "copilot" || provider === "opencode";
+}
+//#endregion
 //#region src/provider/Layers/ProviderService.ts
 /**
 * ProviderServiceLive - Cross-provider orchestration layer.
@@ -76240,6 +76745,8 @@ const makeProviderService = effect.Effect.fn("makeProviderService")(function* (o
 			});
 			metricProvider = routed.adapter.provider;
 			metricModel = input.modelSelection?.model;
+			const unsupportedFile = input.attachments.find((attachment) => attachment.type === "file");
+			if (unsupportedFile && !providerSupportsGeneralFileAttachments(routed.adapter.provider)) return yield* toValidationError("ProviderService.sendTurn", `Provider '${routed.adapter.provider}' does not accept general file attachments. Add '${unsupportedFile.name}' to the workspace and reference its path instead.`);
 			yield* effect.Effect.annotateCurrentSpan({
 				"provider.kind": routed.adapter.provider,
 				...input.modelSelection?.model ? { "provider.model": input.modelSelection.model } : {}
@@ -76314,6 +76821,8 @@ const makeProviderService = effect.Effect.fn("makeProviderService")(function* (o
 			allowRecovery: false
 		});
 		if (!routed.isActive || routed.session === void 0) return yield* new ProviderSessionNotFoundError({ threadId: input.threadId });
+		const unsupportedFile = input.attachments.find((attachment) => attachment.type === "file");
+		if (unsupportedFile && !providerSupportsGeneralFileAttachments(routed.adapter.provider)) return yield* toValidationError("ProviderService.steerTurn", `Provider '${routed.adapter.provider}' does not accept general file attachments. Add '${unsupportedFile.name}' to the workspace and reference its path instead.`);
 		if (routed.session.activeTurnId !== input.expectedTurnId) return yield* toValidationError("ProviderService.steerTurn", `Expected active turn '${input.expectedTurnId}', found '${routed.session.activeTurnId ?? "none"}'.`);
 		const steer = routed.adapter.steerTurn;
 		if (routed.adapter.capabilities.turnSteering !== "native" || steer === void 0) return yield* toValidationError("ProviderService.steerTurn", `Provider '${routed.adapter.provider}' does not support active-turn steering.`);
@@ -76692,6 +77201,7 @@ const ProviderSessionReaperLive = makeProviderSessionReaperLive();
 const OPENCODE_SERVER_READY_PREFIX = "opencode server listening";
 const DEFAULT_OPENCODE_SERVER_TIMEOUT_MS = 5e3;
 const DEFAULT_HOSTNAME = "127.0.0.1";
+const MINIMUM_OPENCODE_VERSION = "1.14.19";
 const OPENCODE_RUNTIME_ERROR_TAG = "OpenCodeRuntimeError";
 var OpenCodeRuntimeError = class extends effect.Data.TaggedError(OPENCODE_RUNTIME_ERROR_TAG) {
 	static is = (u) => effect.Predicate.isTagged(u, OPENCODE_RUNTIME_ERROR_TAG);
@@ -76717,6 +77227,22 @@ const runOpenCodeSdk = (operation, fn) => effect.Effect.tryPromise({
 		cause
 	})
 }).pipe(effect.Effect.withSpan(`opencode.${operation}`));
+const verifyOpenCodeServerVersion = (client) => runOpenCodeSdk("global.health", (signal) => client.global.health({ signal })).pipe(effect.Effect.timeoutOption("5 seconds"), effect.Effect.flatMap((result) => {
+	if (effect.Option.isNone(result)) return effect.Effect.fail(new OpenCodeRuntimeError({
+		operation: "global.health",
+		detail: "Timed out while checking the OpenCode server version."
+	}));
+	const health = result.value.data;
+	if (!health?.healthy || typeof health.version !== "string" || health.version.length === 0) return effect.Effect.fail(new OpenCodeRuntimeError({
+		operation: "global.health",
+		detail: "OpenCode server health check returned an invalid response."
+	}));
+	if (compareCliVersions(health.version, "1.14.19") < 0) return effect.Effect.fail(new OpenCodeRuntimeError({
+		operation: "global.health",
+		detail: `OpenCode v${health.version} is too old. Upgrade to v${MINIMUM_OPENCODE_VERSION} or newer.`
+	}));
+	return effect.Effect.succeed(health.version);
+}));
 let openCodeSdkModulePromise;
 const loadOpenCodeSdkModule = () => effect.Effect.tryPromise({
 	try: async () => {
@@ -76734,6 +77260,11 @@ const loadOpenCodeSdkModule = () => effect.Effect.tryPromise({
 		cause
 	})
 }).pipe(effect.Effect.withSpan("opencode.sdk.load"));
+function resolveOpenCodeServerPassword(input) {
+	if (input.configuredPassword !== void 0) return input.configuredPassword;
+	if (input.external) return;
+	return input.environment === void 0 ? process.env.OPENCODE_SERVER_PASSWORD : input.environment.OPENCODE_SERVER_PASSWORD;
+}
 function parseServerUrlFromOutput(output) {
 	for (const line of output.split("\n")) {
 		if (!line.startsWith(OPENCODE_SERVER_READY_PREFIX)) continue;
@@ -76758,13 +77289,13 @@ function openCodeQuestionId(index, question) {
 function toOpenCodeFileParts(input) {
 	const parts = [];
 	for (const attachment of input.attachments ?? []) {
-		const attachmentPath = input.resolveAttachmentPath(attachment);
-		if (!attachmentPath) continue;
+		const attachmentUrl = input.resolveAttachmentUrl(attachment);
+		if (!attachmentUrl) continue;
 		parts.push({
 			type: "file",
 			mime: attachment.mimeType,
 			filename: attachment.name,
-			url: (0, node_url.pathToFileURL)(attachmentPath).href
+			url: attachmentUrl
 		});
 	}
 	return parts;
@@ -76883,11 +77414,17 @@ const makeOpenCodeRuntime = effect.Effect.gen(function* () {
 			`--hostname=${hostname}`,
 			`--port=${port}`
 		];
+		const serverPassword = resolveOpenCodeServerPassword({
+			external: false,
+			...input.serverPassword !== void 0 ? { configuredPassword: input.serverPassword } : {},
+			...input.environment !== void 0 ? { environment: input.environment } : {}
+		});
 		const child = yield* spawner.spawn(effect_unstable_process.ChildProcess.make(input.binaryPath, args, {
 			detached: process.platform !== "win32",
 			shell: process.platform === "win32",
 			env: {
 				...input.environment ?? process.env,
+				...serverPassword !== void 0 ? { OPENCODE_SERVER_PASSWORD: serverPassword } : {},
 				OPENCODE_CONFIG_CONTENT: JSON.stringify({})
 			}
 		})).pipe(effect.Effect.provideService(effect.Scope.Scope, runtimeScope), effect.Effect.mapError((cause) => new OpenCodeRuntimeError({
@@ -76950,24 +77487,34 @@ const makeOpenCodeRuntime = effect.Effect.gen(function* () {
 		}
 		return {
 			url: readyOption.value,
+			...serverPassword !== void 0 ? { serverPassword } : {},
 			exitCode: child.exitCode.pipe(effect.Effect.map(Number), effect.Effect.orElseSucceed(() => 0))
 		};
 	});
 	const connectToOpenCodeServer = (input) => {
 		const serverUrl = input.serverUrl?.trim();
-		if (serverUrl) return effect.Effect.succeed({
-			url: serverUrl,
-			exitCode: null,
-			external: true
-		});
+		if (serverUrl) {
+			const serverPassword = resolveOpenCodeServerPassword({
+				external: true,
+				...input.serverPassword !== void 0 ? { configuredPassword: input.serverPassword } : {}
+			});
+			return effect.Effect.succeed({
+				url: serverUrl,
+				...serverPassword !== void 0 ? { serverPassword } : {},
+				exitCode: null,
+				external: true
+			});
+		}
 		return startOpenCodeServerProcess({
 			binaryPath: input.binaryPath,
+			...input.serverPassword !== void 0 ? { serverPassword: input.serverPassword } : {},
 			...input.environment !== void 0 ? { environment: input.environment } : {},
 			...input.port !== void 0 ? { port: input.port } : {},
 			...input.hostname !== void 0 ? { hostname: input.hostname } : {},
 			...input.timeoutMs !== void 0 ? { timeoutMs: input.timeoutMs } : {}
 		}).pipe(effect.Effect.map((server) => ({
 			url: server.url,
+			...server.serverPassword !== void 0 ? { serverPassword: server.serverPassword } : {},
 			exitCode: server.exitCode,
 			external: false
 		})));
@@ -76978,11 +77525,11 @@ const makeOpenCodeRuntime = effect.Effect.gen(function* () {
 		...input.serverPassword ? { headers: { Authorization: `Basic ${Buffer.from(`opencode:${input.serverPassword}`, "utf8").toString("base64")}` } } : {},
 		throwOnError: true
 	})));
-	const loadProviders = (client) => runOpenCodeSdk("provider.list", () => client.provider.list()).pipe(effect.Effect.filterMapOrFail((list) => list.data ? effect.Result.succeed(list.data) : effect.Result.fail(new OpenCodeRuntimeError({
+	const loadProviders = (client) => runOpenCodeSdk("provider.list", (signal) => client.provider.list({}, { signal })).pipe(effect.Effect.filterMapOrFail((list) => list.data ? effect.Result.succeed(list.data) : effect.Result.fail(new OpenCodeRuntimeError({
 		operation: "provider.list",
 		detail: "OpenCode provider list was empty."
 	})), (result) => result));
-	const loadAgents = (client) => runOpenCodeSdk("app.agents", () => client.app.agents()).pipe(effect.Effect.map((result) => result.data ?? []));
+	const loadAgents = (client) => runOpenCodeSdk("app.agents", (signal) => client.app.agents({}, { signal })).pipe(effect.Effect.map((result) => result.data ?? []));
 	const loadOpenCodeInventory = (client) => effect.Effect.all([loadProviders(client), loadAgents(client)], { concurrency: "unbounded" }).pipe(effect.Effect.map(([providerList, agents]) => ({
 		providerList,
 		agents
@@ -77571,12 +78118,10 @@ const TERMINAL_ENV_BLOCKLIST = /* @__PURE__ */ new Set([
 var TerminalSubprocessCheckError = class extends effect.Schema.TaggedError()("TerminalSubprocessCheckError", {
 	message: effect.Schema.String,
 	cause: effect.Schema.optional(effect.Schema.Defect()),
-	terminalPid: effect.Schema.Number,
-	command: effect.Schema.Literals([
-		"powershell",
-		"pgrep",
-		"ps"
-	])
+	command: effect.Schema.Literals(["powershell", "ps"]),
+	exitCode: effect.Schema.optional(effect.Schema.NullOr(effect.Schema.Number)),
+	timedOut: effect.Schema.optional(effect.Schema.Boolean),
+	stdoutTruncated: effect.Schema.optional(effect.Schema.Boolean)
 }) {};
 var TerminalProcessSignalError = class extends effect.Schema.TaggedError()("TerminalProcessSignalError", {
 	message: effect.Schema.String,
@@ -77796,81 +78341,90 @@ function isRetryableShellSpawnError(error) {
 	const message = messages.join(" ").toLowerCase();
 	return message.includes("posix_spawnp failed") || message.includes("enoent") || message.includes("not found") || message.includes("file not found") || message.includes("no such file");
 }
-function checkWindowsSubprocessActivity(terminalPid) {
-	const command = [
-		`$children = Get-CimInstance Win32_Process -Filter "ParentProcessId = ${terminalPid}" -ErrorAction SilentlyContinue`,
-		"if ($children) { exit 0 }",
-		"exit 1"
-	].join("; ");
-	return effect.Effect.tryPromise({
-		try: () => runProcess("powershell.exe", [
-			"-NoProfile",
-			"-NonInteractive",
-			"-Command",
-			command
-		], {
-			timeoutMs: 1500,
-			allowNonZeroExit: true,
-			maxBufferBytes: 32768,
-			outputMode: "truncate"
-		}),
-		catch: (cause) => new TerminalSubprocessCheckError({
-			message: "Failed to check Windows terminal subprocess activity.",
-			cause,
-			terminalPid,
-			command: "powershell"
-		})
-	}).pipe(effect.Effect.map((result) => result.code === 0));
+function parsePosixProcessTable(stdout) {
+	const childrenByParent = /* @__PURE__ */ new Map();
+	for (const line of stdout.split(/\r?\n/g)) {
+		const match = /^\s*(\d+)\s+(\d+)(?:\s|$)/.exec(line);
+		if (!match) continue;
+		const pid = Number(match[1]);
+		const parentPid = Number(match[2]);
+		if (!Number.isInteger(pid) || !Number.isInteger(parentPid)) continue;
+		const children = childrenByParent.get(parentPid) ?? [];
+		children.push(pid);
+		childrenByParent.set(parentPid, children);
+	}
+	return { childrenByParent };
+}
+function parseWindowsProcessTable(stdout) {
+	const childrenByParent = /* @__PURE__ */ new Map();
+	for (const line of stdout.split(/\r?\n/g)) {
+		const [pidRaw, parentPidRaw] = line.trim().split("|", 2);
+		const pid = Number(pidRaw);
+		const parentPid = Number(parentPidRaw);
+		if (!Number.isInteger(pid) || !Number.isInteger(parentPid)) continue;
+		const children = childrenByParent.get(parentPid) ?? [];
+		children.push(pid);
+		childrenByParent.set(parentPid, children);
+	}
+	return { childrenByParent };
 }
-const checkPosixSubprocessActivity = effect.Effect.fn("terminal.checkPosixSubprocessActivity")(function* (terminalPid) {
-	const runPgrep = effect.Effect.tryPromise({
-		try: () => runProcess("pgrep", ["-P", String(terminalPid)], {
+const POSIX_PS_ABSOLUTE_PATHS = ["/bin/ps", "/usr/bin/ps"];
+const resolvePosixPsCommand = effect.Effect.fn("terminal.resolvePosixPsCommand")(function* () {
+	const fileSystem = yield* effect.FileSystem.FileSystem;
+	for (const candidate of POSIX_PS_ABSOLUTE_PATHS) if (yield* fileSystem.exists(candidate).pipe(effect.Effect.orElseSucceed(() => false))) return candidate;
+	return "ps";
+});
+const snapshotPosixProcessTable = effect.Effect.fn("terminal.snapshotPosixProcessTable")(function* (psCommand) {
+	const result = yield* effect.Effect.tryPromise({
+		try: () => runProcess(psCommand, ["-eo", "pid=,ppid="], {
 			timeoutMs: 1e3,
 			allowNonZeroExit: true,
-			maxBufferBytes: 32768,
+			maxBufferBytes: 524288,
 			outputMode: "truncate"
 		}),
 		catch: (cause) => new TerminalSubprocessCheckError({
-			message: "Failed to inspect terminal subprocesses with pgrep.",
+			message: "Failed to snapshot POSIX processes.",
 			cause,
-			terminalPid,
-			command: "pgrep"
+			command: "ps"
 		})
 	});
-	const runPs = effect.Effect.tryPromise({
-		try: () => runProcess("ps", ["-eo", "pid=,ppid="], {
-			timeoutMs: 1e3,
+	if (result.code !== 0 || result.timedOut || result.stdoutTruncated) return yield* new TerminalSubprocessCheckError({
+		message: "POSIX process snapshot was incomplete.",
+		command: "ps",
+		exitCode: result.code,
+		timedOut: result.timedOut,
+		stdoutTruncated: result.stdoutTruncated
+	});
+	return parsePosixProcessTable(result.stdout);
+});
+const snapshotWindowsProcessTable = effect.Effect.fn("terminal.snapshotWindowsProcessTable")(function* () {
+	const command = ["$processes = Get-CimInstance Win32_Process -ErrorAction Stop", "foreach ($process in $processes) { Write-Output \"$($process.ProcessId)|$($process.ParentProcessId)\" }"].join("; ");
+	const result = yield* effect.Effect.tryPromise({
+		try: () => runProcess("powershell.exe", [
+			"-NoProfile",
+			"-NonInteractive",
+			"-Command",
+			command
+		], {
+			timeoutMs: 1500,
 			allowNonZeroExit: true,
-			maxBufferBytes: 262144,
+			maxBufferBytes: 524288,
 			outputMode: "truncate"
 		}),
 		catch: (cause) => new TerminalSubprocessCheckError({
-			message: "Failed to inspect terminal subprocesses with ps.",
+			message: "Failed to snapshot Windows processes.",
 			cause,
-			terminalPid,
-			command: "ps"
+			command: "powershell"
 		})
 	});
-	const pgrepResult = yield* effect.Effect.exit(runPgrep);
-	if (pgrepResult._tag === "Success") {
-		if (pgrepResult.value.code === 0) return pgrepResult.value.stdout.trim().length > 0;
-		if (pgrepResult.value.code === 1) return false;
-	}
-	const psResult = yield* effect.Effect.exit(runPs);
-	if (psResult._tag === "Failure" || psResult.value.code !== 0) return false;
-	for (const line of psResult.value.stdout.split(/\r?\n/g)) {
-		const [pidRaw, ppidRaw] = line.trim().split(/\s+/g);
-		const pid = Number(pidRaw);
-		const ppid = Number(ppidRaw);
-		if (!Number.isInteger(pid) || !Number.isInteger(ppid)) continue;
-		if (ppid === terminalPid) return true;
-	}
-	return false;
-});
-const defaultSubprocessChecker = effect.Effect.fn("terminal.defaultSubprocessChecker")(function* (terminalPid) {
-	if (!Number.isInteger(terminalPid) || terminalPid <= 0) return false;
-	if (process.platform === "win32") return yield* checkWindowsSubprocessActivity(terminalPid);
-	return yield* checkPosixSubprocessActivity(terminalPid);
+	if (result.code !== 0 || result.timedOut || result.stdoutTruncated) return yield* new TerminalSubprocessCheckError({
+		message: "Windows process snapshot was incomplete.",
+		command: "powershell",
+		exitCode: result.code,
+		timedOut: result.timedOut,
+		stdoutTruncated: result.stdoutTruncated
+	});
+	return parseWindowsProcessTable(result.stdout);
 });
 function capHistory(history, maxLines) {
 	if (history.length === 0) return history;
@@ -78062,7 +78616,8 @@ const makeTerminalManagerWithOptions = effect.Effect.fn("makeTerminalManagerWith
 	const platform = options.platform ?? process.platform;
 	const baseEnv = options.env ?? process.env;
 	const shellResolver = options.shellResolver ?? (() => defaultShellResolver(platform, baseEnv));
-	const subprocessChecker = options.subprocessChecker ?? defaultSubprocessChecker;
+	const posixPsCommand = options.processTableSnapshotter === void 0 && platform !== "win32" ? yield* resolvePosixPsCommand() : null;
+	const processTableSnapshotter = options.processTableSnapshotter ?? (platform === "win32" ? snapshotWindowsProcessTable : () => snapshotPosixProcessTable(posixPsCommand ?? "ps"));
 	const subprocessPollIntervalMs = options.subprocessPollIntervalMs ?? DEFAULT_SUBPROCESS_POLL_INTERVAL_MS;
 	const processKillGraceMs = options.processKillGraceMs ?? DEFAULT_PROCESS_KILL_GRACE_MS;
 	const maxRetainedInactiveSessions = options.maxRetainedInactiveSessions ?? DEFAULT_MAX_RETAINED_INACTIVE_SESSIONS;
@@ -78553,26 +79108,22 @@ const makeTerminalManagerWithOptions = effect.Effect.fn("makeTerminalManagerWith
 	const pollSubprocessActivity = effect.Effect.fn("terminal.pollSubprocessActivity")(function* () {
 		const runningSessions = [...(yield* readManagerState).sessions.values()].filter((session) => session.status === "running" && Number.isInteger(session.pid));
 		if (runningSessions.length === 0) return;
+		const processTable = yield* processTableSnapshotter().pipe(effect.Effect.map(effect.Option.some), effect.Effect.catch((reason) => effect.Effect.logWarning("failed to snapshot processes for terminal subprocess polling", { reason }).pipe(effect.Effect.as(effect.Option.none()))));
+		if (effect.Option.isNone(processTable)) return;
 		const checkSubprocessActivity = effect.Effect.fn("terminal.checkSubprocessActivity")(function* (session) {
 			const terminalPid = session.pid;
-			const hasRunningSubprocess = yield* subprocessChecker(terminalPid).pipe(effect.Effect.map(effect.Option.some), effect.Effect.catch((reason) => effect.Effect.logWarning("failed to check terminal subprocess activity", {
-				threadId: session.threadId,
-				terminalId: session.terminalId,
-				terminalPid,
-				reason
-			}).pipe(effect.Effect.as(effect.Option.none()))));
-			if (effect.Option.isNone(hasRunningSubprocess)) return;
+			const hasRunningSubprocess = (processTable.value.childrenByParent.get(terminalPid)?.length ?? 0) > 0;
 			const event = yield* modifyManagerState((state) => {
 				const liveSession = effect.Option.fromNullishOr(state.sessions.get(toSessionKey(session.threadId, session.terminalId)));
-				if (effect.Option.isNone(liveSession) || liveSession.value.status !== "running" || liveSession.value.pid !== terminalPid || liveSession.value.hasRunningSubprocess === hasRunningSubprocess.value) return [effect.Option.none(), state];
-				liveSession.value.hasRunningSubprocess = hasRunningSubprocess.value;
+				if (effect.Option.isNone(liveSession) || liveSession.value.status !== "running" || liveSession.value.pid !== terminalPid || liveSession.value.hasRunningSubprocess === hasRunningSubprocess) return [effect.Option.none(), state];
+				liveSession.value.hasRunningSubprocess = hasRunningSubprocess;
 				liveSession.value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
 				return [effect.Option.some({
 					type: "activity",
 					threadId: liveSession.value.threadId,
 					terminalId: liveSession.value.terminalId,
 					createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-					hasRunningSubprocess: hasRunningSubprocess.value
+					hasRunningSubprocess
 				}), state];
 			});
 			if (effect.Option.isSome(event)) yield* publishEvent(event.value);
@@ -78880,20 +79431,6 @@ var ProviderCommandReactor = class extends effect.Context.Service()("ryco/orches
 */
 var ProviderRuntimeIngestionService = class extends effect.Context.Service()("ryco/orchestration/Services/ProviderRuntimeIngestion/ProviderRuntimeIngestionService") {};
 //#endregion
-//#region src/orchestration/Services/ThreadDeletionReactor.ts
-/**
-* ThreadDeletionReactor - Thread deletion cleanup reactor service interface.
-*
-* Owns background workers that react to thread deletion domain events and
-* perform best-effort runtime cleanup for provider sessions and terminals.
-*
-* @module ThreadDeletionReactor
-*/
-/**
-* ThreadDeletionReactor - Service tag for thread deletion cleanup workers.
-*/
-var ThreadDeletionReactor = class extends effect.Context.Service()("ryco/orchestration/Services/ThreadDeletionReactor") {};
-//#endregion
 //#region src/orchestration/Layers/OrchestrationReactor.ts
 const makeOrchestrationReactor = effect.Effect.gen(function* () {
 	const providerRuntimeIngestion = yield* ProviderRuntimeIngestionService;
@@ -79469,6 +80006,227 @@ function make$4() {
 }
 const layer = effect.Layer.effect(ThreadBackgroundLivenessService, effect.Effect.sync(make$4));
 //#endregion
+//#region src/orchestration/ActivityPayloadProjection.ts
+function asRecord$1(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function asTrimmedString$1(value) {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+}
+function summarizeToolTextOutput(value) {
+	const lines = [];
+	for (const rawLine of value.split(/\r?\n/u)) {
+		const line = rawLine.replace(/\s+/g, " ").trim();
+		if (line.length > 0) lines.push(line);
+	}
+	const firstLine = lines.find((line) => line !== "```");
+	if (firstLine) return firstLine.length <= 84 ? firstLine : `${firstLine.slice(0, 83).trimEnd()}…`;
+	if (lines.length > 1) return `${lines.length.toLocaleString()} lines`;
+	return null;
+}
+function pushChangedFile(target, seen, value) {
+	const normalized = asTrimmedString$1(value);
+	if (!normalized || seen.has(normalized)) return;
+	seen.add(normalized);
+	target.push(normalized);
+}
+function collectChangedFiles(value, target, seen, depth) {
+	if (depth > 4 || target.length >= 12) return;
+	if (Array.isArray(value)) {
+		for (const entry of value) {
+			collectChangedFiles(entry, target, seen, depth + 1);
+			if (target.length >= 12) return;
+		}
+		return;
+	}
+	const record = asRecord$1(value);
+	if (!record) return;
+	pushChangedFile(target, seen, record.path);
+	pushChangedFile(target, seen, record.filePath);
+	pushChangedFile(target, seen, record.relativePath);
+	pushChangedFile(target, seen, record.filename);
+	pushChangedFile(target, seen, record.newPath);
+	pushChangedFile(target, seen, record.oldPath);
+	for (const nestedKey of [
+		"item",
+		"result",
+		"input",
+		"data",
+		"changes",
+		"files",
+		"edits",
+		"patch",
+		"patches",
+		"operations"
+	]) {
+		if (!(nestedKey in record)) continue;
+		collectChangedFiles(record[nestedKey], target, seen, depth + 1);
+		if (target.length >= 12) return;
+	}
+}
+function projectCommandData(data) {
+	const item = asRecord$1(data.item);
+	if (!item) return;
+	const projectedItem = {};
+	if ("command" in item) projectedItem.command = item.command;
+	const aggregatedOutput = asTrimmedString$1(item.aggregatedOutput);
+	if (aggregatedOutput) {
+		const summary = summarizeToolTextOutput(aggregatedOutput);
+		if (summary) projectedItem.aggregatedOutput = summary;
+	}
+	const input = asRecord$1(item.input);
+	if (input && "command" in input) projectedItem.input = { command: input.command };
+	const result = asRecord$1(item.result);
+	if (result) {
+		const projectedResult = {};
+		if ("command" in result) projectedResult.command = result.command;
+		const content = asTrimmedString$1(result.content);
+		if (content) {
+			const summary = summarizeToolTextOutput(content);
+			if (summary) projectedResult.content = summary;
+		}
+		if (Object.keys(projectedResult).length > 0) projectedItem.result = projectedResult;
+	}
+	return Object.keys(projectedItem).length > 0 ? projectedItem : void 0;
+}
+function projectCommandValue(data) {
+	if (data.command !== void 0) return data.command;
+	const input = asRecord$1(data.input);
+	if (input?.command !== void 0) return input.command;
+	const stateInput = asRecord$1(asRecord$1(data.state)?.input);
+	if (stateInput?.command !== void 0) return stateInput.command;
+}
+const MCP_ITEM_KEPT_FIELDS = [
+	"type",
+	"id",
+	"tool",
+	"server",
+	"status",
+	"arguments",
+	"appContext",
+	"error",
+	"durationMs"
+];
+function extractMcpResultText(result) {
+	const record = asRecord$1(result);
+	if (!record) return typeof result === "string" ? result : null;
+	if (typeof record.content === "string") return record.content;
+	if (Array.isArray(record.content)) {
+		const texts = [];
+		for (const entry of record.content) {
+			const text = asRecord$1(entry)?.text;
+			if (typeof text === "string" && text.trim().length > 0) texts.push(text);
+		}
+		if (texts.length > 0) return texts.join("\n");
+	}
+	return null;
+}
+function summarizeMcpResult(result) {
+	if (result === void 0 || result === null) return;
+	const text = extractMcpResultText(result);
+	const summary = text ? summarizeToolTextOutput(text) : null;
+	return summary ? { content: summary } : void 0;
+}
+function projectMcpToolCallData(data) {
+	const projectedData = {};
+	const item = asRecord$1(data.item);
+	if (item) {
+		const projectedItem = {};
+		for (const key of MCP_ITEM_KEPT_FIELDS) if (key in item) projectedItem[key] = item[key];
+		const result = summarizeMcpResult(item.result);
+		if (result) projectedItem.result = result;
+		projectedData.item = projectedItem;
+	}
+	if ("toolName" in data) projectedData.toolName = data.toolName;
+	if ("input" in data) projectedData.input = data.input;
+	if (!item) {
+		const result = summarizeMcpResult(data.result);
+		if (result) projectedData.result = result;
+	}
+	if ("toolCallId" in data) projectedData.toolCallId = data.toolCallId;
+	if ("kind" in data) projectedData.kind = data.kind;
+	const changedFiles = [];
+	collectChangedFiles(data, changedFiles, /* @__PURE__ */ new Set(), 0);
+	if (changedFiles.length > 0) projectedData.files = changedFiles.map((path) => ({ path }));
+	return projectedData;
+}
+function projectRawOutput(value) {
+	const direct = asTrimmedString$1(value);
+	if (direct) {
+		const summary = summarizeToolTextOutput(direct);
+		return summary ? { content: summary } : void 0;
+	}
+	const rawOutput = asRecord$1(value);
+	if (!rawOutput) return;
+	if (typeof rawOutput.totalFiles === "number" && Number.isFinite(rawOutput.totalFiles)) return {
+		totalFiles: rawOutput.totalFiles,
+		...rawOutput.truncated === true ? { truncated: true } : {}
+	};
+	for (const key of [
+		"content",
+		"stdout",
+		"stderr"
+	]) {
+		const output = asTrimmedString$1(rawOutput[key]);
+		if (!output) continue;
+		const summary = summarizeToolTextOutput(output);
+		return summary ? { content: summary } : void 0;
+	}
+}
+function projectAcpContent(value) {
+	if (!Array.isArray(value)) return;
+	const summary = summarizeToolTextOutput(value.map((entryValue) => {
+		const entry = asRecord$1(entryValue);
+		const content = asRecord$1(entry?.content);
+		return entry?.type === "content" && content?.type === "text" ? asTrimmedString$1(content.text) : null;
+	}).filter((entry) => entry !== null).join("\n"));
+	return summary ? { content: summary } : void 0;
+}
+/**
+* Projects provider-specific tool data to the fields shared clients consume.
+* The result is safe to persist for cumulative streaming updates: unbounded
+* tool output is reduced to a one-line summary while identity, command, and
+* changed-file metadata remain available to every client.
+*/
+function projectActivityPayload(activity) {
+	const payload = asRecord$1(activity.payload);
+	const data = asRecord$1(payload?.data);
+	if (!payload || !data) return activity;
+	const itemStatus = asRecord$1(data.item)?.status;
+	const projectedPayload = payload.status === "completed" && (itemStatus === "failed" || itemStatus === "declined") ? {
+		...payload,
+		status: itemStatus
+	} : payload;
+	if (payload.itemType === "mcp_tool_call") return {
+		...activity,
+		payload: {
+			...projectedPayload,
+			data: projectMcpToolCallData(data)
+		}
+	};
+	const projectedData = {};
+	const item = projectCommandData(data);
+	if (item) projectedData.item = item;
+	const command = projectCommandValue(data);
+	if (command !== void 0) projectedData.command = command;
+	const changedFiles = [];
+	collectChangedFiles(data, changedFiles, /* @__PURE__ */ new Set(), 0);
+	if (changedFiles.length > 0) projectedData.files = changedFiles.map((path) => ({ path }));
+	if ("toolCallId" in data) projectedData.toolCallId = data.toolCallId;
+	if ("kind" in data) projectedData.kind = data.kind;
+	const rawOutput = projectRawOutput(data.rawOutput) ?? projectAcpContent(data.content);
+	if (rawOutput) projectedData.rawOutput = rawOutput;
+	return {
+		...activity,
+		payload: {
+			...projectedPayload,
+			data: projectedData
+		}
+	};
+}
+//#endregion
 //#region src/orchestration/Layers/ProviderRuntimeIngestion.ts
 const providerTurnKey = (threadId, turnId) => `${threadId}:${turnId}`;
 const providerTaskKey = (threadId, taskId) => `${threadId}:${taskId}`;
@@ -79986,7 +80744,7 @@ function runtimeEventToActivities(event, taskTitle) {
 		}
 		case "item.updated":
 			if (!require_collectUint8StreamText.isToolLifecycleItemType(event.payload.itemType)) return [];
-			return [{
+			return [projectActivityPayload({
 				id: event.eventId,
 				createdAt: event.createdAt,
 				tone: "tool",
@@ -80004,7 +80762,7 @@ function runtimeEventToActivities(event, taskTitle) {
 				},
 				turnId: toTurnId$1(event.turnId) ?? null,
 				...maybeSequence
-			}];
+			})];
 		case "item.completed":
 			if (!require_collectUint8StreamText.isToolLifecycleItemType(event.payload.itemType)) return [];
 			return [{
@@ -80980,6 +81738,15 @@ const HANDLED_TURN_START_KEY_TTL = effect.Duration.minutes(30);
 const DEFAULT_RUNTIME_MODE = "full-access";
 const DEFAULT_TOKEN_MODE = require_collectUint8StreamText.DEFAULT_AGENT_TOKEN_MODE;
 const DEFAULT_THREAD_TITLE = "New thread";
+function pathEntryExists(targetPath) {
+	try {
+		(0, node_fs.lstatSync)(targetPath);
+		return true;
+	} catch (error) {
+		if (error.code === "ENOENT") return false;
+		throw error;
+	}
+}
 function providerErrorLabel(value) {
 	const normalized = value?.trim();
 	return normalized && normalized.length > 0 ? normalized : "unknown";
@@ -81001,10 +81768,10 @@ function isUnknownPendingApprovalRequestError(cause) {
 	const error = findProviderAdapterRequestError(cause);
 	if (error) {
 		const detail = error.detail.toLowerCase();
-		return detail.includes("unknown pending approval request") || detail.includes("unknown pending permission request");
+		return detail.includes("unknown pending approval request") || detail.includes("unknown pending permission request") || detail.includes("unknown pending codex approval request");
 	}
-	const message = effect.Cause.pretty(cause);
-	return message.includes("unknown pending approval request") || message.includes("unknown pending permission request");
+	const message = effect.Cause.pretty(cause).toLowerCase();
+	return message.includes("unknown pending approval request") || message.includes("unknown pending permission request") || message.includes("unknown pending codex approval request");
 }
 function isUnknownPendingUserInputRequestError(cause) {
 	const error = findProviderAdapterRequestError(cause);
@@ -81088,9 +81855,64 @@ const make$2 = effect.Effect.gen(function* () {
 	const resolveThread = effect.Effect.fnUntraced(function* (threadId) {
 		return yield* projectionSnapshotQuery.getThreadDetailById(threadId).pipe(effect.Effect.map(effect.Option.getOrUndefined));
 	});
+	const ensureRecordedWorktreeAvailable = effect.Effect.fn("ensureRecordedWorktreeAvailable")(function* (thread, project) {
+		if (thread.worktreePath === null) return;
+		if (!project) return yield* new ProviderAdapterRequestError({
+			provider: providerErrorLabel(String(thread.modelSelection.instanceId)),
+			method: "thread.turn.start",
+			detail: `Cannot verify worktree '${thread.worktreePath}' because project '${thread.projectId}' is unavailable.`
+		});
+		const repositoryRoot = node_path.default.resolve(project.workspaceRoot);
+		const worktreePath = node_path.default.resolve(thread.worktreePath);
+		if (worktreePath === repositoryRoot) return;
+		const registeredWorktreePaths = () => gitWorkflow.listWorktreePaths(repositoryRoot).pipe(effect.Effect.map((paths) => paths.map((entry) => node_path.default.resolve(entry))));
+		const failRecovery = (detail) => new ProviderAdapterRequestError({
+			provider: providerErrorLabel(String(thread.modelSelection.instanceId)),
+			method: "thread.turn.start",
+			detail
+		});
+		if (pathEntryExists(worktreePath)) {
+			if (!(yield* registeredWorktreePaths()).includes(worktreePath)) return yield* failRecovery(`Refusing to use '${worktreePath}' because it exists but is not a registered worktree for '${repositoryRoot}'.`);
+			return;
+		}
+		const branch = thread.branch;
+		if (branch === null) return yield* failRecovery(`Cannot recreate missing worktree '${worktreePath}' because the thread has no recorded branch.`);
+		if (!(yield* gitWorkflow.listLocalBranchNames(repositoryRoot)).includes(branch)) return yield* failRecovery(`Cannot recreate missing worktree '${worktreePath}' because branch '${branch}' no longer exists.`);
+		yield* gitWorkflow.pruneWorktrees(repositoryRoot);
+		if (pathEntryExists(worktreePath)) {
+			if ((yield* registeredWorktreePaths()).includes(worktreePath)) return;
+			return yield* failRecovery(`Refusing to recreate worktree '${worktreePath}' because another filesystem entry now occupies that path.`);
+		}
+		const recreated = yield* gitWorkflow.createWorktree({
+			cwd: repositoryRoot,
+			path: worktreePath,
+			refName: branch,
+			dependencyHydration: "none"
+		});
+		if (node_path.default.resolve(recreated.worktree.path) !== worktreePath || recreated.worktree.refName !== branch) return yield* failRecovery(`Worktree recovery returned unexpected metadata for '${worktreePath}' and branch '${branch}'.`);
+		const changedAt = (/* @__PURE__ */ new Date()).toISOString();
+		yield* orchestrationEngine.dispatch({
+			type: "thread.meta.update",
+			commandId: serverCommandId$2("worktree-recovered"),
+			threadId: thread.id,
+			branch,
+			worktreePath
+		});
+		if (thread.worktreeId !== void 0 && thread.worktreeId !== null) yield* orchestrationEngine.dispatch({
+			type: "worktree.meta.update",
+			commandId: serverCommandId$2("worktree-recovered-meta"),
+			worktreeId: thread.worktreeId,
+			branch,
+			changedAt
+		});
+		yield* gitWorkflow.invalidateStatus(worktreePath);
+		yield* vcsStatusBroadcaster.refreshStatus(worktreePath).pipe(effect.Effect.ignoreCause({ log: true }));
+	});
 	const ensureSessionForThread = effect.Effect.fn("ensureSessionForThread")(function* (threadId, createdAt, options) {
 		const thread = yield* resolveThread(threadId);
 		if (!thread) return yield* effect.Effect.die(/* @__PURE__ */ new Error(`Thread '${threadId}' was not found in read model.`));
+		const project = yield* resolveProject(thread.projectId);
+		yield* ensureRecordedWorktreeAvailable(thread, project);
 		const desiredRuntimeMode = thread.runtimeMode;
 		const desiredTokenMode = thread.tokenMode ?? DEFAULT_TOKEN_MODE;
 		const requestedModelSelection = options?.modelSelection;
@@ -81138,7 +81960,6 @@ const make$2 = effect.Effect.gen(function* () {
 				detail: `Thread '${threadId}' cannot switch from instance '${currentInstanceId}' to '${desiredInstanceId}' because their provider resume state is incompatible.`
 			});
 		}
-		const project = yield* resolveProject(thread.projectId);
 		const effectiveCwd = resolveThreadWorkspaceCwd({
 			thread,
 			projects: project ? [project] : []
@@ -81326,7 +82147,10 @@ const make$2 = effect.Effect.gen(function* () {
 				message: input.messageText,
 				...attachments.length > 0 ? { attachments } : {},
 				modelSelection
-			});
+			}).pipe(effect.Effect.retry({
+				times: 2,
+				schedule: effect.Schedule.exponential("2 seconds")
+			}));
 			if (!generated) return;
 			const thread = yield* resolveThread(input.threadId);
 			if (!thread) return;
@@ -81371,34 +82195,7 @@ const make$2 = effect.Effect.gen(function* () {
 			});
 			return;
 		}
-		if (event.payload.contextHandoff !== void 0) {
-			yield* contextHandoffCoordinator.processTurnStart(event);
-			return;
-		}
-		if (thread.messages.filter((entry) => entry.role === "user").length === 1) {
-			const project = yield* resolveProject(thread.projectId);
-			const generationCwd = resolveThreadWorkspaceCwd({
-				thread,
-				projects: project ? [project] : []
-			}) ?? process.cwd();
-			const generationInput = {
-				messageText: message.text,
-				...message.attachments !== void 0 ? { attachments: message.attachments } : {},
-				...event.payload.titleSeed !== void 0 ? { titleSeed: event.payload.titleSeed } : {}
-			};
-			yield* maybeGenerateAndRenameWorktreeBranchForFirstTurn({
-				threadId: event.payload.threadId,
-				branch: thread.branch,
-				worktreePath: thread.worktreePath,
-				worktreeId: thread.worktreeId ?? null,
-				...generationInput
-			}).pipe(effect.Effect.forkScoped);
-			if (canReplaceThreadTitle(thread.title, event.payload.titleSeed)) yield* maybeGenerateThreadTitleForFirstTurn({
-				threadId: event.payload.threadId,
-				cwd: generationCwd,
-				...generationInput
-			}).pipe(effect.Effect.forkScoped);
-		}
+		const isFirstUserMessageTurn = thread.messages.filter((entry) => entry.role === "user").length === 1;
 		const handleTurnStartFailure = (cause) => {
 			if (effect.Cause.hasInterruptsOnly(cause)) return effect.Effect.void;
 			const detail = formatFailureDetail(cause);
@@ -81421,6 +82218,12 @@ const make$2 = effect.Effect.gen(function* () {
 			cause: effect.Cause.pretty(recoveryCause),
 			originalCause: effect.Cause.pretty(cause)
 		})));
+		if (event.payload.contextHandoff !== void 0) {
+			const project = yield* resolveProject(thread.projectId);
+			if (!(yield* ensureRecordedWorktreeAvailable(thread, project).pipe(effect.Effect.as(true), effect.Effect.catchCause((cause) => handleTurnStartFailure(cause).pipe(effect.Effect.as(false)))))) return;
+			yield* contextHandoffCoordinator.processTurnStart(event);
+			return;
+		}
 		const sendTurnRequest = yield* buildSendTurnRequestForThread({
 			threadId: event.payload.threadId,
 			messageText: message.text,
@@ -81431,6 +82234,30 @@ const make$2 = effect.Effect.gen(function* () {
 			createdAt: event.payload.createdAt
 		}).pipe(effect.Effect.map(effect.Option.some), effect.Effect.catchCause((cause) => handleTurnStartFailure(cause).pipe(effect.Effect.as(effect.Option.none()))));
 		if (effect.Option.isNone(sendTurnRequest)) return;
+		if (isFirstUserMessageTurn) {
+			const project = yield* resolveProject(thread.projectId);
+			const generationCwd = resolveThreadWorkspaceCwd({
+				thread,
+				projects: project ? [project] : []
+			}) ?? process.cwd();
+			const generationInput = {
+				messageText: message.text,
+				...message.attachments !== void 0 ? { attachments: message.attachments } : {},
+				...event.payload.titleSeed !== void 0 ? { titleSeed: event.payload.titleSeed } : {}
+			};
+			yield* maybeGenerateAndRenameWorktreeBranchForFirstTurn({
+				threadId: event.payload.threadId,
+				branch: thread.branch,
+				worktreePath: thread.worktreePath,
+				worktreeId: thread.worktreeId ?? null,
+				...generationInput
+			}).pipe(effect.Effect.forkScoped);
+			if (canReplaceThreadTitle(thread.title, event.payload.titleSeed)) yield* maybeGenerateThreadTitleForFirstTurn({
+				threadId: event.payload.threadId,
+				cwd: generationCwd,
+				...generationInput
+			}).pipe(effect.Effect.forkScoped);
+		}
 		const commitAcceptedModelSelection = event.payload.modelSelection !== void 0 && !effect.Equal.equals(thread.modelSelection, event.payload.modelSelection) ? orchestrationEngine.dispatch({
 			type: "thread.meta.update",
 			commandId: serverCommandId$2("accepted-model-selection"),
@@ -81443,7 +82270,8 @@ const make$2 = effect.Effect.gen(function* () {
 		if (isProviderOriginatedCommandId(event.commandId)) return;
 		const thread = yield* resolveThread(event.payload.threadId);
 		if (!thread) return;
-		if (!(thread.session && thread.session.status !== "stopped")) return yield* appendProviderFailureActivity({
+		const session = thread.session;
+		if (!session || session.status === "stopped") return yield* appendProviderFailureActivity({
 			threadId: event.payload.threadId,
 			kind: "provider.turn.interrupt.failed",
 			summary: "Provider turn interrupt failed",
@@ -81451,7 +82279,41 @@ const make$2 = effect.Effect.gen(function* () {
 			turnId: event.payload.turnId ?? null,
 			createdAt: event.payload.createdAt
 		});
-		yield* providerService.interruptTurn({ threadId: event.payload.threadId });
+		const recoverInterruptFailure = (cause) => {
+			if (effect.Cause.hasInterruptsOnly(cause)) return effect.Effect.interrupt;
+			const detail = formatFailureDetail(cause);
+			return effect.Effect.gen(function* () {
+				const latestSession = (yield* resolveThread(event.payload.threadId))?.session;
+				if (!latestSession || latestSession.status === "stopped" || latestSession.status === "ready" || latestSession.activeTurnId === null || event.payload.turnId !== void 0 && latestSession.activeTurnId !== event.payload.turnId) return;
+				yield* providerService.stopSession({ threadId: event.payload.threadId }).pipe(effect.Effect.catchCause((stopCause) => effect.Cause.hasInterruptsOnly(stopCause) ? effect.Effect.interrupt : effect.Effect.logWarning("provider command reactor failed to stop session after interrupt failure", {
+					threadId: event.payload.threadId,
+					cause: effect.Cause.pretty(stopCause),
+					originalCause: effect.Cause.pretty(cause)
+				})));
+				const stoppedSession = (yield* resolveThread(event.payload.threadId))?.session;
+				if (!stoppedSession || stoppedSession.status === "stopped" || stoppedSession.status === "ready" || stoppedSession.activeTurnId === null || event.payload.turnId !== void 0 && stoppedSession.activeTurnId !== event.payload.turnId) return;
+				yield* setThreadSession({
+					threadId: event.payload.threadId,
+					session: {
+						...stoppedSession,
+						status: "stopped",
+						activeTurnId: null,
+						lastError: detail,
+						updatedAt: event.payload.createdAt
+					},
+					createdAt: event.payload.createdAt
+				});
+				yield* appendProviderFailureActivity({
+					threadId: event.payload.threadId,
+					kind: "provider.turn.interrupt.failed",
+					summary: "Provider turn interrupt failed",
+					detail,
+					turnId: event.payload.turnId ?? null,
+					createdAt: event.payload.createdAt
+				});
+			});
+		};
+		yield* providerService.interruptTurn({ threadId: event.payload.threadId }).pipe(effect.Effect.catchCause(recoverInterruptFailure));
 	});
 	const processGoalUpdated = effect.Effect.fn("processGoalUpdated")(function* (event) {
 		if (event.payload.origin !== "client") return;
@@ -83243,14 +84105,17 @@ const make = effect.Effect.gen(function* () {
 		}),
 		process: processThreadDeletedSafely
 	});
+	const seenSequence = yield* effect.SubscriptionRef.make(0);
+	const noteSeen = (sequence) => effect.SubscriptionRef.update(seenSequence, (seen) => Math.max(seen, sequence));
 	return {
 		start: effect.Effect.fn("start")(function* () {
-			yield* effect.Effect.forkScoped(effect.Stream.runForEach(orchestrationEngine.streamDomainEvents, (event) => {
-				if (event.type !== "thread.deleted") return effect.Effect.void;
-				return worker.enqueue(event);
-			}));
+			const subscription = yield* orchestrationEngine.subscribeDomainEvents;
+			yield* effect.Effect.forkScoped(effect.Stream.runForEach(effect.Stream.fromSubscription(subscription), (event) => (event.type === "thread.deleted" ? worker.enqueue(event) : effect.Effect.void).pipe(effect.Effect.andThen(noteSeen(event.sequence)))));
 		}),
-		drain: worker.drain
+		drainThrough: effect.Effect.fn("ThreadDeletionReactor.drainThrough")(function* (targetSequence) {
+			yield* effect.SubscriptionRef.changes(seenSequence).pipe(effect.Stream.filter((seen) => seen >= targetSequence), effect.Stream.runHead);
+			yield* worker.drain;
+		})
 	};
 });
 const ThreadDeletionReactorLive = effect.Layer.effect(ThreadDeletionReactor, make);
@@ -97568,10 +98433,21 @@ const OrchestrationEventPersistedRowSchema = effect.Schema.Struct({
 	payload: UnknownFromJsonString,
 	metadata: EventMetadataFromJsonString
 });
+const HasEventAfterRequestSchema = effect.Schema.Struct({
+	aggregateKind: require_collectUint8StreamText.OrchestrationAggregateKind,
+	aggregateId: effect.Schema.String,
+	type: require_collectUint8StreamText.OrchestrationEventType,
+	sequenceExclusive: require_collectUint8StreamText.NonNegativeInt
+});
 const ReadFromSequenceRequestSchema = effect.Schema.Struct({
 	sequenceExclusive: require_collectUint8StreamText.NonNegativeInt,
 	limit: effect.Schema.Number
 });
+const ReadThroughSequenceRequestSchema = effect.Schema.Struct({
+	sequenceExclusive: require_collectUint8StreamText.NonNegativeInt,
+	sequenceInclusive: require_collectUint8StreamText.NonNegativeInt,
+	limit: effect.Schema.Number
+});
 const DEFAULT_READ_FROM_SEQUENCE_LIMIT = 1e3;
 const READ_PAGE_SIZE = 500;
 function inferActorKind(event) {
@@ -97664,6 +98540,34 @@ const makeEventStore = effect.Effect.gen(function* () {
         LIMIT ${request.limit}
       `
 	});
+	const readEventRowsThroughSequence = effect_unstable_sql_SqlSchema.findAll({
+		Request: ReadThroughSequenceRequestSchema,
+		Result: OrchestrationEventPersistedRowSchema,
+		execute: (request) => sql`
+        SELECT
+          sequence,
+          event_id AS "eventId",
+          event_type AS "type",
+          aggregate_kind AS "aggregateKind",
+          stream_id AS "aggregateId",
+          occurred_at AS "occurredAt",
+          command_id AS "commandId",
+          causation_event_id AS "causationEventId",
+          correlation_id AS "correlationId",
+          payload_json AS "payload",
+          metadata_json AS "metadata"
+        FROM orchestration_events
+        WHERE sequence > ${request.sequenceExclusive}
+          AND sequence <= ${request.sequenceInclusive}
+        ORDER BY sequence ASC
+        LIMIT ${request.limit}
+      `
+	});
+	const readLatestSequence = effect_unstable_sql_SqlSchema.findOne({
+		Request: effect.Schema.Void,
+		Result: effect.Schema.Struct({ sequence: effect.Schema.NullOr(require_collectUint8StreamText.NonNegativeInt) }),
+		execute: () => sql`SELECT MAX(sequence) AS "sequence" FROM orchestration_events`
+	});
 	const readRecentEventRows = effect_unstable_sql_SqlSchema.findAll({
 		Request: effect.Schema.Struct({
 			since: require_collectUint8StreamText.IsoDateTime,
@@ -97681,6 +98585,20 @@ const makeEventStore = effect.Effect.gen(function* () {
       ORDER BY sequence DESC
       LIMIT ${limit}
     `
+	});
+	const findEventAfter = effect_unstable_sql_SqlSchema.findOneOption({
+		Request: HasEventAfterRequestSchema,
+		Result: effect.Schema.Struct({ sequence: require_collectUint8StreamText.NonNegativeInt }),
+		execute: (request) => sql`
+        SELECT sequence
+        FROM orchestration_events
+        WHERE aggregate_kind = ${request.aggregateKind}
+          AND stream_id = ${request.aggregateId}
+          AND event_type = ${request.type}
+          AND sequence > ${request.sequenceExclusive}
+        ORDER BY sequence ASC
+        LIMIT 1
+      `
 	});
 	const append = (event) => appendEventRow({
 		eventId: event.eventId,
@@ -97709,6 +98627,22 @@ const makeEventStore = effect.Effect.gen(function* () {
 		}));
 		return readPage(sequenceExclusive, normalizedLimit);
 	};
+	const readThroughSequence = (sequenceExclusive, sequenceInclusive) => {
+		const normalizedStart = Math.max(0, Math.floor(sequenceExclusive));
+		const normalizedEnd = Math.max(0, Math.floor(sequenceInclusive));
+		if (normalizedEnd <= normalizedStart) return effect.Stream.empty;
+		const readPage = (cursor) => effect.Stream.fromEffect(readEventRowsThroughSequence({
+			sequenceExclusive: cursor,
+			sequenceInclusive: normalizedEnd,
+			limit: READ_PAGE_SIZE
+		}).pipe(effect.Effect.mapError(toPersistenceSqlOrDecodeError$2("OrchestrationEventStore.readThroughSequence:query", "OrchestrationEventStore.readThroughSequence:decodeRows")), effect.Effect.flatMap((rows) => effect.Effect.forEach(rows, (row) => decodeEvent(row).pipe(effect.Effect.mapError(toPersistenceDecodeError("OrchestrationEventStore.readThroughSequence:rowToEvent"))))))).pipe(effect.Stream.flatMap((events) => {
+			if (events.length === 0) return effect.Stream.empty;
+			const nextCursor = events[events.length - 1].sequence;
+			return effect.Stream.concat(effect.Stream.fromIterable(events), nextCursor < normalizedEnd ? readPage(nextCursor) : effect.Stream.empty);
+		}));
+		return readPage(normalizedStart);
+	};
+	const latestSequence = readLatestSequence(void 0).pipe(effect.Effect.map((row) => row.sequence ?? 0), effect.Effect.mapError(toPersistenceSqlOrDecodeError$2("OrchestrationEventStore.latestSequence:query", "OrchestrationEventStore.latestSequence:decodeRow")));
 	const readPage = (sequenceExclusive, limit) => {
 		const normalizedLimit = Math.max(0, Math.floor(limit));
 		const normalizedSequenceExclusive = Math.max(0, Math.floor(sequenceExclusive));
@@ -97730,12 +98664,16 @@ const makeEventStore = effect.Effect.gen(function* () {
 		since: input.since,
 		limit: Math.min(Math.max(1, Math.floor(input.limit)), 500)
 	}).pipe(effect.Effect.mapError(toPersistenceSqlOrDecodeError$2("OrchestrationEventStore.readRecent:query", "OrchestrationEventStore.readRecent:decodeRows")), effect.Effect.flatMap((rows) => effect.Effect.forEach(rows, (row) => decodeEvent(row).pipe(effect.Effect.mapError(toPersistenceDecodeError("OrchestrationEventStore.readRecent:rowToEvent"))))));
+	const hasEventAfter = (input) => findEventAfter(input).pipe(effect.Effect.map(effect.Option.isSome), effect.Effect.mapError(toPersistenceSqlOrDecodeError$2("OrchestrationEventStore.hasEventAfter:query", "OrchestrationEventStore.hasEventAfter:decodeRow")));
 	return {
 		append,
 		readPage,
 		readRecent,
 		readFromSequence,
-		readAll: () => readFromSequence(0, Number.MAX_SAFE_INTEGER)
+		readThroughSequence,
+		latestSequence,
+		readAll: () => readFromSequence(0, Number.MAX_SAFE_INTEGER),
+		hasEventAfter
 	};
 });
 const OrchestrationEventStoreLive = effect.Layer.effect(OrchestrationEventStore, makeEventStore);
@@ -98053,7 +98991,8 @@ function requireThreadHasUserMessage(input) {
 	return requireThread(input).pipe(effect.Effect.flatMap((thread) => thread.messages.some((message) => message.role === "user") ? effect.Effect.succeed(thread) : effect.Effect.fail(invariantError(input.command.type, `Thread '${input.threadId}' cannot be archived before a message has been sent.`))));
 }
 function requireThreadAbsent(input) {
-	if (!findThreadById(input.readModel, input.threadId)) return effect.Effect.void;
+	const existing = findThreadById(input.readModel, input.threadId);
+	if (existing === void 0 || existing.deletedAt !== null) return effect.Effect.void;
 	return effect.Effect.fail(invariantError(input.command.type, `Thread '${input.threadId}' already exists and cannot be created twice.`));
 }
 //#endregion
@@ -100466,17 +101405,26 @@ const makeProjectionPendingApprovalRepository = effect.Effect.gen(function* () {
 		execute: ({ requestId }) => sql`
         DELETE FROM projection_pending_approvals
         WHERE request_id = ${requestId}
+      `
+	});
+	const deleteProjectionPendingApprovalRowsByThread = effect_unstable_sql_SqlSchema.void({
+		Request: ListProjectionPendingApprovalsInput,
+		execute: ({ threadId }) => sql`
+        DELETE FROM projection_pending_approvals
+        WHERE thread_id = ${threadId}
       `
 	});
 	const upsert = (row) => upsertProjectionPendingApprovalRow(row).pipe(effect.Effect.mapError(toPersistenceSqlError("ProjectionPendingApprovalRepository.upsert:query")));
 	const listByThreadId = (input) => listProjectionPendingApprovalRows(input).pipe(effect.Effect.mapError(toPersistenceSqlError("ProjectionPendingApprovalRepository.listByThreadId:query")));
 	const getByRequestId = (input) => getProjectionPendingApprovalRow(input).pipe(effect.Effect.mapError(toPersistenceSqlError("ProjectionPendingApprovalRepository.getByRequestId:query")));
 	const deleteByRequestId = (input) => deleteProjectionPendingApprovalRow(input).pipe(effect.Effect.mapError(toPersistenceSqlError("ProjectionPendingApprovalRepository.deleteByRequestId:query")));
+	const deleteByThreadId = (input) => deleteProjectionPendingApprovalRowsByThread(input).pipe(effect.Effect.mapError(toPersistenceSqlError("ProjectionPendingApprovalRepository.deleteByThreadId:query")));
 	return {
 		upsert,
 		listByThreadId,
 		getByRequestId,
-		deleteByRequestId
+		deleteByRequestId,
+		deleteByThreadId
 	};
 });
 const ProjectionPendingApprovalRepositoryLive = effect.Layer.effect(ProjectionPendingApprovalRepository, makeProjectionPendingApprovalRepository);
@@ -101424,7 +102372,15 @@ const ORCHESTRATION_EVENT_PROJECTORS = {
 	"project.meta-updated": [ORCHESTRATION_PROJECTOR_NAMES.projects],
 	"project.avatar-set": [ORCHESTRATION_PROJECTOR_NAMES.projects],
 	"project.deleted": [ORCHESTRATION_PROJECTOR_NAMES.projects],
-	"thread.created": [ORCHESTRATION_PROJECTOR_NAMES.threads],
+	"thread.created": [
+		ORCHESTRATION_PROJECTOR_NAMES.threadMessages,
+		ORCHESTRATION_PROJECTOR_NAMES.threadProposedPlans,
+		ORCHESTRATION_PROJECTOR_NAMES.threadActivities,
+		ORCHESTRATION_PROJECTOR_NAMES.threadSessions,
+		ORCHESTRATION_PROJECTOR_NAMES.threadTurns,
+		ORCHESTRATION_PROJECTOR_NAMES.pendingApprovals,
+		ORCHESTRATION_PROJECTOR_NAMES.threads
+	],
 	"thread.deleted": [ORCHESTRATION_PROJECTOR_NAMES.threads],
 	"thread.archived": [ORCHESTRATION_PROJECTOR_NAMES.threads],
 	"thread.unarchived": [ORCHESTRATION_PROJECTOR_NAMES.threads],
@@ -101489,7 +102445,7 @@ function extractActivityRequestId(payload) {
 }
 function isStalePendingApprovalFailureDetail(detail) {
 	if (detail === null) return false;
-	return detail.includes("stale pending approval request") || detail.includes("unknown pending approval request") || detail.includes("unknown pending permission request");
+	return detail.includes("stale pending approval request") || detail.includes("unknown pending approval request") || detail.includes("unknown pending permission request") || detail.includes("unknown pending codex approval request");
 }
 function derivePendingUserInputStatesFromActivities(activities) {
 	const states = /* @__PURE__ */ new Map();
@@ -101574,7 +102530,6 @@ function collectThreadAttachmentRelativePaths(threadId, messages) {
 	if (!threadSegment) return /* @__PURE__ */ new Set();
 	const relativePaths = /* @__PURE__ */ new Set();
 	for (const message of messages) for (const attachment of message.attachments ?? []) {
-		if (attachment.type !== "image") continue;
 		const attachmentThreadSegment = parseThreadSegmentFromAttachmentId(attachment.id);
 		if (!attachmentThreadSegment || attachmentThreadSegment !== threadSegment) continue;
 		relativePaths.add(attachmentRelativePath(attachment));
@@ -101876,7 +102831,12 @@ const makeOrchestrationProjectionPipeline = effect.Effect.fn("makeOrchestrationP
 				return;
 			}
 			case "thread.deleted": {
-				attachmentSideEffects.deletedThreadIds.add(event.payload.threadId);
+				if (!(yield* eventStore.hasEventAfter({
+					aggregateKind: "thread",
+					aggregateId: event.payload.threadId,
+					type: "thread.created",
+					sequenceExclusive: event.sequence
+				}))) attachmentSideEffects.deletedThreadIds.add(event.payload.threadId);
 				const existingRow = yield* projectionThreadRepository.getById({ threadId: event.payload.threadId });
 				if (effect.Option.isNone(existingRow)) return;
 				yield* projectionThreadRepository.upsert({
@@ -102111,6 +103071,9 @@ const makeOrchestrationProjectionPipeline = effect.Effect.fn("makeOrchestrationP
 	});
 	const applyThreadMessagesProjection = effect.Effect.fn("applyThreadMessagesProjection")(function* (event, attachmentSideEffects) {
 		switch (event.type) {
+			case "thread.created":
+				yield* projectionThreadMessageRepository.deleteByThreadId({ threadId: event.payload.threadId });
+				return;
 			case "thread.message-sent": {
 				const existingMessage = yield* projectionThreadMessageRepository.getByMessageId({ messageId: event.payload.messageId });
 				const previousMessage = effect.Option.getOrUndefined(existingMessage);
@@ -102152,6 +103115,9 @@ const makeOrchestrationProjectionPipeline = effect.Effect.fn("makeOrchestrationP
 	});
 	const applyThreadProposedPlansProjection = effect.Effect.fn("applyThreadProposedPlansProjection")(function* (event, _attachmentSideEffects) {
 		switch (event.type) {
+			case "thread.created":
+				yield* projectionThreadProposedPlanRepository.deleteByThreadId({ threadId: event.payload.threadId });
+				return;
 			case "thread.proposed-plan-upserted":
 				yield* projectionThreadProposedPlanRepository.upsert({
 					planId: event.payload.proposedPlan.id,
@@ -102178,6 +103144,10 @@ const makeOrchestrationProjectionPipeline = effect.Effect.fn("makeOrchestrationP
 	});
 	const applyThreadActivitiesProjection = effect.Effect.fn("applyThreadActivitiesProjection")(function* (event, attachmentSideEffects) {
 		switch (event.type) {
+			case "thread.created":
+				yield* projectionThreadActivityRepository.deleteByThreadId({ threadId: event.payload.threadId });
+				yield* projectionThreadUserInputRequestRepository.deleteByThreadId({ threadId: event.payload.threadId });
+				return;
 			case "thread.activity-appended": {
 				const requestId = extractActivityRequestId(event.payload.activity.payload);
 				const activityPayload = typeof event.payload.activity.payload === "object" && event.payload.activity.payload !== null ? event.payload.activity.payload : null;
@@ -102233,6 +103203,10 @@ const makeOrchestrationProjectionPipeline = effect.Effect.fn("makeOrchestrationP
 		}
 	});
 	const applyThreadSessionsProjection = effect.Effect.fn("applyThreadSessionsProjection")(function* (event, _attachmentSideEffects) {
+		if (event.type === "thread.created") {
+			yield* projectionThreadSessionRepository.deleteByThreadId({ threadId: event.payload.threadId });
+			return;
+		}
 		if (event.type !== "thread.session-set") return;
 		yield* projectionThreadSessionRepository.upsert({
 			threadId: event.payload.threadId,
@@ -102249,6 +103223,9 @@ const makeOrchestrationProjectionPipeline = effect.Effect.fn("makeOrchestrationP
 	});
 	const applyThreadTurnsProjection = effect.Effect.fn("applyThreadTurnsProjection")(function* (event, _attachmentSideEffects) {
 		switch (event.type) {
+			case "thread.created":
+				yield* projectionTurnRepository.deleteByThreadId({ threadId: event.payload.threadId });
+				return;
 			case "thread.turn-start-requested":
 				yield* projectionTurnRepository.replacePendingTurnStart({
 					threadId: event.payload.threadId,
@@ -102424,6 +103401,9 @@ const makeOrchestrationProjectionPipeline = effect.Effect.fn("makeOrchestrationP
 	const applyCheckpointsProjection = () => effect.Effect.void;
 	const applyPendingApprovalsProjection = effect.Effect.fn("applyPendingApprovalsProjection")(function* (event, attachmentSideEffects) {
 		switch (event.type) {
+			case "thread.created":
+				yield* projectionPendingApprovalRepository.deleteByThreadId({ threadId: event.payload.threadId });
+				return;
 			case "thread.activity-appended": {
 				const requestId = extractActivityRequestId(event.payload.activity.payload) ?? event.metadata.requestId ?? null;
 				if (requestId === null) return;
@@ -102581,7 +103561,8 @@ const makeOrchestrationProjectionPipeline = effect.Effect.fn("makeOrchestrationP
 		const lastAppliedByProjector = new Map(projectors.map((projector) => [projector.name, 0]));
 		for (const row of stateRows) if (lastAppliedByProjector.has(row.projector)) lastAppliedByProjector.set(row.projector, row.lastAppliedSequence);
 		const replayFromSequence = Math.min(...lastAppliedByProjector.values());
-		yield* effect.Stream.runForEach(eventStore.readFromSequence(replayFromSequence), (event) => effect.Effect.gen(function* () {
+		const replayThroughSequence = yield* eventStore.latestSequence;
+		yield* effect.Stream.runForEach(eventStore.readThroughSequence(replayFromSequence, replayThroughSequence), (event) => effect.Effect.gen(function* () {
 			const projectorsToAdvance = projectors.filter((projector) => event.sequence > (lastAppliedByProjector.get(projector.name) ?? 0));
 			if (projectorsToAdvance.length === 0) return;
 			const postCommit = yield* sql.withTransaction(applyProjectorsForEvent(event, projectorsToAdvance));
@@ -106516,6 +107497,7 @@ exports.GITHUB_PULL_REQUEST_LIST_JSON_FIELDS = GITHUB_PULL_REQUEST_LIST_JSON_FIE
 exports.GitHubCli = GitHubCli;
 exports.GitHubCliError = GitHubCliError;
 exports.GitLabCli = GitLabCli;
+exports.MINIMUM_OPENCODE_VERSION = MINIMUM_OPENCODE_VERSION;
 exports.OpenCodeRuntime = OpenCodeRuntime;
 exports.OpenCodeRuntimeError = OpenCodeRuntimeError;
 exports.ProviderAdapterProcessError = ProviderAdapterProcessError;
@@ -106637,6 +107619,7 @@ exports.openCodeRuntimeErrorDetail = openCodeRuntimeErrorDetail;
 exports.parseGenericCliVersion = parseGenericCliVersion;
 exports.parseOpenCodeModelSlug = parseOpenCodeModelSlug;
 exports.providerModelsFromSettings = providerModelsFromSettings;
+exports.readPersistedAttachment = readPersistedAttachment;
 exports.redactAgentControlSecrets = redactAgentControlSecrets;
 exports.resolveAttachmentPath = resolveAttachmentPath;
 exports.resolveClaudeHomePath = resolveClaudeHomePath$1;
@@ -106654,4 +107637,5 @@ exports.toOpenCodeFileParts = toOpenCodeFileParts;
 exports.toOpenCodePermissionReply = toOpenCodePermissionReply;
 exports.toOpenCodeQuestionAnswers = toOpenCodeQuestionAnswers;
 exports.validateRankInboxThreadsResult = validateRankInboxThreadsResult;
+exports.verifyOpenCodeServerVersion = verifyOpenCodeServerVersion;
 exports.withoutStatusCheckRollupJsonField = withoutStatusCheckRollupJsonField;