@norman-else/dsh-claude 0.1.42 → 0.1.44

package/lib/client.d.ts

@@ -292,6 +292,24 @@ declare const en: {
   readonly diffUpdateBranchCompleted: "Updated and pushed commit {commit}";
   readonly diffUpdateBranchConflicts: "The update left conflicts in these files:";
   readonly diffUpdateBranchResolve: "Have Claude resolve the conflicts";
+  readonly conflictTitle: "Resolve conflicts";
+  readonly conflictOperation_rebase: "Rebase";
+  readonly conflictOperation_merge: "Merge";
+  readonly 'conflictOperation_cherry-pick': "Cherry-pick";
+  readonly conflictOperation_revert: "Revert";
+  readonly conflictBadge: "{operation}: {count} conflict(s)";
+  readonly conflictBadgeReady: "Continue {operation}";
+  readonly conflictDescription: "The {operation} is unfinished. Resolve the conflicts and continue, or abort to return to the state before it.";
+  readonly conflictFiles: "These files conflict and must be resolved and staged:";
+  readonly conflictReady: "Every conflict is resolved. The operation can continue.";
+  readonly conflictResolve: "Have Claude resolve the conflicts";
+  readonly conflictContinue: "Continue {operation}";
+  readonly conflictAbort: "Abort {operation}";
+  readonly conflictAbortConfirm: "Press \"Abort {operation}\" again to confirm: work done during the {operation} is discarded.";
+  readonly conflictPush: "Push once it finishes";
+  readonly conflictContinued: "{operation} finished";
+  readonly conflictPushed: "{operation} finished and pushed";
+  readonly conflictAborted: "Aborted the {operation}";
   readonly repositoryChecksOpen: "Show failing checks";
   readonly checksCardTitle: "Failing checks";
   readonly checksCardLoading: "Loading check details…";

package/lib/client.js

@@ -352,6 +352,22 @@ window.__ModuleLoader__.load({
 		function nativelyRenderedStep(activities, turn, step) {
 			return activities.some((activity) => activity.turn === turn && activity.step === step && activity.renderer === "native");
 		}
+		/** The turn's own accounting, drawn as a footer.
+		*
+		*  It hangs off the turn rather than the step that reported it: a turn waiting
+		*  on background tasks reports usage per settled segment, and the task badge
+		*  the plugin draws at the turn's foot would otherwise sit *under* a line that
+		*  reads as a closing total. Every report is cumulative, so the newest one
+		*  supersedes the ones before it. Natively drawn steps keep the Host's footer.
+		*/
+		function latestTurnUsage(activities, turn) {
+			let latest;
+			for (const activity of activities) {
+				if (activity.turn !== turn || activity.kind !== "usage" || activity.renderer === "native") continue;
+				if (activity.usage !== void 0) latest = activity.usage;
+			}
+			return latest;
+		}
 		/** Fold one step's shared ordinal stream into Claude Code-style prose and tool groups. */
 		function transcriptItemsForStep(activities, turn, step, tasks = []) {
 			if (nativelyRenderedStep(activities, turn, step)) return [];
@@ -413,15 +429,6 @@ window.__ModuleLoader__.load({
 					});
 					continue;
 				}
-				if (activity.kind === "usage" && activity.usage !== void 0) {
-					flushGroup();
-					items.push({
-						kind: "usage",
-						ordinal: activity.ordinal,
-						usage: activity.usage
-					});
-					continue;
-				}
 				if (activity.kind === "tool-call" && activity.toolUseId !== void 0 && activity.toolName !== void 0) {
 					group ??= {
 						ordinal: activity.ordinal,
@@ -2234,6 +2241,14 @@ window.__ModuleLoader__.load({
 			whiteSpace: "nowrap",
 			cursor: "pointer"
 		};
+		/** A stopped rebase is the one bar control that reports a blocked checkout
+		*  rather than an available action, so it carries the warning tone. */
+		const repositoryConflictTrigger = {
+			...repositoryUpdateTrigger,
+			borderColor: "color-mix(in srgb, var(--dsw-alias-state-warning-primary, #d69e2e) 55%, transparent)",
+			background: "color-mix(in srgb, var(--dsw-alias-state-warning-primary, #d69e2e) 14%, transparent)",
+			color: "var(--dsw-alias-state-warning-primary, #d69e2e)"
+		};
 		const repositoryChecksFrame = {
 			position: "relative",
 			display: "inline-flex",
@@ -4350,6 +4365,7 @@ window.__ModuleLoader__.load({
 		const MAX_COMMANDS = 2e3;
 		const MAX_REPOSITORY_TEXT_CHARS = 1024;
 		const MAX_DIFF_CHARS = 262144;
+		const MAX_CONFLICT_PATHS = 100;
 		const MAX_REVIEW_COMMENTS = 50;
 		const MAX_REVIEW_COMMENT_CHARS = 2e3;
 		const MAX_TRANSCRIPT_CHARS = 64e3;
@@ -4368,7 +4384,12 @@ window.__ModuleLoader__.load({
 				"ready",
 				"not-repository",
 				"unavailable"
-			].includes(String(repository.status)) || typeof repository.cwd !== "string" || repository.cwd.length > MAX_REPOSITORY_TEXT_CHARS || !optionalBoundedString(repository.root) || !optionalBoundedString(repository.branch) || !optionalBoundedString(repository.remote) || repository.detached !== void 0 && typeof repository.detached !== "boolean" || repository.worktree !== void 0 && typeof repository.worktree !== "boolean" || repository.dirty !== void 0 && typeof repository.dirty !== "boolean" || repository.upstream !== void 0 && typeof repository.upstream !== "boolean" || repository.ahead !== void 0 && !nonNegativeInteger(repository.ahead) || repository.behind !== void 0 && !nonNegativeInteger(repository.behind)) return false;
+			].includes(String(repository.status)) || typeof repository.cwd !== "string" || repository.cwd.length > MAX_REPOSITORY_TEXT_CHARS || !optionalBoundedString(repository.root) || !optionalBoundedString(repository.branch) || !optionalBoundedString(repository.remote) || repository.detached !== void 0 && typeof repository.detached !== "boolean" || repository.worktree !== void 0 && typeof repository.worktree !== "boolean" || repository.dirty !== void 0 && typeof repository.dirty !== "boolean" || repository.upstream !== void 0 && typeof repository.upstream !== "boolean" || repository.ahead !== void 0 && !nonNegativeInteger(repository.ahead) || repository.behind !== void 0 && !nonNegativeInteger(repository.behind) || repository.operation !== void 0 && ![
+				"rebase",
+				"merge",
+				"cherry-pick",
+				"revert"
+			].includes(String(repository.operation)) || repository.conflicts !== void 0 && (!Array.isArray(repository.conflicts) || repository.conflicts.length > MAX_CONFLICT_PATHS || repository.conflicts.some((path) => typeof path !== "string" || path.length > MAX_REPOSITORY_TEXT_CHARS))) return false;
 			if (repository.diff !== void 0) {
 				const diff = record$7(repository.diff);
 				if (diff === void 0 || !nonNegativeInteger(diff.additions) || !nonNegativeInteger(diff.deletions) || !nonNegativeInteger(diff.files) || typeof diff.truncated !== "boolean" || diff.patch !== void 0 && (typeof diff.patch !== "string" || diff.patch.length > MAX_DIFF_CHARS)) return false;
@@ -5379,8 +5400,10 @@ window.__ModuleLoader__.load({
 			return parts;
 		}
 		/** The footer the Host draws under its own assistant message, drawn here for
-		*  the steps the Host never had a message for. */
+		*  the steps the Host never had a message for. Mounted at the turn's foot, so
+		*  it closes the turn under the task badge rather than above it. */
 		function ClaudeTurnUsage({ usage, t }) {
+			ensureCss$4();
 			const parts = turnUsageParts(usage, t);
 			if (parts.length === 0) return null;
 			return /* @__PURE__ */ jsxs("div", {
@@ -5422,10 +5445,7 @@ window.__ModuleLoader__.load({
 				}, `text:${item.ordinal}`) : item.kind === "compaction" ? /* @__PURE__ */ jsx(ClaudeCompactionDivider, {
 					compaction: item.compaction,
 					t
-				}, `compaction:${item.ordinal}`) : item.kind === "usage" ? /* @__PURE__ */ jsx(ClaudeTurnUsage, {
-					usage: item.usage,
-					t
-				}, `usage:${item.ordinal}`) : item.kind === "tools" ? /* @__PURE__ */ jsx(ClaudeTranscriptToolGroup, {
+				}, `compaction:${item.ordinal}`) : item.kind === "tools" ? /* @__PURE__ */ jsx(ClaudeTranscriptToolGroup, {
 					tools: item.tools,
 					...item.additions === void 0 ? {} : { additions: item.additions },
 					...item.deletions === void 0 ? {} : { deletions: item.deletions },
@@ -5720,6 +5740,7 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/ClaudeActivityTail.tsx
 		const MAX_HOVER_TASKS = 6;
+		const EMPTY_TASKS = [];
 		function taskGlyph(status) {
 			if (status === "failed") return {
 				glyph: "×",
@@ -5842,24 +5863,36 @@ window.__ModuleLoader__.load({
 				})
 			});
 		}
+		/** Everything that closes a turn, in the order it reads: what the turn is
+		*  still doing, then what it cost. */
+		function ClaudeTurnFooter({ turn, useClaudeProjection, t, openTasks }) {
+			const tasks = useClaudeProjection((value) => value.tasks?.tasks ?? EMPTY_TASKS);
+			const usage = useClaudeProjection((value) => latestTurnUsage(value.activities, turn));
+			return /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(ClaudeTaskLauncher, {
+				turn,
+				tasks,
+				t,
+				openTasks
+			}), usage === void 0 ? null : /* @__PURE__ */ jsx(ClaudeTurnUsage, {
+				usage,
+				t
+			})] });
+		}
 		function ClaudeActivityTail({ matched, useClaudeProjection, t, openTasks }) {
-			const tasks = useClaudeProjection((value) => value.tasks?.tasks ?? []);
-			return /* @__PURE__ */ jsx(ClaudeTaskLauncher, {
+			return /* @__PURE__ */ jsx(ClaudeTurnFooter, {
 				turn: matched.turn,
-				tasks,
+				useClaudeProjection,
 				t,
 				openTasks
 			});
 		}
 		//#endregion
 		//#region src/client/ClaudeActiveTasksNode.tsx
-		const EMPTY_TASKS = [];
-		/** Render the task launcher while the owning DSH turn is still open. */
+		/** Render the turn footer while the owning DSH turn is still open. */
 		function ClaudeActiveTasksNode({ node, useClaudeProjection, t, openTasks }) {
-			const tasks = useClaudeProjection((value) => value.tasks?.tasks ?? EMPTY_TASKS);
-			return /* @__PURE__ */ jsx(ClaudeTaskLauncher, {
+			return /* @__PURE__ */ jsx(ClaudeTurnFooter, {
 				turn: node.data.turn,
-				tasks,
+				useClaudeProjection,
 				t,
 				openTasks
 			});
@@ -5977,6 +6010,22 @@ window.__ModuleLoader__.load({
 			}
 			return checks;
 		}
+		/** Review bots sign a comment with an attribution line and an actions checklist
+		*  aimed at the bot itself; in a prompt both are noise, and "apply fix" reads as
+		*  an instruction Claude cannot follow. */
+		function commentText(body) {
+			const lines = body.replaceAll(/<!--[\s\S]*?-->/g, "").split("\n").filter((line) => !/^\s*<sup>[\s\S]*<\/sup>\s*$/.test(line));
+			let end = lines.length;
+			while (end > 0 && /^\s*(?:-{3,}|\*\*[^*]+\*\*|[-*] \[[ xX]\].*)?\s*$/.test(lines[end - 1] ?? "")) end -= 1;
+			return (lines.slice(end).some((line) => /^\s*[-*] \[[ xX]\]/.test(line)) ? lines.slice(0, end) : lines).join("\n").trim();
+		}
+		/** A one-line comment sits after the author; anything longer starts on its own
+		*  line, so its headings and lists keep meaning instead of running into ours. */
+		function attributed(prefix, body) {
+			const text = commentText(body);
+			const indented = text.split("\n").map((line) => line.length === 0 ? line : `  ${line}`).join("\n");
+			return text.includes("\n") ? `${prefix}\n\n${indented}` : `${prefix} ${text}`;
+		}
 		/** 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. */
@@ -5986,8 +6035,8 @@ window.__ModuleLoader__.load({
 			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")}`;
+				return [attributed(`- ${`${thread.path}${thread.line === void 0 ? "" : `:${thread.line}`}`} (@${first.author}):`, first.body), ...rest.map((reply) => attributed(`  (@${reply.author}):`, reply.body))].join("\n");
+			}).filter((block) => block.length > 0).join("\n\n")}`;
 		}
 		/** Draft handed to Claude when the user forwards failing CI checks. */
 		function composeChecksPrompt(checks) {
@@ -5995,11 +6044,13 @@ window.__ModuleLoader__.load({
 				return `${`## ${check.name}${check.link === void 0 ? "" : ` (${check.link})`}`}${check.description === void 0 ? "" : `\n${check.description}`}${check.log === void 0 ? "" : `\n\n\`\`\`\n${check.log}\n\`\`\``}`;
 			}).join("\n\n")}`;
 		}
-		/** Draft handed to Claude after an update-branch merge left conflicts behind. */
-		function composeConflictsPrompt(baseBranch, conflicts, method = "merge") {
+		/** Draft handed to Claude for a stopped merge, rebase, cherry-pick or revert --
+		*  from the update-branch dialog that caused one, or from the repository bar
+		*  for one already in the tree, where the base branch is not always known. */
+		function composeConflictsPrompt(conflicts, operation = "merge", baseBranch) {
 			const list = conflicts.map((file) => `- ${file}`).join("\n");
-			if (method === "rebase") return `Rebasing the current branch onto origin/${baseBranch} stopped on conflicts in the files below. Resolve each conflict preserving the intent of both sides, stage the files, run \`git rebase --continue\` until the rebase finishes, then push with \`git push --force-with-lease\`.\n\n${list}`;
-			return `Merging origin/${baseBranch} into the current branch left merge conflicts in the files below. Resolve each conflict preserving the intent of both sides, then commit the merge.\n\n${list}`;
+			const base = baseBranch === void 0 ? void 0 : `origin/${baseBranch}`;
+			return `${operation === "rebase" ? `Rebasing the current branch${base === void 0 ? "" : ` onto ${base}`} stopped on conflicts in the files below.` : operation === "merge" ? `Merging ${base ?? "the base branch"} into the current branch left conflicts in the files below.` : `A ${operation} stopped on conflicts in the files below.`} Resolve each conflict preserving the intent of both sides, stage the resolved files, then run \`git ${operation} --continue\` until the ${operation} finishes.${operation === "rebase" && baseBranch !== void 0 ? " Once it finishes, push with `git push --force-with-lease`." : ""}\n\n${list}`;
 		}
 		//#endregion
 		//#region src/client/auto-fix.ts
@@ -6054,6 +6105,15 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
+		//#region src/client/branch-label.ts
+		/** `Detached HEAD` names a git implementation detail, not the user's checkout:
+		*  a stopped rebase still knows which branch it parked, and that name is what
+		*  every panel should show. Only a genuinely nameless HEAD falls back. */
+		function branchLabel(repository, t) {
+			if (repository.branch !== void 0) return repository.branch;
+			return repository.detached === true ? t("repositoryDetached") : t("repositoryUnknownBranch");
+		}
+		//#endregion
 		//#region src/client/session-preset.ts
 		/**
 		* Resolve one row's preset id, newest seat first.
@@ -6191,7 +6251,7 @@ window.__ModuleLoader__.load({
 						}) : rows.map((row) => {
 							const repository = row.cwd === void 0 ? void 0 : statuses[row.cwd];
 							const pullRequest = repository?.pullRequest;
-							const branch = repository?.status === "ready" ? repository.detached === true ? t("repositoryDetached") : repository.branch ?? t("repositoryUnknownBranch") : repository === void 0 ? t("overviewLoading") : t("repositoryUnavailable");
+							const branch = repository?.status === "ready" ? branchLabel(repository, t) : repository === void 0 ? t("overviewLoading") : t("repositoryUnavailable");
 							return /* @__PURE__ */ jsxs("button", {
 								type: "button",
 								style: overviewRow,
@@ -8592,6 +8652,169 @@ window.__ModuleLoader__.load({
 				}) : null]
 			});
 		}
+		/** The way out of a stopped merge or rebase. A rebase detaches HEAD, which
+		*  hides every other control on this bar, and the update-branch dialog that
+		*  started it takes its conflict list along when it closes -- so this one is
+		*  mounted from repository state instead, and survives being dismissed. */
+		function ConflictControl({ sessionId, repository, t, report, submitPrompt }) {
+			const [dialog, setDialog] = useState();
+			const operation = repository.operation;
+			if (operation === void 0) return null;
+			const conflicts = repository.conflicts ?? [];
+			const operationName = t(`conflictOperation_${operation}`);
+			const closeDialog = () => {
+				if (dialog?.submitting !== true) setDialog(void 0);
+			};
+			const run = (action) => {
+				if (dialog === void 0 || dialog.submitting) return;
+				const { error: _error, ...pending } = dialog;
+				setDialog({
+					...pending,
+					submitting: true
+				});
+				executeRepositoryAction(sessionId, {
+					action,
+					fingerprint: "",
+					message: "",
+					includeUnstaged: false,
+					push: dialog.push
+				}).then((result) => {
+					if (result.conflicts !== void 0 && result.conflicts.length > 0) {
+						setDialog({
+							...pending,
+							submitting: false,
+							confirmAbort: false
+						});
+						return;
+					}
+					report(action === "resolve-abort" ? t("conflictAborted", { operation: operationName }) : t(result.pushed ? "conflictPushed" : "conflictContinued", { operation: operationName }));
+					setDialog(void 0);
+				}, (reason) => {
+					setDialog({
+						...pending,
+						submitting: false,
+						error: reason instanceof Error ? reason.message : t("diffActionFailed")
+					});
+				});
+			};
+			const openDialog = () => {
+				setDialog({
+					submitting: false,
+					confirmAbort: false,
+					push: repository.remote !== void 0 && repository.pullRequest?.state === "open"
+				});
+			};
+			return /* @__PURE__ */ jsxs(Fragment$1, { children: [
+				/* @__PURE__ */ jsx("button", {
+					type: "button",
+					style: repositoryConflictTrigger,
+					title: t("conflictDescription", { operation: operationName }),
+					onClick: openDialog,
+					children: conflicts.length > 0 ? t("conflictBadge", {
+						operation: operationName,
+						count: conflicts.length
+					}) : t("conflictBadgeReady", { operation: operationName })
+				}),
+				dialog === void 0 ? null : /* @__PURE__ */ jsx("style", {
+					"data-dsh-claude-repository-modal-styles": true,
+					children: diffModalCss
+				}),
+				/* @__PURE__ */ jsx(Modal, {
+					className: "dshClaudeRepositoryActionModal",
+					contentClassName: "dshClaudeRepositoryActionModalContent",
+					open: dialog !== void 0,
+					onClose: closeDialog,
+					title: t("conflictTitle"),
+					closeLabel: t("diffCancel"),
+					description: t("conflictDescription", { operation: operationName }),
+					footer: /* @__PURE__ */ jsxs("div", {
+						style: diffModalFooter,
+						children: [/* @__PURE__ */ jsx("button", {
+							type: "button",
+							style: {
+								...button,
+								...diffModalButton
+							},
+							disabled: dialog?.submitting === true,
+							onClick: () => {
+								if (dialog?.confirmAbort === true) run("resolve-abort");
+								else setDialog((current) => current === void 0 ? current : {
+									...current,
+									confirmAbort: true
+								});
+							},
+							children: t("conflictAbort", { operation: operationName })
+						}), /* @__PURE__ */ jsx("button", {
+							type: "button",
+							style: {
+								...primaryButton,
+								...diffModalButton
+							},
+							disabled: dialog?.submitting === true || conflicts.length > 0,
+							onClick: () => run("resolve-continue"),
+							children: dialog?.submitting === true ? t("diffSubmitting") : t("conflictContinue", { operation: operationName })
+						})]
+					}),
+					children: dialog === void 0 ? null : /* @__PURE__ */ jsxs("div", {
+						style: diffModalBody,
+						children: [
+							/* @__PURE__ */ jsxs("div", {
+								style: diffModalMeta,
+								children: [/* @__PURE__ */ jsxs("strong", {
+									style: diffModalMetaText,
+									children: [
+										operationName,
+										" · ",
+										branchLabel(repository, t)
+									]
+								}), /* @__PURE__ */ jsx("span", {
+									style: diffModalFileState,
+									children: conflicts.length > 0 ? t("conflictFiles") : t("conflictReady")
+								})]
+							}),
+							conflicts.length === 0 ? null : /* @__PURE__ */ jsx("ul", {
+								style: diffModalConflicts,
+								children: conflicts.map((file) => /* @__PURE__ */ jsx("li", { children: file }, file))
+							}),
+							conflicts.length === 0 || submitPrompt === void 0 ? null : /* @__PURE__ */ jsx("button", {
+								type: "button",
+								style: diffModalConflictResolve,
+								onClick: () => {
+									submitPrompt(composeConflictsPrompt(conflicts, operation, repository.pullRequest?.baseBranch));
+									closeDialog();
+								},
+								children: t("conflictResolve")
+							}),
+							repository.remote === void 0 ? null : /* @__PURE__ */ jsxs("label", {
+								style: diffModalCheckbox,
+								children: [/* @__PURE__ */ jsx("input", {
+									type: "checkbox",
+									checked: dialog.push,
+									disabled: dialog.submitting,
+									onChange: (event) => {
+										const { checked } = event.currentTarget;
+										setDialog((current) => current === void 0 ? current : {
+											...current,
+											push: checked
+										});
+									}
+								}), t("conflictPush")]
+							}),
+							!dialog.confirmAbort ? null : /* @__PURE__ */ jsx("p", {
+								role: "alert",
+								style: diffModalStatus,
+								children: t("conflictAbortConfirm", { operation: operationName })
+							}),
+							dialog.error === void 0 ? null : /* @__PURE__ */ jsx("p", {
+								role: "alert",
+								style: diffModalError,
+								children: dialog.error
+							})
+						]
+					})
+				})
+			] });
+		}
 		/** The trigger only shows on a clean branch that is behind its base -- but a
 		*  conflicted rebase leaves the tree dirty on a detached HEAD, so an open
 		*  dialog (and its resolve button) has to outlive that. */
@@ -8763,7 +8986,7 @@ window.__ModuleLoader__.load({
 									type: "button",
 									style: diffModalConflictResolve,
 									onClick: () => {
-										submitPrompt(composeConflictsPrompt(base, dialog.conflicts ?? [], method));
+										submitPrompt(composeConflictsPrompt(dialog.conflicts ?? [], method, base));
 										closeDialog();
 									},
 									children: t("diffUpdateBranchResolve")
@@ -9034,7 +9257,7 @@ window.__ModuleLoader__.load({
 			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 branch = branchLabel(repository, t);
 			const pullRequest = repository.pullRequest;
 			const merged = pullRequest?.state === "merged";
 			const mergedAge = merged ? relativeAge(pullRequest.mergedAt) : void 0;
@@ -9106,79 +9329,89 @@ window.__ModuleLoader__.load({
 						}) : null,
 						/* @__PURE__ */ jsxs("span", {
 							style: repositoryStatusItems,
-							children: [hasDiff || pushable ? /* @__PURE__ */ jsxs("button", {
-								type: "button",
-								style: {
-									...diffTrigger,
-									...merged ? diffTriggerMuted : {}
-								},
-								onClick: openDiff,
-								"aria-label": t("diffOpen"),
-								children: [hasDiff && repository.diff !== void 0 ? /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsxs("span", {
-									style: merged ? diffAddMuted : diffAdd,
-									children: ["+", repository.diff.additions]
-								}), /* @__PURE__ */ jsxs("span", {
-									style: merged ? diffDeleteMuted : diffDelete,
-									children: ["−", repository.diff.deletions]
-								})] }) : null, pushable ? /* @__PURE__ */ jsxs("span", {
-									style: merged ? diffAheadMuted : diffAhead,
-									children: ["↑", aheadCount > 0 ? aheadCount : ""]
-								}) : null]
-							}) : null, pullRequest === void 0 ? null : merged ? /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsxs("span", {
-								style: repositoryMergedStatus,
-								children: [
-									/* @__PURE__ */ jsx("span", {
-										style: repositoryMergedDot,
-										"aria-hidden": "true"
-									}),
-									t("repositoryState_merged"),
-									mergedAge === void 0 ? null : /* @__PURE__ */ jsxs("span", {
-										style: repositoryMergedAge,
-										children: ["· ", t("repositoryMergedAgo", { age: mergedAge })]
-									})
-								]
-							}), /* @__PURE__ */ jsx(CleanupControl, {
-								repository,
-								t,
-								report,
-								...deleteWorkspace === void 0 ? {} : { deleteWorkspace }
-							})] }) : /* @__PURE__ */ jsxs(Fragment$1, { children: [
-								pullRequest.checks === "failing" ? /* @__PURE__ */ jsx(FailingChecksControl, {
-									sessionId,
-									pullNumber: pullRequest.number,
-									t,
-									...submitPrompt === void 0 ? {} : { submitPrompt }
-								}) : pullRequest.checks === "none" ? null : /* @__PURE__ */ jsx(StatusGlyph, {
-									label: t(`repositoryChecks_${pullRequest.checks}`),
-									tone: pullRequest.checks === "passing" ? "success" : "warning",
-									children: /* @__PURE__ */ jsx(ChecksGlyph, { state: pullRequest.checks })
-								}),
-								pullRequest.review === "none" ? null : /* @__PURE__ */ jsx(StatusGlyph, {
-									label: t(`repositoryReview_${pullRequest.review}`),
-									tone: pullRequest.review === "approved" ? "success" : pullRequest.review === "changes-requested" ? "error" : "neutral",
-									children: /* @__PURE__ */ jsx(ReviewGlyph, {})
-								}),
-								/* @__PURE__ */ jsx(AutoFixControl, {
-									sessionId,
-									repository,
-									running,
-									t,
-									...submitPrompt === void 0 ? {} : { submitPrompt }
-								}),
-								/* @__PURE__ */ jsx(UpdateBranchControl, {
+							children: [
+								/* @__PURE__ */ jsx(ConflictControl, {
 									sessionId,
 									repository,
 									t,
 									report,
 									...submitPrompt === void 0 ? {} : { submitPrompt }
 								}),
-								/* @__PURE__ */ jsx(MergePullRequestControl, {
-									sessionId,
+								hasDiff || pushable ? /* @__PURE__ */ jsxs("button", {
+									type: "button",
+									style: {
+										...diffTrigger,
+										...merged ? diffTriggerMuted : {}
+									},
+									onClick: openDiff,
+									"aria-label": t("diffOpen"),
+									children: [hasDiff && repository.diff !== void 0 ? /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsxs("span", {
+										style: merged ? diffAddMuted : diffAdd,
+										children: ["+", repository.diff.additions]
+									}), /* @__PURE__ */ jsxs("span", {
+										style: merged ? diffDeleteMuted : diffDelete,
+										children: ["−", repository.diff.deletions]
+									})] }) : null, pushable ? /* @__PURE__ */ jsxs("span", {
+										style: merged ? diffAheadMuted : diffAhead,
+										children: ["↑", aheadCount > 0 ? aheadCount : ""]
+									}) : null]
+								}) : null,
+								pullRequest === void 0 ? null : merged ? /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsxs("span", {
+									style: repositoryMergedStatus,
+									children: [
+										/* @__PURE__ */ jsx("span", {
+											style: repositoryMergedDot,
+											"aria-hidden": "true"
+										}),
+										t("repositoryState_merged"),
+										mergedAge === void 0 ? null : /* @__PURE__ */ jsxs("span", {
+											style: repositoryMergedAge,
+											children: ["· ", t("repositoryMergedAgo", { age: mergedAge })]
+										})
+									]
+								}), /* @__PURE__ */ jsx(CleanupControl, {
 									repository,
 									t,
-									report
-								})
-							] })]
+									report,
+									...deleteWorkspace === void 0 ? {} : { deleteWorkspace }
+								})] }) : /* @__PURE__ */ jsxs(Fragment$1, { children: [
+									pullRequest.checks === "failing" ? /* @__PURE__ */ jsx(FailingChecksControl, {
+										sessionId,
+										pullNumber: pullRequest.number,
+										t,
+										...submitPrompt === void 0 ? {} : { submitPrompt }
+									}) : pullRequest.checks === "none" ? null : /* @__PURE__ */ jsx(StatusGlyph, {
+										label: t(`repositoryChecks_${pullRequest.checks}`),
+										tone: pullRequest.checks === "passing" ? "success" : "warning",
+										children: /* @__PURE__ */ jsx(ChecksGlyph, { state: pullRequest.checks })
+									}),
+									pullRequest.review === "none" ? null : /* @__PURE__ */ jsx(StatusGlyph, {
+										label: t(`repositoryReview_${pullRequest.review}`),
+										tone: pullRequest.review === "approved" ? "success" : pullRequest.review === "changes-requested" ? "error" : "neutral",
+										children: /* @__PURE__ */ jsx(ReviewGlyph, {})
+									}),
+									/* @__PURE__ */ jsx(AutoFixControl, {
+										sessionId,
+										repository,
+										running,
+										t,
+										...submitPrompt === void 0 ? {} : { submitPrompt }
+									}),
+									/* @__PURE__ */ jsx(UpdateBranchControl, {
+										sessionId,
+										repository,
+										t,
+										report,
+										...submitPrompt === void 0 ? {} : { submitPrompt }
+									}),
+									/* @__PURE__ */ jsx(MergePullRequestControl, {
+										sessionId,
+										repository,
+										t,
+										report
+									})
+								] })
+							]
 						})
 					]
 				})]
@@ -14387,7 +14620,7 @@ window.__ModuleLoader__.load({
 			return (action === "commit" ? t("diffCommit") : action === "commit-push" ? t("diffCommitPush") : action === "push" ? t("diffPush") : action === "merge-pr" ? t("diffMergePr") : action === "update-branch" ? t("diffUpdateBranch") : t("diffCreatePr")).replace(/[….]+$/u, "");
 		}
 		function repositoryActionAvailability(repository) {
-			const ready = repository?.status === "ready" && repository.detached !== true;
+			const ready = repository?.status === "ready" && repository.detached !== true && (repository.conflicts ?? []).length === 0;
 			const committable = ready && repository.dirty === true;
 			const hasRemote = repository?.remote !== void 0;
 			const hasOpenPullRequest = repository?.pullRequest?.state === "open";
@@ -14707,7 +14940,7 @@ window.__ModuleLoader__.load({
 				repository?.status
 			]);
 			if (!projection.owned || repository?.status !== "ready" || diff === void 0) return null;
-			const branch = repository.detached === true ? t("repositoryDetached") : repository.branch ?? t("repositoryUnknownBranch");
+			const branch = branchLabel(repository, t);
 			const availability = repositoryActionAvailability(repository);
 			const anyActionAvailable = availability["commit"] || availability["commit-push"] || availability["push"] || availability["create-pr"];
 			const menuItems = [
@@ -18767,6 +19000,24 @@ window.__ModuleLoader__.load({
 			diffUpdateBranchCompleted: "已更新并推送 commit {commit}",
 			diffUpdateBranchConflicts: "更新产生冲突,以下文件需要解决:",
 			diffUpdateBranchResolve: "让 Claude 解决冲突",
+			conflictTitle: "解决冲突",
+			conflictOperation_rebase: "Rebase",
+			conflictOperation_merge: "合并",
+			"conflictOperation_cherry-pick": "Cherry-pick",
+			conflictOperation_revert: "Revert",
+			conflictBadge: "{operation} 冲突 {count}",
+			conflictBadgeReady: "继续 {operation}",
+			conflictDescription: "{operation} 尚未完成。解决冲突后继续,或中止回到操作前的状态。",
+			conflictFiles: "以下文件存在冲突,需要解决并 git add:",
+			conflictReady: "冲突已全部解决,可以继续。",
+			conflictResolve: "让 Claude 解决冲突",
+			conflictContinue: "继续 {operation}",
+			conflictAbort: "中止 {operation}",
+			conflictAbortConfirm: "再次点击「中止 {operation}」确认:{operation} 期间的改动会被丢弃。",
+			conflictPush: "完成后推送到远端",
+			conflictContinued: "{operation} 已完成",
+			conflictPushed: "{operation} 已完成并推送",
+			conflictAborted: "已中止 {operation}",
 			repositoryChecksOpen: "查看失败的检查",
 			checksCardTitle: "失败的检查",
 			checksCardLoading: "正在读取检查详情…",
@@ -19191,6 +19442,24 @@ window.__ModuleLoader__.load({
 			diffUpdateBranchCompleted: "Updated and pushed commit {commit}",
 			diffUpdateBranchConflicts: "The update left conflicts in these files:",
 			diffUpdateBranchResolve: "Have Claude resolve the conflicts",
+			conflictTitle: "Resolve conflicts",
+			conflictOperation_rebase: "Rebase",
+			conflictOperation_merge: "Merge",
+			"conflictOperation_cherry-pick": "Cherry-pick",
+			conflictOperation_revert: "Revert",
+			conflictBadge: "{operation}: {count} conflict(s)",
+			conflictBadgeReady: "Continue {operation}",
+			conflictDescription: "The {operation} is unfinished. Resolve the conflicts and continue, or abort to return to the state before it.",
+			conflictFiles: "These files conflict and must be resolved and staged:",
+			conflictReady: "Every conflict is resolved. The operation can continue.",
+			conflictResolve: "Have Claude resolve the conflicts",
+			conflictContinue: "Continue {operation}",
+			conflictAbort: "Abort {operation}",
+			conflictAbortConfirm: "Press \"Abort {operation}\" again to confirm: work done during the {operation} is discarded.",
+			conflictPush: "Push once it finishes",
+			conflictContinued: "{operation} finished",
+			conflictPushed: "{operation} finished and pushed",
+			conflictAborted: "Aborted the {operation}",
 			repositoryChecksOpen: "Show failing checks",
 			checksCardTitle: "Failing checks",
 			checksCardLoading: "Loading check details…",