@norman-else/dsh-claude 0.1.27 → 0.1.28

package/lib/index.mjs

@@ -3850,6 +3850,8 @@ var RepositoryActionService = class {
 		if (request.action === "update-branch") {
 			const base = safeText(request.baseBranch ?? "", 512, "Base branch");
 			if (before.files.length > 0) throw new RepositoryActionError("dirty-workspace", "Commit or stash workspace changes before updating the branch.");
+			const method = request.mergeMethod ?? "rebase";
+			if (method !== "merge" && method !== "rebase") throw new RepositoryActionError("invalid-request", "Update branch supports merge or rebase.");
 			const git = await this.#git();
 			await this.#mustRun(git, [
 				"fetch",
@@ -3857,7 +3859,11 @@ var RepositoryActionService = class {
 				"--",
 				base
 			], before.root, REMOTE_TIMEOUT_MS, "fetch-failed", "Git could not fetch the base branch.");
-			const merged = await this.#run(git, [
+			const merged = await this.#run(git, method === "rebase" ? [
+				"rebase",
+				"--",
+				`origin/${base}`
+			] : [
 				"merge",
 				"--no-edit",
 				"--",
@@ -3872,8 +3878,8 @@ var RepositoryActionService = class {
 				], before.root, GIT_TIMEOUT_MS$1);
 				const conflicts = conflicted.exitCode === 0 && !conflicted.lossy ? conflicted.stdout.split(/\r?\n/u).filter((line) => line.length > 0).slice(0, 100) : [];
 				if (conflicts.length === 0) {
-					await this.#run(git, ["merge", "--abort"], before.root, GIT_TIMEOUT_MS$1).catch(() => void 0);
-					throw new RepositoryActionError("merge-failed", "Git could not merge the base branch.");
+					await this.#run(git, [method, "--abort"], before.root, GIT_TIMEOUT_MS$1).catch(() => void 0);
+					throw new RepositoryActionError("merge-failed", `Git could not ${method} the base branch.`);
 				}
 				this.#invalidate(before.root);
 				return {
@@ -3882,9 +3888,9 @@ var RepositoryActionService = class {
 					conflicts
 				};
 			}
-			const mergedHead = (await this.#mustRun(git, ["rev-parse", "HEAD"], before.root, GIT_TIMEOUT_MS$1, "merge-failed", "The merge commit could not be verified.")).stdout.trim();
+			const mergedHead = (await this.#mustRun(git, ["rev-parse", "HEAD"], before.root, GIT_TIMEOUT_MS$1, "merge-failed", "The updated commit could not be verified.")).stdout.trim();
 			try {
-				await this.#push(git, before.root, before.branch);
+				await this.#push(git, before.root, before.branch, method === "rebase");
 			} catch (error) {
 				throw new RepositoryActionError("push-failed", error instanceof Error ? error.message : "Git push failed.", mergedHead);
 			}
@@ -4073,13 +4079,13 @@ var RepositoryActionService = class {
 		if (staged.exitCode !== 0 || staged.lossy) throw new RepositoryActionError("repository-unavailable", "Staged files could not be verified.");
 		if (staged.stdout.split(/\r?\n/u).some((path) => path.length > 0 && isProtectedWarpPath(path))) throw new RepositoryActionError("protected-warp-file", "WARP.md files cannot be committed. Unstage them before continuing.");
 	}
-	async #push(git, cwd, branch) {
+	async #push(git, cwd, branch, forceWithLease = false) {
 		const args = (await this.#run(git, [
 			"rev-parse",
 			"--abbrev-ref",
 			"--symbolic-full-name",
 			"@{upstream}"
-		], cwd, GIT_TIMEOUT_MS$1)).exitCode === 0 ? ["push"] : [
+		], cwd, GIT_TIMEOUT_MS$1)).exitCode === 0 ? ["push", ...forceWithLease ? ["--force-with-lease"] : []] : [
 			"push",
 			"--set-upstream",
 			"origin",