@devflow-one/cli 0.1.3 → 0.1.6

package/README.md

@@ -162,6 +162,10 @@ devflow branch create feat/x
 devflow branch create feat/x --project ABC
 devflow mr create "Title" feat/x --body "desc" --project ABC
 
+# target branch: the repo's configured base branch by default (a {year}/{number}
+# pattern is expanded to the newest matching remote branch), or pick one
+devflow mr create "Title" feat/x --base release/2026.4 --project ABC
+
 # routed by issue key (project key = prefix before the last '-')
 devflow mr find ABC-123
 devflow pipeline status 42 deadbeef --issue ABC-9
@@ -182,13 +186,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.6",
   "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;
@@ -39,6 +53,19 @@ function toValues(flag, raw) {
   return parsed;
 }
 
+/** Parse a value-taking flag as a non-blank string, or fail clearly. */
+function toBranch(flag, raw) {
+  if (raw === undefined) return undefined;
+
+  const branch = String(raw).trim();
+
+  if (raw === true || branch === "") {
+    throw new UsageError(`"--${flag}" requires a branch name.`);
+  }
+
+  return branch;
+}
+
 /** A bad-invocation error (wrong/missing args) — printed with the command usage. */
 export class UsageError extends Error {
   constructor(message) {
@@ -102,7 +129,8 @@ const COMMANDS = {
     method: "POST",
     action: "commitByTemplate",
     usage:
-      'commit template <worktreePath> [--values \'{"key":"val"}\'] [--no-push] [--issue KEY] [--project KEY]',
+      'commit template <worktreePath> [--values \'{"key":"val"}\'] [--no-push] [--issue KEY] [--project KEY]' +
+      " (--values keys must match the {key} tokens of the project's configured commit template)",
     buildArgs: ([worktreePath], flags) => {
       if (!worktreePath) throw new UsageError("commit template requires <worktreePath>.");
 
@@ -116,13 +144,21 @@ const COMMANDS = {
   "mr create": {
     method: "POST",
     action: "createPullRequest",
-    usage: "mr create <title> <headBranch> [--body <text>] [--issue KEY] [--project KEY]",
+    usage:
+      "mr create <title> <headBranch> [--body <text>] [--base <branch>] [--issue KEY] [--project KEY]" +
+      " (--base defaults to the repo's configured base branch, expanding a {year}/{number} pattern)",
     buildArgs: ([title, headBranch], flags) => {
       if (!title || !headBranch) {
         throw new UsageError("mr create requires <title> and <headBranch>.");
       }
 
-      return [title, flags.body ?? "", headBranch];
+      const baseBranch = toBranch("base", flags.base);
+
+      // Omitted rather than trailing-undefined so the gateway resolves the repo's
+      // own configured base branch (and expands a pattern) instead of seeing null.
+      return baseBranch
+        ? [title, flags.body ?? "", headBranch, baseBranch]
+        : [title, flags.body ?? "", headBranch];
     },
   },
   "mr ready": {
@@ -144,6 +180,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",

package/src/contextResolver.js

@@ -162,8 +162,8 @@ function fill(resolved, source, origin) {
  * @param {(args: string[]) => string | null} [options.runGit]
  * @param {(q: { cwd?: string, remote?: string, branch?: string }) => Promise<object | null>} [options.queryContext]
  * @returns {Promise<{
- *   projectKey?: string, issueKey?: string, repo?: string, profile?: string,
- *   profileAlive?: boolean | null, matchedBy: Record<string, string>,
+ *   projectKey?: string, issueKey?: string, repo?: string, baseBranch?: string,
+ *   profile?: string, profileAlive?: boolean | null, matchedBy: Record<string, string>,
  *   candidates?: object[], ambiguous?: boolean, warnings: string[]
  * }>}
  */
@@ -259,6 +259,9 @@ export async function resolveContext({
                 clean(context.repo?.id) ??
                 clean(context.repo?.name) ??
                 clean(context.repo?.remoteUrl),
+              // The selector `repo` flattens the digest to one string; the configured
+              // base branch rides alongside it so a caller can target it explicitly.
+              baseBranch: clean(context.repo?.baseBranch),
               profile: clean(context.profileId),
             }),
       },