create-mercato-app 0.5.1-develop.2744.9c8be0dd93 → 0.5.1-develop.2762.90c271efe2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-mercato-app",
-  "version": "0.5.1-develop.2744.9c8be0dd93",
+  "version": "0.5.1-develop.2762.90c271efe2",
   "type": "module",
   "description": "Create a new Open Mercato application",
   "main": "./dist/index.js",

package/template/.env.example

@@ -178,10 +178,10 @@ CACHE_TTL=300000
 #CACHE_REDIS_URL=redis://localhost:6379
 
 # SQLite configuration (for sqlite strategy)
-CACHE_SQLITE_PATH=./data/cache.db
+CACHE_SQLITE_PATH=./.mercato/cache/cache.db
 
 # JSON file configuration (for jsonfile strategy)
-#CACHE_JSON_FILE_PATH=./data/cache.json
+#CACHE_JSON_FILE_PATH=./.mercato/cache/cache.json
 
 # Database pooling settings
 DB_POOL_MIN=5

package/template/scripts/dev-runtime.mjs

@@ -55,9 +55,9 @@ const {
   stripAnsi,
   wrapListLines,
 } = await import(resolveSplashHelpersImport())
-const { resolveSpawnCommand } = await import(resolveSpawnUtilsImport())
+const { resolveProjectBinary, resolveSpawnCommand } = await import(resolveSpawnUtilsImport())
 
-const command = process.platform === 'win32' ? 'mercato.cmd' : 'mercato'
+const command = resolveProjectBinary(process.platform === 'win32' ? 'mercato.cmd' : 'mercato')
 const classic = process.argv.includes('--classic') || isEnabledEnvFlag(process.env.OM_DEV_CLASSIC)
 const verbose = !classic && (process.argv.includes('--verbose') || process.env.MERCATO_DEV_OUTPUT === 'verbose')
 const rawPassthrough = classic || verbose
@@ -412,10 +412,10 @@ function spawnMercato(args) {
   return child
 }
 
-function waitForExit(child) {
+function waitForExit(child, label = 'Child process') {
   return new Promise((resolve) => {
     child.on('exit', (code, signal) => {
-      resolve({ code, signal })
+      resolve({ label, code, signal })
     })
   })
 }
@@ -441,6 +441,32 @@ function resolveChildExitCode(result, fallback = 1) {
   return fallback
 }
 
+function formatChildExitStatus(result) {
+  if (typeof result?.code === 'number') {
+    return `exit code ${result.code}`
+  }
+  if (result?.signal) {
+    return `signal ${result.signal}`
+  }
+  return 'an unknown status'
+}
+
+function resolveUnexpectedExitCode(result) {
+  const exitCode = resolveChildExitCode(result, 1)
+  return exitCode === 0 ? 1 : exitCode
+}
+
+function reportUnexpectedChildExit(result) {
+  const message = `❌ ${result?.label ?? 'Child process'} exited unexpectedly with ${formatChildExitStatus(result)}`
+  console.error(message)
+  rememberRawLog(message)
+  publishRuntimeFailure(message, {
+    progressCurrent: splashState.progressCurrent >= runtimeProgressCurrent ? splashState.progressCurrent : runtimeProgressCurrent,
+    progressLabel: splashState.progressLabel || startupProgress.label,
+    failureLines: [...collectRuntimeFailureLines(), message].slice(-10),
+  })
+}
+
 function joinBaseUrl(baseUrl, pathname) {
   return `${String(baseUrl ?? '').replace(/\/$/, '')}${pathname}`
 }
@@ -1521,12 +1547,16 @@ async function runClassicRuntime() {
 
   const watch = spawnMercato(['generate', 'watch', '--skip-initial'])
   const server = spawnMercato(['server', 'dev'])
-  const result = await Promise.race([waitForExit(watch), waitForExit(server)])
+  const result = await Promise.race([
+    waitForExit(watch, 'Generator watch'),
+    waitForExit(server, 'App runtime'),
+  ])
   if (isGracefulShutdownResult(result)) {
     return
   }
 
-  shutdown(resolveChildExitCode(result, 0))
+  reportUnexpectedChildExit(result)
+  shutdown(resolveUnexpectedExitCode(result))
 }
 
 if (classic) {
@@ -1541,7 +1571,11 @@ printRuntimePackagesSummary()
 const watch = startFilteredChild(['generate', 'watch', '--skip-initial'], 'Generator watch', classifyWatchLine)
 const server = startFilteredChild(['server', 'dev'], 'App runtime', classifyServerLine)
 
-const result = await Promise.race([waitForExit(watch), waitForExit(server)])
+const result = await Promise.race([
+  waitForExit(watch, 'Generator watch'),
+  waitForExit(server, 'App runtime'),
+])
 if (!isGracefulShutdownResult(result)) {
-  shutdown(resolveChildExitCode(result, 0))
+  reportUnexpectedChildExit(result)
+  shutdown(resolveUnexpectedExitCode(result))
 }

package/template/scripts/dev-spawn-utils.mjs

@@ -1,3 +1,6 @@
+import fs from 'node:fs'
+import path from 'node:path'
+
 function isWindowsCmdScript(command, platform = process.platform) {
   return platform === 'win32' && /\.(cmd|bat)$/i.test(String(command))
 }
@@ -23,6 +26,34 @@ function assertWindowsCmdSafeValue(value, label) {
   return stringValue
 }
 
+export function resolveProjectBinary(command, options = {}) {
+  const safeCommand = assertProcessSafeValue(command, 'Process command')
+  const cwd = options.cwd ?? process.cwd()
+  const platform = options.platform ?? process.platform
+
+  if (path.isAbsolute(safeCommand) || safeCommand.includes('/') || safeCommand.includes('\\')) {
+    return safeCommand
+  }
+
+  const binDir = path.join(cwd, 'node_modules', '.bin')
+  const candidates = platform === 'win32'
+    ? [
+        path.join(binDir, safeCommand),
+        path.join(binDir, `${safeCommand}.cmd`),
+        path.join(binDir, `${safeCommand}.bat`),
+        path.join(binDir, `${safeCommand}.exe`),
+      ]
+    : [path.join(binDir, safeCommand)]
+
+  for (const candidate of candidates) {
+    if (fs.existsSync(candidate)) {
+      return candidate
+    }
+  }
+
+  return safeCommand
+}
+
 export function resolveSpawnCommand(command, commandArgs = [], options = {}) {
   const platform = options.platform ?? process.platform
   const safeCommand = assertProcessSafeValue(command, 'Process command')

package/template/scripts/setup.mjs

@@ -1,7 +1,17 @@
 import { spawnSync } from 'node:child_process'
+import { existsSync } from 'node:fs'
 
 const reinstall = process.argv.includes('--reinstall')
 const classic = process.argv.includes('--classic')
+
+if (!existsSync('node_modules/cross-spawn')) {
+  const bootstrap = spawnSync('yarn', ['install'], {
+    stdio: 'inherit',
+    shell: process.platform === 'win32',
+  })
+  if (bootstrap.status !== 0) process.exit(bootstrap.status ?? 1)
+}
+
 const result = spawnSync(
   process.execPath,
   ['./scripts/dev.mjs', '--setup', ...(reinstall ? ['--reinstall'] : []), ...(classic ? ['--classic'] : [])],

package/template/src/modules/example/commands/todos.ts

@@ -27,13 +27,13 @@ import {
 
 export const todoCreateSchema = z.object({
   id: z.string().uuid().optional(),
-  title: z.string().min(1),
+  title: z.string().min(1).max(200),
   is_done: z.boolean().optional(),
 })
 
 export const todoUpdateSchema = z.object({
   id: z.string().uuid(),
-  title: z.string().min(1).optional(),
+  title: z.string().min(1).max(200).optional(),
   is_done: z.boolean().optional(),
 })
 

package/template/src/modules/example_customers_sync/api/example-customers-sync/mappings/route.ts

@@ -24,11 +24,11 @@ type MappingRow = {
   interaction_id: string
   todo_id: string
   sync_status: string
-  last_synced_at: Date | null
+  last_synced_at: Date | string | null
   last_error: string | null
-  source_updated_at: Date | null
-  created_at: Date
-  updated_at: Date
+  source_updated_at: Date | string | null
+  created_at: Date | string
+  updated_at: Date | string
   organization_id: string
   tenant_id: string
 }
@@ -53,6 +53,15 @@ function decodeCursor(token: string | undefined): CursorPayload | null {
   }
 }
 
+function toIsoString(value: Date | string | null | undefined): string | null {
+  if (!value) return null
+  if (value instanceof Date) {
+    return Number.isNaN(value.getTime()) ? null : value.toISOString()
+  }
+  const parsed = new Date(value)
+  return Number.isNaN(parsed.getTime()) ? null : parsed.toISOString()
+}
+
 export async function GET(request: Request) {
   const { translate } = await resolveTranslations()
   try {
@@ -163,11 +172,11 @@ export async function GET(request: Request) {
         interactionId: row.interaction_id,
         todoId: row.todo_id,
         syncStatus: row.sync_status,
-        lastSyncedAt: row.last_synced_at?.toISOString() ?? null,
+        lastSyncedAt: toIsoString(row.last_synced_at),
         lastError: row.last_error ?? null,
-        sourceUpdatedAt: row.source_updated_at?.toISOString() ?? null,
-        createdAt: row.created_at.toISOString(),
-        updatedAt: row.updated_at.toISOString(),
+        sourceUpdatedAt: toIsoString(row.source_updated_at),
+        createdAt: toIsoString(row.created_at),
+        updatedAt: toIsoString(row.updated_at),
         organizationId: row.organization_id,
         tenantId: row.tenant_id,
         exampleHref: `/backend/todos/${encodeURIComponent(row.todo_id)}/edit`,
@@ -186,7 +195,7 @@ export async function GET(request: Request) {
 
     return NextResponse.json({
       items,
-      ...(last ? { nextCursor: encodeCursor({ updatedAt: last.updated_at.toISOString(), id: last.id }) } : {}),
+      ...(last ? { nextCursor: encodeCursor({ updatedAt: toIsoString(last.updated_at) ?? new Date(0).toISOString(), id: last.id }) } : {}),
     })
   } catch (error) {
     if (error instanceof z.ZodError) {

package/template/src/modules/example_customers_sync/lib/sync.ts

@@ -1,6 +1,8 @@
+import { setTimeout as sleep } from 'node:timers/promises'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { type Kysely } from 'kysely'
 import type { CommandBus } from '@open-mercato/shared/lib/commands'
+import '@open-mercato/core/modules/customers/commands/index'
 import { loadCustomFieldSnapshot } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
@@ -66,7 +68,7 @@ type LegacyExampleTodoLinkRow = {
   entityId: string
   todoId: string
   createdByUserId: string | null
-  createdAt: Date
+  createdAt: Date | string
 }
 
 export type ExampleCustomersSyncReconcileItem = {
@@ -92,6 +94,8 @@ type CursorPayload = {
 }
 
 const DEFAULT_TASK_TITLE = 'Untitled task'
+const LEGACY_INBOUND_BOOTSTRAP_ATTEMPTS = 10
+const LEGACY_INBOUND_BOOTSTRAP_DELAY_MS = 100
 
 function isSyncOriginFromBridge(syncOrigin: unknown): boolean {
   return typeof syncOrigin === 'string' && syncOrigin.startsWith('example_customers_sync:')
@@ -110,6 +114,10 @@ function parseDateOrNull(value: string | Date | null | undefined): Date | null {
   return Number.isNaN(parsed.getTime()) ? null : parsed
 }
 
+function toIsoString(value: Date | string | null | undefined): string | null {
+  return parseDateOrNull(value)?.toISOString() ?? null
+}
+
 function trimErrorMessage(value: unknown): string {
   const message = value instanceof Error ? value.message : String(value ?? 'Unknown sync error')
   return message.length > 2000 ? `${message.slice(0, 1997)}...` : message
@@ -394,6 +402,38 @@ async function loadLegacyExampleTodoLinkRow(
   }
 }
 
+async function waitForLegacyExampleTodoLinkRow(
+  em: EntityManager,
+  scope: ExampleCustomersSyncScope,
+  todoId: string,
+): Promise<LegacyExampleTodoLinkRow | null> {
+  for (let attempt = 0; attempt < LEGACY_INBOUND_BOOTSTRAP_ATTEMPTS; attempt += 1) {
+    const link = await loadLegacyExampleTodoLinkRow(em, scope, todoId)
+    if (link) return link
+    if (attempt < LEGACY_INBOUND_BOOTSTRAP_ATTEMPTS - 1) {
+      await sleep(LEGACY_INBOUND_BOOTSTRAP_DELAY_MS)
+      em.clear()
+    }
+  }
+  return null
+}
+
+async function waitForExampleTodoSnapshot(
+  em: EntityManager,
+  scope: ExampleCustomersSyncScope,
+  todoId: string,
+): Promise<ExampleTodoSnapshot | null> {
+  for (let attempt = 0; attempt < LEGACY_INBOUND_BOOTSTRAP_ATTEMPTS; attempt += 1) {
+    const todo = await loadExampleTodoSnapshot(em, scope, todoId)
+    if (todo) return todo
+    if (attempt < LEGACY_INBOUND_BOOTSTRAP_ATTEMPTS - 1) {
+      await sleep(LEGACY_INBOUND_BOOTSTRAP_DELAY_MS)
+      em.clear()
+    }
+  }
+  return null
+}
+
 async function ensureLegacyExampleMapping(
   em: EntityManager,
   scope: ExampleCustomersSyncScope,
@@ -416,7 +456,7 @@ async function ensureLegacyExampleMapping(
     ...scope,
     interactionId,
     todoId: legacyLink.todoId,
-    sourceUpdatedAt: legacyLink.createdAt ?? null,
+    sourceUpdatedAt: parseDateOrNull(legacyLink.createdAt),
   })
 }
 
@@ -755,7 +795,7 @@ async function loadLegacyExampleTodoLinks(
   const next = rows.length > limit ? pageRows[pageRows.length - 1] : null
   return {
     rows: pageRows,
-    ...(next ? { nextCursor: encodeCursor({ createdAt: next.createdAt.toISOString(), id: next.id }) } : {}),
+    ...(next ? { nextCursor: encodeCursor({ createdAt: toIsoString(next.createdAt) ?? new Date(0).toISOString(), id: next.id }) } : {}),
   }
 }
 
@@ -781,14 +821,14 @@ async function ensureCanonicalInteractionForLegacyLink(
     return { interactionId: existing.id, created: false }
   }
 
-  const todo = await loadExampleTodoSnapshot(em, scope, link.todoId)
+  const todo = await waitForExampleTodoSnapshot(em, scope, link.todoId)
   if (!todo) return null
 
   const patch = buildInteractionUpdateFromExampleTodo({
     title: todo.title,
     isDone: todo.isDone,
     customValues: todo.customValues,
-    occurredAt: todo.isDone ? (todo.updatedAt ?? link.createdAt) : null,
+    occurredAt: todo.isDone ? parseDateOrNull(todo.updatedAt ?? link.createdAt) : null,
   })
 
   const commandBus = container.resolve('commandBus') as CommandBus
@@ -801,6 +841,8 @@ async function ensureCanonicalInteractionForLegacyLink(
     const result = await commandBus.execute<Record<string, unknown>, { interactionId: string }>('customers.interactions.create', {
       input: {
         id: link.todoId,
+        tenantId: scope.tenantId,
+        organizationId: scope.organizationId,
         entityId: link.entityId,
         interactionType: CUSTOMER_INTERACTION_TASK_TYPE,
         title: patch.title,
@@ -840,16 +882,16 @@ async function ensureMappingForLegacyExampleTodo(
   todoId: string,
 ): Promise<ExampleCustomerInteractionMapping | null> {
   const em = (container.resolve('em') as EntityManager).fork()
-  const legacyLink = await loadLegacyExampleTodoLinkRow(em, scope, todoId)
+  const legacyLink = await waitForLegacyExampleTodoLinkRow(em, scope, todoId)
   if (!legacyLink) return null
   const canonical = await ensureCanonicalInteractionForLegacyLink(container, scope, legacyLink)
   if (!canonical) return null
-  const todo = await loadExampleTodoSnapshot(em, scope, todoId)
+  const todo = await waitForExampleTodoSnapshot(em, scope, todoId)
   return await updateMappingAfterSync(em, {
     ...scope,
     interactionId: canonical.interactionId,
     todoId,
-    sourceUpdatedAt: todo?.updatedAt ?? legacyLink.createdAt,
+    sourceUpdatedAt: parseDateOrNull(todo?.updatedAt ?? legacyLink.createdAt),
   })
 }
 
@@ -888,7 +930,7 @@ export async function reconcileLegacyExampleTodoLinks(
         ...scope,
         interactionId: canonical.interactionId,
         todoId: row.todoId,
-        sourceUpdatedAt: todo?.updatedAt ?? row.createdAt,
+        sourceUpdatedAt: parseDateOrNull(todo?.updatedAt ?? row.createdAt),
       })
       items.push({
         linkId: row.id,