@devflow-one/cli 0.1.12 → 0.1.13

package/README.md

@@ -162,6 +162,7 @@ devflow mr find                             # issue key from the branch
 devflow branch resolve ABC-124              # read-only: branch name + whether it exists
 devflow branch create --issue ABC-124       # creates it, or reuses an existing one
 devflow branch create feat/x                # a name is only a fallback when no issue key is known
+devflow branch create --issue ABC-124 --from release/2026.4   # start from another remote branch
 
 # or route explicitly, overriding whatever the directory implies
 devflow branch create feat/x --project ABC
@@ -183,7 +184,8 @@ devflow mr types --project ABC                # configured types: id, label, def
 # {issueTitle} needs the Jira API token set in Settings, else it renders empty.
 devflow mr create "Title" feat/x --issue ABC-123
 devflow mr create "Title" --issue ABC-123   # head branch from the branch template
-# the template always picks the head branch; a different one is replaced (warning on stderr)
+# a head branch that exists on the remote is used as is; otherwise the template picks it
+# and a different one is replaced (warning on stderr)
 
 # routed by issue key (project key = prefix before the last '-')
 devflow mr find ABC-123
@@ -194,10 +196,12 @@ devflow commit template /wt/ABC-123 --values '{"summary":"fix login"}' --project
 devflow commit template /wt/ABC-123 --no-push --project ABC   # commit locally, skip push
 
 # read a PR/MR's title + description, then edit it: --title/--description replace,
-# --append-description adds text after a `---` rule (skipped if already at the end)
+# --append-description adds text after a `---` rule (skipped if already at the end);
+# --base retargets the PR/MR to an existing remote branch
 devflow mr get 42 --project ABC
 devflow mr update 42 --append-description "## Test plan" --project ABC
 devflow mr update 42 --title "Fix login redirect" --project ABC
+devflow mr update 42 --base release/2026.4 --project ABC
 
 # assembled fix-review-comments prompt (read-only; runs no AI, makes no writes)
 devflow mr fix-prompt 42                    # issue key inferred from the branch

package/package.json

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

package/src/commands.js

@@ -153,17 +153,19 @@ const COMMANDS = {
     retryUnsafe: true,
     action: "createBranch",
     usage:
-      "branch create [branchName] [--issue KEY] [--project KEY]" +
+      "branch create [branchName] [--issue KEY] [--from <branch>] [--project KEY]" +
       " (the repo's branch template names the branch from the issue, incl. {parentIssueKey};" +
-      " branchName is only a fallback; an existing branch is reused)",
+      " branchName is only a fallback; an existing branch is reused; --from picks the remote" +
+      " branch to start from instead of the repo's configured base branch)",
     buildArgs: ([branchName], flags, context = {}) => {
       const issueKey = templateIssueKey(branchName, flags, context);
+      const from = toBranch("from", flags.from);
 
       if (!branchName && !issueKey) {
         throw new UsageError("branch create needs an issue key (--issue) or a <branchName>.");
       }
 
-      return [branchName, issueKey];
+      return from === undefined ? [branchName, issueKey] : [branchName, issueKey, from];
     },
   },
   "branch resolve": {
@@ -215,8 +217,8 @@ const COMMANDS = {
     usage:
       "mr create <title> [headBranch] [--body <text>] [--base <branch>] [--type <idOrLabel>]" +
       " [--issue KEY] [--project KEY]" +
-      " (the repo's branch template picks the head branch from the issue; headBranch is only" +
-      " a fallback; --base defaults to the repo's configured base branch, expanding a {year}/{number} pattern;" +
+      " (a headBranch that exists on the remote is used as is; otherwise the repo's branch" +
+      " template picks the head branch from the issue; --base defaults to the repo's configured base branch, expanding a {year}/{number} pattern;" +
       " --type is auto-selected by matching PR type names against the title prefix, branch prefix," +
       " Jira issue type and title keywords, falling back to the first configured type)",
     buildArgs: ([title, headBranch], flags, context = {}) => {
@@ -328,23 +330,27 @@ const COMMANDS = {
     action: "updatePullRequest",
     usage:
       "mr update <prId> [--title <text>] [--description <text> | --append-description <text>]" +
-      " [--issue KEY] [--project KEY]" +
+      " [--base <branch>] [--issue KEY] [--project KEY]" +
       " (--title/--description replace; --append-description adds text after a `---` rule" +
-      " and is skipped if it already ends the description after that rule)",
+      " and is skipped if it already ends the description after that rule; --base retargets" +
+      " the PR/MR to an existing remote branch)",
     buildArgs: ([prId], flags) => {
       const title = toText("title", flags.title);
       const body = toRawText("description", flags.description);
       const appendBody = toRawText("append-description", flags["append-description"]);
+      const baseBranch = toBranch("base", flags.base);
 
-      if (title === undefined && body === undefined && appendBody === undefined) {
-        throw new UsageError("mr update needs --title, --description or --append-description.");
+      if ([title, body, appendBody, baseBranch].every((value) => value === undefined)) {
+        throw new UsageError(
+          "mr update needs --title, --description, --append-description or --base.",
+        );
       }
 
       if (body !== undefined && appendBody !== undefined) {
         throw new UsageError("mr update takes --description or --append-description, not both.");
       }
 
-      return [toInt("prId", prId), { title, body, appendBody }];
+      return [toInt("prId", prId), { title, body, appendBody, baseBranch }];
     },
   },
   "mr types": {