@open-mercato/cli 0.10.1-develop.7903.1.d8ab1c8b0d → 0.10.1-develop.7907.1.28240ddda3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cli",
-  "version": "0.10.1-develop.7903.1.d8ab1c8b0d",
+  "version": "0.10.1-develop.7907.1.28240ddda3",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,10 +60,10 @@
     "@mikro-orm/decorators": "^7.1.14",
     "@mikro-orm/migrations": "^7.1.14",
     "@mikro-orm/postgresql": "^7.1.14",
-    "@open-mercato/events": "0.10.1-develop.7903.1.d8ab1c8b0d",
-    "@open-mercato/queue": "0.10.1-develop.7903.1.d8ab1c8b0d",
-    "@open-mercato/shared": "0.10.1-develop.7903.1.d8ab1c8b0d",
-    "@open-mercato/telemetry": "0.10.1-develop.7903.1.d8ab1c8b0d",
+    "@open-mercato/events": "0.10.1-develop.7907.1.28240ddda3",
+    "@open-mercato/queue": "0.10.1-develop.7907.1.28240ddda3",
+    "@open-mercato/shared": "0.10.1-develop.7907.1.28240ddda3",
+    "@open-mercato/telemetry": "0.10.1-develop.7907.1.28240ddda3",
     "cross-spawn": "^7.0.6",
     "minisearch": "7.2.0",
     "pg": "8.23.0",
@@ -75,10 +75,10 @@
     "typescript-js": "npm:typescript@6.0.3"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.10.1-develop.7903.1.d8ab1c8b0d"
+    "@open-mercato/shared": "0.10.1-develop.7907.1.28240ddda3"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.10.1-develop.7903.1.d8ab1c8b0d",
+    "@open-mercato/shared": "0.10.1-develop.7907.1.28240ddda3",
     "@types/jest": "^30.0.0",
     "jest": "^30.4.2",
     "ts-jest": "^29.4.12"

package/src/__tests__/mercato.test.ts

@@ -549,6 +549,7 @@ describe('--help never triggers side effects (issue #5581)', () => {
       expect(exitCode).toBe(0)
       const printed = consoleLogSpy.mock.calls.map((call) => String(call[0])).join('\n')
       expect(printed).toContain('Usage: mercato init')
+      expect(printed).toContain('--skip-if-initialized')
 
       consoleLogSpy.mockRestore()
       consoleErrorSpy.mockRestore()
@@ -1267,6 +1268,95 @@ describe('init command failure output', () => {
   })
 })
 
+describe('init on an already initialized database', () => {
+  const originalDatabaseUrl = process.env.DATABASE_URL
+
+  beforeEach(() => {
+    jest.restoreAllMocks()
+    jest.resetModules()
+    process.env.DATABASE_URL = 'postgres://postgres:secret@db.example.com:6543/shop_a'
+  })
+
+  afterEach(() => {
+    jest.dontMock('child_process')
+    jest.dontMock('pg')
+    jest.dontMock('../lib/generators')
+    jest.dontMock('../lib/resolver')
+    jest.resetModules()
+  })
+
+  afterAll(() => {
+    process.env.DATABASE_URL = originalDatabaseUrl
+  })
+
+  function mockSeededDatabase(usersCount: string) {
+    const generateEntityIds = jest.fn().mockResolvedValue(undefined)
+    jest.doMock('child_process', () => ({ execSync: jest.fn() }))
+    jest.doMock('pg', () => ({
+      Client: jest.fn().mockImplementation(() => ({
+        connect: jest.fn().mockResolvedValue(undefined),
+        end: jest.fn().mockResolvedValue(undefined),
+        query: jest.fn().mockImplementation(async (sql: string) => {
+          if (sql.includes('pg_database')) return { rows: [{ exists: 1 }] }
+          if (sql.includes('to_regclass')) return { rows: [{ regclass: 'users' }] }
+          if (sql.includes('COUNT(*)')) return { rows: [{ count: usersCount }] }
+          return { rows: [] }
+        }),
+      })),
+    }))
+    jest.doMock('../lib/generators', () => ({
+      generateEntityIds,
+      generateModuleRegistries: jest.fn().mockResolvedValue(undefined),
+      generateModuleEntities: jest.fn().mockResolvedValue(undefined),
+      generateModuleDi: jest.fn().mockResolvedValue(undefined),
+      generateModulePackageSources: jest.fn().mockResolvedValue(undefined),
+      generateWebResearchAdapters: jest.fn().mockResolvedValue(undefined),
+      generateOpenApi: jest.fn().mockResolvedValue(undefined),
+    }))
+    jest.doMock('../lib/resolver', () => ({
+      createResolver: () => ({ getAppDir: () => '/tmp/test-app' }),
+    }))
+    return { generateEntityIds }
+  }
+
+  it('aborts without --skip-if-initialized and points at the explicit reinstall', async () => {
+    const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation()
+    const consoleLogSpy = jest.spyOn(console, 'log').mockImplementation()
+    const { generateEntityIds } = mockSeededDatabase('2')
+
+    const mercato = await import('../mercato')
+    const exitCode = await mercato.run(['node', 'mercato', 'init'])
+
+    expect(exitCode).toBe(1)
+    const errors = consoleErrorSpy.mock.calls.map((call) => String(call[0])).join('\n')
+    expect(errors).toContain('Initialization aborted: found 2 existing user(s)')
+    expect(generateEntityIds).not.toHaveBeenCalled()
+
+    consoleErrorSpy.mockRestore()
+    consoleLogSpy.mockRestore()
+  })
+
+  it('keeps the data, names the target database and exits 0 with --skip-if-initialized', async () => {
+    const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation()
+    const consoleLogSpy = jest.spyOn(console, 'log').mockImplementation()
+    const { generateEntityIds } = mockSeededDatabase('3')
+
+    const mercato = await import('../mercato')
+    const exitCode = await mercato.run(['node', 'mercato', 'init', '--skip-if-initialized'])
+
+    expect(exitCode).toBe(0)
+    const printed = consoleLogSpy.mock.calls.map((call) => String(call[0])).join('\n')
+    expect(printed).toContain('Database already initialized (3 user(s) in db.example.com:6543/shop_a)')
+    expect(printed).toContain('Check DATABASE_URL in .env')
+    expect(printed).not.toContain('secret')
+    expect(generateEntityIds).not.toHaveBeenCalled()
+    expect(consoleErrorSpy).not.toHaveBeenCalled()
+
+    consoleErrorSpy.mockRestore()
+    consoleLogSpy.mockRestore()
+  })
+})
+
 describe('seed:defaults command', () => {
   const originalDatabaseUrl = process.env.DATABASE_URL
 

package/src/lib/__tests__/init-existing-database.test.ts

@@ -0,0 +1,27 @@
+import { decideExistingDatabase, describeDatabaseTarget, formatSkipIfInitializedMessage } from '../init-existing-database'
+
+describe('init on an existing database', () => {
+  it('proceeds on an empty database regardless of the flag', () => {
+    expect(decideExistingDatabase(0, false)).toBe('proceed')
+    expect(decideExistingDatabase(0, true)).toBe('proceed')
+    expect(decideExistingDatabase(Number.NaN, true)).toBe('proceed')
+  })
+
+  it('aborts on existing users unless --skip-if-initialized is passed', () => {
+    expect(decideExistingDatabase(2, false)).toBe('abort')
+    expect(decideExistingDatabase(2, true)).toBe('skip')
+  })
+
+  it('describes the target database without credentials', () => {
+    expect(describeDatabaseTarget('postgres://postgres:secret@localhost:5432/open-mercato')).toBe('localhost:5432/open-mercato')
+    expect(describeDatabaseTarget('postgres://me:pw@db.example.com/shop%20a?sslmode=require')).toBe('db.example.com/shop a')
+    expect(describeDatabaseTarget('not a url')).toBe('the database from DATABASE_URL')
+  })
+
+  it('tells the user which database was kept and how to check it', () => {
+    const lines = formatSkipIfInitializedMessage(4, 'postgres://postgres:secret@127.0.0.1:5432/app').join('\n')
+    expect(lines).toContain('4 user(s) in 127.0.0.1:5432/app')
+    expect(lines).toContain('DATABASE_URL')
+    expect(lines).not.toContain('secret')
+  })
+})

package/src/lib/init-existing-database.ts

@@ -0,0 +1,24 @@
+export type ExistingDatabaseDecision = 'proceed' | 'skip' | 'abort'
+
+export function decideExistingDatabase(existingUsersCount: number, skipIfInitialized: boolean): ExistingDatabaseDecision {
+  if (!Number.isFinite(existingUsersCount) || existingUsersCount <= 0) return 'proceed'
+  return skipIfInitialized ? 'skip' : 'abort'
+}
+
+export function describeDatabaseTarget(databaseUrl: string): string {
+  try {
+    const url = new URL(databaseUrl)
+    const database = decodeURIComponent(url.pathname.replace(/^\/+/, '')) || '(default database)'
+    const host = url.hostname || 'localhost'
+    return `${host}${url.port ? `:${url.port}` : ''}/${database}`
+  } catch {
+    return 'the database from DATABASE_URL'
+  }
+}
+
+export function formatSkipIfInitializedMessage(existingUsersCount: number, databaseUrl: string): string[] {
+  return [
+    `✅ Database already initialized (${existingUsersCount} user(s) in ${describeDatabaseTarget(databaseUrl)}) — keeping the existing data and skipping the first-run seed.`,
+    '   Not the database you expected? Check DATABASE_URL in .env. To wipe it and seed from scratch: yarn mercato init --reinstall',
+  ]
+}

package/src/mercato.ts

@@ -10,6 +10,7 @@ import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 import { getSslConfig } from '@open-mercato/shared/lib/db/ssl'
 import { getRedisUrl, getRedisUrlOrThrow, parseRedisUrl } from '@open-mercato/shared/lib/redis/connection'
 import { resolveInitDerivedSecrets } from './lib/init-secrets'
+import { decideExistingDatabase, formatSkipIfInitializedMessage } from './lib/init-existing-database'
 import {
   resolveAutoSpawnWorkersMode,
   resolveLazySpawnMode,
@@ -956,7 +957,7 @@ export function isHelpRequest(args: string[]): boolean {
 // generic help branch. Without an entry here, `mercato init --help` runs a full install.
 const TOP_LEVEL_COMMAND_HELP: Record<string, string[]> = {
   init: [
-    'Usage: mercato init [--reinstall|-r] [--no-examples] [--no-demo-users] [--stresstest [--lite] [--count=<n>]]',
+    'Usage: mercato init [--reinstall|-r] [--skip-if-initialized] [--no-examples] [--no-demo-users] [--stresstest [--lite] [--count=<n>]]',
     'Initializes this app: installs dependencies, runs generators, applies migrations and seeds data.',
   ],
   'agentic:init': [
@@ -1029,6 +1030,7 @@ export async function run(argv = process.argv) {
       } else if (process.env.OM_INIT_REINSTALL) {
         delete process.env.OM_INIT_REINSTALL
       }
+      const skipIfInitialized = initArgs.includes('--skip-if-initialized')
       const skipExamples = initArgs.includes('--no-examples')
       const skipDemoUsers = initArgs.includes('--no-demo-users')
       const stressTestEnabled =
@@ -1182,7 +1184,12 @@ export async function run(argv = process.argv) {
               'SELECT COUNT(*)::text AS count FROM users',
             )
             const existingUsersCount = Number.parseInt(countResult.rows?.[0]?.count ?? '0', 10)
-            if (Number.isFinite(existingUsersCount) && existingUsersCount > 0) {
+            const existingDatabase = decideExistingDatabase(existingUsersCount, skipIfInitialized)
+            if (existingDatabase === 'skip') {
+              for (const line of formatSkipIfInitializedMessage(existingUsersCount, dbUrl)) console.log(line)
+              return 0
+            }
+            if (existingDatabase === 'abort') {
               console.error(
                 `❌ Initialization aborted: found ${existingUsersCount} existing user(s) in the database.`,
               )
@@ -1480,8 +1487,12 @@ export async function run(argv = process.argv) {
       console.log('╔══════════════════════════════════════════════════════════════╗')
       console.log('║  🚀 You\'re now ready to start development!                   ║')
       console.log('║                                                              ║')
-      console.log('║  Start the dev server:                                       ║')
-      console.log('║    yarn dev                                                  ║')
+      if (parseBooleanToken(process.env.OM_INIT_DEV_AUTOSTART) === true) {
+        console.log('║  The dev server is starting now (next time run: yarn dev).   ║')
+      } else {
+        console.log('║  Start the dev server:                                       ║')
+        console.log('║    yarn dev                                                  ║')
+      }
       console.log('║                                                              ║')
       console.log('║  Users created:                                              ║')
       for (const entry of createdUsers) {