@biffo/cli 0.211.2 → 0.211.4

package/dist/index.js

@@ -3389,8 +3389,9 @@ async function buildCommitAndOpenPr(options, deps, plan, migrations, fromVersion
     `Applied ${applied.written.length} change(s), ${applied.deleted.length + (cleanedCoreVersion ? 1 : 0)} deletion(s), ${carried.length} new migration(s)`
   );
   const lockfiles = await refreshInstanceLockfiles(options.cwd, applied, deps);
+  const carriedPrs = readCarriedPrs(options.templateRepo, fromVersion, toVersion);
   await git.add(options.cwd, ["-A"]);
-  await git.commit(options.cwd, `chore(core): upgrade template core ${fromVersion} -> ${toVersion}`);
+  await git.commit(options.cwd, buildCommitMessage(fromVersion, toVersion, carriedPrs));
   log.step(3, 4, `Pushing ${branch}`);
   const pushOpts = { token };
   if (options.remote) pushOpts.remote = options.remote;
@@ -3415,7 +3416,7 @@ async function buildCommitAndOpenPr(options, deps, plan, migrations, fromVersion
       lockfiles,
       breaking,
       cleanedCoreVersion ? coreVersionCleanup : null,
-      readCarriedPrs(options.templateRepo, fromVersion, toVersion)
+      carriedPrs
     )
   });
   if (plan.conflicts.length > 0) {
@@ -3443,6 +3444,11 @@ function carriedPrsSection(carriedPrs) {
   const unique = [...new Set(carriedPrs)].sort((a, b) => a - b);
   return ["", `<!-- ${CARRIED_PRS_MARKER}${unique.join(",")} -->`];
 }
+function buildCommitMessage(from, to, carriedPrs) {
+  const subject = `chore(core): upgrade template core ${from} -> ${to}`;
+  const marker = carriedPrsSection(carriedPrs);
+  return marker.length === 0 ? subject : [subject, ...marker].join("\n");
+}
 function carriedPrNumbers(subjects) {
   const numbers = [];
   for (const subject of subjects) {
@@ -4978,6 +4984,7 @@ function formatWiringResult(environment, result) {
 // src/commands/deploy.ts
 var deployCommand = new Command9("deploy").description("Deploy infrastructure and application to an environment").argument("<environment>", "Target environment: dev | staging | prod").option("--infra-only", "Deploy infrastructure only, skip application build").option("--app-only", "Deploy application only, skip Terraform").option("-p, --project <name>", "Project name (overrides biffo.config.json in current directory)").option("-c, --config <path>", "Path to biffo.config.json").option("-y, --yes", "Skip deployment target confirmation").action(
   async (environment, options) => {
+    process.exitCode = 1;
     const validEnvs = ["dev", "staging", "prod"];
     if (!validEnvs.includes(environment)) {
       log.error(`Unknown environment: ${environment}. Must be one of: ${validEnvs.join(", ")}`);
@@ -4989,12 +4996,14 @@ var deployCommand = new Command9("deploy").description("Deploy infrastructure an
 `));
     if (!options.yes && !await confirmDeployTarget(config, environment)) {
       log.warn("Deploy cancelled");
+      process.exitCode = 0;
       return;
     }
     const token = resolveGithubToken();
     const github = new GitHubAdapter(token);
     const aws = new AwsAdapter(config);
     await runDeploy(github, aws, config, environment, { ...options, token });
+    process.exitCode = 0;
   }
 );
 async function resolveConfig2(options) {
@@ -5056,17 +5065,28 @@ function describeProject(config) {
   const { org, repo } = config.source_control.config;
   return `${config.project.name} (${org}/${repo})`;
 }
-async function chooseProject(projects) {
+async function chooseProject(projects, isTTY = Boolean(process.stdin.isTTY)) {
+  const question = "Which project do you want to deploy?";
+  const remedy = "Pass --project <name> to choose one. Available:\n" + projects.map((p) => `    ${describeProject(p)}`).join("\n");
+  if (isNonInteractive()) {
+    throw new NonInteractiveError(nonInteractiveMessage(question, remedy));
+  }
+  if (!isTTY) {
+    throw new NonInteractiveError(
+      `Refusing to prompt for "${question}" \u2014 no interactive terminal is attached.
+  ${remedy}`
+    );
+  }
   const { chosen } = await promptOr(
     {
-      question: "Which project do you want to deploy?",
-      remedy: "Pass --project <name> to choose one. Available:\n" + projects.map((p) => `    ${describeProject(p)}`).join("\n")
+      question,
+      remedy
     },
     [
       {
         type: "list",
         name: "chosen",
-        message: "Which project do you want to deploy?",
+        message: question,
         choices: projects.map((p) => ({ name: describeProject(p), value: p.project.name }))
       }
     ]

package/package.json

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