@norman-else/dsh-claude 0.1.21 → 0.1.22

package/lib/index.mjs

@@ -3579,6 +3579,30 @@ var RepositoryActionService = class {
 				pushed: true
 			};
 		}
+		if (request.action === "merge-pr") {
+			const method = request.mergeMethod;
+			if (method !== "merge" && method !== "squash" && method !== "rebase") throw new RepositoryActionError("invalid-request", "The merge method is invalid.");
+			let gh;
+			try {
+				gh = await this.#gh();
+			} catch (error) {
+				throw new RepositoryActionError("gh-unavailable", error instanceof Error ? error.message : "GitHub CLI is unavailable.");
+			}
+			const merged = await this.#run(gh, [
+				"pr",
+				"merge",
+				`--${method}`
+			], before.root, REMOTE_TIMEOUT_MS);
+			if (merged.exitCode !== 0 || merged.lossy) {
+				const reason = merged.stderr.split(/\r?\n/u).map((line) => line.trim()).filter((line) => line.length > 0).at(-1);
+				throw new RepositoryActionError("merge-failed", reason === void 0 || reason.length === 0 ? "The pull request could not be merged." : reason);
+			}
+			this.#invalidate(before.root);
+			return {
+				commit: before.head,
+				pushed: true
+			};
+		}
 		const message = safeText(request.message, MAX_MESSAGE_CHARS, "Commit message");
 		if (before.files.length === 0 && request.action !== "create-pr") throw new RepositoryActionError("nothing-to-commit", "There are no changes to commit.");
 		const git = await this.#git();
@@ -3916,7 +3940,8 @@ const ACTIONS = /* @__PURE__ */ new Set([
 	"commit",
 	"commit-push",
 	"push",
-	"create-pr"
+	"create-pr",
+	"merge-pr"
 ]);
 function record$1(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
@@ -3956,13 +3981,16 @@ function actionRequest(input) {
 	return {
 		action,
 		fingerprint: string(input, "fingerprint"),
-		message: action === "push" ? optionalString(input, "message") ?? "" : string(input, "message"),
+		message: action === "push" || action === "merge-pr" ? optionalString(input, "message") ?? "" : string(input, "message"),
 		includeUnstaged: input.includeUnstaged,
 		...optionalString(input, "prTitle") === void 0 ? {} : { prTitle: optionalString(input, "prTitle") },
 		...optionalString(input, "prBody") === void 0 ? {} : { prBody: optionalString(input, "prBody") },
 		...optionalString(input, "baseBranch") === void 0 ? {} : { baseBranch: optionalString(input, "baseBranch") },
 		...input.draft === void 0 ? {} : typeof input.draft === "boolean" ? { draft: input.draft } : (() => {
 			throw new RepositoryActionError("invalid-request", "The draft field must be a boolean.");
+		})(),
+		...input.mergeMethod === void 0 ? {} : input.mergeMethod === "merge" || input.mergeMethod === "squash" || input.mergeMethod === "rebase" ? { mergeMethod: input.mergeMethod } : (() => {
+			throw new RepositoryActionError("invalid-request", "The mergeMethod field is invalid.");
 		})()
 	};
 }