@norman-else/dsh-claude 0.1.21 → 0.1.22

package/lib/client.js

@@ -577,15 +577,15 @@ window.__ModuleLoader__.load({
 		const settingsBody = {
 			margin: 0,
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 13,
-			lineHeight: "20px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const settingsCard = {
 			display: "flex",
 			flexDirection: "column",
 			gap: 14,
 			padding: 18,
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 14,
 			background: "var(--dsw-alias-bg-layer-1)"
 		};
@@ -600,8 +600,8 @@ window.__ModuleLoader__.load({
 			gridTemplateColumns: "minmax(130px, 0.36fr) minmax(0, 1fr)",
 			gap: "10px 18px",
 			padding: "14px 0",
-			borderTop: "1px solid var(--dsw-alias-border-l2)",
-			borderBottom: "1px solid var(--dsw-alias-border-l2)",
+			borderTop: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
+			borderBottom: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			fontSize: 13
 		};
 		const diagnosticLabel = { color: "var(--dsw-alias-label-tertiary)" };
@@ -620,13 +620,13 @@ window.__ModuleLoader__.load({
 			boxSizing: "border-box",
 			minHeight: 38,
 			padding: "7px 13px",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 10,
 			background: "var(--dsw-alias-bg-layer-2)",
 			color: "var(--dsw-alias-label-primary)",
 			font: "inherit",
-			fontSize: 13,
-			lineHeight: "20px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const settingSelectTrigger = {
 			width: "100%",
@@ -636,14 +636,14 @@ window.__ModuleLoader__.load({
 			justifyContent: "space-between",
 			gap: 12,
 			padding: "7px 11px 7px 13px",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 10,
 			background: "var(--dsw-alias-bg-layer-2)",
 			color: "var(--dsw-alias-label-primary)",
 			boxShadow: "0 1px 2px color-mix(in srgb, var(--dsw-alias-label-primary) 5%, transparent)",
 			font: "inherit",
-			fontSize: 13,
-			lineHeight: "20px",
+			fontSize: 14,
+			lineHeight: "22px",
 			textAlign: "left",
 			cursor: "pointer",
 			transition: "border-color 120ms ease, box-shadow 120ms ease, background 120ms ease"
@@ -678,7 +678,7 @@ window.__ModuleLoader__.load({
 			maxHeight: 240,
 			overflowY: "auto",
 			padding: 5,
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 11,
 			background: "var(--dsw-alias-bg-layer-1)",
 			boxShadow: "0 12px 32px color-mix(in srgb, var(--dsw-alias-label-primary) 16%, transparent), 0 2px 8px color-mix(in srgb, var(--dsw-alias-label-primary) 8%, transparent)"
@@ -695,8 +695,8 @@ window.__ModuleLoader__.load({
 			background: "transparent",
 			color: "var(--dsw-alias-label-primary)",
 			font: "inherit",
-			fontSize: 13,
-			lineHeight: "20px",
+			fontSize: 14,
+			lineHeight: "22px",
 			textAlign: "left",
 			cursor: "pointer"
 		};
@@ -728,7 +728,7 @@ window.__ModuleLoader__.load({
 			flex: "none",
 			minHeight: 34,
 			padding: "6px 14px",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 9,
 			background: "var(--dsw-alias-bg-layer-2)",
 			color: "var(--dsw-alias-label-primary)",
@@ -752,7 +752,7 @@ window.__ModuleLoader__.load({
 			minWidth: 0,
 			margin: 8,
 			overflow: "hidden",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 12,
 			background: "var(--dsw-alias-bg-layer-1)",
 			boxShadow: "0 4px 16px color-mix(in srgb, #000 12%, transparent)"
@@ -766,7 +766,7 @@ window.__ModuleLoader__.load({
 			justifyContent: "space-between",
 			gap: 10,
 			padding: "9px 12px",
-			borderBottom: "1px solid var(--dsw-alias-border-l2)"
+			borderBottom: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))"
 		};
 		const tasksHeading = {
 			display: "block",
@@ -830,8 +830,8 @@ window.__ModuleLoader__.load({
 			alignItems: "center",
 			gap: 6,
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 13,
-			lineHeight: "20px",
+			fontSize: 14,
+			lineHeight: "22px",
 			fontWeight: 600
 		};
 		const tasksGroupToggle = {
@@ -843,8 +843,8 @@ window.__ModuleLoader__.load({
 			background: "transparent",
 			color: "var(--dsw-alias-label-secondary)",
 			font: "inherit",
-			fontSize: 13,
-			lineHeight: "20px",
+			fontSize: 14,
+			lineHeight: "22px",
 			fontWeight: 600,
 			cursor: "pointer"
 		};
@@ -868,7 +868,7 @@ window.__ModuleLoader__.load({
 		const tasksFinishedSection = {
 			marginTop: 12,
 			paddingTop: 8,
-			borderTop: "1px solid var(--dsw-alias-border-l2)"
+			borderTop: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))"
 		};
 		const taskCardList = {
 			display: "flex",
@@ -878,12 +878,12 @@ window.__ModuleLoader__.load({
 		};
 		const taskCard = {
 			padding: "11px 12px",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 10,
 			background: "var(--dsw-alias-bg-layer-1)",
 			boxShadow: "0 1px 3px color-mix(in srgb, #000 7%, transparent)"
 		};
-		const taskCardRunning = { borderColor: "var(--dsw-alias-border-l3)" };
+		const taskCardRunning = { borderColor: "var(--dsw-alias-border-l3, color-mix(in srgb, currentColor 24%, transparent))" };
 		const taskCardTop = {
 			display: "flex",
 			alignItems: "flex-start",
@@ -994,7 +994,7 @@ window.__ModuleLoader__.load({
 		};
 		const tasksBadgeWrap = {
 			display: "flex",
-			justifyContent: "flex-end",
+			justifyContent: "flex-start",
 			margin: "8px 0 4px"
 		};
 		const tasksBadgeSeat = {
@@ -1009,15 +1009,15 @@ window.__ModuleLoader__.load({
 			border: "none",
 			borderRadius: 6,
 			background: "transparent",
-			color: "var(--dsw-alias-label-tertiary)",
+			color: "var(--dsw-static-blue-450)",
 			font: "inherit",
-			fontSize: 11,
-			lineHeight: "16px",
+			fontSize: 14,
+			lineHeight: "22px",
 			fontVariantNumeric: "tabular-nums",
 			cursor: "pointer",
 			transition: "color 120ms ease, opacity 120ms ease"
 		};
-		const tasksBadgeHovered = { color: "var(--dsw-alias-label-secondary)" };
+		const tasksBadgeHovered = { textDecoration: "underline" };
 		const tasksBadgeDone = { opacity: .7 };
 		const tasksBadgeDot = {
 			width: 8,
@@ -1028,10 +1028,10 @@ window.__ModuleLoader__.load({
 		};
 		const tasksBadgeDotError = { background: "var(--dsw-alias-state-error-primary)" };
 		const tasksBadgeDotDone = { background: "var(--dsw-alias-state-success-primary, var(--dsw-static-green-500))" };
-		const tasksBadgeCount = { fontWeight: 600 };
+		const tasksBadgeLabel = { fontWeight: 500 };
 		const tasksHoverCard = {
 			position: "absolute",
-			right: 0,
+			left: 0,
 			bottom: "calc(100% + 8px)",
 			zIndex: 40,
 			minWidth: 240,
@@ -1041,7 +1041,7 @@ window.__ModuleLoader__.load({
 			flexDirection: "column",
 			gap: 6,
 			padding: "10px 12px",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 12,
 			background: "var(--dsw-alias-bg-layer-2)",
 			boxShadow: "0 8px 24px color-mix(in srgb, #000 24%, transparent)",
@@ -1087,7 +1087,7 @@ window.__ModuleLoader__.load({
 		const tasksHoverHint = {
 			marginTop: 2,
 			paddingTop: 6,
-			borderTop: "1px solid var(--dsw-alias-border-l1)",
+			borderTop: "1px solid var(--dsw-alias-border-l1, color-mix(in srgb, currentColor 12%, transparent))",
 			color: "var(--dsw-alias-label-tertiary)",
 			fontSize: 11
 		};
@@ -1104,7 +1104,7 @@ window.__ModuleLoader__.load({
 			alignItems: "center",
 			minWidth: 0,
 			padding: 2,
-			border: "1px solid var(--dsw-alias-border-l1)",
+			border: "1px solid var(--dsw-alias-border-l1, color-mix(in srgb, currentColor 12%, transparent))",
 			borderRadius: 10,
 			background: "var(--dsw-alias-interactive-bg-base, var(--dsw-alias-bg-layer-1))",
 			color: "var(--dsw-alias-label-secondary)"
@@ -1149,7 +1149,7 @@ window.__ModuleLoader__.load({
 			flexDirection: "column",
 			gap: 4,
 			padding: 4,
-			border: "1px solid var(--dsw-alias-border-inverted)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 10,
 			background: "var(--dsw-specific-menu)",
 			boxShadow: "var(--dsw-shadow-lv3)"
@@ -1161,7 +1161,7 @@ window.__ModuleLoader__.load({
 			alignItems: "center",
 			gap: 6,
 			padding: "0 8px",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 7,
 			background: "var(--dsw-alias-bg-layer-1)",
 			color: "var(--dsw-alias-label-tertiary)"
@@ -1221,7 +1221,7 @@ window.__ModuleLoader__.load({
 			width: 1,
 			height: 16,
 			flex: "none",
-			background: "var(--dsw-alias-border-l2)"
+			background: "var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))"
 		};
 		const heroWorktreeToggle = {
 			height: 26,
@@ -1253,7 +1253,7 @@ window.__ModuleLoader__.load({
 			display: "grid",
 			placeItems: "center",
 			flex: "none",
-			border: "1px solid var(--dsw-alias-border-inverted)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 4,
 			background: "var(--dsw-alias-bg-layer-2)",
 			boxShadow: "inset 0 1px 1px rgba(0, 0, 0, 0.08)",
@@ -1281,7 +1281,7 @@ window.__ModuleLoader__.load({
 			flexDirection: "column",
 			gap: 12,
 			padding: 14,
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 12,
 			background: "var(--dsw-alias-bg-layer-1)",
 			boxShadow: "var(--dsw-shadow-lv3)"
@@ -1401,18 +1401,18 @@ window.__ModuleLoader__.load({
 			alignItems: "center",
 			gap: 9,
 			padding: "7px 11px",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 11,
 			background: "var(--dsw-alias-bg-layer-1)",
 			color: "var(--dsw-alias-label-primary)",
 			boxShadow: "0 1px 2px color-mix(in srgb, var(--dsw-alias-label-primary) 4%, transparent)",
 			font: "inherit",
-			fontSize: 13,
-			lineHeight: "20px",
+			fontSize: 14,
+			lineHeight: "22px",
 			textAlign: "left"
 		};
 		const repositoryBarMerged = {
-			borderColor: "color-mix(in srgb, #a78bfa 30%, var(--dsw-alias-border-l2))",
+			borderColor: "color-mix(in srgb, #a78bfa 30%, var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent)))",
 			background: "color-mix(in srgb, #a78bfa 5%, var(--dsw-alias-bg-layer-1))"
 		};
 		const repositoryPrIcon = {
@@ -1457,7 +1457,7 @@ window.__ModuleLoader__.load({
 			flexDirection: "column",
 			gap: 10,
 			padding: "13px 14px",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 12,
 			background: "var(--dsw-alias-bg-layer-1)",
 			boxShadow: "0 14px 38px color-mix(in srgb, #000 34%, transparent)",
@@ -1632,7 +1632,7 @@ window.__ModuleLoader__.load({
 			gap: 4,
 			minHeight: 26,
 			padding: "3px 8px",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 7,
 			background: "var(--dsw-alias-bg-layer-2)",
 			font: "inherit",
@@ -1645,6 +1645,23 @@ window.__ModuleLoader__.load({
 			background: "transparent",
 			color: "var(--dsw-alias-label-tertiary)"
 		};
+		const repositoryMergeTrigger = {
+			flex: "none",
+			display: "inline-flex",
+			alignItems: "center",
+			gap: 4,
+			minHeight: 26,
+			padding: "3px 8px",
+			border: "1px solid color-mix(in srgb, var(--dsw-alias-state-success-primary) 45%, transparent)",
+			borderRadius: 7,
+			background: "color-mix(in srgb, var(--dsw-alias-state-success-primary) 12%, transparent)",
+			color: "var(--dsw-alias-state-success-primary)",
+			font: "inherit",
+			fontSize: 12,
+			lineHeight: "18px",
+			fontWeight: 650,
+			cursor: "pointer"
+		};
 		const diffAdd = { color: "var(--dsw-alias-state-success-primary)" };
 		const diffDelete = { color: "var(--dsw-alias-state-error-primary)" };
 		const diffCommentButtonClass = "dshClaudeDiffCommentButton";
@@ -1690,7 +1707,7 @@ window.__ModuleLoader__.load({
 			left: 62,
 			margin: "4px 8px 8px 62px",
 			padding: "8px 10px",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 8,
 			background: "var(--dsw-alias-bg-layer-1)",
 			fontFamily: "var(--dsw-font-family, system-ui)",
@@ -1717,7 +1734,7 @@ window.__ModuleLoader__.load({
 			minHeight: 56,
 			boxSizing: "border-box",
 			padding: "6px 8px",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 6,
 			background: "var(--dsw-alias-bg-base)",
 			color: "var(--dsw-alias-label-primary)",
@@ -1733,7 +1750,7 @@ window.__ModuleLoader__.load({
 		const diffCommentActionButton = {
 			minHeight: 24,
 			padding: "2px 10px",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 6,
 			background: "transparent",
 			color: "var(--dsw-alias-label-secondary)",
@@ -1768,7 +1785,7 @@ window.__ModuleLoader__.load({
 			alignItems: "center",
 			gap: 8,
 			padding: "7px 11px",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 11,
 			background: "var(--dsw-alias-bg-layer-1)",
 			boxShadow: "0 1px 2px color-mix(in srgb, var(--dsw-alias-label-primary) 4%, transparent)",
@@ -1856,7 +1873,7 @@ window.__ModuleLoader__.load({
 			minWidth: 0,
 			margin: 8,
 			overflow: "hidden",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 12,
 			background: "var(--dsw-alias-bg-layer-1)",
 			boxShadow: "0 4px 16px color-mix(in srgb, #000 12%, transparent)"
@@ -1875,7 +1892,7 @@ window.__ModuleLoader__.load({
 			justifyContent: "space-between",
 			gap: 10,
 			padding: "9px 12px",
-			borderBottom: "1px solid var(--dsw-alias-border-l2)"
+			borderBottom: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))"
 		};
 		const diffHeaderTitle = {
 			minWidth: 0,
@@ -1939,7 +1956,7 @@ window.__ModuleLoader__.load({
 			alignItems: "center",
 			gap: 7,
 			padding: "6px 12px",
-			borderBottom: "1px solid var(--dsw-alias-border-l2)",
+			borderBottom: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			color: "var(--dsw-alias-label-tertiary)",
 			fontSize: 12
 		};
@@ -1949,7 +1966,7 @@ window.__ModuleLoader__.load({
 			overflow: "auto",
 			background: "var(--dsw-alias-bg-base)"
 		};
-		const diffFile = { borderBottom: "1px solid var(--dsw-alias-border-l2)" };
+		const diffFile = { borderBottom: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))" };
 		const diffFileHeader = {
 			width: "100%",
 			minHeight: 38,
@@ -1984,8 +2001,8 @@ window.__ModuleLoader__.load({
 			padding: "4px 0 8px",
 			background: "var(--dsw-alias-bg-base)",
 			fontFamily: "var(--dsw-font-family-mono, ui-monospace, SFMono-Regular, Consolas, monospace)",
-			fontSize: 13,
-			lineHeight: "20px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const diffLine = {
 			minHeight: 17,
@@ -2099,7 +2116,7 @@ window.__ModuleLoader__.load({
 			maxHeight: 300,
 			overflowX: "hidden",
 			overflowY: "auto",
-			border: "1px solid var(--dsw-alias-border-l2)",
+			border: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			borderRadius: 8
 		};
 		const diffModalFile = {
@@ -2108,7 +2125,7 @@ window.__ModuleLoader__.load({
 			gap: 12,
 			minWidth: 0,
 			padding: "10px 14px",
-			borderBottom: "1px solid var(--dsw-alias-border-l2)",
+			borderBottom: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			color: "var(--dsw-alias-label-secondary)",
 			fontSize: 15,
 			lineHeight: "22px"
@@ -2576,8 +2593,8 @@ window.__ModuleLoader__.load({
 							},
 							"aria-hidden": "true"
 						}), /* @__PURE__ */ jsx("span", {
-							style: tasksBadgeCount,
-							children: turnTasks.length
+							style: tasksBadgeLabel,
+							children: label
 						})]
 					})]
 				})
@@ -3033,8 +3050,8 @@ window.__ModuleLoader__.load({
 			".dsh-claude-transcript-text{color:var(--dsw-alias-label-primary);font-size:15px;line-height:24px;overflow-wrap:anywhere}",
 			".dsh-claude-tool-group-native{overflow:visible}",
 			".dsh-claude-tool-group-native>.dsh-claude-flow-row{padding:0}",
-			".dsh-claude-tool-list{max-height:min(420px,calc(100vh - 320px));overflow-x:hidden;overflow-y:auto;overscroll-behavior:contain;margin-top:4px;border:1px solid var(--dsw-alias-border-l1);border-radius:10px;scrollbar-gutter:stable}",
-			".dsh-claude-tool-item{border-top:1px solid var(--dsw-alias-border-l1)}",
+			".dsh-claude-tool-list{max-height:min(420px,calc(100vh - 320px));overflow-x:hidden;overflow-y:auto;overscroll-behavior:contain;margin-top:4px;border:1px solid var(--dsw-alias-border-l1, color-mix(in srgb, currentColor 12%, transparent));border-radius:10px;scrollbar-gutter:stable}",
+			".dsh-claude-tool-item{border-top:1px solid var(--dsw-alias-border-l1, color-mix(in srgb, currentColor 12%, transparent))}",
 			".dsh-claude-tool-item:first-child{border-top:0}",
 			".dsh-claude-tool-summary-row{display:flex;align-items:center;min-height:34px;gap:8px;padding:0 10px;cursor:pointer;list-style:none}",
 			".dsh-claude-tool-summary-row::-webkit-details-marker{display:none}",
@@ -3051,7 +3068,7 @@ window.__ModuleLoader__.load({
 			".dsh-claude-tool-path{overflow-wrap:anywhere;color:var(--dsw-alias-label-primary)}",
 			".dsh-claude-tool-code{max-height:260px;overflow:auto;margin:0;padding:8px 0;border-radius:8px;background:var(--dsw-alias-markdown-code-block);font:var(--dsw-font-markdown-code-block-small)}",
 			".dsh-claude-tool-code-line{display:grid;grid-template-columns:44px minmax(max-content,1fr);min-height:18px}",
-			".dsh-claude-tool-line-number{padding-right:10px;text-align:right;user-select:none;color:var(--dsw-alias-label-caption);border-right:1px solid var(--dsw-alias-border-l1)}",
+			".dsh-claude-tool-line-number{padding-right:10px;text-align:right;user-select:none;color:var(--dsw-alias-label-caption);border-right:1px solid var(--dsw-alias-border-l1, color-mix(in srgb, currentColor 12%, transparent))}",
 			".dsh-claude-tool-line-text{padding:0 10px;white-space:pre}",
 			".dsh-claude-tool-label{width:72px;flex:none;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:13px;line-height:20px;color:var(--dsw-alias-label-tertiary)}",
 			".dsh-claude-tool-description{min-width:0;flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:14px;line-height:20px;color:var(--dsw-alias-label-primary)}",
@@ -3069,7 +3086,7 @@ window.__ModuleLoader__.load({
 			".dsh-claude-flow-summary{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-tertiary);font-size:14px;line-height:24px;flex:auto}",
 			".dsh-claude-flow-summary[data-error]{color:var(--dsw-alias-state-error-primary)}",
 			".dsh-claude-flow-body{margin:4px 0 4px 22px;color:var(--dsw-alias-label-tertiary);font-size:14px;line-height:24px;white-space:pre-wrap;overflow-wrap:anywhere}",
-			".dsh-claude-flow-detail{max-height:260px;overflow:auto;margin:4px 0 4px 4px;padding:12px 16px;border:1px solid var(--dsw-alias-border-l1);border-radius:12px;background:var(--dsw-alias-markdown-code-block);color:var(--dsw-alias-label-primary);font:var(--dsw-font-markdown-code-block-small);white-space:pre-wrap}",
+			".dsh-claude-flow-detail{max-height:260px;overflow:auto;margin:4px 0 4px 4px;padding:12px 16px;border:1px solid var(--dsw-alias-border-l1, color-mix(in srgb, currentColor 12%, transparent));border-radius:12px;background:var(--dsw-alias-markdown-code-block);color:var(--dsw-alias-label-primary);font:var(--dsw-font-markdown-code-block-small);white-space:pre-wrap}",
 			".dsh-claude-flow-subcalls{display:flex;flex-direction:column;gap:2px;margin:4px 0 4px 22px;color:var(--dsw-alias-label-tertiary);font-size:13px;line-height:22px}",
 			".dsh-claude-act-running{animation:dsh-claude-act-pulse 1.2s ease-in-out infinite}",
 			"@keyframes dsh-claude-act-pulse{0%,100%{opacity:1}50%{opacity:.3}}"
@@ -3935,6 +3952,84 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
+		//#region src/client/repository-action-api.ts
+		var RepositoryActionClientError = class extends Error {
+			code;
+			commit;
+			constructor(message, code, commit) {
+				super(message);
+				this.name = "RepositoryActionClientError";
+				if (code !== void 0) this.code = code;
+				if (commit !== void 0) this.commit = commit;
+			}
+		};
+		function record$2(value) {
+			return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+		}
+		async function response$1(pending) {
+			const result = await pending;
+			const body = await result.json();
+			if (!result.ok) {
+				const error = record$2(body);
+				throw new RepositoryActionClientError(typeof error?.message === "string" ? error.message : "Repository action failed.", typeof error?.error === "string" ? error.error : void 0, typeof error?.commit === "string" ? error.commit : void 0);
+			}
+			return body;
+		}
+		function preview(value) {
+			const input = record$2(value);
+			if (input === void 0 || typeof input.root !== "string" || typeof input.branch !== "string" || typeof input.head !== "string" || typeof input.fingerprint !== "string" || !Array.isArray(input.files) || typeof input.patch !== "string" || typeof input.truncated !== "boolean" || typeof input.hasStaged !== "boolean" || typeof input.hasUnstaged !== "boolean" || typeof input.hasUntracked !== "boolean" || input.upstream !== void 0 && typeof input.upstream !== "string" || !Array.isArray(input.unpushedCommits) || typeof input.unpushedTruncated !== "boolean") throw new Error("Invalid repository action preview.");
+			for (const file of input.files) {
+				const item = record$2(file);
+				if (item === void 0 || typeof item.path !== "string" || typeof item.staged !== "boolean" || typeof item.unstaged !== "boolean" || typeof item.untracked !== "boolean") throw new Error("Invalid repository action file.");
+			}
+			for (const commit of input.unpushedCommits) {
+				const item = record$2(commit);
+				if (item === void 0 || typeof item.hash !== "string" || typeof item.subject !== "string") throw new Error("Invalid repository action commit.");
+			}
+			return input;
+		}
+		function result(value) {
+			const input = record$2(value);
+			if (input === void 0 || typeof input.commit !== "string" || typeof input.pushed !== "boolean" || input.pullRequestUrl !== void 0 && typeof input.pullRequestUrl !== "string") throw new Error("Invalid repository action result.");
+			return input;
+		}
+		function endpoint(path, sessionId) {
+			return `${CLAUDE_REPOSITORY_ACTION_PATH}${path}?sessionId=${encodeURIComponent(sessionId)}`;
+		}
+		async function loadRepositoryActionPreview(sessionId, signal) {
+			return preview(await response$1(fetch(endpoint("/preview", sessionId), {
+				method: "GET",
+				credentials: "same-origin",
+				headers: { accept: "application/json" },
+				...signal === void 0 ? {} : { signal }
+			})));
+		}
+		async function generateCommitMessage(sessionId, fingerprint, signal) {
+			const value = record$2(await response$1(fetch(endpoint("/message", sessionId), {
+				method: "POST",
+				credentials: "same-origin",
+				headers: {
+					accept: "application/json",
+					"content-type": "application/json"
+				},
+				body: JSON.stringify({ fingerprint }),
+				...signal === void 0 ? {} : { signal }
+			})));
+			if (typeof value?.message !== "string") throw new Error("Invalid generated commit message.");
+			return value.message;
+		}
+		function executeRepositoryAction(sessionId, request) {
+			return response$1(fetch(endpoint("", sessionId), {
+				method: "POST",
+				credentials: "same-origin",
+				headers: {
+					accept: "application/json",
+					"content-type": "application/json"
+				},
+				body: JSON.stringify(request)
+			})).then(result);
+		}
+		//#endregion
 		//#region src/client/ClaudeRepositoryStatus.tsx
 		const RATE_LIMIT_TITLE_PREFIX = "Claude rate limit";
 		const RATE_LIMIT_BLOCKING_TITLE = "Claude rate limit is blocking requests";
@@ -4153,6 +4248,175 @@ window.__ModuleLoader__.load({
 				})]
 			});
 		}
+		const MERGE_METHODS = [
+			"merge",
+			"squash",
+			"rebase"
+		];
+		function MergePullRequestControl({ sessionId, repository, t }) {
+			const [menuOpen, setMenuOpen] = useState(false);
+			const [dialog, setDialog] = useState();
+			const controller = useRef();
+			const pullRequest = repository.pullRequest;
+			useEffect(() => () => controller.current?.abort(), []);
+			useEffect(() => {
+				if (dialog?.merged !== true || dialog.error !== void 0) return;
+				const timer = setTimeout(() => setDialog(void 0), 1200);
+				return () => clearTimeout(timer);
+			}, [dialog?.error, dialog?.merged]);
+			if (pullRequest === void 0 || pullRequest.state !== "open" || pullRequest.draft || repository.detached === true) return null;
+			const openMerge = (method) => {
+				controller.current?.abort();
+				setMenuOpen(false);
+				setDialog({
+					method,
+					loading: true,
+					submitting: false
+				});
+				const aborter = new AbortController();
+				controller.current = aborter;
+				loadRepositoryActionPreview(sessionId, aborter.signal).then((preview) => {
+					setDialog({
+						method,
+						loading: false,
+						submitting: false,
+						fingerprint: preview.fingerprint
+					});
+				}, (error) => {
+					if (!aborter.signal.aborted) setDialog({
+						method,
+						loading: false,
+						submitting: false,
+						error: error instanceof Error ? error.message : t("diffActionFailed")
+					});
+				});
+			};
+			const closeDialog = () => {
+				if (dialog?.submitting === true) return;
+				controller.current?.abort();
+				controller.current = void 0;
+				setDialog(void 0);
+			};
+			const confirmMerge = () => {
+				if (dialog?.fingerprint === void 0 || dialog.submitting) return;
+				const { error: _error, ...pending } = dialog;
+				setDialog({
+					...pending,
+					submitting: true
+				});
+				executeRepositoryAction(sessionId, {
+					action: "merge-pr",
+					fingerprint: dialog.fingerprint,
+					message: "",
+					includeUnstaged: false,
+					mergeMethod: dialog.method
+				}).then(() => {
+					setDialog({
+						...pending,
+						submitting: false,
+						merged: true
+					});
+				}, (error) => {
+					setDialog({
+						...pending,
+						submitting: false,
+						error: error instanceof Error ? error.message : t("diffActionFailed")
+					});
+				});
+			};
+			const items = MERGE_METHODS.map((method) => ({
+				id: method,
+				label: t(`diffMerge_${method}`)
+			}));
+			const merged = dialog?.merged === true;
+			return /* @__PURE__ */ jsxs(Fragment$1, { children: [
+				/* @__PURE__ */ jsx(Menu, {
+					open: menuOpen,
+					items,
+					onSelect: (id) => openMerge(id),
+					onClose: () => setMenuOpen(false),
+					align: "end",
+					portal: true,
+					anchor: /* @__PURE__ */ jsxs("button", {
+						type: "button",
+						style: repositoryMergeTrigger,
+						"aria-label": t("repositoryMergeMenu"),
+						"aria-haspopup": "menu",
+						"aria-expanded": menuOpen,
+						onClick: () => setMenuOpen((value) => !value),
+						children: [t("diffMergePr"), /* @__PURE__ */ jsx(IconChevronDownOutline14, {})]
+					})
+				}),
+				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("diffMergePr"),
+					closeLabel: t("diffCancel"),
+					description: t("diffMergeDescription"),
+					footer: /* @__PURE__ */ jsxs("div", {
+						style: diffModalFooter,
+						children: [/* @__PURE__ */ jsx("button", {
+							type: "button",
+							style: {
+								...button,
+								...diffModalButton
+							},
+							disabled: dialog?.submitting === true,
+							onClick: closeDialog,
+							children: merged ? t("diffDone") : t("diffCancel")
+						}), !merged ? /* @__PURE__ */ jsx("button", {
+							type: "button",
+							style: {
+								...primaryButton,
+								...diffModalButton
+							},
+							disabled: dialog?.loading === true || dialog?.submitting === true || dialog?.fingerprint === void 0,
+							onClick: confirmMerge,
+							children: dialog?.submitting === true ? t("diffSubmitting") : t("diffConfirm")
+						}) : null]
+					}),
+					children: dialog === void 0 ? null : /* @__PURE__ */ jsxs("div", {
+						style: diffModalBody,
+						children: [
+							/* @__PURE__ */ jsxs("div", {
+								style: diffModalMeta,
+								children: [/* @__PURE__ */ jsxs("strong", {
+									style: diffModalMetaText,
+									title: pullRequest.title,
+									children: [
+										t("repositoryPr", { number: pullRequest.number }),
+										" → ",
+										pullRequest.baseBranch ?? t("diffPrBaseDefault")
+									]
+								}), /* @__PURE__ */ jsx("span", {
+									style: diffModalFileState,
+									children: t(`diffMerge_${dialog.method}`)
+								})]
+							}),
+							/* @__PURE__ */ jsx("p", {
+								style: diffModalStatus,
+								children: pullRequest.title
+							}),
+							merged ? /* @__PURE__ */ jsx("p", {
+								style: diffModalSuccess,
+								children: t("diffMergeCompleted", { number: pullRequest.number })
+							}) : null,
+							dialog.error === void 0 ? null : /* @__PURE__ */ jsx("p", {
+								role: "alert",
+								style: diffModalError,
+								children: dialog.error
+							})
+						]
+					})
+				})
+			] });
+		}
 		function ClaudeRepositoryStatus({ sessionId, useSessions, useClaudeProjection, t, openDiff }) {
 			const blank = useSessions((value) => value.byId[sessionId]?.blank === true);
 			const projection = useClaudeProjection((value) => value);
@@ -4256,13 +4520,21 @@ window.__ModuleLoader__.load({
 											children: ["· ", t("repositoryMergedAgo", { age: mergedAge })]
 										})
 									]
-								}) : /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(StatusItem, {
-									label: t(`repositoryChecks_${pullRequest.checks}`),
-									tone: pullRequest.checks === "passing" ? "success" : pullRequest.checks === "failing" ? "error" : pullRequest.checks === "pending" ? "warning" : "neutral"
-								}), /* @__PURE__ */ jsx(StatusItem, {
-									label: t(`repositoryReview_${pullRequest.review}`),
-									tone: pullRequest.review === "approved" ? "success" : pullRequest.review === "changes-requested" ? "error" : "neutral"
-								})] })
+								}) : /* @__PURE__ */ jsxs(Fragment$1, { children: [
+									/* @__PURE__ */ jsx(StatusItem, {
+										label: t(`repositoryChecks_${pullRequest.checks}`),
+										tone: pullRequest.checks === "passing" ? "success" : pullRequest.checks === "failing" ? "error" : pullRequest.checks === "pending" ? "warning" : "neutral"
+									}),
+									/* @__PURE__ */ jsx(StatusItem, {
+										label: t(`repositoryReview_${pullRequest.review}`),
+										tone: pullRequest.review === "approved" ? "success" : pullRequest.review === "changes-requested" ? "error" : "neutral"
+									}),
+									/* @__PURE__ */ jsx(MergePullRequestControl, {
+										sessionId,
+										repository,
+										t
+									})
+								] })
 							]
 						})
 					]
@@ -4271,7 +4543,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/client/review-comment-api.ts
-		function record$2(value) {
+		function record$1(value) {
 			return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 		}
 		async function post(path, sessionId, body) {
@@ -4286,13 +4558,13 @@ window.__ModuleLoader__.load({
 			});
 			const value = await response.json();
 			if (!response.ok) {
-				const error = record$2(value);
+				const error = record$1(value);
 				throw new Error(typeof error?.message === "string" ? error.message : "Review comment request failed.");
 			}
 			return value;
 		}
 		async function addReviewComment(sessionId, comment) {
-			const created = record$2(record$2(await post("", sessionId, comment))?.comment);
+			const created = record$1(record$1(await post("", sessionId, comment))?.comment);
 			if (created === void 0 || typeof created.id !== "string") throw new Error("Invalid review comment response.");
 			return created;
 		}
@@ -4446,84 +4718,6 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
-		//#region src/client/repository-action-api.ts
-		var RepositoryActionClientError = class extends Error {
-			code;
-			commit;
-			constructor(message, code, commit) {
-				super(message);
-				this.name = "RepositoryActionClientError";
-				if (code !== void 0) this.code = code;
-				if (commit !== void 0) this.commit = commit;
-			}
-		};
-		function record$1(value) {
-			return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
-		}
-		async function response$1(pending) {
-			const result = await pending;
-			const body = await result.json();
-			if (!result.ok) {
-				const error = record$1(body);
-				throw new RepositoryActionClientError(typeof error?.message === "string" ? error.message : "Repository action failed.", typeof error?.error === "string" ? error.error : void 0, typeof error?.commit === "string" ? error.commit : void 0);
-			}
-			return body;
-		}
-		function preview(value) {
-			const input = record$1(value);
-			if (input === void 0 || typeof input.root !== "string" || typeof input.branch !== "string" || typeof input.head !== "string" || typeof input.fingerprint !== "string" || !Array.isArray(input.files) || typeof input.patch !== "string" || typeof input.truncated !== "boolean" || typeof input.hasStaged !== "boolean" || typeof input.hasUnstaged !== "boolean" || typeof input.hasUntracked !== "boolean" || input.upstream !== void 0 && typeof input.upstream !== "string" || !Array.isArray(input.unpushedCommits) || typeof input.unpushedTruncated !== "boolean") throw new Error("Invalid repository action preview.");
-			for (const file of input.files) {
-				const item = record$1(file);
-				if (item === void 0 || typeof item.path !== "string" || typeof item.staged !== "boolean" || typeof item.unstaged !== "boolean" || typeof item.untracked !== "boolean") throw new Error("Invalid repository action file.");
-			}
-			for (const commit of input.unpushedCommits) {
-				const item = record$1(commit);
-				if (item === void 0 || typeof item.hash !== "string" || typeof item.subject !== "string") throw new Error("Invalid repository action commit.");
-			}
-			return input;
-		}
-		function result(value) {
-			const input = record$1(value);
-			if (input === void 0 || typeof input.commit !== "string" || typeof input.pushed !== "boolean" || input.pullRequestUrl !== void 0 && typeof input.pullRequestUrl !== "string") throw new Error("Invalid repository action result.");
-			return input;
-		}
-		function endpoint(path, sessionId) {
-			return `${CLAUDE_REPOSITORY_ACTION_PATH}${path}?sessionId=${encodeURIComponent(sessionId)}`;
-		}
-		async function loadRepositoryActionPreview(sessionId, signal) {
-			return preview(await response$1(fetch(endpoint("/preview", sessionId), {
-				method: "GET",
-				credentials: "same-origin",
-				headers: { accept: "application/json" },
-				...signal === void 0 ? {} : { signal }
-			})));
-		}
-		async function generateCommitMessage(sessionId, fingerprint, signal) {
-			const value = record$1(await response$1(fetch(endpoint("/message", sessionId), {
-				method: "POST",
-				credentials: "same-origin",
-				headers: {
-					accept: "application/json",
-					"content-type": "application/json"
-				},
-				body: JSON.stringify({ fingerprint }),
-				...signal === void 0 ? {} : { signal }
-			})));
-			if (typeof value?.message !== "string") throw new Error("Invalid generated commit message.");
-			return value.message;
-		}
-		function executeRepositoryAction(sessionId, request) {
-			return response$1(fetch(endpoint("", sessionId), {
-				method: "POST",
-				credentials: "same-origin",
-				headers: {
-					accept: "application/json",
-					"content-type": "application/json"
-				},
-				body: JSON.stringify(request)
-			})).then(result);
-		}
-		//#endregion
 		//#region src/client/ClaudeDiffPanel.tsx
 		function pathFromHeader(line) {
 			return /^diff --git a\/(.+) b\/(.+)$/u.exec(line)?.[2];
@@ -4710,7 +4904,7 @@ window.__ModuleLoader__.load({
 			});
 		}
 		function actionLabel(action, t) {
-			return (action === "commit" ? t("diffCommit") : action === "commit-push" ? t("diffCommitPush") : action === "push" ? t("diffPush") : t("diffCreatePr")).replace(/[….]+$/u, "");
+			return (action === "commit" ? t("diffCommit") : action === "commit-push" ? t("diffCommitPush") : action === "push" ? t("diffPush") : action === "merge-pr" ? t("diffMergePr") : t("diffCreatePr")).replace(/[….]+$/u, "");
 		}
 		function repositoryActionAvailability(repository) {
 			const ready = repository?.status === "ready" && repository.detached !== true;
@@ -4722,7 +4916,8 @@ window.__ModuleLoader__.load({
 				"commit": committable,
 				"commit-push": committable && hasRemote,
 				"push": pushable,
-				"create-pr": (committable || pushable) && hasRemote && !hasOpenPullRequest
+				"create-pr": (committable || pushable) && hasRemote && !hasOpenPullRequest,
+				"merge-pr": ready && hasOpenPullRequest && repository?.pullRequest?.draft !== true
 			};
 		}
 		function RestorePanelIcon() {
@@ -6429,6 +6624,13 @@ window.__ModuleLoader__.load({
 			diffCommitCompleted: "已创建 commit {commit}",
 			diffCommitPreserved: "本地 commit {commit} 已保留。",
 			diffOpenPr: "打开 Pull Request",
+			diffMergePr: "Merge",
+			repositoryMergeMenu: "打开 PR 合并选项",
+			diffMerge_merge: "合并提交 (merge)",
+			diffMerge_squash: "Squash 合并",
+			diffMerge_rebase: "Rebase 合并",
+			diffMergeDescription: "使用所选方式合并当前分支的 Pull Request。",
+			diffMergeCompleted: "已合并 PR #{number}",
 			reviewCommentAdd: "添加行评论",
 			reviewCommentPlaceholder: "请求更改",
 			reviewCommentSubmit: "注释",
@@ -6631,6 +6833,13 @@ window.__ModuleLoader__.load({
 			diffCommitCompleted: "Created commit {commit}",
 			diffCommitPreserved: "Local commit {commit} was preserved.",
 			diffOpenPr: "Open pull request",
+			diffMergePr: "Merge",
+			repositoryMergeMenu: "Open merge options",
+			diffMerge_merge: "Create a merge commit",
+			diffMerge_squash: "Squash and merge",
+			diffMerge_rebase: "Rebase and merge",
+			diffMergeDescription: "Merge the pull request for this branch with the selected method.",
+			diffMergeCompleted: "Merged PR #{number}",
 			reviewCommentAdd: "Add line comment",
 			reviewCommentPlaceholder: "Request changes",
 			reviewCommentSubmit: "Comment",