@norman-else/dsh-claude 0.1.41 → 0.1.43

package/lib/client.js

@@ -4,7 +4,7 @@ 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, IconRightUpOutline14, IconSearchOutline16, IconSendOutline14, IconThinkOutline14, IconTrashOutline16, MarkdownText, Menu, Modal, StateDot, Toast, Tooltip, useDismissOnOutsidePointer } = require("@deepseek-ai/dsh-client-ui-primitives");
+		var { Button, DiffBlock, DisclosureRow, HoverCard, IconAgentPresetOutline16, IconApiOutline14, IconBranchOutline16, IconCheckOutline14, IconCheckOutline16, IconChevronDownOutline14, IconChevronRightOutline14, IconChevronUpOutline14, IconCloseOutline16, IconEditOutline16, IconEllipsisOutline16, IconFullscreenOutline16, IconListPenOutline16, IconLoadingOutline16, IconQueueOutline14, IconRefreshOutline14, IconRefreshOutline16, IconRightUpOutline14, IconSearchOutline16, IconSendOutline14, IconSparkle16, 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
@@ -28,6 +28,9 @@ window.__ModuleLoader__.load({
 		const CLAUDE_EDITOR_OPEN_PATH = "/plugins/dsh-claude/editor/open";
 		const CLAUDE_REWIND_PATH = "/plugins/dsh-claude/rewind";
 		const CLAUDE_PLAN_FEEDBACK_PATH = "/plugins/dsh-claude/plan/feedback";
+		const CLAUDE_PROMPTS_PATH = "/plugins/dsh-claude/prompts";
+		const CLAUDE_PROMPT_NAME_PATH = "/plugins/dsh-claude/prompts/name";
+		const CLAUDE_PROMPT_REFINE_PATH = "/plugins/dsh-claude/prompts/refine";
 		function isClaudeRenderMode(value) {
 			return value === "plugin" || value === "native";
 		}
@@ -349,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 [];
@@ -410,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,
@@ -1834,7 +1844,7 @@ window.__ModuleLoader__.load({
 			whiteSpace: "nowrap"
 		};
 		const repositoryBarFrame = {
-			width: "calc(100% - 64px)",
+			width: "calc(100% - 2 * var(--dsh-composer-side-clearance, 16px))",
 			maxWidth: "var(--dsh-composer-card-max-width, 782px)",
 			minWidth: 0,
 			margin: "0 auto",
@@ -2231,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",
@@ -2994,7 +3012,7 @@ window.__ModuleLoader__.load({
 			fontSize: 11
 		};
 		const reviewCommentBarFrame = {
-			width: "calc(100% - 64px)",
+			width: "calc(100% - 2 * var(--dsh-composer-side-clearance, 16px))",
 			maxWidth: "var(--dsh-composer-card-max-width, 782px)",
 			margin: "0 auto",
 			boxSizing: "border-box"
@@ -3085,6 +3103,113 @@ window.__ModuleLoader__.load({
 			whiteSpace: "pre-wrap",
 			overflowWrap: "anywhere"
 		};
+		const promptSaveTriggerClass = "dshClaudePromptSaveTrigger";
+		const promptSpinClass = "dshClaudePromptSpin";
+		const promptUndoClass = "dshClaudePromptUndo";
+		const promptSaveFieldClass = "dshClaudePromptSaveField";
+		/** The composer's own attach button geometry (InputBar.module.css `.add`:
+		*  28x28 circle on --dsw-specific-selector, 14px glyph). The primitives'
+		*  Button has no icon-only form — its `sm` is a 36px-wide capsule around a
+		*  16px slot, which is why this reads oversized beside its neighbours. */
+		const promptSaveTriggerCss = `
+		.${promptSaveTriggerClass} {
+		  width: 28px;
+		  height: 28px;
+		  flex: none;
+		  display: grid;
+		  place-items: center;
+		  padding: 0;
+		  border: none;
+		  border-radius: 999px;
+		  background: var(--dsw-specific-selector);
+		  color: var(--dsw-alias-label-primary);
+		  cursor: pointer;
+		  transition: background-color 120ms ease, color 120ms ease;
+		}
+		/* With no draft there is nothing to keep, so the control drops its seat
+		 * entirely rather than sitting there as a filled-but-dead circle. */
+		.${promptSaveTriggerClass}:disabled {
+		  cursor: default;
+		  background: transparent;
+		  color: var(--dsw-alias-label-tertiary);
+		}
+		.${promptSaveTriggerClass}:focus-visible { outline: none; }
+		.${promptSaveFieldClass} {
+		  box-sizing: border-box;
+		  width: 100%;
+		  height: 30px;
+		  padding: 0 9px;
+		  border: 1px solid var(--dsw-alias-border-inverted);
+		  border-radius: 7px;
+		  background: var(--dsw-alias-interactive-bg-hover);
+		  color: var(--dsw-alias-label-primary);
+		  font-family: var(--dsw-font-family);
+		  font-size: 13px;
+		  line-height: 20px;
+		}
+		/* Not --dsw-alias-brand-primary: in the dark theme that alias resolves to
+		 * neutral-bluish-50, so a focused field draws a near-white slab around
+		 * itself. The focus ring is a step up in the same greys the card is made of. */
+		.${promptSaveFieldClass}:focus-visible {
+		  outline: none;
+		  border-color: var(--dsw-alias-label-tertiary);
+		  background: var(--dsw-alias-interactive-bg-active);
+		}
+		.${promptSaveFieldClass}:disabled { opacity: 0.6; }
+		/* ic_ds_loading_outline_16 is a bare open ring and nothing in the primitives
+		 * turns it, so a four-second rewrite sat behind a frozen glyph that reads as
+		 * the letter C. The spin is what makes it a spinner. */
+		.${promptSpinClass} { animation: dshClaudePromptSpin 900ms linear infinite; }
+		@keyframes dshClaudePromptSpin { to { transform: rotate(360deg); } }
+		/* The icon set has no undo arrow, and ic_ds_refresh_outline_16 turns
+		 * clockwise — the redo direction. Mirrored, it is the ordinary undo glyph. */
+		.${promptUndoClass} { transform: scaleX(-1); }
+		@media (prefers-reduced-motion: reduce) {
+		  .${promptSpinClass} { animation: none; }
+		}
+		`;
+		/** The naming card hangs off the composer tool row, portaled so the composer
+		*  card cannot clip it and positioned by useAnchoredPosition. */
+		const promptSaveCard = {
+			position: "fixed",
+			zIndex: 120,
+			boxSizing: "border-box",
+			display: "flex",
+			flexDirection: "column",
+			gap: 8,
+			width: 340,
+			maxWidth: "calc(100vw - 32px)",
+			padding: "10px 12px",
+			border: "1px solid var(--dsw-alias-border-inverted)",
+			borderRadius: 11,
+			background: "var(--dsw-specific-menu)",
+			boxShadow: "var(--dsw-shadow-lv3)",
+			color: "var(--dsw-alias-label-primary)",
+			fontSize: 12,
+			lineHeight: "20px"
+		};
+		const promptSaveHeading = {
+			color: "var(--dsw-alias-label-tertiary)",
+			fontSize: 11,
+			lineHeight: "16px"
+		};
+		const promptSaveActions = {
+			display: "flex",
+			justifyContent: "flex-end",
+			gap: 6
+		};
+		/** The saved file, wrapped rather than truncated: a path the user cannot read
+		*  in full does not tell them where to go and edit it. */
+		const promptSaveLocation = {
+			color: "var(--dsw-alias-label-tertiary)",
+			fontSize: 11,
+			lineHeight: "16px",
+			overflowWrap: "anywhere"
+		};
+		const promptSaveError = {
+			color: "var(--dsw-static-red-450, #d64545)",
+			overflowWrap: "anywhere"
+		};
 		const diffAhead = { color: "var(--dsw-static-blue-450)" };
 		const diffAheadMuted = { color: "color-mix(in srgb, var(--dsw-static-blue-450) 62%, var(--dsw-alias-label-tertiary))" };
 		const diffAddMuted = { color: "color-mix(in srgb, var(--dsw-alias-state-success-primary) 62%, var(--dsw-alias-label-tertiary))" };
@@ -4008,6 +4133,16 @@ window.__ModuleLoader__.load({
 			laneHeld[lane] -= 1;
 			pump();
 		}
+		/** Runs at most once, so a release can be wired to every ending of a stream
+		*  without any of them having to know about the others. */
+		function once(action) {
+			let done = false;
+			return () => {
+				if (done) return;
+				done = true;
+				action();
+			};
+		}
 		function acquire(lane) {
 			let released = false;
 			const releaseOnce = () => {
@@ -4111,11 +4246,53 @@ window.__ModuleLoader__.load({
 			writeId += 1;
 			return writeId;
 		}
+		/**
+		* A reader that gives its permit back however the stream ends.
+		*
+		* The permit used to be released by one event only -- the caller's abort --
+		* and a stream has three endings, two of which the caller does not cause: the
+		* server closing the response, and the body failing mid-read. Either one left
+		* the permit held. For the reserved carrier that permit is a single boolean,
+		* so one such ending closed the transcript stream for the life of the page and
+		* every reopen answered `starved`, silently, forever.
+		*
+		* Binding the release to the reader rather than to the signal is what makes
+		* that unrepresentable: a caller cannot hold the permit past the stream it is
+		* reading, because every way of leaving the read passes through here. `free`
+		* is idempotent, so the abort listener below stays as the belt to this brace.
+		*/
+		function releasingReader(reader, free) {
+			return {
+				get closed() {
+					return reader.closed;
+				},
+				read: async () => {
+					try {
+						const chunk = await reader.read();
+						if (chunk.done) free();
+						return chunk;
+					} catch (error) {
+						free();
+						throw error;
+					}
+				},
+				cancel: async (reason) => {
+					try {
+						await reader.cancel(reason);
+					} finally {
+						free();
+					}
+				},
+				releaseLock: () => {
+					reader.releaseLock();
+				}
+			};
+		}
 		async function openStream(lane, path, cancel, options, reserved) {
 			const url = withQuery(path, options?.query);
-			const free = reserved ? () => {
+			const free = reserved ? once(() => {
 				projectionHeld = false;
-			} : await acquire(lane);
+			}) : await acquire(lane);
 			try {
 				const response = await send(url, {
 					method: options?.method ?? "GET",
@@ -4133,7 +4310,7 @@ window.__ModuleLoader__.load({
 					throw new PluginRequestError("http", `HTTP ${response.status}`, response.status);
 				}
 				cancel.addEventListener("abort", free, { once: true });
-				return response.body.getReader();
+				return releasingReader(response.body.getReader(), free);
 			} catch (error) {
 				free();
 				throw failureOf(error, cancel);
@@ -4188,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;
@@ -4206,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;
@@ -4598,6 +4781,10 @@ window.__ModuleLoader__.load({
 			#report;
 			#resyncCooldownMs;
 			#resyncedAt = 0;
+			/** Whether the carrier is in a run of failures. One report per outage: the
+			*  retry loop runs every couple of seconds and a beacon per attempt would
+			*  be the plugin reporting its own noise. */
+			#carrierFailing = false;
 			#controller;
 			#settle;
 			#running = false;
@@ -4683,6 +4870,7 @@ window.__ModuleLoader__.load({
 						let superseded = false;
 						try {
 							const reader = await this.#open(`${CLAUDE_PROJECTION_PATH}/multi?sessions=${lanes.map(encodeURIComponent).join(",")}`, controller.signal);
+							this.#carrierFailing = false;
 							const stop = () => {
 								superseded = true;
 								reader.cancel().catch(() => void 0);
@@ -4705,6 +4893,10 @@ window.__ModuleLoader__.load({
 								if (this.#controller !== controller) continue;
 								return;
 							}
+							if (!this.#carrierFailing) {
+								this.#carrierFailing = true;
+								this.#report("projection-carrier-unavailable", error instanceof Error ? error.message : String(error));
+							}
 						} finally {
 							if (this.#controller === controller) this.#controller = void 0;
 						}
@@ -5208,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", {
@@ -5251,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 },
@@ -5549,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: "×",
@@ -5671,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
 			});
@@ -5806,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. */
@@ -5815,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) {
@@ -5824,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
@@ -5883,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.
@@ -6020,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,
@@ -8421,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. */
@@ -8592,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")
@@ -8863,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;
@@ -8935,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
+									})
+								] })
+							]
 						})
 					]
 				})]
@@ -14216,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";
@@ -14536,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 = [
@@ -17642,6 +18046,428 @@ window.__ModuleLoader__.load({
 			}
 		}
 		//#endregion
+		//#region src/client/prompt-api.ts
+		/** Prompt files live in one global directory, so one module-level cache serves
+		*  every session. The TTL is what lets a file added outside DSH appear without
+		*  a reload, while a burst of keystrokes through the menu still costs one
+		*  directory scan. */
+		const TTL_MS = 5e3;
+		let cached;
+		function invalidateClaudePrompts() {
+			cached = void 0;
+		}
+		/** The user's prompt snippets, at most one read per TTL window. */
+		async function claudePrompts() {
+			const at = Date.now();
+			if (cached !== void 0 && at - cached.at < TTL_MS) return await cached.prompts;
+			const prompts = pluginRead(CLAUDE_PROMPTS_PATH, "fast").then((payload) => payload.prompts).catch(() => {
+				invalidateClaudePrompts();
+				return [];
+			});
+			cached = {
+				at,
+				prompts
+			};
+			return await prompts;
+		}
+		/** Save one snippet, answering where it landed. Rejects with a
+		*  `PluginRequestError` whose `code` is `name-taken` when the file already
+		*  exists; nothing is overwritten. */
+		async function saveClaudePrompt(name, body) {
+			const saved = await pluginWrite(CLAUDE_PROMPTS_PATH, "fast", void 0, { json: {
+				name,
+				body
+			} });
+			invalidateClaudePrompts();
+			return saved.prompt;
+		}
+		/** Ask the host to name a draft with Claude's cheapest model. Answers
+		*  undefined whenever no name could be had — the caller already holds the
+		*  locally derived one, so a failure here is never worth reporting. */
+		async function suggestClaudePromptName(draft, cancel) {
+			try {
+				return (await pluginWrite(CLAUDE_PROMPT_NAME_PATH, "git", cancel, { json: { draft } })).name;
+			} catch {
+				return;
+			}
+		}
+		/** Rewrite a draft into something an agent can act on. Unlike the name
+		*  suggestion this one throws: the user asked for it and is waiting, so a
+		*  failure is theirs to see rather than ours to swallow. */
+		async function refineClaudePrompt(draft, cancel) {
+			return (await pluginWrite(CLAUDE_PROMPT_REFINE_PATH, "git", cancel, { json: { draft } })).text;
+		}
+		/** Characters the host's `PROMPT_NAME` guard rejects; scrubbed rather than
+		*  re-implemented here, so a drift in the guard cannot let a bad name through
+		*  (the host still validates, and answers `invalid-name`). */
+		const FOREIGN_NAME_CHARS = /[^\p{L}\p{M}\p{N} ._()\[\]-]/gu;
+		const MAX_NAME_CHARS = 40;
+		function stamp(now) {
+			const pad = (value) => String(value).padStart(2, "0");
+			return `${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}-${pad(now.getHours())}${pad(now.getMinutes())}`;
+		}
+		/** The file name to offer for a draft: its opening line, scrubbed to what a
+		*  file name may hold. A draft that opens with punctuation or an emoji leaves
+		*  nothing usable, so those fall back to a timestamp the user can rename. */
+		function defaultPromptName(draft, now = /* @__PURE__ */ new Date()) {
+			const collapsed = (draft.split("\n").map((line) => line.trim()).find((line) => line.length > 0) ?? "").replace(FOREIGN_NAME_CHARS, " ").replace(/\s+/gu, " ").trim();
+			const cut = collapsed.slice(0, MAX_NAME_CHARS);
+			const boundary = collapsed.length > MAX_NAME_CHARS ? cut.search(/[\s\-_][^\s\-_]*$/u) : -1;
+			const scrubbed = (boundary > 0 ? cut.slice(0, boundary) : cut).trim();
+			return /^[\p{L}\p{N}]/u.test(scrubbed) ? scrubbed : `prompt-${stamp(now)}`;
+		}
+		//#endregion
+		//#region src/client/ClaudePromptSaveAction.tsx
+		const CARD_GAP = 8;
+		const CARD_MARGIN = 12;
+		/**
+		* Place the card above its trigger, clamped into the viewport, and dismiss it
+		* on a pointer that lands outside both.
+		*
+		* The primitives ship `useAnchoredPosition` and `useDismissOnOutsidePointer`
+		* for exactly this, and both are used here through their published types —
+		* but the Host's build of that package predates the `side` option of one and
+		* the portal argument of the other. Neither omission is visible to `tsc`,
+		* which reads this checkout's newer copy, and both are silent at runtime: the
+		* card hangs below a composer pinned to the bottom of the window, and every
+		* pointer landing in the naming field counts as outside and closes it. Owning
+		* twenty lines beats behaviour that depends on which Desktop the plugin was
+		* installed into.
+		*/
+		function useAnchoredCard(open, anchor, card, onDismiss) {
+			const [position, setPosition] = useState();
+			useLayoutEffect(() => {
+				if (!open) {
+					setPosition(void 0);
+					return;
+				}
+				const place = () => {
+					const trigger = anchor.current?.getBoundingClientRect();
+					const panel = card.current?.getBoundingClientRect();
+					if (trigger === void 0 || panel === void 0) return;
+					const above = trigger.top - CARD_GAP - panel.height;
+					setPosition({
+						left: Math.max(CARD_MARGIN, Math.min(trigger.left, window.innerWidth - panel.width - CARD_MARGIN)),
+						top: above >= CARD_MARGIN ? above : Math.min(trigger.bottom + CARD_GAP, window.innerHeight - panel.height - CARD_MARGIN)
+					});
+				};
+				place();
+				window.addEventListener("resize", place);
+				window.addEventListener("scroll", place, true);
+				return () => {
+					window.removeEventListener("resize", place);
+					window.removeEventListener("scroll", place, true);
+				};
+			}, [
+				open,
+				anchor,
+				card
+			]);
+			useEffect(() => {
+				if (!open) return void 0;
+				const dismiss = (event) => {
+					const target = event.target;
+					if (!(target instanceof Node)) return;
+					if (anchor.current?.contains(target) === true || card.current?.contains(target) === true) return;
+					onDismiss();
+				};
+				document.addEventListener("pointerdown", dismiss);
+				return () => {
+					document.removeEventListener("pointerdown", dismiss);
+				};
+			}, [
+				open,
+				anchor,
+				card,
+				onDismiss
+			]);
+			return position;
+		}
+		/**
+		* Keep the draft you just wrote, from the composer's own tool row.
+		*
+		* It sits beside the attach and access controls rather than in a row of its
+		* own: a band above the composer moves the repository bar and the composer
+		* itself every time a draft appears, and this is a once-in-a-while action that
+		* has not earned that. The naming card is portaled and anchored, so opening it
+		* displaces nothing either.
+		*
+		* The field opens on a name derived from the draft's first line, which costs
+		* nothing and is there instantly, and a Claude-written name replaces it when
+		* one arrives. That ordering is the whole naming design: the suggestion is an
+		* improvement on a working answer, never something the user waits for.
+		*/
+		function ClaudePromptSaveAction({ t, useClaudeProjection, input, savePrompt = saveClaudePrompt, suggestName = suggestClaudePromptName }) {
+			const owned = useClaudeProjection((projection) => projection.owned);
+			const anchor = useRef(null);
+			const panelRef = useRef(null);
+			const suggestion = useRef(void 0);
+			const [panel, setPanel] = useState();
+			const [saving, setSaving] = useState(false);
+			const close = useCallback(() => {
+				suggestion.current?.abort();
+				suggestion.current = void 0;
+				setPanel(void 0);
+			}, []);
+			const position = useAnchoredCard(panel !== void 0, anchor, panelRef, close);
+			useEffect(() => () => {
+				suggestion.current?.abort();
+			}, []);
+			if (!owned) return null;
+			const draft = input?.draft ?? "";
+			const label = t("promptSave");
+			const open = () => {
+				setPanel({
+					kind: "naming",
+					name: defaultPromptName(draft),
+					touched: false,
+					suggesting: true
+				});
+				const attempt = new AbortController();
+				suggestion.current = attempt;
+				suggestName(draft, attempt.signal).then((suggested) => {
+					if (attempt.signal.aborted) return;
+					setPanel((current) => current?.kind !== "naming" ? current : {
+						...current,
+						suggesting: false,
+						...suggested === void 0 || current.touched ? {} : { name: suggested }
+					});
+				});
+			};
+			const save = () => {
+				const name = panel?.kind === "naming" ? panel.name.trim() : "";
+				if (saving || name === "" || draft.trim() === "") return;
+				setSaving(true);
+				savePrompt(name, draft).then((prompt) => {
+					setPanel({
+						kind: "saved",
+						prompt
+					});
+				}, (error) => {
+					setPanel({
+						kind: "naming",
+						name,
+						touched: true,
+						suggesting: false,
+						failure: error instanceof PluginRequestError && error.code === "name-taken" ? t("promptSaveExists") : t("promptSaveFailed", { message: error instanceof Error ? error.message : String(error) })
+					});
+				}).finally(() => {
+					setSaving(false);
+				});
+			};
+			return /* @__PURE__ */ jsxs("span", {
+				ref: anchor,
+				style: {
+					position: "relative",
+					display: "inline-flex"
+				},
+				children: [
+					/* @__PURE__ */ jsx("style", {
+						"data-dsh-claude-prompt-save-styles": true,
+						children: promptSaveTriggerCss
+					}),
+					/* @__PURE__ */ jsx(Tooltip, {
+						label,
+						side: "top",
+						delayMs: 250,
+						disabled: panel !== void 0,
+						children: /* @__PURE__ */ jsx("button", {
+							type: "button",
+							className: promptSaveTriggerClass,
+							"aria-label": label,
+							"aria-haspopup": "dialog",
+							"aria-expanded": panel !== void 0,
+							disabled: draft.trim() === "",
+							onClick: () => {
+								if (panel === void 0) open();
+								else close();
+							},
+							children: /* @__PURE__ */ jsx(IconListPenOutline16, { size: 14 })
+						})
+					}),
+					panel === void 0 || typeof document === "undefined" ? null : createPortal(/* @__PURE__ */ jsx("div", {
+						ref: panelRef,
+						style: {
+							...promptSaveCard,
+							...position
+						},
+						role: "dialog",
+						"aria-label": label,
+						children: panel.kind === "saved" ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
+							/* @__PURE__ */ jsx("span", { children: t("promptSaved", { name: panel.prompt.name }) }),
+							/* @__PURE__ */ jsx("span", {
+								style: promptSaveLocation,
+								children: panel.prompt.location
+							}),
+							/* @__PURE__ */ jsx("span", {
+								style: promptSaveActions,
+								children: /* @__PURE__ */ jsx(Button, {
+									variant: "primary",
+									size: "sm",
+									onClick: close,
+									children: t("promptSaveDone")
+								})
+							})
+						] }) : /* @__PURE__ */ jsxs("form", {
+							style: { display: "contents" },
+							onSubmit: (event) => {
+								event.preventDefault();
+								save();
+							},
+							children: [
+								/* @__PURE__ */ jsx("span", {
+									style: promptSaveHeading,
+									children: panel.suggesting ? t("promptSaveNaming") : label
+								}),
+								/* @__PURE__ */ jsx("input", {
+									className: promptSaveFieldClass,
+									"aria-label": t("promptSaveName"),
+									placeholder: t("promptSaveName"),
+									value: panel.name,
+									maxLength: 128,
+									autoFocus: true,
+									disabled: saving,
+									onChange: (event) => setPanel({
+										...panel,
+										name: event.currentTarget.value,
+										touched: true
+									}),
+									onKeyDown: (event) => {
+										if (event.key === "Escape") close();
+									}
+								}),
+								panel.failure === void 0 ? null : /* @__PURE__ */ jsx("span", {
+									style: promptSaveError,
+									children: panel.failure
+								}),
+								/* @__PURE__ */ jsxs("span", {
+									style: promptSaveActions,
+									children: [/* @__PURE__ */ jsx(Button, {
+										variant: "ghost",
+										size: "sm",
+										type: "button",
+										disabled: saving,
+										onClick: close,
+										children: t("promptSaveCancel")
+									}), /* @__PURE__ */ jsx(Button, {
+										variant: "primary",
+										size: "sm",
+										type: "submit",
+										disabled: saving,
+										children: t("promptSaveConfirm")
+									})]
+								})
+							]
+						})
+					}), document.body)
+				]
+			});
+		}
+		//#endregion
+		//#region src/client/ClaudePromptRefineAction.tsx
+		/**
+		* Rewrite the draft in place, from the composer's own tool row.
+		*
+		* The rewrite replaces the draft outright, which is what makes the undo state
+		* load-bearing rather than a nicety: `SessionInput.setDraft` documents itself
+		* as "merged into history so a seed is not an undoable step of its own", so
+		* Ctrl/Cmd+Z does NOT bring the original back. Without somewhere to put it,
+		* one press of this button would silently destroy a draft the user may have
+		* spent minutes on. So the original is held for exactly as long as it is still
+		* recoverable — until the rewrite is edited or sent — and the same button
+		* offers it back over that window.
+		*/
+		function ClaudePromptRefineAction({ t, useClaudeProjection, input, replaceDraft, notify, refine = refineClaudePrompt }) {
+			const owned = useClaudeProjection((projection) => projection.owned);
+			const attempt = useRef(void 0);
+			const [busy, setBusy] = useState(false);
+			const [applied, setApplied] = useState();
+			useEffect(() => () => {
+				attempt.current?.abort();
+			}, []);
+			if (!owned || replaceDraft === void 0) return null;
+			const draft = input?.draft ?? "";
+			const undoable = applied !== void 0 && draft === applied.refined;
+			const label = busy ? t("promptRefineBusy") : undoable ? t("promptRefineUndo") : t("promptRefine");
+			const run = () => {
+				if (busy || draft.trim() === "") return;
+				setBusy(true);
+				const running = new AbortController();
+				attempt.current = running;
+				refine(draft, running.signal).then((text) => {
+					if (running.signal.aborted) return;
+					setApplied({
+						original: draft,
+						refined: text
+					});
+					replaceDraft(text);
+				}, (error) => {
+					if (running.signal.aborted) return;
+					notify?.("error", t("promptRefineFailed", { message: error instanceof Error ? error.message : String(error) }));
+				}).finally(() => {
+					setBusy(false);
+				});
+			};
+			const undo = () => {
+				if (applied === void 0) return;
+				replaceDraft(applied.original);
+				setApplied(void 0);
+			};
+			return /* @__PURE__ */ jsx(Tooltip, {
+				label,
+				side: "top",
+				delayMs: 250,
+				children: /* @__PURE__ */ jsxs("button", {
+					type: "button",
+					className: promptSaveTriggerClass,
+					"aria-label": label,
+					disabled: busy || !undoable && draft.trim() === "",
+					onClick: undoable ? undo : run,
+					children: [/* @__PURE__ */ jsx("style", {
+						"data-dsh-claude-prompt-refine-styles": true,
+						children: promptSaveTriggerCss
+					}), busy ? /* @__PURE__ */ jsx(IconLoadingOutline16, {
+						size: 14,
+						className: promptSpinClass
+					}) : undoable ? /* @__PURE__ */ jsx(IconRefreshOutline16, {
+						size: 14,
+						className: promptUndoClass
+					}) : /* @__PURE__ */ jsx(IconSparkle16, { size: 14 })]
+				})
+			});
+		}
+		//#endregion
+		//#region src/client/claude-prompt-source.ts
+		/**
+		* The user's own prompt snippets as a second `/` group.
+		*
+		* Unlike {@link createClaudeCommandSource}, a pick here settles as plain text:
+		* the pipeline replaces the trigger token with the snippet body and leaves the
+		* caret after it, so the draft stays editable and nothing is sent. A snippet is
+		* a half-written message, not a command.
+		*/
+		function createClaudePromptSource(groupName, load = claudePrompts) {
+			let known = [];
+			return {
+				trigger: "/",
+				name: groupName,
+				order: 20,
+				async candidates(_session, request) {
+					if (request.position !== "leading") return [];
+					known = await load();
+					const query = request.query.toLocaleLowerCase();
+					return known.filter((prompt) => prompt.name.toLocaleLowerCase().includes(query)).map((prompt) => ({
+						name: prompt.name,
+						description: prompt.description
+					}));
+				},
+				onPick(pick) {
+					const prompt = known.find((item) => item.name === pick.candidate.name);
+					return prompt === void 0 ? void 0 : { text: prompt.body };
+				}
+			};
+		}
+		//#endregion
 		//#region src/client/preset-seat-mark.ts
 		/** Flags the Host's agent-preset seat while it names the Claude preset.
 		*
@@ -17940,7 +18766,7 @@ window.__ModuleLoader__.load({
 			worktreeBranchPrefixEffect: "分支前缀修改会应用于之后自动创建的 Worktree 分支；显式指定的完整分支名不会被修改。",
 			maxProcessesSetting: "Claude 进程上限",
 			idleTimeoutSetting: "闲置回收时长（分钟）",
-			maxProcessesEffect: "进程上限在下次启动 Claude 进程时生效。留空或非法值会被拒绝。",
+			maxProcessesEffect: "保存后立即回收超额空闲进程；运行中的进程完成后再收敛。满载时，新会话会等待可用容量。留空或非法值会被拒绝。",
 			idleTimeoutEffect: "闲置回收时长在下一次回合结束后生效。留空或非法值会被拒绝。",
 			settingHint: "查看说明",
 			pluginUpdate: "插件更新",
@@ -18098,6 +18924,20 @@ window.__ModuleLoader__.load({
 			sessionMenu: "会话菜单",
 			sessionMenuOpenIn: "打开方式",
 			sessionMenuOpenFailed: "无法打开：{message}",
+			promptSource: "常用提示词",
+			promptSave: "存为常用提示词",
+			promptSaveName: "名字",
+			promptSaveNaming: "正在起名…",
+			promptRefine: "AI 优化提示词",
+			promptRefineBusy: "优化中…",
+			promptRefineUndo: "还原成优化前的内容",
+			promptRefineFailed: "优化失败：{message}",
+			promptSaveConfirm: "保存",
+			promptSaveCancel: "取消",
+			promptSaveDone: "知道了",
+			promptSaved: "已存为「{name}」",
+			promptSaveExists: "已有同名提示词，换个名字。",
+			promptSaveFailed: "保存失败：{message}",
 			presetHeaderHint: "当前会话运行的 Agent 预设",
 			diffWorkingTree: "分支改动",
 			diffFiles: "{count} 个已修改文件",
@@ -18160,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: "正在读取检查详情…",
@@ -18350,7 +19208,7 @@ window.__ModuleLoader__.load({
 			worktreeBranchPrefixEffect: "Prefix changes apply to subsequently generated Worktree branches. Explicit full branch names remain unchanged.",
 			maxProcessesSetting: "Claude process limit",
 			idleTimeoutSetting: "Idle timeout (minutes)",
-			maxProcessesEffect: "The process limit applies when the next Claude process is admitted. Blank or invalid values are rejected.",
+			maxProcessesEffect: "Saving immediately reclaims excess idle processes; running processes converge after they finish. New sessions wait for capacity while every process is busy. Blank or invalid values are rejected.",
 			idleTimeoutEffect: "The idle timeout applies after the next completed turn. Blank or invalid values are rejected.",
 			settingHint: "Show details",
 			pluginUpdate: "Plugin updates",
@@ -18508,6 +19366,20 @@ window.__ModuleLoader__.load({
 			sessionMenu: "Session menu",
 			sessionMenuOpenIn: "Open in",
 			sessionMenuOpenFailed: "Could not open: {message}",
+			promptSource: "Prompts",
+			promptSave: "Save as a prompt",
+			promptSaveName: "Name",
+			promptSaveNaming: "Naming it…",
+			promptRefine: "Rewrite with AI",
+			promptRefineBusy: "Rewriting…",
+			promptRefineUndo: "Put the original back",
+			promptRefineFailed: "Could not rewrite: {message}",
+			promptSaveConfirm: "Save",
+			promptSaveCancel: "Cancel",
+			promptSaveDone: "Got it",
+			promptSaved: "Saved as \"{name}\"",
+			promptSaveExists: "A prompt with that name already exists. Try another.",
+			promptSaveFailed: "Could not save: {message}",
 			presetHeaderHint: "The agent preset this session runs",
 			diffWorkingTree: "Branch changes",
 			diffFiles: "{count} modified file(s)",
@@ -18570,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…",
@@ -18785,6 +19675,7 @@ window.__ModuleLoader__.load({
 				diagnostics.report(kind, detail);
 			} });
 			ctx.effect(() => ctx.inputTriggers.registerSource(createClaudeCommandSource(ctx, projections)), "dsh-claude: Claude slash source");
+			ctx.effect(() => ctx.inputTriggers.registerSource(createClaudePromptSource(t("promptSource"))), "dsh-claude: Claude prompt source");
 			const sessions = ctx.get("sessions");
 			const workspaces = ctx.get("workspaces");
 			const uiWorkspace = ctx.get("uiWorkspace");
@@ -19131,6 +20022,34 @@ window.__ModuleLoader__.load({
 				locale: namespace,
 				inject: () => ({ t })
 			}, ClaudeSessionMenu));
+			ctx.slots.inject("conversation.input.left", () => ctx.slots.register({
+				name: "conversation.input.left",
+				id: "claude-prompt-save",
+				order: 40,
+				locale: namespace,
+				inject: () => ({ t })
+			}, ClaudePromptSaveAction));
+			ctx.slots.inject("conversation.input.left", () => ctx.slots.register({
+				name: "conversation.input.left",
+				id: "claude-prompt-refine",
+				order: 41,
+				locale: namespace,
+				inject: (sessionId) => {
+					if (sessions === void 0 || conversation === void 0) return { t };
+					const scope = sessions.scope(sessionId);
+					if (scope === void 0) return { t };
+					const facade = sessionInput(conversation, scope);
+					return {
+						t,
+						replaceDraft: (text) => {
+							facade.setDraft(text);
+						},
+						notify: (level, text) => {
+							facade.notify(level, text);
+						}
+					};
+				}
+			}, ClaudePromptRefineAction));
 			ctx.slots.inject("conversation.input.dock", () => ctx.slots.register({
 				name: "conversation.input.dock",
 				id: "claude-review-comments",