@open-mercato/cli 0.6.7 → 0.6.8-canary.320.1.bf889f49e4

package/dist/lib/utils.js

@@ -69,14 +69,17 @@ function writeIfChanged(filePath, content, checksumPath, structureChecksum) {
       content: newChecksum,
       structure: structureChecksum || ""
     };
-    const shouldWrite = !existingRecord || existingRecord.content !== newRecord.content || structureChecksum && existingRecord.structure !== newRecord.structure;
-    if (shouldWrite) {
+    const outputChanged = !fs.existsSync(filePath) || fs.readFileSync(filePath, "utf8") !== content;
+    if (outputChanged) {
       ensureDir(filePath);
       fs.writeFileSync(filePath, content);
+    }
+    const checksumChanged = !existingRecord || existingRecord.content !== newRecord.content || existingRecord.structure !== newRecord.structure;
+    if (checksumChanged) {
+      ensureDir(checksumPath);
       writeChecksumRecord(checksumPath, newRecord);
-      return true;
     }
-    return false;
+    return outputChanged;
   }
   if (fs.existsSync(filePath)) {
     const existing = fs.readFileSync(filePath, "utf8");
@@ -170,16 +173,20 @@ function writeGeneratedFile(options) {
   const { outFile, checksumFile, content, structureChecksum, result, quiet } = options;
   const checksum = { content: calculateChecksum(content), structure: structureChecksum };
   const existing = readChecksumRecord(checksumFile);
-  const shouldWrite = !fs.existsSync(outFile) || !existing || existing.content !== checksum.content || existing.structure !== checksum.structure;
-  if (shouldWrite) {
+  const outputChanged = !fs.existsSync(outFile) || fs.readFileSync(outFile, "utf8") !== content;
+  if (outputChanged) {
     fs.mkdirSync(path.dirname(outFile), { recursive: true });
     fs.writeFileSync(outFile, content);
-    writeChecksumRecord(checksumFile, checksum);
     result.filesWritten.push(outFile);
   } else {
     result.filesUnchanged.push(outFile);
   }
-  if (!quiet) logGenerationResult(path.relative(process.cwd(), outFile), shouldWrite);
+  const checksumChanged = !existing || existing.content !== checksum.content || existing.structure !== checksum.structure;
+  if (checksumChanged) {
+    fs.mkdirSync(path.dirname(checksumFile), { recursive: true });
+    writeChecksumRecord(checksumFile, checksum);
+  }
+  if (!quiet) logGenerationResult(path.relative(process.cwd(), outFile), outputChanged);
 }
 export {
   calculateChecksum,

package/dist/lib/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/utils.ts"],
-  "sourcesContent": ["import fs from 'node:fs'\nimport path from 'node:path'\nimport crypto from 'node:crypto'\nimport { pathToFileURL } from 'node:url'\n\nexport type ChecksumRecord = {\n  content: string\n  structure: string\n}\n\nexport interface GeneratorResult {\n  filesWritten: string[]\n  filesUnchanged: string[]\n  errors: string[]\n}\n\nexport function calculateChecksum(content: string): string {\n  return crypto.createHash('md5').update(content).digest('hex')\n}\n\nexport function readChecksumRecord(filePath: string): ChecksumRecord | null {\n  if (!fs.existsSync(filePath)) {\n    return null\n  }\n  try {\n    const parsed = JSON.parse(fs.readFileSync(filePath, 'utf8')) as Partial<ChecksumRecord>\n    if (parsed && typeof parsed.content === 'string' && typeof parsed.structure === 'string') {\n      return { content: parsed.content, structure: parsed.structure }\n    }\n  } catch {\n    // Invalid checksum file\n  }\n  return null\n}\n\nexport function writeChecksumRecord(filePath: string, record: ChecksumRecord): void {\n  fs.writeFileSync(filePath, JSON.stringify(record) + '\\n')\n}\n\nfunction collectStructureEntries(target: string, base: string, acc: string[]): void {\n  let entries: fs.Dirent[]\n  try {\n    entries = fs.readdirSync(target, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))\n  } catch (err) {\n    acc.push(`error:${path.relative(base, target)}:${(err as Error).message}`)\n    return\n  }\n\n  for (const entry of entries) {\n    const fullPath = path.join(target, entry.name)\n    const rel = path.relative(base, fullPath)\n    try {\n      const stat = fs.statSync(fullPath)\n      if (entry.isDirectory()) {\n        acc.push(`dir:${rel}:${stat.mtimeMs}`)\n        collectStructureEntries(fullPath, base, acc)\n      } else if (entry.isFile()) {\n        acc.push(`file:${rel}:${stat.size}:${stat.mtimeMs}`)\n      } else {\n        acc.push(`other:${rel}:${stat.mtimeMs}`)\n      }\n    } catch {\n      // File was deleted between readdir and stat - skip it\n      continue\n    }\n  }\n}\n\nexport function calculateStructureChecksum(paths: string[]): string {\n  const normalized = Array.from(new Set(paths.map((p) => path.resolve(p)))).sort((a, b) => a.localeCompare(b))\n  const entries: string[] = []\n  for (const target of normalized) {\n    if (!fs.existsSync(target)) {\n      entries.push(`missing:${target}`)\n      continue\n    }\n    const stat = fs.statSync(target)\n    entries.push(`${stat.isDirectory() ? 'dir' : 'file'}:${target}:${stat.mtimeMs}`)\n    if (stat.isDirectory()) collectStructureEntries(target, target, entries)\n  }\n  return calculateChecksum(entries.join('\\n'))\n}\n\nexport function writeIfChanged(\n  filePath: string,\n  content: string,\n  checksumPath?: string,\n  structureChecksum?: string\n): boolean {\n  const newChecksum = calculateChecksum(content)\n\n  if (checksumPath) {\n    const existingRecord = readChecksumRecord(checksumPath)\n    const newRecord: ChecksumRecord = {\n      content: newChecksum,\n      structure: structureChecksum || '',\n    }\n\n    const shouldWrite =\n      !existingRecord ||\n      existingRecord.content !== newRecord.content ||\n      (structureChecksum && existingRecord.structure !== newRecord.structure)\n\n    if (shouldWrite) {\n      ensureDir(filePath)\n      fs.writeFileSync(filePath, content)\n      writeChecksumRecord(checksumPath, newRecord)\n      return true\n    }\n    return false\n  }\n\n  // Simple comparison without checksum file\n  if (fs.existsSync(filePath)) {\n    const existing = fs.readFileSync(filePath, 'utf8')\n    if (existing === content) {\n      return false\n    }\n  }\n\n  ensureDir(filePath)\n  fs.writeFileSync(filePath, content)\n  return true\n}\n\nexport function ensureDir(filePath: string): void {\n  fs.mkdirSync(path.dirname(filePath), { recursive: true })\n}\n\n// Allowed path substrings for safe deletion. Include both POSIX and Windows separators.\nconst ALLOWED_RIMRAF_PATTERNS = [\n  '/generated/',\n  '/dist/',\n  '/.mercato/',\n  '/entities/',\n  '\\\\generated\\\\',\n  '\\\\dist\\\\',\n  '\\\\.mercato\\\\',\n  '\\\\entities\\\\',\n]\n\nexport function rimrafDir(dir: string, opts?: { allowedPatterns?: string[] }): void {\n  if (!fs.existsSync(dir)) return\n\n  // Safety check: only allow deletion within known safe directories\n  const resolved = path.resolve(dir)\n  const allowed = opts?.allowedPatterns ?? ALLOWED_RIMRAF_PATTERNS\n\n  // Normalize resolved path to support matching against both POSIX and Windows patterns\n  const normalized = {\n    posix: resolved.replace(/\\\\/g, '/'),\n    win: resolved.replace(/\\//g, '\\\\'),\n  }\n\n  if (!allowed.some((pattern) => normalized.posix.includes(pattern) || normalized.win.includes(pattern))) {\n    throw new Error(`Refusing to delete directory outside allowed paths: ${resolved}. Allowed patterns: ${allowed.join(', ')}`)\n  }\n\n  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {\n    const p = path.join(dir, entry.name)\n    if (entry.isDirectory()) rimrafDir(p, opts)\n    else fs.unlinkSync(p)\n  }\n  fs.rmdirSync(dir)\n}\n\nexport function toVar(s: string): string {\n  return s.replace(/[^a-zA-Z0-9_]/g, '_')\n}\n\nexport function toSnake(s: string): string {\n  return s\n    .replace(/([a-z0-9])([A-Z])/g, '$1_$2')\n    .replace(/\\W+/g, '_')\n    .replace(/_{2,}/g, '_')\n    .replace(/(?:^_+|_+$)/g, '')\n    .toLowerCase()\n}\n\nexport function sourceFileHasNamedExport(filePath: string, exportName: string): boolean {\n  let source: string\n  try {\n    source = fs.readFileSync(filePath, 'utf8')\n  } catch {\n    return false\n  }\n\n  const escaped = exportName.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&')\n  if (new RegExp(`export\\\\s+(?:const|let|var|function|class|async\\\\s+function)\\\\s+${escaped}\\\\b`).test(source)) {\n    return true\n  }\n  if (new RegExp(`export\\\\s+\\\\{[^}]*\\\\b${escaped}\\\\b[^}]*\\\\}`).test(source)) {\n    return true\n  }\n  return false\n}\n\nexport async function moduleHasExport(filePath: string, exportName: string): Promise<boolean> {\n  if (sourceFileHasNamedExport(filePath, exportName)) {\n    return true\n  }\n  try {\n    const isAbsolutePath = path.isAbsolute(filePath)\n    const importUrl = isAbsolutePath ? pathToFileURL(filePath).href : filePath\n    const mod = await import(importUrl)\n    return mod != null && Object.prototype.hasOwnProperty.call(mod, exportName)\n  } catch {\n    return false\n  }\n}\n\nexport function logGenerationResult(label: string, changed: boolean): void {\n  if (changed) {\n    console.log(`Generated ${label}`)\n  }\n}\n\nexport function createGeneratorResult(): GeneratorResult {\n  return {\n    filesWritten: [],\n    filesUnchanged: [],\n    errors: [],\n  }\n}\n\nexport function writeGeneratedFile(options: {\n  outFile: string\n  checksumFile: string\n  content: string\n  structureChecksum: string\n  result: GeneratorResult\n  quiet?: boolean\n}): void {\n  const { outFile, checksumFile, content, structureChecksum, result, quiet } = options\n  const checksum = { content: calculateChecksum(content), structure: structureChecksum }\n  const existing = readChecksumRecord(checksumFile)\n  const shouldWrite =\n    !fs.existsSync(outFile) ||\n    !existing ||\n    existing.content !== checksum.content ||\n    existing.structure !== checksum.structure\n  if (shouldWrite) {\n    fs.mkdirSync(path.dirname(outFile), { recursive: true })\n    fs.writeFileSync(outFile, content)\n    writeChecksumRecord(checksumFile, checksum)\n    result.filesWritten.push(outFile)\n  } else {\n    result.filesUnchanged.push(outFile)\n  }\n  if (!quiet) logGenerationResult(path.relative(process.cwd(), outFile), shouldWrite)\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import fs from 'node:fs'\nimport path from 'node:path'\nimport crypto from 'node:crypto'\nimport { pathToFileURL } from 'node:url'\n\nexport type ChecksumRecord = {\n  content: string\n  structure: string\n}\n\nexport interface GeneratorResult {\n  filesWritten: string[]\n  filesUnchanged: string[]\n  errors: string[]\n}\n\nexport function calculateChecksum(content: string): string {\n  return crypto.createHash('md5').update(content).digest('hex')\n}\n\nexport function readChecksumRecord(filePath: string): ChecksumRecord | null {\n  if (!fs.existsSync(filePath)) {\n    return null\n  }\n  try {\n    const parsed = JSON.parse(fs.readFileSync(filePath, 'utf8')) as Partial<ChecksumRecord>\n    if (parsed && typeof parsed.content === 'string' && typeof parsed.structure === 'string') {\n      return { content: parsed.content, structure: parsed.structure }\n    }\n  } catch {\n    // Invalid checksum file\n  }\n  return null\n}\n\nexport function writeChecksumRecord(filePath: string, record: ChecksumRecord): void {\n  fs.writeFileSync(filePath, JSON.stringify(record) + '\\n')\n}\n\nfunction collectStructureEntries(target: string, base: string, acc: string[]): void {\n  let entries: fs.Dirent[]\n  try {\n    entries = fs.readdirSync(target, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))\n  } catch (err) {\n    acc.push(`error:${path.relative(base, target)}:${(err as Error).message}`)\n    return\n  }\n\n  for (const entry of entries) {\n    const fullPath = path.join(target, entry.name)\n    const rel = path.relative(base, fullPath)\n    try {\n      const stat = fs.statSync(fullPath)\n      if (entry.isDirectory()) {\n        acc.push(`dir:${rel}:${stat.mtimeMs}`)\n        collectStructureEntries(fullPath, base, acc)\n      } else if (entry.isFile()) {\n        acc.push(`file:${rel}:${stat.size}:${stat.mtimeMs}`)\n      } else {\n        acc.push(`other:${rel}:${stat.mtimeMs}`)\n      }\n    } catch {\n      // File was deleted between readdir and stat - skip it\n      continue\n    }\n  }\n}\n\nexport function calculateStructureChecksum(paths: string[]): string {\n  const normalized = Array.from(new Set(paths.map((p) => path.resolve(p)))).sort((a, b) => a.localeCompare(b))\n  const entries: string[] = []\n  for (const target of normalized) {\n    if (!fs.existsSync(target)) {\n      entries.push(`missing:${target}`)\n      continue\n    }\n    const stat = fs.statSync(target)\n    entries.push(`${stat.isDirectory() ? 'dir' : 'file'}:${target}:${stat.mtimeMs}`)\n    if (stat.isDirectory()) collectStructureEntries(target, target, entries)\n  }\n  return calculateChecksum(entries.join('\\n'))\n}\n\nexport function writeIfChanged(\n  filePath: string,\n  content: string,\n  checksumPath?: string,\n  structureChecksum?: string\n): boolean {\n  const newChecksum = calculateChecksum(content)\n\n  if (checksumPath) {\n    const existingRecord = readChecksumRecord(checksumPath)\n    const newRecord: ChecksumRecord = {\n      content: newChecksum,\n      structure: structureChecksum || '',\n    }\n\n    const outputChanged = !fs.existsSync(filePath) || fs.readFileSync(filePath, 'utf8') !== content\n    if (outputChanged) {\n      ensureDir(filePath)\n      fs.writeFileSync(filePath, content)\n    }\n\n    const checksumChanged =\n      !existingRecord ||\n      existingRecord.content !== newRecord.content ||\n      existingRecord.structure !== newRecord.structure\n    if (checksumChanged) {\n      ensureDir(checksumPath)\n      writeChecksumRecord(checksumPath, newRecord)\n    }\n\n    return outputChanged\n  }\n\n  // Simple comparison without checksum file\n  if (fs.existsSync(filePath)) {\n    const existing = fs.readFileSync(filePath, 'utf8')\n    if (existing === content) {\n      return false\n    }\n  }\n\n  ensureDir(filePath)\n  fs.writeFileSync(filePath, content)\n  return true\n}\n\nexport function ensureDir(filePath: string): void {\n  fs.mkdirSync(path.dirname(filePath), { recursive: true })\n}\n\n// Allowed path substrings for safe deletion. Include both POSIX and Windows separators.\nconst ALLOWED_RIMRAF_PATTERNS = [\n  '/generated/',\n  '/dist/',\n  '/.mercato/',\n  '/entities/',\n  '\\\\generated\\\\',\n  '\\\\dist\\\\',\n  '\\\\.mercato\\\\',\n  '\\\\entities\\\\',\n]\n\nexport function rimrafDir(dir: string, opts?: { allowedPatterns?: string[] }): void {\n  if (!fs.existsSync(dir)) return\n\n  // Safety check: only allow deletion within known safe directories\n  const resolved = path.resolve(dir)\n  const allowed = opts?.allowedPatterns ?? ALLOWED_RIMRAF_PATTERNS\n\n  // Normalize resolved path to support matching against both POSIX and Windows patterns\n  const normalized = {\n    posix: resolved.replace(/\\\\/g, '/'),\n    win: resolved.replace(/\\//g, '\\\\'),\n  }\n\n  if (!allowed.some((pattern) => normalized.posix.includes(pattern) || normalized.win.includes(pattern))) {\n    throw new Error(`Refusing to delete directory outside allowed paths: ${resolved}. Allowed patterns: ${allowed.join(', ')}`)\n  }\n\n  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {\n    const p = path.join(dir, entry.name)\n    if (entry.isDirectory()) rimrafDir(p, opts)\n    else fs.unlinkSync(p)\n  }\n  fs.rmdirSync(dir)\n}\n\nexport function toVar(s: string): string {\n  return s.replace(/[^a-zA-Z0-9_]/g, '_')\n}\n\nexport function toSnake(s: string): string {\n  return s\n    .replace(/([a-z0-9])([A-Z])/g, '$1_$2')\n    .replace(/\\W+/g, '_')\n    .replace(/_{2,}/g, '_')\n    .replace(/(?:^_+|_+$)/g, '')\n    .toLowerCase()\n}\n\nexport function sourceFileHasNamedExport(filePath: string, exportName: string): boolean {\n  let source: string\n  try {\n    source = fs.readFileSync(filePath, 'utf8')\n  } catch {\n    return false\n  }\n\n  const escaped = exportName.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&')\n  if (new RegExp(`export\\\\s+(?:const|let|var|function|class|async\\\\s+function)\\\\s+${escaped}\\\\b`).test(source)) {\n    return true\n  }\n  if (new RegExp(`export\\\\s+\\\\{[^}]*\\\\b${escaped}\\\\b[^}]*\\\\}`).test(source)) {\n    return true\n  }\n  return false\n}\n\nexport async function moduleHasExport(filePath: string, exportName: string): Promise<boolean> {\n  if (sourceFileHasNamedExport(filePath, exportName)) {\n    return true\n  }\n  try {\n    const isAbsolutePath = path.isAbsolute(filePath)\n    const importUrl = isAbsolutePath ? pathToFileURL(filePath).href : filePath\n    const mod = await import(importUrl)\n    return mod != null && Object.prototype.hasOwnProperty.call(mod, exportName)\n  } catch {\n    return false\n  }\n}\n\nexport function logGenerationResult(label: string, changed: boolean): void {\n  if (changed) {\n    console.log(`Generated ${label}`)\n  }\n}\n\nexport function createGeneratorResult(): GeneratorResult {\n  return {\n    filesWritten: [],\n    filesUnchanged: [],\n    errors: [],\n  }\n}\n\nexport function writeGeneratedFile(options: {\n  outFile: string\n  checksumFile: string\n  content: string\n  structureChecksum: string\n  result: GeneratorResult\n  quiet?: boolean\n}): void {\n  const { outFile, checksumFile, content, structureChecksum, result, quiet } = options\n  const checksum = { content: calculateChecksum(content), structure: structureChecksum }\n  const existing = readChecksumRecord(checksumFile)\n  const outputChanged = !fs.existsSync(outFile) || fs.readFileSync(outFile, 'utf8') !== content\n  if (outputChanged) {\n    fs.mkdirSync(path.dirname(outFile), { recursive: true })\n    fs.writeFileSync(outFile, content)\n    result.filesWritten.push(outFile)\n  } else {\n    result.filesUnchanged.push(outFile)\n  }\n\n  const checksumChanged =\n    !existing ||\n    existing.content !== checksum.content ||\n    existing.structure !== checksum.structure\n  if (checksumChanged) {\n    fs.mkdirSync(path.dirname(checksumFile), { recursive: true })\n    writeChecksumRecord(checksumFile, checksum)\n  }\n  if (!quiet) logGenerationResult(path.relative(process.cwd(), outFile), outputChanged)\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/mercato.js

@@ -35,6 +35,7 @@ import { acquireServerStartLock } from "./lib/server-start-lock.js";
 import { assertSingleInstanceStrategies } from "./lib/single-instance-strategy-guard.js";
 import { createDevEnvReloader, watchDevEnvFiles } from "./lib/dev-env-reload.js";
 import { quotePostgresIdentifier } from "./lib/db/identifiers.js";
+import { getRegisteredDevSupervisorManifest } from "./lib/dev-supervisor-manifest.js";
 const lazyIntegration = () => import("./lib/testing/integration.js");
 import path from "node:path";
 import fs from "node:fs";
@@ -584,7 +585,7 @@ async function runGeneratorSuiteWithStructuralInvalidation(quiet) {
   }
   await runPostGenerateStructuralInvalidation(quiet);
 }
-async function createGenerateWatchRuntime() {
+async function createGenerateWatchRuntime(quiet = false) {
   const [
     { createResolver },
     { calculateGenerateWatchStructureChecksum },
@@ -613,6 +614,7 @@ async function createGenerateWatchRuntime() {
       return calculateGenerateWatchStructureChecksum(collectWatchState());
     },
     changeSignal: createGenerateWatchChangeSignal({
+      onSkippedDirectory: quiet ? void 0 : (directory) => console.log(`[generate:watch] Skipping missing watch directory: ${directory}`),
       getWatchTargets: () => {
         const state = collectWatchState();
         const targets = [{
@@ -649,7 +651,10 @@ async function buildAllModules() {
 async function run(argv = process.argv) {
   const [, , ...parts] = argv;
   const [first, second, ...remaining] = parts;
-  await ensureEnvLoaded({ createIfMissing: first !== "deploy", quiet: first === "deploy" });
+  await ensureEnvLoaded({
+    createIfMissing: first !== "deploy" && first !== "telemetry",
+    quiet: first === "deploy" || first === "telemetry"
+  });
   if (first === "init") {
     const { execSync } = await import("child_process");
     console.log("\u{1F680} Initializing Open Mercato app...\n");
@@ -1059,6 +1064,17 @@ async function run(argv = process.argv) {
     const exitCode = await runAgenticInit(parts.slice(1));
     return exitCode;
   }
+  if (first === "telemetry") {
+    if (second === "init") {
+      const { runTelemetryInit } = await import("./lib/telemetry-init.js");
+      return runTelemetryInit(remaining.filter(Boolean));
+    }
+    console.log("Usage: yarn mercato telemetry init [--dry-run]");
+    console.log("  Wires @open-mercato/telemetry into this app (package.json, .env,");
+    console.log("  instrumentation.ts, next.config.ts, and the API dispatcher).");
+    console.log("  Idempotent and safe to re-run. Use --dry-run to preview changes.");
+    return second && second !== "help" && second !== "--help" && second !== "-h" ? 1 : 0;
+  }
   if (first === "module") {
     try {
       const subcommand = second;
@@ -1322,12 +1338,16 @@ async function run(argv = process.argv) {
             const workerPromises = discoveredQueues.map(async (queue) => {
               const queueWorkers = allWorkers.filter((w) => w.queue === queue);
               const concurrency = effectiveByQueue.get(queue) ?? concurrencyOverride ?? Math.max(...queueWorkers.map((w) => w.concurrency), 1);
+              const maxStalledCount = Math.max(...queueWorkers.map((w) => w.maxStalledCount ?? 1), 1);
+              const lockDuration = Math.max(...queueWorkers.map((w) => w.lockDuration ?? 0), 0) || void 0;
               console.log(`[worker] Starting "${queue}" with ${queueWorkers.length} handler(s), concurrency: ${concurrency}`);
               const queueRedisUrl = getRedisUrl("QUEUE");
               await runWorker({
                 queueName: queue,
                 connection: queueRedisUrl ? { url: queueRedisUrl } : void 0,
                 concurrency,
+                lockDuration,
+                maxStalledCount,
                 background: true,
                 handler: createPerJobWorkerHandler(queueWorkers, createRequestContainer)
               });
@@ -1359,12 +1379,16 @@ async function run(argv = process.argv) {
               const requested = concurrencyOverride ?? Math.max(...queueWorkers.map((w) => w.concurrency), 1);
               const budgetPlan = await resolveWorkerBudgetPlan([{ queue: queueName, concurrency: requested }]);
               const concurrency = budgetPlan.entries[0]?.effective ?? requested;
+              const maxStalledCount = Math.max(...queueWorkers.map((w) => w.maxStalledCount ?? 1), 1);
+              const lockDuration = Math.max(...queueWorkers.map((w) => w.lockDuration ?? 0), 0) || void 0;
               console.log(`[worker] Found ${queueWorkers.length} worker(s) for queue "${queueName}"`);
               const queueRedisUrl = getRedisUrl("QUEUE");
               await runWorker({
                 queueName,
                 connection: queueRedisUrl ? { url: queueRedisUrl } : void 0,
                 concurrency,
+                lockDuration,
+                maxStalledCount,
                 handler: createPerJobWorkerHandler(queueWorkers, createRequestContainer)
               });
             } else {
@@ -1478,7 +1502,7 @@ async function run(argv = process.argv) {
           const intervalArg = args.find((arg) => arg.startsWith("--interval="));
           const parsedInterval = intervalArg ? Number.parseInt(intervalArg.split("=")[1] ?? "", 10) : NaN;
           const intervalMs = Number.isFinite(parsedInterval) && parsedInterval >= 250 ? parsedInterval : 1e3;
-          const generateWatchRuntime = await createGenerateWatchRuntime();
+          const generateWatchRuntime = await createGenerateWatchRuntime(quiet);
           const watcher = startInProcessGenerateWatcher({
             pollMs: intervalMs,
             skipInitial,
@@ -1604,6 +1628,7 @@ async function run(argv = process.argv) {
           let lastRestartReason = null;
           const generateWatcherMode = resolveGenerateWatcherMode(process.env);
           const envReloader = createDevEnvReloader(appDir, process.env, initialProcessEnvironmentEntries);
+          const devSupervisorManifest = getRegisteredDevSupervisorManifest();
           function cleanup() {
             console.log("[server] Shutting down...");
             for (const proc of processes) {
@@ -1764,8 +1789,8 @@ async function run(argv = process.argv) {
               applyEventsSingleDeliveryGuard({ processEnv: process.env, runtimeEnv, autoSpawnWorkersMode });
               const autoSpawnSchedulerMode = resolveAutoSpawnSchedulerMode(process.env);
               const queueStrategy = process.env.QUEUE_STRATEGY || "local";
-              const schedulerCommand = lookupModuleCommand(getCliModules(), "scheduler", "start");
-              const embedSchedulerInSharedWorker = shouldEmbedLocalSchedulerInSharedWorker(process.env) && queueStrategy === "local" && autoSpawnWorkersMode === "lazy" && resolveLazySpawnMode(process.env) === "shared" && autoSpawnSchedulerMode !== "off" && schedulerCommand.status === "ok";
+              const schedulerStartStatus = devSupervisorManifest?.schedulerStartStatus ?? lookupModuleCommand(getCliModules(), "scheduler", "start").status;
+              const embedSchedulerInSharedWorker = shouldEmbedLocalSchedulerInSharedWorker(process.env) && queueStrategy === "local" && autoSpawnWorkersMode === "lazy" && resolveLazySpawnMode(process.env) === "shared" && autoSpawnSchedulerMode !== "off" && schedulerStartStatus === "ok";
               const nextRuntime = startNextDev(runtimeEnv);
               const restartPromise = waitForDevRestart();
               const backgroundStartAbort = new AbortController();
@@ -1792,10 +1817,11 @@ async function run(argv = process.argv) {
                   console.warn("[server] Timed out waiting for dev warmup marker; starting background services anyway.");
                 }
                 if (autoSpawnWorkersMode !== "off") {
-                  const discoveredWorkers = getRegisteredCliWorkers();
+                  const discoveredWorkers = devSupervisorManifest?.workers ?? 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.");
+                    const workerRegistryFile = devSupervisorManifest ? "dev-supervisor.generated.json" : "modules.cli.generated.ts";
+                    console.error(`[server] AUTO_SPAWN_WORKERS is enabled, but no queues were discovered from CLI modules. Run \`yarn generate\` and verify \`.mercato/generated/${workerRegistryFile}\` contains worker entries. Continuing without auto-spawned workers.`);
                   } else if (autoSpawnWorkersMode === "lazy") {
                     const lazySpawnMode = resolveLazySpawnMode(process.env);
                     const lazyModeHint = lazySpawnMode === "shared" ? "shared worker mode \u2014 one `queue worker --all` process; set OM_AUTO_SPAWN_WORKERS_LAZY_MODE=per-queue to change" : "per-queue worker mode \u2014 one process per queue; set OM_AUTO_SPAWN_WORKERS_LAZY_MODE=shared to change";
@@ -1836,8 +1862,8 @@ async function run(argv = process.argv) {
                 if (embedSchedulerInSharedWorker && activeLazySupervisor) {
                   console.log("[server] Local scheduler will run inside the lazy shared worker process.");
                 } else if (autoSpawnSchedulerMode !== "off" && queueStrategy === "local") {
-                  if (schedulerCommand.status !== "ok") {
-                    console.log(`[server] Skipping scheduler auto-start \u2014 ${describeMissingModuleCommand(schedulerCommand)}`);
+                  if (schedulerStartStatus !== "ok") {
+                    console.log(`[server] Skipping scheduler auto-start \u2014 ${describeMissingModuleCommand({ status: schedulerStartStatus })}`);
                   } else if (autoSpawnSchedulerMode === "lazy") {
                     console.log("[server] Lazy scheduler auto-spawn enabled - scheduler will start when an enabled schedule exists.");
                     activeLazySchedulerSupervisor = startLazySchedulerSupervisor({