@tokenoftrust/cli 2.1.1 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/cli",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Token of Trust developer CLI — clone a tenant store, run it locally with save→reload, and submit it for preview. Installs the `tot` command.",
   "license": "Apache-2.0",
   "author": "Token of Trust",

package/src/commands/start.mjs

@@ -267,10 +267,18 @@ export async function run(argv, ctx) {
       noLogin: false, noOpen: args.noOpen, docker: args.docker,
     });
     const runtime = /** @type {{ useDocker: boolean, runnerDir: any }} */ ({ useDocker: args.docker, runnerDir: null });
-    await Promise.all([
+    await settleCheckoutAndRuntime(
       ensureCheckout(client, tenant, dir, env),
       prefetchRuntime(client, devArgs, env, runtime, ctx),
-    ]);
+      {
+        onRuntimeFailedAfterCheckout: () => {
+          printCheckoutLocation(dir);
+          console.log(
+            `     Once the problem below is fixed, run \`tot start\` again from ${resolve(dir, "..")} — it reuses ./${tenant}.`,
+          );
+        },
+      },
+    );
 
     // Say EXACTLY where the code landed + THE one next step, so a freshly
     // checked-out dev is never left wondering what to open. Absolute path (works
@@ -690,10 +698,32 @@ export function formatElapsed(ms) {
  * Developer Cockpit URL, the one next step is framed as "edit a line → see it in
  * your cockpit"; otherwise it's the same edit-to-see-it-reload action.
  */
-/** @param {string} dir @param {string|null} [cockpitUrl] */
-function printCheckoutLanding(dir, cockpitUrl = null) {
+/** @param {string} dir */
+function printCheckoutLocation(dir) {
   console.log("");
   console.log(`  📁 Your store code is at:  ${dir}`);
+}
+
+/**
+ * Run the checkout and the runner prefetch together, but never let a failed prefetch hide
+ * a checkout that succeeded: the code is already on disk, so say where before re-throwing
+ * the prefetch error. A failed checkout wins (nothing landed, nothing to point at).
+ * @param {Promise<unknown>} checkout
+ * @param {Promise<unknown>} runtime
+ * @param {{ onRuntimeFailedAfterCheckout: () => void }} hooks
+ */
+export async function settleCheckoutAndRuntime(checkout, runtime, { onRuntimeFailedAfterCheckout }) {
+  const [checkedOut, prepared] = await Promise.allSettled([checkout, runtime]);
+  if (checkedOut.status === "rejected") throw checkedOut.reason;
+  if (prepared.status === "rejected") {
+    onRuntimeFailedAfterCheckout();
+    throw prepared.reason;
+  }
+}
+
+/** @param {string} dir @param {string|null} [cockpitUrl] */
+function printCheckoutLanding(dir, cockpitUrl = null) {
+  printCheckoutLocation(dir);
   const where = cockpitUrl ? `your ${DEVELOPER_COCKPIT}` : "your browser";
   console.log(`     Next: open it in your editor and change one line in`);
   console.log(`     content/home.html — you'll see it reflected in ${where}.`);