liftbay 0.5.0 → 0.5.2

package/dist/index.js

@@ -25969,7 +25969,7 @@ import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync }
 import { homedir } from "os";
 import { join } from "path";
 
-// ../sdk/node_modules/openapi-fetch/dist/index.mjs
+// node_modules/openapi-fetch/dist/index.mjs
 var PATH_PARAM_RE = /\{[^{}]+\}/g;
 var supportsRequestInitExt = () => {
   return typeof process === "object" && Number.parseInt(process?.versions?.node?.substring(0, 2)) >= 18 && process.versions.undici;
@@ -26445,7 +26445,7 @@ function removeTrailingSlash(url) {
   return url;
 }
 
-// ../sdk/dist/index.js
+// node_modules/@liftbay/sdk/dist/index.js
 var LiftbayApiError = class extends Error {
   constructor(status2, code, message, fields = {}) {
     super(message);
@@ -28582,6 +28582,11 @@ function writeAppJson(data, cwd = process.cwd()) {
 
 // src/prompts.ts
 var import_picocolors3 = __toESM(require_picocolors(), 1);
+function fit(text2, reserve = 8) {
+  const width = Math.max(20, (process.stdout.columns || 80) - reserve);
+  const plain = text2.replace(/\x1b\[[0-9;]*m/g, "");
+  return plain.length <= width ? text2 : `${plain.slice(0, width - 1)}\u2026`;
+}
 var symbol2 = (state) => state === "submit" ? import_picocolors3.default.green("\u25C7") : state === "cancel" ? import_picocolors3.default.red("\u25A0") : state === "error" ? import_picocolors3.default.yellow("\u25B2") : import_picocolors3.default.cyan("\u25C6");
 function checkboxes(opts) {
   const required = opts.required ?? true;
@@ -28983,7 +28988,7 @@ async function status(lb, config, refresh = true) {
 }
 async function waitFor(lb, config, message, done) {
   const spin = spinner();
-  spin.start(`${message} ${import_picocolors6.default.dim("(Ctrl-C to stop)")}`);
+  spin.start(fit(message));
   const until = Date.now() + WAIT_MINUTES * 6e4;
   while (Date.now() < until) {
     await sleep2(4e3);
@@ -28998,7 +29003,13 @@ async function waitFor(lb, config, message, done) {
 }
 async function waitForInstall(lb, config, attempt) {
   const spin = spinner();
-  spin.start(`Waiting for the GitHub App to be installed ${import_picocolors6.default.dim("(Ctrl-C to stop)")}`);
+  spin.start(fit("Waiting for the GitHub App to be installed"));
+  const explain = (text2, spinnerText) => {
+    spin.stop(import_picocolors6.default.dim("\u2026"));
+    log.info(text2);
+    spin.start(fit(spinnerText));
+  };
+  let noRepoAccessShown = false;
   const until = Date.now() + WAIT_MINUTES * 6e4;
   let last = "waiting";
   while (Date.now() < until) {
@@ -29006,7 +29017,7 @@ async function waitForInstall(lb, config, attempt) {
     const a2 = attempt ? (await lb.GET("/v1/orgs/{org}/github/install/{attempt}", { params: { path: { org: config.org, attempt } } })).data : void 0;
     if (a2 && a2.status !== last) {
       last = a2.status;
-      if (a2.status === "needs_sign_in") spin.message(`GitHub is done. Sign in to Liftbay in that browser to finish linking ${import_picocolors6.default.dim("(Ctrl-C to stop)")}`);
+      if (a2.status === "needs_sign_in") explain("GitHub is done. Sign in to Liftbay in that browser to finish linking.", "Waiting for you to sign in to Liftbay in the browser");
       else if (a2.status !== "waiting" && a2.status !== "connected") {
         spin.error("GitHub didn't connect");
         return { ok: false, message: a2.message };
@@ -29018,7 +29029,10 @@ async function waitForInstall(lb, config, attempt) {
       return { ok: true, status: s };
     }
     if (a2?.status === "connected") {
-      spin.message(`Installed on ${s.repo.split("/")[0]}, but without access to ${s.repo}: on GitHub, Configure the app and select the repository ${import_picocolors6.default.dim("(Ctrl-C to stop)")}`);
+      if (!noRepoAccessShown) {
+        noRepoAccessShown = true;
+        explain(`Installed on ${s.repo.split("/")[0]}, but without access to ${s.repo}. On GitHub, Configure the app and select the repository.`, "Waiting for access to the repository");
+      }
     }
   }
   spin.error("Stopped waiting");
@@ -29206,7 +29220,7 @@ async function readyToBuild(branch, interactive) {
   }
 }
 async function build(opts) {
-  let config = requireConfig();
+  const config = requireConfig();
   const lb = client();
   const interactive = isInteractive();
   const path2 = { org: config.org, project: config.project };
@@ -29247,25 +29261,26 @@ async function build(opts) {
     platforms = choice === "all" ? profile.platforms : [choice];
   } else platforms = profile.platforms;
   const storeIos = platforms.includes("ios") && !opts.simulator && profile.distribution === "store";
-  let iosEngine = opts.engine ?? config.build?.iosEngine ?? "auto";
+  let iosEngine = opts.engine ?? "auto";
   if (!storeIos && iosEngine === "xcode-cloud") {
-    if (opts.engine === "xcode-cloud") fail(`Xcode Cloud makes iOS store builds only; profile "${profileName}" is ${opts.simulator ? "a simulator" : `an ${profile.distribution}`} build. Use a store profile, or --engine github-actions.`);
-    iosEngine = "github-actions";
+    fail(`Xcode Cloud makes iOS store builds only; profile "${profileName}" is ${opts.simulator ? "a simulator" : `an ${profile.distribution}`} build. Use a store profile, or --engine github-actions.`);
   }
   if (storeIos) {
-    if (!opts.engine && !config.build?.iosEngine && interactive) {
+    if (!opts.engine && interactive) {
+      const setting = (await unwrap(lb.GET("/v1/orgs/{org}/projects/{project}", { params: { path: path2 } }))).iosEngine ?? "github-actions";
+      const label = (e) => e === "xcode-cloud" ? "Xcode Cloud" : "GitHub Actions";
       iosEngine = cancelled(
         await select({
-          message: "Where should iOS builds run?",
-          options: [
-            { value: "github-actions", label: "GitHub Actions", hint: "macOS runners on your GitHub minutes" },
-            { value: "xcode-cloud", label: "Xcode Cloud", hint: "25 free hours a month with the Apple Developer Program" }
-          ]
+          message: "Where should this iOS build run?",
+          options: ["github-actions", "xcode-cloud"].map((e) => ({
+            value: e,
+            label: label(e),
+            hint: [e === setting ? "project default" : "", e === "xcode-cloud" ? "25 free hours a month with the Apple Developer Program" : "macOS runners on your GitHub minutes"].filter(Boolean).join(" \xB7 ")
+          })),
+          initialValue: setting
         })
       );
-      config = { ...config, build: { ...config.build, iosEngine } };
-      writeConfig(config);
-      log.info(import_picocolors7.default.dim("Saved in liftbay.json (commit it). Override once with --engine."));
+      if (iosEngine !== setting) log.info(import_picocolors7.default.dim(`Just this build. Change the project default in the dashboard's project settings, or with ${cmd("liftbay ci init --ios-engine " + iosEngine)}.`));
     }
     if (iosEngine === "xcode-cloud") {
       const xc = await unwrap(lb.GET("/v1/orgs/{org}/projects/{project}/xcode-cloud", { params: { path: path2 } }));
@@ -29543,7 +29558,7 @@ async function xcodeCloudConnect(opts) {
     last = s.step;
     if (!wait || s.step === "apple_key") fail(s.step === "apple_key" ? s.message : "Not connected yet. Run this again once the step above is done.");
     const spin = spinner();
-    spin.start("Waiting for that step (checking every 10 seconds; Ctrl-C to stop)");
+    spin.start(fit("Waiting for that step (checking every 10 seconds)"));
     await sleep5(1e4);
     spin.stop("Checking again");
   }
@@ -30108,16 +30123,17 @@ async function ciInit(app, config, opts) {
   let iosEngine = opts.iosEngine;
   if (iosEngine && iosEngine !== "github-actions" && iosEngine !== "xcode-cloud") fail("--ios-engine must be github-actions or xcode-cloud");
   if (platforms.includes("ios") && !iosEngine) {
-    iosEngine = config.build?.iosEngine ?? (opts.yes || !isInteractive() ? "github-actions" : cancelled(
+    const current = (await unwrap(lb.GET("/v1/orgs/{org}/projects/{project}", { params: { path: { org: config.org, project: config.project } } }))).iosEngine;
+    iosEngine = opts.yes || !isInteractive() ? current ?? "github-actions" : cancelled(
       await select({
-        message: "Where should iOS builds run?",
+        message: "Where should iOS store builds run? (you can pick for each build too)",
         options: [
           { value: "github-actions", label: "GitHub Actions", hint: "macOS runners on your GitHub minutes; ready now" },
           { value: "xcode-cloud", label: "Xcode Cloud", hint: "store builds, 25 free hours a month with the Apple Developer Program; one-time setup after iOS signing" }
         ],
-        initialValue: "github-actions"
+        initialValue: current ?? "github-actions"
       })
-    ));
+    );
   }
   if (platforms.includes("ios") && !app.bundleId) log.warn(`No iOS bundle identifier found. Set ${import_picocolors13.default.cyan("expo.ios.bundleIdentifier")} in app.json before the first iOS build.`);
   if (platforms.includes("android") && !app.androidPackage) log.warn(`No Android package found. Set ${import_picocolors13.default.cyan("expo.android.package")} in app.json before the first Android build.`);
@@ -30155,12 +30171,13 @@ async function ciInit(app, config, opts) {
     log.info(import_picocolors13.default.dim(`Variables kept on expo.dev (EAS environment variables) aren't in eas.json: ${import_picocolors13.default.cyan("npx eas env:pull --environment production")}, then ${import_picocolors13.default.cyan(cmd("liftbay env import .env.local --environment production"))}.`));
   }
   const profiles = Object.fromEntries(Object.entries(base).map(([name, prof]) => [name, { ...prof, platforms }]));
-  const next = { ...config, build: { profiles, triggers: config.build?.triggers ?? [], ...iosEngine ? { iosEngine } : {} } };
+  if (iosEngine) await unwrap(lb.PATCH("/v1/orgs/{org}/projects/{project}", { params: { path: path2 }, body: { iosEngine } }));
+  const next = { ...config, build: { profiles, triggers: config.build?.triggers ?? [] } };
   writeConfig(next);
   note(
     Object.entries(profiles).map(([name, prof]) => `${import_picocolors13.default.bold(name.padEnd(12))} env ${prof.environment.padEnd(12)} ${prof.distribution === "store" ? "store" : "internal"} \xB7 ${prof.platforms.join(", ")}`).join("\n") + (iosEngine ? `
 
-iOS builds run on ${iosEngine === "xcode-cloud" ? "Xcode Cloud" : "GitHub Actions"}` : ""),
+iOS store builds run on ${iosEngine === "xcode-cloud" ? "Xcode Cloud" : "GitHub Actions"} (project setting)` : ""),
     "Build profiles"
   );
   if (iosEngine === "xcode-cloud") {
@@ -30549,7 +30566,7 @@ async function publish(opts) {
     let done = 0;
     for (const m of prep.missing) {
       const f = bySha.get(m.sha256);
-      spin.message(`Uploading ${++done}/${prep.missing.length}: ${f.path}`);
+      spin.message(fit(`Uploading ${++done}/${prep.missing.length}: ${f.path}`));
       const res = await fetch(m.uploadUrl, { method: "PUT", body: readFileSync10(f.abs), headers: { "Content-Type": f.contentType } });
       if (!res.ok) fail(`Upload failed for ${f.path} (${res.status})`);
     }
@@ -30635,7 +30652,7 @@ async function channels() {
 }
 
 // src/index.ts
-var program2 = new Command("liftbay").description("Build, ship and update React Native apps").version("0.5.0").option("--json", "print the result as JSON on stdout (progress goes to stderr; never prompts). Also LIFTBAY_JSON=1").hook("preAction", () => {
+var program2 = new Command("liftbay").description("Build, ship and update React Native apps").version("0.5.2").option("--json", "print the result as JSON on stdout (progress goes to stderr; never prompts). Also LIFTBAY_JSON=1").hook("preAction", () => {
   if (program2.opts().json || process.env.LIFTBAY_JSON === "1") enableJson();
 });
 var wrap = (fn) => async (...args) => {
@@ -30645,14 +30662,14 @@ var wrap = (fn) => async (...args) => {
     reportError(e);
   }
 };
-var setupOptions = (cmd2) => cmd2.option("--org <slug>", "organization").option("--project <slug>", "project slug (created if it doesn't exist)").option("--platforms <list>", "ios, android or all").option("--runtime-policy <policy>", "appVersion or fingerprint").option("--ios-engine <engine>", "where iOS builds run: github-actions or xcode-cloud").option("--no-eas", "don't use eas.json's build profiles and env, even if there is one").option("-y, --yes", "accept defaults, no prompts").option("--api-url <url>", "API URL (for self-hosted or local development)").option("--dashboard-url <url>", "dashboard URL");
+var setupOptions = (cmd2) => cmd2.option("--org <slug>", "organization").option("--project <slug>", "project slug (created if it doesn't exist)").option("--platforms <list>", "ios, android or all").option("--runtime-policy <policy>", "appVersion or fingerprint").option("--ios-engine <engine>", "project setting: where iOS store builds run, github-actions or xcode-cloud").option("--no-eas", "don't use eas.json's build profiles and env, even if there is one").option("-y, --yes", "accept defaults, no prompts").option("--api-url <url>", "API URL (for self-hosted or local development)").option("--dashboard-url <url>", "dashboard URL");
 program2.command("login").description("Sign in through the browser").option("--api-url <url>", "API URL").option("--dashboard-url <url>", "dashboard URL").option("--no-open", "don't open the browser").option("--no-wait", "start the sign-in and exit; run `liftbay login` again after approving to finish (for agents)").action(wrap(login));
 program2.command("logout").description("Sign out and remove the saved token").action(wrap(logout));
 program2.command("whoami").description("Show the signed-in user and organizations").action(wrap(whoami));
 setupOptions(program2.command("init").description("Set up this app: link the project, builds, then OTA updates").option("--no-ota", "skip OTA updates")).action(wrap(initCommand));
 var ci = program2.command("ci").description("Builds");
 setupOptions(ci.command("init").description("Set up build profiles, environments and app identifiers")).action(wrap(ciInitCommand));
-program2.command("build").description("Build on your GitHub Actions (Android on Linux, iOS on macOS) and follow the logs").option("--platform <platform>", "ios, android or all (asked in a terminal; otherwise the profile's platforms)").option("--profile <name>", "build profile from liftbay.json (asked in a terminal; otherwise production)").option("--ref <ref>", "branch, tag or commit to build (default: current branch)").option("-m, --message <text>", "build message").option("--simulator", "iOS: build for the simulator instead of a signed .ipa").option("--no-wait", "queue and exit without following the logs").option("--submit", "submit store builds when they succeed: TestFlight, or a Google Play track").option("--track <track>", "Play track for --submit: internal, alpha, beta or production").option("--engine <engine>", "where iOS builds run: github-actions or xcode-cloud (default: build.iosEngine in liftbay.json; asked in a terminal)").action(wrap(build));
+program2.command("build").description("Build on your GitHub Actions (Android on Linux, iOS on macOS) and follow the logs").option("--platform <platform>", "ios, android or all (asked in a terminal; otherwise the profile's platforms)").option("--profile <name>", "build profile from liftbay.json (asked in a terminal; otherwise production)").option("--ref <ref>", "branch, tag or commit to build (default: current branch)").option("-m, --message <text>", "build message").option("--simulator", "iOS: build for the simulator instead of a signed .ipa").option("--no-wait", "queue and exit without following the logs").option("--submit", "submit store builds when they succeed: TestFlight, or a Google Play track").option("--track <track>", "Play track for --submit: internal, alpha, beta or production").option("--engine <engine>", "where this iOS store build runs: github-actions or xcode-cloud (asked in a terminal; otherwise the project's setting)").action(wrap(build));
 var builds = program2.command("builds").description("Look at builds: list, status, logs, artifacts");
 builds.command("list").description("Recent builds, newest first").option("--platform <platform>", "ios or android").option("--status <list>", "comma-separated: queued, preparing, running, uploading, succeeded, failed, cancelled").option("--limit <n>", "how many", "20").action(wrap(buildsList));
 builds.command("view <number>").description("Status, phases and artifacts of one build").action(wrap(buildsView));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "liftbay",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Build, sign, submit and update React Native apps from your own CI.",
   "keywords": [
     "react-native",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@clack/core": "1.5.1",
     "@clack/prompts": "^1.8.1",
-    "@liftbay/sdk": "^0.1.1",
+    "@liftbay/sdk": "^0.1.2",
     "@types/node": "^26.6.4",
     "@types/qrcode": "^1.5.6",
     "@types/node-forge": "^1.3.14",

package/skills/liftbay/SKILL.md

@@ -60,7 +60,7 @@ Useful flags:
 
 To set up one part on its own, use `liftbay ci init --yes --json` (builds) or `liftbay ota init --yes --json` (OTA).
 
-Pass `--ios-engine github-actions|xcode-cloud` for where iOS **store** builds run; it's saved as `build.iosEngine` in `liftbay.json`. Xcode Cloud uses the Apple team's free hours, and needs iOS signing and `liftbay xcode-cloud connect` first. Internal (ad hoc) and simulator builds always run on GitHub Actions.
+`--ios-engine github-actions|xcode-cloud` sets a **project setting**: where iOS **store** builds run unless a build picks. Builds you start without `--engine`, and every build started by a git push, use it. It's also in the dashboard's project settings. Xcode Cloud uses the Apple team's free hours, and needs iOS signing and `liftbay xcode-cloud connect` first; until it's connected (or when it's out of hours), those builds fall back to GitHub Actions and say so in the log. Internal (ad hoc) and simulator builds always run on GitHub Actions.
 
 Then get GitHub ready. Builds start the workflow through the Liftbay GitHub App:
 
@@ -159,7 +159,7 @@ Statuses: `queued` → `preparing` → `running` → `uploading` → `succeeded`
 Other flags:
 - `--ref <branch|tag|sha>`: defaults to the current branch, which must be pushed.
 - `--simulator`: unsigned iOS simulator build; needs no Apple account.
-- `--engine github-actions|xcode-cloud`: overrides `build.iosEngine` for this build (Xcode Cloud: iOS store builds only)
+- `--engine github-actions|xcode-cloud`: for this build only, instead of the project's setting (Xcode Cloud: iOS store builds only)
 - `-m "message"`
 
 **Xcode Cloud (optional):** `liftbay xcode-cloud connect --json`. Its error says which one-time step the user has to do in App Store Connect.