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

package/src/lib/generators/route-manifest-shards.ts

@@ -0,0 +1,146 @@
+export type RouteManifestShardKind = 'api' | 'backend'
+
+export type RouteManifestShardEntry = {
+  path: string
+  declaration: string
+  imports?: string[]
+}
+
+export type RouteManifestShardOutput = {
+  fileName: string
+  content: string
+}
+
+type IndexedRouteManifestShardEntry = RouteManifestShardEntry & {
+  order: number
+}
+
+const DYNAMIC_SHARD_KEY = '__dynamic'
+const ROOT_SHARD_KEY = '__root'
+
+function normalizeRoutePath(kind: RouteManifestShardKind, pathname: string): string[] {
+  const segments = pathname.split('?')[0].split('/').filter(Boolean)
+  if (kind === 'backend' && segments[0]?.toLowerCase() === 'backend') {
+    segments.shift()
+  }
+  return segments
+}
+
+export function getRouteManifestShardKey(kind: RouteManifestShardKind, pathname: string): string {
+  const firstSegment = normalizeRoutePath(kind, pathname)[0]
+  if (!firstSegment) return ROOT_SHARD_KEY
+  if (
+    firstSegment.startsWith('[')
+    || firstSegment.startsWith(':')
+    || firstSegment === '*'
+  ) {
+    return DYNAMIC_SHARD_KEY
+  }
+  return firstSegment.toLowerCase()
+}
+
+function renderArray(entries: RouteManifestShardEntry[]): string {
+  if (entries.length === 0) return '[]'
+  return `[\n${entries.map((entry) => `  ${entry.declaration}`).join(',\n')}\n]`
+}
+
+function uniqueImports(entries: RouteManifestShardEntry[]): string[] {
+  return Array.from(new Set(entries.flatMap((entry) => entry.imports ?? [])))
+}
+
+function shardStem(kind: RouteManifestShardKind, index: number, key: string): string {
+  const safeKey = key.replace(/[^a-zA-Z0-9_-]/g, '_')
+  return `${kind}-route-shard.${String(index).padStart(3, '0')}.${safeKey}.generated`
+}
+
+function renderShardFile(kind: RouteManifestShardKind, entries: IndexedRouteManifestShardEntry[]): string {
+  const typeName = kind === 'api' ? 'ApiRouteManifestEntry' : 'BackendRouteManifestEntry'
+  const helperImport = kind === 'backend' ? 'resolvePageRouteMetadata, ' : ''
+  const imports = uniqueImports(entries)
+  return `// AUTO-GENERATED by mercato generate registry (request-scoped route shard)\nimport { ${helperImport}type ${typeName} } from '@open-mercato/shared/modules/registry'\n${imports.length ? `${imports.join('\n')}\n` : ''}\nexport const routes: ${typeName}[] = ${renderArray(entries)}\nexport const routeOrders = [${entries.map((entry) => entry.order).join(', ')}]\n\nexport default routes\n`
+}
+
+function renderLoaderFile(
+  kind: RouteManifestShardKind,
+  shards: Array<{ key: string; stem: string; orders: number[] }>,
+): string {
+  const isApi = kind === 'api'
+  const typeName = kind === 'api' ? 'ApiRouteManifestEntry' : 'BackendRouteManifestEntry'
+  const functionName = kind === 'api' ? 'loadApiRouteManifestShard' : 'loadBackendRouteManifestShard'
+  const ordinalFunctionName = isApi ? 'loadApiRouteManifestByOrdinal' : 'loadBackendRouteManifestByOrdinal'
+  const facadeExportName = isApi ? 'apiRouteFacades' : 'backendRouteFacades'
+  const metadataExportName = isApi ? 'apiRouteMetadata' : 'backendRouteMetadata'
+  const metadataFileName = isApi ? 'api-route-metadata.generated' : 'backend-route-metadata.generated'
+  const shardCases = shards
+    .map(({ key, stem }) => `    case ${JSON.stringify(key)}:\n      return import('./${stem}').then((entry) => ({ routes: entry.routes, routeOrders: entry.routeOrders }))`)
+    .join('\n')
+  const hasDynamicShard = shards.some(({ key }) => key === DYNAMIC_SHARD_KEY)
+  const routeShardKeys: string[] = []
+  for (const shard of shards) {
+    for (const order of shard.orders) routeShardKeys[order] = shard.key
+  }
+  const prefixNormalization = kind === 'backend'
+    ? `  if (segments[0]?.toLowerCase() === 'backend') segments.shift()\n`
+    : ''
+  const loadDynamic = hasDynamicShard
+    ? `  const dynamicShard = await loadShard(${JSON.stringify(DYNAMIC_SHARD_KEY)})\n`
+    : `  const dynamicShard: LoadedRouteShard = EMPTY_SHARD\n`
+
+  return `// AUTO-GENERATED by mercato generate registry (request-scoped route loader)\nimport type { ${typeName} } from '@open-mercato/shared/modules/registry'\nimport { ${metadataExportName} } from './${metadataFileName}'\n\ntype LoadedRouteShard = { routes: ${typeName}[]; routeOrders: number[] }\nconst EMPTY_SHARD: LoadedRouteShard = { routes: [], routeOrders: [] }\nconst ROUTE_SHARD_KEYS = ${JSON.stringify(routeShardKeys)}\n\nfunction resolveShardKey(pathname: string): string {\n  const segments = pathname.split('?')[0].split('/').filter(Boolean)\n${prefixNormalization}  return segments[0]?.toLowerCase() ?? ${JSON.stringify(ROOT_SHARD_KEY)}\n}\n\nasync function loadShard(key: string): Promise<LoadedRouteShard> {\n  switch (key) {\n${shardCases ? `${shardCases}\n` : ''}    default:\n      return EMPTY_SHARD\n  }\n}\n\nexport async function ${ordinalFunctionName}(ordinal: number): Promise<${typeName}> {\n  const shardKey = ROUTE_SHARD_KEYS[ordinal]\n  if (shardKey === undefined) throw new Error('Unknown generated route manifest ordinal: ' + ordinal)\n  const shard = await loadShard(shardKey)\n  const index = shard.routeOrders.indexOf(ordinal)\n  if (index < 0 || !shard.routes[index]) throw new Error('Generated route manifest ordinal is missing from its shard: ' + ordinal)\n  return shard.routes[index]\n}\n\nexport const ${facadeExportName}: ${typeName}[] = ${metadataExportName}.map((metadata, ordinal) => ({\n  ...metadata,\n  load: async () => {\n    const route = await ${ordinalFunctionName}(ordinal)\n    return route.load()\n  },\n}))\n\nexport async function ${functionName}(pathname: string): Promise<${typeName}[]> {\n  const exactShard = await loadShard(resolveShardKey(pathname))\n${loadDynamic}  return [\n    ...exactShard.routes.map((route, index) => ({ route, order: exactShard.routeOrders[index] })),\n    ...dynamicShard.routes.map((route, index) => ({ route, order: dynamicShard.routeOrders[index] })),\n  ].sort((a, b) => a.order - b.order).map(({ route }) => route)\n}\n`
+}
+
+export function renderRouteManifestShardOutputs(
+  kind: RouteManifestShardKind,
+  entries: RouteManifestShardEntry[],
+): RouteManifestShardOutput[] {
+  const grouped = new Map<string, IndexedRouteManifestShardEntry[]>()
+  for (const [order, entry] of entries.entries()) {
+    const key = getRouteManifestShardKey(kind, entry.path)
+    const existing = grouped.get(key)
+    const indexedEntry = { ...entry, order }
+    if (existing) existing.push(indexedEntry)
+    else grouped.set(key, [indexedEntry])
+  }
+
+  const sortedGroups = Array.from(grouped.entries()).sort(([a], [b]) => a.localeCompare(b))
+  const shards = sortedGroups.map(([key, shardEntries], index) => {
+    const stem = shardStem(kind, index, key)
+    return {
+      key,
+      stem,
+      orders: shardEntries.map((entry) => entry.order),
+      output: {
+        fileName: `${stem}.ts`,
+        content: renderShardFile(kind, shardEntries),
+      },
+    }
+  })
+  const loaderFileName = kind === 'api'
+    ? 'api-route-shards.generated.ts'
+    : 'backend-route-shards.generated.ts'
+
+  return [
+    ...shards.map(({ output }) => output),
+    {
+      fileName: loaderFileName,
+      content: renderLoaderFile(kind, shards),
+    },
+  ]
+}
+
+export function renderRouteMetadataOutput(
+  kind: RouteManifestShardKind,
+  entries: RouteManifestShardEntry[],
+): RouteManifestShardOutput {
+  const isApi = kind === 'api'
+  const manifestType = isApi ? 'ApiRouteManifestEntry' : 'BackendRouteManifestEntry'
+  const metadataType = isApi ? 'ApiRouteMetadataEntry' : 'BackendRouteMetadataEntry'
+  const exportName = isApi ? 'apiRouteMetadata' : 'backendRouteMetadata'
+  const fileName = isApi ? 'api-route-metadata.generated.ts' : 'backend-route-metadata.generated.ts'
+  const helperImport = isApi ? '' : 'resolvePageRouteMetadata, '
+  const imports = uniqueImports(entries)
+  const content = `// AUTO-GENERATED by mercato generate registry (route metadata without component loaders)\nimport { ${helperImport}type ${manifestType} } from '@open-mercato/shared/modules/registry'\n${imports.length ? `${imports.join('\n')}\n` : ''}\nexport type ${metadataType} = Omit<${manifestType}, 'load'>\n\nexport const ${exportName}: ${metadataType}[] = ${renderArray(entries)}\n\nexport default ${exportName}\n`
+  return { fileName, content }
+}
+
+export const routeManifestShardFilePattern = /^(?:api|backend)-route-shard\..+\.generated\.(?:ts|checksum)$/

package/src/lib/in-process-generate-watcher.ts

@@ -24,6 +24,8 @@ export type GenerateWatcherChangeSignal = {
   currentVersion(): number
   /** Refresh filesystem subscriptions after module configuration changes. */
   refresh(): Promise<void> | void
+  /** Whether configured roots are missing and should be retried on idle polls. */
+  hasSkippedTargets?(): boolean
   /** When true, preserve the legacy full-checksum-on-every-poll behavior. */
   usesPollingFallback(): boolean
   /** Close filesystem subscriptions. Idempotent. */
@@ -130,16 +132,23 @@ export function startInProcessGenerateWatcher(
         if (stopping) return
         try {
           const changeVersion = changeSignal?.currentVersion() ?? 0
-          if (
+          const eventGatedIdle = Boolean(
             changeSignal
             && !changeSignal.usesPollingFallback()
             && changeVersion === observedChangeVersion
-          ) {
-            return
+          )
+          let refreshedSkippedTargets = false
+          if (eventGatedIdle) {
+            if (!changeSignal?.hasSkippedTargets?.()) return
+            await changeSignal.refresh()
+            refreshedSkippedTargets = true
+            if (changeSignal.hasSkippedTargets?.()) return
           }
           const nextChecksum = await computeStructureChecksum()
           observedChangeVersion = changeVersion
-          await changeSignal?.refresh()
+          if (!refreshedSkippedTargets) {
+            await changeSignal?.refresh()
+          }
           if (nextChecksum !== previousChecksum) {
             previousChecksum = nextChecksum
             await runOnce('structure change')

package/src/lib/load-env.ts

@@ -0,0 +1,30 @@
+import fs from 'node:fs'
+import path from 'node:path'
+
+/**
+ * Bootstrap-free `.env` loader for the CLI binary. `bin.ts` must load the app's
+ * `.env` BEFORE `initTelemetry()` so `TELEMETRY_*` set only in `.env` resolves a
+ * real backend for worker/scheduler processes — `run()`'s `ensureEnvLoaded()`
+ * happens after telemetry init, which is too late. Deliberately read-only (no
+ * `.env.example` copy — that UX stays in `ensureEnvLoaded`) and pulls in only the
+ * resolver + dotenv, so nothing here loads `pg` and the OTEL instrumentation
+ * load-order guarantee is preserved.
+ */
+export async function loadAppEnv(options: { cwd?: string } = {}): Promise<void> {
+  try {
+    const { createResolver } = await import('./resolver.js')
+    const appDir = createResolver(options.cwd).getAppDir()
+    const envPath = path.join(appDir, '.env')
+    if (fs.existsSync(envPath)) {
+      const dotenv = await import('dotenv')
+      dotenv.config({ path: envPath, quiet: true })
+      return
+    }
+  } catch {
+    // Resolver can fail outside an app dir — fall through to plain cwd loading.
+  }
+  try {
+    const dotenv = await import('dotenv')
+    dotenv.config({ quiet: true })
+  } catch {}
+}

package/src/lib/queue-worker-supervisor.ts

@@ -32,6 +32,11 @@ import {
 import type { ModuleWorker } from '@open-mercato/shared/modules/registry'
 import type { LazyWorkerSpawnMode } from './auto-spawn-workers'
 
+export type SupervisorWorkerDescriptor = Pick<
+  ModuleWorker,
+  'id' | 'moduleId' | 'queue' | 'concurrency'
+>
+
 export type LazySupervisorSpawnFn = (
   command: string,
   args: readonly string[],
@@ -47,7 +52,7 @@ export type LazyWorkerSupervisorOptions = {
   mercatoBin: string
   appDir: string
   runtimeEnv: NodeJS.ProcessEnv
-  workers: ModuleWorker[]
+  workers: readonly SupervisorWorkerDescriptor[]
   pollMs: number
   restartOnUnexpectedExit: boolean
   spawnMode?: LazyWorkerSpawnMode
@@ -89,7 +94,7 @@ type QueueGroup = {
   workerCount: number
 }
 
-function groupWorkersByQueue(workers: ModuleWorker[]): QueueGroup[] {
+function groupWorkersByQueue(workers: readonly SupervisorWorkerDescriptor[]): QueueGroup[] {
   const groups = new Map<string, QueueGroup>()
   for (const worker of workers) {
     const existing = groups.get(worker.queue)

package/src/lib/resolver.ts

@@ -25,10 +25,12 @@ export type CliEnvironment = {
 export type ModuleEntry = {
   id: string
   from?: '@open-mercato/core' | '@app' | string
+  devSupervisorRequiresFullBootstrap?: boolean
 }
 
 export type PackageInfo = {
   name: string
+  version?: string | null
   path: string
   modulesPath: string
 }
@@ -88,18 +90,45 @@ function pkgRootFor(rootDir: string, from?: string, isMonorepo = true): string {
 function parseModuleEntryFromObjectLiteral(node: ts.ObjectLiteralExpression): ModuleEntry | null {
   let id: string | null = null
   let from: string | null = null
+  let devSupervisorRequiresFullBootstrap = false
   for (const property of node.properties) {
-    if (!ts.isPropertyAssignment(property) || !ts.isIdentifier(property.name)) continue
-    const key = property.name.text
+    if (!ts.isPropertyAssignment(property)) continue
+    const key = ts.isIdentifier(property.name) || ts.isStringLiteralLike(property.name)
+      ? property.name.text
+      : null
     if (key === 'id' && ts.isStringLiteralLike(property.initializer)) {
       id = property.initializer.text
     }
     if (key === 'from' && ts.isStringLiteralLike(property.initializer)) {
       from = property.initializer.text
     }
+    if (key === 'overrides') {
+      if (!ts.isObjectLiteralExpression(property.initializer)) {
+        devSupervisorRequiresFullBootstrap = true
+        continue
+      }
+      for (const overrideProperty of property.initializer.properties) {
+        if (ts.isSpreadAssignment(overrideProperty)) {
+          devSupervisorRequiresFullBootstrap = true
+          break
+        }
+        if (!ts.isPropertyAssignment(overrideProperty)) continue
+        const overrideKey = ts.isIdentifier(overrideProperty.name) || ts.isStringLiteralLike(overrideProperty.name)
+          ? overrideProperty.name.text
+          : null
+        if (overrideKey === 'workers' || overrideKey === 'cli') {
+          devSupervisorRequiresFullBootstrap = true
+          break
+        }
+      }
+    }
   }
   if (!id) return null
-  return { id, from: from ?? '@open-mercato/core' }
+  return {
+    id,
+    from: from ?? '@open-mercato/core',
+    ...(devSupervisorRequiresFullBootstrap ? { devSupervisorRequiresFullBootstrap: true } : {}),
+  }
 }
 
 function parseProcessEnvAccess(
@@ -356,6 +385,7 @@ function discoverPackagesInMonorepo(rootDir: string): PackageInfo[] {
       if (fs.existsSync(modulesPath)) {
         packages.push({
           name: pkgJson.name || `@open-mercato/${entry.name}`,
+          version: typeof pkgJson.version === 'string' ? pkgJson.version : null,
           path: pkgPath,
           modulesPath,
         })
@@ -391,6 +421,7 @@ function discoverPackagesInNodeModules(rootDir: string): PackageInfo[] {
       if (fs.existsSync(modulesPath)) {
         packages.push({
           name: pkgJson.name || `@open-mercato/${entry.name}`,
+          version: typeof pkgJson.version === 'string' ? pkgJson.version : null,
           path: pkgPath,
           modulesPath,
         })