@p4code/cli 0.1.9 → 0.1.11

package/dist/bin.mjs

@@ -233,7 +233,7 @@ const make$73 = () => {
 const layer$69 = Layer.sync(NetService, make$73);
 //#endregion
 //#region package.json
-var version = "0.1.9";
+var version = "0.1.11";
 //#endregion
 //#region src/config.ts
 /**
@@ -5557,8 +5557,6 @@ const ClientSettingsSchema = Schema$1.Struct({
 	sidebarProjectSortOrder: SidebarProjectSortOrder.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_SIDEBAR_PROJECT_SORT_ORDER))),
 	sidebarThreadSortOrder: SidebarThreadSortOrder.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_SIDEBAR_THREAD_SORT_ORDER))),
 	sidebarThreadPreviewCount: SidebarThreadPreviewCount.pipe(Schema$1.withDecodingDefault(Effect.succeed(6))),
-	sidebarV2Enabled: Schema$1.Boolean.pipe(Schema$1.withDecodingDefault(Effect.succeed(false))),
-	sidebarV2ConfiguredByUser: Schema$1.Boolean.pipe(Schema$1.withDecodingDefault(Effect.succeed(false))),
 	timestampFormat: TimestampFormat.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_TIMESTAMP_FORMAT))),
 	wordWrap: Schema$1.Boolean.pipe(Schema$1.withDecodingDefault(Effect.succeed(true)))
 });
@@ -5905,8 +5903,6 @@ Schema$1.Struct({
 	sidebarProjectSortOrder: Schema$1.optionalKey(SidebarProjectSortOrder),
 	sidebarThreadSortOrder: Schema$1.optionalKey(SidebarThreadSortOrder),
 	sidebarThreadPreviewCount: Schema$1.optionalKey(SidebarThreadPreviewCount),
-	sidebarV2Enabled: Schema$1.optionalKey(Schema$1.Boolean),
-	sidebarV2ConfiguredByUser: Schema$1.optionalKey(Schema$1.Boolean),
 	timestampFormat: Schema$1.optionalKey(TimestampFormat),
 	wordWrap: Schema$1.optionalKey(Schema$1.Boolean)
 });
@@ -7542,6 +7538,84 @@ var ProjectWriteFileError = class extends Schema$1.TaggedErrorClass()("ProjectWr
 	}
 };
 //#endregion
+//#region ../../packages/contracts/src/threadControl.ts
+/**
+* Thread control over MCP - the self-scoped toolkit an agent uses to act on
+* the thread it is running in.
+*
+* Deliberately narrow. The reported need was an agent renaming its own thread;
+* that needs no cross-thread reach, and the per-session bearer token is the
+* only thing guarding `/mcp` on a remote-reachable server, so a capability
+* that could rename arbitrary threads would be a capability to vandalise the
+* workspace from one leaked token. Delete and create are withheld outright,
+* the same answer the task toolkit gave. Settle is absent for a structural
+* reason rather than a policy one: the decider refuses `thread.settle` while
+* the thread's session is starting or running, and a self-scoped MCP call
+* always arrives from its own live session, so the call could never succeed.
+*
+* Quick-append to memory lives here too: it is the other thing an agent wants
+* to do *from* a thread, and it shares the toolkit's capability and scope.
+*
+* @module contracts/threadControl
+*/
+const ThreadRenameInput = Schema$1.Struct({ title: TrimmedNonEmptyString.annotate({ description: "The new thread title. Replaces the current one." }) });
+const ThreadRenameResult = Schema$1.Struct({
+	threadId: ThreadId,
+	title: TrimmedNonEmptyString
+});
+/**
+* Which memory file an append lands in.
+*
+* A closed union rather than a filename, because the target directory also
+* holds credentials and per-machine settings - the same reason the hub sync's
+* memory allowlist exists. These two names must stay within that allowlist
+* (`MEMORY_FILE_NAMES` in `sync/memoryFile.ts`), so an appended file is one
+* the sync will carry to the user's other machines rather than refuse.
+*/
+const MemoryAppendTarget = Schema$1.Literals(["CLAUDE.md", "AGENTS.md"]);
+const MemoryAppendInput = Schema$1.Struct({
+	text: TrimmedNonEmptyString.annotate({ description: "Markdown to append to the user-scope memory file, as its own block." }),
+	file: Schema$1.optional(MemoryAppendTarget.annotate({ description: "Which memory file to append to. Defaults to CLAUDE.md." }))
+});
+const MemoryAppendResult = Schema$1.Struct({
+	file: MemoryAppendTarget,
+	/** Absolute path the append landed in, so the agent can cite or inspect it. */
+	path: Schema$1.String
+});
+var ThreadToolUnavailableError = class extends Schema$1.TaggedErrorClass()("ThreadToolUnavailableError", {
+	capability: Schema$1.Literal("threads"),
+	environmentId: EnvironmentId,
+	threadId: ThreadId,
+	providerSessionId: TrimmedNonEmptyString,
+	providerInstanceId: ProviderInstanceId
+}) {
+	get message() {
+		return `MCP credential does not grant the ${this.capability} capability.`;
+	}
+};
+/** The orchestration engine declined or failed the rename command. */
+var ThreadRenameRejectedError = class extends Schema$1.TaggedErrorClass()("ThreadRenameRejectedError", {
+	threadId: ThreadId,
+	detail: Schema$1.String
+}) {
+	get message() {
+		return `Renaming thread ${this.threadId} failed: ${this.detail}`;
+	}
+};
+var MemoryAppendFailedError = class extends Schema$1.TaggedErrorClass()("MemoryAppendFailedError", {
+	file: MemoryAppendTarget,
+	detail: Schema$1.String
+}) {
+	get message() {
+		return `Appending to ${this.file} failed: ${this.detail}`;
+	}
+};
+const ThreadControlToolError = Schema$1.Union([
+	ThreadToolUnavailableError,
+	ThreadRenameRejectedError,
+	MemoryAppendFailedError
+]);
+//#endregion
 //#region ../../packages/contracts/src/agentAsset.ts
 /**
 * User-scope agent assets — the things that make an agent behave the same on
@@ -28990,414 +29064,1060 @@ const staticAndDevRouteLayer = HttpRouter.add("GET", "*", Effect.gen(function* (
 		contentType
 	});
 }));
-//#endregion
-//#region src/checkpointing/Errors.ts
-const CheckpointDiffOperation = Schema$1.Literals(["CheckpointDiffQuery.getTurnDiff", "CheckpointDiffQuery.getFullThreadDiff"]);
-/** The computed result does not satisfy the checkpoint RPC contract. */
-var CheckpointDiffResultInvalidError = class extends Schema$1.TaggedErrorClass()("CheckpointDiffResultInvalidError", {
-	operation: CheckpointDiffOperation,
-	threadId: ThreadId
-}) {
-	get message() {
-		const result = this.operation === "CheckpointDiffQuery.getTurnDiff" ? "turn diff" : "full thread diff";
-		return `Checkpoint invariant violation in ${this.operation}: Computed ${result} result does not satisfy contract schema.`;
-	}
-};
-/** Projection state no longer contains the requested checkpoint thread. */
-var CheckpointThreadNotFoundError = class extends Schema$1.TaggedErrorClass()("CheckpointThreadNotFoundError", {
-	operation: CheckpointDiffOperation,
-	threadId: ThreadId
-}) {
-	get message() {
-		return `Checkpoint invariant violation in ${this.operation}: Thread '${this.threadId}' not found.`;
-	}
-};
-/** The checkpoint thread has no workspace path from which to compute a diff. */
-var CheckpointWorkspacePathMissingError = class extends Schema$1.TaggedErrorClass()("CheckpointWorkspacePathMissingError", {
-	operation: CheckpointDiffOperation,
-	threadId: ThreadId
-}) {
-	get message() {
-		const diff = this.operation === "CheckpointDiffQuery.getTurnDiff" ? "turn diff" : "full thread diff";
-		return `Checkpoint invariant violation in ${this.operation}: Workspace path missing for thread '${this.threadId}' when computing ${diff}.`;
-	}
-};
-/** The requested turn lies beyond the latest available checkpoint. */
-var CheckpointTurnRangeUnavailableError = class extends Schema$1.TaggedErrorClass()("CheckpointTurnRangeUnavailableError", {
-	operation: CheckpointDiffOperation,
-	threadId: ThreadId,
-	requestedTurnCount: NonNegativeInt,
-	availableTurnCount: NonNegativeInt
-}) {
-	get message() {
-		return `Checkpoint unavailable for thread ${this.threadId} turn ${this.requestedTurnCount}: Turn diff range exceeds current turn count: requested ${this.requestedTurnCount}, current ${this.availableTurnCount}.`;
-	}
-};
-/** Expected checkpoint metadata does not contain the requested Git ref. */
-var CheckpointRefUnavailableError = class extends Schema$1.TaggedErrorClass()("CheckpointRefUnavailableError", {
-	operation: CheckpointDiffOperation,
-	threadId: ThreadId,
-	turnCount: NonNegativeInt,
-	checkpoint: Schema$1.Literals(["from", "to"])
-}) {
-	get message() {
-		return `Checkpoint unavailable for thread ${this.threadId} turn ${this.turnCount}: Checkpoint ref is unavailable for turn ${this.turnCount}.`;
+(() => {
+	try {
+		return process.env.NODE_ENV === "development";
+	} catch {
+		return false;
 	}
-};
-//#endregion
-//#region src/checkpointing/Utils.ts
-const CHECKPOINT_REFS_PREFIX = "refs/p4/checkpoints";
-function checkpointRefForThreadTurn(threadId, turnCount) {
-	return CheckpointRef.make(`${CHECKPOINT_REFS_PREFIX}/${Encoding.encodeBase64Url(threadId)}/turn/${turnCount}`);
-}
-function resolveThreadWorkspaceCwd(input) {
-	const worktreeCwd = input.thread.worktreePath ?? void 0;
-	if (worktreeCwd) return worktreeCwd;
-	return input.projects.find((project) => project.id === input.thread.projectId)?.workspaceRoot;
-}
+})();
+const COMMIT_METADATA_SPLIT = /(?=^From [a-f0-9]+ .+$)/m;
+const GIT_DIFF_FILE_BREAK_REGEX = /(?=^diff --git)/gm;
+const FILENAME_HEADER_REGEX = /^(---|\+\+\+)\s+([^\t\r\n]+)/;
+const FILENAME_HEADER_REGEX_GIT = /^(---|\+\+\+)\s+[ab]\/([^\t\r\n]+)/;
+const ALTERNATE_FILE_NAMES_GIT = /^diff --git (?:"a\/(.+?)"|a\/(.+?)) (?:"b\/(.+?)"|b\/(.+?))$/;
+const INDEX_LINE_METADATA = /^index ([0-9a-f]+)\.\.([0-9a-f]+)(?: (\d+))?$/i;
+Object.freeze({
+	fromStart: 0,
+	fromEnd: 0
+});
 //#endregion
-//#region src/git/remoteRefs.ts
-function parseRemoteNamesInGitOrder(stdout) {
-	const remoteNames = [];
-	for (const line of stdout.split("\n")) {
-		const remoteName = line.trim();
-		if (remoteName.length > 0) remoteNames.push(remoteName);
-	}
-	return remoteNames;
-}
-function parseRemoteNames(stdout) {
-	return parseRemoteNamesInGitOrder(stdout).toSorted((a, b) => b.length - a.length);
-}
-function parseRemoteRefWithRemoteNames(ref, remoteNames) {
-	const trimmedRef = ref.trim();
-	if (trimmedRef.length === 0) return null;
-	for (const remoteName of remoteNames) {
-		const remotePrefix = `${remoteName}/`;
-		if (!trimmedRef.startsWith(remotePrefix)) continue;
-		const branchName = trimmedRef.slice(remotePrefix.length).trim();
-		if (branchName.length === 0) return null;
-		return {
-			remoteRef: trimmedRef,
-			remoteName,
-			branchName
-		};
+//#region ../../node_modules/.pnpm/@pierre+diffs@1.3.0-beta.5_patch_hash=7cb6da88544119adda056b2f46f43956f99326227732da0b3_3b51331382fbad9d080c5033ee1e2a6a/node_modules/@pierre/diffs/dist/utils/cleanLastNewline.js
+function cleanLastNewline(contents) {
+	let end = contents.length;
+	if (contents.charCodeAt(end - 1) === 10) {
+		end--;
+		if (contents.charCodeAt(end - 1) === 13) end--;
 	}
-	return null;
-}
-function extractBranchNameFromRemoteRef(ref, options) {
-	const normalized = ref.trim();
-	if (normalized.length === 0) return "";
-	if (normalized.startsWith("refs/remotes/")) return extractBranchNameFromRemoteRef(normalized.slice(13), options);
-	const parsedRemoteRef = parseRemoteRefWithRemoteNames(normalized, options?.remoteName ? [options.remoteName] : options?.remoteNames ?? []);
-	if (parsedRemoteRef) return parsedRemoteRef.branchName;
-	const firstSlash = normalized.indexOf("/");
-	if (firstSlash === -1) return normalized;
-	return normalized.slice(firstSlash + 1).trim();
+	return contents.slice(0, end);
 }
 //#endregion
-//#region src/vcs/GitVcsDriverCore.ts
-const DEFAULT_TIMEOUT_MS$5 = 3e4;
-const DEFAULT_MAX_OUTPUT_BYTES$1 = 1e6;
-const OUTPUT_TRUNCATED_MARKER$1 = "\n\n[truncated]";
-const PREPARED_COMMIT_PATCH_MAX_OUTPUT_BYTES = 49e3;
-const RANGE_COMMIT_SUMMARY_MAX_OUTPUT_BYTES = 19e3;
-const RANGE_DIFF_SUMMARY_MAX_OUTPUT_BYTES = 19e3;
-const RANGE_DIFF_PATCH_MAX_OUTPUT_BYTES = 59e3;
-const REVIEW_DIFF_PATCH_MAX_OUTPUT_BYTES = 12e4;
-const REVIEW_UNTRACKED_DIFF_MAX_OUTPUT_BYTES = 8e4;
-const WORKSPACE_FILES_MAX_OUTPUT_BYTES$1 = 12e4;
-const STATUS_UPSTREAM_REFRESH_INTERVAL = Duration.seconds(15);
-const STATUS_UPSTREAM_REFRESH_TIMEOUT = Duration.seconds(5);
-const STATUS_UPSTREAM_REFRESH_FAILURE_BASE_COOLDOWN = Duration.seconds(30);
-const STATUS_UPSTREAM_REFRESH_FAILURE_MAX_COOLDOWN = Duration.minutes(15);
-const STATUS_UPSTREAM_REFRESH_CACHE_CAPACITY = 2048;
-const REPOSITORY_PATHS_CACHE_CAPACITY = 2048;
-const REPOSITORY_PATHS_CACHE_TTL = Duration.minutes(10);
-const REPOSITORY_PATHS_REFRESH_COALESCE_TTL = Duration.seconds(5);
-const NON_REPOSITORY_PATHS_CACHE_TTL = Duration.seconds(1);
-const LIST_REFS_SNAPSHOT_CACHE_CAPACITY = 64;
-const LIST_REFS_SNAPSHOT_CACHE_TTL = Duration.minutes(2);
-const LIST_REFS_REFRESH_COALESCE_TTL = Duration.seconds(5);
-const LIST_REFS_REFRESH_FAILURE_COOLDOWN = Duration.seconds(30);
-const STATUS_UPSTREAM_REFRESH_ENV = Object.freeze({
-	GCM_INTERACTIVE: "never",
-	GIT_ASKPASS: "",
-	GIT_TERMINAL_PROMPT: "0",
-	SSH_ASKPASS: "",
-	SSH_ASKPASS_REQUIRE: "never"
-});
-const DEFAULT_BASE_BRANCH_CANDIDATES = ["main", "master"];
-const GIT_LIST_BRANCHES_DEFAULT_LIMIT = 100;
-const NON_REPOSITORY_STATUS_DETAILS = Object.freeze({
-	isRepo: false,
-	hasOriginRemote: false,
-	isDefaultBranch: false,
-	branch: null,
-	upstreamRef: null,
-	hasWorkingTreeChanges: false,
-	workingTree: {
-		files: [],
-		insertions: 0,
-		deletions: 0
-	},
-	hasUpstream: false,
-	aheadCount: 0,
-	behindCount: 0,
-	aheadOfDefaultCount: 0
-});
-const NON_REPOSITORY_REMOTE_STATUS_DETAILS = Object.freeze({
-	isRepo: false,
-	isDefaultBranch: false,
-	branch: null,
-	upstreamRef: null,
-	hasUpstream: false,
-	aheadCount: 0,
-	behindCount: 0,
-	aheadOfDefaultCount: 0
-});
-var StatusRemoteRefreshCacheKey = class extends Data.Class {};
-function statusUpstreamRefreshFailureCooldown(consecutiveFailures) {
-	const exponent = Math.max(0, consecutiveFailures - 1);
-	const cooldownMs = Duration.toMillis(STATUS_UPSTREAM_REFRESH_FAILURE_BASE_COOLDOWN) * Math.pow(2, exponent);
-	return Duration.min(Duration.millis(cooldownMs), STATUS_UPSTREAM_REFRESH_FAILURE_MAX_COOLDOWN);
-}
-var GitRefsSnapshotCacheKey = class extends Data.Class {};
-var GitRefsRefreshCacheKey = class extends Data.Class {};
-function parseBranchAb(value) {
-	const match = value.match(/^\+(\d+)\s+-(\d+)$/);
-	if (!match) return {
-		ahead: 0,
-		behind: 0
-	};
-	return {
-		ahead: Number(match[1] ?? "0"),
-		behind: Number(match[2] ?? "0")
-	};
-}
-function parseNumstatEntries(stdout) {
-	const entries = [];
-	for (const line of stdout.split(/\r?\n/g)) {
-		if (line.trim().length === 0) continue;
-		const [addedRaw, deletedRaw, ...pathParts] = line.split("	");
-		const rawPath = pathParts.length > 1 ? (pathParts.at(-1) ?? "").trim() : pathParts.join("	").trim();
-		if (rawPath.length === 0) continue;
-		const added = Number.parseInt(addedRaw ?? "0", 10);
-		const deleted = Number.parseInt(deletedRaw ?? "0", 10);
-		const renameArrowIndex = rawPath.indexOf(" => ");
-		const normalizedPath = renameArrowIndex >= 0 ? rawPath.slice(renameArrowIndex + 4).trim() : rawPath;
-		entries.push({
-			path: normalizedPath.length > 0 ? normalizedPath : rawPath,
-			insertions: Number.isFinite(added) ? added : 0,
-			deletions: Number.isFinite(deleted) ? deleted : 0
-		});
-	}
-	return entries;
-}
-function parsePorcelainPath(line) {
-	if (line.startsWith("? ") || line.startsWith("! ")) {
-		const simple = line.slice(2).trim();
-		return simple.length > 0 ? simple : null;
-	}
-	if (!(line.startsWith("1 ") || line.startsWith("2 ") || line.startsWith("u "))) return null;
-	const tabIndex = line.indexOf("	");
-	if (tabIndex >= 0) {
-		const [filePath] = line.slice(tabIndex + 1).split("	");
-		return filePath?.trim().length ? filePath.trim() : null;
-	}
-	const filePath = line.trim().split(/\s+/g).at(-1) ?? "";
-	return filePath.length > 0 ? filePath : null;
-}
-function filterBranchesForListQuery(refs, query) {
-	if (!query) return refs;
-	const normalizedQuery = query.toLowerCase();
-	return refs.filter((refName) => refName.name.toLowerCase().includes(normalizedQuery));
-}
-function paginateBranches(input) {
-	const cursor = input.cursor ?? 0;
-	const limit = input.limit ?? GIT_LIST_BRANCHES_DEFAULT_LIMIT;
-	const totalCount = input.refs.length;
-	const refs = input.refs.slice(cursor, cursor + limit);
-	return {
-		refs,
-		nextCursor: cursor + refs.length < totalCount ? cursor + refs.length : null,
-		totalCount
-	};
-}
-function parseWorktreeBranchPaths(stdout) {
-	const worktreePaths = /* @__PURE__ */ new Map();
-	let currentPath = null;
-	let currentBranch = null;
-	let currentPrunable = false;
-	const flush = () => {
-		if (currentPath !== null && currentBranch !== null && !currentPrunable) worktreePaths.set(currentBranch, currentPath);
-		currentPath = null;
-		currentBranch = null;
-		currentPrunable = false;
-	};
-	for (const field of stdout.split("\0")) if (field === "") flush();
-	else if (field.startsWith("worktree ")) currentPath = field.slice(9);
-	else if (field.startsWith("branch refs/heads/")) currentBranch = field.slice(18);
-	else if (field === "prunable" || field.startsWith("prunable ")) currentPrunable = true;
-	flush();
-	return worktreePaths;
-}
-function splitNullSeparatedPaths$1(input, truncated) {
-	const parts = input.split("\0");
-	if (parts.length === 0) return [];
-	if (truncated && parts[parts.length - 1]?.length) parts.pop();
-	return parts.filter((value) => value.length > 0);
-}
-function splitNullSeparatedGitStdoutPaths(result) {
-	return splitNullSeparatedPaths$1(result.stdout, result.stdoutTruncated);
+//#region ../../node_modules/.pnpm/@pierre+diffs@1.3.0-beta.5_patch_hash=7cb6da88544119adda056b2f46f43956f99326227732da0b3_3b51331382fbad9d080c5033ee1e2a6a/node_modules/@pierre/diffs/dist/utils/detachString.js
+const stringDetachEncoder = new TextEncoder();
+const stringDetachDecoder = new TextDecoder("utf-8", { ignoreBOM: true });
+const SURROGATE_CODE_UNIT_PATTERN = /[\uD800-\uDFFF]/;
+const STRING_DETACH_INITIAL_BUFFER_SIZE = 1024;
+let stringDetachBuffer = new Uint8Array(STRING_DETACH_INITIAL_BUFFER_SIZE);
+function releaseStringDetachBuffer() {
+	if (stringDetachBuffer.length !== STRING_DETACH_INITIAL_BUFFER_SIZE) stringDetachBuffer = new Uint8Array(STRING_DETACH_INITIAL_BUFFER_SIZE);
 }
-function sanitizeRemoteName(value) {
-	const sanitized = value.trim().replace(/[^A-Za-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
-	return sanitized.length > 0 ? sanitized : "fork";
+function detachString(value) {
+	if (value.length === 0) return value;
+	if (SURROGATE_CODE_UNIT_PATTERN.test(value)) return JSON.parse(JSON.stringify(value));
+	const requiredByteLength = value.length * 3;
+	if (stringDetachBuffer.length < requiredByteLength) stringDetachBuffer = new Uint8Array(requiredByteLength);
+	const { written } = stringDetachEncoder.encodeInto(value, stringDetachBuffer);
+	return stringDetachDecoder.decode(stringDetachBuffer.subarray(0, written));
 }
-function parseRemoteFetchUrls(stdout) {
-	const remotes = /* @__PURE__ */ new Map();
-	for (const line of stdout.split("\n")) {
-		const trimmed = line.trim();
-		if (trimmed.length === 0) continue;
-		const match = /^(\S+)\s+(\S+)\s+\((fetch|push)\)$/.exec(trimmed);
-		if (!match) continue;
-		const [, remoteName = "", remoteUrl = "", direction = ""] = match;
-		if (direction !== "fetch" || remoteName.length === 0 || remoteUrl.length === 0) continue;
-		remotes.set(remoteName, remoteUrl);
+//#endregion
+//#region ../../node_modules/.pnpm/@pierre+diffs@1.3.0-beta.5_patch_hash=7cb6da88544119adda056b2f46f43956f99326227732da0b3_3b51331382fbad9d080c5033ee1e2a6a/node_modules/@pierre/diffs/dist/utils/parsePatchFiles.js
+function processPatch(data, cacheKeyPrefix, throwOnError) {
+	try {
+		return _processPatch(data, cacheKeyPrefix, throwOnError);
+	} finally {
+		releaseStringDetachBuffer();
 	}
-	return remotes;
-}
-function parseUpstreamRefWithRemoteNames(upstreamRef, remoteNames) {
-	const parsed = parseRemoteRefWithRemoteNames(upstreamRef, remoteNames);
-	if (!parsed) return null;
-	return {
-		upstreamRef,
-		remoteName: parsed.remoteName,
-		branchName: parsed.branchName
-	};
-}
-function parseUpstreamRefByFirstSeparator(upstreamRef) {
-	const separatorIndex = upstreamRef.indexOf("/");
-	if (separatorIndex <= 0 || separatorIndex === upstreamRef.length - 1) return null;
-	const remoteName = upstreamRef.slice(0, separatorIndex).trim();
-	const branchName = upstreamRef.slice(separatorIndex + 1).trim();
-	if (remoteName.length === 0 || branchName.length === 0) return null;
-	return {
-		upstreamRef,
-		remoteName,
-		branchName
-	};
 }
-function parseTrackingBranchByUpstreamRef(stdout, upstreamRef) {
-	for (const line of stdout.split("\n")) {
-		const trimmedLine = line.trim();
-		if (trimmedLine.length === 0) continue;
-		const [branchNameRaw, upstreamBranchRaw = ""] = trimmedLine.split("	");
-		const branchName = branchNameRaw?.trim() ?? "";
-		const candidateUpstreamRef = upstreamBranchRaw.trim();
-		if (branchName.length === 0 || candidateUpstreamRef.length === 0) continue;
-		if (candidateUpstreamRef === upstreamRef) return branchName;
+function _processPatch(data, cacheKeyPrefix, throwOnError = false) {
+	const isGitDiff = isGitDiffPatch(data);
+	const rawFiles = isGitDiff ? splitGitDiffFiles(data) : splitUnifiedDiffFiles(data);
+	let patchMetadata;
+	const files = [];
+	for (const fileOrPatchMetadata of rawFiles) {
+		if (isGitDiff && !GIT_DIFF_FILE_BREAK_REGEX.test(fileOrPatchMetadata)) {
+			if (patchMetadata == null) patchMetadata = detachString(fileOrPatchMetadata);
+			else if (throwOnError) throw Error("parsePatchContent: unknown file blob");
+			else console.error("parsePatchContent: unknown file blob:", fileOrPatchMetadata);
+			continue;
+		} else if (!isGitDiff && !startsWithUnifiedDiffFileHeader(fileOrPatchMetadata)) {
+			if (patchMetadata == null) patchMetadata = detachString(fileOrPatchMetadata);
+			else if (throwOnError) throw Error("parsePatchContent: unknown file blob");
+			else console.error("parsePatchContent: unknown file blob:", fileOrPatchMetadata);
+			continue;
+		}
+		const currentFile = _processFile(fileOrPatchMetadata, {
+			cacheKey: cacheKeyPrefix != null ? `${cacheKeyPrefix}-${files.length}` : void 0,
+			isGitDiff,
+			throwOnError
+		});
+		if (currentFile != null) files.push(currentFile);
 	}
-	return null;
-}
-function deriveLocalBranchNameFromRemoteRef(branchName) {
-	const separatorIndex = branchName.indexOf("/");
-	if (separatorIndex <= 0 || separatorIndex === branchName.length - 1) return null;
-	const localBranch = branchName.slice(separatorIndex + 1).trim();
-	return localBranch.length > 0 ? localBranch : null;
-}
-function gitCommandContext(input) {
 	return {
-		operation: input.operation,
-		command: "git",
-		cwd: input.cwd,
-		argumentCount: input.args.length
+		patchMetadata,
+		files
 	};
 }
-function parseDefaultBranchFromRemoteHeadRef(value, remoteName) {
-	const trimmed = value.trim();
-	const prefix = `refs/remotes/${remoteName}/`;
-	if (!trimmed.startsWith(prefix)) return null;
-	const refName = trimmed.slice(prefix.length).trim();
-	return refName.length > 0 ? refName : null;
-}
-function isMissingGitCwdError(error) {
-	if (!(error.cause instanceof PlatformError.PlatformError)) return false;
-	const reason = error.cause.reason;
-	if (reason._tag === "NotFound") return reason.pathOrDescriptor === error.cwd;
-	return reason._tag === "BadResource" && reason.pathOrDescriptor === error.cwd && typeof reason.cause === "object" && reason.cause !== null && "code" in reason.cause && reason.cause.code === "ENOTDIR";
-}
-function isNonRepositoryGitStderr(stderr) {
-	return stderr.toLowerCase().includes("not a git repository");
-}
-const nowUnixNano = DateTime.now.pipe(Effect.map((now) => BigInt(DateTime.toEpochMillis(now)) * 1000000n));
-const addCurrentSpanEvent = (name, attributes) => Effect.gen(function* () {
-	const span = yield* Effect.currentSpan;
-	const timestamp = yield* nowUnixNano;
-	yield* Effect.sync(() => {
-		span.event(name, timestamp, compactTraceAttributes(attributes));
-	});
-}).pipe(Effect.catchTags({ NoSuchElementError: () => Effect.void }));
-function trace2ChildKey(record) {
-	const childId = record.child_id;
-	if (typeof childId === "number" || typeof childId === "string") return String(childId);
-	const hookName = record.hook_name;
-	return typeof hookName === "string" && hookName.trim().length > 0 ? hookName.trim() : null;
-}
-const Trace2Record = Schema$1.Record(Schema$1.String, Schema$1.Unknown);
-const createTrace2Monitor = Effect.fn("createTrace2Monitor")(function* (input, progress) {
-	if (!progress?.onHookStarted && !progress?.onHookFinished) return {
-		env: {},
-		flush: Effect.void
-	};
-	const fs = yield* FileSystem.FileSystem;
-	const path = yield* Path.Path;
-	const traceFilePath = yield* fs.makeTempFileScoped({
-		prefix: `p4code-git-trace2-${process.pid}-`,
-		suffix: ".json"
-	});
-	const hookStartByChildKey = /* @__PURE__ */ new Map();
-	const traceTailState = yield* Ref.make({
-		processedChars: 0,
-		remainder: ""
-	});
-	const handleTraceLine = Effect.fn("handleTraceLine")(function* (line) {
-		const trimmedLine = line.trim();
-		if (trimmedLine.length === 0) return;
-		const traceRecord = decodeJsonResult(Trace2Record)(trimmedLine);
-		if (Result.isFailure(traceRecord)) {
-			yield* Effect.logDebug(`GitVcsDriver.trace2: failed to parse trace line for ${input.operation} in ${input.cwd} (${input.args.length} arguments)`, traceRecord.failure);
-			return;
-		}
-		if (traceRecord.success.child_class !== "hook") return;
-		const event = traceRecord.success.event;
-		const childKey = trace2ChildKey(traceRecord.success);
-		if (childKey === null) return;
-		const started = hookStartByChildKey.get(childKey);
-		const hookNameFromEvent = typeof traceRecord.success.hook_name === "string" ? traceRecord.success.hook_name.trim() : "";
-		const hookName = hookNameFromEvent.length > 0 ? hookNameFromEvent : started?.hookName ?? "";
-		if (hookName.length === 0) return;
-		if (event === "child_start") {
-			const now = yield* DateTime.now;
-			hookStartByChildKey.set(childKey, {
-				hookName,
-				startedAtMs: DateTime.toEpochMillis(now)
-			});
-			yield* addCurrentSpanEvent("git.hook.started", { hookName });
-			if (progress.onHookStarted) yield* progress.onHookStarted(hookName);
-			return;
+function _processFile(fileDiffString, { cacheKey, isGitDiff = GIT_DIFF_FILE_BREAK_REGEX.test(fileDiffString), oldFile, newFile, throwOnError = false } = {}) {
+	let lastHunkEnd = 0;
+	const hunks = splitAtLinePrefix(fileDiffString, "@@ ");
+	let currentFile;
+	const isPartial = oldFile == null || newFile == null;
+	let deletionLineIndex = 0;
+	let additionLineIndex = 0;
+	for (const hunk of hunks) {
+		const lines = splitWithNewlines(hunk);
+		const firstLine = lines[0];
+		if (firstLine == null) {
+			if (throwOnError) throw Error("parsePatchContent: invalid hunk");
+			else console.error("parsePatchContent: invalid hunk", hunk);
+			continue;
 		}
-		if (event === "child_exit") {
-			hookStartByChildKey.delete(childKey);
-			const code = traceRecord.success.exitCode;
-			const exitCode = typeof code === "number" && Number.isInteger(code) ? code : null;
-			const now = yield* DateTime.now;
-			const durationMs = started ? Math.max(0, DateTime.toEpochMillis(now) - started.startedAtMs) : null;
-			yield* addCurrentSpanEvent("git.hook.finished", {
-				hookName: started?.hookName ?? hookName,
-				exitCode,
-				durationMs
-			});
+		const fileHeader = parseHunkHeader(firstLine);
+		let additionLines = 0;
+		let deletionLines = 0;
+		if (fileHeader == null || currentFile == null) {
+			if (currentFile != null) {
+				if (throwOnError) throw Error("parsePatchContent: Invalid hunk");
+				else console.error("parsePatchContent: Invalid hunk", hunk);
+				continue;
+			}
+			currentFile = {
+				name: "",
+				type: "change",
+				hunks: [],
+				splitLineCount: 0,
+				unifiedLineCount: 0,
+				isPartial,
+				additionLines: !isPartial && oldFile != null && newFile != null ? splitFileContents(newFile.contents) : [],
+				deletionLines: !isPartial && oldFile != null && newFile != null ? splitFileContents(oldFile.contents) : [],
+				cacheKey: maybeDetachOptionalString(cacheKey)
+			};
+			if (currentFile.additionLines.length === 1 && newFile?.contents === "") currentFile.additionLines.length = 0;
+			if (currentFile.deletionLines.length === 1 && oldFile?.contents === "") currentFile.deletionLines.length = 0;
+			for (const line of lines) {
+				if (line.startsWith("diff --git")) {
+					const filenameMatch$1 = line.trim().match(ALTERNATE_FILE_NAMES_GIT);
+					const prevName = filenameMatch$1?.[1] ?? filenameMatch$1?.[2];
+					const name = filenameMatch$1?.[3] ?? filenameMatch$1?.[4];
+					if (prevName == null || name == null) {
+						if (throwOnError) throw Error("parsePatchContent: invalid git diff header");
+						else console.error("parsePatchContent: invalid git diff header", line);
+						continue;
+					}
+					currentFile.name = detachString(name.trim());
+					if (prevName !== name) currentFile.prevName = detachString(prevName.trim());
+					continue;
+				}
+				const filenameMatch = line.startsWith("---") || line.startsWith("+++") ? line.match(isGitDiff ? FILENAME_HEADER_REGEX_GIT : FILENAME_HEADER_REGEX) : null;
+				if (filenameMatch != null) {
+					const [, type, fileName] = filenameMatch;
+					if (type === "---" && fileName !== "/dev/null") {
+						const detachedFileName = detachString(fileName.trim());
+						currentFile.prevName = detachedFileName;
+						currentFile.name = detachedFileName;
+					} else if (type === "+++" && fileName !== "/dev/null") currentFile.name = detachString(fileName.trim());
+				} else if (isGitDiff) {
+					if (line.startsWith("new mode ")) currentFile.mode = detachString(line.slice(8).trim());
+					if (line.startsWith("old mode ")) currentFile.prevMode = detachString(line.slice(8).trim());
+					if (line.startsWith("new file mode")) {
+						currentFile.type = "new";
+						currentFile.mode = detachString(line.slice(13).trim());
+					}
+					if (line.startsWith("deleted file mode")) {
+						currentFile.type = "deleted";
+						currentFile.mode = detachString(line.slice(17).trim());
+					}
+					if (line.startsWith("similarity index")) if (line.startsWith("similarity index 100%")) currentFile.type = "rename-pure";
+					else currentFile.type = "rename-changed";
+					if (line.startsWith("index ")) {
+						const [, prevObjectId, newObjectId, mode] = line.trim().match(INDEX_LINE_METADATA) ?? [];
+						if (prevObjectId != null) currentFile.prevObjectId = detachString(prevObjectId);
+						if (newObjectId != null) currentFile.newObjectId = detachString(newObjectId);
+						if (mode != null) currentFile.mode = detachString(mode);
+					}
+					if (line.startsWith("rename from ")) currentFile.prevName = detachString(line.slice(12).trim());
+					if (line.startsWith("rename to ")) currentFile.name = detachString(line.slice(10).trim());
+				}
+			}
+			continue;
+		}
+		let currentContent;
+		let lastLineType;
+		while (lines.length > 0 && (lines[lines.length - 1] === "\n" || lines[lines.length - 1] === "\r" || lines[lines.length - 1] === "\r\n" || lines[lines.length - 1] === "")) lines.pop();
+		const { additionStart, deletionStart } = fileHeader;
+		deletionLineIndex = isPartial ? deletionLineIndex : deletionStart - 1;
+		additionLineIndex = isPartial ? additionLineIndex : additionStart - 1;
+		const hunkData = {
+			collapsedBefore: 0,
+			splitLineCount: 0,
+			splitLineStart: 0,
+			unifiedLineCount: 0,
+			unifiedLineStart: 0,
+			additionCount: fileHeader.additionCount,
+			additionStart,
+			additionLines,
+			deletionCount: fileHeader.deletionCount,
+			deletionStart,
+			deletionLines,
+			deletionLineIndex,
+			additionLineIndex,
+			hunkContent: [],
+			hunkContext: maybeDetachOptionalString(fileHeader.hunkContext),
+			hunkSpecs: detachString(firstLine),
+			noEOFCRAdditions: false,
+			noEOFCRDeletions: false
+		};
+		let parsedAdditionLines = 0;
+		let parsedDeletionLines = 0;
+		for (let lineIndex = 1; lineIndex < lines.length; lineIndex++) {
+			const rawLine = lines[lineIndex];
+			if (parsedAdditionLines >= hunkData.additionCount && parsedDeletionLines >= hunkData.deletionCount && !rawLine.startsWith("\\")) {
+				if (throwOnError && isHunkBodyLine(rawLine) && !isFormatPatchVersionSeparator(rawLine)) throw Error("parsePatchContent: hunk has more lines than expected");
+				break;
+			}
+			const firstChar = rawLine[0];
+			if (firstChar !== "+" && firstChar !== "-" && firstChar !== " " && firstChar !== "\\") {
+				if (throwOnError) throw Error("parsePatchContent: invalid hunk line");
+				console.error(`parseLineType: Invalid firstChar: "${firstChar}", full line: "${rawLine}"`);
+				console.error("processFile: invalid rawLine:", rawLine);
+				continue;
+			}
+			const type = parseRawLineType(firstChar);
+			if (type === "addition") {
+				if (throwOnError && parsedAdditionLines >= hunkData.additionCount) throw Error("parsePatchContent: hunk has too many addition lines");
+				const line = getParsedLineContent(rawLine);
+				if (currentContent == null || currentContent.type !== "change") {
+					currentContent = createContentGroup("change", deletionLineIndex, additionLineIndex);
+					hunkData.hunkContent.push(currentContent);
+				}
+				additionLineIndex++;
+				parsedAdditionLines++;
+				if (isPartial) currentFile.additionLines.push(line);
+				currentContent.additions++;
+				additionLines++;
+				lastLineType = "addition";
+			} else if (type === "deletion") {
+				if (throwOnError && parsedDeletionLines >= hunkData.deletionCount) throw Error("parsePatchContent: hunk has too many deletion lines");
+				const line = getParsedLineContent(rawLine);
+				if (currentContent == null || currentContent.type !== "change") {
+					currentContent = createContentGroup("change", deletionLineIndex, additionLineIndex);
+					hunkData.hunkContent.push(currentContent);
+				}
+				deletionLineIndex++;
+				parsedDeletionLines++;
+				if (isPartial) currentFile.deletionLines.push(line);
+				currentContent.deletions++;
+				deletionLines++;
+				lastLineType = "deletion";
+			} else if (type === "context") {
+				if (throwOnError && (parsedDeletionLines >= hunkData.deletionCount || parsedAdditionLines >= hunkData.additionCount)) throw Error("parsePatchContent: hunk has too many context lines");
+				const line = getParsedLineContent(rawLine);
+				if (currentContent == null || currentContent.type !== "context") {
+					currentContent = createContentGroup("context", deletionLineIndex, additionLineIndex);
+					hunkData.hunkContent.push(currentContent);
+				}
+				additionLineIndex++;
+				deletionLineIndex++;
+				parsedAdditionLines++;
+				parsedDeletionLines++;
+				if (isPartial) {
+					currentFile.deletionLines.push(line);
+					currentFile.additionLines.push(line);
+				}
+				currentContent.lines++;
+				lastLineType = "context";
+			} else if (type === "metadata" && currentContent != null) {
+				if (currentContent.type === "context") {
+					hunkData.noEOFCRAdditions = true;
+					hunkData.noEOFCRDeletions = true;
+				} else if (lastLineType === "deletion") hunkData.noEOFCRDeletions = true;
+				else if (lastLineType === "addition") hunkData.noEOFCRAdditions = true;
+				if (isPartial && (lastLineType === "addition" || lastLineType === "context")) {
+					const lastIndex = currentFile.additionLines.length - 1;
+					if (lastIndex >= 0) currentFile.additionLines[lastIndex] = cleanLastNewline(currentFile.additionLines[lastIndex]);
+				}
+				if (isPartial && (lastLineType === "deletion" || lastLineType === "context")) {
+					const lastIndex = currentFile.deletionLines.length - 1;
+					if (lastIndex >= 0) currentFile.deletionLines[lastIndex] = cleanLastNewline(currentFile.deletionLines[lastIndex]);
+				}
+			}
+		}
+		if (throwOnError && (parsedAdditionLines !== hunkData.additionCount || parsedDeletionLines !== hunkData.deletionCount)) throw Error("parsePatchContent: hunk line count mismatch");
+		hunkData.additionLines = additionLines;
+		hunkData.deletionLines = deletionLines;
+		hunkData.collapsedBefore = Math.max(hunkData.additionStart - 1 - lastHunkEnd, 0);
+		currentFile.hunks.push(hunkData);
+		lastHunkEnd = hunkData.additionStart + hunkData.additionCount - 1;
+		for (const content of hunkData.hunkContent) if (content.type === "context") {
+			hunkData.splitLineCount += content.lines;
+			hunkData.unifiedLineCount += content.lines;
+		} else {
+			hunkData.splitLineCount += Math.max(content.additions, content.deletions);
+			hunkData.unifiedLineCount += content.deletions + content.additions;
+		}
+		hunkData.splitLineStart = currentFile.splitLineCount + hunkData.collapsedBefore;
+		hunkData.unifiedLineStart = currentFile.unifiedLineCount + hunkData.collapsedBefore;
+		currentFile.splitLineCount += hunkData.collapsedBefore + hunkData.splitLineCount;
+		currentFile.unifiedLineCount += hunkData.collapsedBefore + hunkData.unifiedLineCount;
+	}
+	if (currentFile == null) return;
+	if (throwOnError && isPartial && !isGitDiff && currentFile.hunks.length === 0) throw Error("parsePatchContent: unified file has no hunks");
+	if (currentFile.hunks.length > 0 && !isPartial && currentFile.additionLines.length > 0 && currentFile.deletionLines.length > 0) {
+		const lastHunk = currentFile.hunks[currentFile.hunks.length - 1];
+		const lastHunkEnd$1 = lastHunk.additionStart + lastHunk.additionCount - 1;
+		const totalFileLines = currentFile.additionLines.length;
+		const collapsedAfter = Math.max(totalFileLines - lastHunkEnd$1, 0);
+		currentFile.splitLineCount += collapsedAfter;
+		currentFile.unifiedLineCount += collapsedAfter;
+	}
+	if (!isGitDiff) {
+		if (currentFile.prevName != null && currentFile.name !== currentFile.prevName) if (currentFile.hunks.length > 0) currentFile.type = "rename-changed";
+		else currentFile.type = "rename-pure";
+		else if ((oldFile == null || oldFile.contents === "") && newFile != null && newFile.contents !== "") currentFile.type = "new";
+		else if (oldFile != null && oldFile.contents !== "" && (newFile == null || newFile.contents === "")) currentFile.type = "deleted";
+	}
+	if (currentFile.type !== "rename-pure" && currentFile.type !== "rename-changed") currentFile.prevName = void 0;
+	return currentFile;
+}
+/**
+* Parses a patch file string into an array of parsed patches.
+*
+* @param data - The raw patch file content (supports multi-commit patches)
+* @param cacheKeyPrefix - Optional prefix for generating cache keys. When provided,
+*   each file in the patch will get a cache key in the format `prefix-patchIndex-fileIndex`.
+*   This enables caching of rendered diff results in the worker pool.
+*/
+function parsePatchFiles(data, cacheKeyPrefix, throwOnError = false) {
+	const patches = [];
+	const rawPatches = hasCommitMetadataBoundary(data) ? data.split(COMMIT_METADATA_SPLIT) : [data];
+	for (const patch of rawPatches) try {
+		patches.push(processPatch(patch, cacheKeyPrefix != null ? `${cacheKeyPrefix}-${patches.length}` : void 0, throwOnError));
+	} catch (error) {
+		if (throwOnError) throw error;
+		else console.error(error);
+	}
+	return patches;
+}
+function hasCommitMetadataBoundary(data) {
+	return data.startsWith("From ") || data.includes("\nFrom ");
+}
+function splitFileContents(contents) {
+	const lines = splitWithNewlines(contents);
+	for (let index = 0; index < lines.length; index++) lines[index] = detachString(lines[index]);
+	return lines;
+}
+function splitWithNewlines(contents) {
+	if (contents.length === 0) return [""];
+	const lines = [];
+	let startIndex = 0;
+	for (;;) {
+		const newlineIndex = contents.indexOf("\n", startIndex);
+		if (newlineIndex === -1) break;
+		lines.push(contents.slice(startIndex, newlineIndex + 1));
+		startIndex = newlineIndex + 1;
+	}
+	if (startIndex < contents.length) lines.push(contents.slice(startIndex));
+	return lines;
+}
+function splitGitDiffFiles(contents) {
+	return splitAtLinePrefix(contents, "diff --git");
+}
+function splitUnifiedDiffFiles(contents) {
+	if (contents.length === 0) return [""];
+	const parts = [];
+	let partStartIndex = 0;
+	let lineStartIndex = 0;
+	let remainingDeletionLines = 0;
+	let remainingAdditionLines = 0;
+	let hasOpenedUnifiedFile = false;
+	while (lineStartIndex < contents.length) {
+		const nextLineStartIndex = getNextLineStartIndex(contents, lineStartIndex);
+		if (remainingDeletionLines <= 0 && remainingAdditionLines <= 0) {
+			if (isUnifiedDiffFileHeaderAt(contents, lineStartIndex)) {
+				if (lineStartIndex > partStartIndex) parts.push(contents.slice(partStartIndex, lineStartIndex));
+				partStartIndex = lineStartIndex;
+				hasOpenedUnifiedFile = true;
+				lineStartIndex = getNextLineStartIndex(contents, nextLineStartIndex);
+				continue;
+			}
+			if (hasOpenedUnifiedFile && contents.startsWith("@@ -", lineStartIndex)) {
+				const fileHeader = parseHunkHeader(contents.slice(lineStartIndex, nextLineStartIndex));
+				if (fileHeader != null) {
+					remainingDeletionLines = fileHeader.deletionCount;
+					remainingAdditionLines = fileHeader.additionCount;
+				}
+			}
+			lineStartIndex = nextLineStartIndex;
+			continue;
+		}
+		const firstChar = contents[lineStartIndex];
+		if (firstChar === "\\") {
+			lineStartIndex = nextLineStartIndex;
+			continue;
+		}
+		if (firstChar === " ") {
+			remainingDeletionLines = Math.max(remainingDeletionLines - 1, 0);
+			remainingAdditionLines = Math.max(remainingAdditionLines - 1, 0);
+		} else if (firstChar === "-") remainingDeletionLines = Math.max(remainingDeletionLines - 1, 0);
+		else if (firstChar === "+") remainingAdditionLines = Math.max(remainingAdditionLines - 1, 0);
+		lineStartIndex = nextLineStartIndex;
+	}
+	parts.push(contents.slice(partStartIndex));
+	return parts;
+}
+function startsWithUnifiedDiffFileHeader(contents) {
+	return isUnifiedDiffFileHeaderAt(contents, 0);
+}
+function isUnifiedDiffFileHeaderAt(contents, lineStartIndex) {
+	const nextLineStartIndex = getNextLineStartIndex(contents, lineStartIndex);
+	return isUnifiedDiffHeaderLineAt(contents, lineStartIndex, "---") && isUnifiedDiffHeaderLineAt(contents, nextLineStartIndex, "+++");
+}
+function isUnifiedDiffHeaderLineAt(contents, lineStartIndex, prefix) {
+	if (!contents.startsWith(prefix, lineStartIndex)) return false;
+	const separator = contents[lineStartIndex + prefix.length];
+	if (separator !== " " && separator !== "	") return false;
+	for (let index = lineStartIndex + prefix.length + 1; index < contents.length; index++) {
+		const char = contents[index];
+		if (char === "\n" || char === "\r") break;
+		if (char !== " " && char !== "	") return true;
+	}
+	return false;
+}
+function getNextLineStartIndex(contents, lineStartIndex) {
+	const newlineIndex = contents.indexOf("\n", lineStartIndex);
+	return newlineIndex === -1 ? contents.length : newlineIndex + 1;
+}
+function isHunkBodyLine(line) {
+	const firstChar = line[0];
+	return firstChar === "+" || firstChar === "-" || firstChar === " ";
+}
+function isFormatPatchVersionSeparator(line) {
+	if (!line.startsWith("--")) return false;
+	for (let index = 2; index < line.length; index++) {
+		const char = line[index];
+		if (char !== " " && char !== "	" && char !== "\n" && char !== "\r") return false;
+	}
+	return true;
+}
+function parseHunkHeader(line) {
+	if (!line.startsWith("@@ -")) return;
+	let index = 4;
+	const deletionStartResult = readPositiveInteger(line, index);
+	if (deletionStartResult == null) return;
+	const deletionStart = deletionStartResult.value;
+	index = deletionStartResult.endIndex;
+	let deletionCount = 1;
+	if (line[index] === ",") {
+		const deletionCountResult = readPositiveInteger(line, index + 1);
+		if (deletionCountResult == null) return;
+		deletionCount = deletionCountResult.value;
+		index = deletionCountResult.endIndex;
+	}
+	if (line[index] !== " " || line[index + 1] !== "+") return;
+	index += 2;
+	const additionStartResult = readPositiveInteger(line, index);
+	if (additionStartResult == null) return;
+	const additionStart = additionStartResult.value;
+	index = additionStartResult.endIndex;
+	let additionCount = 1;
+	if (line[index] === ",") {
+		const additionCountResult = readPositiveInteger(line, index + 1);
+		if (additionCountResult == null) return;
+		additionCount = additionCountResult.value;
+		index = additionCountResult.endIndex;
+	}
+	if (line[index] !== " " || line[index + 1] !== "@" || line[index + 2] !== "@") return;
+	let hunkContext;
+	const contextStartIndex = index + 3;
+	if (line[contextStartIndex] === " ") hunkContext = trimLineEnd(line.slice(contextStartIndex + 1));
+	return {
+		additionCount,
+		additionStart,
+		deletionCount,
+		deletionStart,
+		hunkContext
+	};
+}
+function readPositiveInteger(value, startIndex) {
+	let index = startIndex;
+	let parsedValue = 0;
+	for (; index < value.length; index++) {
+		const digit = value.charCodeAt(index) - 48;
+		if (digit < 0 || digit > 9) break;
+		parsedValue = parsedValue * 10 + digit;
+	}
+	if (index === startIndex) return;
+	return {
+		value: parsedValue,
+		endIndex: index
+	};
+}
+function trimLineEnd(value) {
+	if (value.endsWith("\r\n")) return value.slice(0, -2);
+	if (value.endsWith("\n")) return value.slice(0, -1);
+	return value;
+}
+function isGitDiffPatch(data) {
+	return data.startsWith("diff --git") || data.includes("\ndiff --git");
+}
+function splitAtLinePrefix(contents, prefix) {
+	if (contents.length === 0) return [""];
+	const newlinePrefix = `\n${prefix}`;
+	const firstBoundaryIndex = contents.startsWith(prefix) ? 0 : findLinePrefixIndex(contents, newlinePrefix, 0);
+	if (firstBoundaryIndex === -1) return [contents];
+	const parts = [];
+	if (firstBoundaryIndex > 0) parts.push(contents.slice(0, firstBoundaryIndex));
+	let startIndex = firstBoundaryIndex;
+	for (;;) {
+		const nextBoundaryIndex = findLinePrefixIndex(contents, newlinePrefix, startIndex + 1);
+		if (nextBoundaryIndex === -1) break;
+		parts.push(contents.slice(startIndex, nextBoundaryIndex));
+		startIndex = nextBoundaryIndex;
+	}
+	parts.push(contents.slice(startIndex));
+	return parts;
+}
+function findLinePrefixIndex(contents, newlinePrefix, fromIndex) {
+	const index = contents.indexOf(newlinePrefix, fromIndex);
+	return index === -1 ? -1 : index + 1;
+}
+function maybeDetachOptionalString(value) {
+	return value == null ? value : detachString(value);
+}
+function parseRawLineType(firstChar) {
+	return firstChar === " " ? "context" : firstChar === "\\" ? "metadata" : firstChar === "+" ? "addition" : "deletion";
+}
+function getParsedLineContent(rawLine) {
+	const processedLine = rawLine.slice(1);
+	return detachString(processedLine === "" ? "\n" : processedLine);
+}
+function createContentGroup(type, deletionLineIndex, additionLineIndex) {
+	if (type === "change") return {
+		type: "change",
+		additions: 0,
+		deletions: 0,
+		additionLineIndex,
+		deletionLineIndex
+	};
+	return {
+		type: "context",
+		lines: 0,
+		additionLineIndex,
+		deletionLineIndex
+	};
+}
+//#endregion
+//#region src/checkpointing/ThreadChangedFiles.ts
+/**
+* Per-thread changed-file attribution for checkpoint diffs.
+*
+* A checkpoint snapshots the whole working tree (`git add -A`), so on a shared
+* worktree the diff between two of a thread's checkpoints also contains every
+* edit other threads made in the window. The thread's own tool activities are
+* per-thread by construction, and the inline changed-files summary the clients
+* derive from them is already the surface users trust. These helpers extract
+* that same path list on the server and cut a checkpoint diff down to it.
+*
+* `collectActivityChangedFilePaths` must stay in lockstep with
+* `collectChangedFiles` in `apps/web/src/session-logic.ts` (and the mobile
+* copy in `threadActivity.ts`): same field names, same nested keys, same depth
+* bound. The one deliberate difference is dropping the cap of 12 paths - that
+* cap exists for display, and a filter that stopped collecting would silently
+* drop real work from the diff.
+*
+* @module ThreadChangedFiles
+*/
+const CHANGED_FILE_FIELDS = [
+	"path",
+	"filePath",
+	"relativePath",
+	"filename",
+	"newPath",
+	"oldPath"
+];
+const NESTED_PAYLOAD_KEYS = [
+	"item",
+	"result",
+	"input",
+	"data",
+	"changes",
+	"files",
+	"edits",
+	"patch",
+	"patches",
+	"operations"
+];
+const MAX_COLLECT_DEPTH = 4;
+function asRecord$3(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
+}
+function pushChangedFilePath(target, value) {
+	if (typeof value !== "string") return;
+	const normalized = value.trim();
+	if (normalized.length === 0) return;
+	target.add(normalized);
+}
+function collectChangedFilePaths(value, target, depth) {
+	if (depth > MAX_COLLECT_DEPTH) return;
+	if (Array.isArray(value)) {
+		for (const entry of value) collectChangedFilePaths(entry, target, depth + 1);
+		return;
+	}
+	const record = asRecord$3(value);
+	if (!record) return;
+	for (const field of CHANGED_FILE_FIELDS) pushChangedFilePath(target, record[field]);
+	for (const nestedKey of NESTED_PAYLOAD_KEYS) if (nestedKey in record) collectChangedFilePaths(record[nestedKey], target, depth + 1);
+}
+/**
+* Extract the file paths a single activity payload names, exactly as the
+* clients do for the inline changed-files summary.
+*/
+function collectActivityChangedFilePaths(payload) {
+	const target = /* @__PURE__ */ new Set();
+	collectChangedFilePaths(asRecord$3(asRecord$3(payload)?.data), target, 0);
+	return target;
+}
+/**
+* Normalize activity-named paths to the workspace-relative form git patches
+* use. Adapters report paths as the tool received them, which may be absolute;
+* a path outside the workspace cannot appear in the checkpoint diff and is
+* dropped rather than mismatched.
+*/
+function normalizeChangedFilePaths(changedPaths, workspaceCwd) {
+	const workspacePrefix = workspaceCwd.endsWith("/") ? workspaceCwd : `${workspaceCwd}/`;
+	const normalized = /* @__PURE__ */ new Set();
+	for (const changedPath of changedPaths) {
+		let candidate = changedPath;
+		if (candidate.startsWith(workspacePrefix)) candidate = candidate.slice(workspacePrefix.length);
+		else if (candidate.startsWith("/")) continue;
+		else if (candidate.startsWith("./")) candidate = candidate.slice(2);
+		if (candidate.length > 0) normalized.add(candidate);
+	}
+	return normalized;
+}
+const DIFF_FILE_HEADER = /^diff --git /gm;
+function splitUnifiedDiffBlocks(diff) {
+	const starts = [];
+	for (const match of diff.matchAll(DIFF_FILE_HEADER)) starts.push(match.index);
+	return starts.map((start, index) => diff.slice(start, starts[index + 1]));
+}
+function blockNamesPath(block, allowedPaths) {
+	try {
+		return parsePatchFiles(block).some((patch) => patch.files.some((file) => allowedPaths.has(file.name) || file.prevName !== void 0 && allowedPaths.has(file.prevName)));
+	} catch {
+		return true;
+	}
+}
+/**
+* Cut a unified diff down to the files a thread's own activities name.
+*
+* `changedPaths` is the raw activity path list; normalization against
+* `workspaceCwd` happens here. The caller decides what an empty path list
+* means - this function treats it literally and returns an empty diff.
+*/
+function filterUnifiedDiffToChangedFiles(diff, changedPaths, workspaceCwd) {
+	if (diff.length === 0) return diff;
+	const allowedPaths = normalizeChangedFilePaths(changedPaths, workspaceCwd);
+	return splitUnifiedDiffBlocks(diff).filter((block) => blockNamesPath(block, allowedPaths)).join("");
+}
+//#endregion
+//#region src/checkpointing/Errors.ts
+const CheckpointDiffOperation = Schema$1.Literals(["CheckpointDiffQuery.getTurnDiff", "CheckpointDiffQuery.getFullThreadDiff"]);
+/** The computed result does not satisfy the checkpoint RPC contract. */
+var CheckpointDiffResultInvalidError = class extends Schema$1.TaggedErrorClass()("CheckpointDiffResultInvalidError", {
+	operation: CheckpointDiffOperation,
+	threadId: ThreadId
+}) {
+	get message() {
+		const result = this.operation === "CheckpointDiffQuery.getTurnDiff" ? "turn diff" : "full thread diff";
+		return `Checkpoint invariant violation in ${this.operation}: Computed ${result} result does not satisfy contract schema.`;
+	}
+};
+/** Projection state no longer contains the requested checkpoint thread. */
+var CheckpointThreadNotFoundError = class extends Schema$1.TaggedErrorClass()("CheckpointThreadNotFoundError", {
+	operation: CheckpointDiffOperation,
+	threadId: ThreadId
+}) {
+	get message() {
+		return `Checkpoint invariant violation in ${this.operation}: Thread '${this.threadId}' not found.`;
+	}
+};
+/** The checkpoint thread has no workspace path from which to compute a diff. */
+var CheckpointWorkspacePathMissingError = class extends Schema$1.TaggedErrorClass()("CheckpointWorkspacePathMissingError", {
+	operation: CheckpointDiffOperation,
+	threadId: ThreadId
+}) {
+	get message() {
+		const diff = this.operation === "CheckpointDiffQuery.getTurnDiff" ? "turn diff" : "full thread diff";
+		return `Checkpoint invariant violation in ${this.operation}: Workspace path missing for thread '${this.threadId}' when computing ${diff}.`;
+	}
+};
+/** The requested turn lies beyond the latest available checkpoint. */
+var CheckpointTurnRangeUnavailableError = class extends Schema$1.TaggedErrorClass()("CheckpointTurnRangeUnavailableError", {
+	operation: CheckpointDiffOperation,
+	threadId: ThreadId,
+	requestedTurnCount: NonNegativeInt,
+	availableTurnCount: NonNegativeInt
+}) {
+	get message() {
+		return `Checkpoint unavailable for thread ${this.threadId} turn ${this.requestedTurnCount}: Turn diff range exceeds current turn count: requested ${this.requestedTurnCount}, current ${this.availableTurnCount}.`;
+	}
+};
+/** Expected checkpoint metadata does not contain the requested Git ref. */
+var CheckpointRefUnavailableError = class extends Schema$1.TaggedErrorClass()("CheckpointRefUnavailableError", {
+	operation: CheckpointDiffOperation,
+	threadId: ThreadId,
+	turnCount: NonNegativeInt,
+	checkpoint: Schema$1.Literals(["from", "to"])
+}) {
+	get message() {
+		return `Checkpoint unavailable for thread ${this.threadId} turn ${this.turnCount}: Checkpoint ref is unavailable for turn ${this.turnCount}.`;
+	}
+};
+//#endregion
+//#region src/checkpointing/Utils.ts
+const CHECKPOINT_REFS_PREFIX = "refs/p4/checkpoints";
+function checkpointRefForThreadTurn(threadId, turnCount) {
+	return CheckpointRef.make(`${CHECKPOINT_REFS_PREFIX}/${Encoding.encodeBase64Url(threadId)}/turn/${turnCount}`);
+}
+function resolveThreadWorkspaceCwd(input) {
+	const worktreeCwd = input.thread.worktreePath ?? void 0;
+	if (worktreeCwd) return worktreeCwd;
+	return input.projects.find((project) => project.id === input.thread.projectId)?.workspaceRoot;
+}
+//#endregion
+//#region src/git/remoteRefs.ts
+function parseRemoteNamesInGitOrder(stdout) {
+	const remoteNames = [];
+	for (const line of stdout.split("\n")) {
+		const remoteName = line.trim();
+		if (remoteName.length > 0) remoteNames.push(remoteName);
+	}
+	return remoteNames;
+}
+function parseRemoteNames(stdout) {
+	return parseRemoteNamesInGitOrder(stdout).toSorted((a, b) => b.length - a.length);
+}
+function parseRemoteRefWithRemoteNames(ref, remoteNames) {
+	const trimmedRef = ref.trim();
+	if (trimmedRef.length === 0) return null;
+	for (const remoteName of remoteNames) {
+		const remotePrefix = `${remoteName}/`;
+		if (!trimmedRef.startsWith(remotePrefix)) continue;
+		const branchName = trimmedRef.slice(remotePrefix.length).trim();
+		if (branchName.length === 0) return null;
+		return {
+			remoteRef: trimmedRef,
+			remoteName,
+			branchName
+		};
+	}
+	return null;
+}
+function extractBranchNameFromRemoteRef(ref, options) {
+	const normalized = ref.trim();
+	if (normalized.length === 0) return "";
+	if (normalized.startsWith("refs/remotes/")) return extractBranchNameFromRemoteRef(normalized.slice(13), options);
+	const parsedRemoteRef = parseRemoteRefWithRemoteNames(normalized, options?.remoteName ? [options.remoteName] : options?.remoteNames ?? []);
+	if (parsedRemoteRef) return parsedRemoteRef.branchName;
+	const firstSlash = normalized.indexOf("/");
+	if (firstSlash === -1) return normalized;
+	return normalized.slice(firstSlash + 1).trim();
+}
+//#endregion
+//#region src/vcs/GitVcsDriverCore.ts
+const DEFAULT_TIMEOUT_MS$5 = 3e4;
+const DEFAULT_MAX_OUTPUT_BYTES$1 = 1e6;
+const OUTPUT_TRUNCATED_MARKER$1 = "\n\n[truncated]";
+const PREPARED_COMMIT_PATCH_MAX_OUTPUT_BYTES = 49e3;
+const RANGE_COMMIT_SUMMARY_MAX_OUTPUT_BYTES = 19e3;
+const RANGE_DIFF_SUMMARY_MAX_OUTPUT_BYTES = 19e3;
+const RANGE_DIFF_PATCH_MAX_OUTPUT_BYTES = 59e3;
+const REVIEW_DIFF_PATCH_MAX_OUTPUT_BYTES = 12e4;
+const REVIEW_UNTRACKED_DIFF_MAX_OUTPUT_BYTES = 8e4;
+const WORKSPACE_FILES_MAX_OUTPUT_BYTES$1 = 12e4;
+const STATUS_UPSTREAM_REFRESH_INTERVAL = Duration.seconds(15);
+const STATUS_UPSTREAM_REFRESH_TIMEOUT = Duration.seconds(5);
+const STATUS_UPSTREAM_REFRESH_FAILURE_BASE_COOLDOWN = Duration.seconds(30);
+const STATUS_UPSTREAM_REFRESH_FAILURE_MAX_COOLDOWN = Duration.minutes(15);
+const STATUS_UPSTREAM_REFRESH_CACHE_CAPACITY = 2048;
+const REPOSITORY_PATHS_CACHE_CAPACITY = 2048;
+const REPOSITORY_PATHS_CACHE_TTL = Duration.minutes(10);
+const REPOSITORY_PATHS_REFRESH_COALESCE_TTL = Duration.seconds(5);
+const NON_REPOSITORY_PATHS_CACHE_TTL = Duration.seconds(1);
+const LIST_REFS_SNAPSHOT_CACHE_CAPACITY = 64;
+const LIST_REFS_SNAPSHOT_CACHE_TTL = Duration.minutes(2);
+const LIST_REFS_REFRESH_COALESCE_TTL = Duration.seconds(5);
+const LIST_REFS_REFRESH_FAILURE_COOLDOWN = Duration.seconds(30);
+const STATUS_UPSTREAM_REFRESH_ENV = Object.freeze({
+	GCM_INTERACTIVE: "never",
+	GIT_ASKPASS: "",
+	GIT_TERMINAL_PROMPT: "0",
+	SSH_ASKPASS: "",
+	SSH_ASKPASS_REQUIRE: "never"
+});
+const DEFAULT_BASE_BRANCH_CANDIDATES = ["main", "master"];
+const GIT_LIST_BRANCHES_DEFAULT_LIMIT = 100;
+const NON_REPOSITORY_STATUS_DETAILS = Object.freeze({
+	isRepo: false,
+	hasOriginRemote: false,
+	isDefaultBranch: false,
+	branch: null,
+	upstreamRef: null,
+	hasWorkingTreeChanges: false,
+	workingTree: {
+		files: [],
+		insertions: 0,
+		deletions: 0
+	},
+	hasUpstream: false,
+	aheadCount: 0,
+	behindCount: 0,
+	aheadOfDefaultCount: 0
+});
+const NON_REPOSITORY_REMOTE_STATUS_DETAILS = Object.freeze({
+	isRepo: false,
+	isDefaultBranch: false,
+	branch: null,
+	upstreamRef: null,
+	hasUpstream: false,
+	aheadCount: 0,
+	behindCount: 0,
+	aheadOfDefaultCount: 0
+});
+var StatusRemoteRefreshCacheKey = class extends Data.Class {};
+function statusUpstreamRefreshFailureCooldown(consecutiveFailures) {
+	const exponent = Math.max(0, consecutiveFailures - 1);
+	const cooldownMs = Duration.toMillis(STATUS_UPSTREAM_REFRESH_FAILURE_BASE_COOLDOWN) * Math.pow(2, exponent);
+	return Duration.min(Duration.millis(cooldownMs), STATUS_UPSTREAM_REFRESH_FAILURE_MAX_COOLDOWN);
+}
+var GitRefsSnapshotCacheKey = class extends Data.Class {};
+var GitRefsRefreshCacheKey = class extends Data.Class {};
+function parseBranchAb(value) {
+	const match = value.match(/^\+(\d+)\s+-(\d+)$/);
+	if (!match) return {
+		ahead: 0,
+		behind: 0
+	};
+	return {
+		ahead: Number(match[1] ?? "0"),
+		behind: Number(match[2] ?? "0")
+	};
+}
+function parseNumstatEntries(stdout) {
+	const entries = [];
+	for (const line of stdout.split(/\r?\n/g)) {
+		if (line.trim().length === 0) continue;
+		const [addedRaw, deletedRaw, ...pathParts] = line.split("	");
+		const rawPath = pathParts.length > 1 ? (pathParts.at(-1) ?? "").trim() : pathParts.join("	").trim();
+		if (rawPath.length === 0) continue;
+		const added = Number.parseInt(addedRaw ?? "0", 10);
+		const deleted = Number.parseInt(deletedRaw ?? "0", 10);
+		const renameArrowIndex = rawPath.indexOf(" => ");
+		const normalizedPath = renameArrowIndex >= 0 ? rawPath.slice(renameArrowIndex + 4).trim() : rawPath;
+		entries.push({
+			path: normalizedPath.length > 0 ? normalizedPath : rawPath,
+			insertions: Number.isFinite(added) ? added : 0,
+			deletions: Number.isFinite(deleted) ? deleted : 0
+		});
+	}
+	return entries;
+}
+function parsePorcelainPath(line) {
+	if (line.startsWith("? ") || line.startsWith("! ")) {
+		const simple = line.slice(2).trim();
+		return simple.length > 0 ? simple : null;
+	}
+	if (!(line.startsWith("1 ") || line.startsWith("2 ") || line.startsWith("u "))) return null;
+	const tabIndex = line.indexOf("	");
+	if (tabIndex >= 0) {
+		const [filePath] = line.slice(tabIndex + 1).split("	");
+		return filePath?.trim().length ? filePath.trim() : null;
+	}
+	const filePath = line.trim().split(/\s+/g).at(-1) ?? "";
+	return filePath.length > 0 ? filePath : null;
+}
+function filterBranchesForListQuery(refs, query) {
+	if (!query) return refs;
+	const normalizedQuery = query.toLowerCase();
+	return refs.filter((refName) => refName.name.toLowerCase().includes(normalizedQuery));
+}
+function paginateBranches(input) {
+	const cursor = input.cursor ?? 0;
+	const limit = input.limit ?? GIT_LIST_BRANCHES_DEFAULT_LIMIT;
+	const totalCount = input.refs.length;
+	const refs = input.refs.slice(cursor, cursor + limit);
+	return {
+		refs,
+		nextCursor: cursor + refs.length < totalCount ? cursor + refs.length : null,
+		totalCount
+	};
+}
+function parseWorktreeBranchPaths(stdout) {
+	const worktreePaths = /* @__PURE__ */ new Map();
+	let currentPath = null;
+	let currentBranch = null;
+	let currentPrunable = false;
+	const flush = () => {
+		if (currentPath !== null && currentBranch !== null && !currentPrunable) worktreePaths.set(currentBranch, currentPath);
+		currentPath = null;
+		currentBranch = null;
+		currentPrunable = false;
+	};
+	for (const field of stdout.split("\0")) if (field === "") flush();
+	else if (field.startsWith("worktree ")) currentPath = field.slice(9);
+	else if (field.startsWith("branch refs/heads/")) currentBranch = field.slice(18);
+	else if (field === "prunable" || field.startsWith("prunable ")) currentPrunable = true;
+	flush();
+	return worktreePaths;
+}
+function splitNullSeparatedPaths$1(input, truncated) {
+	const parts = input.split("\0");
+	if (parts.length === 0) return [];
+	if (truncated && parts[parts.length - 1]?.length) parts.pop();
+	return parts.filter((value) => value.length > 0);
+}
+function splitNullSeparatedGitStdoutPaths(result) {
+	return splitNullSeparatedPaths$1(result.stdout, result.stdoutTruncated);
+}
+function sanitizeRemoteName(value) {
+	const sanitized = value.trim().replace(/[^A-Za-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
+	return sanitized.length > 0 ? sanitized : "fork";
+}
+function parseRemoteFetchUrls(stdout) {
+	const remotes = /* @__PURE__ */ new Map();
+	for (const line of stdout.split("\n")) {
+		const trimmed = line.trim();
+		if (trimmed.length === 0) continue;
+		const match = /^(\S+)\s+(\S+)\s+\((fetch|push)\)$/.exec(trimmed);
+		if (!match) continue;
+		const [, remoteName = "", remoteUrl = "", direction = ""] = match;
+		if (direction !== "fetch" || remoteName.length === 0 || remoteUrl.length === 0) continue;
+		remotes.set(remoteName, remoteUrl);
+	}
+	return remotes;
+}
+function parseUpstreamRefWithRemoteNames(upstreamRef, remoteNames) {
+	const parsed = parseRemoteRefWithRemoteNames(upstreamRef, remoteNames);
+	if (!parsed) return null;
+	return {
+		upstreamRef,
+		remoteName: parsed.remoteName,
+		branchName: parsed.branchName
+	};
+}
+function parseUpstreamRefByFirstSeparator(upstreamRef) {
+	const separatorIndex = upstreamRef.indexOf("/");
+	if (separatorIndex <= 0 || separatorIndex === upstreamRef.length - 1) return null;
+	const remoteName = upstreamRef.slice(0, separatorIndex).trim();
+	const branchName = upstreamRef.slice(separatorIndex + 1).trim();
+	if (remoteName.length === 0 || branchName.length === 0) return null;
+	return {
+		upstreamRef,
+		remoteName,
+		branchName
+	};
+}
+function parseTrackingBranchByUpstreamRef(stdout, upstreamRef) {
+	for (const line of stdout.split("\n")) {
+		const trimmedLine = line.trim();
+		if (trimmedLine.length === 0) continue;
+		const [branchNameRaw, upstreamBranchRaw = ""] = trimmedLine.split("	");
+		const branchName = branchNameRaw?.trim() ?? "";
+		const candidateUpstreamRef = upstreamBranchRaw.trim();
+		if (branchName.length === 0 || candidateUpstreamRef.length === 0) continue;
+		if (candidateUpstreamRef === upstreamRef) return branchName;
+	}
+	return null;
+}
+function deriveLocalBranchNameFromRemoteRef(branchName) {
+	const separatorIndex = branchName.indexOf("/");
+	if (separatorIndex <= 0 || separatorIndex === branchName.length - 1) return null;
+	const localBranch = branchName.slice(separatorIndex + 1).trim();
+	return localBranch.length > 0 ? localBranch : null;
+}
+function gitCommandContext(input) {
+	return {
+		operation: input.operation,
+		command: "git",
+		cwd: input.cwd,
+		argumentCount: input.args.length
+	};
+}
+function parseDefaultBranchFromRemoteHeadRef(value, remoteName) {
+	const trimmed = value.trim();
+	const prefix = `refs/remotes/${remoteName}/`;
+	if (!trimmed.startsWith(prefix)) return null;
+	const refName = trimmed.slice(prefix.length).trim();
+	return refName.length > 0 ? refName : null;
+}
+function isMissingGitCwdError(error) {
+	if (!(error.cause instanceof PlatformError.PlatformError)) return false;
+	const reason = error.cause.reason;
+	if (reason._tag === "NotFound") return reason.pathOrDescriptor === error.cwd;
+	return reason._tag === "BadResource" && reason.pathOrDescriptor === error.cwd && typeof reason.cause === "object" && reason.cause !== null && "code" in reason.cause && reason.cause.code === "ENOTDIR";
+}
+function isNonRepositoryGitStderr(stderr) {
+	return stderr.toLowerCase().includes("not a git repository");
+}
+const nowUnixNano = DateTime.now.pipe(Effect.map((now) => BigInt(DateTime.toEpochMillis(now)) * 1000000n));
+const addCurrentSpanEvent = (name, attributes) => Effect.gen(function* () {
+	const span = yield* Effect.currentSpan;
+	const timestamp = yield* nowUnixNano;
+	yield* Effect.sync(() => {
+		span.event(name, timestamp, compactTraceAttributes(attributes));
+	});
+}).pipe(Effect.catchTags({ NoSuchElementError: () => Effect.void }));
+function trace2ChildKey(record) {
+	const childId = record.child_id;
+	if (typeof childId === "number" || typeof childId === "string") return String(childId);
+	const hookName = record.hook_name;
+	return typeof hookName === "string" && hookName.trim().length > 0 ? hookName.trim() : null;
+}
+const Trace2Record = Schema$1.Record(Schema$1.String, Schema$1.Unknown);
+const createTrace2Monitor = Effect.fn("createTrace2Monitor")(function* (input, progress) {
+	if (!progress?.onHookStarted && !progress?.onHookFinished) return {
+		env: {},
+		flush: Effect.void
+	};
+	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
+	const traceFilePath = yield* fs.makeTempFileScoped({
+		prefix: `p4code-git-trace2-${process.pid}-`,
+		suffix: ".json"
+	});
+	const hookStartByChildKey = /* @__PURE__ */ new Map();
+	const traceTailState = yield* Ref.make({
+		processedChars: 0,
+		remainder: ""
+	});
+	const handleTraceLine = Effect.fn("handleTraceLine")(function* (line) {
+		const trimmedLine = line.trim();
+		if (trimmedLine.length === 0) return;
+		const traceRecord = decodeJsonResult(Trace2Record)(trimmedLine);
+		if (Result.isFailure(traceRecord)) {
+			yield* Effect.logDebug(`GitVcsDriver.trace2: failed to parse trace line for ${input.operation} in ${input.cwd} (${input.args.length} arguments)`, traceRecord.failure);
+			return;
+		}
+		if (traceRecord.success.child_class !== "hook") return;
+		const event = traceRecord.success.event;
+		const childKey = trace2ChildKey(traceRecord.success);
+		if (childKey === null) return;
+		const started = hookStartByChildKey.get(childKey);
+		const hookNameFromEvent = typeof traceRecord.success.hook_name === "string" ? traceRecord.success.hook_name.trim() : "";
+		const hookName = hookNameFromEvent.length > 0 ? hookNameFromEvent : started?.hookName ?? "";
+		if (hookName.length === 0) return;
+		if (event === "child_start") {
+			const now = yield* DateTime.now;
+			hookStartByChildKey.set(childKey, {
+				hookName,
+				startedAtMs: DateTime.toEpochMillis(now)
+			});
+			yield* addCurrentSpanEvent("git.hook.started", { hookName });
+			if (progress.onHookStarted) yield* progress.onHookStarted(hookName);
+			return;
+		}
+		if (event === "child_exit") {
+			hookStartByChildKey.delete(childKey);
+			const code = traceRecord.success.exitCode;
+			const exitCode = typeof code === "number" && Number.isInteger(code) ? code : null;
+			const now = yield* DateTime.now;
+			const durationMs = started ? Math.max(0, DateTime.toEpochMillis(now) - started.startedAtMs) : null;
+			yield* addCurrentSpanEvent("git.hook.finished", {
+				hookName: started?.hookName ?? hookName,
+				exitCode,
+				durationMs
+			});
 			if (progress.onHookFinished) yield* progress.onHookFinished({
 				hookName: started?.hookName ?? hookName,
 				exitCode,
@@ -31596,6 +32316,32 @@ function buildTurnDiffResult(input, diff) {
 const make$39 = Effect.gen(function* () {
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 	const checkpointStore = yield* CheckpointStore;
+	const threadActivities = yield* ProjectionThreadActivityRepository;
+	/**
+	* The file paths this thread's own tool activities name, optionally limited
+	* to a set of turns. This is the attribution a checkpoint cannot provide: a
+	* checkpoint snapshots the whole tree, so on a shared worktree its diff also
+	* contains other threads' edits, while activities are per-thread by
+	* construction.
+	*/
+	const collectThreadChangedFilePaths = Effect.fn("CheckpointDiffQuery.collectThreadChangedFilePaths")(function* (threadId, turnIds) {
+		const activities = yield* threadActivities.listByThreadId({ threadId });
+		const changedPaths = /* @__PURE__ */ new Set();
+		for (const activity of activities) {
+			if (activity.tone !== "tool") continue;
+			if (turnIds !== null && (activity.turnId === null || !turnIds.has(activity.turnId))) continue;
+			for (const changedPath of collectActivityChangedFilePaths(activity.payload)) changedPaths.add(changedPath);
+		}
+		return changedPaths;
+	});
+	/**
+	* A thread whose activities name no paths at all gets the unfiltered diff.
+	* That is the deliberate escape valve: a thread working purely through shell
+	* commands never names the files it touched, and erasing its whole diff
+	* would be worse than the shared-worktree contamination this filter exists
+	* to remove.
+	*/
+	const attributeDiffToThread = (diff, changedPaths, workspaceCwd) => changedPaths.size === 0 ? diff : filterUnifiedDiffToChangedFiles(diff, changedPaths, workspaceCwd);
 	const getTurnDiff = Effect.fn("getTurnDiff")(function* (input) {
 		const operation = "CheckpointDiffQuery.getTurnDiff";
 		const ignoreWhitespace = input.ignoreWhitespace ?? true;
@@ -31649,13 +32395,16 @@ const make$39 = Effect.gen(function* () {
 			turnCount: input.toTurnCount,
 			checkpoint: "to"
 		});
-		const turnDiff = buildTurnDiffResult(input, yield* checkpointStore.diffCheckpoints({
+		const diff = yield* checkpointStore.diffCheckpoints({
 			cwd: workspaceCwd,
 			fromCheckpointRef,
 			toCheckpointRef,
 			fallbackFromToHead: false,
 			ignoreWhitespace
-		}).pipe(Effect.withSpan("checkpoint.turnDiff.diffCheckpoints")));
+		}).pipe(Effect.withSpan("checkpoint.turnDiff.diffCheckpoints"));
+		const turnIdsInRange = new Set(threadContext.value.checkpoints.filter((checkpoint) => checkpoint.checkpointTurnCount > input.fromTurnCount && checkpoint.checkpointTurnCount <= input.toTurnCount).map((checkpoint) => checkpoint.turnId));
+		const changedPaths = yield* collectThreadChangedFilePaths(input.threadId, turnIdsInRange);
+		const turnDiff = buildTurnDiffResult(input, attributeDiffToThread(diff, changedPaths, workspaceCwd));
 		if (!isTurnDiffResult(turnDiff)) return yield* new CheckpointDiffResultInvalidError({
 			operation,
 			threadId: input.threadId
@@ -31713,11 +32462,12 @@ const make$39 = Effect.gen(function* () {
 			fallbackFromToHead: false,
 			ignoreWhitespace
 		}).pipe(Effect.withSpan("checkpoint.fullThread.diffCheckpoints"));
+		const changedPaths = yield* collectThreadChangedFilePaths(input.threadId, null);
 		const turnDiff = buildTurnDiffResult({
 			threadId: input.threadId,
 			fromTurnCount: 0,
 			toTurnCount: input.toTurnCount
-		}, diff);
+		}, attributeDiffToThread(diff, changedPaths, workspaceCwd));
 		if (!isTurnDiffResult(turnDiff)) return yield* new CheckpointDiffResultInvalidError({
 			operation,
 			threadId: input.threadId
@@ -32297,7 +33047,7 @@ const normalizeDispatchCommand = (command) => Effect.gen(function* () {
 const buildTaskRow = (input, taskId, timestamp, repositoryKey = null) => ({
 	taskId,
 	projectId: input.projectId ?? null,
-	repositoryKey,
+	repositoryKey: repositoryKey ?? input.repositoryKey ?? null,
 	threadId: input.threadId ?? null,
 	title: input.title,
 	body: input.body ?? "",
@@ -35368,6 +36118,18 @@ const requireTaskCapability = Effect.fn("mcp.requireTaskCapability")(function* (
 	});
 	return invocation;
 });
+/** Third of the trio, for the same reason the second exists. */
+const requireThreadCapability = Effect.fn("mcp.requireThreadCapability")(function* () {
+	const invocation = yield* McpInvocationContext;
+	if (!invocation.capabilities.has("threads")) return yield* new ThreadToolUnavailableError({
+		capability: "threads",
+		environmentId: invocation.environmentId,
+		threadId: invocation.threadId,
+		providerSessionId: invocation.providerSessionId,
+		providerInstanceId: invocation.providerInstanceId
+	});
+	return invocation;
+});
 //#endregion
 //#region src/mcp/PreviewAutomationBroker.ts
 var PreviewAutomationBroker = class extends Context.Service()("@p4code/cli/mcp/PreviewAutomationBroker") {};
@@ -44316,7 +45078,11 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (options
 			threadId: ThreadId.make(request.threadId),
 			providerSessionId,
 			providerInstanceId: ProviderInstanceId.make(request.providerInstanceId),
-			capabilities: /* @__PURE__ */ new Set(["preview", "tasks"]),
+			capabilities: /* @__PURE__ */ new Set([
+				"preview",
+				"tasks",
+				"threads"
+			]),
 			issuedAt
 		};
 		yield* SynchronizedRef.update(state, ({ records }) => {
@@ -81339,7 +82105,7 @@ const invokeTargeted = (operation, input, timeoutMs) => {
 	const { tabId, ...operationInput } = input;
 	return invoke(operation, operationInput, timeoutMs, tabId);
 };
-const handlers$1 = {
+const handlers$2 = {
 	preview_status: (input) => invokeTargeted("status", input ?? {}),
 	preview_open: (input) => invokeTargeted("open", normalizePreviewOpenInput(input)),
 	preview_navigate: (input) => invokeTargeted("navigate", input, input.timeoutMs),
@@ -81355,10 +82121,10 @@ const handlers$1 = {
 	preview_recording_start: (input) => invokeTargeted("recordingStart", input ?? {}),
 	preview_recording_stop: (input) => invokeTargeted("recordingStop", input ?? {})
 };
-const { preview_snapshot, ...standardHandlers } = handlers$1;
+const { preview_snapshot, ...standardHandlers } = handlers$2;
 const PreviewStandardToolkitHandlersLive = PreviewStandardToolkit.toLayer(standardHandlers);
 const PreviewSnapshotToolkitHandlersLive = PreviewSnapshotToolkit.toLayer({ preview_snapshot });
-PreviewToolkit.toLayer(handlers$1);
+PreviewToolkit.toLayer(handlers$2);
 //#endregion
 //#region src/mcp/toolkits/tasks/tools.ts
 const dependencies = [McpInvocationContext, TaskRepository];
@@ -81504,6 +82270,93 @@ const TaskToolkitHandlersLive = TaskToolkit.toLayer({
 	})
 });
 //#endregion
+//#region src/mcp/toolkits/threads/tools.ts
+/**
+* Self-scoped on purpose: neither tool takes a thread id. The thread acted on
+* is always the one in `McpInvocationScope`, exactly as `task_current` resolves
+* it, so a leaked per-session token cannot reach any other thread. Delete,
+* create and archive are deliberately not exposed; settle could never succeed
+* from here because the decider refuses it while the calling session is alive.
+*/
+const ThreadRenameTool = Tool.make("thread_rename", {
+	description: "Rename this agent session's own thread. Use it when the seeded title no longer matches what the thread turned out to be about. Only the current thread can be renamed; no other thread is reachable.",
+	parameters: ThreadRenameInput,
+	success: ThreadRenameResult,
+	failure: ThreadControlToolError,
+	dependencies: [
+		McpInvocationContext,
+		OrchestrationEngineService,
+		Crypto.Crypto
+	]
+}).annotate(Tool.Title, "Rename this thread").annotate(Tool.Readonly, false).annotate(Tool.Destructive, false).annotate(Tool.Idempotent, true);
+const MemoryAppendTool = Tool.make("memory_append", {
+	description: "Append a block of markdown to the user-scope memory file (CLAUDE.md by default, AGENTS.md on request). Use it to record a durable preference or fact the user asked to remember. Appends only - it never rewrites or removes existing memory.",
+	parameters: MemoryAppendInput,
+	success: MemoryAppendResult,
+	failure: ThreadControlToolError,
+	dependencies: [
+		McpInvocationContext,
+		ServerSettingsService,
+		FileSystem.FileSystem,
+		Path.Path
+	]
+}).annotate(Tool.Title, "Append to memory").annotate(Tool.Readonly, false).annotate(Tool.Destructive, false).annotate(Tool.Idempotent, false);
+const ThreadToolkit = Toolkit.make(ThreadRenameTool, MemoryAppendTool);
+//#endregion
+//#region src/mcp/toolkits/threads/handlers.ts
+const DEFAULT_MEMORY_APPEND_TARGET = "CLAUDE.md";
+const ThreadToolkitHandlersLive = ThreadToolkit.toLayer({
+	thread_rename: (input) => Effect.gen(function* () {
+		const invocation = yield* requireThreadCapability();
+		const engine = yield* OrchestrationEngineService;
+		const crypto = yield* Crypto.Crypto;
+		const commandId = CommandId.make(yield* crypto.randomUUIDv4.pipe(Effect.orDie));
+		yield* engine.dispatch({
+			type: "thread.meta.update",
+			commandId,
+			threadId: invocation.threadId,
+			title: input.title
+		}).pipe(Effect.mapError((cause) => new ThreadRenameRejectedError({
+			threadId: invocation.threadId,
+			detail: cause.message
+		})));
+		return {
+			threadId: invocation.threadId,
+			title: input.title
+		};
+	}),
+	memory_append: (input) => Effect.gen(function* () {
+		yield* requireThreadCapability();
+		const file = input.file ?? DEFAULT_MEMORY_APPEND_TARGET;
+		if (!isMemoryFileName(file)) return yield* new MemoryAppendFailedError({
+			file,
+			detail: `${file} is not an allowlisted memory file.`
+		});
+		const memoryRoot = yield* resolveClaudeConfigDirPath({ homePath: (yield* (yield* ServerSettingsService).getSettings.pipe(Effect.orElseSucceed(() => void 0)))?.providers.claudeAgent.homePath ?? "" }, process.env);
+		const path = yield* Path.Path;
+		const fileSystem = yield* FileSystem.FileSystem;
+		const filePath = path.join(memoryRoot, file);
+		const existing = yield* fileSystem.readFileString(filePath).pipe(Effect.orElseSucceed(() => ""));
+		const block = input.text.trim();
+		const contents = existing.trim().length === 0 ? `${block}\n` : `${existing.trimEnd()}\n\n${block}\n`;
+		if (contents.length > 524288) return yield* new MemoryAppendFailedError({
+			file,
+			detail: `Appending would grow ${file} past ${AGENT_ASSET_FILE_MAX_CHARS} characters.`
+		});
+		yield* writeFileStringAtomically({
+			filePath,
+			contents
+		}).pipe(Effect.mapError((cause) => new MemoryAppendFailedError({
+			file,
+			detail: cause.message
+		})));
+		return {
+			file,
+			path: filePath
+		};
+	})
+});
+//#endregion
 //#region src/mcp/McpHttpServer.ts
 const unauthorized = HttpServerResponse.jsonUnsafe({
 	error: "invalid_mcp_credential",
@@ -81607,12 +82460,13 @@ const PreviewStandardToolkitRegistrationLive = McpServer.toolkit(PreviewStandard
 const PreviewSnapshotRegistrationLive = Layer.effectDiscard(registerPreviewSnapshot()).pipe(Layer.provide(PreviewSnapshotToolkitHandlersLive));
 const PreviewToolkitRegistrationLive = Layer.mergeAll(PreviewStandardToolkitRegistrationLive, PreviewSnapshotRegistrationLive);
 const TaskToolkitRegistrationLive = McpServer.toolkit(TaskToolkit).pipe(Layer.provide(TaskToolkitHandlersLive));
+const ThreadToolkitRegistrationLive = McpServer.toolkit(ThreadToolkit).pipe(Layer.provide(ThreadToolkitHandlersLive));
 const McpTransportLive = McpServer.layerHttp({
 	name: "P4Code",
 	version,
 	path: "/mcp"
 }).pipe(Layer.provide(McpAuthMiddlewareLive));
-const layer = Layer.mergeAll(PreviewToolkitRegistrationLive, TaskToolkitRegistrationLive).pipe(Layer.provideMerge(McpTransportLive));
+const layer = Layer.mergeAll(PreviewToolkitRegistrationLive, TaskToolkitRegistrationLive, ThreadToolkitRegistrationLive).pipe(Layer.provideMerge(McpTransportLive));
 //#endregion
 //#region src/orchestration/Services/CheckpointReactor.ts
 /**
@@ -82946,992 +83800,460 @@ const make$2 = Effect.gen(function* () {
 		const requestedModelSelection = options?.modelSelection;
 		const resolveActiveSession = (threadId) => providerService.listSessions().pipe(Effect.map((sessions) => sessions.find((session) => session.threadId === threadId)));
 		const activeSession = yield* resolveActiveSession(threadId);
-		const activeThreadSession = thread.session !== null && thread.session.status !== "stopped" && activeSession ? thread.session : null;
-		if (activeThreadSession !== null && activeSession !== void 0 && (activeThreadSession.providerInstanceId === void 0 || activeSession.providerInstanceId === void 0)) return yield* new ProviderAdapterRequestError({
-			provider: providerErrorLabel(activeThreadSession.providerName ?? void 0),
-			method: "thread.turn.start",
-			detail: `Thread '${threadId}' has an active provider session without a provider instance id.`
-		});
-		const currentInstanceId = activeThreadSession !== null && activeSession !== void 0 && activeSession.providerInstanceId !== void 0 ? activeSession.providerInstanceId : thread.modelSelection.instanceId;
-		const desiredModelSelection = requestedModelSelection ?? thread.modelSelection;
-		const desiredInstanceId = desiredModelSelection.instanceId;
-		const currentInfo = yield* providerService.getInstanceInfo(currentInstanceId).pipe(Effect.mapError(() => new ProviderAdapterRequestError({
-			provider: providerErrorLabelFromInstanceHint({
-				instanceId: String(currentInstanceId),
-				modelSelectionInstanceId: String(thread.modelSelection.instanceId),
-				sessionProvider: thread.session?.providerName ?? void 0
-			}),
-			method: "thread.turn.start",
-			detail: `Thread '${threadId}' references unknown provider instance '${currentInstanceId}'. The instance is not configured in this build.`
-		})));
-		const desiredInfo = yield* providerService.getInstanceInfo(desiredInstanceId).pipe(Effect.mapError(() => new ProviderAdapterRequestError({
-			provider: providerErrorLabelFromInstanceHint({ instanceId: String(desiredModelSelection.instanceId) }),
-			method: "thread.turn.start",
-			detail: `Requested provider instance '${desiredInstanceId}' is not configured in this build.`
-		})));
-		const desiredDriverKind = desiredInfo.driverKind;
-		if (!isProviderDriverKind(desiredDriverKind)) return yield* new ProviderAdapterRequestError({
-			provider: providerErrorLabel(String(desiredDriverKind)),
-			method: "thread.turn.start",
-			detail: `Requested provider instance '${desiredInstanceId}' uses unknown provider driver '${desiredDriverKind}'. The driver is not installed in this build.`
-		});
-		const preferredProvider = desiredDriverKind;
-		if (options?.pendingTurnStart === true && thread.session?.status !== "running") yield* setThreadSession({
-			threadId,
-			session: {
-				threadId,
-				status: "starting",
-				providerName: activeSession?.provider ?? preferredProvider,
-				providerInstanceId: activeSession?.providerInstanceId ?? desiredInstanceId,
-				runtimeMode: desiredRuntimeMode,
-				activeTurnId: null,
-				lastError: null,
-				updatedAt: createdAt
-			},
-			createdAt
-		});
-		if (thread.session !== null) yield* rejectStartedThreadModelChangeIfRequired({
-			threadId,
-			currentModelSelection: activeSession?.model !== void 0 ? {
-				...thread.modelSelection,
-				instanceId: currentInstanceId,
-				model: activeSession.model
-			} : thread.modelSelection,
-			requestedModelSelection
-		});
-		if (thread.session !== null && requestedModelSelection !== void 0 && requestedModelSelection.instanceId !== currentInstanceId) {
-			if (currentInfo.driverKind !== desiredInfo.driverKind) return yield* new ProviderAdapterRequestError({
-				provider: preferredProvider,
-				method: "thread.turn.start",
-				detail: `Thread '${threadId}' is bound to driver '${currentInfo.driverKind}' and cannot switch to '${desiredInfo.driverKind}'.`
-			});
-			if (currentInfo.continuationIdentity.continuationKey !== desiredInfo.continuationIdentity.continuationKey) return yield* new ProviderAdapterRequestError({
-				provider: preferredProvider,
-				method: "thread.turn.start",
-				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] : []
-		});
-		const startProviderSession = (input) => providerService.startSession(threadId, {
-			threadId,
-			...preferredProvider ? { provider: preferredProvider } : {},
-			providerInstanceId: desiredInstanceId,
-			...effectiveCwd ? { cwd: effectiveCwd } : {},
-			modelSelection: desiredModelSelection,
-			...input?.resumeCursor !== void 0 ? { resumeCursor: input.resumeCursor } : {},
-			runtimeMode: desiredRuntimeMode
-		});
-		const bindSessionToThread = (session) => Effect.gen(function* () {
-			if (session.providerInstanceId === void 0) return yield* new ProviderAdapterRequestError({
-				provider: providerErrorLabel(session.provider),
-				method: "thread.turn.start",
-				detail: `Provider session '${session.threadId}' started without a provider instance id.`
-			});
-			yield* setThreadSession({
-				threadId,
-				session: {
-					threadId,
-					status: options?.pendingTurnStart === true && session.status === "ready" ? "starting" : mapProviderSessionStatusToOrchestrationStatus(session.status),
-					providerName: session.provider,
-					providerInstanceId: session.providerInstanceId,
-					runtimeMode: desiredRuntimeMode,
-					activeTurnId: null,
-					lastError: session.lastError ?? null,
-					updatedAt: session.updatedAt
-				},
-				createdAt
-			});
-		});
-		const existingSessionThreadId = thread.session && thread.session.status !== "stopped" && activeSession ? thread.id : null;
-		if (existingSessionThreadId) {
-			const runtimeModeChanged = thread.runtimeMode !== thread.session?.runtimeMode;
-			const cwdChanged = effectiveCwd !== activeSession?.cwd;
-			const sessionModelSwitch = (yield* providerService.getCapabilities(desiredInstanceId)).sessionModelSwitch;
-			const modelChanged = requestedModelSelection !== void 0 && requestedModelSelection.model !== activeSession?.model;
-			const instanceChanged = requestedModelSelection !== void 0 && activeSession?.providerInstanceId !== requestedModelSelection.instanceId;
-			const shouldRestartForModelChange = modelChanged && sessionModelSwitch === "unsupported";
-			const previousModelSelection = threadModelSelections.get(threadId);
-			const shouldRestartForModelSelectionChange = preferredProvider === "claudeAgent" && requestedModelSelection !== void 0 && !Equal.equals(previousModelSelection, requestedModelSelection);
-			if (!runtimeModeChanged && !cwdChanged && !instanceChanged && !shouldRestartForModelChange && !shouldRestartForModelSelectionChange) return existingSessionThreadId;
-			const resumeCursor = shouldRestartForModelChange ? void 0 : activeSession?.resumeCursor ?? void 0;
-			yield* Effect.logInfo("provider command reactor restarting provider session", {
-				threadId,
-				existingSessionThreadId,
-				currentProvider: activeSession?.provider,
-				currentInstanceId,
-				desiredInstanceId,
-				desiredProvider: desiredModelSelection.instanceId,
-				currentRuntimeMode: thread.session?.runtimeMode,
-				desiredRuntimeMode: thread.runtimeMode,
-				runtimeModeChanged,
-				previousCwd: activeSession?.cwd,
-				desiredCwd: effectiveCwd,
-				cwdChanged,
-				modelChanged,
-				instanceChanged,
-				shouldRestartForModelChange,
-				shouldRestartForModelSelectionChange,
-				hasResumeCursor: resumeCursor !== void 0
-			});
-			const restartedSession = yield* startProviderSession(resumeCursor !== void 0 ? { resumeCursor } : void 0);
-			yield* Effect.logInfo("provider command reactor restarted provider session", {
-				threadId,
-				previousSessionId: existingSessionThreadId,
-				restartedSessionThreadId: restartedSession.threadId,
-				provider: restartedSession.provider,
-				runtimeMode: restartedSession.runtimeMode,
-				cwd: restartedSession.cwd
-			});
-			yield* bindSessionToThread(restartedSession);
-			return restartedSession.threadId;
-		}
-		const startedSession = yield* startProviderSession(void 0);
-		yield* bindSessionToThread(startedSession);
-		return startedSession.threadId;
-	});
-	const buildSendTurnRequestForThread = Effect.fnUntraced(function* (input) {
-		const thread = yield* resolveThread(input.threadId);
-		if (!thread) return yield* Effect.die(/* @__PURE__ */ new Error(`Thread '${input.threadId}' was not found in read model.`));
-		yield* ensureSessionForThread(input.threadId, input.createdAt, {
-			...input.modelSelection !== void 0 ? { modelSelection: input.modelSelection } : {},
-			pendingTurnStart: true
-		});
-		if (input.modelSelection !== void 0) threadModelSelections.set(input.threadId, input.modelSelection);
-		const normalizedInput = toNonEmptyProviderInput(input.messageText);
-		const normalizedAttachments = input.attachments ?? [];
-		const activeSession = yield* providerService.listSessions().pipe(Effect.map((sessions) => sessions.find((session) => session.threadId === input.threadId)));
-		const sessionModelSwitch = activeSession === void 0 ? "in-session" : activeSession.providerInstanceId === void 0 ? yield* new ProviderAdapterRequestError({
-			provider: providerErrorLabel(activeSession.provider),
-			method: "thread.turn.start",
-			detail: `Active provider session '${activeSession.threadId}' is missing a provider instance id.`
-		}) : (yield* providerService.getCapabilities(activeSession.providerInstanceId)).sessionModelSwitch;
-		const requestedModelSelection = input.modelSelection ?? threadModelSelections.get(input.threadId) ?? thread.modelSelection;
-		const modelForTurn = sessionModelSwitch === "unsupported" && input.modelSelection === void 0 ? activeSession?.model !== void 0 ? {
-			...requestedModelSelection,
-			model: activeSession.model
-		} : requestedModelSelection : input.modelSelection;
-		return {
-			threadId: input.threadId,
-			...normalizedInput ? { input: normalizedInput } : {},
-			...normalizedAttachments.length > 0 ? { attachments: normalizedAttachments } : {},
-			...modelForTurn !== void 0 ? { modelSelection: modelForTurn } : {},
-			...input.interactionMode !== void 0 ? { interactionMode: input.interactionMode } : {}
-		};
-	});
-	const maybeGenerateAndRenameWorktreeBranchForFirstTurn = Effect.fn("maybeGenerateAndRenameWorktreeBranchForFirstTurn")(function* (input) {
-		if (!input.branch || !input.worktreePath) return;
-		if (!isTemporaryWorktreeBranch(input.branch)) return;
-		const oldBranch = input.branch;
-		const cwd = input.worktreePath;
-		const attachments = input.attachments ?? [];
-		yield* Effect.gen(function* () {
-			const settings = yield* serverSettingsService.getSettings;
-			const modelSelection = settings.sourceControlWriterModelSelection === null ? settings.textGenerationModelSelection : resolveSourceControlWriterModelSelection(settings, yield* providerRegistry.getProviders);
-			const generated = yield* textGeneration.generateBranchName({
-				cwd,
-				message: input.messageText,
-				...attachments.length > 0 ? { attachments } : {},
-				modelSelection
-			});
-			if (!generated) return;
-			const targetBranch = buildGeneratedWorktreeBranchName(generated.branch);
-			if (targetBranch === oldBranch) return;
-			const renamed = yield* gitWorkflow.renameBranch({
-				cwd,
-				oldBranch,
-				newBranch: targetBranch
-			});
-			yield* orchestrationEngine.dispatch({
-				type: "thread.meta.update",
-				commandId: yield* serverCommandId("worktree-branch-rename"),
-				threadId: input.threadId,
-				branch: renamed.branch,
-				worktreePath: cwd
-			});
-			yield* vcsStatusBroadcaster.refreshStatus(cwd).pipe(Effect.ignoreCause({ log: true }));
-		}).pipe(Effect.catchCause((cause) => Effect.logWarning("provider command reactor failed to generate or rename worktree branch", {
-			threadId: input.threadId,
-			cwd,
-			oldBranch,
-			cause: Cause.pretty(cause)
-		})));
-	});
-	const maybeGenerateThreadTitleForFirstTurn = Effect.fn("maybeGenerateThreadTitleForFirstTurn")(function* (input) {
-		const attachments = input.attachments ?? [];
-		yield* Effect.gen(function* () {
-			const { textGenerationModelSelection: modelSelection } = yield* serverSettingsService.getSettings;
-			const generated = yield* textGeneration.generateThreadTitle({
-				cwd: input.cwd,
-				message: input.messageText,
-				...attachments.length > 0 ? { attachments } : {},
-				modelSelection
-			});
-			if (!generated) return;
-			const thread = yield* resolveThread(input.threadId);
-			if (!thread) return;
-			if (!canReplaceThreadTitle(thread.title, input.titleSeed)) return;
-			yield* orchestrationEngine.dispatch({
-				type: "thread.meta.update",
-				commandId: yield* serverCommandId("thread-title-rename"),
-				threadId: input.threadId,
-				title: generated.title
-			});
-		}).pipe(Effect.catchCause((cause) => Effect.logWarning("provider command reactor failed to generate or rename thread title", {
-			threadId: input.threadId,
-			cwd: input.cwd,
-			cause: Cause.pretty(cause)
-		})));
-	});
-	const processTurnStartRequested = Effect.fn("processTurnStartRequested")(function* (event) {
-		const key = turnStartKeyForEvent(event);
-		if (yield* hasHandledTurnStartRecently(key)) return;
-		const thread = yield* resolveThread(event.payload.threadId);
-		if (!thread) return;
-		const message = thread.messages.find((entry) => entry.id === event.payload.messageId);
-		if (!message || message.role !== "user") {
-			yield* appendProviderFailureActivity({
-				threadId: event.payload.threadId,
-				kind: "provider.turn.start.failed",
-				summary: "Provider turn start failed",
-				detail: `User message '${event.payload.messageId}' was not found for turn start request.`,
-				turnId: null,
-				createdAt: event.payload.createdAt
-			});
-			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,
-				...generationInput
-			}).pipe(Effect.forkScoped);
-			if (canReplaceThreadTitle(thread.title, event.payload.titleSeed)) yield* maybeGenerateThreadTitleForFirstTurn({
-				threadId: event.payload.threadId,
-				cwd: generationCwd,
-				...generationInput
-			}).pipe(Effect.forkScoped);
-		}
-		const handleTurnStartFailure = (cause) => {
-			if (Cause.hasInterruptsOnly(cause)) return Effect.void;
-			const detail = formatFailureDetail(cause);
-			return setThreadSessionErrorOnTurnStartFailure({
-				threadId: event.payload.threadId,
-				detail,
-				createdAt: event.payload.createdAt
-			}).pipe(Effect.flatMap(() => appendProviderFailureActivity({
-				threadId: event.payload.threadId,
-				kind: "provider.turn.start.failed",
-				summary: "Provider turn start failed",
-				detail,
-				turnId: null,
-				createdAt: event.payload.createdAt
-			})), Effect.asVoid);
-		};
-		const recoverTurnStartFailure = (cause) => handleTurnStartFailure(cause).pipe(Effect.catchCause((recoveryCause) => Effect.logWarning("provider command reactor failed to recover turn start failure", {
-			eventType: event.type,
-			threadId: event.payload.threadId,
-			cause: Cause.pretty(recoveryCause),
-			originalCause: Cause.pretty(cause)
-		})));
-		const sendTurnRequest = yield* buildSendTurnRequestForThread({
-			threadId: event.payload.threadId,
-			messageText: message.text,
-			...message.attachments !== void 0 ? { attachments: message.attachments } : {},
-			...event.payload.modelSelection !== void 0 ? { modelSelection: event.payload.modelSelection } : {},
-			interactionMode: event.payload.interactionMode,
-			createdAt: event.payload.createdAt
-		}).pipe(Effect.map(Option.some), Effect.catchCause((cause) => handleTurnStartFailure(cause).pipe(Effect.as(Option.none()))));
-		if (Option.isNone(sendTurnRequest)) return;
-		yield* providerService.sendTurn(sendTurnRequest.value).pipe(Effect.catchCause(recoverTurnStartFailure), Effect.forkScoped);
-	});
-	const processTurnInterruptRequested = Effect.fn("processTurnInterruptRequested")(function* (event) {
-		const thread = yield* resolveThread(event.payload.threadId);
-		if (!thread) return;
-		if (!(thread.session && thread.session.status !== "stopped")) return yield* appendProviderFailureActivity({
-			threadId: event.payload.threadId,
-			kind: "provider.turn.interrupt.failed",
-			summary: "Provider turn interrupt failed",
-			detail: "No active provider session is bound to this thread.",
-			turnId: event.payload.turnId ?? null,
-			createdAt: event.payload.createdAt
-		});
-		yield* providerService.interruptTurn({ threadId: event.payload.threadId });
-		yield* appendTurnInterruptedActivity({
-			threadId: event.payload.threadId,
-			turnId: event.payload.turnId ?? null,
-			createdAt: event.payload.createdAt
-		});
-	});
-	const processApprovalResponseRequested = Effect.fn("processApprovalResponseRequested")(function* (event) {
-		const thread = yield* resolveThread(event.payload.threadId);
-		if (!thread) return;
-		if (!(thread.session && thread.session.status !== "stopped")) return yield* appendProviderFailureActivity({
-			threadId: event.payload.threadId,
-			kind: "provider.approval.respond.failed",
-			summary: "Provider approval response failed",
-			detail: "No active provider session is bound to this thread.",
-			turnId: null,
-			createdAt: event.payload.createdAt,
-			requestId: event.payload.requestId
-		});
-		yield* providerService.respondToRequest({
-			threadId: event.payload.threadId,
-			requestId: event.payload.requestId,
-			decision: event.payload.decision
-		}).pipe(Effect.catchCause((cause) => appendProviderFailureActivity({
-			threadId: event.payload.threadId,
-			kind: "provider.approval.respond.failed",
-			summary: "Provider approval response failed",
-			detail: isUnknownPendingApprovalRequestError(cause) ? stalePendingRequestDetail("approval", event.payload.requestId) : Cause.pretty(cause),
-			turnId: null,
-			createdAt: event.payload.createdAt,
-			requestId: event.payload.requestId
-		})));
-	});
-	const processUserInputResponseRequested = Effect.fn("processUserInputResponseRequested")(function* (event) {
-		const thread = yield* resolveThread(event.payload.threadId);
-		if (!thread) return;
-		if (!(thread.session && thread.session.status !== "stopped")) return yield* appendProviderFailureActivity({
-			threadId: event.payload.threadId,
-			kind: "provider.user-input.respond.failed",
-			summary: "Provider user input response failed",
-			detail: "No active provider session is bound to this thread.",
-			turnId: null,
-			createdAt: event.payload.createdAt,
-			requestId: event.payload.requestId
-		});
-		yield* providerService.respondToUserInput({
-			threadId: event.payload.threadId,
-			requestId: event.payload.requestId,
-			answers: event.payload.answers
-		}).pipe(Effect.catchCause((cause) => appendProviderFailureActivity({
-			threadId: event.payload.threadId,
-			kind: "provider.user-input.respond.failed",
-			summary: "Provider user input response failed",
-			detail: isUnknownPendingUserInputRequestError(cause) ? stalePendingRequestDetail("user-input", event.payload.requestId) : Cause.pretty(cause),
-			turnId: null,
-			createdAt: event.payload.createdAt,
-			requestId: event.payload.requestId
+		const activeThreadSession = thread.session !== null && thread.session.status !== "stopped" && activeSession ? thread.session : null;
+		if (activeThreadSession !== null && activeSession !== void 0 && (activeThreadSession.providerInstanceId === void 0 || activeSession.providerInstanceId === void 0)) return yield* new ProviderAdapterRequestError({
+			provider: providerErrorLabel(activeThreadSession.providerName ?? void 0),
+			method: "thread.turn.start",
+			detail: `Thread '${threadId}' has an active provider session without a provider instance id.`
+		});
+		const currentInstanceId = activeThreadSession !== null && activeSession !== void 0 && activeSession.providerInstanceId !== void 0 ? activeSession.providerInstanceId : thread.modelSelection.instanceId;
+		const desiredModelSelection = requestedModelSelection ?? thread.modelSelection;
+		const desiredInstanceId = desiredModelSelection.instanceId;
+		const currentInfo = yield* providerService.getInstanceInfo(currentInstanceId).pipe(Effect.mapError(() => new ProviderAdapterRequestError({
+			provider: providerErrorLabelFromInstanceHint({
+				instanceId: String(currentInstanceId),
+				modelSelectionInstanceId: String(thread.modelSelection.instanceId),
+				sessionProvider: thread.session?.providerName ?? void 0
+			}),
+			method: "thread.turn.start",
+			detail: `Thread '${threadId}' references unknown provider instance '${currentInstanceId}'. The instance is not configured in this build.`
 		})));
-	});
-	const processSessionStopRequested = Effect.fn("processSessionStopRequested")(function* (event) {
-		const thread = yield* resolveThread(event.payload.threadId);
-		if (!thread) return;
-		const now = event.payload.createdAt;
-		if (thread.session && thread.session.status !== "stopped") yield* providerService.stopSession({ threadId: thread.id });
-		yield* setThreadSession({
-			threadId: thread.id,
+		const desiredInfo = yield* providerService.getInstanceInfo(desiredInstanceId).pipe(Effect.mapError(() => new ProviderAdapterRequestError({
+			provider: providerErrorLabelFromInstanceHint({ instanceId: String(desiredModelSelection.instanceId) }),
+			method: "thread.turn.start",
+			detail: `Requested provider instance '${desiredInstanceId}' is not configured in this build.`
+		})));
+		const desiredDriverKind = desiredInfo.driverKind;
+		if (!isProviderDriverKind(desiredDriverKind)) return yield* new ProviderAdapterRequestError({
+			provider: providerErrorLabel(String(desiredDriverKind)),
+			method: "thread.turn.start",
+			detail: `Requested provider instance '${desiredInstanceId}' uses unknown provider driver '${desiredDriverKind}'. The driver is not installed in this build.`
+		});
+		const preferredProvider = desiredDriverKind;
+		if (options?.pendingTurnStart === true && thread.session?.status !== "running") yield* setThreadSession({
+			threadId,
 			session: {
-				threadId: thread.id,
-				status: "stopped",
-				providerName: thread.session?.providerName ?? null,
-				...thread.session?.providerInstanceId !== void 0 ? { providerInstanceId: thread.session.providerInstanceId } : {},
-				runtimeMode: thread.session?.runtimeMode ?? DEFAULT_RUNTIME_MODE,
+				threadId,
+				status: "starting",
+				providerName: activeSession?.provider ?? preferredProvider,
+				providerInstanceId: activeSession?.providerInstanceId ?? desiredInstanceId,
+				runtimeMode: desiredRuntimeMode,
 				activeTurnId: null,
-				lastError: thread.session?.lastError ?? null,
-				updatedAt: now
+				lastError: null,
+				updatedAt: createdAt
 			},
-			createdAt: now
+			createdAt
 		});
-	});
-	const processDomainEvent = Effect.fn("processDomainEvent")(function* (event) {
-		yield* Effect.annotateCurrentSpan({
-			"orchestration.event_type": event.type,
-			"orchestration.thread_id": event.payload.threadId,
-			...event.commandId ? { "orchestration.command_id": event.commandId } : {}
+		if (thread.session !== null) yield* rejectStartedThreadModelChangeIfRequired({
+			threadId,
+			currentModelSelection: activeSession?.model !== void 0 ? {
+				...thread.modelSelection,
+				instanceId: currentInstanceId,
+				model: activeSession.model
+			} : thread.modelSelection,
+			requestedModelSelection
 		});
-		yield* increment(orchestrationEventsProcessedTotal, { eventType: event.type });
-		switch (event.type) {
-			case "thread.runtime-mode-set": {
-				const thread = yield* resolveThread(event.payload.threadId);
-				if (!thread?.session || thread.session.status === "stopped") return;
-				const cachedModelSelection = threadModelSelections.get(event.payload.threadId);
-				yield* ensureSessionForThread(event.payload.threadId, event.occurredAt, cachedModelSelection !== void 0 ? { modelSelection: cachedModelSelection } : {});
-				return;
-			}
-			case "thread.turn-start-requested":
-				yield* processTurnStartRequested(event);
-				return;
-			case "thread.turn-interrupt-requested":
-				yield* processTurnInterruptRequested(event);
-				return;
-			case "thread.approval-response-requested":
-				yield* processApprovalResponseRequested(event);
-				return;
-			case "thread.user-input-response-requested":
-				yield* processUserInputResponseRequested(event);
-				return;
-			case "thread.session-stop-requested":
-				yield* processSessionStopRequested(event);
-				return;
+		if (thread.session !== null && requestedModelSelection !== void 0 && requestedModelSelection.instanceId !== currentInstanceId) {
+			if (currentInfo.driverKind !== desiredInfo.driverKind) return yield* new ProviderAdapterRequestError({
+				provider: preferredProvider,
+				method: "thread.turn.start",
+				detail: `Thread '${threadId}' is bound to driver '${currentInfo.driverKind}' and cannot switch to '${desiredInfo.driverKind}'.`
+			});
+			if (currentInfo.continuationIdentity.continuationKey !== desiredInfo.continuationIdentity.continuationKey) return yield* new ProviderAdapterRequestError({
+				provider: preferredProvider,
+				method: "thread.turn.start",
+				detail: `Thread '${threadId}' cannot switch from instance '${currentInstanceId}' to '${desiredInstanceId}' because their provider resume state is incompatible.`
+			});
 		}
-	});
-	const processDomainEventSafely = (event) => processDomainEvent(event).pipe(Effect.catchCause((cause) => {
-		if (Cause.hasInterruptsOnly(cause)) return Effect.failCause(cause);
-		return Effect.logWarning("provider command reactor failed to process event", {
-			eventType: event.type,
-			cause: Cause.pretty(cause)
+		const project = yield* resolveProject(thread.projectId);
+		const effectiveCwd = resolveThreadWorkspaceCwd({
+			thread,
+			projects: project ? [project] : []
 		});
-	}));
-	const worker = yield* makeDrainableWorker(processDomainEventSafely);
-	return {
-		start: Effect.fn("start")(function* () {
-			const processEvent = Effect.fn("processEvent")(function* (event) {
-				if (event.type === "thread.runtime-mode-set" || event.type === "thread.turn-start-requested" || event.type === "thread.turn-interrupt-requested" || event.type === "thread.approval-response-requested" || event.type === "thread.user-input-response-requested" || event.type === "thread.session-stop-requested") return yield* worker.enqueue(event);
+		const startProviderSession = (input) => providerService.startSession(threadId, {
+			threadId,
+			...preferredProvider ? { provider: preferredProvider } : {},
+			providerInstanceId: desiredInstanceId,
+			...effectiveCwd ? { cwd: effectiveCwd } : {},
+			modelSelection: desiredModelSelection,
+			...input?.resumeCursor !== void 0 ? { resumeCursor: input.resumeCursor } : {},
+			runtimeMode: desiredRuntimeMode
+		});
+		const bindSessionToThread = (session) => Effect.gen(function* () {
+			if (session.providerInstanceId === void 0) return yield* new ProviderAdapterRequestError({
+				provider: providerErrorLabel(session.provider),
+				method: "thread.turn.start",
+				detail: `Provider session '${session.threadId}' started without a provider instance id.`
+			});
+			yield* setThreadSession({
+				threadId,
+				session: {
+					threadId,
+					status: options?.pendingTurnStart === true && session.status === "ready" ? "starting" : mapProviderSessionStatusToOrchestrationStatus(session.status),
+					providerName: session.provider,
+					providerInstanceId: session.providerInstanceId,
+					runtimeMode: desiredRuntimeMode,
+					activeTurnId: null,
+					lastError: session.lastError ?? null,
+					updatedAt: session.updatedAt
+				},
+				createdAt
 			});
-			yield* Effect.forkScoped(Stream.runForEach(orchestrationEngine.streamDomainEvents, processEvent));
-		}),
-		drain: worker.drain
-	};
-});
-const ProviderCommandReactorLive = Layer.effect(ProviderCommandReactor, make$2);
-(() => {
-	try {
-		return process.env.NODE_ENV === "development";
-	} catch {
-		return false;
-	}
-})();
-const COMMIT_METADATA_SPLIT = /(?=^From [a-f0-9]+ .+$)/m;
-const GIT_DIFF_FILE_BREAK_REGEX = /(?=^diff --git)/gm;
-const FILENAME_HEADER_REGEX = /^(---|\+\+\+)\s+([^\t\r\n]+)/;
-const FILENAME_HEADER_REGEX_GIT = /^(---|\+\+\+)\s+[ab]\/([^\t\r\n]+)/;
-const ALTERNATE_FILE_NAMES_GIT = /^diff --git (?:"a\/(.+?)"|a\/(.+?)) (?:"b\/(.+?)"|b\/(.+?))$/;
-const INDEX_LINE_METADATA = /^index ([0-9a-f]+)\.\.([0-9a-f]+)(?: (\d+))?$/i;
-Object.freeze({
-	fromStart: 0,
-	fromEnd: 0
-});
-//#endregion
-//#region ../../node_modules/.pnpm/@pierre+diffs@1.3.0-beta.5_patch_hash=7cb6da88544119adda056b2f46f43956f99326227732da0b3_3b51331382fbad9d080c5033ee1e2a6a/node_modules/@pierre/diffs/dist/utils/cleanLastNewline.js
-function cleanLastNewline(contents) {
-	let end = contents.length;
-	if (contents.charCodeAt(end - 1) === 10) {
-		end--;
-		if (contents.charCodeAt(end - 1) === 13) end--;
-	}
-	return contents.slice(0, end);
-}
-//#endregion
-//#region ../../node_modules/.pnpm/@pierre+diffs@1.3.0-beta.5_patch_hash=7cb6da88544119adda056b2f46f43956f99326227732da0b3_3b51331382fbad9d080c5033ee1e2a6a/node_modules/@pierre/diffs/dist/utils/detachString.js
-const stringDetachEncoder = new TextEncoder();
-const stringDetachDecoder = new TextDecoder("utf-8", { ignoreBOM: true });
-const SURROGATE_CODE_UNIT_PATTERN = /[\uD800-\uDFFF]/;
-const STRING_DETACH_INITIAL_BUFFER_SIZE = 1024;
-let stringDetachBuffer = new Uint8Array(STRING_DETACH_INITIAL_BUFFER_SIZE);
-function releaseStringDetachBuffer() {
-	if (stringDetachBuffer.length !== STRING_DETACH_INITIAL_BUFFER_SIZE) stringDetachBuffer = new Uint8Array(STRING_DETACH_INITIAL_BUFFER_SIZE);
-}
-function detachString(value) {
-	if (value.length === 0) return value;
-	if (SURROGATE_CODE_UNIT_PATTERN.test(value)) return JSON.parse(JSON.stringify(value));
-	const requiredByteLength = value.length * 3;
-	if (stringDetachBuffer.length < requiredByteLength) stringDetachBuffer = new Uint8Array(requiredByteLength);
-	const { written } = stringDetachEncoder.encodeInto(value, stringDetachBuffer);
-	return stringDetachDecoder.decode(stringDetachBuffer.subarray(0, written));
-}
-//#endregion
-//#region ../../node_modules/.pnpm/@pierre+diffs@1.3.0-beta.5_patch_hash=7cb6da88544119adda056b2f46f43956f99326227732da0b3_3b51331382fbad9d080c5033ee1e2a6a/node_modules/@pierre/diffs/dist/utils/parsePatchFiles.js
-function processPatch(data, cacheKeyPrefix, throwOnError) {
-	try {
-		return _processPatch(data, cacheKeyPrefix, throwOnError);
-	} finally {
-		releaseStringDetachBuffer();
-	}
-}
-function _processPatch(data, cacheKeyPrefix, throwOnError = false) {
-	const isGitDiff = isGitDiffPatch(data);
-	const rawFiles = isGitDiff ? splitGitDiffFiles(data) : splitUnifiedDiffFiles(data);
-	let patchMetadata;
-	const files = [];
-	for (const fileOrPatchMetadata of rawFiles) {
-		if (isGitDiff && !GIT_DIFF_FILE_BREAK_REGEX.test(fileOrPatchMetadata)) {
-			if (patchMetadata == null) patchMetadata = detachString(fileOrPatchMetadata);
-			else if (throwOnError) throw Error("parsePatchContent: unknown file blob");
-			else console.error("parsePatchContent: unknown file blob:", fileOrPatchMetadata);
-			continue;
-		} else if (!isGitDiff && !startsWithUnifiedDiffFileHeader(fileOrPatchMetadata)) {
-			if (patchMetadata == null) patchMetadata = detachString(fileOrPatchMetadata);
-			else if (throwOnError) throw Error("parsePatchContent: unknown file blob");
-			else console.error("parsePatchContent: unknown file blob:", fileOrPatchMetadata);
-			continue;
-		}
-		const currentFile = _processFile(fileOrPatchMetadata, {
-			cacheKey: cacheKeyPrefix != null ? `${cacheKeyPrefix}-${files.length}` : void 0,
-			isGitDiff,
-			throwOnError
 		});
-		if (currentFile != null) files.push(currentFile);
-	}
-	return {
-		patchMetadata,
-		files
-	};
-}
-function _processFile(fileDiffString, { cacheKey, isGitDiff = GIT_DIFF_FILE_BREAK_REGEX.test(fileDiffString), oldFile, newFile, throwOnError = false } = {}) {
-	let lastHunkEnd = 0;
-	const hunks = splitAtLinePrefix(fileDiffString, "@@ ");
-	let currentFile;
-	const isPartial = oldFile == null || newFile == null;
-	let deletionLineIndex = 0;
-	let additionLineIndex = 0;
-	for (const hunk of hunks) {
-		const lines = splitWithNewlines(hunk);
-		const firstLine = lines[0];
-		if (firstLine == null) {
-			if (throwOnError) throw Error("parsePatchContent: invalid hunk");
-			else console.error("parsePatchContent: invalid hunk", hunk);
-			continue;
-		}
-		const fileHeader = parseHunkHeader(firstLine);
-		let additionLines = 0;
-		let deletionLines = 0;
-		if (fileHeader == null || currentFile == null) {
-			if (currentFile != null) {
-				if (throwOnError) throw Error("parsePatchContent: Invalid hunk");
-				else console.error("parsePatchContent: Invalid hunk", hunk);
-				continue;
-			}
-			currentFile = {
-				name: "",
-				type: "change",
-				hunks: [],
-				splitLineCount: 0,
-				unifiedLineCount: 0,
-				isPartial,
-				additionLines: !isPartial && oldFile != null && newFile != null ? splitFileContents(newFile.contents) : [],
-				deletionLines: !isPartial && oldFile != null && newFile != null ? splitFileContents(oldFile.contents) : [],
-				cacheKey: maybeDetachOptionalString(cacheKey)
-			};
-			if (currentFile.additionLines.length === 1 && newFile?.contents === "") currentFile.additionLines.length = 0;
-			if (currentFile.deletionLines.length === 1 && oldFile?.contents === "") currentFile.deletionLines.length = 0;
-			for (const line of lines) {
-				if (line.startsWith("diff --git")) {
-					const filenameMatch$1 = line.trim().match(ALTERNATE_FILE_NAMES_GIT);
-					const prevName = filenameMatch$1?.[1] ?? filenameMatch$1?.[2];
-					const name = filenameMatch$1?.[3] ?? filenameMatch$1?.[4];
-					if (prevName == null || name == null) {
-						if (throwOnError) throw Error("parsePatchContent: invalid git diff header");
-						else console.error("parsePatchContent: invalid git diff header", line);
-						continue;
-					}
-					currentFile.name = detachString(name.trim());
-					if (prevName !== name) currentFile.prevName = detachString(prevName.trim());
-					continue;
-				}
-				const filenameMatch = line.startsWith("---") || line.startsWith("+++") ? line.match(isGitDiff ? FILENAME_HEADER_REGEX_GIT : FILENAME_HEADER_REGEX) : null;
-				if (filenameMatch != null) {
-					const [, type, fileName] = filenameMatch;
-					if (type === "---" && fileName !== "/dev/null") {
-						const detachedFileName = detachString(fileName.trim());
-						currentFile.prevName = detachedFileName;
-						currentFile.name = detachedFileName;
-					} else if (type === "+++" && fileName !== "/dev/null") currentFile.name = detachString(fileName.trim());
-				} else if (isGitDiff) {
-					if (line.startsWith("new mode ")) currentFile.mode = detachString(line.slice(8).trim());
-					if (line.startsWith("old mode ")) currentFile.prevMode = detachString(line.slice(8).trim());
-					if (line.startsWith("new file mode")) {
-						currentFile.type = "new";
-						currentFile.mode = detachString(line.slice(13).trim());
-					}
-					if (line.startsWith("deleted file mode")) {
-						currentFile.type = "deleted";
-						currentFile.mode = detachString(line.slice(17).trim());
-					}
-					if (line.startsWith("similarity index")) if (line.startsWith("similarity index 100%")) currentFile.type = "rename-pure";
-					else currentFile.type = "rename-changed";
-					if (line.startsWith("index ")) {
-						const [, prevObjectId, newObjectId, mode] = line.trim().match(INDEX_LINE_METADATA) ?? [];
-						if (prevObjectId != null) currentFile.prevObjectId = detachString(prevObjectId);
-						if (newObjectId != null) currentFile.newObjectId = detachString(newObjectId);
-						if (mode != null) currentFile.mode = detachString(mode);
-					}
-					if (line.startsWith("rename from ")) currentFile.prevName = detachString(line.slice(12).trim());
-					if (line.startsWith("rename to ")) currentFile.name = detachString(line.slice(10).trim());
-				}
-			}
-			continue;
+		const existingSessionThreadId = thread.session && thread.session.status !== "stopped" && activeSession ? thread.id : null;
+		if (existingSessionThreadId) {
+			const runtimeModeChanged = thread.runtimeMode !== thread.session?.runtimeMode;
+			const cwdChanged = effectiveCwd !== activeSession?.cwd;
+			const sessionModelSwitch = (yield* providerService.getCapabilities(desiredInstanceId)).sessionModelSwitch;
+			const modelChanged = requestedModelSelection !== void 0 && requestedModelSelection.model !== activeSession?.model;
+			const instanceChanged = requestedModelSelection !== void 0 && activeSession?.providerInstanceId !== requestedModelSelection.instanceId;
+			const shouldRestartForModelChange = modelChanged && sessionModelSwitch === "unsupported";
+			const previousModelSelection = threadModelSelections.get(threadId);
+			const shouldRestartForModelSelectionChange = preferredProvider === "claudeAgent" && requestedModelSelection !== void 0 && !Equal.equals(previousModelSelection, requestedModelSelection);
+			if (!runtimeModeChanged && !cwdChanged && !instanceChanged && !shouldRestartForModelChange && !shouldRestartForModelSelectionChange) return existingSessionThreadId;
+			const resumeCursor = shouldRestartForModelChange ? void 0 : activeSession?.resumeCursor ?? void 0;
+			yield* Effect.logInfo("provider command reactor restarting provider session", {
+				threadId,
+				existingSessionThreadId,
+				currentProvider: activeSession?.provider,
+				currentInstanceId,
+				desiredInstanceId,
+				desiredProvider: desiredModelSelection.instanceId,
+				currentRuntimeMode: thread.session?.runtimeMode,
+				desiredRuntimeMode: thread.runtimeMode,
+				runtimeModeChanged,
+				previousCwd: activeSession?.cwd,
+				desiredCwd: effectiveCwd,
+				cwdChanged,
+				modelChanged,
+				instanceChanged,
+				shouldRestartForModelChange,
+				shouldRestartForModelSelectionChange,
+				hasResumeCursor: resumeCursor !== void 0
+			});
+			const restartedSession = yield* startProviderSession(resumeCursor !== void 0 ? { resumeCursor } : void 0);
+			yield* Effect.logInfo("provider command reactor restarted provider session", {
+				threadId,
+				previousSessionId: existingSessionThreadId,
+				restartedSessionThreadId: restartedSession.threadId,
+				provider: restartedSession.provider,
+				runtimeMode: restartedSession.runtimeMode,
+				cwd: restartedSession.cwd
+			});
+			yield* bindSessionToThread(restartedSession);
+			return restartedSession.threadId;
 		}
-		let currentContent;
-		let lastLineType;
-		while (lines.length > 0 && (lines[lines.length - 1] === "\n" || lines[lines.length - 1] === "\r" || lines[lines.length - 1] === "\r\n" || lines[lines.length - 1] === "")) lines.pop();
-		const { additionStart, deletionStart } = fileHeader;
-		deletionLineIndex = isPartial ? deletionLineIndex : deletionStart - 1;
-		additionLineIndex = isPartial ? additionLineIndex : additionStart - 1;
-		const hunkData = {
-			collapsedBefore: 0,
-			splitLineCount: 0,
-			splitLineStart: 0,
-			unifiedLineCount: 0,
-			unifiedLineStart: 0,
-			additionCount: fileHeader.additionCount,
-			additionStart,
-			additionLines,
-			deletionCount: fileHeader.deletionCount,
-			deletionStart,
-			deletionLines,
-			deletionLineIndex,
-			additionLineIndex,
-			hunkContent: [],
-			hunkContext: maybeDetachOptionalString(fileHeader.hunkContext),
-			hunkSpecs: detachString(firstLine),
-			noEOFCRAdditions: false,
-			noEOFCRDeletions: false
+		const startedSession = yield* startProviderSession(void 0);
+		yield* bindSessionToThread(startedSession);
+		return startedSession.threadId;
+	});
+	const buildSendTurnRequestForThread = Effect.fnUntraced(function* (input) {
+		const thread = yield* resolveThread(input.threadId);
+		if (!thread) return yield* Effect.die(/* @__PURE__ */ new Error(`Thread '${input.threadId}' was not found in read model.`));
+		yield* ensureSessionForThread(input.threadId, input.createdAt, {
+			...input.modelSelection !== void 0 ? { modelSelection: input.modelSelection } : {},
+			pendingTurnStart: true
+		});
+		if (input.modelSelection !== void 0) threadModelSelections.set(input.threadId, input.modelSelection);
+		const normalizedInput = toNonEmptyProviderInput(input.messageText);
+		const normalizedAttachments = input.attachments ?? [];
+		const activeSession = yield* providerService.listSessions().pipe(Effect.map((sessions) => sessions.find((session) => session.threadId === input.threadId)));
+		const sessionModelSwitch = activeSession === void 0 ? "in-session" : activeSession.providerInstanceId === void 0 ? yield* new ProviderAdapterRequestError({
+			provider: providerErrorLabel(activeSession.provider),
+			method: "thread.turn.start",
+			detail: `Active provider session '${activeSession.threadId}' is missing a provider instance id.`
+		}) : (yield* providerService.getCapabilities(activeSession.providerInstanceId)).sessionModelSwitch;
+		const requestedModelSelection = input.modelSelection ?? threadModelSelections.get(input.threadId) ?? thread.modelSelection;
+		const modelForTurn = sessionModelSwitch === "unsupported" && input.modelSelection === void 0 ? activeSession?.model !== void 0 ? {
+			...requestedModelSelection,
+			model: activeSession.model
+		} : requestedModelSelection : input.modelSelection;
+		return {
+			threadId: input.threadId,
+			...normalizedInput ? { input: normalizedInput } : {},
+			...normalizedAttachments.length > 0 ? { attachments: normalizedAttachments } : {},
+			...modelForTurn !== void 0 ? { modelSelection: modelForTurn } : {},
+			...input.interactionMode !== void 0 ? { interactionMode: input.interactionMode } : {}
 		};
-		let parsedAdditionLines = 0;
-		let parsedDeletionLines = 0;
-		for (let lineIndex = 1; lineIndex < lines.length; lineIndex++) {
-			const rawLine = lines[lineIndex];
-			if (parsedAdditionLines >= hunkData.additionCount && parsedDeletionLines >= hunkData.deletionCount && !rawLine.startsWith("\\")) {
-				if (throwOnError && isHunkBodyLine(rawLine) && !isFormatPatchVersionSeparator(rawLine)) throw Error("parsePatchContent: hunk has more lines than expected");
-				break;
-			}
-			const firstChar = rawLine[0];
-			if (firstChar !== "+" && firstChar !== "-" && firstChar !== " " && firstChar !== "\\") {
-				if (throwOnError) throw Error("parsePatchContent: invalid hunk line");
-				console.error(`parseLineType: Invalid firstChar: "${firstChar}", full line: "${rawLine}"`);
-				console.error("processFile: invalid rawLine:", rawLine);
-				continue;
-			}
-			const type = parseRawLineType(firstChar);
-			if (type === "addition") {
-				if (throwOnError && parsedAdditionLines >= hunkData.additionCount) throw Error("parsePatchContent: hunk has too many addition lines");
-				const line = getParsedLineContent(rawLine);
-				if (currentContent == null || currentContent.type !== "change") {
-					currentContent = createContentGroup("change", deletionLineIndex, additionLineIndex);
-					hunkData.hunkContent.push(currentContent);
-				}
-				additionLineIndex++;
-				parsedAdditionLines++;
-				if (isPartial) currentFile.additionLines.push(line);
-				currentContent.additions++;
-				additionLines++;
-				lastLineType = "addition";
-			} else if (type === "deletion") {
-				if (throwOnError && parsedDeletionLines >= hunkData.deletionCount) throw Error("parsePatchContent: hunk has too many deletion lines");
-				const line = getParsedLineContent(rawLine);
-				if (currentContent == null || currentContent.type !== "change") {
-					currentContent = createContentGroup("change", deletionLineIndex, additionLineIndex);
-					hunkData.hunkContent.push(currentContent);
-				}
-				deletionLineIndex++;
-				parsedDeletionLines++;
-				if (isPartial) currentFile.deletionLines.push(line);
-				currentContent.deletions++;
-				deletionLines++;
-				lastLineType = "deletion";
-			} else if (type === "context") {
-				if (throwOnError && (parsedDeletionLines >= hunkData.deletionCount || parsedAdditionLines >= hunkData.additionCount)) throw Error("parsePatchContent: hunk has too many context lines");
-				const line = getParsedLineContent(rawLine);
-				if (currentContent == null || currentContent.type !== "context") {
-					currentContent = createContentGroup("context", deletionLineIndex, additionLineIndex);
-					hunkData.hunkContent.push(currentContent);
-				}
-				additionLineIndex++;
-				deletionLineIndex++;
-				parsedAdditionLines++;
-				parsedDeletionLines++;
-				if (isPartial) {
-					currentFile.deletionLines.push(line);
-					currentFile.additionLines.push(line);
-				}
-				currentContent.lines++;
-				lastLineType = "context";
-			} else if (type === "metadata" && currentContent != null) {
-				if (currentContent.type === "context") {
-					hunkData.noEOFCRAdditions = true;
-					hunkData.noEOFCRDeletions = true;
-				} else if (lastLineType === "deletion") hunkData.noEOFCRDeletions = true;
-				else if (lastLineType === "addition") hunkData.noEOFCRAdditions = true;
-				if (isPartial && (lastLineType === "addition" || lastLineType === "context")) {
-					const lastIndex = currentFile.additionLines.length - 1;
-					if (lastIndex >= 0) currentFile.additionLines[lastIndex] = cleanLastNewline(currentFile.additionLines[lastIndex]);
-				}
-				if (isPartial && (lastLineType === "deletion" || lastLineType === "context")) {
-					const lastIndex = currentFile.deletionLines.length - 1;
-					if (lastIndex >= 0) currentFile.deletionLines[lastIndex] = cleanLastNewline(currentFile.deletionLines[lastIndex]);
-				}
-			}
+	});
+	const maybeGenerateAndRenameWorktreeBranchForFirstTurn = Effect.fn("maybeGenerateAndRenameWorktreeBranchForFirstTurn")(function* (input) {
+		if (!input.branch || !input.worktreePath) return;
+		if (!isTemporaryWorktreeBranch(input.branch)) return;
+		const oldBranch = input.branch;
+		const cwd = input.worktreePath;
+		const attachments = input.attachments ?? [];
+		yield* Effect.gen(function* () {
+			const settings = yield* serverSettingsService.getSettings;
+			const modelSelection = settings.sourceControlWriterModelSelection === null ? settings.textGenerationModelSelection : resolveSourceControlWriterModelSelection(settings, yield* providerRegistry.getProviders);
+			const generated = yield* textGeneration.generateBranchName({
+				cwd,
+				message: input.messageText,
+				...attachments.length > 0 ? { attachments } : {},
+				modelSelection
+			});
+			if (!generated) return;
+			const targetBranch = buildGeneratedWorktreeBranchName(generated.branch);
+			if (targetBranch === oldBranch) return;
+			const renamed = yield* gitWorkflow.renameBranch({
+				cwd,
+				oldBranch,
+				newBranch: targetBranch
+			});
+			yield* orchestrationEngine.dispatch({
+				type: "thread.meta.update",
+				commandId: yield* serverCommandId("worktree-branch-rename"),
+				threadId: input.threadId,
+				branch: renamed.branch,
+				worktreePath: cwd
+			});
+			yield* vcsStatusBroadcaster.refreshStatus(cwd).pipe(Effect.ignoreCause({ log: true }));
+		}).pipe(Effect.catchCause((cause) => Effect.logWarning("provider command reactor failed to generate or rename worktree branch", {
+			threadId: input.threadId,
+			cwd,
+			oldBranch,
+			cause: Cause.pretty(cause)
+		})));
+	});
+	const maybeGenerateThreadTitleForFirstTurn = Effect.fn("maybeGenerateThreadTitleForFirstTurn")(function* (input) {
+		const attachments = input.attachments ?? [];
+		yield* Effect.gen(function* () {
+			const { textGenerationModelSelection: modelSelection } = yield* serverSettingsService.getSettings;
+			const generated = yield* textGeneration.generateThreadTitle({
+				cwd: input.cwd,
+				message: input.messageText,
+				...attachments.length > 0 ? { attachments } : {},
+				modelSelection
+			});
+			if (!generated) return;
+			const thread = yield* resolveThread(input.threadId);
+			if (!thread) return;
+			if (!canReplaceThreadTitle(thread.title, input.titleSeed)) return;
+			yield* orchestrationEngine.dispatch({
+				type: "thread.meta.update",
+				commandId: yield* serverCommandId("thread-title-rename"),
+				threadId: input.threadId,
+				title: generated.title
+			});
+		}).pipe(Effect.catchCause((cause) => Effect.logWarning("provider command reactor failed to generate or rename thread title", {
+			threadId: input.threadId,
+			cwd: input.cwd,
+			cause: Cause.pretty(cause)
+		})));
+	});
+	const processTurnStartRequested = Effect.fn("processTurnStartRequested")(function* (event) {
+		const key = turnStartKeyForEvent(event);
+		if (yield* hasHandledTurnStartRecently(key)) return;
+		const thread = yield* resolveThread(event.payload.threadId);
+		if (!thread) return;
+		const message = thread.messages.find((entry) => entry.id === event.payload.messageId);
+		if (!message || message.role !== "user") {
+			yield* appendProviderFailureActivity({
+				threadId: event.payload.threadId,
+				kind: "provider.turn.start.failed",
+				summary: "Provider turn start failed",
+				detail: `User message '${event.payload.messageId}' was not found for turn start request.`,
+				turnId: null,
+				createdAt: event.payload.createdAt
+			});
+			return;
 		}
-		if (throwOnError && (parsedAdditionLines !== hunkData.additionCount || parsedDeletionLines !== hunkData.deletionCount)) throw Error("parsePatchContent: hunk line count mismatch");
-		hunkData.additionLines = additionLines;
-		hunkData.deletionLines = deletionLines;
-		hunkData.collapsedBefore = Math.max(hunkData.additionStart - 1 - lastHunkEnd, 0);
-		currentFile.hunks.push(hunkData);
-		lastHunkEnd = hunkData.additionStart + hunkData.additionCount - 1;
-		for (const content of hunkData.hunkContent) if (content.type === "context") {
-			hunkData.splitLineCount += content.lines;
-			hunkData.unifiedLineCount += content.lines;
-		} else {
-			hunkData.splitLineCount += Math.max(content.additions, content.deletions);
-			hunkData.unifiedLineCount += content.deletions + content.additions;
+		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,
+				...generationInput
+			}).pipe(Effect.forkScoped);
+			if (canReplaceThreadTitle(thread.title, event.payload.titleSeed)) yield* maybeGenerateThreadTitleForFirstTurn({
+				threadId: event.payload.threadId,
+				cwd: generationCwd,
+				...generationInput
+			}).pipe(Effect.forkScoped);
 		}
-		hunkData.splitLineStart = currentFile.splitLineCount + hunkData.collapsedBefore;
-		hunkData.unifiedLineStart = currentFile.unifiedLineCount + hunkData.collapsedBefore;
-		currentFile.splitLineCount += hunkData.collapsedBefore + hunkData.splitLineCount;
-		currentFile.unifiedLineCount += hunkData.collapsedBefore + hunkData.unifiedLineCount;
-	}
-	if (currentFile == null) return;
-	if (throwOnError && isPartial && !isGitDiff && currentFile.hunks.length === 0) throw Error("parsePatchContent: unified file has no hunks");
-	if (currentFile.hunks.length > 0 && !isPartial && currentFile.additionLines.length > 0 && currentFile.deletionLines.length > 0) {
-		const lastHunk = currentFile.hunks[currentFile.hunks.length - 1];
-		const lastHunkEnd$1 = lastHunk.additionStart + lastHunk.additionCount - 1;
-		const totalFileLines = currentFile.additionLines.length;
-		const collapsedAfter = Math.max(totalFileLines - lastHunkEnd$1, 0);
-		currentFile.splitLineCount += collapsedAfter;
-		currentFile.unifiedLineCount += collapsedAfter;
-	}
-	if (!isGitDiff) {
-		if (currentFile.prevName != null && currentFile.name !== currentFile.prevName) if (currentFile.hunks.length > 0) currentFile.type = "rename-changed";
-		else currentFile.type = "rename-pure";
-		else if ((oldFile == null || oldFile.contents === "") && newFile != null && newFile.contents !== "") currentFile.type = "new";
-		else if (oldFile != null && oldFile.contents !== "" && (newFile == null || newFile.contents === "")) currentFile.type = "deleted";
-	}
-	if (currentFile.type !== "rename-pure" && currentFile.type !== "rename-changed") currentFile.prevName = void 0;
-	return currentFile;
-}
-/**
-* Parses a patch file string into an array of parsed patches.
-*
-* @param data - The raw patch file content (supports multi-commit patches)
-* @param cacheKeyPrefix - Optional prefix for generating cache keys. When provided,
-*   each file in the patch will get a cache key in the format `prefix-patchIndex-fileIndex`.
-*   This enables caching of rendered diff results in the worker pool.
-*/
-function parsePatchFiles(data, cacheKeyPrefix, throwOnError = false) {
-	const patches = [];
-	const rawPatches = hasCommitMetadataBoundary(data) ? data.split(COMMIT_METADATA_SPLIT) : [data];
-	for (const patch of rawPatches) try {
-		patches.push(processPatch(patch, cacheKeyPrefix != null ? `${cacheKeyPrefix}-${patches.length}` : void 0, throwOnError));
-	} catch (error) {
-		if (throwOnError) throw error;
-		else console.error(error);
-	}
-	return patches;
-}
-function hasCommitMetadataBoundary(data) {
-	return data.startsWith("From ") || data.includes("\nFrom ");
-}
-function splitFileContents(contents) {
-	const lines = splitWithNewlines(contents);
-	for (let index = 0; index < lines.length; index++) lines[index] = detachString(lines[index]);
-	return lines;
-}
-function splitWithNewlines(contents) {
-	if (contents.length === 0) return [""];
-	const lines = [];
-	let startIndex = 0;
-	for (;;) {
-		const newlineIndex = contents.indexOf("\n", startIndex);
-		if (newlineIndex === -1) break;
-		lines.push(contents.slice(startIndex, newlineIndex + 1));
-		startIndex = newlineIndex + 1;
-	}
-	if (startIndex < contents.length) lines.push(contents.slice(startIndex));
-	return lines;
-}
-function splitGitDiffFiles(contents) {
-	return splitAtLinePrefix(contents, "diff --git");
-}
-function splitUnifiedDiffFiles(contents) {
-	if (contents.length === 0) return [""];
-	const parts = [];
-	let partStartIndex = 0;
-	let lineStartIndex = 0;
-	let remainingDeletionLines = 0;
-	let remainingAdditionLines = 0;
-	let hasOpenedUnifiedFile = false;
-	while (lineStartIndex < contents.length) {
-		const nextLineStartIndex = getNextLineStartIndex(contents, lineStartIndex);
-		if (remainingDeletionLines <= 0 && remainingAdditionLines <= 0) {
-			if (isUnifiedDiffFileHeaderAt(contents, lineStartIndex)) {
-				if (lineStartIndex > partStartIndex) parts.push(contents.slice(partStartIndex, lineStartIndex));
-				partStartIndex = lineStartIndex;
-				hasOpenedUnifiedFile = true;
-				lineStartIndex = getNextLineStartIndex(contents, nextLineStartIndex);
-				continue;
-			}
-			if (hasOpenedUnifiedFile && contents.startsWith("@@ -", lineStartIndex)) {
-				const fileHeader = parseHunkHeader(contents.slice(lineStartIndex, nextLineStartIndex));
-				if (fileHeader != null) {
-					remainingDeletionLines = fileHeader.deletionCount;
-					remainingAdditionLines = fileHeader.additionCount;
-				}
+		const handleTurnStartFailure = (cause) => {
+			if (Cause.hasInterruptsOnly(cause)) return Effect.void;
+			const detail = formatFailureDetail(cause);
+			return setThreadSessionErrorOnTurnStartFailure({
+				threadId: event.payload.threadId,
+				detail,
+				createdAt: event.payload.createdAt
+			}).pipe(Effect.flatMap(() => appendProviderFailureActivity({
+				threadId: event.payload.threadId,
+				kind: "provider.turn.start.failed",
+				summary: "Provider turn start failed",
+				detail,
+				turnId: null,
+				createdAt: event.payload.createdAt
+			})), Effect.asVoid);
+		};
+		const recoverTurnStartFailure = (cause) => handleTurnStartFailure(cause).pipe(Effect.catchCause((recoveryCause) => Effect.logWarning("provider command reactor failed to recover turn start failure", {
+			eventType: event.type,
+			threadId: event.payload.threadId,
+			cause: Cause.pretty(recoveryCause),
+			originalCause: Cause.pretty(cause)
+		})));
+		const sendTurnRequest = yield* buildSendTurnRequestForThread({
+			threadId: event.payload.threadId,
+			messageText: message.text,
+			...message.attachments !== void 0 ? { attachments: message.attachments } : {},
+			...event.payload.modelSelection !== void 0 ? { modelSelection: event.payload.modelSelection } : {},
+			interactionMode: event.payload.interactionMode,
+			createdAt: event.payload.createdAt
+		}).pipe(Effect.map(Option.some), Effect.catchCause((cause) => handleTurnStartFailure(cause).pipe(Effect.as(Option.none()))));
+		if (Option.isNone(sendTurnRequest)) return;
+		yield* providerService.sendTurn(sendTurnRequest.value).pipe(Effect.catchCause(recoverTurnStartFailure), Effect.forkScoped);
+	});
+	const processTurnInterruptRequested = Effect.fn("processTurnInterruptRequested")(function* (event) {
+		const thread = yield* resolveThread(event.payload.threadId);
+		if (!thread) return;
+		if (!(thread.session && thread.session.status !== "stopped")) return yield* appendProviderFailureActivity({
+			threadId: event.payload.threadId,
+			kind: "provider.turn.interrupt.failed",
+			summary: "Provider turn interrupt failed",
+			detail: "No active provider session is bound to this thread.",
+			turnId: event.payload.turnId ?? null,
+			createdAt: event.payload.createdAt
+		});
+		yield* providerService.interruptTurn({ threadId: event.payload.threadId });
+		yield* appendTurnInterruptedActivity({
+			threadId: event.payload.threadId,
+			turnId: event.payload.turnId ?? null,
+			createdAt: event.payload.createdAt
+		});
+	});
+	const processApprovalResponseRequested = Effect.fn("processApprovalResponseRequested")(function* (event) {
+		const thread = yield* resolveThread(event.payload.threadId);
+		if (!thread) return;
+		if (!(thread.session && thread.session.status !== "stopped")) return yield* appendProviderFailureActivity({
+			threadId: event.payload.threadId,
+			kind: "provider.approval.respond.failed",
+			summary: "Provider approval response failed",
+			detail: "No active provider session is bound to this thread.",
+			turnId: null,
+			createdAt: event.payload.createdAt,
+			requestId: event.payload.requestId
+		});
+		yield* providerService.respondToRequest({
+			threadId: event.payload.threadId,
+			requestId: event.payload.requestId,
+			decision: event.payload.decision
+		}).pipe(Effect.catchCause((cause) => appendProviderFailureActivity({
+			threadId: event.payload.threadId,
+			kind: "provider.approval.respond.failed",
+			summary: "Provider approval response failed",
+			detail: isUnknownPendingApprovalRequestError(cause) ? stalePendingRequestDetail("approval", event.payload.requestId) : Cause.pretty(cause),
+			turnId: null,
+			createdAt: event.payload.createdAt,
+			requestId: event.payload.requestId
+		})));
+	});
+	const processUserInputResponseRequested = Effect.fn("processUserInputResponseRequested")(function* (event) {
+		const thread = yield* resolveThread(event.payload.threadId);
+		if (!thread) return;
+		if (!(thread.session && thread.session.status !== "stopped")) return yield* appendProviderFailureActivity({
+			threadId: event.payload.threadId,
+			kind: "provider.user-input.respond.failed",
+			summary: "Provider user input response failed",
+			detail: "No active provider session is bound to this thread.",
+			turnId: null,
+			createdAt: event.payload.createdAt,
+			requestId: event.payload.requestId
+		});
+		yield* providerService.respondToUserInput({
+			threadId: event.payload.threadId,
+			requestId: event.payload.requestId,
+			answers: event.payload.answers
+		}).pipe(Effect.catchCause((cause) => appendProviderFailureActivity({
+			threadId: event.payload.threadId,
+			kind: "provider.user-input.respond.failed",
+			summary: "Provider user input response failed",
+			detail: isUnknownPendingUserInputRequestError(cause) ? stalePendingRequestDetail("user-input", event.payload.requestId) : Cause.pretty(cause),
+			turnId: null,
+			createdAt: event.payload.createdAt,
+			requestId: event.payload.requestId
+		})));
+	});
+	const processSessionStopRequested = Effect.fn("processSessionStopRequested")(function* (event) {
+		const thread = yield* resolveThread(event.payload.threadId);
+		if (!thread) return;
+		const now = event.payload.createdAt;
+		if (thread.session && thread.session.status !== "stopped") yield* providerService.stopSession({ threadId: thread.id });
+		yield* setThreadSession({
+			threadId: thread.id,
+			session: {
+				threadId: thread.id,
+				status: "stopped",
+				providerName: thread.session?.providerName ?? null,
+				...thread.session?.providerInstanceId !== void 0 ? { providerInstanceId: thread.session.providerInstanceId } : {},
+				runtimeMode: thread.session?.runtimeMode ?? DEFAULT_RUNTIME_MODE,
+				activeTurnId: null,
+				lastError: thread.session?.lastError ?? null,
+				updatedAt: now
+			},
+			createdAt: now
+		});
+	});
+	const processDomainEvent = Effect.fn("processDomainEvent")(function* (event) {
+		yield* Effect.annotateCurrentSpan({
+			"orchestration.event_type": event.type,
+			"orchestration.thread_id": event.payload.threadId,
+			...event.commandId ? { "orchestration.command_id": event.commandId } : {}
+		});
+		yield* increment(orchestrationEventsProcessedTotal, { eventType: event.type });
+		switch (event.type) {
+			case "thread.runtime-mode-set": {
+				const thread = yield* resolveThread(event.payload.threadId);
+				if (!thread?.session || thread.session.status === "stopped") return;
+				const cachedModelSelection = threadModelSelections.get(event.payload.threadId);
+				yield* ensureSessionForThread(event.payload.threadId, event.occurredAt, cachedModelSelection !== void 0 ? { modelSelection: cachedModelSelection } : {});
+				return;
 			}
-			lineStartIndex = nextLineStartIndex;
-			continue;
-		}
-		const firstChar = contents[lineStartIndex];
-		if (firstChar === "\\") {
-			lineStartIndex = nextLineStartIndex;
-			continue;
+			case "thread.turn-start-requested":
+				yield* processTurnStartRequested(event);
+				return;
+			case "thread.turn-interrupt-requested":
+				yield* processTurnInterruptRequested(event);
+				return;
+			case "thread.approval-response-requested":
+				yield* processApprovalResponseRequested(event);
+				return;
+			case "thread.user-input-response-requested":
+				yield* processUserInputResponseRequested(event);
+				return;
+			case "thread.session-stop-requested":
+				yield* processSessionStopRequested(event);
+				return;
 		}
-		if (firstChar === " ") {
-			remainingDeletionLines = Math.max(remainingDeletionLines - 1, 0);
-			remainingAdditionLines = Math.max(remainingAdditionLines - 1, 0);
-		} else if (firstChar === "-") remainingDeletionLines = Math.max(remainingDeletionLines - 1, 0);
-		else if (firstChar === "+") remainingAdditionLines = Math.max(remainingAdditionLines - 1, 0);
-		lineStartIndex = nextLineStartIndex;
-	}
-	parts.push(contents.slice(partStartIndex));
-	return parts;
-}
-function startsWithUnifiedDiffFileHeader(contents) {
-	return isUnifiedDiffFileHeaderAt(contents, 0);
-}
-function isUnifiedDiffFileHeaderAt(contents, lineStartIndex) {
-	const nextLineStartIndex = getNextLineStartIndex(contents, lineStartIndex);
-	return isUnifiedDiffHeaderLineAt(contents, lineStartIndex, "---") && isUnifiedDiffHeaderLineAt(contents, nextLineStartIndex, "+++");
-}
-function isUnifiedDiffHeaderLineAt(contents, lineStartIndex, prefix) {
-	if (!contents.startsWith(prefix, lineStartIndex)) return false;
-	const separator = contents[lineStartIndex + prefix.length];
-	if (separator !== " " && separator !== "	") return false;
-	for (let index = lineStartIndex + prefix.length + 1; index < contents.length; index++) {
-		const char = contents[index];
-		if (char === "\n" || char === "\r") break;
-		if (char !== " " && char !== "	") return true;
-	}
-	return false;
-}
-function getNextLineStartIndex(contents, lineStartIndex) {
-	const newlineIndex = contents.indexOf("\n", lineStartIndex);
-	return newlineIndex === -1 ? contents.length : newlineIndex + 1;
-}
-function isHunkBodyLine(line) {
-	const firstChar = line[0];
-	return firstChar === "+" || firstChar === "-" || firstChar === " ";
-}
-function isFormatPatchVersionSeparator(line) {
-	if (!line.startsWith("--")) return false;
-	for (let index = 2; index < line.length; index++) {
-		const char = line[index];
-		if (char !== " " && char !== "	" && char !== "\n" && char !== "\r") return false;
-	}
-	return true;
-}
-function parseHunkHeader(line) {
-	if (!line.startsWith("@@ -")) return;
-	let index = 4;
-	const deletionStartResult = readPositiveInteger(line, index);
-	if (deletionStartResult == null) return;
-	const deletionStart = deletionStartResult.value;
-	index = deletionStartResult.endIndex;
-	let deletionCount = 1;
-	if (line[index] === ",") {
-		const deletionCountResult = readPositiveInteger(line, index + 1);
-		if (deletionCountResult == null) return;
-		deletionCount = deletionCountResult.value;
-		index = deletionCountResult.endIndex;
-	}
-	if (line[index] !== " " || line[index + 1] !== "+") return;
-	index += 2;
-	const additionStartResult = readPositiveInteger(line, index);
-	if (additionStartResult == null) return;
-	const additionStart = additionStartResult.value;
-	index = additionStartResult.endIndex;
-	let additionCount = 1;
-	if (line[index] === ",") {
-		const additionCountResult = readPositiveInteger(line, index + 1);
-		if (additionCountResult == null) return;
-		additionCount = additionCountResult.value;
-		index = additionCountResult.endIndex;
-	}
-	if (line[index] !== " " || line[index + 1] !== "@" || line[index + 2] !== "@") return;
-	let hunkContext;
-	const contextStartIndex = index + 3;
-	if (line[contextStartIndex] === " ") hunkContext = trimLineEnd(line.slice(contextStartIndex + 1));
-	return {
-		additionCount,
-		additionStart,
-		deletionCount,
-		deletionStart,
-		hunkContext
-	};
-}
-function readPositiveInteger(value, startIndex) {
-	let index = startIndex;
-	let parsedValue = 0;
-	for (; index < value.length; index++) {
-		const digit = value.charCodeAt(index) - 48;
-		if (digit < 0 || digit > 9) break;
-		parsedValue = parsedValue * 10 + digit;
-	}
-	if (index === startIndex) return;
-	return {
-		value: parsedValue,
-		endIndex: index
-	};
-}
-function trimLineEnd(value) {
-	if (value.endsWith("\r\n")) return value.slice(0, -2);
-	if (value.endsWith("\n")) return value.slice(0, -1);
-	return value;
-}
-function isGitDiffPatch(data) {
-	return data.startsWith("diff --git") || data.includes("\ndiff --git");
-}
-function splitAtLinePrefix(contents, prefix) {
-	if (contents.length === 0) return [""];
-	const newlinePrefix = `\n${prefix}`;
-	const firstBoundaryIndex = contents.startsWith(prefix) ? 0 : findLinePrefixIndex(contents, newlinePrefix, 0);
-	if (firstBoundaryIndex === -1) return [contents];
-	const parts = [];
-	if (firstBoundaryIndex > 0) parts.push(contents.slice(0, firstBoundaryIndex));
-	let startIndex = firstBoundaryIndex;
-	for (;;) {
-		const nextBoundaryIndex = findLinePrefixIndex(contents, newlinePrefix, startIndex + 1);
-		if (nextBoundaryIndex === -1) break;
-		parts.push(contents.slice(startIndex, nextBoundaryIndex));
-		startIndex = nextBoundaryIndex;
-	}
-	parts.push(contents.slice(startIndex));
-	return parts;
-}
-function findLinePrefixIndex(contents, newlinePrefix, fromIndex) {
-	const index = contents.indexOf(newlinePrefix, fromIndex);
-	return index === -1 ? -1 : index + 1;
-}
-function maybeDetachOptionalString(value) {
-	return value == null ? value : detachString(value);
-}
-function parseRawLineType(firstChar) {
-	return firstChar === " " ? "context" : firstChar === "\\" ? "metadata" : firstChar === "+" ? "addition" : "deletion";
-}
-function getParsedLineContent(rawLine) {
-	const processedLine = rawLine.slice(1);
-	return detachString(processedLine === "" ? "\n" : processedLine);
-}
-function createContentGroup(type, deletionLineIndex, additionLineIndex) {
-	if (type === "change") return {
-		type: "change",
-		additions: 0,
-		deletions: 0,
-		additionLineIndex,
-		deletionLineIndex
-	};
+	});
+	const processDomainEventSafely = (event) => processDomainEvent(event).pipe(Effect.catchCause((cause) => {
+		if (Cause.hasInterruptsOnly(cause)) return Effect.failCause(cause);
+		return Effect.logWarning("provider command reactor failed to process event", {
+			eventType: event.type,
+			cause: Cause.pretty(cause)
+		});
+	}));
+	const worker = yield* makeDrainableWorker(processDomainEventSafely);
 	return {
-		type: "context",
-		lines: 0,
-		additionLineIndex,
-		deletionLineIndex
+		start: Effect.fn("start")(function* () {
+			const processEvent = Effect.fn("processEvent")(function* (event) {
+				if (event.type === "thread.runtime-mode-set" || event.type === "thread.turn-start-requested" || event.type === "thread.turn-interrupt-requested" || event.type === "thread.approval-response-requested" || event.type === "thread.user-input-response-requested" || event.type === "thread.session-stop-requested") return yield* worker.enqueue(event);
+			});
+			yield* Effect.forkScoped(Stream.runForEach(orchestrationEngine.streamDomainEvents, processEvent));
+		}),
+		drain: worker.drain
 	};
-}
+});
+const ProviderCommandReactorLive = Layer.effect(ProviderCommandReactor, make$2);
 //#endregion
 //#region src/checkpointing/Diffs.ts
 function parseTurnDiffFilesFromUnifiedDiff(diff) {
@@ -83972,6 +84294,7 @@ const make$1 = Effect.gen(function* () {
 	const receiptBus = yield* RuntimeReceiptBus;
 	const workspaceEntries = yield* WorkspaceEntries;
 	const vcsStatusBroadcaster = yield* VcsStatusBroadcaster;
+	const threadActivities = yield* ProjectionThreadActivityRepository;
 	const appendRevertFailureActivity = (input) => Effect.all({
 		commandId: serverCommandId("checkpoint-revert-failure"),
 		activityId: serverEventId
@@ -84060,13 +84383,21 @@ const make$1 = Effect.gen(function* () {
 			checkpointRef: targetCheckpointRef
 		});
 		yield* workspaceEntries.refresh(input.cwd);
+		const turnChangedPaths = yield* threadActivities.listByThreadId({ threadId: input.threadId }).pipe(Effect.map((activities) => {
+			const changedPaths = /* @__PURE__ */ new Set();
+			for (const activity of activities) {
+				if (activity.tone !== "tool" || activity.turnId !== input.turnId) continue;
+				for (const changedPath of collectActivityChangedFilePaths(activity.payload)) changedPaths.add(changedPath);
+			}
+			return normalizeChangedFilePaths(changedPaths, input.cwd);
+		}), Effect.orElseSucceed(() => /* @__PURE__ */ new Set()));
 		const files = yield* checkpointStore.diffCheckpoints({
 			cwd: input.cwd,
 			fromCheckpointRef,
 			toCheckpointRef: targetCheckpointRef,
 			fallbackFromToHead: false,
 			ignoreWhitespace: false
-		}).pipe(Effect.map((diff) => parseTurnDiffFilesFromUnifiedDiff(diff).map((file) => ({
+		}).pipe(Effect.map((diff) => parseTurnDiffFilesFromUnifiedDiff(diff).filter((file) => turnChangedPaths.size === 0 || turnChangedPaths.has(file.path)).map((file) => ({
 			path: file.path,
 			kind: "modified",
 			additions: file.additions,