@norman-else/dsh-claude 0.1.21 → 0.1.23

package/lib/index.mjs

@@ -1,9 +1,9 @@
-import { S as CLAUDE_UPDATE_PATH, _ as CLAUDE_PROJECTION_PATH, a as latestClaudeTasks, b as CLAUDE_REVIEW_COMMENT_PATH, c as normalizeTasksEvent, d as CLAUDE_ACTIVITY_EVENT, f as CLAUDE_CODE_PRESET_ID, g as CLAUDE_GLOBAL_SETTINGS_PATH, h as CLAUDE_DOCTOR_PATH, i as latestClaudeSessionBinding, l as redactText, m as CLAUDE_CODE_PROVIDER_IDS, n as currentClaudeActivityCursor, o as normalizeActivity, p as CLAUDE_CODE_PROVIDER, r as latestClaudeContextUsage, s as normalizeContextUsage, t as boundText, u as safeDetail, v as CLAUDE_REPOSITORY_ACTION_PATH, w as TASK_TOOL_NAMES, x as CLAUDE_UPDATE_CHECK_PATH, y as CLAUDE_REPOSITORY_SETUP_PATH } from "./events-BdDs9ebF.mjs";
-import { n as projectClaudeCommands, t as CLAUDE_COMMANDS_SERVICE } from "./command-bridge-C10-lz6A.mjs";
-import { a as resolveClaudeExecutable, n as ensureManagedPreset, o as runClaudeDoctor, t as ManagedPresetConflictError } from "./preset-installer-DMANIjwu.mjs";
+import { C as CLAUDE_UPDATE_PATH, S as CLAUDE_UPDATE_CHECK_PATH, T as TASK_TOOL_NAMES, _ as CLAUDE_PROJECTION_PATH, a as latestClaudeTasks, b as CLAUDE_REPOSITORY_SETUP_PATH, c as normalizeTasksEvent, d as CLAUDE_ACTIVITY_EVENT, f as CLAUDE_CODE_PRESET_ID, g as CLAUDE_GLOBAL_SETTINGS_PATH, h as CLAUDE_DOCTOR_PATH, i as latestClaudeSessionBinding, l as redactText, m as CLAUDE_CODE_PROVIDER_IDS, n as currentClaudeActivityCursor, o as normalizeActivity, p as CLAUDE_CODE_PROVIDER, r as latestClaudeContextUsage, s as normalizeContextUsage, t as boundText, u as safeDetail, v as CLAUDE_REPOSITORY_ACTION_PATH, x as CLAUDE_REVIEW_COMMENT_PATH, y as CLAUDE_REPOSITORY_FEEDBACK_PATH } from "./events-DhrAr5gh.mjs";
+import { n as projectClaudeCommands, t as CLAUDE_COMMANDS_SERVICE } from "./command-bridge-Br25ODdm.mjs";
+import { a as resolveClaudeExecutable, n as ensureManagedPreset, o as runClaudeDoctor, t as ManagedPresetConflictError } from "./preset-installer-B_Cb0RG6.mjs";
 import z from "@deepseek-ai/schemastery";
 import { createHash, randomUUID } from "node:crypto";
-import { chmod, mkdir, opendir, readFile, realpath, rename, rm, writeFile } from "node:fs/promises";
+import { chmod, mkdir, opendir, readFile, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
 import { basename, dirname, extname, isAbsolute, join, resolve } from "node:path";
 import { dshHomePath, resolveDshHome } from "@deepseek-ai/dsh-home-paths";
 import { homedir } from "node:os";
@@ -25,7 +25,7 @@ function emptyProjection() {
 		activities: []
 	};
 }
-function record$5(value) {
+function record$6(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
 function finiteInteger(value) {
@@ -35,7 +35,7 @@ function string$3(value, max) {
 	return typeof value === "string" && value.length > 0 && value.length <= max;
 }
 function binding(value) {
-	const input = record$5(value);
+	const input = record$6(value);
 	if (input === void 0 || !string$3(input.claudeSessionId, 512) || !string$3(input.sdkVersion, 128) || !string$3(input.cwd, 4096) || input.cliVersion !== void 0 && !string$3(input.cliVersion, 128)) return void 0;
 	return {
 		claudeSessionId: input.claudeSessionId,
@@ -65,22 +65,22 @@ const ACTIVITY_PHASES = /* @__PURE__ */ new Set([
 	"failed"
 ]);
 function activity(value) {
-	const input = record$5(value);
+	const input = record$6(value);
 	if (input === void 0 || !finiteInteger(input.turn) || !finiteInteger(input.step) || !finiteInteger(input.ordinal) || typeof input.kind !== "string" || !ACTIVITY_KINDS.has(input.kind) || input.phase !== void 0 && (typeof input.phase !== "string" || !ACTIVITY_PHASES.has(input.phase))) return void 0;
 	return normalizeActivity(input);
 }
 function contextUsage(value) {
-	const input = record$5(value);
+	const input = record$6(value);
 	if (input === void 0 || !Array.isArray(input.categories)) return void 0;
 	return normalizeContextUsage(input);
 }
 function tasks(value) {
-	const input = record$5(value);
+	const input = record$6(value);
 	if (input === void 0 || !Array.isArray(input.tasks)) return void 0;
 	return normalizeTasksEvent(input.tasks);
 }
 function parseClaudeSidecar(value) {
-	const input = record$5(value);
+	const input = record$6(value);
 	if (input === void 0 || input.schemaVersion !== SIDECAR_SCHEMA_VERSION || !finiteInteger(input.revision) || !Array.isArray(input.activities) || input.activities.length > MAX_ACTIVITIES) throw new Error("dsh-claude: invalid sidecar document");
 	const activities = input.activities.map(activity);
 	if (activities.some((item) => item === void 0)) throw new Error("dsh-claude: invalid sidecar activity");
@@ -653,7 +653,7 @@ function createUserQuestionBridge(userQuestions, activeContext) {
 }
 //#endregion
 //#region src/sdk-messages.ts
-function record$4(value) {
+function record$5(value) {
 	return value !== null && typeof value === "object" ? value : void 0;
 }
 function string$2(value) {
@@ -668,7 +668,7 @@ function taskUsageOf(usage) {
 	return Object.keys(normalized).length === 0 ? void 0 : normalized;
 }
 function resultUsage(message) {
-	const usage = record$4(message.usage);
+	const usage = record$5(message.usage);
 	const normalized = {};
 	if (usage !== void 0) {
 		if (typeof usage.input_tokens === "number") normalized.inputTokens = usage.input_tokens;
@@ -680,7 +680,7 @@ function resultUsage(message) {
 	return normalized;
 }
 function normalizeAssistant(message) {
-	const content = record$4(message.message)?.content;
+	const content = record$5(message.message)?.content;
 	if (!Array.isArray(content)) return [{
 		kind: "protocol-error",
 		title: "Malformed Claude assistant message",
@@ -689,7 +689,7 @@ function normalizeAssistant(message) {
 	const parentToolUseId = string$2(message.parent_tool_use_id);
 	const normalized = [];
 	for (const item of content) {
-		const block = record$4(item);
+		const block = record$5(item);
 		if (block === void 0) continue;
 		if (block.type === "text") {
 			const text = string$2(block.text);
@@ -722,7 +722,7 @@ function normalizeAssistant(message) {
 }
 function normalizeUser(message) {
 	if (message.isReplay === true) return [];
-	const content = record$4(message.message)?.content;
+	const content = record$5(message.message)?.content;
 	if (typeof content === "string") return [];
 	if (!Array.isArray(content)) return [{
 		kind: "protocol-error",
@@ -732,7 +732,7 @@ function normalizeUser(message) {
 	const parentToolUseId = string$2(message.parent_tool_use_id);
 	const normalized = [];
 	for (const item of content) {
-		const block = record$4(item);
+		const block = record$5(item);
 		if (block?.type !== "tool_result") continue;
 		const toolUseId = string$2(block.tool_use_id);
 		if (toolUseId === void 0) continue;
@@ -813,7 +813,7 @@ function normalizeSystem(message) {
 		const summary = string$2(message.summary);
 		const subagentType = string$2(message.subagent_type);
 		const lastToolName = string$2(message.last_tool_name);
-		const usage = taskUsageOf(record$4(message.usage));
+		const usage = taskUsageOf(record$5(message.usage));
 		return [{
 			kind: "subagent",
 			title: summary ?? description ?? "Claude subagent update",
@@ -829,7 +829,7 @@ function normalizeSystem(message) {
 		}];
 	}
 	if (subtype === "task_updated") {
-		const patch = record$4(message.patch);
+		const patch = record$5(message.patch);
 		const status = string$2(patch?.status);
 		const taskId = string$2(message.task_id);
 		const description = string$2(patch?.description);
@@ -852,7 +852,7 @@ function normalizeSystem(message) {
 		const taskId = string$2(message.task_id);
 		const summary = string$2(message.summary);
 		const taskStatus = failed ? "failed" : stopped ? "stopped" : "completed";
-		const usage = taskUsageOf(record$4(message.usage));
+		const usage = taskUsageOf(record$5(message.usage));
 		return [{
 			kind: "subagent",
 			title: summary ?? taskId ?? "Claude subagent finished",
@@ -867,7 +867,7 @@ function normalizeSystem(message) {
 	if (subtype === "background_tasks_changed") return [{
 		kind: "background-tasks",
 		tasks: (Array.isArray(message.tasks) ? message.tasks : []).flatMap((item) => {
-			const entry = record$4(item);
+			const entry = record$5(item);
 			const taskId = string$2(entry?.task_id);
 			const description = string$2(entry?.description);
 			const taskType = string$2(entry?.task_type);
@@ -910,10 +910,10 @@ const RESULT_ERROR_SUBTYPES = /* @__PURE__ */ new Set([
 function normalizeSdkMessage(message) {
 	const value = message;
 	if (value.type === "stream_event") {
-		const event = record$4(value.event);
+		const event = record$5(value.event);
 		const parentToolUseId = string$2(value.parent_tool_use_id);
 		if (event?.type === "content_block_delta") {
-			const delta = record$4(event.delta);
+			const delta = record$5(event.delta);
 			if (delta?.type === "text_delta") {
 				const text = string$2(delta.text);
 				return text === void 0 ? [] : [{
@@ -948,7 +948,7 @@ function normalizeSdkMessage(message) {
 		const errors = Array.isArray(value.errors) ? value.errors.filter((item) => typeof item === "string") : void 0;
 		const terminalReason = string$2(value.terminal_reason);
 		const userMessageUuid = string$2(value.user_message_uuid);
-		const permissionDenials = Array.isArray(value.permission_denials) ? value.permission_denials.map((item) => record$4(item)).filter((item) => item !== void 0).map((item) => {
+		const permissionDenials = Array.isArray(value.permission_denials) ? value.permission_denials.map((item) => record$5(item)).filter((item) => item !== void 0).map((item) => {
 			const toolName = string$2(item.tool_name);
 			const toolUseId = string$2(item.tool_use_id);
 			return toolName === void 0 || toolUseId === void 0 ? void 0 : {
@@ -974,7 +974,7 @@ function normalizeSdkMessage(message) {
 		detail: value.error ?? value.output
 	}];
 	if (value.type === "rate_limit_event") {
-		const status = string$2(record$4(value.rate_limit_info)?.status);
+		const status = string$2(record$5(value.rate_limit_info)?.status);
 		return [{
 			kind: "status",
 			title: status !== void 0 && status !== "allowed" ? "Claude rate limit is blocking requests" : "Claude rate limit status changed",
@@ -2510,7 +2510,7 @@ function registerClaudeDoctorRoutes(ctx, runtime, supervisor, config, resolution
 }
 //#endregion
 //#region src/projection-routes.ts
-const MAX_SESSION_ID_CHARS$2 = 1024;
+const MAX_SESSION_ID_CHARS$3 = 1024;
 /** Slow-moving metadata refresh and stream heartbeat cadence; deliberately off
 *  the transcript hot path so git/gh latency never delays visible text. */
 const META_REFRESH_MS = 5e3;
@@ -2524,7 +2524,7 @@ function targetFromUrl(rawUrl) {
 		if (stream) encoded = encoded.slice(0, -7);
 		if (encoded.length === 0 || encoded.includes("/")) return void 0;
 		const sessionId = decodeURIComponent(encoded);
-		if (sessionId.length === 0 || sessionId.length > MAX_SESSION_ID_CHARS$2) return void 0;
+		if (sessionId.length === 0 || sessionId.length > MAX_SESSION_ID_CHARS$3) return void 0;
 		return {
 			sessionId,
 			stream
@@ -2684,17 +2684,17 @@ function registerClaudeProjectionRoute(ctx, sidecar, ownsSession, commandsForSes
 }
 //#endregion
 //#region src/repository-status.ts
-const MAX_OUTPUT_BYTES$2 = 65536;
+const MAX_OUTPUT_BYTES$3 = 65536;
 const MAX_DIFF_BYTES = 262144;
 const MAX_UNTRACKED_DIFFS = 50;
-const GIT_TIMEOUT_MS$2 = 5e3;
-const GH_TIMEOUT_MS = 8e3;
+const GIT_TIMEOUT_MS$3 = 5e3;
+const GH_TIMEOUT_MS$1 = 8e3;
 const CACHE_TTL_MS = 5e3;
 const MAX_TEXT_CHARS = 1024;
 function bounded(value) {
 	return value.trim().slice(0, MAX_TEXT_CHARS);
 }
-async function collect$2(handle) {
+async function collect$3(handle) {
 	const outcome = await handle.done;
 	const stdout = handle.collected.stdout?.readFrom(0);
 	return {
@@ -2703,15 +2703,15 @@ async function collect$2(handle) {
 		lossy: stdout?.lossy === true
 	};
 }
-async function run(runtime, executable, args, cwd, timeoutMs, maxBytes = MAX_OUTPUT_BYTES$2) {
+async function run(runtime, executable, args, cwd, timeoutMs, maxBytes = MAX_OUTPUT_BYTES$3) {
 	const signal = AbortSignal.timeout(timeoutMs);
-	return collect$2(runtime.spawn({
+	return collect$3(runtime.spawn({
 		argv: [executable, ...args],
 		cwd,
 		stdio: {
 			stdin: "ignore",
 			stdout: { maxBytes },
-			stderr: { maxBytes: MAX_OUTPUT_BYTES$2 }
+			stderr: { maxBytes: MAX_OUTPUT_BYTES$3 }
 		},
 		graceMs: 1e3,
 		signal,
@@ -2781,14 +2781,14 @@ function parseGitHubRemote(value) {
 	if (match?.[1] === void 0 || match[2] === void 0) return void 0;
 	return `${match[1]}/${match[2]}`;
 }
-function record$3(value) {
+function record$4(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
 function aggregateChecks(value) {
 	if (!Array.isArray(value) || value.length === 0) return "none";
 	let pending = false;
 	for (const item of value) {
-		const check = record$3(item);
+		const check = record$4(item);
 		if (check === void 0) continue;
 		const conclusion = typeof check.conclusion === "string" ? check.conclusion.toUpperCase() : void 0;
 		const status = typeof check.status === "string" ? check.status.toUpperCase() : void 0;
@@ -2812,7 +2812,7 @@ function reviewState(value) {
 	return "none";
 }
 function parsePullRequest(value) {
-	const input = record$3(value);
+	const input = record$4(value);
 	if (input === void 0 || !Number.isSafeInteger(input.number) || Number(input.number) <= 0 || typeof input.title !== "string" || typeof input.url !== "string") return void 0;
 	let url;
 	try {
@@ -2833,7 +2833,7 @@ function parsePullRequest(value) {
 		review: reviewState(input.reviewDecision),
 		checks: aggregateChecks(input.statusCheckRollup),
 		...typeof input.mergeStateStatus === "string" ? { mergeState: bounded(input.mergeStateStatus) } : {},
-		...typeof record$3(input.author)?.login === "string" ? { author: bounded(String(record$3(input.author)?.login)) } : {},
+		...typeof record$4(input.author)?.login === "string" ? { author: bounded(String(record$4(input.author)?.login)) } : {},
 		...typeof input.createdAt === "string" && Number.isFinite(Date.parse(input.createdAt)) ? { createdAt: new Date(input.createdAt).toISOString() } : {},
 		...typeof input.mergedAt === "string" && Number.isFinite(Date.parse(input.mergedAt)) ? { mergedAt: new Date(input.mergedAt).toISOString() } : {},
 		...typeof input.baseRefName === "string" && bounded(input.baseRefName).length > 0 ? { baseBranch: bounded(input.baseRefName) } : {}
@@ -2906,7 +2906,7 @@ var RepositoryStatusService = class {
 				"--show-toplevel",
 				"--absolute-git-dir",
 				"--git-common-dir"
-			], cwd, GIT_TIMEOUT_MS$2);
+			], cwd, GIT_TIMEOUT_MS$3);
 			if (paths.exitCode !== 0) return {
 				status: "not-repository",
 				cwd: safeCwd
@@ -2924,7 +2924,7 @@ var RepositoryStatusService = class {
 				"--porcelain=v2",
 				"--branch",
 				"--untracked-files=normal"
-			], cwd, GIT_TIMEOUT_MS$2);
+			], cwd, GIT_TIMEOUT_MS$3);
 			if (statusResult.exitCode !== 0) return {
 				status: "unavailable",
 				cwd: safeCwd
@@ -2934,7 +2934,7 @@ var RepositoryStatusService = class {
 				"remote",
 				"get-url",
 				"origin"
-			], cwd, GIT_TIMEOUT_MS$2);
+			], cwd, GIT_TIMEOUT_MS$3);
 			const remote = remoteResult.exitCode === 0 ? parseGitHubRemote(remoteResult.stdout) : void 0;
 			const pullRequest = status.branch === void 0 || remote === void 0 ? void 0 : await this.#pullRequest(cwd, remote, status.branch);
 			const diffBase = pullRequest?.baseBranch === void 0 ? "HEAD" : await this.#mergeBase(cwd, git, pullRequest.baseBranch) ?? "HEAD";
@@ -2944,6 +2944,7 @@ var RepositoryStatusService = class {
 				files: 0,
 				truncated: false
 			};
+			const baseBehind = pullRequest?.state === "open" && pullRequest.baseBranch !== void 0 ? await this.#baseBehind(cwd, git, pullRequest.baseBranch) : void 0;
 			return {
 				status: "ready",
 				cwd: safeCwd,
@@ -2952,7 +2953,8 @@ var RepositoryStatusService = class {
 				worktree: normalizedPath(gitDir) !== normalizedPath(commonDir),
 				...remote === void 0 ? {} : { remote },
 				...pullRequest === void 0 ? {} : { pullRequest },
-				...diff === void 0 ? {} : { diff }
+				...diff === void 0 ? {} : { diff },
+				...baseBehind === void 0 ? {} : { baseBehind }
 			};
 		} catch {
 			return {
@@ -2961,13 +2963,28 @@ var RepositoryStatusService = class {
 			};
 		}
 	}
+	async #baseBehind(cwd, git, baseBranch) {
+		try {
+			const result = await run(this.#runtime, git, [
+				"rev-list",
+				"--count",
+				`HEAD..refs/remotes/origin/${baseBranch}`,
+				"--"
+			], cwd, GIT_TIMEOUT_MS$3);
+			if (result.exitCode !== 0 || result.lossy) return void 0;
+			const count = Number(bounded(result.stdout));
+			return Number.isSafeInteger(count) && count >= 0 ? count : void 0;
+		} catch {
+			return;
+		}
+	}
 	async #mergeBase(cwd, git, baseBranch) {
 		try {
 			const result = await run(this.#runtime, git, [
 				"merge-base",
 				"HEAD",
 				`refs/remotes/origin/${baseBranch}`
-			], cwd, GIT_TIMEOUT_MS$2);
+			], cwd, GIT_TIMEOUT_MS$3);
 			if (result.exitCode !== 0 || result.lossy) return void 0;
 			const oid = bounded(result.stdout);
 			return /^[0-9a-f]{40}$/iu.test(oid) ? oid : void 0;
@@ -2983,7 +3000,7 @@ var RepositoryStatusService = class {
 				"--numstat",
 				base,
 				"--"
-			], cwd, GIT_TIMEOUT_MS$2);
+			], cwd, GIT_TIMEOUT_MS$3);
 			if (numstat.exitCode !== 0 || numstat.lossy) return void 0;
 			const summary = parseDiffNumstat(numstat.stdout);
 			const patch = await run(this.#runtime, git, [
@@ -2993,7 +3010,7 @@ var RepositoryStatusService = class {
 				"--unified=3",
 				base,
 				"--"
-			], cwd, GIT_TIMEOUT_MS$2, MAX_DIFF_BYTES);
+			], cwd, GIT_TIMEOUT_MS$3, MAX_DIFF_BYTES);
 			if (patch.exitCode !== 0) return {
 				...summary,
 				truncated: true
@@ -3017,7 +3034,7 @@ var RepositoryStatusService = class {
 			"--others",
 			"--exclude-standard",
 			"-z"
-		], cwd, GIT_TIMEOUT_MS$2);
+		], cwd, GIT_TIMEOUT_MS$3);
 		if (listed.exitCode !== 0 || listed.lossy) return {
 			additions: 0,
 			files: 0,
@@ -3040,7 +3057,7 @@ var RepositoryStatusService = class {
 				"--",
 				"/dev/null",
 				path
-			], cwd, GIT_TIMEOUT_MS$2, MAX_DIFF_BYTES);
+			], cwd, GIT_TIMEOUT_MS$3, MAX_DIFF_BYTES);
 			if (result.exitCode !== 0 && result.exitCode !== 1) {
 				truncated = true;
 				continue;
@@ -3069,7 +3086,7 @@ var RepositoryStatusService = class {
 				repository,
 				"--json",
 				"number,title,url,state,isDraft,reviewDecision,mergeStateStatus,mergedAt,statusCheckRollup,author,createdAt,baseRefName"
-			], cwd, GH_TIMEOUT_MS);
+			], cwd, GH_TIMEOUT_MS$1);
 			if (result.exitCode !== 0) return void 0;
 			return parsePullRequest(JSON.parse(result.stdout));
 		} catch {
@@ -3079,12 +3096,13 @@ var RepositoryStatusService = class {
 };
 //#endregion
 //#region src/repository-setup.ts
-const MAX_OUTPUT_BYTES$1 = 131072;
-const GIT_TIMEOUT_MS$1 = 1e4;
+const MAX_OUTPUT_BYTES$2 = 131072;
+const GIT_TIMEOUT_MS$2 = 1e4;
 const GIT_FETCH_TIMEOUT_MS = 6e4;
 const MAX_PATH_CHARS = 4096;
 const MAX_BRANCH_CHARS = 512;
 const LEASE_SCHEMA_VERSION = 1;
+const CLEANUP_GRACE_MS = 12e4;
 var RepositorySetupError = class extends Error {
 	code;
 	constructor(code, message) {
@@ -3093,7 +3111,7 @@ var RepositorySetupError = class extends Error {
 		this.code = code;
 	}
 };
-async function collect$1(handle) {
+async function collect$2(handle) {
 	const outcome = await handle.done;
 	const stdout = handle.collected.stdout?.readFrom(0);
 	const stderr = handle.collected.stderr?.readFrom(0);
@@ -3127,6 +3145,14 @@ function parseWorktreeBranches(value) {
 function slug(value, fallback) {
 	return value.toLocaleLowerCase("en-US").replace(/[^a-z0-9._-]+/gu, "-").replace(/^-+|-+$/gu, "").slice(0, 48) || fallback;
 }
+/** Comparable form for path identity: resolved, forward slashes, case-folded
+*  so Windows drive-letter or case spelling differences cannot hide a match. */
+function comparablePath(value) {
+	return resolve(value).replaceAll("\\", "/").toLocaleLowerCase("en-US");
+}
+function pathExists(value) {
+	return stat(value).then(() => true, () => false);
+}
 function lease(value) {
 	if (value === null || typeof value !== "object" || Array.isArray(value)) return void 0;
 	const input = value;
@@ -3146,6 +3172,7 @@ var RepositorySetupService = class {
 	#leasePath;
 	#worktreeRoot;
 	#branchPrefix;
+	#cleanupGraceMs;
 	#gitPath;
 	#pending = Promise.resolve();
 	constructor(runtime, options = {}) {
@@ -3153,6 +3180,7 @@ var RepositorySetupService = class {
 		this.#leasePath = options.leasePath ?? dshHomePath("plugins", "dsh-claude", "worktrees.json");
 		this.#worktreeRoot = options.worktreeRoot ?? dshHomePath("plugins", "dsh-claude", "worktrees");
 		this.#branchPrefix = options.branchPrefix ?? (async () => "claude");
+		this.#cleanupGraceMs = options.cleanupGraceMs ?? CLEANUP_GRACE_MS;
 	}
 	async listBranches(cwd) {
 		const git = await this.#git();
@@ -3215,14 +3243,22 @@ var RepositorySetupService = class {
 			await this.#writeLeases(leases);
 		});
 	}
-	cleanupSession(sessionId) {
+	/** Reconcile leases against the set of directories still referenced by a
+	*  workspace: an unreferenced lease's clean worktree is removed. Fresh
+	*  leases are retained for a grace period so a worktree created moments ago
+	*  cannot be swept before its workspace registration lands, and dirty
+	*  worktrees are always retained to avoid losing uncommitted work. */
+	cleanupOrphans(activePaths) {
+		const active = new Set(activePaths.map(comparablePath));
 		return this.#serialize(async () => {
 			const leases = await this.#readLeases();
 			const retained = [];
 			let changed = false;
 			const git = await this.#git();
+			const now = Date.now();
 			for (const item of leases) {
-				if (item.sessionId !== sessionId) {
+				const age = now - Date.parse(item.createdAt);
+				if (active.has(comparablePath(item.path)) || !(age >= this.#cleanupGraceMs)) {
 					retained.push(item);
 					continue;
 				}
@@ -3232,7 +3268,15 @@ var RepositorySetupService = class {
 						"--porcelain=v1",
 						"--untracked-files=normal"
 					], item.path);
-					if (status.exitCode !== 0 || status.lossy || status.stdout.trim().length > 0) {
+					if (status.exitCode !== 0 || status.lossy) {
+						if (await pathExists(item.path)) retained.push(item);
+						else {
+							await this.#run(git, ["worktree", "prune"], item.root).catch(() => void 0);
+							changed = true;
+						}
+						continue;
+					}
+					if (status.stdout.trim().length > 0) {
 						retained.push(item);
 						continue;
 					}
@@ -3253,7 +3297,8 @@ var RepositorySetupService = class {
 					], item.root).catch(() => void 0);
 					changed = true;
 				} catch {
-					retained.push(item);
+					if (await pathExists(item.root)) retained.push(item);
+					else changed = true;
 				}
 			}
 			if (changed) await this.#writeLeases(retained);
@@ -3386,14 +3431,14 @@ var RepositorySetupService = class {
 		this.#gitPath ??= this.#runtime.resolveExecutable("git");
 		return this.#gitPath;
 	}
-	async #run(executable, args, cwd, timeoutMs = GIT_TIMEOUT_MS$1) {
-		return collect$1(this.#runtime.spawn({
+	async #run(executable, args, cwd, timeoutMs = GIT_TIMEOUT_MS$2) {
+		return collect$2(this.#runtime.spawn({
 			argv: [executable, ...args],
 			cwd,
 			stdio: {
 				stdin: "ignore",
-				stdout: { maxBytes: MAX_OUTPUT_BYTES$1 },
-				stderr: { maxBytes: MAX_OUTPUT_BYTES$1 }
+				stdout: { maxBytes: MAX_OUTPUT_BYTES$2 },
+				stderr: { maxBytes: MAX_OUTPUT_BYTES$2 }
 			},
 			graceMs: 1e3,
 			signal: AbortSignal.timeout(timeoutMs),
@@ -3434,12 +3479,12 @@ var RepositorySetupService = class {
 };
 //#endregion
 //#region src/repository-actions.ts
-const MAX_OUTPUT_BYTES = 262144;
+const MAX_OUTPUT_BYTES$1 = 262144;
 const MAX_PATCH_CHARS = 65536;
 const MAX_MESSAGE_CHARS = 512;
 const MAX_PR_TEXT_CHARS = 8192;
 const MAX_UNPUSHED_COMMITS = 20;
-const GIT_TIMEOUT_MS = 15e3;
+const GIT_TIMEOUT_MS$1 = 15e3;
 const REMOTE_TIMEOUT_MS = 6e4;
 const GENERATE_TIMEOUT_MS = 6e4;
 var RepositoryActionError = class extends Error {
@@ -3452,7 +3497,7 @@ var RepositoryActionError = class extends Error {
 		if (commit !== void 0) this.commit = commit;
 	}
 };
-async function collect(handle) {
+async function collect$1(handle) {
 	const outcome = await handle.done;
 	const stdout = handle.collected.stdout?.readFrom(0);
 	const stderr = handle.collected.stderr?.readFrom(0);
@@ -3579,6 +3624,77 @@ var RepositoryActionService = class {
 				pushed: true
 			};
 		}
+		if (request.action === "merge-pr") {
+			const method = request.mergeMethod;
+			if (method !== "merge" && method !== "squash" && method !== "rebase") throw new RepositoryActionError("invalid-request", "The merge method is invalid.");
+			let gh;
+			try {
+				gh = await this.#gh();
+			} catch (error) {
+				throw new RepositoryActionError("gh-unavailable", error instanceof Error ? error.message : "GitHub CLI is unavailable.");
+			}
+			const merged = await this.#run(gh, [
+				"pr",
+				"merge",
+				`--${method}`
+			], before.root, REMOTE_TIMEOUT_MS);
+			if (merged.exitCode !== 0 || merged.lossy) {
+				const reason = merged.stderr.split(/\r?\n/u).map((line) => line.trim()).filter((line) => line.length > 0).at(-1);
+				throw new RepositoryActionError("merge-failed", reason === void 0 || reason.length === 0 ? "The pull request could not be merged." : reason);
+			}
+			this.#invalidate(before.root);
+			return {
+				commit: before.head,
+				pushed: true
+			};
+		}
+		if (request.action === "update-branch") {
+			const base = safeText(request.baseBranch ?? "", 512, "Base branch");
+			if (before.files.length > 0) throw new RepositoryActionError("dirty-workspace", "Commit or stash workspace changes before updating the branch.");
+			const git = await this.#git();
+			await this.#mustRun(git, [
+				"fetch",
+				"origin",
+				"--",
+				base
+			], before.root, REMOTE_TIMEOUT_MS, "fetch-failed", "Git could not fetch the base branch.");
+			const merged = await this.#run(git, [
+				"merge",
+				"--no-edit",
+				"--",
+				`origin/${base}`
+			], before.root, REMOTE_TIMEOUT_MS);
+			if (merged.exitCode !== 0 || merged.lossy) {
+				const conflicted = await this.#run(git, [
+					"diff",
+					"--name-only",
+					"--diff-filter=U",
+					"--"
+				], before.root, GIT_TIMEOUT_MS$1);
+				const conflicts = conflicted.exitCode === 0 && !conflicted.lossy ? conflicted.stdout.split(/\r?\n/u).filter((line) => line.length > 0).slice(0, 100) : [];
+				if (conflicts.length === 0) {
+					await this.#run(git, ["merge", "--abort"], before.root, GIT_TIMEOUT_MS$1).catch(() => void 0);
+					throw new RepositoryActionError("merge-failed", "Git could not merge the base branch.");
+				}
+				this.#invalidate(before.root);
+				return {
+					commit: before.head,
+					pushed: false,
+					conflicts
+				};
+			}
+			const mergedHead = (await this.#mustRun(git, ["rev-parse", "HEAD"], before.root, GIT_TIMEOUT_MS$1, "merge-failed", "The merge commit could not be verified.")).stdout.trim();
+			try {
+				await this.#push(git, before.root, before.branch);
+			} catch (error) {
+				throw new RepositoryActionError("push-failed", error instanceof Error ? error.message : "Git push failed.", mergedHead);
+			}
+			this.#invalidate(before.root);
+			return {
+				commit: mergedHead,
+				pushed: true
+			};
+		}
 		const message = safeText(request.message, MAX_MESSAGE_CHARS, "Commit message");
 		if (before.files.length === 0 && request.action !== "create-pr") throw new RepositoryActionError("nothing-to-commit", "There are no changes to commit.");
 		const git = await this.#git();
@@ -3591,7 +3707,7 @@ var RepositoryActionService = class {
 					"add",
 					"--",
 					...paths
-				], before.root, GIT_TIMEOUT_MS, "stage-failed", "Changes could not be staged.");
+				], before.root, GIT_TIMEOUT_MS$1, "stage-failed", "Changes could not be staged.");
 			}
 			await this.#rejectStagedWarp(git, before.root);
 			const staged = await this.#run(git, [
@@ -3600,7 +3716,7 @@ var RepositoryActionService = class {
 				"--quiet",
 				"--exit-code",
 				"--"
-			], before.root, GIT_TIMEOUT_MS);
+			], before.root, GIT_TIMEOUT_MS$1);
 			if (staged.exitCode === 0) throw new RepositoryActionError("nothing-to-commit", "There are no staged changes to commit.");
 			if (staged.exitCode !== 1) throw new RepositoryActionError("repository-unavailable", "The staged changes could not be verified.");
 			await this.#mustRun(git, [
@@ -3608,8 +3724,8 @@ var RepositoryActionService = class {
 				"-m",
 				message,
 				"--"
-			], before.root, GIT_TIMEOUT_MS, "commit-failed", "Git commit failed.");
-			oid = (await this.#mustRun(git, ["rev-parse", "HEAD"], before.root, GIT_TIMEOUT_MS, "commit-failed", "The new commit could not be verified.")).stdout.trim();
+			], before.root, GIT_TIMEOUT_MS$1, "commit-failed", "Git commit failed.");
+			oid = (await this.#mustRun(git, ["rev-parse", "HEAD"], before.root, GIT_TIMEOUT_MS$1, "commit-failed", "The new commit could not be verified.")).stdout.trim();
 			this.#invalidate(before.root);
 			if (request.action === "commit") return {
 				commit: oid,
@@ -3660,21 +3776,21 @@ var RepositoryActionService = class {
 			"rev-parse",
 			"--path-format=absolute",
 			"--show-toplevel"
-		], cwd, GIT_TIMEOUT_MS, "not-repository", "The session directory is not a Git repository.")).stdout.trim();
+		], cwd, GIT_TIMEOUT_MS$1, "not-repository", "The session directory is not a Git repository.")).stdout.trim();
 		const [branchResult, headResult, statusResult, stagedPatch, unstagedPatch] = await Promise.all([
 			this.#run(git, [
 				"symbolic-ref",
 				"--quiet",
 				"--short",
 				"HEAD"
-			], root, GIT_TIMEOUT_MS),
-			this.#run(git, ["rev-parse", "HEAD"], root, GIT_TIMEOUT_MS),
+			], root, GIT_TIMEOUT_MS$1),
+			this.#run(git, ["rev-parse", "HEAD"], root, GIT_TIMEOUT_MS$1),
 			this.#run(git, [
 				"status",
 				"--porcelain=v1",
 				"-z",
 				"--untracked-files=all"
-			], root, GIT_TIMEOUT_MS),
+			], root, GIT_TIMEOUT_MS$1),
 			this.#run(git, [
 				"diff",
 				"--cached",
@@ -3684,7 +3800,7 @@ var RepositoryActionService = class {
 				"--",
 				":(exclude)WARP.md",
 				":(exclude)**/WARP.md"
-			], root, GIT_TIMEOUT_MS, MAX_OUTPUT_BYTES),
+			], root, GIT_TIMEOUT_MS$1, MAX_OUTPUT_BYTES$1),
 			this.#run(git, [
 				"diff",
 				"--no-ext-diff",
@@ -3693,7 +3809,7 @@ var RepositoryActionService = class {
 				"--",
 				":(exclude)WARP.md",
 				":(exclude)**/WARP.md"
-			], root, GIT_TIMEOUT_MS, MAX_OUTPUT_BYTES)
+			], root, GIT_TIMEOUT_MS$1, MAX_OUTPUT_BYTES$1)
 		]);
 		if (branchResult.exitCode !== 0) throw new RepositoryActionError("detached-head", "A detached HEAD cannot be committed from this panel.");
 		if (headResult.exitCode !== 0 || statusResult.exitCode !== 0 || statusResult.lossy) throw new RepositoryActionError("repository-unavailable", "Repository state is unavailable.");
@@ -3713,7 +3829,7 @@ var RepositoryActionService = class {
 			"--abbrev-ref",
 			"--symbolic-full-name",
 			"@{upstream}"
-		], root, GIT_TIMEOUT_MS);
+		], root, GIT_TIMEOUT_MS$1);
 		const upstream = upstreamResult.exitCode === 0 && !upstreamResult.lossy ? upstreamResult.stdout.trim() : void 0;
 		const logResult = await this.#run(git, [
 			"log",
@@ -3722,7 +3838,7 @@ var RepositoryActionService = class {
 			String(21),
 			upstream === void 0 ? "HEAD" : "@{upstream}..HEAD",
 			"--"
-		], root, GIT_TIMEOUT_MS);
+		], root, GIT_TIMEOUT_MS$1);
 		const commitLines = logResult.exitCode === 0 && !logResult.lossy ? logResult.stdout.split(/\r?\n/u).filter((line) => line.includes("	")) : [];
 		const unpushedCommits = commitLines.slice(0, MAX_UNPUSHED_COMMITS).flatMap((line) => {
 			const tab = line.indexOf("	");
@@ -3754,7 +3870,7 @@ var RepositoryActionService = class {
 			"--cached",
 			"--name-only",
 			"--"
-		], cwd, GIT_TIMEOUT_MS);
+		], cwd, GIT_TIMEOUT_MS$1);
 		if (staged.exitCode !== 0 || staged.lossy) throw new RepositoryActionError("repository-unavailable", "Staged files could not be verified.");
 		if (staged.stdout.split(/\r?\n/u).some((path) => path.length > 0 && isProtectedWarpPath(path))) throw new RepositoryActionError("protected-warp-file", "WARP.md files cannot be committed. Unstage them before continuing.");
 	}
@@ -3764,7 +3880,7 @@ var RepositoryActionService = class {
 			"--abbrev-ref",
 			"--symbolic-full-name",
 			"@{upstream}"
-		], cwd, GIT_TIMEOUT_MS)).exitCode === 0 ? ["push"] : [
+		], cwd, GIT_TIMEOUT_MS$1)).exitCode === 0 ? ["push"] : [
 			"push",
 			"--set-upstream",
 			"origin",
@@ -3787,14 +3903,14 @@ var RepositoryActionService = class {
 		if (result.exitCode !== 0 || result.lossy) throw new RepositoryActionError(code, message);
 		return result;
 	}
-	#run(executable, args, cwd, timeoutMs, maxBytes = MAX_OUTPUT_BYTES) {
-		return collect(this.#runtime.spawn({
+	#run(executable, args, cwd, timeoutMs, maxBytes = MAX_OUTPUT_BYTES$1) {
+		return collect$1(this.#runtime.spawn({
 			argv: [executable, ...args],
 			cwd,
 			stdio: {
 				stdin: "ignore",
 				stdout: { maxBytes },
-				stderr: { maxBytes: MAX_OUTPUT_BYTES }
+				stderr: { maxBytes: MAX_OUTPUT_BYTES$1 }
 			},
 			graceMs: 1e3,
 			signal: AbortSignal.timeout(timeoutMs),
@@ -3805,7 +3921,7 @@ var RepositoryActionService = class {
 //#endregion
 //#region src/repository-setup-routes.ts
 const MAX_BODY_BYTES$2 = 16384;
-function record$2(value) {
+function record$3(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
 async function readJson$2(req) {
@@ -3817,7 +3933,7 @@ async function readJson$2(req) {
 		if (size > MAX_BODY_BYTES$2) throw new RepositorySetupError("body-too-large", "The request body is too large.");
 		chunks.push(buffer);
 	}
-	const value = record$2(JSON.parse(Buffer.concat(chunks).toString("utf8")));
+	const value = record$3(JSON.parse(Buffer.concat(chunks).toString("utf8")));
 	if (value === void 0) throw new RepositorySetupError("invalid-request", "The request body is invalid.");
 	return value;
 }
@@ -3911,14 +4027,16 @@ function registerRepositorySetupRoute(ctx, service) {
 //#endregion
 //#region src/repository-action-routes.ts
 const MAX_BODY_BYTES$1 = 16384;
-const MAX_SESSION_ID_CHARS$1 = 1024;
+const MAX_SESSION_ID_CHARS$2 = 1024;
 const ACTIONS = /* @__PURE__ */ new Set([
 	"commit",
 	"commit-push",
 	"push",
-	"create-pr"
+	"create-pr",
+	"merge-pr",
+	"update-branch"
 ]);
-function record$1(value) {
+function record$2(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
 async function readJson$1(req) {
@@ -3930,13 +4048,13 @@ async function readJson$1(req) {
 		if (size > MAX_BODY_BYTES$1) throw new RepositoryActionError("body-too-large", "The request body is too large.");
 		chunks.push(buffer);
 	}
-	const value = record$1(JSON.parse(Buffer.concat(chunks).toString("utf8")));
+	const value = record$2(JSON.parse(Buffer.concat(chunks).toString("utf8")));
 	if (value === void 0) throw new RepositoryActionError("invalid-request", "The request body is invalid.");
 	return value;
 }
-function sessionId(url) {
+function sessionId$1(url) {
 	const value = url.searchParams.get("sessionId");
-	if (value === null || value.length === 0 || value.length > MAX_SESSION_ID_CHARS$1) throw new RepositoryActionError("invalid-session", "The session is invalid.");
+	if (value === null || value.length === 0 || value.length > MAX_SESSION_ID_CHARS$2) throw new RepositoryActionError("invalid-session", "The session is invalid.");
 	return value;
 }
 function string(input, key) {
@@ -3956,13 +4074,16 @@ function actionRequest(input) {
 	return {
 		action,
 		fingerprint: string(input, "fingerprint"),
-		message: action === "push" ? optionalString(input, "message") ?? "" : string(input, "message"),
+		message: action === "push" || action === "merge-pr" || action === "update-branch" ? optionalString(input, "message") ?? "" : string(input, "message"),
 		includeUnstaged: input.includeUnstaged,
 		...optionalString(input, "prTitle") === void 0 ? {} : { prTitle: optionalString(input, "prTitle") },
 		...optionalString(input, "prBody") === void 0 ? {} : { prBody: optionalString(input, "prBody") },
 		...optionalString(input, "baseBranch") === void 0 ? {} : { baseBranch: optionalString(input, "baseBranch") },
 		...input.draft === void 0 ? {} : typeof input.draft === "boolean" ? { draft: input.draft } : (() => {
 			throw new RepositoryActionError("invalid-request", "The draft field must be a boolean.");
+		})(),
+		...input.mergeMethod === void 0 ? {} : input.mergeMethod === "merge" || input.mergeMethod === "squash" || input.mergeMethod === "rebase" ? { mergeMethod: input.mergeMethod } : (() => {
+			throw new RepositoryActionError("invalid-request", "The mergeMethod field is invalid.");
 		})()
 	};
 }
@@ -3974,7 +4095,7 @@ function registerRepositoryActionRoute(ctx, service, cwdForSession) {
 			if (!trustedRequest(req)) return json(res, 403, { error: "forbidden" });
 			const url = new URL(req.url ?? "/", "http://localhost");
 			try {
-				const cwd = cwdForSession(sessionId(url));
+				const cwd = cwdForSession(sessionId$1(url));
 				if (cwd === void 0) throw new RepositoryActionError("session-unavailable", "The Claude session is unavailable.");
 				if (url.pathname === `/plugins/dsh-claude/repository/action/preview`) {
 					if (req.method !== "GET") return json(res, 405, { error: "method not allowed" });
@@ -4006,6 +4127,218 @@ function registerRepositoryActionRoute(ctx, service, cwdForSession) {
 	}), "dsh-claude: repository action route");
 }
 //#endregion
+//#region src/pr-feedback.ts
+const MAX_OUTPUT_BYTES = 524288;
+const GIT_TIMEOUT_MS = 1e4;
+const GH_TIMEOUT_MS = 6e4;
+const MAX_COMMENTS = 100;
+const MAX_COMMENT_CHARS = 4096;
+const MAX_FAILING_CHECKS = 3;
+const MAX_LOG_CHARS = 8192;
+var PullRequestFeedbackError = class extends Error {
+	code;
+	constructor(code, message) {
+		super(message);
+		this.name = "PullRequestFeedbackError";
+		this.code = code;
+	}
+};
+async function collect(handle) {
+	const outcome = await handle.done;
+	const stdout = handle.collected.stdout?.readFrom(0);
+	return {
+		exitCode: outcome.exitCode,
+		stdout: stdout?.text ?? "",
+		lossy: stdout?.lossy === true
+	};
+}
+function record$1(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function parseReviewComments(value) {
+	if (!Array.isArray(value)) return [];
+	const comments = [];
+	for (const item of value) {
+		const input = record$1(item);
+		if (input === void 0 || !Number.isSafeInteger(input.id)) continue;
+		const body = typeof input.body === "string" ? input.body.trim() : "";
+		const path = typeof input.path === "string" ? input.path : "";
+		const url = typeof input.html_url === "string" ? input.html_url : "";
+		if (body.length === 0 || path.length === 0) continue;
+		const line = Number.isSafeInteger(input.line) ? Number(input.line) : Number.isSafeInteger(input.original_line) ? Number(input.original_line) : void 0;
+		comments.push({
+			id: Number(input.id),
+			path,
+			...line === void 0 ? {} : { line },
+			side: input.side === "LEFT" ? "old" : "new",
+			author: typeof record$1(input.user)?.login === "string" ? String(record$1(input.user)?.login) : "unknown",
+			body: body.slice(0, MAX_COMMENT_CHARS),
+			url
+		});
+		if (comments.length >= MAX_COMMENTS) break;
+	}
+	return comments;
+}
+/** Extract the Actions job id from a check run link, when it is one. */
+function actionsJobId(link) {
+	if (link === void 0) return void 0;
+	return /\/actions\/runs\/\d+\/jobs?\/(\d+)/u.exec(link)?.[1];
+}
+function parseFailingChecks(value) {
+	if (!Array.isArray(value)) return [];
+	const failing = [];
+	for (const item of value) {
+		const input = record$1(item);
+		if (input === void 0 || input.bucket !== "fail" || typeof input.name !== "string") continue;
+		failing.push({
+			name: input.name,
+			...typeof input.link === "string" && input.link.length > 0 ? { link: input.link } : {},
+			...typeof input.description === "string" && input.description.length > 0 ? { description: input.description } : {}
+		});
+	}
+	return failing;
+}
+/** Keep the informative end of a failed-job log within the size budget. */
+function boundedLogTail(value) {
+	const text = value.replaceAll("\0", "").trimEnd();
+	return text.length <= MAX_LOG_CHARS ? text : text.slice(text.length - MAX_LOG_CHARS);
+}
+var PullRequestFeedbackService = class {
+	#runtime;
+	#gitExecutable;
+	#ghExecutable;
+	constructor(runtime) {
+		this.#runtime = runtime;
+	}
+	async comments(cwd, pullNumber) {
+		const repository = await this.#repository(cwd);
+		const gh = await this.#gh();
+		const result = await this.#run(gh, [
+			"api",
+			`repos/${repository}/pulls/${pullNumber}/comments`,
+			"--paginate"
+		], cwd, GH_TIMEOUT_MS);
+		if (result.exitCode !== 0) throw new PullRequestFeedbackError("comments-unavailable", "Pull request comments could not be loaded.");
+		try {
+			const pages = result.stdout.replaceAll("][", ",");
+			return parseReviewComments(JSON.parse(pages));
+		} catch {
+			throw new PullRequestFeedbackError("comments-unavailable", "Pull request comments could not be parsed.");
+		}
+	}
+	async failingChecks(cwd, pullNumber) {
+		const gh = await this.#gh();
+		const result = await this.#run(gh, [
+			"pr",
+			"checks",
+			String(pullNumber),
+			"--json",
+			"name,state,link,description,bucket"
+		], cwd, GH_TIMEOUT_MS);
+		let checks;
+		try {
+			checks = parseFailingChecks(JSON.parse(result.stdout));
+		} catch {
+			throw new PullRequestFeedbackError("checks-unavailable", "Pull request checks could not be loaded.");
+		}
+		const detailed = [];
+		for (const check of checks) {
+			const jobId = detailed.length < MAX_FAILING_CHECKS ? actionsJobId(check.link) : void 0;
+			if (jobId === void 0) {
+				detailed.push(check);
+				continue;
+			}
+			const log = await this.#run(gh, [
+				"run",
+				"view",
+				"--job",
+				jobId,
+				"--log-failed"
+			], cwd, GH_TIMEOUT_MS);
+			detailed.push(log.exitCode === 0 && log.stdout.trim().length > 0 ? {
+				...check,
+				log: boundedLogTail(log.stdout)
+			} : check);
+		}
+		return detailed;
+	}
+	async #repository(cwd) {
+		const git = await this.#git();
+		const remote = await this.#run(git, [
+			"remote",
+			"get-url",
+			"origin"
+		], cwd, GIT_TIMEOUT_MS);
+		const repository = remote.exitCode === 0 ? parseGitHubRemote(remote.stdout) : void 0;
+		if (repository === void 0) throw new PullRequestFeedbackError("no-github-remote", "The repository has no GitHub origin remote.");
+		return repository;
+	}
+	#git() {
+		this.#gitExecutable ??= this.#runtime.resolveExecutable("git");
+		return this.#gitExecutable;
+	}
+	#gh() {
+		this.#ghExecutable ??= this.#runtime.resolveExecutable("gh").catch(() => {
+			throw new PullRequestFeedbackError("gh-unavailable", "GitHub CLI is unavailable.");
+		});
+		return this.#ghExecutable;
+	}
+	#run(executable, args, cwd, timeoutMs) {
+		return collect(this.#runtime.spawn({
+			argv: [executable, ...args],
+			cwd,
+			stdio: {
+				stdin: "ignore",
+				stdout: { maxBytes: MAX_OUTPUT_BYTES },
+				stderr: { maxBytes: 65536 }
+			},
+			graceMs: 1e3,
+			signal: AbortSignal.timeout(timeoutMs),
+			env: {}
+		}));
+	}
+};
+//#endregion
+//#region src/pr-feedback-routes.ts
+const MAX_SESSION_ID_CHARS$1 = 1024;
+function sessionId(url) {
+	const value = url.searchParams.get("sessionId");
+	if (value === null || value.length === 0 || value.length > MAX_SESSION_ID_CHARS$1) throw new PullRequestFeedbackError("invalid-session", "The session is invalid.");
+	return value;
+}
+function pullNumber(url) {
+	const value = Number(url.searchParams.get("number"));
+	if (!Number.isSafeInteger(value) || value <= 0 || value > 1e9) throw new PullRequestFeedbackError("invalid-request", "The pull request number is invalid.");
+	return value;
+}
+function registerPullRequestFeedbackRoute(ctx, service, cwdForSession) {
+	ctx.effect(() => ctx.webServer.register({
+		kind: "prefix",
+		path: CLAUDE_REPOSITORY_FEEDBACK_PATH,
+		handler: async (req, res) => {
+			if (!trustedRequest(req)) return json(res, 403, { error: "forbidden" });
+			if (req.method !== "GET") return json(res, 405, { error: "method not allowed" });
+			const url = new URL(req.url ?? "/", "http://localhost");
+			try {
+				const cwd = cwdForSession(sessionId(url));
+				if (cwd === void 0) throw new PullRequestFeedbackError("session-unavailable", "The Claude session is unavailable.");
+				if (url.pathname === `/plugins/dsh-claude/repository/feedback/comments`) return json(res, 200, { comments: await service.comments(cwd, pullNumber(url)) });
+				if (url.pathname === `/plugins/dsh-claude/repository/feedback/checks`) return json(res, 200, { checks: await service.failingChecks(cwd, pullNumber(url)) });
+				return json(res, 404, { error: "not found" });
+			} catch (error) {
+				if (error instanceof PullRequestFeedbackError) return json(res, 409, {
+					error: error.code,
+					message: error.message
+				});
+				return json(res, 500, {
+					error: "pr-feedback-unavailable",
+					message: "Pull request feedback is unavailable."
+				});
+			}
+		}
+	}), "dsh-claude: pull request feedback route");
+}
+//#endregion
 //#region src/review-comment-routes.ts
 const MAX_BODY_BYTES = 16384;
 const MAX_SESSION_ID_CHARS = 1024;
@@ -4346,6 +4679,12 @@ const BUILTIN_OUTPUT_STYLES = [
 const STYLE_NAME = /^[\p{L}\p{N}][\p{L}\p{N} ._()\[\]-]{0,127}$/u;
 const DEFAULT_WORKTREE_BRANCH_PREFIX = "claude";
 const MAX_BRANCH_PREFIX_CHARS = 128;
+const MAX_PROCESSES_LIMIT = 16;
+const MAX_IDLE_TIMEOUT_MINUTES = 1440;
+const DEFAULT_LIMITS = {
+	maxProcesses: 4,
+	idleTimeoutMs: 18e5
+};
 function pathsFor(deps) {
 	const root = join(homedir(), ".claude");
 	return {
@@ -4451,19 +4790,45 @@ const WORKTREE_BRANCH_PREFIX = {
 		else document.worktreeBranchPrefix = value;
 	}
 };
-const DESCRIPTORS = [OUTPUT_STYLE, WORKTREE_BRANCH_PREFIX];
+function isBoundedInteger(value, min, max) {
+	return typeof value === "number" && Number.isInteger(value) && value >= min && value <= max;
+}
+function integerSetting(key, min, max, defaultFor) {
+	return {
+		key,
+		kind: "text",
+		document: "plugin",
+		effect: "new-session",
+		maxLength: String(max).length,
+		read(document, defaults = DEFAULT_LIMITS) {
+			const value = document[key];
+			return String(isBoundedInteger(value, min, max) ? value : defaultFor(defaults));
+		},
+		apply(document, value) {
+			const parsed = typeof value === "string" && /^\d{1,6}$/u.test(value.trim()) ? Number(value.trim()) : value;
+			if (!isBoundedInteger(parsed, min, max)) throw new Error(`Invalid value for global setting ${key}`);
+			document[key] = parsed;
+		}
+	};
+}
+const DESCRIPTORS = [
+	OUTPUT_STYLE,
+	WORKTREE_BRANCH_PREFIX,
+	integerSetting("maxProcesses", 1, MAX_PROCESSES_LIMIT, (limits) => limits.maxProcesses),
+	integerSetting("idleTimeoutMinutes", 1, MAX_IDLE_TIMEOUT_MINUTES, (limits) => Math.max(1, Math.round(limits.idleTimeoutMs / 6e4)))
+];
 const DESCRIPTOR_BY_KEY = new Map(DESCRIPTORS.map((descriptor) => [descriptor.key, descriptor]));
 let pendingWrite = Promise.resolve();
 function documentFor(descriptor, documents) {
 	return documents[descriptor.document];
 }
-async function views(documents, paths) {
+async function views(documents, paths, defaults) {
 	return { settings: await Promise.all(DESCRIPTORS.map(async (descriptor) => {
 		const document = documentFor(descriptor, documents);
 		if (descriptor.kind === "text") return {
 			key: descriptor.key,
 			kind: descriptor.kind,
-			value: descriptor.read(document),
+			value: descriptor.read(document, defaults),
 			maxLength: descriptor.maxLength,
 			effect: descriptor.effect
 		};
@@ -4492,7 +4857,22 @@ async function readDocuments(paths) {
 }
 async function readGlobalSettings(deps = {}) {
 	const paths = pathsFor(deps);
-	return views(await readDocuments(paths), paths);
+	return views(await readDocuments(paths), paths, deps.defaultLimits ?? DEFAULT_LIMITS);
+}
+/** Supervisor limits the user overrode in Settings; absent keys fall back to the plugin config. */
+async function readSupervisorLimitOverrides(deps = {}) {
+	let document;
+	try {
+		document = await readDocument(pathsFor(deps).pluginSettingsFile);
+	} catch {
+		return {};
+	}
+	const maxProcesses = document.maxProcesses;
+	const idleTimeoutMinutes = document.idleTimeoutMinutes;
+	return {
+		...isBoundedInteger(maxProcesses, 1, MAX_PROCESSES_LIMIT) ? { maxProcesses } : {},
+		...isBoundedInteger(idleTimeoutMinutes, 1, MAX_IDLE_TIMEOUT_MINUTES) ? { idleTimeoutMs: idleTimeoutMinutes * 6e4 } : {}
+	};
 }
 async function readWorktreeBranchPrefix(deps = {}) {
 	const paths = pathsFor(deps);
@@ -4534,7 +4914,7 @@ function updateGlobalSettings(changes, deps = {}) {
 		}
 		if (changedDocuments.has("claude")) await atomicWrite(paths.settingsFile, documents.claude);
 		if (changedDocuments.has("plugin")) await atomicWrite(paths.pluginSettingsFile, documents.plugin);
-		return views(documents, paths);
+		return views(documents, paths, deps.defaultLimits ?? DEFAULT_LIMITS);
 	});
 	pendingWrite = operation;
 	return operation;
@@ -4562,7 +4942,9 @@ function registerClaudeGlobalSettingsRoute(ctx, deps = {}) {
 			if (req.method !== "GET" && req.method !== "PATCH") return json(res, 405, { error: "method not allowed" });
 			if (!trustedRequest(req)) return json(res, 403, { error: "forbidden" });
 			try {
-				json(res, 200, req.method === "GET" ? await readGlobalSettings(deps) : await updateGlobalSettings(await requestJson(req), deps));
+				const result = req.method === "GET" ? await readGlobalSettings(deps) : await updateGlobalSettings(await requestJson(req), deps);
+				if (req.method === "PATCH") await deps.onUpdated?.();
+				json(res, 200, result);
 			} catch (error) {
 				json(res, 400, { error: error instanceof Error ? error.message : "Invalid global settings request" });
 			}
@@ -4692,12 +5074,21 @@ async function installManagedPresetCompatibility(logger, install = ensureManaged
 }
 async function apply(ctx, config) {
 	await installManagedPresetCompatibility(ctx.logger);
+	const defaultLimits = {
+		idleTimeoutMs: config.idleTimeoutMs ?? 18e5,
+		maxProcesses: config.maxProcesses ?? 4
+	};
 	const supervisorConfig = {
 		executablePath: "",
 		defaultModel: config.model ?? "default",
-		idleTimeoutMs: config.idleTimeoutMs ?? 18e5,
-		maxProcesses: config.maxProcesses ?? 4
+		...defaultLimits
 	};
+	const applyLimitOverrides = async () => {
+		const overrides = await readSupervisorLimitOverrides();
+		supervisorConfig.idleTimeoutMs = overrides.idleTimeoutMs ?? defaultLimits.idleTimeoutMs;
+		supervisorConfig.maxProcesses = overrides.maxProcesses ?? defaultLimits.maxProcesses;
+	};
+	await applyLimitOverrides();
 	const sidecar = new ClaudeSidecarRepository();
 	const repositoryStatus = new RepositoryStatusService(ctx.subprocess);
 	const repositorySetup = new RepositorySetupService(ctx.subprocess, { branchPrefix: () => readWorktreeBranchPrefix() });
@@ -4777,7 +5168,21 @@ async function apply(ctx, config) {
 	ctx.on("agent/disposed", async ({ agent }) => {
 		reviewComments.disposeSession(agent.id);
 		await supervisor.disposeSession(agent.id);
-		await repositorySetup.cleanupSession(agent.id);
+	});
+	const injectWorkspaceRegistry = ctx.inject;
+	injectWorkspaceRegistry(["workspaceRegistry"], (sweepCtx) => {
+		const sweep = () => {
+			try {
+				const paths = sweepCtx.workspaceRegistry.list().map((workspace) => workspace.path);
+				repositorySetup.cleanupOrphans(paths).catch(() => void 0);
+			} catch {}
+		};
+		sweepCtx.effect(() => {
+			sweep();
+			const timer = setInterval(sweep, 6e4);
+			timer.unref?.();
+			return () => clearInterval(timer);
+		}, "dsh-claude: worktree reconciliation");
 	});
 	ctx.effect(() => () => reviewComments.dispose(), "dsh-claude: review comments store");
 	ctx.effect(() => () => supervisor.dispose(), "dsh-claude: process supervisor");
@@ -4786,13 +5191,19 @@ async function apply(ctx, config) {
 		registerClaudeDoctorRoutes(webCtx, webCtx.subprocess, supervisor, supervisorConfig, resolutionError);
 		const desktopActions = webCtx.get("desktopActions");
 		registerClaudeUpdateRoutes(webCtx, webCtx.subprocess, { ...typeof desktopActions?.requestRestart === "function" ? { requestRestart: desktopActions.requestRestart.bind(desktopActions) } : {} });
-		registerClaudeGlobalSettingsRoute(webCtx);
+		registerClaudeGlobalSettingsRoute(webCtx, {
+			defaultLimits,
+			onUpdated: applyLimitOverrides
+		});
 		registerRepositorySetupRoute(webCtx, repositorySetup);
-		registerRepositoryActionRoute(webCtx, new RepositoryActionService(webCtx.subprocess, supervisorConfig.executablePath, (cwd) => repositoryStatus.invalidate(cwd)), (sessionId) => {
+		const repositoryActions = new RepositoryActionService(webCtx.subprocess, supervisorConfig.executablePath, (cwd) => repositoryStatus.invalidate(cwd));
+		const cwdForClaudeSession = (sessionId) => {
 			const agent = webCtx.agents.get(sessionId);
 			if (agent === void 0 || webCtx.agentPresets.composedPreset(agent.ctx) !== "claude") return void 0;
 			return agent.session.header.cwd;
-		});
+		};
+		registerRepositoryActionRoute(webCtx, repositoryActions, cwdForClaudeSession);
+		registerPullRequestFeedbackRoute(webCtx, new PullRequestFeedbackService(webCtx.subprocess), cwdForClaudeSession);
 		const ownsClaudeSession = (sessionId) => {
 			const agent = webCtx.agents.get(sessionId);
 			return agent !== void 0 && webCtx.agentPresets.composedPreset(agent.ctx) === "claude";