@cerbur/clutch-dsh-worktree 0.1.3 → 0.1.4

package/lib/client.js

@@ -811,7 +811,7 @@ window.__ModuleLoader__.load({
 			return (summary?.displayTitle ?? sessionId).toLocaleLowerCase().includes(normalizedQuery);
 		}
 		//#endregion
-		//#region lib/client/worktree-view.js
+		//#region lib/client/worktree-view-errors.js
 		/** A DSH Session exists even when the external Worktree binding needs repair. */
 		var WorktreeSessionBindingError = class extends Error {
 			code;
@@ -832,6 +832,98 @@ window.__ModuleLoader__.load({
 				this.cause = cause;
 			}
 		};
+		function recordDetails(value) {
+			if (typeof value !== "object" || value === null || Array.isArray(value)) return void 0;
+			const details = value.details;
+			if (typeof details !== "object" || details === null || Array.isArray(details)) return void 0;
+			return details;
+		}
+		/** Convert any adapter/Gateway failure into renderable, retry-aware UI data. */
+		function toWorktreeViewError(error) {
+			if (typeof error === "object" && error !== null) {
+				const candidate = error;
+				const details = error instanceof WorktreeSessionBindingError ? {
+					...recordDetails(error) ?? {},
+					sessionId: error.sessionId
+				} : recordDetails(error);
+				return {
+					code: typeof candidate.code === "string" ? candidate.code : "WORKTREE_VIEW_FAILED",
+					message: typeof candidate.message === "string" ? candidate.message : "",
+					retryable: candidate.retryable !== false,
+					...details === void 0 ? {} : { details }
+				};
+			}
+			return {
+				code: "WORKTREE_VIEW_FAILED",
+				message: "",
+				retryable: true
+			};
+		}
+		/** Keep ordering mutation/refresh failures reachable from the surface Retry control. */
+		function toRetryableWorktreeOrderError(error) {
+			return {
+				...toWorktreeViewError(error),
+				retryable: true
+			};
+		}
+		//#endregion
+		//#region lib/client/worktree-view-actions.js
+		function browserRandomUuid() {
+			const randomUUID = globalThis.crypto?.randomUUID;
+			if (typeof randomUUID === "function") return randomUUID.call(globalThis.crypto);
+			return `${Date.now().toString(16)}-${Math.random().toString(16).slice(2)}`;
+		}
+		/** Generate a short, editable default branch name without colliding with known local names. */
+		function createDefaultWorktreeName(existingNames, randomUuid = browserRandomUuid) {
+			const usedNames = new Set([...existingNames].map((name) => name.trim()));
+			for (let attempt = 0; attempt < 100; attempt += 1) {
+				const suffix = randomUuid().replace(/[^a-z0-9]/gi, "").slice(0, 8).toLowerCase();
+				if (suffix.length < 8) continue;
+				const candidate = `dsh/${suffix}`;
+				if (!usedNames.has(candidate)) return candidate;
+			}
+			throw new Error("Unable to generate an available default Worktree name.");
+		}
+		/** Resolve a row-half drop target to native-style optional before-anchor semantics. */
+		function resolveWorktreeMove(worktreeIds, sourceWorktreeId, targetWorktreeId, half) {
+			const sourceIndex = worktreeIds.indexOf(sourceWorktreeId);
+			const targetIndex = worktreeIds.indexOf(targetWorktreeId);
+			if (sourceIndex === -1 || targetIndex === -1) return void 0;
+			const beforeWorktreeId = half === "before" ? targetWorktreeId : worktreeIds[targetIndex + 1];
+			if (beforeWorktreeId === sourceWorktreeId) return void 0;
+			const anchorIndex = beforeWorktreeId === void 0 ? worktreeIds.length : worktreeIds.indexOf(beforeWorktreeId);
+			if (anchorIndex === sourceIndex || anchorIndex === sourceIndex + 1) return void 0;
+			return beforeWorktreeId === void 0 ? {} : { beforeWorktreeId };
+		}
+		/** Keep mutation routing in the browser Consumer while leaving wire details to the adapter. */
+		async function executeWorktreeAction(manager, action) {
+			if (action.type === "createWorktree") return manager.createWorktree(action.input);
+			if (action.type === "removeWorktree") {
+				await manager.removeWorktree(action.input);
+				return;
+			}
+		}
+		/**
+		* Create a normal DSH Session at a Worktree cwd, then add the external binding.
+		* A binding failure deliberately leaves the DSH-created Session intact.
+		*/
+		async function createSessionForWorktree(input) {
+			const sessionId = await input.createSession({ cwd: input.cwd });
+			try {
+				await input.manager.bindSession({
+					workspaceId: input.workspaceId,
+					worktreeId: input.worktreeId,
+					sessionId
+				});
+			} catch (error) {
+				throw new WorktreeSessionBindingError(sessionId, error);
+			}
+			input.beforeOpen?.(sessionId);
+			input.openSession(sessionId);
+			return sessionId;
+		}
+		//#endregion
+		//#region lib/client/worktree-view-read.js
 		/** Reuse the previous ID snapshot when DSH republishes equivalent Workspace items. */
 		function stableWorkspaceIds(previous, next) {
 			if (previous.length !== next.length) return next;
@@ -895,26 +987,6 @@ window.__ModuleLoader__.load({
 				case "ready": return [];
 			}
 		}
-		function browserRandomUuid() {
-			const randomUUID = globalThis.crypto?.randomUUID;
-			if (typeof randomUUID === "function") return randomUUID.call(globalThis.crypto);
-			return `${Date.now().toString(16)}-${Math.random().toString(16).slice(2)}`;
-		}
-		/** Generate a short, editable default branch name without colliding with known local names. */
-		function createDefaultWorktreeName(existingNames, randomUuid = browserRandomUuid) {
-			const usedNames = new Set([...existingNames].map((name) => name.trim()));
-			for (let attempt = 0; attempt < 100; attempt += 1) {
-				const suffix = randomUuid().replace(/[^a-z0-9]/gi, "").slice(0, 8).toLowerCase();
-				if (suffix.length < 8) continue;
-				const candidate = `dsh/${suffix}`;
-				if (!usedNames.has(candidate)) return candidate;
-			}
-			throw new Error("Unable to generate an available default Worktree name.");
-		}
-		/** Hide DSH-archived Sessions from the browser-local Worktree projection. */
-		function filterArchivedSessionIds(sessionIds, archivedSessionIds) {
-			return sessionIds.filter((sessionId) => !archivedSessionIds.includes(sessionId));
-		}
 		function readinessFromBranchError(error) {
 			const viewError = toWorktreeViewError(error);
 			if (viewError.code === "WORKSPACE_NOT_GIT_REPOSITORY") return {
@@ -961,77 +1033,9 @@ window.__ModuleLoader__.load({
 			if (options.invalidateContext !== false) await options.invalidateWorktreeContext?.();
 			return views;
 		}
-		/** Resolve a row-half drop target to native-style optional before-anchor semantics. */
-		function resolveWorktreeMove(worktreeIds, sourceWorktreeId, targetWorktreeId, half) {
-			const sourceIndex = worktreeIds.indexOf(sourceWorktreeId);
-			const targetIndex = worktreeIds.indexOf(targetWorktreeId);
-			if (sourceIndex === -1 || targetIndex === -1) return void 0;
-			const beforeWorktreeId = half === "before" ? targetWorktreeId : worktreeIds[targetIndex + 1];
-			if (beforeWorktreeId === sourceWorktreeId) return void 0;
-			const anchorIndex = beforeWorktreeId === void 0 ? worktreeIds.length : worktreeIds.indexOf(beforeWorktreeId);
-			if (anchorIndex === sourceIndex || anchorIndex === sourceIndex + 1) return void 0;
-			return beforeWorktreeId === void 0 ? {} : { beforeWorktreeId };
-		}
-		/** Keep mutation routing in the browser Consumer while leaving wire details to the adapter. */
-		async function executeWorktreeAction(manager, action) {
-			if (action.type === "createWorktree") return manager.createWorktree(action.input);
-			if (action.type === "removeWorktree") {
-				await manager.removeWorktree(action.input);
-				return;
-			}
-		}
-		/**
-		* Create a normal DSH Session at a Worktree cwd, then add the external binding.
-		* A binding failure deliberately leaves the DSH-created Session intact.
-		*/
-		async function createSessionForWorktree(input) {
-			const sessionId = await input.createSession({ cwd: input.cwd });
-			try {
-				await input.manager.bindSession({
-					workspaceId: input.workspaceId,
-					worktreeId: input.worktreeId,
-					sessionId
-				});
-			} catch (error) {
-				throw new WorktreeSessionBindingError(sessionId, error);
-			}
-			input.beforeOpen?.(sessionId);
-			input.openSession(sessionId);
-			return sessionId;
-		}
-		function recordDetails(value) {
-			if (typeof value !== "object" || value === null || Array.isArray(value)) return void 0;
-			const details = value.details;
-			if (typeof details !== "object" || details === null || Array.isArray(details)) return void 0;
-			return details;
-		}
-		/** Convert any adapter/Gateway failure into renderable, retry-aware UI data. */
-		function toWorktreeViewError(error) {
-			if (typeof error === "object" && error !== null) {
-				const candidate = error;
-				const details = error instanceof WorktreeSessionBindingError ? {
-					...recordDetails(error) ?? {},
-					sessionId: error.sessionId
-				} : recordDetails(error);
-				return {
-					code: typeof candidate.code === "string" ? candidate.code : "WORKTREE_VIEW_FAILED",
-					message: typeof candidate.message === "string" ? candidate.message : "",
-					retryable: candidate.retryable !== false,
-					...details === void 0 ? {} : { details }
-				};
-			}
-			return {
-				code: "WORKTREE_VIEW_FAILED",
-				message: "",
-				retryable: true
-			};
-		}
-		/** Keep ordering mutation/refresh failures reachable from the surface Retry control. */
-		function toRetryableWorktreeOrderError(error) {
-			return {
-				...toWorktreeViewError(error),
-				retryable: true
-			};
+		/** Hide DSH-archived Sessions from the browser-local Worktree projection. */
+		function filterArchivedSessionIds(sessionIds, archivedSessionIds) {
+			return sessionIds.filter((sessionId) => !archivedSessionIds.includes(sessionId));
 		}
 		//#endregion
 		//#region lib/client/worktree-session.js
@@ -1186,7 +1190,7 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
-		//#region lib/client/WorktreeSurface.js
+		//#region lib/client/worktree-surface-dialogs.js
 		function worktreeSetupMessage(status, t) {
 			switch (status) {
 				case "noRepository": return t("worktree.setup.noRepository");
@@ -1194,32 +1198,232 @@ window.__ModuleLoader__.load({
 				case "noLocalBranch": return t("worktree.setup.noLocalBranch");
 			}
 		}
-		function toNativeWorktreeViewError(error) {
-			const viewError = toWorktreeViewError(error);
-			if (typeof error === "object" && error !== null) return viewError;
-			return {
-				...viewError,
-				message: String(error)
-			};
+		function WorktreeSessionRenameDialog({ t, target, draft, pending, error, onClose, onDraftChange, onSubmit }) {
+			return (0, react_jsx_runtime.jsxs)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
+				open: target !== void 0,
+				onClose,
+				closeLabel: t("dialog.close"),
+				title: t("session.rename"),
+				footer: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+					variant: "outline",
+					disabled: pending,
+					onClick: onClose,
+					children: t("dialog.cancel")
+				}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+					variant: "primary",
+					disabled: pending || draft.trim().length === 0,
+					onClick: () => {
+						onSubmit();
+					},
+					children: t("dialog.rename")
+				})] }),
+				children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Input, {
+					className: worktree_css_default.renameInput,
+					value: draft,
+					"aria-label": t("session.name"),
+					autoFocus: true,
+					disabled: pending,
+					onFocus: (event) => {
+						event.currentTarget.select();
+					},
+					onChange: (event) => {
+						onDraftChange(event.currentTarget.value);
+					},
+					onKeyDown: (event) => {
+						if (event.key === "Enter" && !event.nativeEvent.isComposing) {
+							event.preventDefault();
+							onSubmit();
+						}
+					}
+				}), error !== void 0 && (0, react_jsx_runtime.jsx)("p", {
+					className: worktree_css_default.renameError,
+					role: "alert",
+					children: formatWorktreeViewError(error, t)
+				})]
+			});
 		}
-		const EMPTY_READ_STATE = {
-			status: "idle",
-			views: []
-		};
-		function useStableWorkspaceIds(workspaces) {
-			const next = workspaces.map((workspace) => workspace.workspaceId);
-			const previousRef = (0, react.useRef)([]);
-			const stable = stableWorkspaceIds(previousRef.current, next);
-			if (stable !== previousRef.current) previousRef.current = stable;
-			return previousRef.current;
+		function WorktreeWorkspaceRenameDialog({ t, target, draft, pending, duplicate, error, onClose, onDraftChange, onSubmit }) {
+			if (target === void 0) return null;
+			return (0, react_jsx_runtime.jsxs)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
+				open: true,
+				onClose,
+				closeLabel: t("dialog.closeWorkspaceRename"),
+				title: t("workspace.renameTitle"),
+				footer: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+					variant: "outline",
+					disabled: pending,
+					onClick: onClose,
+					children: t("dialog.cancel")
+				}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+					variant: "primary",
+					disabled: pending || draft.trim().length === 0 || draft.trim() === target.currentTitle || duplicate,
+					onClick: () => {
+						onSubmit();
+					},
+					children: t("dialog.rename")
+				})] }),
+				children: [
+					(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Input, {
+						className: worktree_css_default.renameInput,
+						value: draft,
+						"aria-label": t("workspace.name"),
+						autoFocus: true,
+						disabled: pending,
+						onFocus: (event) => {
+							event.currentTarget.select();
+						},
+						onChange: (event) => {
+							onDraftChange(event.currentTarget.value);
+						},
+						onKeyDown: (event) => {
+							if (event.key === "Enter" && !event.nativeEvent.isComposing) {
+								event.preventDefault();
+								onSubmit();
+							}
+						}
+					}),
+					duplicate && (0, react_jsx_runtime.jsx)("p", {
+						className: worktree_css_default.renameError,
+						role: "alert",
+						children: t("workspace.duplicate")
+					}),
+					error !== void 0 && (0, react_jsx_runtime.jsx)("p", {
+						className: worktree_css_default.renameError,
+						role: "alert",
+						children: formatWorktreeViewError(error, t)
+					})
+				]
+			});
+		}
+		function WorktreeWorkspaceDeleteDialog({ t, target, pending, error, onClose, onSubmit }) {
+			if (target === void 0) return null;
+			return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
+				open: true,
+				onClose,
+				closeLabel: t("dialog.closeWorkspaceDelete"),
+				title: t("workspace.deleteTitle"),
+				description: t("workspace.deleteDescription", { name: target.title }),
+				footer: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+					variant: "outline",
+					disabled: pending,
+					onClick: onClose,
+					children: t("dialog.cancel")
+				}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+					variant: "outline",
+					disabled: pending,
+					onClick: () => {
+						onSubmit();
+					},
+					children: t("dialog.delete")
+				})] }),
+				children: error !== void 0 && (0, react_jsx_runtime.jsx)("p", {
+					className: worktree_css_default.renameError,
+					role: "alert",
+					children: formatWorktreeViewError(error, t)
+				})
+			});
+		}
+		function WorktreeCreateDialog({ t, workspace, view, setupStatus, canCreate, selectedBranch, newBranch, actionPending, onClose, onSelectedBranchChange, onNewBranchChange, onSubmit }) {
+			if (workspace === void 0) return null;
+			return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
+				open: true,
+				onClose: () => {
+					if (actionPending) return;
+					onClose();
+				},
+				closeLabel: t("dialog.closeWorktreeCreate"),
+				title: t("worktree.createTitle"),
+				description: t("worktree.createDescription", { name: workspace.title }),
+				footer: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+					variant: "outline",
+					disabled: actionPending,
+					onClick: onClose,
+					children: t("dialog.cancel")
+				}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+					variant: "primary",
+					disabled: actionPending || selectedBranch.length === 0 || newBranch.trim().length === 0,
+					onClick: () => {
+						onSubmit();
+					},
+					children: t("worktree.create")
+				})] }),
+				children: canCreate ? (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsxs)("label", {
+					className: worktree_css_default.modalField,
+					children: [t("worktree.baseBranch"), (0, react_jsx_runtime.jsx)("select", {
+						className: worktree_css_default.actionSelect,
+						"aria-label": t("worktree.baseBranch"),
+						value: selectedBranch,
+						disabled: actionPending,
+						onChange: (event) => {
+							onSelectedBranchChange(event.currentTarget.value);
+						},
+						children: view?.branches.map((branch) => (0, react_jsx_runtime.jsxs)("option", {
+							value: branch.name,
+							children: [
+								branch.name,
+								branch.isCurrent ? t("branch.current") : "",
+								branch.checkedOut ? t("branch.checkedOut") : ""
+							]
+						}, branch.name))
+					})]
+				}), (0, react_jsx_runtime.jsxs)("label", {
+					className: worktree_css_default.modalField,
+					children: [t("worktree.name"), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Input, {
+						className: worktree_css_default.renameInput,
+						"aria-label": t("worktree.name"),
+						value: newBranch,
+						placeholder: "dsh/12345678",
+						disabled: actionPending,
+						onChange: (event) => {
+							onNewBranchChange(event.currentTarget.value);
+						}
+					})]
+				})] }) : (0, react_jsx_runtime.jsxs)("div", {
+					className: worktree_css_default.gitReadiness,
+					"data-worktree-readiness": setupStatus ?? "loading",
+					role: "alert",
+					children: [(0, react_jsx_runtime.jsx)("p", {
+						className: worktree_css_default.message,
+						children: setupStatus === void 0 ? t("status.loading") : worktreeSetupMessage(setupStatus, t)
+					}), setupStatus !== void 0 && (0, react_jsx_runtime.jsx)("pre", {
+						className: worktree_css_default.commandBlock,
+						"aria-label": t("worktree.setup.commands"),
+						children: worktreeSetupCommands(setupStatus).join("\n")
+					})]
+				})
+			});
 		}
+		function WorktreeRemovalDialog({ t, worktree, actionPending, onClose, onSubmit }) {
+			if (worktree === void 0) return null;
+			return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
+				open: true,
+				onClose: () => {
+					if (actionPending) return;
+					onClose();
+				},
+				closeLabel: t("dialog.closeWorktreeRemove"),
+				title: t("worktree.remove"),
+				description: t("worktree.removeDescription", { name: worktree.branch }),
+				footer: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+					variant: "outline",
+					disabled: actionPending,
+					onClick: onClose,
+					children: t("dialog.cancel")
+				}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+					variant: "primary",
+					disabled: actionPending,
+					onClick: () => {
+						onSubmit();
+					},
+					children: t("worktree.remove")
+				})] })
+			});
+		}
+		//#endregion
+		//#region lib/client/worktree-surface-selectors.js
 		function sessionLabel(sessionId, sessions, t) {
 			return sessionDisplayLabel(sessionId, sessions, t("session.new"));
 		}
-		function rowHalf(event) {
-			const rect = event.currentTarget.getBoundingClientRect();
-			return event.clientY < rect.top + rect.height / 2 ? "before" : "after";
-		}
 		function bindingIdsFor(bindings, worktreeId) {
 			return bindings.filter((binding) => binding.worktreeId === worktreeId).map((binding) => binding.sessionId);
 		}
@@ -1234,6 +1438,12 @@ window.__ModuleLoader__.load({
 			if (view.worktrees.some((record) => includesText(record.branch, query) || includesText(record.absolutePath, query))) return true;
 			return view.bindings.some((binding) => sessionMatchesQuery(binding.sessionId, sessions, query));
 		}
+		//#endregion
+		//#region lib/client/worktree-surface-rows.js
+		function rowHalf(event) {
+			const rect = event.currentTarget.getBoundingClientRect();
+			return event.clientY < rect.top + rect.height / 2 ? "before" : "after";
+		}
 		/** Workspace row using the native DSH menu, fixed action column, and drag contract. */
 		function WorktreeWorkspaceRow({ t, workspace, expanded, actionPending, menuOpen, drag, onToggle, onCreateWorktree, onRename, onDelete, onMenuOpenChange }) {
 			const workspaceMenuItems = [{
@@ -1596,6 +1806,27 @@ window.__ModuleLoader__.load({
 				children: expanded ? t("session.collapse") : t("session.expandMore", { count: sessionIds.length - 5 })
 			})] });
 		}
+		//#endregion
+		//#region lib/client/WorktreeSurface.js
+		function toNativeWorktreeViewError(error) {
+			const viewError = toWorktreeViewError(error);
+			if (typeof error === "object" && error !== null) return viewError;
+			return {
+				...viewError,
+				message: String(error)
+			};
+		}
+		const EMPTY_READ_STATE = {
+			status: "idle",
+			views: []
+		};
+		function useStableWorkspaceIds(workspaces) {
+			const next = workspaces.map((workspace) => workspace.workspaceId);
+			const previousRef = (0, react.useRef)([]);
+			const stable = stableWorkspaceIds(previousRef.current, next);
+			if (stable !== previousRef.current) previousRef.current = stable;
+			return previousRef.current;
+		}
 		/**
 		* Peer Worktree navigation surface. It keeps the original DSH Workspace mode
 		* intact and renders a browser-local Workspace → Worktree → Session projection.
@@ -2457,230 +2688,79 @@ window.__ModuleLoader__.load({
 							children: "WT"
 						})
 					}),
-					(0, react_jsx_runtime.jsxs)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
-						open: sessionRenameTarget !== void 0,
+					(0, react_jsx_runtime.jsx)(WorktreeSessionRenameDialog, {
+						t,
+						target: sessionRenameTarget,
+						draft: sessionRenameDraft,
+						pending: sessionRenamePending,
+						error: sessionRenameError,
 						onClose: closeSessionRename,
-						closeLabel: t("dialog.close"),
-						title: t("session.rename"),
-						footer: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-							variant: "outline",
-							disabled: sessionRenamePending,
-							onClick: closeSessionRename,
-							children: t("dialog.cancel")
-						}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-							variant: "primary",
-							disabled: sessionRenamePending || sessionRenameDraft.trim().length === 0,
-							onClick: () => {
-								confirmSessionRename();
-							},
-							children: t("dialog.rename")
-						})] }),
-						children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Input, {
-							className: worktree_css_default.renameInput,
-							value: sessionRenameDraft,
-							"aria-label": t("session.name"),
-							autoFocus: true,
-							disabled: sessionRenamePending,
-							onFocus: (event) => {
-								event.currentTarget.select();
-							},
-							onChange: (event) => {
-								setSessionRenameDraft(event.currentTarget.value);
-								setSessionRenameError(void 0);
-							},
-							onKeyDown: (event) => {
-								if (event.key === "Enter" && !event.nativeEvent.isComposing) {
-									event.preventDefault();
-									confirmSessionRename();
-								}
-							}
-						}), sessionRenameError !== void 0 && (0, react_jsx_runtime.jsx)("p", {
-							className: worktree_css_default.renameError,
-							role: "alert",
-							children: formatWorktreeViewError(sessionRenameError, t)
-						})]
+						onDraftChange: (draft) => {
+							setSessionRenameDraft(draft);
+							setSessionRenameError(void 0);
+						},
+						onSubmit: confirmSessionRename
 					}),
-					workspaceRenameTarget !== void 0 && (0, react_jsx_runtime.jsxs)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
-						open: workspaceRenameTarget !== void 0,
+					(0, react_jsx_runtime.jsx)(WorktreeWorkspaceRenameDialog, {
+						t,
+						target: workspaceRenameTarget,
+						draft: workspaceRenameDraft,
+						pending: workspaceRenamePending,
+						duplicate: workspaceRenameDuplicate,
+						error: workspaceRenameError,
 						onClose: closeWorkspaceRename,
-						closeLabel: t("dialog.closeWorkspaceRename"),
-						title: t("workspace.renameTitle"),
-						footer: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-							variant: "outline",
-							disabled: workspaceRenamePending,
-							onClick: closeWorkspaceRename,
-							children: t("dialog.cancel")
-						}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-							variant: "primary",
-							disabled: workspaceRenameBlocked,
-							onClick: () => {
-								confirmWorkspaceRename();
-							},
-							children: t("dialog.rename")
-						})] }),
-						children: [
-							(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Input, {
-								className: worktree_css_default.renameInput,
-								value: workspaceRenameDraft,
-								"aria-label": t("workspace.name"),
-								autoFocus: true,
-								disabled: workspaceRenamePending,
-								onFocus: (event) => {
-									event.currentTarget.select();
-								},
-								onChange: (event) => {
-									setWorkspaceRenameDraft(event.currentTarget.value);
-									setWorkspaceRenameError(void 0);
-								},
-								onKeyDown: (event) => {
-									if (event.key === "Enter" && !event.nativeEvent.isComposing) {
-										event.preventDefault();
-										confirmWorkspaceRename();
-									}
-								}
-							}),
-							workspaceRenameDuplicate && (0, react_jsx_runtime.jsx)("p", {
-								className: worktree_css_default.renameError,
-								role: "alert",
-								children: t("workspace.duplicate")
-							}),
-							workspaceRenameError !== void 0 && (0, react_jsx_runtime.jsx)("p", {
-								className: worktree_css_default.renameError,
-								role: "alert",
-								children: formatWorktreeViewError(workspaceRenameError, t)
-							})
-						]
+						onDraftChange: (draft) => {
+							setWorkspaceRenameDraft(draft);
+							setWorkspaceRenameError(void 0);
+						},
+						onSubmit: confirmWorkspaceRename
 					}),
-					workspaceDeleteTarget !== void 0 && (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
-						open: workspaceDeleteTarget !== void 0,
+					(0, react_jsx_runtime.jsx)(WorktreeWorkspaceDeleteDialog, {
+						t,
+						target: workspaceDeleteTarget,
+						pending: workspaceDeletePending,
+						error: workspaceDeleteError,
 						onClose: closeWorkspaceDelete,
-						closeLabel: t("dialog.closeWorkspaceDelete"),
-						title: t("workspace.deleteTitle"),
-						description: t("workspace.deleteDescription", { name: workspaceDeleteTarget.title }),
-						footer: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-							variant: "outline",
-							disabled: workspaceDeletePending,
-							onClick: closeWorkspaceDelete,
-							children: t("dialog.cancel")
-						}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-							variant: "outline",
-							disabled: workspaceDeletePending,
-							onClick: () => {
-								confirmWorkspaceDelete();
-							},
-							children: t("dialog.delete")
-						})] }),
-						children: workspaceDeleteError !== void 0 && (0, react_jsx_runtime.jsx)("p", {
-							className: worktree_css_default.renameError,
-							role: "alert",
-							children: formatWorktreeViewError(workspaceDeleteError, t)
-						})
+						onSubmit: confirmWorkspaceDelete
 					}),
-					worktreeModalWorkspaceId !== void 0 && modalWorkspace !== void 0 && (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
-						open: worktreeModalWorkspaceId !== void 0,
+					(0, react_jsx_runtime.jsx)(WorktreeCreateDialog, {
+						t,
+						workspace: modalWorkspace,
+						view: modalView,
+						setupStatus: modalSetupStatus,
+						canCreate: modalCanCreate,
+						selectedBranch,
+						newBranch,
+						actionPending,
 						onClose: () => {
-							if (actionPending) return;
 							setWorktreeModalWorkspaceId(void 0);
 						},
-						closeLabel: t("dialog.closeWorktreeCreate"),
-						title: t("worktree.createTitle"),
-						description: t("worktree.createDescription", { name: modalWorkspace.title }),
-						footer: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-							variant: "outline",
-							disabled: actionPending,
-							onClick: () => {
-								setWorktreeModalWorkspaceId(void 0);
-							},
-							children: t("dialog.cancel")
-						}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-							variant: "primary",
-							disabled: actionPending || selectedBranch.length === 0 || newBranch.trim().length === 0,
-							onClick: () => {
-								submitWorktree();
-							},
-							children: t("worktree.create")
-						})] }),
-						children: modalCanCreate ? (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsxs)("label", {
-							className: worktree_css_default.modalField,
-							children: [t("worktree.baseBranch"), (0, react_jsx_runtime.jsx)("select", {
-								className: worktree_css_default.actionSelect,
-								"aria-label": t("worktree.baseBranch"),
-								value: selectedBranch,
-								disabled: actionPending,
-								onChange: (event) => {
-									setSelectedBranch(event.currentTarget.value);
-								},
-								children: modalView?.branches.map((branch) => (0, react_jsx_runtime.jsxs)("option", {
-									value: branch.name,
-									children: [
-										branch.name,
-										branch.isCurrent ? t("branch.current") : "",
-										branch.checkedOut ? t("branch.checkedOut") : ""
-									]
-								}, branch.name))
-							})]
-						}), (0, react_jsx_runtime.jsxs)("label", {
-							className: worktree_css_default.modalField,
-							children: [t("worktree.name"), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Input, {
-								className: worktree_css_default.renameInput,
-								"aria-label": t("worktree.name"),
-								value: newBranch,
-								placeholder: "dsh/12345678",
-								disabled: actionPending,
-								onChange: (event) => {
-									setNewBranch(event.currentTarget.value);
-								}
-							})]
-						})] }) : (0, react_jsx_runtime.jsxs)("div", {
-							className: worktree_css_default.gitReadiness,
-							"data-worktree-readiness": modalSetupStatus ?? "loading",
-							role: "alert",
-							children: [(0, react_jsx_runtime.jsx)("p", {
-								className: worktree_css_default.message,
-								children: modalSetupStatus === void 0 ? t("status.loading") : worktreeSetupMessage(modalSetupStatus, t)
-							}), modalSetupStatus !== void 0 && (0, react_jsx_runtime.jsx)("pre", {
-								className: worktree_css_default.commandBlock,
-								"aria-label": t("worktree.setup.commands"),
-								children: worktreeSetupCommands(modalSetupStatus).join("\n")
-							})]
-						})
+						onSelectedBranchChange: setSelectedBranch,
+						onNewBranchChange: setNewBranch,
+						onSubmit: submitWorktree
 					}),
-					worktreeRemoval !== void 0 && (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
-						open: worktreeRemoval !== void 0,
+					(0, react_jsx_runtime.jsx)(WorktreeRemovalDialog, {
+						t,
+						worktree: worktreeRemoval,
+						actionPending,
 						onClose: () => {
-							if (actionPending) return;
 							setWorktreeRemoval(void 0);
 						},
-						closeLabel: t("dialog.closeWorktreeRemove"),
-						title: t("worktree.remove"),
-						description: t("worktree.removeDescription", { name: worktreeRemoval.branch }),
-						footer: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-							variant: "outline",
-							disabled: actionPending,
-							onClick: () => {
-								setWorktreeRemoval(void 0);
-							},
-							children: t("dialog.cancel")
-						}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-							variant: "primary",
-							disabled: actionPending,
-							onClick: () => {
-								if (manager === void 0) return;
-								const target = worktreeRemoval;
-								runMutation(async () => {
-									await executeWorktreeAction(manager, {
-										type: "removeWorktree",
-										input: {
-											workspaceId: target.workspaceId,
-											worktreeId: target.worktreeId
-										}
-									});
-									await invalidateWorktreeContext?.(target.workspaceId);
-									setWorktreeRemoval(void 0);
+						onSubmit: () => {
+							if (manager === void 0 || worktreeRemoval === void 0) return;
+							const target = worktreeRemoval;
+							runMutation(async () => {
+								await executeWorktreeAction(manager, {
+									type: "removeWorktree",
+									input: {
+										workspaceId: target.workspaceId,
+										worktreeId: target.worktreeId
+									}
 								});
-							},
-							children: t("worktree.remove")
-						})] })
+								await invalidateWorktreeContext?.(target.workspaceId);
+								setWorktreeRemoval(void 0);
+							});
+						}
 					})
 				]
 			});