@norman-else/dsh-claude 0.1.32 → 0.1.33

package/lib/client.js

@@ -4,13 +4,14 @@ window.__ModuleLoader__.load({
 		var module = { exports: {} };
 		module.exports;
 		var { Fragment, useCallback, useEffect, useId, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } = require("react");
-		var { DiffBlock, DisclosureRow, HoverCard, IconAgentPresetOutline16, IconApiOutline14, IconBranchOutline16, IconCheckOutline14, IconCheckOutline16, IconChevronDownOutline14, IconChevronRightOutline14, IconChevronUpOutline14, IconCloseOutline16, IconEditOutline16, IconEllipsisOutline16, IconFullscreenOutline16, IconQueueOutline14, IconRefreshOutline14, IconSearchOutline16, IconSendOutline14, IconThinkOutline14, IconTrashOutline16, MarkdownText, Menu, Modal, StateDot, Tooltip, useDismissOnOutsidePointer } = require("@deepseek-ai/dsh-client-ui-primitives");
+		var { DiffBlock, DisclosureRow, HoverCard, IconAgentPresetOutline16, IconApiOutline14, IconBranchOutline16, IconCheckOutline14, IconCheckOutline16, IconChevronDownOutline14, IconChevronRightOutline14, IconChevronUpOutline14, IconCloseOutline16, IconEditOutline16, IconEllipsisOutline16, IconFullscreenOutline16, IconQueueOutline14, IconRefreshOutline14, IconRightUpOutline14, IconSearchOutline16, IconSendOutline14, IconThinkOutline14, IconTrashOutline16, MarkdownText, Menu, Modal, StateDot, Toast, Tooltip, useDismissOnOutsidePointer } = require("@deepseek-ai/dsh-client-ui-primitives");
 		var { Fragment: Fragment$1, jsx, jsxs } = require("react/jsx-runtime");
 		var { createPortal } = require("react-dom");
 		/** Claude's subagent dispatch tools; rendered as plugin-owned group cards
 		*  gathering subagent activity instead of native tool cards. */
 		const TASK_TOOL_NAMES = /* @__PURE__ */ new Set(["Task", "Agent"]);
 		const CLAUDE_DOCTOR_PATH = "/plugins/dsh-claude/doctor";
+		const CLAUDE_CLIENT_DIAGNOSTICS_PATH = "/plugins/dsh-claude/client-diagnostics";
 		const CLAUDE_UPDATE_CHECK_PATH = "/plugins/dsh-claude/update/check";
 		const CLAUDE_USAGE_PATH = "/plugins/dsh-claude/usage";
 		const CLAUDE_UPDATE_PATH = "/plugins/dsh-claude/update";
@@ -1551,7 +1552,7 @@ window.__ModuleLoader__.load({
 		};
 		const repositoryBarFrame = {
 			width: "calc(100% - 64px)",
-			maxWidth: "var(--dsh-conversation-composer-max-width, 782px)",
+			maxWidth: "var(--dsh-composer-card-max-width, 782px)",
 			minWidth: 0,
 			margin: "0 auto",
 			boxSizing: "border-box"
@@ -2063,9 +2064,11 @@ window.__ModuleLoader__.load({
 			fontWeight: 600
 		};
 		const diffGhCommentLink = {
-			color: "var(--dsw-static-blue-450)",
-			textDecoration: "none",
-			fontWeight: 650
+			display: "inline-flex",
+			alignItems: "center",
+			flex: "none",
+			color: "var(--dsw-alias-label-tertiary)",
+			textDecoration: "none"
 		};
 		const diffModalConflicts = {
 			display: "flex",
@@ -2538,6 +2541,156 @@ window.__ModuleLoader__.load({
 			font: "inherit",
 			resize: "vertical"
 		};
+		const diffGhComment = {
+			display: "flex",
+			flexDirection: "column",
+			gap: 4
+		};
+		/** Every comment after the first opens with a rule, the way GitHub separates
+		*  the entries of one conversation. */
+		const diffGhCommentNext = {
+			marginTop: 8,
+			paddingTop: 8,
+			borderTop: "1px solid var(--dsw-alias-border-l1, color-mix(in srgb, currentColor 12%, transparent))"
+		};
+		const diffGhCommentAge = {
+			flex: "none",
+			color: "var(--dsw-alias-label-tertiary)",
+			fontSize: 11
+		};
+		/** Big enough to aim at: the 11px "›" glyph was a hard target. */
+		const diffFileChevron = {
+			width: 14,
+			height: 14,
+			display: "inline-flex",
+			alignItems: "center",
+			justifyContent: "center",
+			flex: "none",
+			color: "var(--dsw-alias-label-secondary)",
+			transition: "transform 120ms ease"
+		};
+		const diffSummaryAction = {
+			marginLeft: "auto",
+			padding: "2px 8px",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
+			borderRadius: 6,
+			background: "transparent",
+			color: "var(--dsw-alias-label-secondary)",
+			font: "inherit",
+			fontSize: 12,
+			cursor: "pointer"
+		};
+		const diffCommentNav = {
+			display: "inline-flex",
+			alignItems: "center",
+			gap: 2
+		};
+		const diffCommentNavCount = {
+			minWidth: 34,
+			textAlign: "center",
+			color: "var(--dsw-alias-label-tertiary)",
+			fontSize: 12,
+			fontVariantNumeric: "tabular-nums"
+		};
+		/** Where the walk stopped, so the eye lands without hunting for it. */
+		const diffCommentBlockActive = {
+			borderColor: "var(--dsw-static-blue-450)",
+			boxShadow: "0 0 0 1px var(--dsw-static-blue-450)"
+		};
+		const diffThreadBadges = {
+			display: "flex",
+			gap: 6
+		};
+		const diffThreadBadge = {
+			flex: "none",
+			padding: "0 6px",
+			borderRadius: 999,
+			background: "var(--dsw-alias-bg-layer-2)",
+			color: "var(--dsw-alias-label-tertiary)",
+			fontSize: 11,
+			lineHeight: "18px"
+		};
+		const diffThreadSummary = {
+			width: "100%",
+			display: "flex",
+			alignItems: "center",
+			gap: 6,
+			minWidth: 0,
+			padding: 0,
+			border: "none",
+			background: "transparent",
+			color: "var(--dsw-alias-label-tertiary)",
+			font: "inherit",
+			fontSize: 12,
+			textAlign: "left",
+			cursor: "pointer"
+		};
+		const diffThreadExcerpt = {
+			minWidth: 0,
+			flex: 1,
+			overflow: "hidden",
+			textOverflow: "ellipsis",
+			whiteSpace: "nowrap"
+		};
+		/** The composer is a region of its own: without the rule it reads as more of
+		*  the comment it sits under. */
+		const diffThreadComposer = {
+			display: "flex",
+			flexDirection: "column",
+			gap: 6,
+			marginTop: 10,
+			paddingTop: 10,
+			borderTop: "1px solid var(--dsw-alias-border-l1, color-mix(in srgb, currentColor 12%, transparent))"
+		};
+		const diffThreadComposerCaption = {
+			color: "var(--dsw-alias-label-tertiary)",
+			fontSize: 11,
+			lineHeight: "16px"
+		};
+		const mentionField = {
+			position: "relative",
+			display: "block"
+		};
+		const mentionList = {
+			position: "absolute",
+			zIndex: 1100,
+			top: "100%",
+			left: 0,
+			width: 240,
+			maxHeight: 176,
+			boxSizing: "border-box",
+			display: "flex",
+			flexDirection: "column",
+			gap: 2,
+			padding: 4,
+			overflowY: "auto",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
+			borderRadius: 8,
+			background: "var(--dsw-specific-menu)",
+			boxShadow: "var(--dsw-shadow-lv3)"
+		};
+		const mentionItem = {
+			height: 28,
+			display: "flex",
+			alignItems: "center",
+			gap: 6,
+			padding: "0 8px",
+			border: "none",
+			borderRadius: 6,
+			background: "transparent",
+			color: "var(--dsw-alias-label-primary)",
+			font: "inherit",
+			fontSize: 13,
+			textAlign: "left",
+			cursor: "pointer"
+		};
+		const mentionItemActive = { background: "var(--dsw-alias-interactive-bg-hover, var(--dsw-alias-bg-layer-2))" };
+		const mentionAvatar = {
+			width: 16,
+			height: 16,
+			flex: "none",
+			borderRadius: "50%"
+		};
 		const diffCommentActions = {
 			display: "flex",
 			justifyContent: "flex-end",
@@ -2568,7 +2721,7 @@ window.__ModuleLoader__.load({
 		};
 		const reviewCommentBarFrame = {
 			width: "calc(100% - 64px)",
-			maxWidth: "var(--dsh-conversation-composer-max-width, 782px)",
+			maxWidth: "var(--dsh-composer-card-max-width, 782px)",
 			margin: "0 auto",
 			boxSizing: "border-box"
 		};
@@ -2987,12 +3140,12 @@ window.__ModuleLoader__.load({
 		  background: var(--dsw-alias-bg-layer-2);
 		}
 		.dshClaudeRepositoryActionModalContent h2 {
-		  font-size: 18px;
-		  line-height: 26px;
+		  font-size: 16px;
+		  line-height: 24px;
 		}
 		.dshClaudeRepositoryActionModalContent > p {
-		  font-size: 14px;
-		  line-height: 22px;
+		  font-size: 13px;
+		  line-height: 20px;
 		}
 		.dshClaudeRepositoryActionModal input:is([type='checkbox'], [type='radio']) {
 		  width: 16px;
@@ -3009,7 +3162,7 @@ window.__ModuleLoader__.load({
 		const diffModalBody = {
 			display: "flex",
 			flexDirection: "column",
-			gap: 16,
+			gap: 14,
 			width: "100%",
 			minWidth: 0,
 			boxSizing: "border-box"
@@ -3020,8 +3173,8 @@ window.__ModuleLoader__.load({
 			gap: 16,
 			minWidth: 0,
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 14,
-			lineHeight: "22px"
+			fontSize: 13,
+			lineHeight: "20px"
 		};
 		const diffModalMetaText = {
 			minWidth: 0,
@@ -3042,11 +3195,11 @@ window.__ModuleLoader__.load({
 			justifyContent: "space-between",
 			gap: 12,
 			minWidth: 0,
-			padding: "10px 14px",
+			padding: "8px 12px",
 			borderBottom: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 13,
-			lineHeight: "20px"
+			fontSize: 12,
+			lineHeight: "18px"
 		};
 		const diffModalFilePath = {
 			minWidth: 0,
@@ -3058,34 +3211,34 @@ window.__ModuleLoader__.load({
 		const diffModalField = {
 			display: "flex",
 			flexDirection: "column",
-			gap: 8,
+			gap: 6,
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 14,
-			lineHeight: "22px",
+			fontSize: 12,
+			lineHeight: "18px",
 			fontWeight: 550
 		};
 		const diffModalTextarea = {
 			...settingTextInput,
-			minHeight: 140,
-			padding: "10px 14px",
-			fontSize: 14,
-			lineHeight: "22px",
+			minHeight: 120,
+			padding: "9px 12px",
+			fontSize: 13,
+			lineHeight: "20px",
 			resize: "vertical"
 		};
 		const diffModalTextInput = {
 			...settingTextInput,
-			minHeight: 44,
-			padding: "9px 14px",
-			fontSize: 14,
-			lineHeight: "22px"
+			minHeight: 36,
+			padding: "7px 12px",
+			fontSize: 13,
+			lineHeight: "20px"
 		};
 		const diffModalCheckbox = {
 			display: "flex",
 			alignItems: "center",
-			gap: 10,
+			gap: 8,
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 14,
-			lineHeight: "22px"
+			fontSize: 13,
+			lineHeight: "20px"
 		};
 		const diffModalFooter = {
 			display: "flex",
@@ -3093,28 +3246,22 @@ window.__ModuleLoader__.load({
 			gap: 12
 		};
 		const diffModalButton = {
-			minHeight: 36,
-			padding: "8px 18px",
-			fontSize: 14,
-			lineHeight: "22px"
+			minHeight: 34,
+			padding: "6px 16px",
+			fontSize: 13,
+			lineHeight: "20px"
 		};
 		const diffModalStatus = {
 			margin: 0,
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 14,
-			lineHeight: "22px"
+			fontSize: 13,
+			lineHeight: "20px"
 		};
 		const diffModalError = {
-			margin: "10px 0 0",
+			margin: "8px 0 0",
 			color: "var(--dsw-alias-state-error-primary)",
-			fontSize: 14,
-			lineHeight: "22px"
-		};
-		const diffModalSuccess = {
-			margin: 0,
-			color: "var(--dsw-alias-state-success-primary)",
-			fontSize: 14,
-			lineHeight: "22px"
+			fontSize: 13,
+			lineHeight: "20px"
 		};
 		const rewindActionCss = `
 		[data-dsh-claude-rewind]:empty {
@@ -3589,6 +3736,32 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
+		//#region src/client/markdown-labels.tsx
+		/** Stable across renders: MarkdownText keys its streaming renderer on this
+		*  object's identity and reparses from scratch whenever it changes. */
+		function useClaudeMarkdownLabels(t) {
+			return useMemo(() => ({
+				code: {
+					copyLabel: t("markdownCopy"),
+					copiedLabel: t("markdownCopied")
+				},
+				footnotes: t("markdownFootnotes")
+			}), [t]);
+		}
+		/** MarkdownText with the labels the running Host demands.
+		*
+		*  The published primitives package still types the old `codeLabels` prop, so
+		*  the new shape cannot typecheck against it — the cast is confined here rather
+		*  than repeated at every call site. Drop it once the installed
+		*  @deepseek-ai/dsh-client-ui-primitives matches the Desktop build. */
+		function ClaudeMarkdown({ text, labels, streaming }) {
+			return /* @__PURE__ */ jsx(MarkdownText, {
+				text,
+				labels,
+				...streaming === void 0 ? {} : { streaming }
+			});
+		}
+		//#endregion
 		//#region src/rewind.ts
 		function isRewound(ranges, seq) {
 			return ranges.some((range) => seq >= range.start && seq <= range.end);
@@ -4429,12 +4602,16 @@ window.__ModuleLoader__.load({
 				marker.turn,
 				tasks
 			]);
+			const markdownLabels = useClaudeMarkdownLabels(t);
 			if (items.length === 0) return null;
 			return /* @__PURE__ */ jsx("div", {
 				className: "dsh-claude-flow",
 				children: items.map((item) => item.kind === "text" ? /* @__PURE__ */ jsx("div", {
 					className: "dsh-claude-transcript-text",
-					children: /* @__PURE__ */ jsx(MarkdownText, { text: item.text })
+					children: /* @__PURE__ */ jsx(ClaudeMarkdown, {
+						text: item.text,
+						labels: markdownLabels
+					})
 				}, `text:${item.ordinal}`) : item.kind === "compaction" ? /* @__PURE__ */ jsx(ClaudeCompactionDivider, {
 					compaction: item.compaction,
 					t
@@ -5486,6 +5663,36 @@ window.__ModuleLoader__.load({
 			})).then(result);
 		}
 		//#endregion
+		//#region src/client/action-toast.tsx
+		/** Always a new id, even for the same text: the id is the Toast's key, and
+		*  reporting the same outcome twice has to replay the banner rather than
+		*  update the text of one that is already fading out. */
+		function nextActionToast(current, text) {
+			return {
+				id: (current?.id ?? 0) + 1,
+				text
+			};
+		}
+		/** Report a finished Git action the way the Host reports everything else: a
+		*  banner over the window, not a line inside the dialog that asked for it. The
+		*  dialog closes the moment the work lands, so the notice has to outlive it. */
+		function useActionToast() {
+			const [shown, setShown] = useState();
+			const done = useCallback(() => {
+				setShown(void 0);
+			}, []);
+			const report = useCallback((text) => {
+				setShown((current) => nextActionToast(current, text));
+			}, []);
+			return {
+				toast: shown === void 0 ? null : /* @__PURE__ */ jsx(Toast, {
+					text: shown.text,
+					onDone: done
+				}, shown.id),
+				report
+			};
+		}
+		//#endregion
 		//#region src/client/repository-setup-api.ts
 		const HOST_STAGES = /* @__PURE__ */ new Set([
 			"inspecting",
@@ -5657,6 +5864,20 @@ window.__ModuleLoader__.load({
 			return body;
 		}
 		//#endregion
+		//#region src/client/relative-age.ts
+		/** Compact age of an ISO timestamp, in the shape the panels already use
+		*  ("<1h", "4h", "3d", "2mo"). `now` is a parameter so callers that re-render
+		*  on a clock — and tests — stay deterministic. */
+		function relativeAge(value, now = Date.now()) {
+			if (value === void 0) return void 0;
+			const elapsedHours = Math.max(0, Math.floor((now - Date.parse(value)) / 36e5));
+			if (!Number.isFinite(elapsedHours)) return void 0;
+			if (elapsedHours < 1) return "<1h";
+			if (elapsedHours < 24) return `${elapsedHours}h`;
+			const days = Math.floor(elapsedHours / 24);
+			return days < 30 ? `${days}d` : `${Math.floor(days / 30)}mo`;
+		}
+		//#endregion
 		//#region src/github-url.ts
 		/** Only GitHub's own image hosts; the browser loads these directly, so a URL
 		*  the API did not vouch for must never become an outbound request. */
@@ -5675,28 +5896,95 @@ window.__ModuleLoader__.load({
 		function record$2(value) {
 			return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 		}
-		async function loadJson(path, sessionId, pullNumber, signal) {
-			const response = await fetch(`${CLAUDE_REPOSITORY_FEEDBACK_PATH}${path}?sessionId=${encodeURIComponent(sessionId)}&number=${pullNumber}`, {
-				method: "GET",
-				credentials: "same-origin",
-				headers: { accept: "application/json" },
-				signal: pluginRequestSignal(PLUGIN_READ_TIMEOUT_MS, signal)
-			});
+		function feedbackUrl(path, sessionId, pullNumber, extra = "") {
+			return `${CLAUDE_REPOSITORY_FEEDBACK_PATH}${path}?sessionId=${encodeURIComponent(sessionId)}&number=${pullNumber}${extra}`;
+		}
+		async function answer(response) {
 			const body = record$2(await response.json());
 			if (!response.ok) throw new Error(typeof body?.message === "string" ? body.message : "Pull request feedback is unavailable.");
 			if (body === void 0) throw new Error("Invalid pull request feedback response.");
 			return body;
 		}
-		async function loadPullRequestComments(sessionId, pullNumber, signal) {
+		async function loadJson(path, sessionId, pullNumber, signal, extra = "") {
+			return answer(await fetch(feedbackUrl(path, sessionId, pullNumber, extra), {
+				method: "GET",
+				credentials: "same-origin",
+				headers: { accept: "application/json" },
+				signal: pluginRequestSignal(PLUGIN_READ_TIMEOUT_MS, signal)
+			}));
+		}
+		/** Writes reach GitHub through `gh`, so they get the action deadline. */
+		async function postJson(path, sessionId, pullNumber, input) {
+			return answer(await fetch(feedbackUrl(path, sessionId, pullNumber), {
+				method: "POST",
+				credentials: "same-origin",
+				headers: {
+					accept: "application/json",
+					"content-type": "application/json"
+				},
+				signal: pluginRequestSignal(PLUGIN_ACTION_TIMEOUT_MS),
+				body: JSON.stringify(input)
+			}));
+		}
+		function reviewComment(value) {
+			const input = record$2(value);
+			if (input === void 0 || typeof input.id !== "number" || typeof input.path !== "string" || typeof input.author !== "string" || typeof input.body !== "string" || typeof input.url !== "string" || input.avatarUrl !== void 0 && githubAvatarUrl(input.avatarUrl) === void 0 || input.side !== "new" && input.side !== "old" || input.line !== void 0 && typeof input.line !== "number" || input.createdAt !== void 0 && typeof input.createdAt !== "string" || input.bot !== void 0 && typeof input.bot !== "boolean") return void 0;
+			return input;
+		}
+		async function loadPullRequestThreads(sessionId, pullNumber, signal) {
 			const body = await loadJson("/comments", sessionId, pullNumber, signal);
-			if (!Array.isArray(body.comments)) throw new Error("Invalid pull request comments response.");
-			const comments = [];
-			for (const item of body.comments) {
+			if (!Array.isArray(body.threads)) throw new Error("Invalid pull request comments response.");
+			const threads = [];
+			for (const item of body.threads) {
 				const input = record$2(item);
-				if (input === void 0 || typeof input.id !== "number" || typeof input.path !== "string" || typeof input.author !== "string" || typeof input.body !== "string" || typeof input.url !== "string" || input.avatarUrl !== void 0 && githubAvatarUrl(input.avatarUrl) === void 0 || input.side !== "new" && input.side !== "old" || input.line !== void 0 && typeof input.line !== "number") continue;
-				comments.push(input);
+				if (input === void 0 || typeof input.id !== "string" || typeof input.path !== "string" || input.side !== "new" && input.side !== "old" || input.line !== void 0 && typeof input.line !== "number" || !Array.isArray(input.comments)) continue;
+				const comments = input.comments.map(reviewComment).filter((value) => value !== void 0);
+				if (comments.length === 0) continue;
+				threads.push({
+					id: input.id,
+					path: input.path,
+					...typeof input.line === "number" ? { line: input.line } : {},
+					side: input.side,
+					resolved: input.resolved === true,
+					outdated: input.outdated === true,
+					comments
+				});
+			}
+			return threads;
+		}
+		/** Post one reply into the thread that `commentId` belongs to. */
+		async function replyToReviewThread(sessionId, pullNumber, commentId, body) {
+			const comment = reviewComment((await postJson("/reply", sessionId, pullNumber, {
+				commentId,
+				body
+			})).comment);
+			if (comment === void 0) throw new Error("Invalid pull request reply response.");
+			return comment;
+		}
+		/** Resolve or reopen a thread; returns the state GitHub reports afterwards. */
+		async function setReviewThreadResolved(sessionId, pullNumber, threadId, resolved) {
+			const answer = await postJson("/resolve", sessionId, pullNumber, {
+				threadId,
+				resolved
+			});
+			if (typeof answer.resolved !== "boolean") throw new Error("Invalid pull request resolve response.");
+			return answer.resolved;
+		}
+		/** Logins GitHub would notify, for the reply composer's `@` completion. */
+		async function loadMentionableUsers(sessionId, pullNumber, query, signal) {
+			const body = await loadJson("/mentionables", sessionId, pullNumber, signal, `&q=${encodeURIComponent(query)}`);
+			if (!Array.isArray(body.users)) return [];
+			const users = [];
+			for (const item of body.users) {
+				const input = record$2(item);
+				if (input === void 0 || typeof input.login !== "string" || input.login.length === 0) continue;
+				const avatarUrl = githubAvatarUrl(input.avatarUrl);
+				users.push({
+					login: input.login,
+					...avatarUrl === void 0 ? {} : { avatarUrl }
+				});
 			}
-			return comments;
+			return users;
 		}
 		async function loadFailingChecks(sessionId, pullNumber, signal) {
 			const body = await loadJson("/checks", sessionId, pullNumber, signal);
@@ -5709,9 +5997,17 @@ window.__ModuleLoader__.load({
 			}
 			return checks;
 		}
-		/** Draft handed to Claude when the user forwards GitHub review comments. */
-		function composeCommentsPrompt(comments) {
-			return `Please address the following GitHub pull request review comments. Make the requested changes, or explain briefly when a comment should not be applied.\n\n${comments.map((comment) => `- ${comment.path}${comment.line === void 0 ? "" : `:${comment.line}`} (@${comment.author}): ${comment.body.replaceAll("\n", "\n  ")}`).join("\n")}`;
+		/** Draft handed to Claude when the user forwards GitHub review comments. A
+		*  resolved thread is a settled conversation: forwarding it would ask Claude to
+		*  redo work the reviewers already signed off. */
+		function composeCommentsPrompt(threads) {
+			const open = threads.filter((thread) => !thread.resolved);
+			if (open.length === 0) return "";
+			return `Please address the following GitHub pull request review comments. Make the requested changes, or explain briefly when a comment should not be applied.\n\n${open.map((thread) => {
+				const [first, ...rest] = thread.comments;
+				if (first === void 0) return "";
+				return [`- ${`${thread.path}${thread.line === void 0 ? "" : `:${thread.line}`}`} (@${first.author}): ${first.body.replaceAll("\n", "\n  ")}`, ...rest.map((reply) => `  (@${reply.author}): ${reply.body.replaceAll("\n", "\n  ")}`)].join("\n");
+			}).filter((block) => block.length > 0).join("\n")}`;
 		}
 		/** Draft handed to Claude when the user forwards failing CI checks. */
 		function composeChecksPrompt(checks) {
@@ -5759,12 +6055,13 @@ window.__ModuleLoader__.load({
 			if (checks.length === 0) return void 0;
 			return checks.map((check) => `${check.name}|${check.link ?? ""}`).sort().join("\n");
 		}
-		function planAutoFix(memory, comments, checks) {
-			const fresh = comments.filter((comment) => !memory.handledCommentIds.has(comment.id));
+		function planAutoFix(memory, threads, checks) {
+			const unhandled = threads.filter((thread) => !thread.resolved).filter((thread) => thread.comments.some((comment) => !memory.handledCommentIds.has(comment.id)));
+			const fresh = unhandled.flatMap((thread) => thread.comments);
 			const signature = checksSignature(checks);
 			const checksChanged = signature !== void 0 && signature !== memory.handledChecksSignature;
 			const sections = [];
-			if (fresh.length > 0) sections.push(composeCommentsPrompt(fresh));
+			if (unhandled.length > 0) sections.push(composeCommentsPrompt(unhandled));
 			if (checksChanged) sections.push(composeChecksPrompt(checks));
 			if (sections.length === 0) return { memory };
 			const nextSignature = checksChanged ? signature : memory.handledChecksSignature;
@@ -5777,6 +6074,47 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
+		//#region src/client/boot-check.ts
+		/** Boot-time assertions against the running Host.
+		*
+		*  The Desktop build ships no type declarations and several of its client
+		*  packages are unpublished, so `tsc` validates this plugin against whatever
+		*  @deepseek-ai/* versions happen to be installed — never against the Host it
+		*  will actually run inside. Every Desktop 2.0 breakage found so far was
+		*  invisible at compile time AND at runtime: a missing service leaves its
+		*  guarded registration silently unregistered, and a renamed custom property
+		*  just freezes a style on its fallback. These checks make that drift say so. */
+		/** Host-owned custom properties the styles read, and where each is scoped.
+		*
+		*  `var(--x, fallback)` cannot distinguish "the Host stopped publishing this"
+		*  from "the Host says this", so anything listed here needs an explicit probe.
+		*  The Host scopes these to a subtree rather than `:root` — custom properties
+		*  inherit, so only an element inside that subtree can see one, and probing
+		*  document.documentElement reports every one of them missing. Each entry
+		*  therefore names the mounted element that must be measured instead.
+		*
+		*  Plugin-owned properties (--dsh-claude-*) are set by this package and are
+		*  deliberately absent from this list. */
+		const CLAUDE_SCOPED_CSS_VARIABLES = ["--dsh-composer-card-max-width"];
+		/** Marks the bar the scoped-property probe measures. */
+		const CLAUDE_COMPOSER_BAR_ATTRIBUTE = "data-dsh-claude-composer-bar";
+		/** One line per service the Host no longer provides; empty when all resolve. */
+		function claudeBootCheckFindings(input) {
+			const findings = [];
+			for (const name of input.services) if (input.resolve(name) === void 0) findings.push(`service "${name}" is declared in inject but the Host does not provide it`);
+			return findings;
+		}
+		/** One line per scoped custom property the measured element cannot see.
+		*
+		*  @param read - computed value of one property ON THE MOUNTED BAR, not on the
+		*  document root: these properties are published to a subtree, so reading them
+		*  anywhere above it returns '' whether or not the Host still defines them. */
+		function claudeScopedCssFindings(read, names = CLAUDE_SCOPED_CSS_VARIABLES) {
+			const findings = [];
+			for (const name of names) if (read(name).trim() === "") findings.push(`CSS custom property "${name}" is not visible to the composer bar; styles reading it are stuck on their fallback`);
+			return findings;
+		}
+		//#endregion
 		//#region src/client/ClaudeRepositoryStatus.tsx
 		/** Icon-only status: the tone carries the state, the full label lives in the tooltip and accessible name. */
 		function StatusGlyph({ label, tone, children }) {
@@ -5900,15 +6238,6 @@ window.__ModuleLoader__.load({
 		function repositoryName$1(remote) {
 			return remote?.split("/").at(-1);
 		}
-		function relativeAge(value) {
-			if (value === void 0) return void 0;
-			const elapsedHours = Math.max(0, Math.floor((Date.now() - Date.parse(value)) / 36e5));
-			if (!Number.isFinite(elapsedHours)) return void 0;
-			if (elapsedHours < 1) return "<1h";
-			if (elapsedHours < 24) return `${elapsedHours}h`;
-			const days = Math.floor(elapsedHours / 24);
-			return days < 30 ? `${days}d` : `${Math.floor(days / 30)}mo`;
-		}
 		function PullRequestHoverCard({ repository, t }) {
 			const pullRequest = repository.pullRequest;
 			if (pullRequest === void 0) return null;
@@ -6046,7 +6375,7 @@ window.__ModuleLoader__.load({
 				if (!enabled || !open || running || number === void 0 || submitPrompt === void 0) return;
 				let cancelled = false;
 				const tick = async () => {
-					const [comments, failing] = await Promise.all([loadPullRequestComments(sessionId, number).catch(() => []), checks === "failing" ? loadFailingChecks(sessionId, number).catch(() => []) : Promise.resolve([])]);
+					const [comments, failing] = await Promise.all([loadPullRequestThreads(sessionId, number).catch(() => []), checks === "failing" ? loadFailingChecks(sessionId, number).catch(() => []) : Promise.resolve([])]);
 					if (cancelled) return;
 					const plan = planAutoFix(autoFixMemory(sessionId), comments, failing);
 					if (plan.prompt !== void 0 && submitPrompt(plan.prompt, "idle")) rememberAutoFix(sessionId, plan.memory);
@@ -6216,7 +6545,7 @@ window.__ModuleLoader__.load({
 				}) : null]
 			});
 		}
-		function UpdateBranchControl({ sessionId, repository, t, submitPrompt }) {
+		function UpdateBranchControl({ sessionId, repository, t, report, submitPrompt }) {
 			const [dialog, setDialog] = useState();
 			const [method, setMethod] = useState("rebase");
 			const controller = useRef();
@@ -6224,11 +6553,6 @@ window.__ModuleLoader__.load({
 			const base = pullRequest?.baseBranch;
 			const behind = repository.baseBehind ?? 0;
 			useEffect(() => () => controller.current?.abort(), []);
-			useEffect(() => {
-				if (dialog?.pushed === void 0 || dialog.error !== void 0) return;
-				const timer = setTimeout(() => setDialog(void 0), 1200);
-				return () => clearTimeout(timer);
-			}, [dialog?.error, dialog?.pushed]);
 			if (pullRequest === void 0 || pullRequest.state !== "open" || base === void 0 || repository.detached === true || repository.dirty === true || behind <= 0) return null;
 			const openDialog = () => {
 				controller.current?.abort();
@@ -6273,11 +6597,16 @@ window.__ModuleLoader__.load({
 					baseBranch: base,
 					mergeMethod: method
 				}).then((result) => {
-					setDialog({
-						...pending,
-						submitting: false,
-						...result.conflicts !== void 0 && result.conflicts.length > 0 ? { conflicts: result.conflicts } : { pushed: result.commit }
-					});
+					if (result.conflicts !== void 0 && result.conflicts.length > 0) {
+						setDialog({
+							...pending,
+							submitting: false,
+							conflicts: result.conflicts
+						});
+						return;
+					}
+					report(t("diffUpdateBranchCompleted", { commit: result.commit.slice(0, 8) }));
+					setDialog(void 0);
 				}, (reason) => {
 					setDialog({
 						...pending,
@@ -6286,7 +6615,7 @@ window.__ModuleLoader__.load({
 					});
 				});
 			};
-			const settled = dialog?.pushed !== void 0 || dialog?.conflicts !== void 0;
+			const settled = dialog?.conflicts !== void 0;
 			return /* @__PURE__ */ jsxs(Fragment$1, { children: [
 				/* @__PURE__ */ jsxs("button", {
 					type: "button",
@@ -6365,10 +6694,6 @@ window.__ModuleLoader__.load({
 									onChange: () => setMethod(option)
 								}), t(`diffUpdateBranch_${option}`, { base })]
 							}, option)),
-							dialog.pushed === void 0 ? null : /* @__PURE__ */ jsx("p", {
-								style: diffModalSuccess,
-								children: t("diffUpdateBranchCompleted", { commit: dialog.pushed.slice(0, 8) })
-							}),
 							dialog.conflicts === void 0 ? null : /* @__PURE__ */ jsxs(Fragment$1, { children: [
 								/* @__PURE__ */ jsx("p", {
 									style: diffModalStatus,
@@ -6401,15 +6726,10 @@ window.__ModuleLoader__.load({
 		/** After a merge: remove the worktree (or switch a plain checkout back to
 		*  base), delete the merged branch, and drop the DSH workspace along with the
 		*  sessions it held. */
-		function CleanupControl({ repository, t, deleteWorkspace }) {
+		function CleanupControl({ repository, t, report, deleteWorkspace }) {
 			const [dialog, setDialog] = useState();
 			const pullRequest = repository.pullRequest;
 			const base = pullRequest?.baseBranch;
-			useEffect(() => {
-				if (dialog?.done === void 0) return;
-				const timer = setTimeout(() => setDialog(void 0), 1500);
-				return () => clearTimeout(timer);
-			}, [dialog?.done]);
 			if (pullRequest?.state !== "merged" || base === void 0 || repository.root === void 0 || repository.detached === true) return null;
 			const root = repository.root;
 			const closeDialog = () => {
@@ -6418,11 +6738,9 @@ window.__ModuleLoader__.load({
 			const confirm = () => {
 				setDialog({ submitting: true });
 				cleanupMergedRepository(root, base).then(async (result) => {
+					report(t("cleanupCompleted", { branch: result.branch }));
+					setDialog(void 0);
 					if (result.mode === "worktree" && deleteWorkspace !== void 0) await deleteWorkspace();
-					setDialog({
-						submitting: false,
-						done: result.branch
-					});
 				}, (reason) => {
 					setDialog({
 						submitting: false,
@@ -6462,8 +6780,8 @@ window.__ModuleLoader__.load({
 							},
 							disabled: dialog?.submitting === true,
 							onClick: closeDialog,
-							children: dialog?.done === void 0 ? t("diffCancel") : t("diffDone")
-						}), dialog?.done === void 0 ? /* @__PURE__ */ jsx("button", {
+							children: t("diffCancel")
+						}), /* @__PURE__ */ jsx("button", {
 							type: "button",
 							style: {
 								...primaryButton,
@@ -6472,35 +6790,28 @@ window.__ModuleLoader__.load({
 							disabled: dialog?.submitting === true,
 							onClick: confirm,
 							children: dialog?.submitting === true ? t("diffSubmitting") : t("diffConfirm")
-						}) : null]
+						})]
 					}),
 					children: dialog === void 0 ? null : /* @__PURE__ */ jsxs("div", {
 						style: diffModalBody,
-						children: [
-							/* @__PURE__ */ jsxs("div", {
-								style: diffModalMeta,
-								children: [/* @__PURE__ */ jsxs("strong", {
-									style: diffModalMetaText,
-									children: [
-										repository.branch ?? t("repositoryUnknownBranch"),
-										" → ",
-										base
-									]
-								}), /* @__PURE__ */ jsx("span", {
-									style: diffModalFileState,
-									children: repository.worktree === true ? t("repositoryWorktree") : t("repositoryLocal")
-								})]
-							}),
-							dialog.done === void 0 ? null : /* @__PURE__ */ jsx("p", {
-								style: diffModalSuccess,
-								children: t("cleanupCompleted", { branch: dialog.done })
-							}),
-							dialog.error === void 0 ? null : /* @__PURE__ */ jsx("p", {
-								role: "alert",
-								style: diffModalError,
-								children: dialog.error
-							})
-						]
+						children: [/* @__PURE__ */ jsxs("div", {
+							style: diffModalMeta,
+							children: [/* @__PURE__ */ jsxs("strong", {
+								style: diffModalMetaText,
+								children: [
+									repository.branch ?? t("repositoryUnknownBranch"),
+									" → ",
+									base
+								]
+							}), /* @__PURE__ */ jsx("span", {
+								style: diffModalFileState,
+								children: repository.worktree === true ? t("repositoryWorktree") : t("repositoryLocal")
+							})]
+						}), dialog.error === void 0 ? null : /* @__PURE__ */ jsx("p", {
+							role: "alert",
+							style: diffModalError,
+							children: dialog.error
+						})]
 					})
 				})
 			] });
@@ -6510,17 +6821,12 @@ window.__ModuleLoader__.load({
 			"squash",
 			"rebase"
 		];
-		function MergePullRequestControl({ sessionId, repository, t }) {
+		function MergePullRequestControl({ sessionId, repository, t, report }) {
 			const [menuOpen, setMenuOpen] = useState(false);
 			const [dialog, setDialog] = useState();
 			const controller = useRef();
 			const pullRequest = repository.pullRequest;
 			useEffect(() => () => controller.current?.abort(), []);
-			useEffect(() => {
-				if (dialog?.merged !== true || dialog.error !== void 0) return;
-				const timer = setTimeout(() => setDialog(void 0), 1200);
-				return () => clearTimeout(timer);
-			}, [dialog?.error, dialog?.merged]);
 			if (pullRequest === void 0 || pullRequest.state !== "open" || pullRequest.draft || repository.detached === true) return null;
 			const openMerge = (method) => {
 				controller.current?.abort();
@@ -6568,11 +6874,8 @@ window.__ModuleLoader__.load({
 					includeUnstaged: false,
 					mergeMethod: dialog.method
 				}).then(() => {
-					setDialog({
-						...pending,
-						submitting: false,
-						merged: true
-					});
+					report(t("diffMergeCompleted", { number: pullRequest.number }));
+					setDialog(void 0);
 				}, (error) => {
 					setDialog({
 						...pending,
@@ -6581,15 +6884,13 @@ window.__ModuleLoader__.load({
 					});
 				});
 			};
-			const items = MERGE_METHODS.map((method) => ({
-				id: method,
-				label: t(`diffMerge_${method}`)
-			}));
-			const merged = dialog?.merged === true;
 			return /* @__PURE__ */ jsxs(Fragment$1, { children: [
 				/* @__PURE__ */ jsx(Menu, {
 					open: menuOpen,
-					items,
+					items: MERGE_METHODS.map((method) => ({
+						id: method,
+						label: t(`diffMerge_${method}`)
+					})),
 					onSelect: (id) => openMerge(id),
 					onClose: () => setMenuOpen(false),
 					align: "end",
@@ -6626,8 +6927,8 @@ window.__ModuleLoader__.load({
 							},
 							disabled: dialog?.submitting === true,
 							onClick: closeDialog,
-							children: merged ? t("diffDone") : t("diffCancel")
-						}), !merged ? /* @__PURE__ */ jsx("button", {
+							children: t("diffCancel")
+						}), /* @__PURE__ */ jsx("button", {
 							type: "button",
 							style: {
 								...primaryButton,
@@ -6636,7 +6937,7 @@ window.__ModuleLoader__.load({
 							disabled: dialog?.loading === true || dialog?.submitting === true || dialog?.fingerprint === void 0,
 							onClick: confirmMerge,
 							children: dialog?.submitting === true ? t("diffSubmitting") : t("diffConfirm")
-						}) : null]
+						})]
 					}),
 					children: dialog === void 0 ? null : /* @__PURE__ */ jsxs("div", {
 						style: diffModalBody,
@@ -6660,10 +6961,6 @@ window.__ModuleLoader__.load({
 								style: diffModalStatus,
 								children: pullRequest.title
 							}),
-							merged ? /* @__PURE__ */ jsx("p", {
-								style: diffModalSuccess,
-								children: t("diffMergeCompleted", { number: pullRequest.number })
-							}) : null,
 							dialog.error === void 0 ? null : /* @__PURE__ */ jsx("p", {
 								role: "alert",
 								style: diffModalError,
@@ -6679,6 +6976,7 @@ window.__ModuleLoader__.load({
 			const running = useSessions((value) => value.byId[sessionId]?.running === true);
 			const projection = useClaudeProjection((value) => value);
 			const repository = projection.repository;
+			const { toast, report } = useActionToast();
 			if (blank || !projection.owned || repository === void 0) return null;
 			const branch = repository.detached === true ? t("repositoryDetached") : repository.branch ?? t("repositoryUnknownBranch");
 			const pullRequest = repository.pullRequest;
@@ -6689,6 +6987,7 @@ window.__ModuleLoader__.load({
 			const hasDiff = repository.diff !== void 0 && (repository.diff.additions > 0 || repository.diff.deletions > 0);
 			if (repository.status !== "ready") return /* @__PURE__ */ jsx("div", {
 				style: repositoryBarFrame,
+				[CLAUDE_COMPOSER_BAR_ATTRIBUTE]: "",
 				children: /* @__PURE__ */ jsxs("div", {
 					style: repositoryBar,
 					children: [/* @__PURE__ */ jsx("span", {
@@ -6700,9 +6999,10 @@ window.__ModuleLoader__.load({
 					})]
 				})
 			});
-			return /* @__PURE__ */ jsx("div", {
+			return /* @__PURE__ */ jsxs("div", {
 				style: repositoryBarFrame,
-				children: /* @__PURE__ */ jsxs("div", {
+				[CLAUDE_COMPOSER_BAR_ATTRIBUTE]: "",
+				children: [toast, /* @__PURE__ */ jsxs("div", {
 					style: {
 						...repositoryBar,
 						...merged ? repositoryBarMerged : {}
@@ -6778,6 +7078,7 @@ window.__ModuleLoader__.load({
 							}), /* @__PURE__ */ jsx(CleanupControl, {
 								repository,
 								t,
+								report,
 								...deleteWorkspace === void 0 ? {} : { deleteWorkspace }
 							})] }) : /* @__PURE__ */ jsxs(Fragment$1, { children: [
 								pullRequest.checks === "failing" ? /* @__PURE__ */ jsx(FailingChecksControl, {
@@ -6806,17 +7107,19 @@ window.__ModuleLoader__.load({
 									sessionId,
 									repository,
 									t,
+									report,
 									...submitPrompt === void 0 ? {} : { submitPrompt }
 								}),
 								/* @__PURE__ */ jsx(MergePullRequestControl, {
 									sessionId,
 									repository,
-									t
+									t,
+									report
 								})
 							] })]
 						})
 					]
-				})
+				})]
 			});
 		}
 		//#endregion
@@ -11134,24 +11437,424 @@ window.__ModuleLoader__.load({
 				ADD_ATTR: ["target", "rel"]
 			});
 		}
-		/** One review comment body, ready for `dangerouslySetInnerHTML`. */
-		function renderCommentBody(body, purify$2 = purify) {
-			return sanitizeCommentHtml(commentBodyHtml(body), purify$2);
+		/** One review comment body, ready for `dangerouslySetInnerHTML`. */
+		function renderCommentBody(body, purify$2 = purify) {
+			return sanitizeCommentHtml(commentBodyHtml(body), purify$2);
+		}
+		/** Open sanitized links in the browser instead of inside the app shell, and
+		*  keep comment checkboxes inert. Installed once, on import, so no render
+		*  path can reach the sanitizer before its hooks. */
+		function installCommentSanitizerHooks(purify$3 = purify) {
+			if (typeof purify$3.addHook !== "function" || purify$3.isSupported !== true) return;
+			purify$3.addHook("afterSanitizeAttributes", (node) => {
+				if (node.nodeName === "A") {
+					node.setAttribute("target", "_blank");
+					node.setAttribute("rel", "noopener noreferrer");
+				}
+				if (node.nodeName === "INPUT") node.setAttribute("disabled", "");
+			});
+		}
+		installCommentSanitizerHooks();
+		//#endregion
+		//#region src/client/mention.ts
+		/** `@` completion for the review reply composer.
+		*
+		*  GitHub resolves `@login` server-side, so completion is convenience only:
+		*  every function here works on the draft text, never on the network. */
+		/** GitHub logins are alphanumeric with dashes; app accounts add a `[bot]`
+		*  suffix, which the user reaches by continuing to type rather than by us
+		*  matching it here. */
+		const HANDLE = /(?:^|[^\w@/-])@([\w-]*)$/u;
+		const MAX_HANDLE_CHARS = 39;
+		/** The handle the caret is currently inside, when it is inside one. */
+		function mentionQueryAt(text, caret) {
+			const before = text.slice(0, caret);
+			const match = HANDLE.exec(before);
+			const query = match?.[1];
+			if (match === void 0 || match === null || query === void 0 || query.length > MAX_HANDLE_CHARS) return void 0;
+			return {
+				query,
+				start: caret - query.length - 1
+			};
+		}
+		/** Swap the typed handle for the chosen login, leaving a separating space. */
+		function applyMention(text, caret, mention, login) {
+			const completed = `@${login} `;
+			return {
+				text: `${text.slice(0, mention.start)}${completed}${text.slice(caret)}`,
+				caret: mention.start + completed.length
+			};
+		}
+		//#endregion
+		//#region src/client/menu-navigation.ts
+		/** Wrapping keyboard navigation shared by the plugin's popup lists. */
+		function menuNavigationIndex(current, count, key) {
+			if (count <= 0) return 0;
+			if (key === "Home") return 0;
+			if (key === "End") return count - 1;
+			return (current + (key === "ArrowDown" ? 1 : -1) + count) % count;
+		}
+		//#endregion
+		//#region src/client/MentionTextarea.tsx
+		/** How long the draft must sit still before the repository is asked who `@al`
+		*  might be; one request per keystroke would rate-limit the token. */
+		const SUGGEST_DEBOUNCE_MS = 200;
+		/** A comment composer that completes `@handles` from the repository's
+		*  mentionable users. GitHub notifies on the text alone, so the popup is a
+		*  convenience: typing a login by hand works exactly as well. */
+		function MentionTextarea({ value, placeholder, suggestLabel, maxLength = 2e3, autoFocus = false, disabled = false, suggest, onChange, onSubmit }) {
+			const areaRef = useRef(null);
+			const [mention, setMention] = useState();
+			const [users, setUsers] = useState([]);
+			const [activeIndex, setActiveIndex] = useState(0);
+			const [caretTarget, setCaretTarget] = useState();
+			const open = mention !== void 0 && users.length > 0;
+			useEffect(() => {
+				if (mention === void 0) {
+					setUsers([]);
+					return;
+				}
+				let cancelled = false;
+				const timer = setTimeout(() => {
+					suggest(mention.query).then((found) => {
+						if (cancelled) return;
+						setUsers(found);
+						setActiveIndex(0);
+					}, () => {
+						if (!cancelled) setUsers([]);
+					});
+				}, SUGGEST_DEBOUNCE_MS);
+				return () => {
+					cancelled = true;
+					clearTimeout(timer);
+				};
+			}, [mention, suggest]);
+			useLayoutEffect(() => {
+				if (caretTarget === void 0 || areaRef.current === null) return;
+				areaRef.current.setSelectionRange(caretTarget, caretTarget);
+				setCaretTarget(void 0);
+			}, [caretTarget, value]);
+			const track = (area) => {
+				setMention(mentionQueryAt(area.value, area.selectionStart ?? area.value.length));
+			};
+			const complete = (login) => {
+				const area = areaRef.current;
+				if (area === null || mention === void 0) return;
+				const applied = applyMention(area.value, area.selectionStart ?? area.value.length, mention, login);
+				setMention(void 0);
+				setUsers([]);
+				setCaretTarget(applied.caret);
+				onChange(applied.text);
+			};
+			const handleKeyDown = (event) => {
+				if (open) {
+					if (event.key === "ArrowDown" || event.key === "ArrowUp" || event.key === "Home" || event.key === "End") {
+						event.preventDefault();
+						setActiveIndex((current) => menuNavigationIndex(current, users.length, event.key));
+						return;
+					}
+					if (event.key === "Enter" || event.key === "Tab") {
+						const login = users[activeIndex]?.login;
+						if (login !== void 0) {
+							event.preventDefault();
+							complete(login);
+							return;
+						}
+					}
+					if (event.key === "Escape") {
+						event.preventDefault();
+						setMention(void 0);
+						setUsers([]);
+						return;
+					}
+				}
+				if (event.key === "Enter" && (event.ctrlKey || event.metaKey) && onSubmit !== void 0) {
+					event.preventDefault();
+					onSubmit();
+				}
+			};
+			return /* @__PURE__ */ jsxs("span", {
+				style: mentionField,
+				children: [/* @__PURE__ */ jsx("textarea", {
+					ref: areaRef,
+					className: diffCommentTextareaClass,
+					style: diffCommentTextarea,
+					value,
+					maxLength,
+					placeholder,
+					disabled,
+					autoFocus,
+					"aria-autocomplete": "list",
+					onChange: (event) => {
+						onChange(event.currentTarget.value);
+						track(event.currentTarget);
+					},
+					onKeyUp: (event) => {
+						track(event.currentTarget);
+					},
+					onClick: (event) => {
+						track(event.currentTarget);
+					},
+					onBlur: () => {
+						setMention(void 0);
+					},
+					onKeyDown: handleKeyDown
+				}), !open ? null : /* @__PURE__ */ jsx("span", {
+					role: "listbox",
+					"aria-label": suggestLabel,
+					style: mentionList,
+					children: users.map((user, index) => /* @__PURE__ */ jsxs("button", {
+						type: "button",
+						role: "option",
+						"aria-selected": index === activeIndex,
+						style: {
+							...mentionItem,
+							...index === activeIndex ? mentionItemActive : {}
+						},
+						onMouseEnter: () => {
+							setActiveIndex(index);
+						},
+						onMouseDown: (event) => {
+							event.preventDefault();
+						},
+						onClick: () => {
+							complete(user.login);
+						},
+						children: [user.avatarUrl === void 0 ? null : /* @__PURE__ */ jsx("img", {
+							src: user.avatarUrl,
+							alt: "",
+							width: 16,
+							height: 16,
+							loading: "lazy",
+							referrerPolicy: "no-referrer",
+							style: mentionAvatar
+						}), user.login]
+					}, user.login))
+				})]
+			});
+		}
+		//#endregion
+		//#region src/client/ReviewThreadCard.tsx
+		const BOT_SUFFIX = "[bot]";
+		/** GitHub prints an app account as its name plus a Bot pill rather than as the
+		*  raw `name[bot]` login. GraphQL already drops that suffix, so the flag from
+		*  the API decides and the suffix is only stripped for display. */
+		function identity(author) {
+			return author.endsWith(BOT_SUFFIX) ? author.slice(0, -5) : author;
+		}
+		function CommentBody({ comment, t, now, first }) {
+			const name = identity(comment.author);
+			const age = relativeAge(comment.createdAt, now);
+			return /* @__PURE__ */ jsxs("div", {
+				style: {
+					...diffGhComment,
+					...first ? {} : diffGhCommentNext
+				},
+				children: [/* @__PURE__ */ jsxs("div", {
+					style: diffCommentCardMeta,
+					children: [/* @__PURE__ */ jsxs("span", {
+						style: diffGhCommentIdentity,
+						children: [
+							comment.avatarUrl === void 0 ? null : /* @__PURE__ */ jsx("img", {
+								src: comment.avatarUrl,
+								alt: "",
+								width: 16,
+								height: 16,
+								loading: "lazy",
+								referrerPolicy: "no-referrer",
+								style: diffGhCommentAvatar,
+								onError: (event) => {
+									event.currentTarget.style.display = "none";
+								}
+							}),
+							/* @__PURE__ */ jsxs("span", {
+								style: diffGhCommentAuthor,
+								children: ["@", name]
+							}),
+							comment.bot !== true ? null : /* @__PURE__ */ jsx("span", {
+								style: diffThreadBadge,
+								children: t("reviewThreadBot")
+							}),
+							age === void 0 ? null : /* @__PURE__ */ jsx("span", {
+								style: diffGhCommentAge,
+								children: t("reviewThreadAgo", { age })
+							})
+						]
+					}), /* @__PURE__ */ jsx(Tooltip, {
+						label: t("reviewThreadOpenOnGitHub"),
+						side: "bottom",
+						delayMs: 250,
+						children: /* @__PURE__ */ jsx("a", {
+							href: comment.url,
+							target: "_blank",
+							rel: "noopener noreferrer",
+							style: diffGhCommentLink,
+							"aria-label": t("reviewThreadOpenOnGitHub"),
+							children: /* @__PURE__ */ jsx(IconRightUpOutline14, {})
+						})
+					})]
+				}), /* @__PURE__ */ jsx("div", {
+					style: diffCommentCardText,
+					className: "dshClaudeDiffCommentBody",
+					dangerouslySetInnerHTML: { __html: renderCommentBody(comment.body) }
+				})]
+			});
 		}
-		/** Open sanitized links in the browser instead of inside the app shell, and
-		*  keep comment checkboxes inert. Installed once, on import, so no render
-		*  path can reach the sanitizer before its hooks. */
-		function installCommentSanitizerHooks(purify$3 = purify) {
-			if (typeof purify$3.addHook !== "function" || purify$3.isSupported !== true) return;
-			purify$3.addHook("afterSanitizeAttributes", (node) => {
-				if (node.nodeName === "A") {
-					node.setAttribute("target", "_blank");
-					node.setAttribute("rel", "noopener noreferrer");
+		/** One GitHub review conversation, anchored on its diff line: every comment in
+		*  the thread, plus the two things a reviewer expects to do with it — answer it
+		*  and close it. A resolved thread collapses, because the diff is about what
+		*  still needs attention. */
+		function ReviewThreadCard({ thread, t, now, anchorKey, active = false, suggest, onReply, onResolvedChange }) {
+			const [expanded, setExpanded] = useState(false);
+			const [replying, setReplying] = useState(false);
+			const [draft, setDraft] = useState("");
+			const [busy, setBusy] = useState(false);
+			const [error, setError] = useState();
+			const first = thread.comments[0];
+			if (first === void 0) return null;
+			const collapsed = thread.resolved && !expanded;
+			const send = () => {
+				const body = draft.trim();
+				if (body.length === 0 || busy) return;
+				setBusy(true);
+				setError(void 0);
+				onReply(body).then(() => {
+					setDraft("");
+					setReplying(false);
+				}, (reason) => {
+					setError(reason instanceof Error ? reason.message : t("reviewThreadReplyFailed"));
+				}).finally(() => {
+					setBusy(false);
+				});
+			};
+			const toggleResolved = () => {
+				if (busy) return;
+				setBusy(true);
+				setError(void 0);
+				onResolvedChange(!thread.resolved).catch((reason) => {
+					setError(reason instanceof Error ? reason.message : t("reviewThreadResolveFailed"));
+				}).finally(() => {
+					setBusy(false);
+				});
+			};
+			const frame = {
+				...anchorKey === void 0 ? {} : { "data-review-target": anchorKey },
+				...active ? { "data-review-active": "true" } : {},
+				style: {
+					...diffCommentBlock,
+					...active ? diffCommentBlockActive : {}
 				}
-				if (node.nodeName === "INPUT") node.setAttribute("disabled", "");
+			};
+			if (collapsed) return /* @__PURE__ */ jsx("div", {
+				...frame,
+				children: /* @__PURE__ */ jsxs("button", {
+					type: "button",
+					"aria-expanded": false,
+					style: diffThreadSummary,
+					onClick: () => {
+						setExpanded(true);
+					},
+					children: [
+						/* @__PURE__ */ jsx("span", {
+							style: diffThreadBadge,
+							children: t("reviewThreadResolved")
+						}),
+						/* @__PURE__ */ jsxs("span", {
+							style: diffGhCommentAuthor,
+							children: ["@", identity(first.author)]
+						}),
+						/* @__PURE__ */ jsx("span", {
+							style: diffThreadExcerpt,
+							children: first.body.split("\n")[0]
+						})
+					]
+				})
+			});
+			return /* @__PURE__ */ jsxs("div", {
+				...frame,
+				children: [
+					!thread.resolved && !thread.outdated ? null : /* @__PURE__ */ jsxs("div", {
+						style: diffThreadBadges,
+						children: [thread.resolved ? /* @__PURE__ */ jsx("span", {
+							style: diffThreadBadge,
+							children: t("reviewThreadResolved")
+						}) : null, thread.outdated ? /* @__PURE__ */ jsx("span", {
+							style: diffThreadBadge,
+							children: t("reviewThreadOutdated")
+						}) : null]
+					}),
+					thread.comments.map((comment, index) => /* @__PURE__ */ jsx(CommentBody, {
+						comment,
+						t,
+						now,
+						first: index === 0
+					}, comment.id)),
+					error === void 0 ? null : /* @__PURE__ */ jsx("p", {
+						style: diffCommentError,
+						children: error
+					}),
+					replying ? /* @__PURE__ */ jsxs("div", {
+						"data-review-reply": "",
+						style: diffThreadComposer,
+						children: [
+							/* @__PURE__ */ jsx("span", {
+								style: diffThreadComposerCaption,
+								children: t("reviewThreadReplyTo", { author: identity(thread.comments[thread.comments.length - 1]?.author ?? first.author) })
+							}),
+							/* @__PURE__ */ jsx(MentionTextarea, {
+								value: draft,
+								placeholder: t("reviewThreadReplyPlaceholder"),
+								suggestLabel: t("reviewThreadMention"),
+								disabled: busy,
+								autoFocus: true,
+								suggest,
+								onChange: setDraft,
+								onSubmit: send
+							}),
+							/* @__PURE__ */ jsxs("div", {
+								style: diffCommentActions,
+								children: [/* @__PURE__ */ jsx("button", {
+									type: "button",
+									style: diffCommentActionButton,
+									disabled: busy,
+									onClick: () => {
+										setReplying(false);
+										setError(void 0);
+									},
+									children: t("reviewCommentCancel")
+								}), /* @__PURE__ */ jsx("button", {
+									type: "button",
+									style: {
+										...diffCommentActionButton,
+										...diffCommentSubmitButton
+									},
+									disabled: busy || draft.trim().length === 0,
+									onClick: send,
+									children: t("reviewThreadSend")
+								})]
+							})
+						]
+					}) : /* @__PURE__ */ jsxs("div", {
+						style: diffCommentActions,
+						children: [/* @__PURE__ */ jsx("button", {
+							type: "button",
+							style: diffCommentActionButton,
+							disabled: busy,
+							onClick: () => {
+								setReplying(true);
+							},
+							children: t("reviewThreadReply")
+						}), /* @__PURE__ */ jsx("button", {
+							type: "button",
+							style: diffCommentActionButton,
+							disabled: busy,
+							onClick: toggleResolved,
+							children: thread.resolved ? t("reviewThreadUnresolve") : t("reviewThreadResolve")
+						})]
+					})
+				]
 			});
 		}
-		installCommentSanitizerHooks();
 		//#endregion
 		//#region src/client/ClaudeDiffPanel.tsx
 		function pathFromHeader(line) {
@@ -11304,6 +12007,28 @@ window.__ModuleLoader__.load({
 			}
 			return out;
 		}
+		/** Everything in this diff still waiting on the reader, in reading order:
+		*  files as the panel lists them, lines as the file reads. Resolved threads are
+		*  collapsed by design, and a comment on a file this diff does not render has
+		*  nowhere to scroll to, so neither is a stop. */
+		function reviewTargets(files, comments, threads) {
+			const targets = [];
+			for (const file of files) {
+				const inFile = [...threads.filter((thread) => thread.path === file.path && !thread.resolved && thread.line !== void 0).map((thread) => ({
+					key: `thread:${thread.id}`,
+					path: thread.path,
+					line: thread.line ?? 0,
+					side: thread.side
+				})), ...comments.filter((comment) => comment.path === file.path).map((comment) => ({
+					key: `comment:${comment.id}`,
+					path: comment.path,
+					line: comment.line,
+					side: comment.side
+				}))];
+				targets.push(...inFile.sort((left, right) => left.line - right.line || left.side.localeCompare(right.side)));
+			}
+			return targets;
+		}
 		/**
 		* Anchor for a drag from row `from` to row `to`: every commentable row in
 		* between on the same side as the first row, collapsed to its first/last line.
@@ -11430,8 +12155,7 @@ window.__ModuleLoader__.load({
 				children: /* @__PURE__ */ jsx("path", { d: "M14 9.5a2 2 0 0 1-2 2H6l-3.5 2.5V4a2 2 0 0 1 2-2h7.5a2 2 0 0 1 2 2z" })
 			});
 		}
-		function DiffFileSection({ file, root, initiallyOpen, t, comments, ghComments, editorAnchor, editorNode, onOpenEditor, onRemoveComment }) {
-			const [open, setOpen] = useState(initiallyOpen);
+		function DiffFileSection({ file, root, open, t, comments, ghThreads, editorAnchor, editorNode, now, activeTargetKey, suggestMention, onOpenEditor, onOpenChange, onRemoveComment, onReplyToThread, onThreadResolvedChange }) {
 			const [revealed, setRevealed] = useState(() => /* @__PURE__ */ new Map());
 			const [total, setTotal] = useState();
 			const [expanding, setExpanding] = useState(false);
@@ -11443,7 +12167,7 @@ window.__ModuleLoader__.load({
 			]);
 			const anchors = useMemo(() => rows.map(commentAnchorForLine), [rows]);
 			const name = file.path.slice(file.path.lastIndexOf("/") + 1);
-			const commentCount = comments.length + ghComments.length;
+			const commentCount = comments.length + ghThreads.reduce((total, thread) => total + thread.comments.length, 0);
 			const expand = (gap, direction) => {
 				if (root === void 0 || expanding) return;
 				const span = gap.count ?? 20;
@@ -11486,14 +12210,16 @@ window.__ModuleLoader__.load({
 					type: "button",
 					style: diffFileHeader,
 					"aria-expanded": open,
-					onClick: () => setOpen((value) => !value),
+					onClick: () => onOpenChange(!open),
 					children: [
 						/* @__PURE__ */ jsx("span", {
+							"data-diff-file-chevron": "",
 							style: {
-								...chevron,
+								...diffFileChevron,
 								...open ? chevronOpen : {}
 							},
-							children: "›"
+							"aria-hidden": "true",
+							children: /* @__PURE__ */ jsx(IconChevronRightOutline14, { size: 14 })
 						}),
 						/* @__PURE__ */ jsx("span", {
 							style: diffFilePath,
@@ -11536,7 +12262,7 @@ window.__ModuleLoader__.load({
 						}, `gap:${entry.gap.newStart}`);
 						const anchor = anchors[index];
 						const lineComments = anchor === void 0 ? [] : comments.filter((comment) => comment.line === anchor.line && comment.side === anchor.side);
-						const ghLineComments = anchor === void 0 ? [] : ghComments.filter((comment) => comment.line === anchor.line && comment.side === anchor.side);
+						const lineThreads = anchor === void 0 ? [] : ghThreads.filter((thread) => thread.line === anchor.line && thread.side === anchor.side);
 						const editorOpen = anchor !== void 0 && editorAnchor !== void 0 && editorAnchor.line === anchor.line && editorAnchor.side === anchor.side;
 						const inDrag = dragLow !== void 0 && dragHigh !== void 0 && index >= dragLow && index <= dragHigh && anchor?.side === dragSide;
 						const inEditorRange = anchor !== void 0 && editorAnchor !== void 0 && editorAnchor.side === anchor.side && anchor.line <= editorAnchor.line && anchor.line >= (editorAnchor.startLine ?? editorAnchor.line);
@@ -11556,7 +12282,12 @@ window.__ModuleLoader__.load({
 								})
 							}),
 							lineComments.map((comment) => /* @__PURE__ */ jsxs("div", {
-								style: diffCommentBlock,
+								"data-review-target": `comment:${comment.id}`,
+								"data-review-active": activeTargetKey === `comment:${comment.id}` ? "true" : void 0,
+								style: {
+									...diffCommentBlock,
+									...activeTargetKey === `comment:${comment.id}` ? diffCommentBlockActive : {}
+								},
 								children: [/* @__PURE__ */ jsxs("div", {
 									style: diffCommentCardMeta,
 									children: [/* @__PURE__ */ jsx("span", { children: commentLineLabel(comment, t) }), /* @__PURE__ */ jsx("button", {
@@ -11571,41 +12302,16 @@ window.__ModuleLoader__.load({
 									children: comment.text
 								})]
 							}, comment.id)),
-							ghLineComments.map((comment) => /* @__PURE__ */ jsxs("div", {
-								style: diffCommentBlock,
-								children: [/* @__PURE__ */ jsxs("div", {
-									style: diffCommentCardMeta,
-									children: [/* @__PURE__ */ jsxs("span", {
-										style: diffGhCommentIdentity,
-										children: [comment.avatarUrl === void 0 ? null : /* @__PURE__ */ jsx("img", {
-											src: comment.avatarUrl,
-											alt: "",
-											width: 16,
-											height: 16,
-											loading: "lazy",
-											referrerPolicy: "no-referrer",
-											style: diffGhCommentAvatar,
-											onError: (event) => {
-												event.currentTarget.style.display = "none";
-											}
-										}), /* @__PURE__ */ jsxs("span", {
-											style: diffGhCommentAuthor,
-											children: ["@", comment.author]
-										})]
-									}), /* @__PURE__ */ jsx("a", {
-										href: comment.url,
-										target: "_blank",
-										rel: "noopener noreferrer",
-										style: diffGhCommentLink,
-										"aria-label": comment.url,
-										children: "↗"
-									})]
-								}), /* @__PURE__ */ jsx("div", {
-									style: diffCommentCardText,
-									className: "dshClaudeDiffCommentBody",
-									dangerouslySetInnerHTML: { __html: renderCommentBody(comment.body) }
-								})]
-							}, `gh-${comment.id}`)),
+							lineThreads.map((thread) => /* @__PURE__ */ jsx(ReviewThreadCard, {
+								thread,
+								anchorKey: `thread:${thread.id}`,
+								active: activeTargetKey === `thread:${thread.id}`,
+								t,
+								suggest: suggestMention,
+								now,
+								onReply: (body) => onReplyToThread(thread, body),
+								onResolvedChange: (resolved) => onThreadResolvedChange(thread, resolved)
+							}, thread.id)),
 							editorOpen ? editorNode : null
 						] }, `${index}:${entry.line}`);
 					})
@@ -11646,6 +12352,7 @@ window.__ModuleLoader__.load({
 			const diff = repository?.diff;
 			const files = useMemo(() => parseUnifiedDiff(diff?.patch ?? ""), [diff?.patch]);
 			const [menuOpen, setMenuOpen] = useState(false);
+			const { toast, report } = useActionToast();
 			const [dialog, setDialog] = useState();
 			const [message, setMessage] = useState("");
 			const [includeUnstaged, setIncludeUnstaged] = useState(true);
@@ -11660,21 +12367,55 @@ window.__ModuleLoader__.load({
 			const [localComments, setLocalComments] = useState([]);
 			const [removedCommentIds, setRemovedCommentIds] = useState(() => /* @__PURE__ */ new Set());
 			const actionController = useRef();
-			const [ghComments, setGhComments] = useState([]);
+			const [ghThreads, setGhThreads] = useState([]);
+			const [threadsLoadedAt, setThreadsLoadedAt] = useState(() => Date.now());
 			const pullNumber = repository?.pullRequest?.state === "open" ? repository.pullRequest.number : void 0;
 			useEffect(() => {
-				setGhComments([]);
+				setGhThreads([]);
 				if (pullNumber === void 0) return;
 				const controller = new AbortController();
-				loadPullRequestComments(sessionId, pullNumber, controller.signal).then(setGhComments, () => void 0);
+				loadPullRequestThreads(sessionId, pullNumber, controller.signal).then((threads) => {
+					setGhThreads(threads);
+					setThreadsLoadedAt(Date.now());
+				}, () => void 0);
 				return () => {
 					controller.abort();
 				};
 			}, [pullNumber, sessionId]);
+			const openThreadCount = ghThreads.filter((thread) => !thread.resolved).length;
+			const bodyRef = useRef(null);
+			const [targetIndex, setTargetIndex] = useState(0);
+			const [activeTargetKey, setActiveTargetKey] = useState();
+			const [pendingScrollKey, setPendingScrollKey] = useState();
+			const [openFiles, setOpenFiles] = useState(() => /* @__PURE__ */ new Map());
+			const fileOpen = useCallback((path, index) => openFiles.get(path) ?? index === 0, [openFiles]);
+			const setFileOpen = useCallback((path, open) => {
+				setOpenFiles((current) => new Map(current).set(path, open));
+			}, []);
+			const suggestMention = useCallback(async (query) => pullNumber === void 0 ? [] : loadMentionableUsers(sessionId, pullNumber, query).catch(() => []), [pullNumber, sessionId]);
+			const replyToThread = useCallback(async (thread, body) => {
+				if (pullNumber === void 0) return;
+				const anchor = thread.comments[0];
+				if (anchor === void 0) return;
+				const posted = await replyToReviewThread(sessionId, pullNumber, anchor.id, body);
+				setGhThreads((list) => list.map((item) => item.id === thread.id ? {
+					...item,
+					comments: [...item.comments, posted]
+				} : item));
+			}, [pullNumber, sessionId]);
+			const changeThreadResolved = useCallback(async (thread, resolved) => {
+				if (pullNumber === void 0) return;
+				const state = await setReviewThreadResolved(sessionId, pullNumber, thread.id, resolved);
+				setGhThreads((list) => list.map((item) => item.id === thread.id ? {
+					...item,
+					resolved: state
+				} : item));
+			}, [pullNumber, sessionId]);
 			const diffViewportObserver = useRef();
 			const diffBodyRef = useCallback((element) => {
 				diffViewportObserver.current?.disconnect();
 				diffViewportObserver.current = void 0;
+				bodyRef.current = element;
 				if (element === null || typeof ResizeObserver === "undefined") return;
 				const update = () => element.style.setProperty("--dsh-claude-diff-viewport", `${element.clientWidth}px`);
 				update();
@@ -11689,16 +12430,6 @@ window.__ModuleLoader__.load({
 				actionController.current = void 0;
 				setDialog(void 0);
 			}, [dialog?.submitting]);
-			useEffect(() => {
-				if (dialog?.commit === void 0 || dialog.error !== void 0 || dialog.pullRequestUrl !== void 0) return;
-				const timer = setTimeout(closeDialog, 1200);
-				return () => clearTimeout(timer);
-			}, [
-				closeDialog,
-				dialog?.commit,
-				dialog?.error,
-				dialog?.pullRequestUrl
-			]);
 			const openAction = useCallback((action) => {
 				actionController.current?.abort();
 				setMenuOpen(false);
@@ -11732,14 +12463,12 @@ window.__ModuleLoader__.load({
 						submitting: false
 					});
 					const generated = await generateCommitMessage(sessionId, preview.fingerprint, controller.signal);
-					setMessage(generated);
-					setPrTitle(generated);
-					setPrBody(`Summary: ${generated}\n\nChanges:\n- ${generated}`);
-					setDialog({
-						action,
-						preview,
-						loading: false,
-						submitting: false
+					setMessage((current) => current.trim() === "" ? generated : current);
+					setPrTitle((current) => current.trim() === "" ? generated : current);
+					setPrBody((current) => current.trim() === "" ? `Summary: ${generated}\n\nChanges:\n- ${generated}` : current);
+					setDialog((current) => current === void 0 ? current : {
+						...current,
+						loading: false
 					});
 				}).catch((error) => {
 					if (!controller.signal.aborted) setDialog({
@@ -11770,12 +12499,8 @@ window.__ModuleLoader__.load({
 							draft
 						} : {}
 					});
-					setDialog({
-						...dialog,
-						submitting: false,
-						commit: result.commit,
-						...result.pullRequestUrl === void 0 ? {} : { pullRequestUrl: result.pullRequestUrl }
-					});
+					report(result.pullRequestUrl === void 0 ? t(dialog.action === "push" ? "diffPushCompleted" : "diffCommitCompleted", { commit: result.commit.slice(0, 8) }) : t("diffPrCompleted"));
+					setDialog(void 0);
 				} catch (error) {
 					const completedCommit = typeof error === "object" && error !== null && "commit" in error && typeof error.commit === "string" ? error.commit : void 0;
 					setDialog({
@@ -11793,6 +12518,7 @@ window.__ModuleLoader__.load({
 				message,
 				prBody,
 				prTitle,
+				report,
 				sessionId,
 				t
 			]);
@@ -11865,6 +12591,47 @@ window.__ModuleLoader__.load({
 				projection.reviewComments,
 				removedCommentIds
 			]);
+			const targets = useMemo(() => reviewTargets(files, reviewComments, ghThreads), [
+				files,
+				ghThreads,
+				reviewComments
+			]);
+			useEffect(() => {
+				setTargetIndex((index) => index < targets.length ? index : 0);
+			}, [targets.length]);
+			const goToComment = useCallback((direction) => {
+				setTargetIndex((current) => {
+					if (targets.length === 0) return current;
+					const next = menuNavigationIndex(current, targets.length, direction);
+					const target = targets[next];
+					if (target !== void 0) {
+						setActiveTargetKey(target.key);
+						setPendingScrollKey(target.key);
+						setFileOpen(target.path, true);
+					}
+					return next;
+				});
+			}, [setFileOpen, targets]);
+			useEffect(() => {
+				if (pendingScrollKey === void 0) return;
+				bodyRef.current?.querySelector(`[data-review-target="${pendingScrollKey}"]`)?.scrollIntoView({ block: "center" });
+				setPendingScrollKey(void 0);
+			}, [pendingScrollKey]);
+			useEffect(() => {
+				if (targets.length === 0) return;
+				const shortcut = (event) => {
+					if (event.ctrlKey || event.metaKey || event.altKey) return;
+					const origin = event.target;
+					if (origin instanceof HTMLElement && (origin.isContentEditable || origin.tagName === "INPUT" || origin.tagName === "TEXTAREA" || origin.tagName === "SELECT")) return;
+					if (event.key !== "n" && event.key !== "p") return;
+					event.preventDefault();
+					goToComment(event.key === "n" ? "ArrowDown" : "ArrowUp");
+				};
+				document.addEventListener("keydown", shortcut);
+				return () => {
+					document.removeEventListener("keydown", shortcut);
+				};
+			}, [goToComment, targets.length]);
 			useEffect(() => () => actionController.current?.abort(), []);
 			useEffect(() => {
 				if (!projection.owned || repository?.status !== "ready" || diff === void 0) closeDetails();
@@ -11900,7 +12667,7 @@ window.__ModuleLoader__.load({
 					disabled: !availability["create-pr"]
 				}
 			];
-			const completed = dialog?.commit !== void 0 && dialog.error === void 0;
+			const allFilesOpen = files.every((file, index) => fileOpen(file.path, index));
 			const commentEditorNode = commentEditor === void 0 ? null : /* @__PURE__ */ jsxs("div", {
 				style: diffCommentBlock,
 				children: [
@@ -11942,6 +12709,7 @@ window.__ModuleLoader__.load({
 				]
 			});
 			return /* @__PURE__ */ jsxs(Fragment$1, { children: [
+				toast,
 				/* @__PURE__ */ jsxs("style", {
 					"data-dsh-claude-repository-modal-styles": true,
 					children: [
@@ -12014,12 +12782,46 @@ window.__ModuleLoader__.load({
 											})
 										})]
 									}),
-									ghComments.length > 0 && submitPrompt !== void 0 ? /* @__PURE__ */ jsxs("button", {
+									targets.length === 0 ? null : /* @__PURE__ */ jsxs("div", {
+										style: diffCommentNav,
+										children: [
+											/* @__PURE__ */ jsx("button", {
+												type: "button",
+												className: panelIconButtonClass,
+												"aria-label": t("diffCommentPrevious"),
+												title: t("diffCommentPosition", {
+													index: targetIndex + 1,
+													total: targets.length
+												}),
+												onClick: () => goToComment("ArrowUp"),
+												children: /* @__PURE__ */ jsx(IconChevronUpOutline14, {})
+											}),
+											/* @__PURE__ */ jsx("span", {
+												style: diffCommentNavCount,
+												children: t("diffCommentCounter", {
+													index: targetIndex + 1,
+													total: targets.length
+												})
+											}),
+											/* @__PURE__ */ jsx("button", {
+												type: "button",
+												className: panelIconButtonClass,
+												"aria-label": t("diffCommentNext"),
+												title: t("diffCommentPosition", {
+													index: targetIndex + 1,
+													total: targets.length
+												}),
+												onClick: () => goToComment("ArrowDown"),
+												children: /* @__PURE__ */ jsx(IconChevronDownOutline14, {})
+											})
+										]
+									}),
+									openThreadCount > 0 && submitPrompt !== void 0 ? /* @__PURE__ */ jsxs("button", {
 										type: "button",
 										style: diffPrCommentsButton,
 										title: t("prCommentsSend"),
-										"aria-label": t("prCommentsButton", { count: ghComments.length }),
-										onClick: () => submitPrompt(composeCommentsPrompt(ghComments)),
+										"aria-label": t("prCommentsButton", { count: openThreadCount }),
+										onClick: () => submitPrompt(composeCommentsPrompt(ghThreads)),
 										children: [/* @__PURE__ */ jsx("svg", {
 											width: "14",
 											height: "14",
@@ -12031,7 +12833,7 @@ window.__ModuleLoader__.load({
 											strokeLinejoin: "round",
 											"aria-hidden": "true",
 											children: /* @__PURE__ */ jsx("path", { d: "M2.75 2.75h10.5a1 1 0 0 1 1 1v6.5a1 1 0 0 1-1 1H8.2l-3.2 2.9v-2.9H2.75a1 1 0 0 1-1-1v-6.5a1 1 0 0 1 1-1Z" })
-										}), ghComments.length]
+										}), openThreadCount]
 									}) : null,
 									/* @__PURE__ */ jsx("button", {
 										type: "button",
@@ -12061,6 +12863,15 @@ window.__ModuleLoader__.load({
 								/* @__PURE__ */ jsxs("span", {
 									style: diffDelete,
 									children: ["−", diff.deletions]
+								}),
+								files.length === 0 ? null : /* @__PURE__ */ jsx("button", {
+									type: "button",
+									style: diffSummaryAction,
+									"aria-label": allFilesOpen ? t("diffCollapseAll") : t("diffExpandAll"),
+									onClick: () => {
+										setOpenFiles(new Map(files.map((file) => [file.path, !allFilesOpen])));
+									},
+									children: allFilesOpen ? t("diffCollapseAll") : t("diffExpandAll")
 								})
 							]
 						}),
@@ -12076,10 +12887,18 @@ window.__ModuleLoader__.load({
 							}) : files.map((file, index) => /* @__PURE__ */ jsx(DiffFileSection, {
 								file,
 								root: repository.root,
-								initiallyOpen: index === 0,
+								open: fileOpen(file.path, index),
+								onOpenChange: (open) => {
+									setFileOpen(file.path, open);
+								},
 								t,
 								comments: reviewComments.filter((comment) => comment.path === file.path),
-								ghComments: ghComments.filter((comment) => comment.path === file.path),
+								ghThreads: ghThreads.filter((thread) => thread.path === file.path),
+								suggestMention,
+								now: threadsLoadedAt,
+								activeTargetKey,
+								onReplyToThread: replyToThread,
+								onThreadResolvedChange: changeThreadResolved,
 								editorAnchor: commentEditor !== void 0 && commentEditor.path === file.path ? commentEditor : void 0,
 								editorNode: commentEditorNode,
 								onOpenEditor: (anchor) => openCommentEditor(file.path, anchor),
@@ -12106,17 +12925,17 @@ window.__ModuleLoader__.load({
 							},
 							disabled: dialog?.submitting === true,
 							onClick: closeDialog,
-							children: completed ? t("diffDone") : t("diffCancel")
-						}), !completed ? /* @__PURE__ */ jsx("button", {
+							children: t("diffCancel")
+						}), /* @__PURE__ */ jsx("button", {
 							type: "button",
 							style: {
 								...primaryButton,
 								...diffModalButton
 							},
-							disabled: dialog?.loading === true || dialog?.submitting === true || dialog?.preview === void 0 || dialog.action !== "push" && message.trim() === "",
+							disabled: dialog?.submitting === true || dialog?.preview === void 0 || dialog.action !== "push" && message.trim() === "",
 							onClick: () => void confirm(),
 							children: dialog?.submitting === true ? t("diffSubmitting") : t("diffConfirm")
-						}) : null]
+						})]
 					}),
 					children: [
 						dialog?.loading === true ? /* @__PURE__ */ jsx("p", {
@@ -12227,17 +13046,7 @@ window.__ModuleLoader__.load({
 											onChange: (event) => setDraft(event.currentTarget.checked)
 										}), t("diffPrDraft")]
 									})
-								] }) : null,
-								dialog.commit !== void 0 ? /* @__PURE__ */ jsx("p", {
-									style: diffModalSuccess,
-									children: dialog.action === "push" ? t("diffPushCompleted", { commit: dialog.commit.slice(0, 8) }) : t("diffCommitCompleted", { commit: dialog.commit.slice(0, 8) })
-								}) : null,
-								dialog.pullRequestUrl !== void 0 ? /* @__PURE__ */ jsx("a", {
-									href: dialog.pullRequestUrl,
-									target: "_blank",
-									rel: "noopener noreferrer",
-									children: t("diffOpenPr")
-								}) : null
+								] }) : null
 							]
 						}) : null,
 						dialog?.error !== void 0 ? /* @__PURE__ */ jsxs("p", {
@@ -12553,8 +13362,18 @@ window.__ModuleLoader__.load({
 			] });
 		}
 		function ClaudePullRequestsPanel({ t, closeDetails, openSession, loadStatus, sessions, workspaces, projectionFor }) {
-			const snapshot = useSyncExternalStore(sessions.subscribe, sessions.getSnapshot, sessions.getSnapshot);
-			const workspaceStore = workspaces ?? NO_WORKSPACES;
+			const sessionStore = useMemo(() => ({
+				subscribe: (listener) => sessions.subscribe(listener),
+				getSnapshot: () => sessions.getSnapshot()
+			}), [sessions]);
+			const snapshot = useSyncExternalStore(sessionStore.subscribe, sessionStore.getSnapshot, sessionStore.getSnapshot);
+			const workspaceStore = useMemo(() => {
+				const source = workspaces ?? NO_WORKSPACES;
+				return {
+					subscribe: (listener) => source.subscribe(listener),
+					getSnapshot: () => source.getSnapshot()
+				};
+			}, [workspaces]);
 			const workspaceState = useSyncExternalStore(workspaceStore.subscribe, workspaceStore.getSnapshot, workspaceStore.getSnapshot);
 			const rows = useMemo(() => claudeSessionRows(snapshot, workspaceState.archivedSessionIds ?? []), [snapshot, workspaceState]);
 			const cwdKey = useMemo(() => [...new Set(rows.map((row) => row.cwd ?? ""))].sort().join("\0"), [rows]);
@@ -12915,6 +13734,7 @@ window.__ModuleLoader__.load({
 		/** Selection toolbar over assistant replies: copy, or ask a follow-up whose
 		*  answer streams into a popup rendered with the Host Markdown renderer. */
 		function ClaudeSelectionAsk({ t, currentSessionId, ownsSession, insertIntoChat }) {
+			const markdownLabels = useClaudeMarkdownLabels(t);
 			const [selection, setSelection] = useState();
 			const [open, setOpen] = useState(false);
 			const [question, setQuestion] = useState("");
@@ -13196,8 +14016,9 @@ window.__ModuleLoader__.load({
 									style: askStatus,
 									children: started ? t("askThinking") : t("askStarting")
 								}) : null,
-								blocks.map((block, index) => block.kind === "text" ? /* @__PURE__ */ jsx(MarkdownText, {
+								blocks.map((block, index) => block.kind === "text" ? /* @__PURE__ */ jsx(ClaudeMarkdown, {
 									text: block.text,
+									labels: markdownLabels,
 									streaming: phase === "answering" && index === blocks.length - 1
 								}, `text-${index}`) : /* @__PURE__ */ jsxs("div", {
 									style: askToolRow,
@@ -13263,6 +14084,77 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
+		//#region src/client/composer-style-probe.ts
+		/** Watch for the plugin's composer bar and check it once for style drift.
+		*
+		*  The Host publishes the composer layout properties onto the composer subtree,
+		*  not onto `:root`. Custom properties inherit, so only an element inside that
+		*  subtree can read one — probing the document root reports every one of them
+		*  missing whether or not the Host still defines it, which is exactly the
+		*  false alarm this replaced.
+		*
+		*  The bar exists only while a Session is on screen, so this waits rather than
+		*  sampling once at boot, and stops after the first successful read: the answer
+		*  cannot change without a Host reload.
+		*
+		*  @param report - receives one line per property the bar cannot see.
+		*  @returns disposer; safe to call more than once.
+		*/
+		function watchClaudeComposerBar(report) {
+			if (typeof document === "undefined" || typeof MutationObserver === "undefined") return () => {};
+			let observer;
+			const stop = () => {
+				observer?.disconnect();
+				observer = void 0;
+			};
+			const probe = () => {
+				const bar = document.querySelector(`[${CLAUDE_COMPOSER_BAR_ATTRIBUTE}]`);
+				if (bar === null) return false;
+				const style = getComputedStyle(bar);
+				for (const finding of claudeScopedCssFindings((name) => style.getPropertyValue(name))) report(finding);
+				return true;
+			};
+			if (probe()) return stop;
+			observer = new MutationObserver(() => {
+				if (probe()) stop();
+			});
+			observer.observe(document.body, {
+				childList: true,
+				subtree: true
+			});
+			return stop;
+		}
+		function postToHost(report) {
+			fetch(CLAUDE_CLIENT_DIAGNOSTICS_PATH, {
+				method: "POST",
+				credentials: "same-origin",
+				headers: { "content-type": "application/json" },
+				body: JSON.stringify(report)
+			}).catch(() => {});
+		}
+		/** Renderer-side findings reach the Host log through here.
+		*
+		*  Nothing the renderer throws — a crashed Slot entry included — reaches the
+		*  Host log on its own, and the shipped Desktop build opens no DevTools, so a
+		*  plugin whose entries all died looks exactly like a healthy one from the
+		*  outside. Every Desktop 2.0 breakage in this package was found only by
+		*  attaching a debugger to the renderer by hand. */
+		function createClaudeDiagnosticsReporter(post = postToHost) {
+			const sent = /* @__PURE__ */ new Set();
+			return { report(kind, detail) {
+				if (sent.size >= 40) return;
+				const key = `${kind} ${detail}`;
+				if (sent.has(key)) return;
+				sent.add(key);
+				try {
+					post({
+						kind,
+						detail
+					});
+				} catch {}
+			} };
+		}
+		//#endregion
 		//#region src/client/rewind-dom.ts
 		/** Seats for the rewind control inside the Host's own message action rows.
 		*
@@ -13346,7 +14238,7 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/ClaudeRewind.tsx
 		const EMPTY_RANGES = [];
-		const EMPTY_CHAT = {
+		const EMPTY_CHAT_VIEW = {
 			chat: {
 				order: [],
 				nodes: { get: () => void 0 }
@@ -13354,7 +14246,7 @@ window.__ModuleLoader__.load({
 			running: false
 		};
 		const NO_SUBSCRIBE = () => () => {};
-		const EMPTY_CHAT_SNAPSHOT = () => EMPTY_CHAT;
+		const EMPTY_CHAT_SNAPSHOT = () => EMPTY_CHAT_VIEW;
 		const EMPTY_PROJECTION_SNAPSHOT = () => EMPTY_CLAUDE_PROJECTION;
 		/** Plain text of one user message node, matching what the copy action yields. */
 		function rewindMessageText(data) {
@@ -13673,12 +14565,6 @@ window.__ModuleLoader__.load({
 		function toggleTicketSelection(tickets, ticket) {
 			return tickets.some((item) => item.key === ticket.key) ? tickets.filter((item) => item.key !== ticket.key) : [...tickets, ticket];
 		}
-		function branchMenuNavigationIndex(current, count, key) {
-			if (count <= 0) return 0;
-			if (key === "Home") return 0;
-			if (key === "End") return count - 1;
-			return (current + (key === "ArrowDown" ? 1 : -1) + count) % count;
-		}
 		const BRANCH_LOAD_RETRIES = 2;
 		const BRANCH_LOAD_RETRY_MS = 1e3;
 		const WORKTREE_PROGRESS_STAGES = [
@@ -13842,7 +14728,7 @@ window.__ModuleLoader__.load({
 				if (event.key === "ArrowDown" || event.key === "ArrowUp" || event.key === "Home" || event.key === "End") {
 					event.preventDefault();
 					const key = event.key;
-					setActiveIndex((current) => branchMenuNavigationIndex(current, filtered.length, key));
+					setActiveIndex((current) => menuNavigationIndex(current, filtered.length, key));
 				} else if (event.key === "Enter") {
 					event.preventDefault();
 					chooseActive();
@@ -14803,9 +15689,9 @@ window.__ModuleLoader__.load({
 				if (this.#inflight !== void 0) return;
 				this.#inflight = (async () => {
 					try {
-						const response = await this.#api.list({});
-						if (!response.result.ok) return;
-						this.#rows = response.result.value.presets;
+						const response = await this.#api.list();
+						if (!response.ok) return;
+						this.#rows = response.value.presets;
 						for (const listener of this.#listeners) listener();
 					} catch {} finally {
 						this.#inflight = void 0;
@@ -15248,6 +16134,9 @@ window.__ModuleLoader__.load({
 			toolInput: "输入",
 			toolOutput: "输出",
 			toolError: "错误",
+			markdownCopy: "复制",
+			markdownCopied: "已复制",
+			markdownFootnotes: "脚注",
 			tokens: "{count} 个 token",
 			doctor: "运行诊断",
 			refreshing: "诊断中…",
@@ -15420,6 +16309,12 @@ window.__ModuleLoader__.load({
 			diffTruncated: "Diff 超出安全显示上限。请在终端中查看完整内容。",
 			diffEmpty: "没有可显示的 tracked 文件改动",
 			diffMaximize: "最大化 Diff 面板",
+			diffCommentPrevious: "上一条评论",
+			diffCommentNext: "下一条评论",
+			diffCommentPosition: "第 {index} 条，共 {total} 条",
+			diffCommentCounter: "{index}/{total}",
+			diffExpandAll: "展开全部文件",
+			diffCollapseAll: "收起全部文件",
 			diffRestore: "还原 Diff 面板",
 			diffCommit: "Commit",
 			diffCommitMenu: "打开提交操作菜单",
@@ -15430,7 +16325,7 @@ window.__ModuleLoader__.load({
 			diffPushDescription: "将本地未推送的 commit 推送到远端分支。",
 			diffPushAhead: "{count} 个未推送的 commit",
 			diffPushCompleted: "已推送 commit {commit}",
-			diffGeneratingMessage: "正在读取仓库并生成 commit message…",
+			diffGeneratingMessage: "正在生成建议的 commit message，只会填进你没写的字段。",
 			diffActionFailed: "仓库操作失败。",
 			diffIncludeUnstaged: "包含 unstaged 和 untracked 改动",
 			diffCommitMessage: "Commit message",
@@ -15448,8 +16343,8 @@ window.__ModuleLoader__.load({
 			diffSubmitting: "执行中…",
 			diffDone: "完成",
 			diffCommitCompleted: "已创建 commit {commit}",
+			diffPrCompleted: "已创建 PR，可在仓库栏打开",
 			diffCommitPreserved: "本地 commit {commit} 已保留。",
-			diffOpenPr: "打开 Pull Request",
 			diffMergePr: "Merge",
 			repositoryMergeMenu: "打开 PR 合并选项",
 			diffMerge_merge: "合并提交 (merge)",
@@ -15544,6 +16439,20 @@ window.__ModuleLoader__.load({
 			reviewCommentSubmit: "注释",
 			reviewCommentCancel: "取消",
 			reviewCommentRemove: "删除评论",
+			reviewThreadReply: "回复",
+			reviewThreadBot: "Bot",
+			reviewThreadAgo: "{age}前",
+			reviewThreadReplyTo: "回复 @{author}",
+			reviewThreadOpenOnGitHub: "在 GitHub 上打开",
+			reviewThreadSend: "发送回复",
+			reviewThreadResolve: "标记为已解决",
+			reviewThreadUnresolve: "重新打开",
+			reviewThreadResolved: "已解决",
+			reviewThreadOutdated: "已过时",
+			reviewThreadReplyPlaceholder: "回复这条评论，输入 @ 可提及成员",
+			reviewThreadMention: "提及仓库成员",
+			reviewThreadReplyFailed: "回复没有发送成功。",
+			reviewThreadResolveFailed: "线程状态没有更新成功。",
 			reviewCommentFailed: "评论操作失败。",
 			reviewCommentsClear: "清除全部评论",
 			reviewCommentsSend: "发送评论",
@@ -15585,6 +16494,9 @@ window.__ModuleLoader__.load({
 			toolInput: "Input",
 			toolOutput: "Output",
 			toolError: "Error",
+			markdownCopy: "Copy",
+			markdownCopied: "Copied",
+			markdownFootnotes: "Footnotes",
 			tokens: "{count} tokens",
 			doctor: "Run Doctor",
 			refreshing: "Running Doctor…",
@@ -15757,6 +16669,12 @@ window.__ModuleLoader__.load({
 			diffTruncated: "The diff exceeds the safe display limit. Use the terminal to inspect the complete content.",
 			diffEmpty: "No tracked file changes to display",
 			diffMaximize: "Maximize diff panel",
+			diffCommentPrevious: "Previous comment",
+			diffCommentNext: "Next comment",
+			diffCommentPosition: "Comment {index} of {total}",
+			diffCommentCounter: "{index}/{total}",
+			diffExpandAll: "Expand all files",
+			diffCollapseAll: "Collapse all files",
 			diffRestore: "Restore diff panel",
 			diffCommit: "Commit",
 			diffCommitMenu: "Open commit actions",
@@ -15767,7 +16685,7 @@ window.__ModuleLoader__.load({
 			diffPushDescription: "Push local commits to the remote branch.",
 			diffPushAhead: "{count} unpushed commit(s)",
 			diffPushCompleted: "Pushed commit {commit}",
-			diffGeneratingMessage: "Reading the repository and generating a commit message…",
+			diffGeneratingMessage: "Suggesting a commit message. It only fills the fields you leave empty.",
 			diffActionFailed: "Repository action failed.",
 			diffIncludeUnstaged: "Include unstaged and untracked changes",
 			diffCommitMessage: "Commit message",
@@ -15785,8 +16703,8 @@ window.__ModuleLoader__.load({
 			diffSubmitting: "Working…",
 			diffDone: "Done",
 			diffCommitCompleted: "Created commit {commit}",
+			diffPrCompleted: "Created the pull request — open it from the repository bar.",
 			diffCommitPreserved: "Local commit {commit} was preserved.",
-			diffOpenPr: "Open pull request",
 			diffMergePr: "Merge",
 			repositoryMergeMenu: "Open merge options",
 			diffMerge_merge: "Create a merge commit",
@@ -15881,6 +16799,20 @@ window.__ModuleLoader__.load({
 			reviewCommentSubmit: "Comment",
 			reviewCommentCancel: "Cancel",
 			reviewCommentRemove: "Remove comment",
+			reviewThreadReply: "Reply",
+			reviewThreadBot: "Bot",
+			reviewThreadAgo: "{age} ago",
+			reviewThreadReplyTo: "Reply to @{author}",
+			reviewThreadOpenOnGitHub: "Open on GitHub",
+			reviewThreadSend: "Send reply",
+			reviewThreadResolve: "Resolve",
+			reviewThreadUnresolve: "Unresolve",
+			reviewThreadResolved: "Resolved",
+			reviewThreadOutdated: "Outdated",
+			reviewThreadReplyPlaceholder: "Reply to this comment; type @ to mention someone",
+			reviewThreadMention: "Mention a repository member",
+			reviewThreadReplyFailed: "The reply could not be posted.",
+			reviewThreadResolveFailed: "The thread could not be updated.",
 			reviewCommentFailed: "The comment could not be saved.",
 			reviewCommentsClear: "Clear all comments",
 			reviewCommentsSend: "Send comments",
@@ -15926,8 +16858,11 @@ window.__ModuleLoader__.load({
 		const inject = [
 			"slots",
 			"locale",
-			"conversationEvents",
+			"remote",
+			"remote.agentPresets",
 			"sessions",
+			"uiSession",
+			"uiConversation",
 			"workspaces",
 			"inputTriggers",
 			"conversation",
@@ -15935,6 +16870,14 @@ window.__ModuleLoader__.load({
 		];
 		function apply(ctx) {
 			const namespace = "settings.claude-code";
+			const diagnostics = createClaudeDiagnosticsReporter();
+			for (const finding of claudeBootCheckFindings({
+				services: inject,
+				resolve: (name) => ctx.get(name)
+			})) diagnostics.report("boot-check", finding);
+			ctx.effect(() => watchClaudeComposerBar((finding) => {
+				diagnostics.report("boot-check", finding);
+			}), "dsh-claude: composer style drift probe");
 			ctx.effect(() => ctx.locale.register(namespace, {
 				zh,
 				en
@@ -15947,6 +16890,7 @@ window.__ModuleLoader__.load({
 			const workspaces = ctx.get("workspaces");
 			const conversation = ctx.get("conversation");
 			const connection = ctx.get("connection");
+			const remote = ctx.get("remote");
 			/** Composer submit hook shared by the repository feedback affordances.
 			*  'append' keeps any user draft and adds the prompt below it; 'idle'
 			*  submits only when the composer is empty and reports false otherwise. */
@@ -15964,14 +16908,18 @@ window.__ModuleLoader__.load({
 					return true;
 				};
 			};
-			if (sessions !== void 0) ctx.effect(() => sessions.provide({
+			const uiSession = ctx.get("uiSession");
+			if (uiSession !== void 0) ctx.effect(() => uiSession.provide({
 				hooks: ["claudeProjection"],
 				resolve: (binding) => ({ hooks: { claudeProjection: projections.source(binding.sessionId) } })
 			}), "dsh-claude: sidecar projection provider");
 			ctx.effect(() => () => projections.dispose(), "dsh-claude: sidecar projection lifecycle");
-			ctx.effect(() => ctx.conversationEvents.register(claudeTurnDefinition), "dsh-claude: Claude turn marker");
-			ctx.effect(() => ctx.conversationEvents.register(claudeActivityStepDefinition), "dsh-claude: Claude activity flow node");
-			ctx.effect(() => ctx.conversationEvents.register(claudeActiveTasksDefinition), "dsh-claude: active Claude tasks node");
+			const uiConversation = ctx.get("uiConversation");
+			if (uiConversation !== void 0) {
+				ctx.effect(() => uiConversation.events.register(claudeTurnDefinition), "dsh-claude: Claude turn marker");
+				ctx.effect(() => uiConversation.events.register(claudeActivityStepDefinition), "dsh-claude: Claude activity flow node");
+				ctx.effect(() => uiConversation.events.register(claudeActiveTasksDefinition), "dsh-claude: active Claude tasks node");
+			}
 			ctx.slots.inject("conversation.chat.node", () => ctx.slots.register({
 				name: "conversation.chat.node",
 				key: "claude-activity-step",
@@ -16002,9 +16950,13 @@ window.__ModuleLoader__.load({
 				diffOpen.close();
 				layout?.closeDetails();
 			};
-			ctx.effect(() => ctx.slots.onEntryError((key, entry) => {
+			ctx.effect(() => ctx.slots.onEntryError((key, entry, error) => {
+				const id = entry.options.id === void 0 ? "" : ` id="${String(entry.options.id)}"`;
+				const message = error instanceof Error ? `${error.message}
+		${error.stack ?? ""}` : String(error);
+				diagnostics.report("slot-entry-crashed", `slot "${key}"${id}: ${message}`);
 				if (key === "shell.overlay" && entry.options.id === "claude-diff-overlay") restoreDiff();
-			}), "dsh-claude: diff overlay recovery");
+			}), "dsh-claude: Slot entry failure reporting");
 			const openTasksPanel = (sessionId, turn) => {
 				closePluginDetails();
 				try {
@@ -16141,8 +17093,8 @@ window.__ModuleLoader__.load({
 					openTasks: (turn) => openTasksPanel(sessionId, turn)
 				})
 			}, ClaudeActivityTail));
-			if (connection !== void 0) {
-				const roster = new AgentPresetRoster(connection.api.agentPresets);
+			if (remote !== void 0) {
+				const roster = new AgentPresetRoster(remote.agentPresets);
 				const hostT = ctx.locale.bind("settings.agentPreset");
 				ctx.slots.inject("conversation.session.header.actions", () => ctx.slots.register({
 					name: "conversation.session.header.actions",
@@ -16236,12 +17188,59 @@ window.__ModuleLoader__.load({
 					input.setDraft(current.trim() === "" ? text : `${current}\n\n${text}`);
 				} }
 			})));
+			/** Compose the chat view the rewind control reads.
+			*
+			*  Desktop 2.0 split what used to be one Session snapshot: the Controller's
+			*  `binding.session` kept `running`, while the assembled Chat nodes moved to
+			*  the Conversation binding's 'chat' target. Reading the old combined shape
+			*  threw on `snapshot.chat.order` and took the whole overlay entry down. */
+			const chatSourceCache = /* @__PURE__ */ new Map();
+			const claudeChatSource = (sessionId) => {
+				const cached = chatSourceCache.get(sessionId);
+				if (cached !== void 0) return cached;
+				if (sessions === void 0 || uiConversation === void 0) return void 0;
+				const session = sessions.binding(sessionId)?.session;
+				if (session === void 0) return void 0;
+				let chatTarget;
+				try {
+					chatTarget = uiConversation.binding(sessionId).target("chat");
+				} catch {
+					return;
+				}
+				let lastChat;
+				let lastRunning;
+				let view = EMPTY_CHAT_VIEW;
+				const source = {
+					subscribe(listener) {
+						const dropChat = chatTarget.subscribe(listener);
+						const dropSession = session.subscribe(listener);
+						return () => {
+							dropChat();
+							dropSession();
+						};
+					},
+					getSnapshot() {
+						const chat = chatTarget.getSnapshot();
+						const running = session.getSnapshot().running === true;
+						if (chat === lastChat && running === lastRunning) return view;
+						lastChat = chat;
+						lastRunning = running;
+						view = chat === void 0 ? EMPTY_CHAT_VIEW : {
+							chat,
+							running
+						};
+						return view;
+					}
+				};
+				chatSourceCache.set(sessionId, source);
+				return source;
+			};
 			if (sessions !== void 0) {
 				const rewind = {
 					t,
 					currentSessionId: () => sessions.list.getSnapshot().current,
 					subscribeSessions: (listener) => sessions.list.subscribe(listener),
-					chatOf: (sessionId) => sessions.binding(sessionId)?.session,
+					chatOf: (sessionId) => claudeChatSource(sessionId),
 					projectionOf: (sessionId) => projections.source(sessionId),
 					...conversation === void 0 ? {} : { setDraft: (sessionId, text) => {
 						const scope = sessions.scope(sessionId);
@@ -16273,7 +17272,7 @@ window.__ModuleLoader__.load({
 					};
 				}
 			}, ClaudeQueueDock));
-			if (sessions !== void 0 && workspaces !== void 0 && conversation !== void 0 && connection !== void 0) {
+			if (sessions !== void 0 && workspaces !== void 0 && conversation !== void 0 && connection !== void 0 && remote !== void 0) {
 				/** Attach a prepared worktree to its session without blocking the flow. */
 				const bindLease = (leaseId, targetSessionId) => {
 					if (leaseId === void 0) return;
@@ -16310,12 +17309,9 @@ window.__ModuleLoader__.load({
 							const targetSessionId = await workspaces.connectWorkspace(workspace.workspaceId);
 							const targetScope = sessions.scope(targetSessionId);
 							if (targetScope === void 0) throw new Error(t("repositorySessionUnavailable"));
-							const presetResponse = await connection.api.agentPresets.select({
-								sessionId: targetSessionId,
-								agentPreset: "claude"
-							});
-							if (!presetResponse.result.ok) throw new Error(presetResponse.result.error.message);
-							sessions.noteAgentPreset(targetSessionId, presetResponse.result.value.agentPreset);
+							const presetResponse = await remote.agentPresets.select(targetSessionId, "claude");
+							if (!presetResponse.ok) throw new Error(presetResponse.error.message);
+							sessions.noteAgentPreset(targetSessionId, presetResponse.value);
 							const targetInput = conversation.input.for(targetScope);
 							onProgress("transferring-draft");
 							if (imageIds.length > 0 && !targetInput.addImages(imageIds)) throw new Error(t("repositoryDraftTransferFailed"));
@@ -16354,12 +17350,9 @@ window.__ModuleLoader__.load({
 									const targetSessionId = await workspaces.connectWorkspace(workspace.workspaceId);
 									const targetScope = sessions.scope(targetSessionId);
 									if (targetScope === void 0) throw new Error(t("repositorySessionUnavailable"));
-									const presetResponse = await connection.api.agentPresets.select({
-										sessionId: targetSessionId,
-										agentPreset: "claude"
-									});
-									if (!presetResponse.result.ok) throw new Error(presetResponse.result.error.message);
-									sessions.noteAgentPreset(targetSessionId, presetResponse.result.value.agentPreset);
+									const presetResponse = await remote.agentPresets.select(targetSessionId, "claude");
+									if (!presetResponse.ok) throw new Error(presetResponse.error.message);
+									sessions.noteAgentPreset(targetSessionId, presetResponse.value);
 									const targetInput = conversation.input.for(targetScope);
 									report("transferring-draft");
 									targetInput.setDraft(rawDraft.trim() === "" ? ticketPrompt(ticket) : `${rawDraft.trimEnd()}\n\n${ticketContext(ticket)}`);