@open-mercato/cli 0.6.3-develop.3894.1.352abf4240 → 0.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cli",
-  "version": "0.6.3-develop.3894.1.352abf4240",
+  "version": "0.6.3",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {
@@ -59,21 +59,21 @@
     "@mikro-orm/decorators": "^7.1.1",
     "@mikro-orm/migrations": "^7.1.1",
     "@mikro-orm/postgresql": "^7.1.1",
-    "@open-mercato/queue": "0.6.3-develop.3894.1.352abf4240",
-    "@open-mercato/shared": "0.6.3-develop.3894.1.352abf4240",
+    "@open-mercato/queue": "0.6.3",
+    "@open-mercato/shared": "0.6.3",
     "cross-spawn": "^7.0.6",
     "pg": "8.21.0",
     "semver": "^7.8.1",
-    "testcontainers": "^12.0.0",
+    "testcontainers": "^12.0.1",
     "ts-morph": "^28.0.0",
     "tsx": "^4.22.3",
     "typescript": "^6.0.3"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.3-develop.3894.1.352abf4240"
+    "@open-mercato/shared": "0.6.3"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.3-develop.3894.1.352abf4240",
+    "@open-mercato/shared": "0.6.3",
     "@types/jest": "^30.0.0",
     "jest": "^30.4.2",
     "ts-jest": "^29.4.11"
@@ -85,6 +85,5 @@
     "type": "git",
     "url": "https://github.com/open-mercato/open-mercato",
     "directory": "packages/cli"
-  },
-  "stableVersion": "0.6.2"
+  }
 }

package/src/__tests__/mercato.test.ts

@@ -37,9 +37,18 @@ function buildMockChildProcessModule(routeAutoExit: MockChildSpawnRouter) {
     if (autoExit) {
       queueMicrotask(() => {
         if (child.exitCode !== null || child.signalCode !== null) return
-        child.exitCode = autoExit.code
-        child.signalCode = autoExit.signal ?? null
-        child.emit('exit', child.exitCode, child.signalCode)
+        if (pathIncludes(spawnargs[1] ?? '', 'next/dist/bin/next') && spawnargs.includes('dev')) {
+          child.stdout.emit('data', '✓ Ready in 1ms\n')
+        }
+        queueMicrotask(() => {
+          child.exitCode = autoExit.code
+          child.signalCode = autoExit.signal ?? null
+          child.emit('exit', child.exitCode, child.signalCode)
+        })
+      })
+    } else if (pathIncludes(spawnargs[1] ?? '', 'next/dist/bin/next') && spawnargs.includes('dev')) {
+      queueMicrotask(() => {
+        child.stdout.emit('data', '✓ Ready in 1ms\n')
       })
     }
 
@@ -1049,6 +1058,7 @@ describe('server start managed process exits', () => {
         envChangeCallback = onChange
         return jest.fn()
       }),
+      watchDevRuntimeFiles: jest.fn(() => jest.fn()),
     }))
     jest.doMock('../lib/generators', () => ({
       generateModulePackageSources: jest.fn().mockResolvedValue(undefined),

package/src/lib/__tests__/dev-env-reload.test.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
-import { createDevEnvReloader, resolveDevEnvFilePaths } from '../dev-env-reload'
+import { createDevEnvReloader, resolveDevEnvFilePaths, watchDevRuntimeFiles } from '../dev-env-reload'
 import { normalizeTestPath } from './path-helpers'
 
 describe('dev env reload helpers', () => {
@@ -60,4 +60,24 @@ describe('dev env reload helpers', () => {
     expect(environment.SHELL_VALUE).toBe('shell-value')
     expect(environment.REMOVED_LATER).toBeUndefined()
   })
+
+  it('watches generated runtime files when explicitly requested', async () => {
+    const generatedDir = path.join(appDir, '.mercato', 'generated')
+    fs.mkdirSync(generatedDir, { recursive: true })
+    const generatedFile = path.join(generatedDir, 'backend-routes.generated.ts')
+    fs.writeFileSync(generatedFile, 'export const routes = []\n')
+
+    let stop = () => {}
+    const seen = new Promise<string>((resolve) => {
+      stop = watchDevRuntimeFiles(appDir, (filePath) => {
+        stop()
+        resolve(filePath)
+      }, { debounceMs: 10 })
+    })
+
+    await new Promise((resolve) => setTimeout(resolve, 25))
+    fs.writeFileSync(generatedFile, 'export const routes = [1]\n')
+
+    await expect(seen.finally(stop)).resolves.toBe(generatedFile)
+  })
 })

package/src/lib/__tests__/generate-watch-structure.test.ts

@@ -0,0 +1,80 @@
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import { calculateGenerateWatchStructureChecksum } from '../generate-watch-structure'
+
+function write(filePath: string, content: string): void {
+  fs.mkdirSync(path.dirname(filePath), { recursive: true })
+  fs.writeFileSync(filePath, content)
+}
+
+describe('calculateGenerateWatchStructureChecksum', () => {
+  let root: string
+  let appDir: string
+  let pkgModule: string
+  let appModule: string
+
+  beforeEach(() => {
+    root = fs.mkdtempSync(path.join(os.tmpdir(), 'om-generate-watch-'))
+    appDir = path.join(root, 'apps', 'mercato')
+    pkgModule = path.join(root, 'packages', 'core', 'src', 'modules', 'customers')
+    appModule = path.join(appDir, 'src', 'modules', 'customers')
+    write(path.join(appDir, 'src', 'modules.ts'), 'export const enabledModules = []\n')
+    write(path.join(pkgModule, 'index.ts'), 'export const metadata = { id: "customers" }\n')
+    write(path.join(pkgModule, 'backend', 'customers', 'people', 'page.tsx'), 'export default function Page() { return null }\n')
+    write(path.join(pkgModule, 'components', 'detail', 'PersonDetailTabs.tsx'), 'export function PersonDetailTabs() { return null }\n')
+  })
+
+  afterEach(() => {
+    fs.rmSync(root, { recursive: true, force: true })
+  })
+
+  function currentChecksum(): string {
+    return calculateGenerateWatchStructureChecksum({
+      modulesFile: path.join(appDir, 'src', 'modules.ts'),
+      moduleRoots: [{ appBase: appModule, pkgBase: pkgModule }],
+    })
+  }
+
+  it('ignores ordinary component edits outside generator discovery paths', () => {
+    const before = currentChecksum()
+
+    write(path.join(pkgModule, 'components', 'detail', 'PersonDetailTabs.tsx'), 'export function PersonDetailTabs() { return "changed" }\n')
+
+    expect(currentChecksum()).toBe(before)
+  })
+
+  it('changes when a discovered backend page is added', () => {
+    const before = currentChecksum()
+
+    write(path.join(pkgModule, 'backend', 'customers', 'companies', 'page.tsx'), 'export default function Page() { return null }\n')
+
+    expect(currentChecksum()).not.toBe(before)
+  })
+
+  it('changes when route metadata changes', () => {
+    write(path.join(pkgModule, 'backend', 'customers', 'people', 'page.meta.ts'), 'export const metadata = { nav: { label: "People" } }\n')
+    const before = currentChecksum()
+
+    write(path.join(pkgModule, 'backend', 'customers', 'people', 'page.meta.ts'), 'export const metadata = { nav: { label: "Contacts" } }\n')
+
+    expect(currentChecksum()).not.toBe(before)
+  })
+
+  it('changes when inline page metadata changes', () => {
+    write(path.join(pkgModule, 'backend', 'customers', 'people', 'page.tsx'), 'export const metadata = { nav: { label: "People" } }\nexport default function Page() { return null }\n')
+    const before = currentChecksum()
+
+    write(path.join(pkgModule, 'backend', 'customers', 'people', 'page.tsx'), 'export const metadata = { nav: { label: "Contacts" } }\nexport default function Page() { return null }\n')
+
+    expect(currentChecksum()).not.toBe(before)
+  })
+
+  it('changes when a convention file changes', () => {
+    const before = currentChecksum()
+
+    write(path.join(pkgModule, 'acl.ts'), 'export const features = [{ id: "customers.view" }]\n')
+
+    expect(currentChecksum()).not.toBe(before)
+  })
+})

package/src/lib/dev-env-reload.ts

@@ -2,6 +2,8 @@ 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',
@@ -108,3 +110,48 @@ export function watchDevEnvFiles(
     }
   }
 }
+
+export function watchDevRuntimeFiles(
+  appDir: string,
+  onChange: (filePath: string) => void,
+  options: { debounceMs?: number } = {},
+): () => void {
+  const debounceMs = options.debounceMs ?? 250
+  const generatedDir = path.join(appDir, '.mercato', 'generated')
+  const timers = new Map<string, NodeJS.Timeout>()
+
+  if (!fs.existsSync(generatedDir)) {
+    return () => {}
+  }
+
+  let watcher: fs.FSWatcher | null = 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()
+  }
+}

package/src/lib/generate-watch-structure.ts

@@ -0,0 +1,170 @@
+import crypto from 'node:crypto'
+import fs from 'node:fs'
+import path from 'node:path'
+import {
+  MODULE_CODE_EXTENSIONS,
+  SCAN_CONFIGS,
+  scanModuleDir,
+  stripModuleCodeExtension,
+  type ModuleRoots,
+} from './generators/scanner'
+
+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',
+] as const
+
+const CONTENT_SENSITIVE_SCAN_CONFIGS = [
+  SCAN_CONFIGS.apiRoutes,
+  SCAN_CONFIGS.apiPlainFiles,
+  SCAN_CONFIGS.subscribers,
+  SCAN_CONFIGS.workers,
+  SCAN_CONFIGS.dashboardWidgets,
+  SCAN_CONFIGS.injectionWidgets,
+] as const
+
+const ROUTE_SHAPE_SCAN_CONFIGS = [
+  SCAN_CONFIGS.frontendPages,
+  SCAN_CONFIGS.backendPages,
+] as const
+
+function checksum(value: string): string {
+  return crypto.createHash('md5').update(value).digest('hex')
+}
+
+function fileRecord(filePath: string, base: string, mode: 'content' | 'shape'): string | null {
+  if (!fs.existsSync(filePath)) return null
+  let stat: fs.Stats
+  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: string, relativePath: string): string | null {
+  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: string): boolean {
+  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: string[], roots: ModuleRoots): void {
+  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: string[], roots: ModuleRoots): void {
+  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}`)
+      }
+    }
+  }
+}
+
+export function calculateGenerateWatchStructureChecksum(options: {
+  modulesFile: string
+  moduleRoots: ModuleRoots[]
+}): string {
+  const records: string[] = []
+  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'))
+}

package/src/lib/testing/integration.ts

@@ -2942,6 +2942,20 @@ export async function startEphemeralEnvironment(options: EphemeralRuntimeOptions
       TENANT_DATA_ENCRYPTION_FALLBACK_KEY: process.env.TENANT_DATA_ENCRYPTION_FALLBACK_KEY ?? 'om-ephemeral-integration-fallback-key',
       AUTO_SPAWN_WORKERS: process.env.AUTO_SPAWN_WORKERS ?? 'true',
       AUTO_SPAWN_SCHEDULER: 'false',
+      // Hide the demo feedback floating action button — it lives at
+      // `fixed bottom-6 right-6 z-banner` and consistently intercepts pointer
+      // events on row-action menus and other bottom-of-viewport UI elements
+      // (e.g. TC-WF-006 Delete menuitem click). The widget is already gated
+      // on `DEMO_MODE !== 'false'` in the backend layout, so opting out here
+      // only affects the integration test runtime — dev + prod stay unchanged.
+      DEMO_MODE: 'false',
+      // Disable the feature-toggle resolution cache. Tests flip overrides
+      // (e.g. example_customers_sync enabled/bidirectional) between cases; the
+      // 1-minute resolution cache can serve a stale value across set/clear
+      // under fast churn, which made the example.todo.* persistent subscribers
+      // skip enqueueing inbound sync jobs (TC-CRM-028 inbound trio flake).
+      // Fresh DB reads make flag-gated sync deterministic in tests only.
+      OM_FEATURE_TOGGLES_CACHE_DISABLED: '1',
       OM_CLI_QUIET: '1',
       MERCATO_QUIET: '1',
       QUEUE_BASE_DIR: EPHEMERAL_QUEUE_BASE_DIR,