@open-mercato/cli 0.6.1-develop.3291.1.6fad645fd0 → 0.6.1

package/dist/mercato.js

@@ -10,6 +10,12 @@ import {
   resolveLazyRestart
 } from "./lib/auto-spawn-workers.js";
 import { startLazyWorkerSupervisor } from "./lib/queue-worker-supervisor.js";
+import {
+  resolveAutoSpawnSchedulerMode,
+  resolveLazySchedulerPollMs,
+  resolveLazySchedulerRestart
+} from "./lib/auto-spawn-scheduler.js";
+import { startLazySchedulerSupervisor } from "./lib/scheduler-supervisor.js";
 import { parseModuleInstallArgs } from "./lib/module-install-args.js";
 import { resolveNextBuildIdCandidate } from "./lib/next-build-id.js";
 import { acquireServerStartLock } from "./lib/server-start-lock.js";
@@ -1393,6 +1399,7 @@ async function run(argv = process.argv) {
           let stopping = false;
           let envChangePromiseResolve = null;
           let activeLazySupervisor = null;
+          let activeLazySchedulerSupervisor = null;
           const envReloader = createDevEnvReloader(appDir, process.env, initialProcessEnvironmentEntries);
           function cleanup() {
             console.log("[server] Shutting down...");
@@ -1404,6 +1411,9 @@ async function run(argv = process.argv) {
             if (activeLazySupervisor) {
               void activeLazySupervisor.close().catch(() => void 0);
             }
+            if (activeLazySchedulerSupervisor) {
+              void activeLazySchedulerSupervisor.close().catch(() => void 0);
+            }
           }
           async function cleanupAndWait() {
             cleanup();
@@ -1422,6 +1432,13 @@ async function run(argv = process.argv) {
               }
               activeLazySupervisor = null;
             }
+            if (activeLazySchedulerSupervisor) {
+              try {
+                await activeLazySchedulerSupervisor.close();
+              } catch {
+              }
+              activeLazySchedulerSupervisor = null;
+            }
             const lockFile = path.join(appDir, ".mercato", "next", "dev", "lock");
             try {
               fs.unlinkSync(lockFile);
@@ -1496,7 +1513,7 @@ async function run(argv = process.argv) {
               envReloader.reload();
               const runtimeEnv = buildServerProcessEnvironment(process.env);
               const autoSpawnWorkersMode = resolveAutoSpawnWorkersMode(process.env);
-              const autoSpawnScheduler = process.env.AUTO_SPAWN_SCHEDULER !== "false";
+              const autoSpawnSchedulerMode = resolveAutoSpawnSchedulerMode(process.env);
               const queueStrategy = process.env.QUEUE_STRATEGY || "local";
               const schedulerCommand = lookupModuleCommand(getCliModules(), "scheduler", "start");
               const managedExitPromises = [
@@ -1519,7 +1536,7 @@ async function run(argv = process.argv) {
                     restartOnUnexpectedExit: resolveLazyRestart(process.env)
                   });
                 } else {
-                  console.log("[server] Starting workers for all queues...");
+                  console.log("[server] Eager worker auto-spawn enabled - starting workers for all queues...");
                   const workerProcess = spawn("node", [mercatoBin, "queue", "worker", "--all"], {
                     stdio: "inherit",
                     env: runtimeEnv,
@@ -1529,11 +1546,20 @@ async function run(argv = process.argv) {
                   managedExitPromises.push(waitForManagedProcessExit(workerProcess, formatQueueWorkerLabel(discoveredWorkerQueues)));
                 }
               }
-              if (autoSpawnScheduler && queueStrategy === "local") {
+              if (autoSpawnSchedulerMode !== "off" && queueStrategy === "local") {
                 if (schedulerCommand.status !== "ok") {
                   console.log(`[server] Skipping scheduler auto-start \u2014 ${describeMissingModuleCommand(schedulerCommand)}`);
+                } else if (autoSpawnSchedulerMode === "lazy") {
+                  console.log("[server] Lazy scheduler auto-spawn enabled - scheduler will start when an enabled schedule exists.");
+                  activeLazySchedulerSupervisor = startLazySchedulerSupervisor({
+                    mercatoBin,
+                    appDir,
+                    runtimeEnv,
+                    pollMs: resolveLazySchedulerPollMs(process.env),
+                    restartOnUnexpectedExit: resolveLazySchedulerRestart(process.env)
+                  });
                 } else {
-                  console.log("[server] Starting scheduler polling engine...");
+                  console.log("[server] Eager scheduler auto-spawn enabled - starting scheduler polling engine...");
                   const schedulerProcess = spawn("node", [mercatoBin, "scheduler", "start"], {
                     stdio: "inherit",
                     env: runtimeEnv,
@@ -1570,7 +1596,7 @@ async function run(argv = process.argv) {
           const nodeModulesBases = Array.from(/* @__PURE__ */ new Set([env.rootDir, appDir]));
           const processes = [];
           const autoSpawnWorkersMode = resolveAutoSpawnWorkersMode(process.env);
-          const autoSpawnScheduler = process.env.AUTO_SPAWN_SCHEDULER !== "false";
+          const autoSpawnSchedulerMode = resolveAutoSpawnSchedulerMode(process.env);
           const queueStrategy = process.env.QUEUE_STRATEGY || "local";
           const runtimeEnv = buildServerProcessEnvironment(process.env);
           const schedulerCommand = lookupModuleCommand(getCliModules(), "scheduler", "start");
@@ -1578,6 +1604,7 @@ async function run(argv = process.argv) {
             port: runtimeEnv.PORT ?? process.env.PORT ?? null
           });
           let activeLazySupervisor = null;
+          let activeLazySchedulerSupervisor = null;
           let stopping = false;
           function cleanup() {
             console.log("[server] Shutting down...");
@@ -1589,6 +1616,9 @@ async function run(argv = process.argv) {
             if (activeLazySupervisor) {
               void activeLazySupervisor.close().catch(() => void 0);
             }
+            if (activeLazySchedulerSupervisor) {
+              void activeLazySchedulerSupervisor.close().catch(() => void 0);
+            }
           }
           async function cleanupAndWait() {
             cleanup();
@@ -1607,6 +1637,13 @@ async function run(argv = process.argv) {
               }
               activeLazySupervisor = null;
             }
+            if (activeLazySchedulerSupervisor) {
+              try {
+                await activeLazySchedulerSupervisor.close();
+              } catch {
+              }
+              activeLazySchedulerSupervisor = null;
+            }
           }
           process.on("SIGTERM", () => {
             stopping = true;
@@ -1646,7 +1683,7 @@ async function run(argv = process.argv) {
                   restartOnUnexpectedExit: resolveLazyRestart(process.env)
                 });
               } else {
-                console.log("[server] Starting workers for all queues...");
+                console.log("[server] Eager worker auto-spawn enabled - starting workers for all queues...");
                 const workerProcess = spawn("node", [mercatoBin, "queue", "worker", "--all"], {
                   stdio: "inherit",
                   env: runtimeEnv,
@@ -1656,11 +1693,20 @@ async function run(argv = process.argv) {
                 managedExitPromises.push(waitForManagedProcessExit(workerProcess, formatQueueWorkerLabel(discoveredWorkerQueues)));
               }
             }
-            if (autoSpawnScheduler && queueStrategy === "local") {
+            if (autoSpawnSchedulerMode !== "off" && queueStrategy === "local") {
               if (schedulerCommand.status !== "ok") {
                 console.log(`[server] Skipping scheduler auto-start \u2014 ${describeMissingModuleCommand(schedulerCommand)}`);
+              } else if (autoSpawnSchedulerMode === "lazy") {
+                console.log("[server] Lazy scheduler auto-spawn enabled - scheduler will start when an enabled schedule exists.");
+                activeLazySchedulerSupervisor = startLazySchedulerSupervisor({
+                  mercatoBin,
+                  appDir,
+                  runtimeEnv,
+                  pollMs: resolveLazySchedulerPollMs(process.env),
+                  restartOnUnexpectedExit: resolveLazySchedulerRestart(process.env)
+                });
               } else {
-                console.log("[server] Starting scheduler polling engine...");
+                console.log("[server] Eager scheduler auto-spawn enabled - starting scheduler polling engine...");
                 const schedulerProcess = spawn("node", [mercatoBin, "scheduler", "start"], {
                   stdio: "inherit",
                   env: runtimeEnv,