@open-mercato/cli 0.6.3 → 0.6.4-canary.3917.1.4d8c013983

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
-[build:cli] found 74 entry points
+[build:cli] found 73 entry points
 Copied create-app/agentic/ → dist/agentic/
 Discovered 16 standalone guides → dist/agentic/guides/
 [build:cli] built successfully

package/AGENTS.md

@@ -72,7 +72,7 @@ The structural cache purge does two things:
 1. Deletes Redis cache keys matching `nav:*` so navigation/sidebar caches are rebuilt next render.
 2. Touches every `*.generated.ts` and `*.generated.checksum` file in the current app's `.mercato/generated/` directory by rewriting them with identical bytes. This advances mtime without changing content, which forces Turbopack's filesystem watcher to invalidate the import graph and recompile leaf files that imported a barrel. Without this, Turbopack can keep serving a cached compile error against a since-fixed module file until the dev server is restarted.
 
-The dev escape hatch is `yarn dev:reset`, which clears the configured Next dev cache (`.mercato/next/dev`) plus legacy `.next` cache directories for the rare case where Turbopack's internal cache stays stuck after a structural purge.
+The dev escape hatch is `yarn dev:reset`, which clears `.next/cache/turbopack` and `.next/cache/webpack` for the rare case where Turbopack's internal cache stays stuck after a structural purge.
 
 ## Database Migrations
 

package/dist/agentic/shared/AGENTS.md.template

@@ -201,7 +201,6 @@ When the user asks to **create a new application** or a **new module**, do not i
 - Entity classes belong in `src/modules/<module>/data/entities.ts` and use decorators from `@mikro-orm/decorators/legacy`
 - Standalone apps expose `yarn mercato configs cache ...` because the template enables the `configs` module from `@open-mercato/core`
 - `yarn generate` automatically runs a best-effort structural cache purge (`yarn mercato configs cache structural --all-tenants`) after successful generation; if the cache command is unavailable, generation still succeeds
-- Use `yarn dev:reset` only as the stale-Turbopack escape hatch; it clears `.mercato/next/dev` plus legacy `.next` caches.
 - Detail/read-model APIs that expose `customFields` MUST return bare field keys via `normalizeCustomFieldResponse()` (for example `{ priority: 3 }`). Keep `cf_` / `cf:` prefixes for request payloads, filters, and form field IDs only.
 - Sidebar icons MUST use `lucide-react` components — never inline SVG via `React.createElement`
 - `page.meta.ts` MUST include `pageGroup`, `pageGroupKey`, and `pageOrder` for sidebar grouping

package/dist/lib/dev-env-reload.js

@@ -1,7 +1,6 @@
 import dotenv from "dotenv";
 import fs from "node:fs";
 import path from "node:path";
-const RUNTIME_GRAPH_FILE_PATTERN = /\.generated(?:\.[a-z0-9]+)?(?:\.tsx?|\.checksum)$/i;
 const DEV_ENV_PRIORITY = [
   ".env",
   ".env.development",
@@ -82,47 +81,9 @@ function watchDevEnvFiles(appDir, onChange, options = {}) {
     }
   };
 }
-function watchDevRuntimeFiles(appDir, onChange, options = {}) {
-  const debounceMs = options.debounceMs ?? 250;
-  const generatedDir = path.join(appDir, ".mercato", "generated");
-  const timers = /* @__PURE__ */ new Map();
-  if (!fs.existsSync(generatedDir)) {
-    return () => {
-    };
-  }
-  let watcher = null;
-  try {
-    watcher = fs.watch(generatedDir, (eventType, fileName) => {
-      if (eventType !== "change" && eventType !== "rename") return;
-      const name = String(fileName ?? "");
-      if (!name) return;
-      if (!RUNTIME_GRAPH_FILE_PATTERN.test(name)) return;
-      const filePath = path.join(generatedDir, name);
-      const existingTimer = timers.get(filePath);
-      if (existingTimer) {
-        clearTimeout(existingTimer);
-      }
-      timers.set(filePath, setTimeout(() => {
-        timers.delete(filePath);
-        onChange(filePath);
-      }, debounceMs));
-    });
-  } catch {
-    return () => {
-    };
-  }
-  return () => {
-    for (const timer of timers.values()) {
-      clearTimeout(timer);
-    }
-    timers.clear();
-    watcher?.close();
-  };
-}
 export {
   createDevEnvReloader,
   resolveDevEnvFilePaths,
-  watchDevEnvFiles,
-  watchDevRuntimeFiles
+  watchDevEnvFiles
 };
 //# sourceMappingURL=dev-env-reload.js.map

package/dist/lib/dev-env-reload.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/dev-env-reload.ts"],
-  "sourcesContent": ["import dotenv from 'dotenv'\nimport fs from 'node:fs'\nimport path from 'node:path'\n\nconst RUNTIME_GRAPH_FILE_PATTERN = /\\.generated(?:\\.[a-z0-9]+)?(?:\\.tsx?|\\.checksum)$/i\n\nconst DEV_ENV_PRIORITY = [\n  '.env',\n  '.env.development',\n  '.env.local',\n  '.env.development.local',\n] as const\n\nexport type DevEnvReloader = {\n  reload: () => void\n  getWatchedFiles: () => string[]\n}\n\nexport function resolveDevEnvFilePaths(appDir: string): string[] {\n  return DEV_ENV_PRIORITY.map((fileName) => path.join(appDir, fileName))\n}\n\nexport function createDevEnvReloader(\n  appDir: string,\n  environment: NodeJS.ProcessEnv = process.env,\n  baseEnvironmentEntries: Iterable<[string, string | undefined]> = Object.entries(environment),\n): DevEnvReloader {\n  const baseEnvironment = new Map<string, string | undefined>(\n    Array.from(baseEnvironmentEntries, ([key, value]) => [key, value]),\n  )\n  const managedKeys = new Set<string>()\n  const envFilePaths = resolveDevEnvFilePaths(appDir)\n\n  const resetManagedKeys = () => {\n    for (const key of managedKeys) {\n      const baseValue = baseEnvironment.get(key)\n      if (baseValue === undefined) {\n        delete environment[key]\n      } else {\n        environment[key] = baseValue\n      }\n    }\n    managedKeys.clear()\n  }\n\n  const reload = () => {\n    resetManagedKeys()\n\n    for (const envFilePath of envFilePaths) {\n      if (!fs.existsSync(envFilePath)) continue\n\n      const parsed = dotenv.parse(fs.readFileSync(envFilePath))\n      for (const [key, value] of Object.entries(parsed)) {\n        if (baseEnvironment.has(key) && baseEnvironment.get(key) !== undefined) {\n          continue\n        }\n        environment[key] = value\n        managedKeys.add(key)\n      }\n    }\n  }\n\n  return {\n    reload,\n    getWatchedFiles: () => [...envFilePaths],\n  }\n}\n\nexport function watchDevEnvFiles(\n  appDir: string,\n  onChange: (filePath: string) => void,\n  options: { debounceMs?: number } = {},\n): () => void {\n  const debounceMs = options.debounceMs ?? 250\n  const envFilePaths = resolveDevEnvFilePaths(appDir)\n  const timers = new Map<string, NodeJS.Timeout>()\n  const watchers = envFilePaths.map((envFilePath) => {\n    const watchDir = path.dirname(envFilePath)\n    const watchFileName = path.basename(envFilePath)\n\n    if (!fs.existsSync(watchDir)) return null\n\n    try {\n      return fs.watch(watchDir, (eventType, fileName) => {\n        if (eventType !== 'change' && eventType !== 'rename') return\n        if (String(fileName ?? '') !== watchFileName) return\n\n        const existingTimer = timers.get(envFilePath)\n        if (existingTimer) {\n          clearTimeout(existingTimer)\n        }\n\n        timers.set(envFilePath, setTimeout(() => {\n          timers.delete(envFilePath)\n          onChange(envFilePath)\n        }, debounceMs))\n      })\n    } catch {\n      return null\n    }\n  }).filter((watcher): watcher is fs.FSWatcher => watcher !== null)\n\n  return () => {\n    for (const timer of timers.values()) {\n      clearTimeout(timer)\n    }\n    timers.clear()\n    for (const watcher of watchers) {\n      watcher.close()\n    }\n  }\n}\n\nexport function watchDevRuntimeFiles(\n  appDir: string,\n  onChange: (filePath: string) => void,\n  options: { debounceMs?: number } = {},\n): () => void {\n  const debounceMs = options.debounceMs ?? 250\n  const generatedDir = path.join(appDir, '.mercato', 'generated')\n  const timers = new Map<string, NodeJS.Timeout>()\n\n  if (!fs.existsSync(generatedDir)) {\n    return () => {}\n  }\n\n  let watcher: fs.FSWatcher | null = null\n  try {\n    watcher = fs.watch(generatedDir, (eventType, fileName) => {\n      if (eventType !== 'change' && eventType !== 'rename') return\n      const name = String(fileName ?? '')\n      if (!name) return\n      if (!RUNTIME_GRAPH_FILE_PATTERN.test(name)) return\n\n      const filePath = path.join(generatedDir, name)\n      const existingTimer = timers.get(filePath)\n      if (existingTimer) {\n        clearTimeout(existingTimer)\n      }\n\n      timers.set(filePath, setTimeout(() => {\n        timers.delete(filePath)\n        onChange(filePath)\n      }, debounceMs))\n    })\n  } catch {\n    return () => {}\n  }\n\n  return () => {\n    for (const timer of timers.values()) {\n      clearTimeout(timer)\n    }\n    timers.clear()\n    watcher?.close()\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import dotenv from 'dotenv'\nimport fs from 'node:fs'\nimport path from 'node:path'\n\nconst DEV_ENV_PRIORITY = [\n  '.env',\n  '.env.development',\n  '.env.local',\n  '.env.development.local',\n] as const\n\nexport type DevEnvReloader = {\n  reload: () => void\n  getWatchedFiles: () => string[]\n}\n\nexport function resolveDevEnvFilePaths(appDir: string): string[] {\n  return DEV_ENV_PRIORITY.map((fileName) => path.join(appDir, fileName))\n}\n\nexport function createDevEnvReloader(\n  appDir: string,\n  environment: NodeJS.ProcessEnv = process.env,\n  baseEnvironmentEntries: Iterable<[string, string | undefined]> = Object.entries(environment),\n): DevEnvReloader {\n  const baseEnvironment = new Map<string, string | undefined>(\n    Array.from(baseEnvironmentEntries, ([key, value]) => [key, value]),\n  )\n  const managedKeys = new Set<string>()\n  const envFilePaths = resolveDevEnvFilePaths(appDir)\n\n  const resetManagedKeys = () => {\n    for (const key of managedKeys) {\n      const baseValue = baseEnvironment.get(key)\n      if (baseValue === undefined) {\n        delete environment[key]\n      } else {\n        environment[key] = baseValue\n      }\n    }\n    managedKeys.clear()\n  }\n\n  const reload = () => {\n    resetManagedKeys()\n\n    for (const envFilePath of envFilePaths) {\n      if (!fs.existsSync(envFilePath)) continue\n\n      const parsed = dotenv.parse(fs.readFileSync(envFilePath))\n      for (const [key, value] of Object.entries(parsed)) {\n        if (baseEnvironment.has(key) && baseEnvironment.get(key) !== undefined) {\n          continue\n        }\n        environment[key] = value\n        managedKeys.add(key)\n      }\n    }\n  }\n\n  return {\n    reload,\n    getWatchedFiles: () => [...envFilePaths],\n  }\n}\n\nexport function watchDevEnvFiles(\n  appDir: string,\n  onChange: (filePath: string) => void,\n  options: { debounceMs?: number } = {},\n): () => void {\n  const debounceMs = options.debounceMs ?? 250\n  const envFilePaths = resolveDevEnvFilePaths(appDir)\n  const timers = new Map<string, NodeJS.Timeout>()\n  const watchers = envFilePaths.map((envFilePath) => {\n    const watchDir = path.dirname(envFilePath)\n    const watchFileName = path.basename(envFilePath)\n\n    if (!fs.existsSync(watchDir)) return null\n\n    try {\n      return fs.watch(watchDir, (eventType, fileName) => {\n        if (eventType !== 'change' && eventType !== 'rename') return\n        if (String(fileName ?? '') !== watchFileName) return\n\n        const existingTimer = timers.get(envFilePath)\n        if (existingTimer) {\n          clearTimeout(existingTimer)\n        }\n\n        timers.set(envFilePath, setTimeout(() => {\n          timers.delete(envFilePath)\n          onChange(envFilePath)\n        }, debounceMs))\n      })\n    } catch {\n      return null\n    }\n  }).filter((watcher): watcher is fs.FSWatcher => watcher !== null)\n\n  return () => {\n    for (const timer of timers.values()) {\n      clearTimeout(timer)\n    }\n    timers.clear()\n    for (const watcher of watchers) {\n      watcher.close()\n    }\n  }\n}\n"],
+  "mappings": "AAAA,OAAO,YAAY;AACnB,OAAO,QAAQ;AACf,OAAO,UAAU;AAEjB,MAAM,mBAAmB;AAAA,EACvB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAOO,SAAS,uBAAuB,QAA0B;AAC/D,SAAO,iBAAiB,IAAI,CAAC,aAAa,KAAK,KAAK,QAAQ,QAAQ,CAAC;AACvE;AAEO,SAAS,qBACd,QACA,cAAiC,QAAQ,KACzC,yBAAiE,OAAO,QAAQ,WAAW,GAC3E;AAChB,QAAM,kBAAkB,IAAI;AAAA,IAC1B,MAAM,KAAK,wBAAwB,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,KAAK,CAAC;AAAA,EACnE;AACA,QAAM,cAAc,oBAAI,IAAY;AACpC,QAAM,eAAe,uBAAuB,MAAM;AAElD,QAAM,mBAAmB,MAAM;AAC7B,eAAW,OAAO,aAAa;AAC7B,YAAM,YAAY,gBAAgB,IAAI,GAAG;AACzC,UAAI,cAAc,QAAW;AAC3B,eAAO,YAAY,GAAG;AAAA,MACxB,OAAO;AACL,oBAAY,GAAG,IAAI;AAAA,MACrB;AAAA,IACF;AACA,gBAAY,MAAM;AAAA,EACpB;AAEA,QAAM,SAAS,MAAM;AACnB,qBAAiB;AAEjB,eAAW,eAAe,cAAc;AACtC,UAAI,CAAC,GAAG,WAAW,WAAW,EAAG;AAEjC,YAAM,SAAS,OAAO,MAAM,GAAG,aAAa,WAAW,CAAC;AACxD,iBAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,MAAM,GAAG;AACjD,YAAI,gBAAgB,IAAI,GAAG,KAAK,gBAAgB,IAAI,GAAG,MAAM,QAAW;AACtE;AAAA,QACF;AACA,oBAAY,GAAG,IAAI;AACnB,oBAAY,IAAI,GAAG;AAAA,MACrB;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AAAA,IACL;AAAA,IACA,iBAAiB,MAAM,CAAC,GAAG,YAAY;AAAA,EACzC;AACF;AAEO,SAAS,iBACd,QACA,UACA,UAAmC,CAAC,GACxB;AACZ,QAAM,aAAa,QAAQ,cAAc;AACzC,QAAM,eAAe,uBAAuB,MAAM;AAClD,QAAM,SAAS,oBAAI,IAA4B;AAC/C,QAAM,WAAW,aAAa,IAAI,CAAC,gBAAgB;AACjD,UAAM,WAAW,KAAK,QAAQ,WAAW;AACzC,UAAM,gBAAgB,KAAK,SAAS,WAAW;AAE/C,QAAI,CAAC,GAAG,WAAW,QAAQ,EAAG,QAAO;AAErC,QAAI;AACF,aAAO,GAAG,MAAM,UAAU,CAAC,WAAW,aAAa;AACjD,YAAI,cAAc,YAAY,cAAc,SAAU;AACtD,YAAI,OAAO,YAAY,EAAE,MAAM,cAAe;AAE9C,cAAM,gBAAgB,OAAO,IAAI,WAAW;AAC5C,YAAI,eAAe;AACjB,uBAAa,aAAa;AAAA,QAC5B;AAEA,eAAO,IAAI,aAAa,WAAW,MAAM;AACvC,iBAAO,OAAO,WAAW;AACzB,mBAAS,WAAW;AAAA,QACtB,GAAG,UAAU,CAAC;AAAA,MAChB,CAAC;AAAA,IACH,QAAQ;AACN,aAAO;AAAA,IACT;AAAA,EACF,CAAC,EAAE,OAAO,CAAC,YAAqC,YAAY,IAAI;AAEhE,SAAO,MAAM;AACX,eAAW,SAAS,OAAO,OAAO,GAAG;AACnC,mBAAa,KAAK;AAAA,IACpB;AACA,WAAO,MAAM;AACb,eAAW,WAAW,UAAU;AAC9B,cAAQ,MAAM;AAAA,IAChB;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/mercato.js

@@ -246,102 +246,6 @@ function buildServerProcessEnvironment(environment) {
   }
   return runtimeEnv;
 }
-function resolveDevRuntimeBaseUrl(environment = process.env) {
-  const configured = environment.APP_URL ?? environment.NEXT_PUBLIC_APP_URL ?? environment.NEXTAUTH_URL;
-  if (configured?.trim()) {
-    return configured.trim().replace(/\/+$/, "");
-  }
-  return `http://localhost:${environment.PORT?.trim() || "3000"}`;
-}
-function writeDevSplashChildState(state) {
-  if (process.env.OM_DEV_SPLASH_RUNTIME_WRAPPER === "1") return;
-  const stateFile = process.env.OM_DEV_SPLASH_CHILD_STATE_FILE;
-  if (!stateFile?.trim()) return;
-  try {
-    fs.mkdirSync(path.dirname(stateFile), { recursive: true });
-    fs.writeFileSync(stateFile, `${JSON.stringify({
-      mode: process.env.OM_DEV_SPLASH_MODE || "dev",
-      failed: false,
-      failureLines: [],
-      failureCommand: null,
-      ...state
-    }, null, 2)}
-`);
-  } catch {
-  }
-}
-function writeDevSplashRuntimeStarting(detail = "Starting Next.js dev server") {
-  writeDevSplashChildState({
-    phase: "Preparing app runtime",
-    detail,
-    ready: false,
-    readyUrl: null,
-    loginUrl: null,
-    progressLabel: "Launching app runtime",
-    activity: detail
-  });
-}
-function resolveSplashProgressFallback() {
-  const current = Number.parseInt(process.env.OM_DEV_SPLASH_STAGE_CURRENT ?? "", 10);
-  const total = Number.parseInt(process.env.OM_DEV_SPLASH_STAGE_TOTAL ?? "", 10);
-  if (Number.isFinite(current) && Number.isFinite(total) && total > 0) {
-    return { current, total };
-  }
-  if (process.env.OM_DEV_SPLASH_MODE === "greenfield" || process.env.OM_DEV_SPLASH_MODE === "setup") {
-    return { current: 5, total: 5 };
-  }
-  return { current: 3, total: 3 };
-}
-function writeDevSplashRuntimeRestarting(reason) {
-  const progress = resolveSplashProgressFallback();
-  writeDevSplashChildState({
-    phase: "App runtime is restarting",
-    detail: `Reason: ${reason}`,
-    ready: false,
-    readyUrl: null,
-    loginUrl: null,
-    progressCurrent: progress.current,
-    progressTotal: progress.total,
-    progressLabel: "Restarting app runtime",
-    activity: `App runtime restart: ${reason}`
-  });
-}
-function writeDevSplashRuntimeReady(reason) {
-  const readyUrl = resolveDevRuntimeBaseUrl();
-  const progress = resolveSplashProgressFallback();
-  writeDevSplashChildState({
-    phase: "App is ready",
-    detail: reason ? `Restart completed after ${reason}` : "Next.js dev server is ready",
-    ready: true,
-    readyUrl,
-    loginUrl: `${readyUrl}/login`,
-    progressCurrent: progress.current,
-    progressTotal: progress.total,
-    progressPercent: 100,
-    progressLabel: "App is ready",
-    activity: reason ? `Restart completed after ${reason}` : "App runtime is ready"
-  });
-}
-function resolveDevWarmupReadyTimeoutMs(environment = process.env) {
-  const parsed = Number.parseInt(environment.OM_DEV_WARMUP_READY_TIMEOUT_MS ?? "", 10);
-  if (Number.isFinite(parsed) && parsed >= 0) return parsed;
-  return 3e5;
-}
-async function waitForDevWarmupReadyFile(filePath, options = {}) {
-  const normalized = filePath?.trim();
-  if (!normalized) return "ready";
-  const timeoutMs = options.timeoutMs ?? resolveDevWarmupReadyTimeoutMs();
-  const startedAt = Date.now();
-  while (true) {
-    if (options.signal?.aborted) return "aborted";
-    try {
-      if (fs.existsSync(normalized)) return "ready";
-    } catch {
-    }
-    if (timeoutMs >= 0 && Date.now() - startedAt >= timeoutMs) return "timeout";
-    await new Promise((resolve) => setTimeout(resolve, 250));
-  }
-}
 function waitForManagedProcessExit(proc, label) {
   return new Promise((resolve) => {
     proc.on("exit", (code, signal) => {
@@ -541,17 +445,18 @@ async function runGeneratorSuite(quiet) {
 function createGenerateWatchChecksumFn() {
   return async () => {
     const { createResolver } = await import("./lib/resolver.js");
-    const { calculateGenerateWatchStructureChecksum } = await import("./lib/generate-watch-structure.js");
+    const { calculateStructureChecksum } = await import("./lib/utils.js");
     const resolver = createResolver();
-    const moduleRoots = [];
+    const tracked = /* @__PURE__ */ new Set([
+      path.join(resolver.getAppDir(), "src", "modules.ts"),
+      path.join(resolver.getAppDir(), "src", "modules")
+    ]);
     for (const entry of resolver.loadEnabledModules()) {
       const roots = resolver.getModulePaths(entry);
-      moduleRoots.push({ appBase: roots.appBase, pkgBase: roots.pkgBase });
+      tracked.add(roots.appBase);
+      tracked.add(roots.pkgBase);
     }
-    return calculateGenerateWatchStructureChecksum({
-      modulesFile: path.join(resolver.getAppDir(), "src", "modules.ts"),
-      moduleRoots
-    });
+    return calculateStructureChecksum(Array.from(tracked));
   };
 }
 async function buildAllModules() {
@@ -1485,11 +1390,10 @@ async function run(argv = process.argv) {
           let processes = [];
           let didRetryCorruptedTurbopackCache = false;
           let stopping = false;
-          let devRestartPromiseResolve = null;
+          let envChangePromiseResolve = null;
           let activeLazySupervisor = null;
           let activeLazySchedulerSupervisor = null;
           let activeGenerateWatcher = null;
-          let lastRestartReason = null;
           const generateWatcherMode = resolveGenerateWatcherMode(process.env);
           const envReloader = createDevEnvReloader(appDir, process.env, initialProcessEnvironmentEntries);
           function cleanup() {
@@ -1562,74 +1466,53 @@ async function run(argv = process.argv) {
           const nextBin = resolveInstalledBinary(nodeModulesBases, "next/dist/bin/next");
           const mercatoBin = resolveInstalledBinary(nodeModulesBases, "@open-mercato/cli/bin/mercato");
           const stopEnvWatcher = watchDevEnvFiles(appDir, (filePath) => {
-            devRestartPromiseResolve?.({
+            envChangePromiseResolve?.({
               label: "Environment file change",
               restart: true,
               filePath
             });
           });
-          const waitForDevRestart = () => new Promise((resolve) => {
-            devRestartPromiseResolve = resolve;
+          const waitForEnvChange = () => new Promise((resolve) => {
+            envChangePromiseResolve = resolve;
           });
-          const startNextDev = (runtimeEnv) => {
-            let readyResolve = () => void 0;
-            const readyPromise = new Promise((resolve) => {
-              readyResolve = resolve;
+          const startNextDev = (runtimeEnv) => new Promise((resolve) => {
+            const nextProcess = spawn("node", [nextBin, "dev", "--turbopack"], {
+              stdio: ["inherit", "pipe", "pipe"],
+              env: runtimeEnv,
+              cwd: appDir
             });
-            const exitPromise = new Promise((resolve) => {
-              writeDevSplashRuntimeStarting(
-                lastRestartReason ? `Restarting Next.js dev server. Reason: ${lastRestartReason}` : "Starting Next.js dev server"
-              );
-              const nextProcess = spawn("node", [nextBin, "dev", "--turbopack"], {
-                stdio: ["inherit", "pipe", "pipe"],
-                env: runtimeEnv,
-                cwd: appDir
-              });
-              processes.push(nextProcess);
-              let combinedOutput = "";
-              let reportedReady = false;
-              const appendOutput = (chunk) => {
-                combinedOutput += chunk;
-                if (combinedOutput.length > 32768) {
-                  combinedOutput = combinedOutput.slice(-32768);
-                }
-                if (!reportedReady && /\bready in\b/i.test(chunk)) {
-                  reportedReady = true;
-                  writeDevSplashRuntimeReady(lastRestartReason ?? void 0);
-                  lastRestartReason = null;
-                  readyResolve();
-                }
-              };
-              nextProcess.stdout?.on("data", (chunk) => {
-                const text = typeof chunk === "string" ? chunk : chunk.toString();
-                process.stdout.write(text);
-                appendOutput(text);
-              });
-              nextProcess.stderr?.on("data", (chunk) => {
-                const text = typeof chunk === "string" ? chunk : chunk.toString();
-                process.stderr.write(text);
-                appendOutput(text);
-              });
-              nextProcess.on("exit", async (code, signal) => {
-                if (!didRetryCorruptedTurbopackCache && isTurbopackCacheCorruption(combinedOutput)) {
-                  didRetryCorruptedTurbopackCache = true;
-                  lastRestartReason = "corrupted Turbopack dev cache";
-                  writeDevSplashRuntimeRestarting(lastRestartReason);
-                  console.log("[server] Detected corrupted Turbopack dev cache. Clearing .mercato/next/dev and restarting Next.js once...");
-                  removeTurbopackDevCache(appDir);
-                  const restarted = startNextDev(runtimeEnv);
-                  restarted.readyPromise.then(readyResolve);
-                  return resolve(await restarted.exitPromise);
-                }
-                resolve({
-                  label: "Next.js dev server",
-                  code,
-                  signal
-                });
+            processes.push(nextProcess);
+            let combinedOutput = "";
+            const appendOutput = (chunk) => {
+              combinedOutput += chunk;
+              if (combinedOutput.length > 32768) {
+                combinedOutput = combinedOutput.slice(-32768);
+              }
+            };
+            nextProcess.stdout?.on("data", (chunk) => {
+              const text = typeof chunk === "string" ? chunk : chunk.toString();
+              process.stdout.write(text);
+              appendOutput(text);
+            });
+            nextProcess.stderr?.on("data", (chunk) => {
+              const text = typeof chunk === "string" ? chunk : chunk.toString();
+              process.stderr.write(text);
+              appendOutput(text);
+            });
+            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);
+                return resolve(await startNextDev(runtimeEnv));
+              }
+              resolve({
+                label: "Next.js dev server",
+                code,
+                signal
               });
             });
-            return { exitPromise, readyPromise };
-          };
+          });
           try {
             while (!stopping) {
               envReloader.reload();
@@ -1638,84 +1521,59 @@ async function run(argv = process.argv) {
               const autoSpawnSchedulerMode = resolveAutoSpawnSchedulerMode(process.env);
               const queueStrategy = process.env.QUEUE_STRATEGY || "local";
               const schedulerCommand = lookupModuleCommand(getCliModules(), "scheduler", "start");
-              const nextRuntime = startNextDev(runtimeEnv);
-              const restartPromise = waitForDevRestart();
-              const backgroundStartAbort = new AbortController();
-              const cancelBackgroundStart = () => backgroundStartAbort.abort();
-              nextRuntime.exitPromise.finally(cancelBackgroundStart);
-              restartPromise.then(cancelBackgroundStart);
-              let backgroundExitResolve = () => void 0;
-              const backgroundExitPromise = new Promise((resolve) => {
-                backgroundExitResolve = resolve;
-              });
               const managedExitPromises = [
-                nextRuntime.exitPromise,
-                restartPromise,
-                backgroundExitPromise
+                startNextDev(runtimeEnv),
+                waitForEnvChange()
               ];
-              const startBackgroundServices = async () => {
-                if (stopping || backgroundStartAbort.signal.aborted) return;
-                const warmupReady = await waitForDevWarmupReadyFile(process.env.OM_DEV_WARMUP_READY_FILE, {
-                  timeoutMs: resolveDevWarmupReadyTimeoutMs(process.env),
-                  signal: backgroundStartAbort.signal
-                });
-                if (warmupReady === "aborted" || stopping || backgroundStartAbort.signal.aborted) return;
-                if (warmupReady === "timeout") {
-                  console.warn("[server] Timed out waiting for dev warmup marker; starting background services anyway.");
-                }
-                if (autoSpawnWorkersMode !== "off") {
-                  const discoveredWorkers = getRegisteredCliWorkers();
-                  const discoveredWorkerQueues = [...new Set(discoveredWorkers.map((worker) => worker.queue))];
-                  if (discoveredWorkerQueues.length === 0) {
-                    console.error("[server] AUTO_SPAWN_WORKERS is enabled, but no queues were discovered from CLI modules. Run `yarn generate` and verify `.mercato/generated/modules.cli.generated.ts` contains worker entries. Continuing without auto-spawned workers.");
-                  } else if (autoSpawnWorkersMode === "lazy") {
-                    console.log(`[server] Lazy worker auto-spawn enabled \u2014 workers will start on first job (${discoveredWorkerQueues.length} queue(s) watched).`);
-                    activeLazySupervisor = startLazyWorkerSupervisor({
-                      mercatoBin,
-                      appDir,
-                      runtimeEnv,
-                      workers: discoveredWorkers,
-                      pollMs: resolveLazyPollMs(process.env),
-                      restartOnUnexpectedExit: resolveLazyRestart(process.env)
-                    });
-                  } else {
-                    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,
-                      cwd: appDir
-                    });
-                    processes.push(workerProcess);
-                    waitForManagedProcessExit(workerProcess, formatQueueWorkerLabel(discoveredWorkerQueues)).then(backgroundExitResolve);
-                  }
+              if (autoSpawnWorkersMode !== "off") {
+                const discoveredWorkers = getRegisteredCliWorkers();
+                const discoveredWorkerQueues = [...new Set(discoveredWorkers.map((worker) => worker.queue))];
+                if (discoveredWorkerQueues.length === 0) {
+                  console.error("[server] AUTO_SPAWN_WORKERS is enabled, but no queues were discovered from CLI modules. Run `yarn generate` and verify `.mercato/generated/modules.cli.generated.ts` contains worker entries. Continuing without auto-spawned workers.");
+                } else if (autoSpawnWorkersMode === "lazy") {
+                  console.log(`[server] Lazy worker auto-spawn enabled \u2014 workers will start on first job (${discoveredWorkerQueues.length} queue(s) watched).`);
+                  activeLazySupervisor = startLazyWorkerSupervisor({
+                    mercatoBin,
+                    appDir,
+                    runtimeEnv,
+                    workers: discoveredWorkers,
+                    pollMs: resolveLazyPollMs(process.env),
+                    restartOnUnexpectedExit: resolveLazyRestart(process.env)
+                  });
+                } else {
+                  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,
+                    cwd: appDir
+                  });
+                  processes.push(workerProcess);
+                  managedExitPromises.push(waitForManagedProcessExit(workerProcess, formatQueueWorkerLabel(discoveredWorkerQueues)));
                 }
-                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] Eager scheduler auto-spawn enabled - starting scheduler polling engine...");
-                    const schedulerProcess = spawn("node", [mercatoBin, "scheduler", "start"], {
-                      stdio: "inherit",
-                      env: runtimeEnv,
-                      cwd: appDir
-                    });
-                    processes.push(schedulerProcess);
-                    waitForManagedProcessExit(schedulerProcess, "Scheduler polling engine").then(backgroundExitResolve);
-                  }
+              }
+              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] Eager scheduler auto-spawn enabled - starting scheduler polling engine...");
+                  const schedulerProcess = spawn("node", [mercatoBin, "scheduler", "start"], {
+                    stdio: "inherit",
+                    env: runtimeEnv,
+                    cwd: appDir
+                  });
+                  processes.push(schedulerProcess);
+                  managedExitPromises.push(waitForManagedProcessExit(schedulerProcess, "Scheduler polling engine"));
                 }
-              };
-              nextRuntime.readyPromise.then(() => {
-                void startBackgroundServices();
-              });
+              }
               if (generateWatcherMode === "in-process") {
                 console.log("[server] In-process generate watcher enabled \u2014 structural changes will regenerate without a sidecar process.");
                 activeGenerateWatcher = startInProcessGenerateWatcher({
@@ -1736,14 +1594,10 @@ async function run(argv = process.argv) {
                 console.log("[server] Legacy out-of-process generate watcher selected via OM_DEV_GENERATE_WATCH_MODE=legacy \u2014 expect the dev orchestrator to spawn `mercato generate watch --skip-initial`.");
               }
               const firstExit = await Promise.race(managedExitPromises);
-              if (isDevServerRestartResult(firstExit)) {
-                lastRestartReason = `${firstExit.label.toLowerCase()} (${path.basename(firstExit.filePath)})`;
-                writeDevSplashRuntimeRestarting(lastRestartReason);
-              }
               await cleanupAndWait();
-              devRestartPromiseResolve = null;
+              envChangePromiseResolve = null;
               if (isDevServerRestartResult(firstExit)) {
-                console.log(`[server] Detected ${firstExit.label.toLowerCase()} (${path.basename(firstExit.filePath)}). Restarting app runtime...`);
+                console.log(`[server] Detected environment file change (${path.basename(firstExit.filePath)}). Restarting app runtime...`);
                 continue;
               }
               if (!isExpectedManagedExit(firstExit, { stopping })) {