@norman-else/dsh-claude 0.1.27 → 0.1.28

package/lib/client.d.ts

@@ -218,10 +218,12 @@ declare const en: {
   readonly diffMergeCompleted: "Merged PR #{number}";
   readonly diffUpdateBranch: "Update branch…";
   readonly repositoryUpdateBranch: "Update branch";
-  readonly diffUpdateBranchDescription: "Merge origin/{base} into the current branch and push; hand any conflicts to Claude.";
+  readonly diffUpdateBranchDescription: "Update the current branch from origin/{base} and push; hand any conflicts to Claude.";
+  readonly diffUpdateBranch_rebase: "Rebase onto origin/{base} (rewrites history, pushes with --force-with-lease)";
+  readonly diffUpdateBranch_merge: "Merge origin/{base} into the current branch";
   readonly diffUpdateBranchBehind: "{count} commit(s) behind origin/{base}";
-  readonly diffUpdateBranchCompleted: "Merged and pushed commit {commit}";
-  readonly diffUpdateBranchConflicts: "The merge left conflicts in these files:";
+  readonly diffUpdateBranchCompleted: "Updated and pushed commit {commit}";
+  readonly diffUpdateBranchConflicts: "The update left conflicts in these files:";
   readonly diffUpdateBranchResolve: "Have Claude resolve the conflicts";
   readonly repositoryChecksOpen: "Show failing checks";
   readonly checksCardTitle: "Failing checks";

package/lib/client.js

@@ -2834,19 +2834,21 @@ window.__ModuleLoader__.load({
 		  background: var(--dsw-alias-bg-layer-2);
 		}
 		.dshClaudeRepositoryActionModalContent h2 {
-		  font-size: 24px;
-		  line-height: 32px;
+		  font-size: 18px;
+		  line-height: 26px;
 		}
 		.dshClaudeRepositoryActionModalContent > p {
-		  font-size: 18px;
-		  line-height: 28px;
+		  font-size: 14px;
+		  line-height: 22px;
 		}
-		.dshClaudeRepositoryActionModal input[type='checkbox'] {
-		  width: 18px;
-		  height: 18px;
+		.dshClaudeRepositoryActionModal input:is([type='checkbox'], [type='radio']) {
+		  width: 16px;
+		  height: 16px;
+		  margin: 0;
+		  accent-color: var(--dsw-static-blue-450);
 		}
 		.dshClaudeRepositoryActionModal textarea:focus,
-		.dshClaudeRepositoryActionModal input:not([type='checkbox']):focus {
+		.dshClaudeRepositoryActionModal input:not([type='checkbox'], [type='radio']):focus {
 		  outline: none;
 		  box-shadow: inset 0 0 0 1px var(--dsw-static-blue-450);
 		}
@@ -2865,8 +2867,8 @@ window.__ModuleLoader__.load({
 			gap: 16,
 			minWidth: 0,
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 16,
-			lineHeight: "24px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const diffModalMetaText = {
 			minWidth: 0,
@@ -2890,8 +2892,8 @@ window.__ModuleLoader__.load({
 			padding: "10px 14px",
 			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"
+			fontSize: 13,
+			lineHeight: "20px"
 		};
 		const diffModalFilePath = {
 			minWidth: 0,
@@ -2905,32 +2907,32 @@ window.__ModuleLoader__.load({
 			flexDirection: "column",
 			gap: 8,
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 16,
-			lineHeight: "24px",
+			fontSize: 14,
+			lineHeight: "22px",
 			fontWeight: 550
 		};
 		const diffModalTextarea = {
 			...settingTextInput,
 			minHeight: 140,
 			padding: "10px 14px",
-			fontSize: 16,
-			lineHeight: "24px",
+			fontSize: 14,
+			lineHeight: "22px",
 			resize: "vertical"
 		};
 		const diffModalTextInput = {
 			...settingTextInput,
 			minHeight: 44,
 			padding: "9px 14px",
-			fontSize: 16,
-			lineHeight: "24px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const diffModalCheckbox = {
 			display: "flex",
 			alignItems: "center",
 			gap: 10,
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 16,
-			lineHeight: "24px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const diffModalFooter = {
 			display: "flex",
@@ -2938,28 +2940,28 @@ window.__ModuleLoader__.load({
 			gap: 12
 		};
 		const diffModalButton = {
-			minHeight: 42,
+			minHeight: 36,
 			padding: "8px 18px",
-			fontSize: 16,
-			lineHeight: "24px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const diffModalStatus = {
 			margin: 0,
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 16,
-			lineHeight: "24px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const diffModalError = {
 			margin: "10px 0 0",
 			color: "var(--dsw-alias-state-error-primary)",
-			fontSize: 16,
-			lineHeight: "24px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const diffModalSuccess = {
 			margin: 0,
 			color: "var(--dsw-alias-state-success-primary)",
-			fontSize: 16,
-			lineHeight: "24px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		//#endregion
 		//#region src/client/token-format.ts
@@ -5412,8 +5414,10 @@ window.__ModuleLoader__.load({
 			}).join("\n\n")}`;
 		}
 		/** Draft handed to Claude after an update-branch merge left conflicts behind. */
-		function composeConflictsPrompt(baseBranch, conflicts) {
-			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${conflicts.map((file) => `- ${file}`).join("\n")}`;
+		function composeConflictsPrompt(baseBranch, conflicts, method = "merge") {
+			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}`;
 		}
 		//#endregion
 		//#region src/client/auto-fix.ts
@@ -5908,6 +5912,7 @@ window.__ModuleLoader__.load({
 		}
 		function UpdateBranchControl({ sessionId, repository, t, submitPrompt }) {
 			const [dialog, setDialog] = useState();
+			const [method, setMethod] = useState("rebase");
 			const controller = useRef();
 			const pullRequest = repository.pullRequest;
 			const base = pullRequest?.baseBranch;
@@ -5959,7 +5964,8 @@ window.__ModuleLoader__.load({
 					fingerprint: dialog.fingerprint,
 					message: "",
 					includeUnstaged: false,
-					baseBranch: base
+					baseBranch: base,
+					mergeMethod: method
 				}).then((result) => {
 					setDialog({
 						...pending,
@@ -6042,6 +6048,17 @@ window.__ModuleLoader__.load({
 									})
 								})]
 							}),
+							["rebase", "merge"].map((option) => /* @__PURE__ */ jsxs("label", {
+								style: diffModalCheckbox,
+								children: [/* @__PURE__ */ jsx("input", {
+									type: "radio",
+									name: "dsh-claude-update-branch-method",
+									value: option,
+									checked: method === option,
+									disabled: settled || dialog.submitting,
+									onChange: () => setMethod(option)
+								}), t(`diffUpdateBranch_${option}`, { base })]
+							}, option)),
 							dialog.pushed === void 0 ? null : /* @__PURE__ */ jsx("p", {
 								style: diffModalSuccess,
 								children: t("diffUpdateBranchCompleted", { commit: dialog.pushed.slice(0, 8) })
@@ -6059,7 +6076,7 @@ window.__ModuleLoader__.load({
 									type: "button",
 									style: diffModalConflictResolve,
 									onClick: () => {
-										submitPrompt(composeConflictsPrompt(base, dialog.conflicts ?? []));
+										submitPrompt(composeConflictsPrompt(base, dialog.conflicts ?? [], method));
 										closeDialog();
 									},
 									children: t("diffUpdateBranchResolve")
@@ -10008,10 +10025,12 @@ window.__ModuleLoader__.load({
 			diffMergeCompleted: "已合并 PR #{number}",
 			diffUpdateBranch: "Update branch…",
 			repositoryUpdateBranch: "Update branch",
-			diffUpdateBranchDescription: "将 origin/{base} 合并进当前分支并推送;出现冲突时可交给 Claude 解决。",
+			diffUpdateBranchDescription: "用 origin/{base} 更新当前分支并推送;出现冲突时可交给 Claude 解决。",
+			diffUpdateBranch_rebase: "Rebase 到 origin/{base}(改写历史,以 --force-with-lease 推送)",
+			diffUpdateBranch_merge: "将 origin/{base} 合并进当前分支",
 			diffUpdateBranchBehind: "落后 origin/{base} {count} 个 commit",
-			diffUpdateBranchCompleted: "已合并并推送 commit {commit}",
-			diffUpdateBranchConflicts: "合并产生冲突,以下文件需要解决:",
+			diffUpdateBranchCompleted: "已更新并推送 commit {commit}",
+			diffUpdateBranchConflicts: "更新产生冲突,以下文件需要解决:",
 			diffUpdateBranchResolve: "让 Claude 解决冲突",
 			repositoryChecksOpen: "查看失败的检查",
 			checksCardTitle: "失败的检查",
@@ -10322,10 +10341,12 @@ window.__ModuleLoader__.load({
 			diffMergeCompleted: "Merged PR #{number}",
 			diffUpdateBranch: "Update branch…",
 			repositoryUpdateBranch: "Update branch",
-			diffUpdateBranchDescription: "Merge origin/{base} into the current branch and push; hand any conflicts to Claude.",
+			diffUpdateBranchDescription: "Update the current branch from origin/{base} and push; hand any conflicts to Claude.",
+			diffUpdateBranch_rebase: "Rebase onto origin/{base} (rewrites history, pushes with --force-with-lease)",
+			diffUpdateBranch_merge: "Merge origin/{base} into the current branch",
 			diffUpdateBranchBehind: "{count} commit(s) behind origin/{base}",
-			diffUpdateBranchCompleted: "Merged and pushed commit {commit}",
-			diffUpdateBranchConflicts: "The merge left conflicts in these files:",
+			diffUpdateBranchCompleted: "Updated and pushed commit {commit}",
+			diffUpdateBranchConflicts: "The update left conflicts in these files:",
 			diffUpdateBranchResolve: "Have Claude resolve the conflicts",
 			repositoryChecksOpen: "Show failing checks",
 			checksCardTitle: "Failing checks",