@open-mercato/cli 0.6.3-develop.3525.3.cc18b8a43f → 0.6.3-develop.3574.1.f3c5dcf345

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cli",
-  "version": "0.6.3-develop.3525.3.cc18b8a43f",
+  "version": "0.6.3-develop.3574.1.f3c5dcf345",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {
@@ -59,8 +59,8 @@
     "@mikro-orm/decorators": "^7.0.17",
     "@mikro-orm/migrations": "^7.0.17",
     "@mikro-orm/postgresql": "^7.0.17",
-    "@open-mercato/queue": "0.6.3-develop.3525.3.cc18b8a43f",
-    "@open-mercato/shared": "0.6.3-develop.3525.3.cc18b8a43f",
+    "@open-mercato/queue": "0.6.3-develop.3574.1.f3c5dcf345",
+    "@open-mercato/shared": "0.6.3-develop.3574.1.f3c5dcf345",
     "cross-spawn": "^7.0.6",
     "pg": "8.21.0",
     "semver": "^7.8.0",
@@ -70,10 +70,10 @@
     "typescript": "^6.0.3"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.3-develop.3525.3.cc18b8a43f"
+    "@open-mercato/shared": "0.6.3-develop.3574.1.f3c5dcf345"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.3-develop.3525.3.cc18b8a43f",
+    "@open-mercato/shared": "0.6.3-develop.3574.1.f3c5dcf345",
     "@types/jest": "^30.0.0",
     "jest": "^30.4.2",
     "ts-jest": "^29.4.9"

package/src/__tests__/mercato.test.ts

@@ -6,6 +6,7 @@ import {
   padByCodePointWidth,
   run,
 } from '../mercato'
+import { pathIncludes } from '../lib/__tests__/path-helpers'
 
 type MockChildAutoExit = { code: number | null; signal?: NodeJS.Signals | null } | undefined
 type MockChildSpawnRouter = (args: string[]) => MockChildAutoExit
@@ -674,7 +675,7 @@ describe('server dev managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
         unlinkSync: jest.fn(),
       }
@@ -691,7 +692,7 @@ describe('server dev managed process exits', () => {
     }))
     jest.doMock('child_process', () =>
       buildMockChildProcessModule((args) =>
-        args[0]?.includes('next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
+        pathIncludes(args[0] ?? '', 'next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
       ),
     )
 
@@ -715,7 +716,7 @@ describe('server dev managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
         unlinkSync: jest.fn(),
       }
@@ -763,7 +764,7 @@ describe('server dev managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
         unlinkSync: jest.fn(),
       }
@@ -792,7 +793,7 @@ describe('server dev managed process exits', () => {
 
     jest.doMock('child_process', () =>
       buildMockChildProcessModule((args) =>
-        args[0]?.includes('next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
+        pathIncludes(args[0] ?? '', 'next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
       ),
     )
 
@@ -830,7 +831,7 @@ describe('server dev managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
         unlinkSync: jest.fn(),
       }
@@ -859,7 +860,7 @@ describe('server dev managed process exits', () => {
 
     jest.doMock('child_process', () =>
       buildMockChildProcessModule((args) =>
-        args[0]?.includes('next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
+        pathIncludes(args[0] ?? '', 'next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
       ),
     )
 
@@ -932,7 +933,7 @@ describe('server start managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
       }
     })
@@ -949,7 +950,7 @@ describe('server start managed process exits', () => {
     }))
     jest.doMock('child_process', () =>
       buildMockChildProcessModule((args) =>
-        args[0]?.includes('next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
+        pathIncludes(args[0] ?? '', 'next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
       ),
     )
 
@@ -973,7 +974,7 @@ describe('server start managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
       }
     })
@@ -1022,7 +1023,7 @@ describe('server start managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
         unlinkSync: jest.fn(),
       }
@@ -1089,7 +1090,7 @@ describe('server start managed process exits', () => {
 
       return {
         spawn: jest.fn((_command: string, args: string[]) => {
-          if (args[0]?.includes('next/dist/bin/next')) {
+          if (pathIncludes(args[0] ?? '', 'next/dist/bin/next')) {
             nextSpawnCount += 1
             if (nextSpawnCount === 1) {
               queueMicrotask(() => envChangeCallback?.('/tmp/test-app/.env'))
@@ -1106,7 +1107,7 @@ describe('server start managed process exits', () => {
     const exitCode = await mercado.run(['node', 'mercato', 'server', 'dev'])
     const { spawn } = await import('child_process')
     const nextSpawns = (spawn as jest.Mock).mock.calls.filter((call) =>
-      call[1]?.[0]?.includes('next/dist/bin/next'),
+      pathIncludes(call[1]?.[0] ?? '', 'next/dist/bin/next'),
     )
 
     expect(exitCode).toBe(0)
@@ -1132,7 +1133,7 @@ describe('server start managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
       }
     })
@@ -1159,7 +1160,7 @@ describe('server start managed process exits', () => {
 
     jest.doMock('child_process', () =>
       buildMockChildProcessModule((args) =>
-        args[0]?.includes('next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
+        pathIncludes(args[0] ?? '', 'next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
       ),
     )
 

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

@@ -2,6 +2,7 @@ import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import { createDevEnvReloader, resolveDevEnvFilePaths } from '../dev-env-reload'
+import { normalizeTestPath } from './path-helpers'
 
 describe('dev env reload helpers', () => {
   let appDir: string
@@ -15,7 +16,7 @@ describe('dev env reload helpers', () => {
   })
 
   it('resolves app env files in low-to-high dev precedence order', () => {
-    expect(resolveDevEnvFilePaths('/tmp/app')).toEqual([
+    expect(resolveDevEnvFilePaths('/tmp/app').map(normalizeTestPath)).toEqual([
       '/tmp/app/.env',
       '/tmp/app/.env.development',
       '/tmp/app/.env.local',

package/src/lib/__tests__/path-helpers.ts

@@ -0,0 +1,7 @@
+export function normalizeTestPath(value: string): string {
+  return value.replace(/\\/g, '/')
+}
+
+export function pathIncludes(value: string, needle: string): boolean {
+  return normalizeTestPath(value).includes(normalizeTestPath(needle))
+}

package/src/lib/db/__tests__/commands.test.ts

@@ -13,6 +13,7 @@ import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import type { ModuleEntry, PackageResolver } from '../../resolver'
+import { normalizeTestPath } from '../../__tests__/path-helpers'
 
 describe('db commands security', () => {
   describe('sanitizeModuleId', () => {
@@ -189,7 +190,7 @@ describe('resolveGeneratedMigrationPath', () => {
       '/repo/src/modules/example/migrations',
     )
 
-    expect(result).toBe('/repo/src/modules/example/migrations/Migration20260506101927.ts')
+    expect(normalizeTestPath(result)).toBe('/repo/src/modules/example/migrations/Migration20260506101927.ts')
   })
 
   it('keeps absolute MikroORM results unchanged', () => {

package/src/lib/testing/__tests__/integration.test.ts

@@ -78,6 +78,7 @@ const resolveBuildCacheFingerprint = async (
 }
 
 describe('integration cache and options', () => {
+  const REUSE_ENV_TEST_TIMEOUT_MS = 60000
   const ephemeralEnvFilePath = path.join(projectRootDirectory, '.ai', 'qa', 'ephemeral-env.json')
   const ephemeralLegacyEnvFilePath = path.join(projectRootDirectory, '.ai', 'qa', 'ephemeral-env.md')
   const originalCacheTtl = process.env[CACHE_TTL_ENV_VAR]
@@ -130,12 +131,20 @@ describe('integration cache and options', () => {
       await writeEphemeralEnvironmentState({
         baseUrl,
         port: 5001,
+        databaseUrl: 'postgres://integration:integration@127.0.0.1:5432/open_mercato',
+        queueBaseDir: '/tmp/open-mercato-queue',
         logPrefix: 'integration',
         captureScreenshots: true,
       })
 
       const state = await readEphemeralEnvironmentState()
-      expect(state).toMatchObject({ baseUrl, port: 5001, captureScreenshots: true })
+      expect(state).toMatchObject({
+        baseUrl,
+        port: 5001,
+        databaseUrl: 'postgres://integration:integration@127.0.0.1:5432/open_mercato',
+        queueBaseDir: '/tmp/open-mercato-queue',
+        captureScreenshots: true,
+      })
 
       const environment = await tryReuseExistingEnvironment({
         verbose: false,
@@ -151,12 +160,16 @@ describe('integration cache and options', () => {
         ownedByCurrentProcess: false,
       })
       expect(environment?.commandEnvironment.OM_INTEGRATION_TEST).toBe('true')
+      expect(environment?.commandEnvironment.DATABASE_URL).toBe(
+        'postgres://integration:integration@127.0.0.1:5432/open_mercato',
+      )
+      expect(environment?.commandEnvironment.QUEUE_BASE_DIR).toBe('/tmp/open-mercato-queue')
       expect(environment?.commandEnvironment.PW_CAPTURE_SCREENSHOTS).toBe('1')
       expect(environment?.commandEnvironment.NEXT_PUBLIC_OM_EXAMPLE_CHECKOUT_TEST_INJECTIONS_ENABLED).toBeUndefined()
     } finally {
       fetchSpy.mockRestore()
     }
-  }, 20000)
+  }, REUSE_ENV_TEST_TIMEOUT_MS)
 
   it('reuses an existing environment with checkout wrapper injections only when explicitly enabled', async () => {
     const baseUrl = 'http://127.0.0.1:5001'
@@ -167,6 +180,8 @@ describe('integration cache and options', () => {
       await writeEphemeralEnvironmentState({
         baseUrl,
         port: 5001,
+        databaseUrl: 'postgres://integration:integration@127.0.0.1:5432/open_mercato',
+        queueBaseDir: '/tmp/open-mercato-queue',
         logPrefix: 'integration',
         captureScreenshots: true,
       })
@@ -184,7 +199,7 @@ describe('integration cache and options', () => {
     } finally {
       fetchSpy.mockRestore()
     }
-  }, 20000)
+  }, REUSE_ENV_TEST_TIMEOUT_MS)
 
   it('reuses an existing environment when /login returns a redirect status other than 302', async () => {
     const baseUrl = 'http://127.0.0.1:5001'
@@ -196,6 +211,8 @@ describe('integration cache and options', () => {
       await writeEphemeralEnvironmentState({
         baseUrl,
         port: 5001,
+        databaseUrl: 'postgres://integration:integration@127.0.0.1:5432/open_mercato',
+        queueBaseDir: '/tmp/open-mercato-queue',
         logPrefix: 'integration',
         captureScreenshots: true,
       })
@@ -216,7 +233,7 @@ describe('integration cache and options', () => {
     } finally {
       fetchSpy.mockRestore()
     }
-  }, 20000)
+  }, REUSE_ENV_TEST_TIMEOUT_MS)
 
   it('reuses an existing environment when /login returns healthy HTML without static asset references', async () => {
     const baseUrl = 'http://127.0.0.1:5001'
@@ -231,6 +248,8 @@ describe('integration cache and options', () => {
       await writeEphemeralEnvironmentState({
         baseUrl,
         port: 5001,
+        databaseUrl: 'postgres://integration:integration@127.0.0.1:5432/open_mercato',
+        queueBaseDir: '/tmp/open-mercato-queue',
         logPrefix: 'integration',
         captureScreenshots: false,
       })
@@ -251,7 +270,7 @@ describe('integration cache and options', () => {
     } finally {
       fetchSpy.mockRestore()
     }
-  }, 20000)
+  }, REUSE_ENV_TEST_TIMEOUT_MS)
 
   it('falls back to rebuilding when the ephemeral environment state is unreachable', async () => {
     const baseUrl = 'http://127.0.0.1:5001'
@@ -261,6 +280,8 @@ describe('integration cache and options', () => {
       await writeEphemeralEnvironmentState({
         baseUrl,
         port: 5001,
+        databaseUrl: 'postgres://integration:integration@127.0.0.1:5432/open_mercato',
+        queueBaseDir: '/tmp/open-mercato-queue',
         logPrefix: 'integration',
         captureScreenshots: false,
       })
@@ -289,6 +310,8 @@ describe('integration cache and options', () => {
       await writeEphemeralEnvironmentState({
         baseUrl,
         port: 5001,
+        databaseUrl: 'postgres://integration:integration@127.0.0.1:5432/open_mercato',
+        queueBaseDir: '/tmp/open-mercato-queue',
         logPrefix: 'integration',
         captureScreenshots: true,
       })

package/src/lib/testing/integration.ts

@@ -138,6 +138,8 @@ type EphemeralEnvironmentState = {
   status: 'running'
   baseUrl: string
   port: number
+  databaseUrl: string
+  queueBaseDir: string
   source: string
   captureScreenshots: boolean
   startedAt: string
@@ -1168,6 +1170,8 @@ async function getPreferredPort(preferredPort: number): Promise<number> {
 export async function writeEphemeralEnvironmentState(input: {
   baseUrl: string
   port: number
+  databaseUrl: string
+  queueBaseDir: string
   logPrefix: string
   captureScreenshots: boolean
 }): Promise<void> {
@@ -1175,6 +1179,8 @@ export async function writeEphemeralEnvironmentState(input: {
     status: 'running',
     baseUrl: input.baseUrl,
     port: input.port,
+    databaseUrl: input.databaseUrl,
+    queueBaseDir: input.queueBaseDir,
     source: input.logPrefix,
     captureScreenshots: input.captureScreenshots,
     startedAt: new Date().toISOString(),
@@ -1219,6 +1225,12 @@ export async function readEphemeralEnvironmentState(): Promise<EphemeralEnvironm
   if (typeof record.port !== 'number' || !Number.isFinite(record.port) || record.port < 1) {
     return null
   }
+  if (typeof record.databaseUrl !== 'string' || record.databaseUrl.length === 0) {
+    return null
+  }
+  if (typeof record.queueBaseDir !== 'string' || record.queueBaseDir.length === 0) {
+    return null
+  }
   if (typeof record.source !== 'string' || record.source.length === 0) {
     return null
   }
@@ -1233,6 +1245,8 @@ export async function readEphemeralEnvironmentState(): Promise<EphemeralEnvironm
     status: 'running',
     baseUrl: record.baseUrl,
     port: record.port,
+    databaseUrl: record.databaseUrl,
+    queueBaseDir: record.queueBaseDir,
     source: record.source,
     captureScreenshots: record.captureScreenshots,
     startedAt: record.startedAt,
@@ -1614,9 +1628,15 @@ export async function acquireEphemeralRuntimeLock(
   }
 }
 
-function buildReusableEnvironment(baseUrl: string, captureScreenshots: boolean): NodeJS.ProcessEnv {
+function buildReusableEnvironment(
+  baseUrl: string,
+  databaseUrl: string,
+  queueBaseDir: string,
+  captureScreenshots: boolean,
+): NodeJS.ProcessEnv {
   const enterpriseModulesFlag = process.env.OM_ENABLE_ENTERPRISE_MODULES ?? 'false'
   return buildEnvironment({
+    DATABASE_URL: databaseUrl,
     BASE_URL: baseUrl,
     APP_URL: baseUrl,
     NEXT_PUBLIC_APP_URL: baseUrl,
@@ -1639,6 +1659,7 @@ function buildReusableEnvironment(baseUrl: string, captureScreenshots: boolean):
     TENANT_DATA_ENCRYPTION_FALLBACK_KEY: process.env.TENANT_DATA_ENCRYPTION_FALLBACK_KEY ?? 'om-ephemeral-integration-fallback-key',
     OM_CLI_QUIET: '1',
     MERCATO_QUIET: '1',
+    QUEUE_BASE_DIR: queueBaseDir,
     NODE_NO_WARNINGS: '1',
     PW_CAPTURE_SCREENSHOTS: captureScreenshots ? '1' : '0',
   })
@@ -1695,8 +1716,13 @@ export async function tryReuseExistingEnvironment(options: EphemeralRuntimeOptio
   return {
     baseUrl: state.baseUrl,
     port: state.port,
-    databaseUrl: '',
-    commandEnvironment: buildReusableEnvironment(state.baseUrl, state.captureScreenshots),
+    databaseUrl: state.databaseUrl,
+    commandEnvironment: buildReusableEnvironment(
+      state.baseUrl,
+      state.databaseUrl,
+      state.queueBaseDir,
+      state.captureScreenshots,
+    ),
     ownedByCurrentProcess: false,
     stop: async () => {},
   }
@@ -3030,6 +3056,8 @@ export async function startEphemeralEnvironment(options: EphemeralRuntimeOptions
       await writeEphemeralEnvironmentState({
         baseUrl: applicationBaseUrl,
         port: applicationPort,
+        databaseUrl,
+        queueBaseDir: EPHEMERAL_QUEUE_BASE_DIR,
         logPrefix: options.logPrefix,
         captureScreenshots: options.captureScreenshots,
       })