@open-mercato/cli 0.6.6-develop.6431.1.g1037269810 → 0.6.6-develop.6451.1.5b071f47fc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cli",
-  "version": "0.6.6-develop.6431.1.g1037269810",
+  "version": "0.6.6-develop.6451.1.5b071f47fc",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,8 +60,8 @@
     "@mikro-orm/decorators": "^7.1.5",
     "@mikro-orm/migrations": "^7.1.5",
     "@mikro-orm/postgresql": "^7.1.5",
-    "@open-mercato/queue": "0.6.6-develop.6431.1.g1037269810",
-    "@open-mercato/shared": "0.6.6-develop.6431.1.g1037269810",
+    "@open-mercato/queue": "0.6.6-develop.6451.1.5b071f47fc",
+    "@open-mercato/shared": "0.6.6-develop.6451.1.5b071f47fc",
     "cross-spawn": "^7.0.6",
     "pg": "8.22.0",
     "semver": "^7.8.5",
@@ -71,10 +71,10 @@
     "typescript": "^6.0.3"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.6-develop.6431.1.g1037269810"
+    "@open-mercato/shared": "0.6.6-develop.6451.1.5b071f47fc"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.6-develop.6431.1.g1037269810",
+    "@open-mercato/shared": "0.6.6-develop.6451.1.5b071f47fc",
     "@types/jest": "^30.0.0",
     "jest": "^30.4.2",
     "ts-jest": "^29.4.11"

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

@@ -27,8 +27,11 @@ import type { ChildProcess } from 'node:child_process'
 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 PRIVATE_ATTACHMENTS_PARTITION_ENV_KEY = 'ATTACHMENTS_PARTITION_PRIVATE_ATTACHMENTS_ROOT'
 const resolver = createResolver()
 const projectRootDirectory = resolver.getRootDir()
+const appDirectory = path.join(projectRootDirectory, 'apps', 'mercato')
+const defaultPrivateAttachmentsRoot = path.join(appDirectory, 'storage', 'attachments', 'privateAttachments')
 
 const mockHealthyReadinessFetch = (
   overrides: {
@@ -169,6 +172,7 @@ describe('integration cache and options', () => {
         'postgres://integration:integration@127.0.0.1:5432/open_mercato',
       )
       expect(environment?.commandEnvironment.QUEUE_BASE_DIR).toBe('/tmp/open-mercato-queue')
+      expect(environment?.commandEnvironment[PRIVATE_ATTACHMENTS_PARTITION_ENV_KEY]).toBe(defaultPrivateAttachmentsRoot)
       expect(environment?.commandEnvironment.PW_CAPTURE_SCREENSHOTS).toBe('1')
       expect(environment?.commandEnvironment.NEXT_PUBLIC_OM_EXAMPLE_CHECKOUT_TEST_INJECTIONS_ENABLED).toBeUndefined()
     } finally {
@@ -206,6 +210,43 @@ describe('integration cache and options', () => {
     }
   }, REUSE_ENV_TEST_TIMEOUT_MS)
 
+  it('reuses app-local private attachment storage when queue state points at an app root', async () => {
+    const baseUrl = 'http://127.0.0.1:5001'
+    const appRoot = await mkdtemp(path.join(os.tmpdir(), 'om-integration-app-root-'))
+    const queueBaseDir = path.join(appRoot, '.mercato', 'queue')
+    const fetchSpy = mockHealthyReadinessFetch()
+
+    try {
+      await mkdir(path.join(appRoot, 'src'), { recursive: true })
+      await writeFile(path.join(appRoot, 'package.json'), '{"name":"integration-test-app"}\n', 'utf8')
+      await writeFile(path.join(appRoot, 'src', 'modules.ts'), 'export const enabledModules = []\n', 'utf8')
+
+      await writeEphemeralEnvironmentState({
+        baseUrl,
+        port: 5001,
+        databaseUrl: 'postgres://integration:integration@127.0.0.1:5432/open_mercato',
+        queueBaseDir,
+        logPrefix: 'integration',
+        captureScreenshots: false,
+      })
+
+      const environment = await tryReuseExistingEnvironment({
+        verbose: false,
+        captureScreenshots: false,
+        logPrefix: 'integration',
+        forceRebuild: false,
+      })
+
+      expect(environment).not.toBeNull()
+      expect(environment?.commandEnvironment[PRIVATE_ATTACHMENTS_PARTITION_ENV_KEY]).toBe(
+        path.join(appRoot, 'storage', 'attachments', 'privateAttachments'),
+      )
+    } finally {
+      fetchSpy.mockRestore()
+      await rm(appRoot, { recursive: true, force: true })
+    }
+  }, 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'
     const fetchSpy = mockHealthyReadinessFetch({

package/src/lib/testing/integration.ts

@@ -221,6 +221,32 @@ function collectExistingPaths(candidates: Array<string | null | undefined>): str
   return Array.from(collected)
 }
 
+function isLikelyNextAppDirectory(candidate: string): boolean {
+  if (!existsSync(path.join(candidate, 'package.json'))) {
+    return false
+  }
+  return resolveFirstExistingPath(
+    path.join(candidate, 'next.config.ts'),
+    path.join(candidate, 'next.config.js'),
+    path.join(candidate, 'next.config.mjs'),
+    path.join(candidate, 'src', 'modules.ts'),
+  ) !== null
+}
+
+function resolveDefaultPrivateAttachmentsAppDirectory(): string {
+  const candidates = [
+    appDirectory,
+    path.join(projectRootDirectory, 'apps', 'mercato'),
+    path.join(projectRootDirectory, 'apps', 'app'),
+  ]
+  for (const candidate of candidates) {
+    if (isLikelyNextAppDirectory(candidate)) {
+      return candidate
+    }
+  }
+  return appDirectory
+}
+
 function readPackageScripts(packageRoot: string): Record<string, string> {
   try {
     const raw = JSON.parse(readFileSync(path.join(packageRoot, 'package.json'), 'utf8')) as {
@@ -246,6 +272,13 @@ const LEGACY_EPHEMERAL_ENV_FILE_PATH = path.join(projectRootDirectory, '.ai', 'q
 const EPHEMERAL_BUILD_CACHE_STATE_PATH = path.join(projectRootDirectory, '.ai', 'qa', 'ephemeral-build-cache.json')
 const EPHEMERAL_CACHE_DB_PATH = path.join(projectRootDirectory, '.ai', 'qa', 'ephemeral-cache.sqlite')
 const EPHEMERAL_QUEUE_BASE_DIR = path.join(appDirectory, '.mercato', 'queue')
+const PRIVATE_ATTACHMENTS_PARTITION_ENV_KEY = 'ATTACHMENTS_PARTITION_PRIVATE_ATTACHMENTS_ROOT'
+const EPHEMERAL_PRIVATE_ATTACHMENTS_ROOT = path.join(
+  resolveDefaultPrivateAttachmentsAppDirectory(),
+  'storage',
+  'attachments',
+  'privateAttachments',
+)
 const PLAYWRIGHT_INTEGRATION_CONFIG_PATH = '.ai/qa/tests/playwright.config.ts'
 const PLAYWRIGHT_RESULTS_JSON_PATH = path.join(projectRootDirectory, '.ai', 'qa', 'test-results', 'results.json')
 const LEGACY_INTEGRATION_TEST_ROOT = path.join(projectRootDirectory, '.ai', 'qa', 'tests')
@@ -1677,6 +1710,7 @@ function buildReusableEnvironment(
   captureScreenshots: boolean,
 ): NodeJS.ProcessEnv {
   const enterpriseModulesFlag = process.env.OM_ENABLE_ENTERPRISE_MODULES ?? 'false'
+  const privateAttachmentsRoot = resolvePrivateAttachmentsRootForQueueBaseDir(queueBaseDir)
   return buildEnvironment({
     DATABASE_URL: databaseUrl,
     BASE_URL: baseUrl,
@@ -1721,11 +1755,25 @@ function buildReusableEnvironment(
     OM_CLI_QUIET: '1',
     MERCATO_QUIET: '1',
     QUEUE_BASE_DIR: queueBaseDir,
+    [PRIVATE_ATTACHMENTS_PARTITION_ENV_KEY]:
+      process.env[PRIVATE_ATTACHMENTS_PARTITION_ENV_KEY] ?? privateAttachmentsRoot,
     NODE_NO_WARNINGS: '1',
     PW_CAPTURE_SCREENSHOTS: captureScreenshots ? '1' : '0',
   })
 }
 
+function resolvePrivateAttachmentsRootForQueueBaseDir(queueBaseDir: string): string {
+  const resolvedQueueBaseDir = path.resolve(queueBaseDir)
+  const queueParent = path.dirname(resolvedQueueBaseDir)
+  if (path.basename(resolvedQueueBaseDir) === 'queue' && path.basename(queueParent) === '.mercato') {
+    const queueAppDirectory = path.dirname(queueParent)
+    if (isLikelyNextAppDirectory(queueAppDirectory)) {
+      return path.join(queueAppDirectory, 'storage', 'attachments', 'privateAttachments')
+    }
+  }
+  return EPHEMERAL_PRIVATE_ATTACHMENTS_ROOT
+}
+
 export async function tryReuseExistingEnvironment(options: EphemeralRuntimeOptions): Promise<EphemeralEnvironmentHandle | null> {
   const state = await readEphemeralEnvironmentState()
   if (!state) {
@@ -3071,6 +3119,8 @@ export async function startEphemeralEnvironment(options: EphemeralRuntimeOptions
       OM_CLI_QUIET: '1',
       MERCATO_QUIET: '1',
       QUEUE_BASE_DIR: EPHEMERAL_QUEUE_BASE_DIR,
+      [PRIVATE_ATTACHMENTS_PARTITION_ENV_KEY]:
+        process.env[PRIVATE_ATTACHMENTS_PARTITION_ENV_KEY] ?? EPHEMERAL_PRIVATE_ATTACHMENTS_ROOT,
       NODE_NO_WARNINGS: '1',
       PORT: String(applicationPort),
       PW_CAPTURE_SCREENSHOTS: options.captureScreenshots ? '1' : '0',