@open-mercato/cli 0.5.1-develop.2727.5af6be1c11 → 0.5.1-develop.2756.cce1739df3

package/dist/mercato.js

@@ -226,6 +226,28 @@ function buildServerProcessEnvironment(environment) {
   }
   return runtimeEnv;
 }
+function waitForManagedProcessExit(proc, label) {
+  return new Promise((resolve) => {
+    proc.on("exit", (code, signal) => {
+      resolve({ label, code, signal });
+    });
+  });
+}
+function isExpectedManagedExitSignal(signal) {
+  return signal === "SIGINT" || signal === "SIGTERM";
+}
+function formatManagedProcessExitStatus(result) {
+  if (typeof result.code === "number") {
+    return `exit code ${result.code}`;
+  }
+  if (result.signal) {
+    return `signal ${result.signal}`;
+  }
+  return "an unknown status";
+}
+function createManagedProcessExitError(result) {
+  return new Error(`[server] ${result.label} exited unexpectedly with ${formatManagedProcessExitStatus(result)}.`);
+}
 function ensureNextBuildIdInConfiguredDistDir(appDir) {
   const configuredDistDir = path.join(appDir, ".mercato", "next");
   const configuredBuildIdPath = path.join(configuredDistDir, "BUILD_ID");
@@ -288,7 +310,7 @@ async function runModuleCommand(allModules, moduleName, commandName, args = [],
       if (!options.silentOptional) {
         console.log(`\u23ED\uFE0F  Skipping "${moduleName}:${commandName}" \u2014 module not enabled`);
       }
-      return;
+      return false;
     }
     throw new Error(`Module not found: "${moduleName}"`);
   }
@@ -297,7 +319,7 @@ async function runModuleCommand(allModules, moduleName, commandName, args = [],
       if (!options.silentOptional) {
         console.log(`\u23ED\uFE0F  Skipping "${moduleName}:${commandName}" \u2014 module has no CLI commands`);
       }
-      return;
+      return false;
     }
     throw new Error(`Module "${moduleName}" has no CLI commands`);
   }
@@ -307,11 +329,12 @@ async function runModuleCommand(allModules, moduleName, commandName, args = [],
       if (!options.silentOptional) {
         console.log(`\u23ED\uFE0F  Skipping "${moduleName}:${commandName}" \u2014 command not found`);
       }
-      return;
+      return false;
     }
     throw new Error(`Command "${commandName}" not found in module "${moduleName}"`);
   }
   await cmd.run(args);
+  return true;
 }
 async function runPostGenerateStructuralCachePurge(quiet) {
   try {
@@ -629,8 +652,11 @@ async function run(argv = process.argv) {
       }
       console.log("\u2705 RBAC setup complete:", { tenantId, organizationId: orgId }, "\n");
       console.log("\u{1F39B}\uFE0F  Seeding feature toggle defaults...");
-      await runModuleCommand(allModules, "feature_toggles", "seed-defaults", []);
-      console.log("\u{1F39B}\uFE0F  \u2705 Feature toggle defaults seeded\n");
+      if (await runModuleCommand(allModules, "feature_toggles", "seed-defaults", [], { optional: true })) {
+        console.log("\u{1F39B}\uFE0F  \u2705 Feature toggle defaults seeded\n");
+      } else {
+        console.log("");
+      }
       if (tenantId) {
         console.log("\u{1F465} Seeding tenant-scoped roles...");
         await runModuleCommand(allModules, "auth", "seed-roles", ["--tenant", tenantId]);
@@ -685,32 +711,47 @@ async function run(argv = process.argv) {
           );
           const stressArgs = ["--tenant", tenantId, "--org", orgId, "--count", String(stressTestCount)];
           if (stressTestLite) stressArgs.push("--lite");
-          await runModuleCommand(allModules, "customers", "seed-stresstest", stressArgs, { optional: true });
-          console.log(`\u2705 Stress test customers seeded (requested ${stressTestCount})
+          if (await runModuleCommand(allModules, "customers", "seed-stresstest", stressArgs, { optional: true })) {
+            console.log(`\u2705 Stress test customers seeded (requested ${stressTestCount})
 `);
+          } else {
+            console.log("");
+          }
         }
         console.log("\u{1F9E9} Enabling default dashboard widgets...");
-        await runModuleCommand(allModules, "dashboards", "seed-defaults", ["--tenant", tenantId], { optional: true });
-        console.log("\u2705 Dashboard widgets enabled\n");
+        if (await runModuleCommand(allModules, "dashboards", "seed-defaults", ["--tenant", tenantId], { optional: true })) {
+          console.log("\u2705 Dashboard widgets enabled\n");
+        } else {
+          console.log("");
+        }
         console.log("\u{1F4CA} Enabling analytics widgets for admin and employee roles...");
-        await runModuleCommand(allModules, "dashboards", "enable-analytics-widgets", [
+        if (await runModuleCommand(allModules, "dashboards", "enable-analytics-widgets", [
           "--tenant",
           tenantId,
           "--roles",
           "admin,employee"
-        ]);
-        console.log("\u2705 Analytics widgets enabled for roles\n");
+        ], { optional: true })) {
+          console.log("\u2705 Analytics widgets enabled for roles\n");
+        } else {
+          console.log("");
+        }
       } else {
         console.log("\u26A0\uFE0F  Could not get organization ID or tenant ID, skipping seeding steps\n");
       }
       console.log("\u{1F9E0} Building search indexes...");
       const vectorArgs = tenantId ? ["--tenant", tenantId, ...orgId ? ["--org", orgId] : []] : ["--purgeFirst=false"];
-      await runModuleCommand(allModules, "search", "reindex", vectorArgs, { optional: true });
-      console.log("\u2705 Search indexes built\n");
+      if (await runModuleCommand(allModules, "search", "reindex", vectorArgs, { optional: true })) {
+        console.log("\u2705 Search indexes built\n");
+      } else {
+        console.log("");
+      }
       console.log("\u{1F50D} Rebuilding query indexes...");
       const queryIndexArgs = ["--force", ...tenantId ? ["--tenant", tenantId] : []];
-      await runModuleCommand(allModules, "query_index", "reindex", queryIndexArgs, { optional: true });
-      console.log("\u2705 Query indexes rebuilt\n");
+      if (await runModuleCommand(allModules, "query_index", "reindex", queryIndexArgs, { optional: true })) {
+        console.log("\u2705 Query indexes rebuilt\n");
+      } else {
+        console.log("");
+      }
       const adminPasswordOverride = derivedSecrets.adminPassword;
       const employeePasswordOverride = derivedSecrets.employeePassword;
       const createdUsers = [];
@@ -1351,7 +1392,7 @@ async function run(argv = process.argv) {
           const startNextDev = () => new Promise((resolve) => {
             const nextProcess = spawn("node", [nextBin, "dev", "--turbopack"], {
               stdio: ["inherit", "pipe", "pipe"],
-              env: process.env,
+              env: runtimeEnv,
               cwd: appDir
             });
             processes.push(nextProcess);
@@ -1372,18 +1413,22 @@ async function run(argv = process.argv) {
               process.stderr.write(text);
               appendOutput(text);
             });
-            nextProcess.on("exit", async () => {
+            nextProcess.on("exit", async (code, signal) => {
               if (!didRetryCorruptedTurbopackCache && isTurbopackCacheCorruption(combinedOutput)) {
                 didRetryCorruptedTurbopackCache = true;
                 console.log("[server] Detected corrupted Turbopack dev cache. Clearing .mercato/next/dev and restarting Next.js once...");
                 removeTurbopackDevCache(appDir);
-                await startNextDev();
-                return resolve();
+                return resolve(await startNextDev());
               }
-              resolve();
+              resolve({
+                label: "Next.js dev server",
+                code,
+                signal
+              });
             });
           });
           const nextExitPromise = startNextDev();
+          const managedExitPromises = [nextExitPromise];
           if (autoSpawnWorkers) {
             const discoveredWorkerQueues = [...new Set(getRegisteredCliWorkers().map((worker) => worker.queue))];
             if (discoveredWorkerQueues.length === 0) {
@@ -1392,32 +1437,28 @@ async function run(argv = process.argv) {
               console.log("[server] Starting workers for all queues...");
               const workerProcess = spawn("node", [mercatoBin, "queue", "worker", "--all"], {
                 stdio: "inherit",
-                env: process.env,
+                env: runtimeEnv,
                 cwd: appDir
               });
               processes.push(workerProcess);
+              managedExitPromises.push(waitForManagedProcessExit(workerProcess, "Queue worker"));
             }
           }
           if (autoSpawnScheduler && queueStrategy === "local") {
             console.log("[server] Starting scheduler polling engine...");
             const schedulerProcess = spawn("node", [mercatoBin, "scheduler", "start"], {
               stdio: "inherit",
-              env: process.env,
+              env: runtimeEnv,
               cwd: appDir
             });
             processes.push(schedulerProcess);
+            managedExitPromises.push(waitForManagedProcessExit(schedulerProcess, "Scheduler polling engine"));
           }
-          await Promise.race(
-            [
-              nextExitPromise,
-              ...processes.filter((proc) => proc.spawnargs[1] !== nextBin).map(
-                (proc) => new Promise((resolve) => {
-                  proc.on("exit", () => resolve());
-                })
-              )
-            ]
-          );
+          const firstExit = await Promise.race(managedExitPromises);
           await cleanupAndWait();
+          if (!isExpectedManagedExitSignal(firstExit.signal)) {
+            throw createManagedProcessExitError(firstExit);
+          }
         }
       },
       {