@biffo/cli 0.41.10 → 0.41.11

package/core.version

@@ -1 +1 @@
-0.41.10
+0.41.11

package/dist/index.js

@@ -835,6 +835,39 @@ var GitHubAdapter = class {
     log.info(`Committed ${files.map((f) => f.path).join(", ")} to ${branch}`);
     return commit.sha;
   }
+  /** The commit SHA at the head of `branch`. */
+  async getBranchSha(org, repo, branch) {
+    const ref = await this.waitForRef(org, repo, `heads/${branch}`, 12e4, 3e3);
+    return ref.object.sha;
+  }
+  /**
+   * Point `branch` at `sha` via a fast-forward-only ref update (issue #329).
+   *
+   * `sha` must be an ancestor-descendant of the branch's current head:
+   * GitHub's `updateRef` rejects a non-fast-forward move unless `force` is set,
+   * and it is deliberately left unset here. The only caller is `writeInstanceFiles`,
+   * moving a freshly-created branch onto the instance commit built on that
+   * branch's own shared base — always a fast-forward. If it ever isn't, failing
+   * loudly is the correct outcome, not clobbering history.
+   *
+   * Idempotent: a no-op (no API write) when `branch` is already at `sha`, so a
+   * resumed init neither errors nor rewrites anything.
+   */
+  async fastForwardBranch(org, repo, branch, sha) {
+    const current = await this.getBranchSha(org, repo, branch);
+    if (current === sha) {
+      log.info(`${branch} already at ${sha.slice(0, 7)} \u2014 skipping`);
+      return;
+    }
+    await this.octokit.git.updateRef({
+      owner: org,
+      repo,
+      ref: `heads/${branch}`,
+      sha,
+      force: false
+    });
+    log.info(`Fast-forwarded ${branch} to ${sha.slice(0, 7)}`);
+  }
   async setDefaultBranch(org, repo, branch) {
     await this.octokit.repos.update({ owner: org, repo, default_branch: branch });
     log.info(`Default branch set to ${branch}`);
@@ -4814,7 +4847,12 @@ function appSiblingRegistryFiles(config) {
   }));
 }
 var INSTANCE_CONFIG_FILE = "biffo.config.json";
-var INSTANCE_FILE_BRANCHES = ["main", "dev", "staging"];
+var INSTANCE_FILE_BASE_BRANCH = "main";
+var INSTANCE_FILE_FOLLOWER_BRANCHES = ["dev", "staging"];
+var INSTANCE_FILE_BRANCHES = [
+  INSTANCE_FILE_BASE_BRANCH,
+  ...INSTANCE_FILE_FOLLOWER_BRANCHES
+];
 async function writeInstanceFiles(github, org, repo, config) {
   const files = [
     { path: INSTANCE_CORE_FILE, content: serializeInstanceCoreVersion(getLatestCoreVersion()) },
@@ -4822,8 +4860,10 @@ async function writeInstanceFiles(github, org, repo, config) {
     ...config ? appSiblingRegistryFiles(config) : []
   ];
   const message = config ? `chore: record core version, register the ${ROOT_SIBLING_NAME} sibling, and drop the template ${INSTANCE_CONFIG_FILE}` : `chore: record core version and drop the template ${INSTANCE_CONFIG_FILE}`;
-  for (const branch of INSTANCE_FILE_BRANCHES) {
-    await github.commitFiles(org, repo, branch, files, message);
+  const committed = await github.commitFiles(org, repo, INSTANCE_FILE_BASE_BRANCH, files, message);
+  const sharedSha = committed ?? await github.getBranchSha(org, repo, INSTANCE_FILE_BASE_BRANCH);
+  for (const branch of INSTANCE_FILE_FOLLOWER_BRANCHES) {
+    await github.fastForwardBranch(org, repo, branch, sharedSha);
   }
 }
 function printPlan2(config) {

package/package.json

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