@devflow-one/cli 0.1.3 → 0.1.5

package/README.md

@@ -182,13 +182,16 @@ devflow mr ready 12 --profile prof-1
 
 ### Destructive actions
 
-`branch delete` and `mr close` are destructive. They are **refused unless you
-confirm** with `--force` (or `--yes`); the gateway enforces the same gate
-server-side, so the confirmation can't be bypassed:
+`branch delete`, `mr close` and `mr merge` are destructive. They are **refused
+unless you confirm** with `--force` (or `--yes`); the gateway enforces the same
+gate server-side, so the confirmation can't be bypassed:
 
 ```sh
 devflow branch delete old --project ABC            # refused
 devflow branch delete old --project ABC --force    # executes
+
+# merge a PR/MR, squashing and cleaning up the source branch
+devflow mr merge 42 --method squash --delete-source-branch --force
 ```
 
 Inference never softens this gate — a destructive command run with fully

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devflow-one/cli",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Terminal CLI wrapping the local DevFlow gateway so shell scripts can trigger repo actions.",
   "keywords": [
     "devflow",

package/src/args.js

@@ -4,7 +4,15 @@
 // positionals.
 
 /** Boolean flags never consume the following token. */
-const BOOLEAN_FLAGS = new Set(["json", "all", "help", "force", "yes", "no-push"]);
+const BOOLEAN_FLAGS = new Set([
+  "json",
+  "all",
+  "help",
+  "force",
+  "yes",
+  "no-push",
+  "delete-source-branch",
+]);
 
 /**
  * @param {string[]} argv the args after the node/script path

package/src/commands.js

@@ -20,6 +20,20 @@ function toInt(name, value) {
   return n;
 }
 
+/** Valid `--method` values for `mr merge`, mirroring the provider merge strategies. */
+const MERGE_METHODS = ["merge", "squash", "rebase"];
+
+/** Parse a `--method` flag into a merge strategy, or fail with the allowed set. */
+function toMergeMethod(value) {
+  const method = String(value);
+
+  if (!MERGE_METHODS.includes(method)) {
+    throw new UsageError(`"--method" must be one of ${MERGE_METHODS.join(", ")}, got "${method}".`);
+  }
+
+  return method;
+}
+
 /** Parse a `--values` JSON-object flag into a plain object, or fail clearly. */
 function toValues(flag, raw) {
   if (raw === undefined) return undefined;
@@ -144,6 +158,20 @@ const COMMANDS = {
     usage: "mr close <prId> [--issue KEY] [--project KEY] --force",
     buildArgs: ([prId]) => [toInt("prId", prId)],
   },
+  "mr merge": {
+    method: "POST",
+    action: "mergePullRequest",
+    destructive: true,
+    usage:
+      "mr merge <prId> [--method merge|squash|rebase] [--delete-source-branch] " +
+      "[--issue KEY] [--project KEY] --force",
+    buildArgs: ([prId], flags) => {
+      const mergeMethod = flags.method === undefined ? undefined : toMergeMethod(flags.method);
+      const deleteSourceBranch = flags["delete-source-branch"] ? true : undefined;
+
+      return [toInt("prId", prId), { mergeMethod, deleteSourceBranch }];
+    },
+  },
   "mr assign": {
     method: "POST",
     action: "assignPr",