@open-mercato/cli 0.6.4-develop.3938.1.c97dbde799 → 0.6.4-develop.3949.1.adc3d0b3b1

package/.turbo/turbo-build.log

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

package/dist/lib/generate-watch-structure.js

@@ -0,0 +1,153 @@
+import crypto from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+import {
+  MODULE_CODE_EXTENSIONS,
+  SCAN_CONFIGS,
+  scanModuleDir,
+  stripModuleCodeExtension
+} from "./generators/scanner.js";
+const STRUCTURAL_CONVENTION_FILES = [
+  "index.ts",
+  "cli.ts",
+  "di.ts",
+  "acl.ts",
+  "setup.ts",
+  "encryption.ts",
+  "ce.ts",
+  "search.ts",
+  "events.ts",
+  "notifications.ts",
+  "notifications.client.ts",
+  "notifications.handlers.ts",
+  "translations.ts",
+  "generators.ts",
+  "ai-tools.ts",
+  "ai-agents.ts",
+  "analytics.ts",
+  "workflows.ts",
+  "inbox-actions.ts",
+  "message-types.ts",
+  "message-objects.ts",
+  "integration.ts",
+  "security.mfa-providers.ts",
+  "security.sudo.ts",
+  "data/entities.ts",
+  "data/extensions.ts",
+  "data/fields.ts",
+  "data/enrichers.ts",
+  "data/guards.ts",
+  "api/interceptors.ts",
+  "commands/interceptors.ts",
+  "widgets/components.ts",
+  "widgets/injection-table.ts",
+  "frontend/middleware.ts",
+  "backend/middleware.ts"
+];
+const CONTENT_SENSITIVE_SCAN_CONFIGS = [
+  SCAN_CONFIGS.apiRoutes,
+  SCAN_CONFIGS.apiPlainFiles,
+  SCAN_CONFIGS.subscribers,
+  SCAN_CONFIGS.workers,
+  SCAN_CONFIGS.dashboardWidgets,
+  SCAN_CONFIGS.injectionWidgets
+];
+const ROUTE_SHAPE_SCAN_CONFIGS = [
+  SCAN_CONFIGS.frontendPages,
+  SCAN_CONFIGS.backendPages
+];
+function checksum(value) {
+  return crypto.createHash("md5").update(value).digest("hex");
+}
+function fileRecord(filePath, base, mode) {
+  if (!fs.existsSync(filePath)) return null;
+  let stat;
+  try {
+    stat = fs.statSync(filePath);
+  } catch {
+    return null;
+  }
+  if (!stat.isFile()) return null;
+  const rel = path.relative(base, filePath).replace(/\\/g, "/");
+  if (mode === "shape") {
+    return `file:${rel}`;
+  }
+  try {
+    return `file:${rel}:${stat.size}:${checksum(fs.readFileSync(filePath, "utf8"))}`;
+  } catch {
+    return `file:${rel}:unreadable`;
+  }
+}
+function resolveCodeFile(base, relativePath) {
+  const stripped = stripModuleCodeExtension(relativePath);
+  const candidates = MODULE_CODE_EXTENSIONS.map((extension) => `${stripped}${extension}`);
+  for (const candidate of candidates) {
+    const filePath = path.join(base, ...candidate.split("/"));
+    if (fs.existsSync(filePath)) return filePath;
+  }
+  return null;
+}
+function hasInlinePageMetadata(filePath) {
+  try {
+    const source = fs.readFileSync(filePath, "utf8");
+    return /\bexport\s+(?:const|let|var|function|class)\s+metadata\b/.test(source) || /\bexport\s+\{[^}]*\bmetadata\b[^}]*\}/.test(source);
+  } catch {
+    return false;
+  }
+}
+function addConventionRecords(records, roots) {
+  for (const base of [roots.pkgBase, roots.appBase]) {
+    records.push(`module-root:${base}:${fs.existsSync(base) ? "present" : "missing"}`);
+    for (const relativePath of STRUCTURAL_CONVENTION_FILES) {
+      const filePath = resolveCodeFile(base, relativePath);
+      if (!filePath) {
+        records.push(`missing:${base}:${relativePath}`);
+        continue;
+      }
+      const record = fileRecord(filePath, base, "content");
+      if (record) records.push(record);
+    }
+  }
+}
+function addScannedRecords(records, roots) {
+  for (const config of CONTENT_SENSITIVE_SCAN_CONFIGS) {
+    for (const scanned of scanModuleDir(roots, config)) {
+      const base = scanned.fromApp ? roots.appBase : roots.pkgBase;
+      const filePath = path.join(base, ...config.folder.split("/"), ...scanned.relPath.split("/"));
+      const record = fileRecord(filePath, base, "content");
+      if (record) records.push(`${config.folder}:${record}`);
+    }
+  }
+  for (const config of ROUTE_SHAPE_SCAN_CONFIGS) {
+    for (const scanned of scanModuleDir(roots, config)) {
+      const base = scanned.fromApp ? roots.appBase : roots.pkgBase;
+      const folderPath = path.join(base, ...config.folder.split("/"));
+      const filePath = path.join(folderPath, ...scanned.relPath.split("/"));
+      const pageRecord = fileRecord(filePath, base, hasInlinePageMetadata(filePath) ? "content" : "shape");
+      if (pageRecord) records.push(`${config.folder}:${pageRecord}`);
+      const dir = path.dirname(filePath);
+      const stem = stripModuleCodeExtension(path.basename(filePath));
+      const metaCandidates = stem === "page" ? ["page.meta", "meta"] : [`${stem}.meta`, "meta"];
+      for (const candidate of metaCandidates) {
+        const metaPath = resolveCodeFile(dir, candidate);
+        if (!metaPath) continue;
+        const record = fileRecord(metaPath, base, "content");
+        if (record) records.push(`${config.folder}:meta:${record}`);
+      }
+    }
+  }
+}
+function calculateGenerateWatchStructureChecksum(options) {
+  const records = [];
+  const modulesRecord = fileRecord(options.modulesFile, path.dirname(options.modulesFile), "content");
+  records.push(modulesRecord ?? `missing:${options.modulesFile}`);
+  for (const roots of options.moduleRoots) {
+    addConventionRecords(records, roots);
+    addScannedRecords(records, roots);
+  }
+  return checksum(records.sort((a, b) => a.localeCompare(b)).join("\n"));
+}
+export {
+  calculateGenerateWatchStructureChecksum
+};
+//# sourceMappingURL=generate-watch-structure.js.map

package/dist/lib/generate-watch-structure.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/lib/generate-watch-structure.ts"],
+  "sourcesContent": ["import crypto from 'node:crypto'\nimport fs from 'node:fs'\nimport path from 'node:path'\nimport {\n  MODULE_CODE_EXTENSIONS,\n  SCAN_CONFIGS,\n  scanModuleDir,\n  stripModuleCodeExtension,\n  type ModuleRoots,\n} from './generators/scanner'\n\nconst STRUCTURAL_CONVENTION_FILES = [\n  'index.ts',\n  'cli.ts',\n  'di.ts',\n  'acl.ts',\n  'setup.ts',\n  'encryption.ts',\n  'ce.ts',\n  'search.ts',\n  'events.ts',\n  'notifications.ts',\n  'notifications.client.ts',\n  'notifications.handlers.ts',\n  'translations.ts',\n  'generators.ts',\n  'ai-tools.ts',\n  'ai-agents.ts',\n  'analytics.ts',\n  'workflows.ts',\n  'inbox-actions.ts',\n  'message-types.ts',\n  'message-objects.ts',\n  'integration.ts',\n  'security.mfa-providers.ts',\n  'security.sudo.ts',\n  'data/entities.ts',\n  'data/extensions.ts',\n  'data/fields.ts',\n  'data/enrichers.ts',\n  'data/guards.ts',\n  'api/interceptors.ts',\n  'commands/interceptors.ts',\n  'widgets/components.ts',\n  'widgets/injection-table.ts',\n  'frontend/middleware.ts',\n  'backend/middleware.ts',\n] as const\n\nconst CONTENT_SENSITIVE_SCAN_CONFIGS = [\n  SCAN_CONFIGS.apiRoutes,\n  SCAN_CONFIGS.apiPlainFiles,\n  SCAN_CONFIGS.subscribers,\n  SCAN_CONFIGS.workers,\n  SCAN_CONFIGS.dashboardWidgets,\n  SCAN_CONFIGS.injectionWidgets,\n] as const\n\nconst ROUTE_SHAPE_SCAN_CONFIGS = [\n  SCAN_CONFIGS.frontendPages,\n  SCAN_CONFIGS.backendPages,\n] as const\n\nfunction checksum(value: string): string {\n  return crypto.createHash('md5').update(value).digest('hex')\n}\n\nfunction fileRecord(filePath: string, base: string, mode: 'content' | 'shape'): string | null {\n  if (!fs.existsSync(filePath)) return null\n  let stat: fs.Stats\n  try {\n    stat = fs.statSync(filePath)\n  } catch {\n    return null\n  }\n  if (!stat.isFile()) return null\n  const rel = path.relative(base, filePath).replace(/\\\\/g, '/')\n  if (mode === 'shape') {\n    return `file:${rel}`\n  }\n  try {\n    return `file:${rel}:${stat.size}:${checksum(fs.readFileSync(filePath, 'utf8'))}`\n  } catch {\n    return `file:${rel}:unreadable`\n  }\n}\n\nfunction resolveCodeFile(base: string, relativePath: string): string | null {\n  const stripped = stripModuleCodeExtension(relativePath)\n  const candidates = MODULE_CODE_EXTENSIONS.map((extension) => `${stripped}${extension}`)\n  for (const candidate of candidates) {\n    const filePath = path.join(base, ...candidate.split('/'))\n    if (fs.existsSync(filePath)) return filePath\n  }\n  return null\n}\n\nfunction hasInlinePageMetadata(filePath: string): boolean {\n  try {\n    const source = fs.readFileSync(filePath, 'utf8')\n    return /\\bexport\\s+(?:const|let|var|function|class)\\s+metadata\\b/.test(source)\n      || /\\bexport\\s+\\{[^}]*\\bmetadata\\b[^}]*\\}/.test(source)\n  } catch {\n    return false\n  }\n}\n\nfunction addConventionRecords(records: string[], roots: ModuleRoots): void {\n  for (const base of [roots.pkgBase, roots.appBase]) {\n    records.push(`module-root:${base}:${fs.existsSync(base) ? 'present' : 'missing'}`)\n    for (const relativePath of STRUCTURAL_CONVENTION_FILES) {\n      const filePath = resolveCodeFile(base, relativePath)\n      if (!filePath) {\n        records.push(`missing:${base}:${relativePath}`)\n        continue\n      }\n      const record = fileRecord(filePath, base, 'content')\n      if (record) records.push(record)\n    }\n  }\n}\n\nfunction addScannedRecords(records: string[], roots: ModuleRoots): void {\n  for (const config of CONTENT_SENSITIVE_SCAN_CONFIGS) {\n    for (const scanned of scanModuleDir(roots, config)) {\n      const base = scanned.fromApp ? roots.appBase : roots.pkgBase\n      const filePath = path.join(base, ...config.folder.split('/'), ...scanned.relPath.split('/'))\n      const record = fileRecord(filePath, base, 'content')\n      if (record) records.push(`${config.folder}:${record}`)\n    }\n  }\n\n  for (const config of ROUTE_SHAPE_SCAN_CONFIGS) {\n    for (const scanned of scanModuleDir(roots, config)) {\n      const base = scanned.fromApp ? roots.appBase : roots.pkgBase\n      const folderPath = path.join(base, ...config.folder.split('/'))\n      const filePath = path.join(folderPath, ...scanned.relPath.split('/'))\n      const pageRecord = fileRecord(filePath, base, hasInlinePageMetadata(filePath) ? 'content' : 'shape')\n      if (pageRecord) records.push(`${config.folder}:${pageRecord}`)\n\n      const dir = path.dirname(filePath)\n      const stem = stripModuleCodeExtension(path.basename(filePath))\n      const metaCandidates = stem === 'page'\n        ? ['page.meta', 'meta']\n        : [`${stem}.meta`, 'meta']\n      for (const candidate of metaCandidates) {\n        const metaPath = resolveCodeFile(dir, candidate)\n        if (!metaPath) continue\n        const record = fileRecord(metaPath, base, 'content')\n        if (record) records.push(`${config.folder}:meta:${record}`)\n      }\n    }\n  }\n}\n\nexport function calculateGenerateWatchStructureChecksum(options: {\n  modulesFile: string\n  moduleRoots: ModuleRoots[]\n}): string {\n  const records: string[] = []\n  const modulesRecord = fileRecord(options.modulesFile, path.dirname(options.modulesFile), 'content')\n  records.push(modulesRecord ?? `missing:${options.modulesFile}`)\n\n  for (const roots of options.moduleRoots) {\n    addConventionRecords(records, roots)\n    addScannedRecords(records, roots)\n  }\n\n  return checksum(records.sort((a, b) => a.localeCompare(b)).join('\\n'))\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/mercato.js

@@ -25,7 +25,7 @@ import {
 import { parseModuleInstallArgs } from "./lib/module-install-args.js";
 import { resolveNextBuildIdCandidate } from "./lib/next-build-id.js";
 import { acquireServerStartLock } from "./lib/server-start-lock.js";
-import { createDevEnvReloader, watchDevEnvFiles, watchDevRuntimeFiles } from "./lib/dev-env-reload.js";
+import { createDevEnvReloader, watchDevEnvFiles } from "./lib/dev-env-reload.js";
 const lazyIntegration = () => import("./lib/testing/integration.js");
 import path from "node:path";
 import fs from "node:fs";
@@ -246,6 +246,82 @@ 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 waitForManagedProcessExit(proc, label) {
   return new Promise((resolve) => {
     proc.on("exit", (code, signal) => {
@@ -445,18 +521,17 @@ async function runGeneratorSuite(quiet) {
 function createGenerateWatchChecksumFn() {
   return async () => {
     const { createResolver } = await import("./lib/resolver.js");
-    const { calculateStructureChecksum } = await import("./lib/utils.js");
+    const { calculateGenerateWatchStructureChecksum } = await import("./lib/generate-watch-structure.js");
     const resolver = createResolver();
-    const tracked = /* @__PURE__ */ new Set([
-      path.join(resolver.getAppDir(), "src", "modules.ts"),
-      path.join(resolver.getAppDir(), "src", "modules")
-    ]);
+    const moduleRoots = [];
     for (const entry of resolver.loadEnabledModules()) {
       const roots = resolver.getModulePaths(entry);
-      tracked.add(roots.appBase);
-      tracked.add(roots.pkgBase);
+      moduleRoots.push({ appBase: roots.appBase, pkgBase: roots.pkgBase });
     }
-    return calculateStructureChecksum(Array.from(tracked));
+    return calculateGenerateWatchStructureChecksum({
+      modulesFile: path.join(resolver.getAppDir(), "src", "modules.ts"),
+      moduleRoots
+    });
   };
 }
 async function buildAllModules() {
@@ -1394,6 +1469,7 @@ async function run(argv = process.argv) {
           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() {
@@ -1472,17 +1548,13 @@ async function run(argv = process.argv) {
               filePath
             });
           });
-          const stopRuntimeWatcher = watchDevRuntimeFiles(appDir, (filePath) => {
-            devRestartPromiseResolve?.({
-              label: "Runtime graph change",
-              restart: true,
-              filePath
-            });
-          });
           const waitForDevRestart = () => new Promise((resolve) => {
             devRestartPromiseResolve = resolve;
           });
           const startNextDev = (runtimeEnv) => 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,
@@ -1490,11 +1562,17 @@ async function run(argv = process.argv) {
             });
             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;
+              }
             };
             nextProcess.stdout?.on("data", (chunk) => {
               const text = typeof chunk === "string" ? chunk : chunk.toString();
@@ -1509,6 +1587,8 @@ async function run(argv = process.argv) {
             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);
                 return resolve(await startNextDev(runtimeEnv));
@@ -1601,6 +1681,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;
               if (isDevServerRestartResult(firstExit)) {
@@ -1614,7 +1698,6 @@ async function run(argv = process.argv) {
             }
           } finally {
             stopEnvWatcher();
-            stopRuntimeWatcher();
           }
         }
       },