@biffo/cli 0.60.2 → 0.60.4

package/dist/index.js

@@ -581,6 +581,18 @@ var GitHubAdapter = class {
    * `biffo core upgrade --apply` (ADR-0006 Phase 3b) to propose a core upgrade
    * as a reviewable PR rather than pushing to a protected branch.
    */
+  /**
+   * The repo's default branch — the integration branch a PR should target.
+   *
+   * Asked of GitHub rather than inferred from the local checkout: it differs per
+   * repo (biffo-template uses `main`, instances use `dev`), and the local
+   * current branch is whatever the caller happens to be on, which under the
+   * worktree-per-change workflow is never it.
+   */
+  async defaultBranch(args) {
+    const { data } = await this.octokit.repos.get({ owner: args.owner, repo: args.repo });
+    return data.default_branch;
+  }
   async createPullRequest(args) {
     const { data } = await this.octokit.pulls.create({
       owner: args.owner,
@@ -1990,7 +2002,7 @@ var coreUpgradeCommand = new Command3("upgrade").description("Three-way-merge te
 ).option("--apply", "Apply the plan on a new branch and open a PR (default: dry run)").option("--allow-conflicts", "With --apply, open the PR even if some files conflict").option(
   "--acknowledge-breaking",
   "With --apply, proceed even though this upgrade crosses a documented breaking change"
-).option("--base <branch>", "Base branch for the PR (defaults to the current branch)").option("--remote <name>", "Git remote to push to and open the PR on (default: origin)").action(
+).option("--base <branch>", "Base branch for the PR (defaults to the repo\u2019s default branch)").option("--remote <name>", "Git remote to push to and open the PR on (default: origin)").action(
   async (options) => {
     const cwd = options.cwd ? resolve3(options.cwd) : process.cwd();
     const runOptions = {
@@ -2143,7 +2155,6 @@ async function applyAndOpenPr(options, deps, plan, migrations, fromVersion, toVe
   if (await git.hasUncommittedChanges(options.cwd)) {
     throw new Error("The working tree has uncommitted changes. Commit or stash them first.");
   }
-  const base = options.base ?? await git.currentBranch(options.cwd);
   const branch = upgradeBranchName(fromVersion, toVersion);
   log.step(1, 4, `Creating branch ${branch}`);
   await git.createBranch(options.cwd, branch);
@@ -2165,7 +2176,9 @@ async function applyAndOpenPr(options, deps, plan, migrations, fromVersion, toVe
   log.step(4, 4, "Opening pull request");
   const remoteUrl = await git.getRemoteUrl(options.cwd, options.remote);
   const { owner, repo } = parseGitHubRepo(remoteUrl);
-  const pr = await deps.makeGitHub(token).createPullRequest({
+  const github = deps.makeGitHub(token);
+  const base = options.base ?? await github.defaultBranch({ owner, repo });
+  const pr = await github.createPullRequest({
     owner,
     repo,
     head: branch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biffo/cli",
-  "version": "0.60.2",
+  "version": "0.60.4",
   "description": "Biffo project scaffolding CLI",
   "license": "MIT",
   "type": "module",