@open-mercato/cli 0.4.9-develop.1038.2d16936bed → 0.4.9-develop.1045.7bcda4435a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cli",
-  "version": "0.4.9-develop.1038.2d16936bed",
+  "version": "0.4.9-develop.1045.7bcda4435a",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {
@@ -58,17 +58,17 @@
     "@mikro-orm/core": "^6.6.2",
     "@mikro-orm/migrations": "^6.6.2",
     "@mikro-orm/postgresql": "^6.6.2",
-    "@open-mercato/shared": "0.4.9-develop.1038.2d16936bed",
+    "@open-mercato/shared": "0.4.9-develop.1045.7bcda4435a",
     "pg": "8.20.0",
     "semver": "^7.7.3",
     "testcontainers": "^11.12.0",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.4.9-develop.1038.2d16936bed"
+    "@open-mercato/shared": "0.4.9-develop.1045.7bcda4435a"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.4.9-develop.1038.2d16936bed",
+    "@open-mercato/shared": "0.4.9-develop.1045.7bcda4435a",
     "@types/jest": "^30.0.0",
     "jest": "^30.2.0",
     "ts-jest": "^29.4.6"

package/src/lib/generators/module-registry.ts

@@ -12,6 +12,7 @@ import {
 import {
   scanModuleDir,
   resolveModuleFile,
+  resolveFirstModuleFile,
   SCAN_CONFIGS,
   type ModuleRoots,
   type ModuleImports,
@@ -391,6 +392,8 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
   const notificationsChecksumFile = path.join(outputDir, 'notifications.generated.checksum')
   const notificationsClientOutFile = path.join(outputDir, 'notifications.client.generated.ts')
   const notificationsClientChecksumFile = path.join(outputDir, 'notifications.client.generated.checksum')
+  const paymentsClientOutFile = path.join(outputDir, 'payments.client.generated.ts')
+  const paymentsClientChecksumFile = path.join(outputDir, 'payments.client.generated.checksum')
   const notificationHandlersOutFile = path.join(outputDir, 'notification-handlers.generated.ts')
   const notificationHandlersChecksumFile = path.join(outputDir, 'notification-handlers.generated.checksum')
   const messageTypesOutFile = path.join(outputDir, 'message-types.generated.ts')
@@ -467,6 +470,7 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
   const notificationImports: string[] = []
   const notificationClientTypes: string[] = []
   const notificationClientImports: string[] = []
+  const paymentsClientImports: string[] = []
   const notificationHandlerEntries: string[] = []
   const notificationHandlerImports: string[] = []
   const messageTypeEntries: string[] = []
@@ -636,6 +640,16 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
       configExpr: (n, id) => `{ moduleId: '${id}', types: (${n}.default ?? []) }`,
     })
 
+    {
+      const resolved = resolveFirstModuleFile(roots, imps, [
+        'widgets/payments/client.tsx',
+        'widgets/payments/client.ts',
+      ])
+      if (resolved) {
+        paymentsClientImports.push(`import '${resolved.importPath}'`)
+      }
+    }
+
     processStandaloneConfig({
       roots, imps, modId, importIdRef,
       relativePath: 'notifications.handlers.ts',
@@ -1277,6 +1291,10 @@ ${notificationHandlersImportSection ? `\n${notificationHandlersImportSection}\n`
 
 export const notificationHandlerEntries: NotificationHandlerEntry[] = [
 ${notificationHandlersEntriesLiteral ? `  ${notificationHandlersEntriesLiteral}\n` : ''}]
+`
+
+  const paymentsClientOutput = `// AUTO-GENERATED by mercato generate registry
+${paymentsClientImports.length ? paymentsClientImports.join('\n') + '\n' : '\n'}export const paymentGatewayClientModuleCount = ${paymentsClientImports.length}
 `
 
   const messageTypeEntriesLiteral = messageTypeEntries.join(',\n  ')
@@ -1489,6 +1507,7 @@ export const allAiTools = aiToolConfigEntries.flatMap(e => e.tools)
   writeGeneratedFile({ outFile: aiToolsOutFile, checksumFile: aiToolsChecksumFile, content: aiToolsOutput, structureChecksum, result, quiet })
   writeGeneratedFile({ outFile: notificationsOutFile, checksumFile: notificationsChecksumFile, content: notificationsOutput, structureChecksum, result, quiet })
   writeGeneratedFile({ outFile: notificationsClientOutFile, checksumFile: notificationsClientChecksumFile, content: notificationsClientOutput, structureChecksum, result, quiet })
+  writeGeneratedFile({ outFile: paymentsClientOutFile, checksumFile: paymentsClientChecksumFile, content: paymentsClientOutput, structureChecksum, result, quiet })
   writeGeneratedFile({ outFile: notificationHandlersOutFile, checksumFile: notificationHandlersChecksumFile, content: notificationHandlersOutput, structureChecksum, result, quiet })
   writeGeneratedFile({ outFile: messageTypesOutFile, checksumFile: messageTypesChecksumFile, content: messageTypesOutput, structureChecksum, result, quiet })
   writeGeneratedFile({ outFile: messageObjectsOutFile, checksumFile: messageObjectsChecksumFile, content: messageObjectsOutput, structureChecksum, result, quiet })

package/src/lib/generators/scanner.ts

@@ -153,7 +153,19 @@ export function resolveModuleFile(
 
   const fromApp = hasApp
   const absolutePath = fromApp ? appFile : pkgFile
-  const importSuffix = relativePath.replace(/\.ts$/, '')
+  const importSuffix = relativePath.replace(/\.tsx?$/, '')
   const importPath = `${fromApp ? imps.appBase : imps.pkgBase}/${importSuffix}`
   return { absolutePath, fromApp, importPath }
 }
+
+export function resolveFirstModuleFile(
+  roots: ModuleRoots,
+  imps: ModuleImports,
+  relativePaths: string[],
+): ResolvedFile | null {
+  for (const relativePath of relativePaths) {
+    const resolved = resolveModuleFile(roots, imps, relativePath)
+    if (resolved) return resolved
+  }
+  return null
+}

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

@@ -20,6 +20,7 @@ import {
 
 const CACHE_TTL_ENV_VAR = 'OM_INTEGRATION_BUILD_CACHE_TTL_SECONDS'
 const APP_READY_TIMEOUT_ENV_VAR = 'OM_INTEGRATION_APP_READY_TIMEOUT_SECONDS'
+const CHECKOUT_TEST_INJECTION_FLAG = 'NEXT_PUBLIC_OM_EXAMPLE_CHECKOUT_TEST_INJECTIONS_ENABLED'
 const resolver = createResolver()
 const projectRootDirectory = resolver.getRootDir()
 
@@ -39,6 +40,7 @@ describe('integration cache and options', () => {
   const ephemeralLegacyEnvFilePath = path.join(projectRootDirectory, '.ai', 'qa', 'ephemeral-env.md')
   const originalCacheTtl = process.env[CACHE_TTL_ENV_VAR]
   const originalAppReadyTimeout = process.env[APP_READY_TIMEOUT_ENV_VAR]
+  const originalCheckoutTestInjectionFlag = process.env[CHECKOUT_TEST_INJECTION_FLAG]
   let originalEphemeralEnvState: string | null = null
   let originalEphemeralLegacyEnvState: string | null = null
 
@@ -69,11 +71,17 @@ describe('integration cache and options', () => {
     } else {
       process.env[APP_READY_TIMEOUT_ENV_VAR] = originalAppReadyTimeout
     }
+    if (originalCheckoutTestInjectionFlag === undefined) {
+      delete process.env[CHECKOUT_TEST_INJECTION_FLAG]
+    } else {
+      process.env[CHECKOUT_TEST_INJECTION_FLAG] = originalCheckoutTestInjectionFlag
+    }
     await restoreEphemeralStateFiles(originalEphemeralEnvState, originalEphemeralLegacyEnvState)
   })
 
   it('reuses an existing reachable ephemeral environment state', async () => {
     const baseUrl = 'http://127.0.0.1:5001'
+    delete process.env[CHECKOUT_TEST_INJECTION_FLAG]
     const fetchSpy = jest.spyOn(global, 'fetch').mockImplementation(async (input) => {
       const url = typeof input === 'string' ? input : String(input)
       if (url.endsWith('/api/auth/login')) {
@@ -116,6 +124,49 @@ describe('integration cache and options', () => {
         ownedByCurrentProcess: false,
       })
       expect(environment?.commandEnvironment.PW_CAPTURE_SCREENSHOTS).toBe('1')
+      expect(environment?.commandEnvironment.NEXT_PUBLIC_OM_EXAMPLE_CHECKOUT_TEST_INJECTIONS_ENABLED).toBeUndefined()
+    } finally {
+      fetchSpy.mockRestore()
+    }
+  }, 20000)
+
+  it('reuses an existing environment with checkout wrapper injections only when explicitly enabled', async () => {
+    const baseUrl = 'http://127.0.0.1:5001'
+    process.env[CHECKOUT_TEST_INJECTION_FLAG] = 'true'
+    const fetchSpy = jest.spyOn(global, 'fetch').mockImplementation(async (input) => {
+      const url = typeof input === 'string' ? input : String(input)
+      if (url.endsWith('/api/auth/login')) {
+        return { status: 401, text: async () => '' } as unknown as Response
+      }
+      if (url.endsWith('/login')) {
+        return {
+          status: 200,
+          text: async () => '<!doctype html><script src="/_next/static/chunks/app-healthcheck.js"></script>',
+        } as unknown as Response
+      }
+      if (url.includes('/_next/static/chunks/app-healthcheck.js')) {
+        return { status: 200, text: async () => '' } as unknown as Response
+      }
+      return { status: 200, text: async () => '' } as unknown as Response
+    })
+
+    try {
+      await writeEphemeralEnvironmentState({
+        baseUrl,
+        port: 5001,
+        logPrefix: 'integration',
+        captureScreenshots: true,
+      })
+
+      const environment = await tryReuseExistingEnvironment({
+        verbose: false,
+        captureScreenshots: true,
+        logPrefix: 'integration',
+        forceRebuild: false,
+      })
+
+      expect(environment).not.toBeNull()
+      expect(environment?.commandEnvironment.NEXT_PUBLIC_OM_EXAMPLE_CHECKOUT_TEST_INJECTIONS_ENABLED).toBe('true')
     } finally {
       fetchSpy.mockRestore()
     }

package/src/lib/testing/integration.ts

@@ -1357,6 +1357,8 @@ async function clearStaleEphemeralEnvironmentLock(logPrefix: string): Promise<bo
 function buildReusableEnvironment(baseUrl: string, captureScreenshots: boolean): NodeJS.ProcessEnv {
   return buildEnvironment({
     BASE_URL: baseUrl,
+    APP_URL: baseUrl,
+    NEXT_PUBLIC_APP_URL: baseUrl,
     NODE_ENV: 'production',
     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',
@@ -2572,6 +2574,8 @@ export async function startEphemeralEnvironment(options: EphemeralRuntimeOptions
     const commandEnvironment = buildEnvironment({
       DATABASE_URL: databaseUrl,
       BASE_URL: applicationBaseUrl,
+      APP_URL: applicationBaseUrl,
+      NEXT_PUBLIC_APP_URL: applicationBaseUrl,
       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',