create-mercato-app 0.6.1-develop.3291.1.6fad645fd0 → 0.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-mercato-app",
-  "version": "0.6.1-develop.3291.1.6fad645fd0",
+  "version": "0.6.1",
   "type": "module",
   "description": "Create a new Open Mercato application",
   "main": "./dist/index.js",
@@ -41,6 +41,5 @@
     "scaffolding",
     "cli"
   ],
-  "license": "MIT",
-  "stableVersion": "0.6.0"
+  "license": "MIT"
 }

package/template/scripts/dev-runtime-log-policy.mjs

@@ -76,6 +76,10 @@ export function isIgnorableBootstrapNoiseLine(line) {
   return normalized.startsWith('[Bootstrap] Entity IDs re-registered')
     || normalized.startsWith('🚀 Starting scheduler')
     || normalized.startsWith('✓ Local scheduler started')
+    || normalized.startsWith('[lazy-scheduler] Watching for enabled schedules')
+    || normalized.startsWith('[lazy-scheduler] Schedule probe failed')
+    || normalized.startsWith('[lazy-scheduler] Poll cycle failed')
+    || normalized.startsWith('[lazy-scheduler] Initial poll failed')
     || normalized.startsWith('💡 Tip:')
 }
 

package/template/scripts/dev-runtime.mjs

@@ -42,6 +42,27 @@ function isEnabledEnvFlag(value) {
   return ['1', 'true', 'yes', 'on'].includes(value.trim().toLowerCase())
 }
 
+function parseEnvBooleanToken(value) {
+  if (typeof value !== 'string') return null
+  const normalized = value.trim().toLowerCase()
+  if (['1', 'true', 'yes', 'on'].includes(normalized)) return true
+  if (['0', 'false', 'no', 'off'].includes(normalized)) return false
+  return null
+}
+
+function resolveAutoSpawnEnabled(env, legacyName, aliasedName) {
+  const legacy = parseEnvBooleanToken(env[legacyName])
+  if (legacy !== null) return legacy
+  const aliased = parseEnvBooleanToken(env[aliasedName])
+  if (aliased !== null) return aliased
+  return true
+}
+
+function resolveAutoSpawnMode(env, legacyName, aliasedName, lazyName) {
+  if (!resolveAutoSpawnEnabled(env, legacyName, aliasedName)) return 'off'
+  return parseEnvBooleanToken(env[lazyName]) === true ? 'lazy' : 'eager'
+}
+
 const {
   clampPercent,
   connectLineStream,
@@ -83,6 +104,10 @@ const CYAN_BORDER = '\u001B[46m\u001B[30m'
 const ERROR_BANNER = '\u001B[41m\u001B[97m'
 const warmupRequestTimeoutsMs = [45000, 120000]
 const maxWarmupRetryAttempts = 3
+const backgroundServiceModes = {
+  workers: resolveAutoSpawnMode(process.env, 'AUTO_SPAWN_WORKERS', 'OM_AUTO_SPAWN_WORKERS', 'OM_AUTO_SPAWN_WORKERS_LAZY'),
+  scheduler: resolveAutoSpawnMode(process.env, 'AUTO_SPAWN_SCHEDULER', 'OM_AUTO_SPAWN_SCHEDULER', 'OM_AUTO_SPAWN_SCHEDULER_LAZY'),
+}
 const splashState = {
   mode: splashMode,
   phase: startupSplashPhase,
@@ -98,6 +123,8 @@ const splashState = {
   packageNames: [],
   workerQueues: [],
   schedulerActive: false,
+  workerMode: backgroundServiceModes.workers,
+  schedulerMode: backgroundServiceModes.scheduler,
   progressCurrent: runtimeProgressCurrent,
   progressTotal: runtimeProgressTotal,
   progressPercent: 0,
@@ -120,6 +147,8 @@ const runtimeSummaryState = {
   packageNames: [],
   workerQueues: [],
   schedulerActive: false,
+  workerMode: backgroundServiceModes.workers,
+  schedulerMode: backgroundServiceModes.scheduler,
   packagesPrinted: false,
   workersPrinted: false,
   lastWorkersSignature: '',
@@ -145,6 +174,22 @@ function printCompactSummary(icon, title, lines) {
   }
 }
 
+function formatBackgroundServiceMode(modes = runtimeSummaryState) {
+  const activeModes = []
+  if (modes.workerMode !== 'off') activeModes.push(['workers', modes.workerMode])
+  if (modes.schedulerMode !== 'off') activeModes.push(['scheduler', modes.schedulerMode])
+  if (activeModes.length === 0) return 'off'
+
+  const uniqueModes = new Set(activeModes.map(([, mode]) => mode))
+  if (uniqueModes.size === 1) return activeModes[0][1]
+
+  return activeModes.map(([service, mode]) => `${service} ${mode}`).join(', ')
+}
+
+function formatBackgroundServiceStatus(action = 'Starting background services', modes = runtimeSummaryState) {
+  return `${action} (${formatBackgroundServiceMode(modes)})`
+}
+
 function loadRuntimePackageNames() {
   const pkg = readJsonFile(path.join(process.cwd(), 'package.json'))
   if (!pkg || typeof pkg !== 'object') return []
@@ -168,6 +213,8 @@ function updateRuntimeSummaryState() {
     packageNames: runtimeSummaryState.packageNames,
     workerQueues: runtimeSummaryState.workerQueues,
     schedulerActive: runtimeSummaryState.schedulerActive,
+    workerMode: runtimeSummaryState.workerMode,
+    schedulerMode: runtimeSummaryState.schedulerMode,
   })
 }
 
@@ -193,6 +240,8 @@ function printBackgroundServicesSummary() {
 
   const signature = JSON.stringify({
     schedulerActive: runtimeSummaryState.schedulerActive,
+    workerMode: runtimeSummaryState.workerMode,
+    schedulerMode: runtimeSummaryState.schedulerMode,
     workerQueues: runtimeSummaryState.workerQueues,
   })
 
@@ -204,7 +253,7 @@ function printBackgroundServicesSummary() {
   runtimeSummaryState.workersPrinted = true
   printCompactSummary(
     '⚙️',
-    `Background services (${detailItems.length})`,
+    `Background services (${formatBackgroundServiceMode()}, ${detailItems.length} active)`,
     detailItems.map((item, index) => `${index === 0 ? '🕒' : '🧵'} ${item}`),
   )
 }
@@ -215,6 +264,32 @@ function initializeRuntimeSummary() {
 }
 
 function captureBackgroundServiceLine(line) {
+  if (
+    line.startsWith('[server] Lazy worker auto-spawn enabled')
+    || line.startsWith('[lazy-supervisor] Watching')
+    || line.startsWith('[lazy-supervisor] Pending job detected')
+  ) {
+    runtimeSummaryState.workerMode = 'lazy'
+    updateRuntimeSummaryState()
+    return true
+  }
+
+  if (
+    line === '[server] Starting workers for all queues...'
+    || line === '[server] Eager worker auto-spawn enabled - starting workers for all queues...'
+    || line.startsWith('🚀 Running queue:worker')
+  ) {
+    runtimeSummaryState.workerMode = 'eager'
+    updateRuntimeSummaryState()
+    return true
+  }
+
+  if (line.startsWith('[server] Lazy scheduler auto-spawn enabled')) {
+    runtimeSummaryState.schedulerMode = 'lazy'
+    updateRuntimeSummaryState()
+    return true
+  }
+
   const queuesMatch = line.match(/^\[worker\] Starting workers for all queues: (.+)$/)
   if (queuesMatch) {
     const queueNames = queuesMatch[1].split(',').map((item) => item.trim()).filter(Boolean)
@@ -241,7 +316,24 @@ function captureBackgroundServiceLine(line) {
     return true
   }
 
-  if (line === '[server] Starting scheduler polling engine...' || line.startsWith('✓ Local scheduler started')) {
+  if (
+    line === '[server] Starting scheduler polling engine...'
+    || line === '[server] Eager scheduler auto-spawn enabled - starting scheduler polling engine...'
+    || line.startsWith('🚀 Running scheduler:start')
+  ) {
+    runtimeSummaryState.schedulerMode = 'eager'
+    runtimeSummaryState.schedulerActive = true
+    updateRuntimeSummaryState()
+    return true
+  }
+
+  if (
+    line === '[lazy-scheduler] Enabled schedule detected - starting scheduler polling engine.'
+    || line.startsWith('✓ Local scheduler started')
+  ) {
+    if (line === '[lazy-scheduler] Enabled schedule detected - starting scheduler polling engine.') {
+      runtimeSummaryState.schedulerMode = 'lazy'
+    }
     runtimeSummaryState.schedulerActive = true
     updateRuntimeSummaryState()
     return true
@@ -315,6 +407,8 @@ function updateSplashState(patch) {
   if (Array.isArray(patch.packageNames)) splashState.packageNames = patch.packageNames
   if (Array.isArray(patch.workerQueues)) splashState.workerQueues = patch.workerQueues
   if (typeof patch.schedulerActive === 'boolean') splashState.schedulerActive = patch.schedulerActive
+  if (typeof patch.workerMode === 'string') splashState.workerMode = patch.workerMode
+  if (typeof patch.schedulerMode === 'string') splashState.schedulerMode = patch.schedulerMode
   if (typeof patch.progressCurrent === 'number') splashState.progressCurrent = patch.progressCurrent
   if (typeof patch.progressTotal === 'number') splashState.progressTotal = patch.progressTotal
   if (typeof patch.progressPercent === 'number') splashState.progressPercent = clampPercent(patch.progressPercent)
@@ -1377,18 +1471,63 @@ function classifyServerLine(line) {
   }
   if (
     line === '[server] Starting workers for all queues...'
+    || line === '[server] Eager worker auto-spawn enabled - starting workers for all queues...'
     || line === '[server] Starting scheduler polling engine...'
+    || line === '[server] Eager scheduler auto-spawn enabled - starting scheduler polling engine...'
+    || line === '[lazy-scheduler] Enabled schedule detected - starting scheduler polling engine.'
     || line.startsWith('🚀 Running queue:worker')
     || line.startsWith('🚀 Running scheduler:start')
   ) {
+    const isLazyTrigger = line === '[lazy-scheduler] Enabled schedule detected - starting scheduler polling engine.'
+    const modes = isLazyTrigger
+      ? { workerMode: runtimeSummaryState.workerMode, schedulerMode: 'lazy' }
+      : runtimeSummaryState
+    const status = formatBackgroundServiceStatus('Starting background services', modes)
+    return {
+      type: 'status',
+      message: `⚙️ ${status}`,
+      splashPhase: startupSplashPhase,
+      splashDetail: status,
+      activity: status,
+      progressCurrent: 3,
+      progressLabel: status,
+    }
+  }
+  if (line.startsWith('[server] Lazy worker auto-spawn enabled')) {
+    const status = 'Background workers armed (lazy)'
+    return {
+      type: 'status',
+      message: `⚙️ ${status}`,
+      splashPhase: startupSplashPhase,
+      splashDetail: status,
+      activity: status,
+      progressCurrent: 3,
+      progressLabel: 'Background services (lazy)',
+    }
+  }
+  if (line.startsWith('[server] Lazy scheduler auto-spawn enabled')) {
+    const status = 'Scheduler armed (lazy)'
+    return {
+      type: 'status',
+      message: `⚙️ ${status}`,
+      splashPhase: startupSplashPhase,
+      splashDetail: status,
+      activity: status,
+      progressCurrent: 3,
+      progressLabel: 'Background services (lazy)',
+    }
+  }
+  const lazyWorkerStartMatch = line.match(/^\[lazy-supervisor\] Pending job detected .+ starting worker for queue "(.+)"$/)
+  if (lazyWorkerStartMatch) {
+    const status = `Starting worker "${lazyWorkerStartMatch[1]}" (lazy)`
     return {
       type: 'status',
-      message: '⚙️ Starting background services',
+      message: `⚙️ ${status}`,
       splashPhase: startupSplashPhase,
-      splashDetail: 'Starting background services',
-      activity: 'Starting queue workers and scheduler',
+      splashDetail: status,
+      activity: status,
       progressCurrent: 3,
-      progressLabel: 'Starting background services',
+      progressLabel: 'Background services (lazy)',
     }
   }
 

package/template/scripts/dev.mjs

@@ -509,6 +509,27 @@ function buildSplashChildEnv() {
   }
 }
 
+function applyLocalDevBackgroundServiceDefaults(childEnv) {
+  const env = childEnv ?? {}
+  if (
+    typeof process.env.OM_AUTO_SPAWN_WORKERS_LAZY !== 'string'
+    || process.env.OM_AUTO_SPAWN_WORKERS_LAZY.trim() === ''
+  ) {
+    env.OM_AUTO_SPAWN_WORKERS_LAZY = 'true'
+  }
+  if (
+    typeof process.env.OM_AUTO_SPAWN_SCHEDULER_LAZY !== 'string'
+    || process.env.OM_AUTO_SPAWN_SCHEDULER_LAZY.trim() === ''
+  ) {
+    env.OM_AUTO_SPAWN_SCHEDULER_LAZY = 'true'
+  }
+  return env
+}
+
+function buildAppDevEnv() {
+  return applyLocalDevBackgroundServiceDefaults(buildSplashChildEnv() ?? {})
+}
+
 function launchStandaloneDev(options = {}) {
   if (!fs.existsSync(standaloneRuntimeScript)) {
     console.error(`❌ Standalone dev runtime not found at ${standaloneRuntimeScript}`)
@@ -543,7 +564,7 @@ function launchStandaloneDev(options = {}) {
 
   const app = spawnCommand(process.execPath, runtimeArgs, {
     stdio: 'inherit',
-    env: buildSplashChildEnv(),
+    env: buildAppDevEnv(),
   })
 
   app.on('close', (code) => {
@@ -1590,7 +1611,7 @@ function launchMonorepoAppDev() {
   })
   const app = spawnCommand(yarnCommand, appArgs, {
     stdio: 'inherit',
-    env: buildSplashChildEnv(),
+    env: buildAppDevEnv(),
   })
 
   app.on('close', (code, signal) => {

package/template/src/lib/dev-origins.ts

@@ -5,17 +5,49 @@
 // duplication is deliberate. Keep both copies in sync when editing; CI
 // runs `yarn template:sync` to enforce parity.
 
-function readOriginHostname(raw: string | undefined): string | null {
+const localDevHostAliases = ['localhost', '127.0.0.1', '[::1]', '0.0.0.0', 'host.docker.internal'] as const
+const localDevHosts = new Set<string>([...localDevHostAliases, '::1'])
+
+function normalizeHostname(hostname: string): string {
+  const normalized = hostname.trim().toLowerCase()
+  return normalized === '::1' ? '[::1]' : normalized
+}
+
+function isLocalDevHost(hostname: string): boolean {
+  return localDevHosts.has(hostname)
+}
+
+function isAllowedBareHostname(hostname: string): boolean {
+  return isLocalDevHost(hostname) || hostname.includes('.') || hostname.startsWith('*.') || hostname.startsWith('**.')
+}
+
+function readUrlOriginHostname(raw: string | undefined): string | null {
   const value = raw?.trim()
   if (!value) return null
 
   try {
-    return new URL(value).hostname
+    return normalizeHostname(new URL(value).hostname)
   } catch {
     return null
   }
 }
 
+function readAllowedOriginHostname(raw: string | undefined): string | null {
+  const value = raw?.trim()
+  if (!value || /\s/.test(value)) return null
+
+  const urlHostname = readUrlOriginHostname(value)
+  if (urlHostname) return urlHostname
+
+  try {
+    const hostname = normalizeHostname(new URL(`http://${value}`).hostname)
+    return isAllowedBareHostname(hostname) ? hostname : null
+  } catch {
+    const hostname = normalizeHostname(value)
+    return isAllowedBareHostname(hostname) ? hostname : null
+  }
+}
+
 function readCsv(value: string | undefined): string[] {
   return (value ?? '')
     .split(',')
@@ -23,13 +55,31 @@ function readCsv(value: string | undefined): string[] {
     .filter((item) => item.length > 0)
 }
 
+function addOriginHostname(origins: Set<string>, hostname: string): void {
+  const normalized = normalizeHostname(hostname)
+  origins.add(normalized)
+
+  if (isLocalDevHost(normalized)) {
+    for (const alias of localDevHostAliases) {
+      origins.add(alias)
+    }
+  }
+}
+
 export function resolveAllowedDevOrigins(env: NodeJS.ProcessEnv = process.env): string[] {
   const origins = new Set<string>()
 
-  for (const raw of [env.APP_URL, env.NEXT_PUBLIC_APP_URL, ...readCsv(env.APP_ALLOWED_ORIGINS)]) {
-    const hostname = readOriginHostname(raw)
+  for (const raw of [env.APP_URL, env.NEXT_PUBLIC_APP_URL]) {
+    const hostname = readUrlOriginHostname(raw)
+    if (hostname) {
+      addOriginHostname(origins, hostname)
+    }
+  }
+
+  for (const raw of readCsv(env.APP_ALLOWED_ORIGINS)) {
+    const hostname = readAllowedOriginHostname(raw)
     if (hostname) {
-      origins.add(hostname)
+      addOriginHostname(origins, hostname)
     }
   }