@biffo/cli 0.41.0 → 0.41.2

package/core.version

@@ -1 +1 @@
-0.41.0
+0.41.2

package/dist/index.js

@@ -599,9 +599,19 @@ var GitHubAdapter = class {
   async createEmptyRepo(org, repo, description) {
     try {
       const { data: existing } = await this.octokit.repos.get({ owner: org, repo });
-      log.info(`Repository ${org}/${repo} already exists \u2014 skipping creation`);
+      if (await this.repoHasCommits(org, repo)) {
+        throw new Error(
+          `Repository ${org}/${repo} already exists and is not empty.
+  Biffo will not push the sibling skeleton over a repo that has content.
+  If this repo is a half-finished Biffo sibling you want to redo, delete it
+  (gh repo delete ${org}/${repo}) and re-run. If it is unrelated, choose a
+  different sibling name.`
+        );
+      }
+      log.info(`Repository ${org}/${repo} already exists and is empty \u2014 adopting it`);
       return existing.clone_url;
     } catch (err) {
+      if (err instanceof Error && !("status" in err)) throw err;
       if (err.status !== 404) throw err;
     }
     log.info(`Creating repository ${org}/${repo}...`);
@@ -625,6 +635,27 @@ var GitHubAdapter = class {
     log.success(`Repository created: ${data.html_url}`);
     return data.clone_url;
   }
+  /**
+   * Does `org/repo` have any commits on any branch?
+   *
+   * `repos.get`'s `size` is unreliable for this — it is in KB and reports 0 for
+   * a freshly-pushed small repo. GitHub answers the question directly instead:
+   * listing commits on a repo with no commits returns 409 ("Git Repository is
+   * empty"). A 404 means the repo itself is gone, which is also "no commits".
+   *
+   * Used to decide whether an existing repo is safe to adopt (issue #316) and
+   * whether a skeleton push has already happened.
+   */
+  async repoHasCommits(org, repo) {
+    try {
+      const { data } = await this.octokit.repos.listCommits({ owner: org, repo, per_page: 1 });
+      return data.length > 0;
+    } catch (err) {
+      const status = err.status;
+      if (status === 409 || status === 404) return false;
+      throw err;
+    }
+  }
   async deleteRepo(org, repo) {
     try {
       await this.octokit.repos.get({ owner: org, repo });
@@ -2197,6 +2228,13 @@ import {
 } from "fs";
 import { homedir } from "os";
 import { join as join9 } from "path";
+var LEGACY_STEP_ALIASES = {
+  github_config: ["github_branches", "github_instance_files", "github_settings"]
+};
+function hasCompleted(session, step) {
+  if (session.completedSteps.includes(step)) return true;
+  return session.completedSteps.some((done) => LEGACY_STEP_ALIASES[done]?.includes(step) ?? false);
+}
 function sessionsDir() {
   return process.env["BIFFO_SESSIONS_DIR"] ?? join9(homedir(), ".biffo", "sessions");
 }
@@ -2232,8 +2270,18 @@ function saveSession(session) {
   const dir = sessionsDir();
   if (!existsSync6(dir)) mkdirSync3(dir, { recursive: true });
   const name = session.config.project?.name ?? "unknown";
+  const prior = loadSession(name);
+  if (prior) {
+    for (const step of prior.completedSteps) {
+      if (!session.completedSteps.includes(step)) session.completedSteps.push(step);
+    }
+    session.outputs = { ...prior.outputs, ...definedOnly(session.outputs) };
+  }
   writeFileSync4(sessionPath(name), JSON.stringify(session, null, 2));
 }
+function definedOnly(value) {
+  return Object.fromEntries(Object.entries(value).filter(([, v]) => v !== void 0));
+}
 function markStepComplete(session, step) {
   if (!session.completedSteps.includes(step)) {
     session.completedSteps.push(step);
@@ -3554,64 +3602,29 @@ var SiblingConfigSchema = z4.object({
   }
 });
 
-// src/commands/sibling-create.ts
-import { cpSync as cpSync2, existsSync as existsSync14, mkdirSync as mkdirSync6, mkdtempSync as mkdtempSync4, readFileSync as readFileSync11, writeFileSync as writeFileSync6 } from "fs";
-import { tmpdir as tmpdir4 } from "os";
-import { dirname as dirname6, join as join16, resolve as resolve9 } from "path";
-import { fileURLToPath as fileURLToPath4 } from "url";
-import chalk11 from "chalk";
-import { Command as Command11 } from "commander";
-
-// src/lib/skeleton-dotfiles.ts
-import { readdirSync as readdirSync7, renameSync } from "fs";
-import { join as join14 } from "path";
-var PACKAGED_GITIGNORE = "_gitignore";
-var REAL_GITIGNORE = ".gitignore";
-function restorePackagedDotfiles(dir) {
-  const restored = [];
-  for (const entry of readdirSync7(dir, { withFileTypes: true })) {
-    const full = join14(dir, entry.name);
-    if (entry.isDirectory()) {
-      restored.push(...restorePackagedDotfiles(full));
-    } else if (entry.name === PACKAGED_GITIGNORE) {
-      const target = join14(dir, REAL_GITIGNORE);
-      renameSync(full, target);
-      restored.push(target);
-    }
-  }
-  return restored;
-}
-
 // src/lib/sibling-session.ts
 import {
   existsSync as existsSync13,
   mkdirSync as mkdirSync5,
-  readdirSync as readdirSync8,
+  readdirSync as readdirSync7,
   readFileSync as readFileSync10,
   rmSync as rmSync5,
   statSync as statSync4,
   writeFileSync as writeFileSync5
 } from "fs";
 import { homedir as homedir3 } from "os";
-import { join as join15 } from "path";
+import { join as join14 } from "path";
 function sessionsDir2() {
-  return process.env["BIFFO_SIBLING_SESSIONS_DIR"] ?? join15(homedir3(), ".biffo", "sibling-sessions");
+  return process.env["BIFFO_SIBLING_SESSIONS_DIR"] ?? join14(homedir3(), ".biffo", "sibling-sessions");
 }
 function sessionPath2(projectName) {
-  return join15(sessionsDir2(), `${projectName}.json`);
+  return join14(sessionsDir2(), `${projectName}.json`);
 }
-function findLatestSiblingSession() {
-  const dir = sessionsDir2();
-  if (!existsSync13(dir)) return null;
-  const files = readdirSync8(dir).filter((f) => f.endsWith(".json"));
-  if (files.length === 0) return null;
-  const sorted = files.map((f) => {
-    const fullPath = join15(dir, f);
-    const mtime = existsSync13(fullPath) ? statSync4(fullPath).mtimeMs : -1;
-    return { f, mtime };
-  }).sort((a, b) => b.mtime - a.mtime);
+function loadSiblingSession(projectName) {
+  const path = sessionPath2(projectName);
+  if (!existsSync13(path)) return null;
   try {
-    return JSON.parse(readFileSync10(join15(dir, sorted[0].f), "utf8"));
+    return JSON.parse(readFileSync10(path, "utf8"));
   } catch {
     return null;
   }
@@ -3620,8 +3633,18 @@ function saveSiblingSession(session) {
   const dir = sessionsDir2();
   if (!existsSync13(dir)) mkdirSync5(dir, { recursive: true });
   const name = session.config.project?.name ?? "unknown";
+  const prior = loadSiblingSession(name);
+  if (prior) {
+    for (const step of prior.completedSteps) {
+      if (!session.completedSteps.includes(step)) session.completedSteps.push(step);
+    }
+    session.outputs = { ...prior.outputs, ...definedOnly2(session.outputs) };
+  }
   writeFileSync5(sessionPath2(name), JSON.stringify(session, null, 2));
 }
+function definedOnly2(value) {
+  return Object.fromEntries(Object.entries(value).filter(([, v]) => v !== void 0));
+}
 function markSiblingStepComplete(session, step) {
   if (!session.completedSteps.includes(step)) {
     session.completedSteps.push(step);
@@ -3633,6 +3656,34 @@ function deleteSiblingSession(projectName) {
   if (existsSync13(path)) rmSync5(path);
 }
 
+// src/commands/sibling-create.ts
+import { cpSync as cpSync2, existsSync as existsSync14, mkdirSync as mkdirSync6, mkdtempSync as mkdtempSync4, readFileSync as readFileSync11, writeFileSync as writeFileSync6 } from "fs";
+import { tmpdir as tmpdir4 } from "os";
+import { dirname as dirname6, join as join16, resolve as resolve9 } from "path";
+import { fileURLToPath as fileURLToPath4 } from "url";
+import chalk11 from "chalk";
+import { Command as Command11 } from "commander";
+
+// src/lib/skeleton-dotfiles.ts
+import { readdirSync as readdirSync8, renameSync } from "fs";
+import { join as join15 } from "path";
+var PACKAGED_GITIGNORE = "_gitignore";
+var REAL_GITIGNORE = ".gitignore";
+function restorePackagedDotfiles(dir) {
+  const restored = [];
+  for (const entry of readdirSync8(dir, { withFileTypes: true })) {
+    const full = join15(dir, entry.name);
+    if (entry.isDirectory()) {
+      restored.push(...restorePackagedDotfiles(full));
+    } else if (entry.name === PACKAGED_GITIGNORE) {
+      const target = join15(dir, REAL_GITIGNORE);
+      renameSync(full, target);
+      restored.push(target);
+    }
+  }
+  return restored;
+}
+
 // src/commands/sibling-create.ts
 var siblingCreateCommand = new Command11("create").description(
   "Create a standalone sibling app repository from the Biffo sibling template (ADR-0007)"
@@ -3675,8 +3726,8 @@ async function runSiblingCreateCommand(name, options) {
   }
   let session = null;
   if (!options.fresh) {
-    const saved = findLatestSiblingSession();
-    if (saved && saved.config.project?.name === name) {
+    const saved = loadSiblingSession(name);
+    if (saved) {
       session = saved;
       console.log(
         chalk11.dim(
@@ -3687,6 +3738,7 @@ async function runSiblingCreateCommand(name, options) {
     }
   }
   if (!session) {
+    deleteSiblingSession(name);
     session = {
       version: 1,
       config,
@@ -3732,7 +3784,7 @@ async function runSiblingCreateCommand(name, options) {
   );
 }
 async function runSiblingCreate(github, aws, coreAws, git, config, session, options) {
-  const totalSteps = 7;
+  const totalSteps = 8;
   const { org, repo } = githubRepo(config);
   const pathPrefix = resolvePathPrefix(config);
   if (!session.completedSteps.includes("verify_credentials")) {
@@ -3768,54 +3820,67 @@ async function runSiblingCreate(github, aws, coreAws, git, config, session, opti
     );
   }
   if (!session.completedSteps.includes("create_repo")) {
-    log.step(3, totalSteps, "Creating GitHub repository and pushing sibling skeleton...");
-    const cloneUrl = await github.createEmptyRepo(
+    log.step(3, totalSteps, "Creating GitHub repository...");
+    session.outputs.cloneUrl = await github.createEmptyRepo(
       org,
       repo,
       config.project.description || void 0
     );
-    session.outputs.cloneUrl = cloneUrl;
-    await pushSkeleton(
-      git,
-      options.skeletonRoot,
-      cloneUrl,
-      config,
-      options.coreConfig,
-      options.githubToken
-    );
     markSiblingStepComplete(session, "create_repo");
   } else {
     log.step(3, totalSteps, "GitHub repository already created \u2014 skipping");
   }
+  const cloneUrl = session.outputs.cloneUrl;
+  if (!cloneUrl) {
+    throw new Error("internal error: create_repo did not populate session.outputs.cloneUrl");
+  }
+  if (!session.completedSteps.includes("push_skeleton")) {
+    if (await github.repoHasCommits(org, repo)) {
+      log.step(4, totalSteps, "Sibling skeleton already pushed \u2014 skipping");
+    } else {
+      log.step(4, totalSteps, "Pushing sibling skeleton...");
+      await pushSkeleton(
+        git,
+        options.skeletonRoot,
+        cloneUrl,
+        config,
+        options.coreConfig,
+        options.githubToken
+      );
+    }
+    markSiblingStepComplete(session, "push_skeleton");
+  } else {
+    log.step(4, totalSteps, "Sibling skeleton already pushed \u2014 skipping");
+  }
   if (!session.completedSteps.includes("oidc_trust")) {
-    log.step(4, totalSteps, "Configuring OIDC trust...");
+    log.step(5, totalSteps, "Configuring OIDC trust...");
     session.outputs.oidcRoleArn = await aws.setupOidcTrust(
       config,
       await resolveRepoIds(github, config)
     );
     markSiblingStepComplete(session, "oidc_trust");
   } else {
-    log.step(4, totalSteps, "OIDC trust already configured \u2014 skipping");
+    log.step(5, totalSteps, "OIDC trust already configured \u2014 skipping");
   }
   if (!session.completedSteps.includes("terraform_backend")) {
-    log.step(5, totalSteps, "Bootstrapping Terraform state backend...");
+    log.step(6, totalSteps, "Bootstrapping Terraform state backend...");
     session.outputs.tfStateBucket = await aws.bootstrapTerraformBackend(config.project.name);
     markSiblingStepComplete(session, "terraform_backend");
   } else {
-    log.step(5, totalSteps, "Terraform backend already bootstrapped \u2014 skipping");
+    log.step(6, totalSteps, "Terraform backend already bootstrapped \u2014 skipping");
   }
   if (!session.completedSteps.includes("github_config")) {
-    log.step(6, totalSteps, "Configuring GitHub repository...");
+    log.step(7, totalSteps, "Configuring GitHub repository...");
     await configureSiblingGithub(github, config, options.coreConfig, session, coreIdentity);
     markSiblingStepComplete(session, "github_config");
   } else {
-    log.step(6, totalSteps, "GitHub already configured \u2014 skipping");
+    log.step(7, totalSteps, "GitHub already configured \u2014 skipping");
   }
   if (options.skipRegistration && !session.completedSteps.includes("register_with_core")) {
-    log.step(7, totalSteps, "Already registered with the core project by `biffo init` \u2014 skipping");
+    log.step(8, totalSteps, "Already registered with the core project by `biffo init` \u2014 skipping");
     markSiblingStepComplete(session, "register_with_core");
   } else if (!session.completedSteps.includes("register_with_core")) {
-    log.step(7, totalSteps, "Opening a registration PR against the core project...");
+    log.step(8, totalSteps, "Opening a registration PR against the core project...");
     session.outputs.registrationPrUrl = await registerWithCore(
       git,
       github,
@@ -3826,7 +3891,7 @@ async function runSiblingCreate(github, aws, coreAws, git, config, session, opti
     );
     markSiblingStepComplete(session, "register_with_core");
   } else {
-    log.step(7, totalSteps, "Already registered with the core project \u2014 skipping");
+    log.step(8, totalSteps, "Already registered with the core project \u2014 skipping");
   }
   deleteSiblingSession(config.project.name);
 }
@@ -3972,7 +4037,10 @@ async function configureSiblingGithub(github, config, coreConfig, session, coreI
   await github.createEnvironments(config);
   await github.enableVulnerabilityAlerts(org, repo);
   await github.setRepoVariable(org, repo, "PROJECT_NAME", config.project.name);
-  await github.setRepoVariable(org, repo, "PATH_PREFIX", resolvePathPrefix(config));
+  const pathPrefix = resolvePathPrefix(config);
+  if (pathPrefix !== "") {
+    await github.setRepoVariable(org, repo, "PATH_PREFIX", pathPrefix);
+  }
   await github.setRepoVariable(org, repo, "AWS_REGION", awsConfig(config).region);
   await github.setRepoVariable(org, repo, "SIBLING_DEPLOY_ENABLED", "true");
   try {
@@ -4178,14 +4246,7 @@ var initCommand = new Command12("init").description("Scaffold a new project from
       const rawConfig = JSON.parse(readFileSync12(resolve10(options.config), "utf8"));
       config = parseConfig(rawConfig);
       const { account_id: accountId, region } = config.cloud.config;
-      session = {
-        version: 1,
-        config,
-        awsAccountId: accountId,
-        awsRegion: region,
-        completedSteps: [],
-        outputs: {}
-      };
+      session = resolveConfigFileSession(config, accountId, region, options.fresh === true);
     } else {
       githubToken = await resolveGithubToken3(options.yes === true);
       const { accountId, region, profile } = await resolveAwsCredentials(options.yes === true);
@@ -4224,6 +4285,7 @@ var initCommand = new Command12("init").description("Scaffold a new project from
       if (!session) {
         const rawConfig = await promptForConfig(accountId, region, profile);
         config = parseConfig(rawConfig);
+        deleteSession(config.project.name);
         session = {
           version: 1,
           config,
@@ -4267,6 +4329,22 @@ var initCommand = new Command12("init").description("Scaffold a new project from
     );
   }
 );
+function resolveConfigFileSession(config, awsAccountId, awsRegion, fresh) {
+  const saved = fresh ? null : loadSession(config.project.name);
+  const session = saved ? { ...saved, config, awsAccountId, awsRegion } : { version: 1, config, awsAccountId, awsRegion, completedSteps: [], outputs: {} };
+  if (saved) {
+    console.log(
+      chalk12.dim(
+        `  Resuming previous init for ${config.project.name} (completed: ${saved.completedSteps.join(", ") || "none"})
+`
+      )
+    );
+  } else {
+    deleteSession(config.project.name);
+  }
+  saveSession(session);
+  return session;
+}
 async function runInit(github, aws, config, session, appSibling) {
   const totalSteps = appSibling ? 6 : 5;
   if (!session.completedSteps.includes("verify_credentials")) {
@@ -4320,14 +4398,26 @@ async function runInit(github, aws, config, session, appSibling) {
       };
     }
   }
-  if (!session.completedSteps.includes("github_config")) {
-    log.step(5, totalSteps, "Configuring GitHub repository...");
-    const { org, repo } = config.source_control.config;
-    const dns = resolveDnsConfig(config);
-    const domain = dns.domain;
+  const { org, repo } = config.source_control.config;
+  if (!hasCompleted(session, "github_branches")) {
+    log.step(5, totalSteps, "Creating dev and staging branches...");
     await github.createBranch(org, repo, "dev", "main");
     await github.createBranch(org, repo, "staging", "main");
+    markStepComplete(session, "github_branches");
+  } else {
+    log.step(5, totalSteps, "Branches already created \u2014 skipping");
+  }
+  if (!hasCompleted(session, "github_instance_files")) {
+    log.step(5, totalSteps, "Writing instance identity files...");
     await writeInstanceFiles(github, org, repo, config);
+    markStepComplete(session, "github_instance_files");
+  } else {
+    log.step(5, totalSteps, "Instance identity files already written \u2014 skipping");
+  }
+  if (!hasCompleted(session, "github_settings")) {
+    log.step(5, totalSteps, "Configuring GitHub repository...");
+    const dns = resolveDnsConfig(config);
+    const domain = dns.domain;
     await github.setDefaultBranch(org, repo, "dev");
     await github.configureBranchProtection(config);
     await github.createEnvironments(config);
@@ -4352,7 +4442,7 @@ async function runInit(github, aws, config, session, appSibling) {
     if (session.outputs.oidcRoleArn) {
       await github.setRepoSecret(org, repo, "BIFFO_OIDC_ROLE_ARN", session.outputs.oidcRoleArn);
     }
-    markStepComplete(session, "github_config");
+    markStepComplete(session, "github_settings");
   } else {
     log.step(5, totalSteps, "GitHub already configured \u2014 skipping");
   }
@@ -4371,6 +4461,9 @@ async function runInit(github, aws, config, session, appSibling) {
 async function createAppSibling(github, config, session, deps) {
   const siblingConfig = appSiblingConfig(config);
   const cloud = config.cloud;
+  if (!session.outputs.appSibling) {
+    deleteSiblingSession(siblingConfig.project.name);
+  }
   session.outputs.appSibling ??= {
     version: 1,
     config: siblingConfig,

package/package.json

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