@open-mercato/cli 0.6.2-develop.3461.1.605f31c2c9 → 0.6.2

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 () => {},
   }
@@ -2880,10 +2906,19 @@ export async function startEphemeralEnvironment(options: EphemeralRuntimeOptions
       JWT_SECRET: process.env.JWT_SECRET ?? 'om-ephemeral-integration-jwt-secret',
       OM_SECURITY_MFA_SETUP_SECRET: process.env.OM_SECURITY_MFA_SETUP_SECRET ?? 'om-ephemeral-integration-mfa-setup-secret',
       NODE_ENV: 'production',
-      DB_POOL_MIN: '0',
-      DB_POOL_MAX: '5',
-      DB_POOL_IDLE_TIMEOUT: '1000',
-      DB_POOL_ACQUIRE_TIMEOUT: '10000',
+      // Pool sizing for the ephemeral integration runtime. Defaults were once
+      // very aggressive (max=5, idle=1000) which exposed flaky 'timeout exceeded
+      // when trying to connect' errors on `progressService.createJob`-backed
+      // endpoints (sync_excel.import, data_sync.run, progress.jobs) — each
+      // request acquires a transaction connection plus a separate connection
+      // for the encryption subscriber's fetchMap probe, and with 1s idle close
+      // the pool thrashes faster than pg-pool can repopulate. These values
+      // still keep the pool tighter than production but give enough headroom
+      // for the legitimate query bursts.
+      DB_POOL_MIN: '2',
+      DB_POOL_MAX: '20',
+      DB_POOL_IDLE_TIMEOUT: '10000',
+      DB_POOL_ACQUIRE_TIMEOUT: '15000',
       DB_IDLE_SESSION_TIMEOUT_MS: '30000',
       DB_IDLE_IN_TRANSACTION_TIMEOUT_MS: '30000',
       OM_INTEGRATION_TEST: 'true',
@@ -3030,6 +3065,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,
       })