@open-mercato/starter 0.8.1-develop.7297.1.67605e74f9 → 0.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/starter",
-  "version": "0.8.1-develop.7297.1.67605e74f9",
+  "version": "0.9.0",
   "description": "One-command, cross-platform bootstrap for Open Mercato dev environments: prerequisite doctor, corporate TLS trust, idempotent setup steps, and a supervised hybrid or fully containerized stack.",
   "license": "MIT",
   "type": "module",
@@ -23,6 +23,5 @@
     "type": "git",
     "url": "https://github.com/open-mercato/open-mercato",
     "directory": "packages/starter"
-  },
-  "stableVersion": "0.8.0"
+  }
 }

package/src/__tests__/starter.test.mjs

@@ -11,7 +11,7 @@ import { DEFAULT_OPENCODE_BASE_IMAGE, DEFAULT_PORTS, resolveStackPorts } from '.
 import { addEnvValue, readEnvValue, setEnvValue } from '../env-file.mjs'
 import { ensureLlmProvider, syncProviderConfigToAppEnv } from '../providers.mjs'
 import { ensureWindowsUtf8Console, resolveSpawnCommand } from '../spawn.mjs'
-import { StepBlocked, buildToolchainStep, clearConvergenceState, databaseIsInitialized, listMigrationModules, migrationsFingerprint, probePostgresCredentials, readAppliedMigrationModules, resolveOpencodeBaseImage, runSteps } from '../steps.mjs'
+import { StepBlocked, buildToolchainStep, clearConvergenceState, databaseIsInitialized, listMigrationModules, migrationsFingerprint, probePostgresCredentials, readAppliedMigrationModules, resolveOpencodeBaseImage, runSteps, workspaceBuildStep } from '../steps.mjs'
 import { ensureEnvFiles } from '../env-setup.mjs'
 import { removeLeftoverComposeResources } from '../infra.mjs'
 import { checkBuildToolchain, defenderExclusionCovers, detectHostGateway, hostIpCandidates } from '../doctor.mjs'
@@ -360,6 +360,29 @@ test('buildToolchainStep warns instead of blocking when the workspace install al
   await assert.rejects(() => buildToolchainStep.check(ctx), (error) => error instanceof StepBlocked)
 })
 
+test('workspaceBuildStep rebuilds packages after generate, like the root yarn build', async () => {
+  const calls = []
+  await workspaceBuildStep.apply({ repoRoot: makeFakeRepo(), runYarnImpl: (_ctx, args) => calls.push(args.join(' ')) })
+  assert.deepEqual(calls, ['build:packages', 'generate', 'build:packages'])
+})
+
+test('workspaceBuildStep only converges once core dist/generated exists, not just the cli binary', async () => {
+  const repo = makeFakeRepo()
+  const ctx = { repoRoot: repo }
+  const writeArtifact = (...segments) => {
+    fs.mkdirSync(path.join(repo, ...segments.slice(0, -1)), { recursive: true })
+    fs.writeFileSync(path.join(repo, ...segments), '')
+  }
+
+  writeArtifact('packages', 'cli', 'dist', 'bin.js')
+  assert.equal((await workspaceBuildStep.check(ctx)).ok, false)
+
+  writeArtifact('packages', 'core', 'dist', 'generated', 'entities.ids.generated.js')
+  assert.equal((await workspaceBuildStep.check(ctx)).ok, true)
+
+  assert.equal((await workspaceBuildStep.check({ ...ctx, installChanged: true })).ok, false)
+})
+
 test('removeLeftoverComposeResources sweeps fixed-name containers and volumes down cannot see', () => {
   const calls = []
   const runComposeImpl = () => ({

package/src/steps.mjs

@@ -440,6 +440,11 @@ export const workspaceInstallStep = {
   },
 }
 
+const WORKSPACE_BUILD_ARTIFACTS = [
+  ['packages', 'cli', 'dist', 'bin.js'],
+  ['packages', 'core', 'dist', 'generated', 'entities.ids.generated.js'],
+]
+
 export const workspaceBuildStep = {
   id: 'workspace-build',
   expectation: '1-3 minutes on the first run, cached by turbo afterwards',
@@ -448,12 +453,18 @@ export const workspaceBuildStep = {
     // The database step shells out to the `mercato` CLI, which only exists
     // after packages are built (turbo's db:migrate task declares no build
     // dependency) — so this must converge before any DB work on a fresh clone.
-    const cliBuilt = fs.existsSync(path.join(ctx.repoRoot, 'packages', 'cli', 'dist', 'bin.js'))
-    return { ok: cliBuilt && !ctx.installChanged, detail: cliBuilt && !ctx.installChanged ? 'packages built, dependencies unchanged' : 'building (turbo caches make re-runs fast)' }
+    // core's dist/generated only exists once `generate` ran AND packages were
+    // rebuilt afterwards, so it proves the whole sequence converged.
+    const built = WORKSPACE_BUILD_ARTIFACTS.every((segments) => fs.existsSync(path.join(ctx.repoRoot, ...segments)))
+    return { ok: built && !ctx.installChanged, detail: built && !ctx.installChanged ? 'packages built, dependencies unchanged' : 'building (turbo caches make re-runs fast)' }
   },
   async apply(ctx) {
-    runYarn(ctx, ['build:packages'])
-    runYarn(ctx, ['generate'])
+    // Mirrors the root `yarn build`: core only compiles `generated/**` into
+    // dist/generated when it exists, which on a fresh clone is after `generate`.
+    const run = ctx.runYarnImpl ?? runYarn
+    run(ctx, ['build:packages'])
+    run(ctx, ['generate'])
+    run(ctx, ['build:packages'])
   },
 }