@prisma-next/cli 0.5.0-dev.9 → 0.5.0

package/src/commands/db-init.ts

@@ -13,6 +13,7 @@ import {
 } from '../utils/cli-errors';
 import type { MigrationCommandOptions } from '../utils/command-helpers';
 import {
+  resolveMigrationPaths,
   sanitizeErrorMessage,
   setCommandDescriptions,
   setCommandExamples,
@@ -111,14 +112,23 @@ async function executeDbInitCommand(
   if (!ctxResult.ok) {
     return ctxResult;
   }
-  const { client, contractJson, dbConnection, onProgress, contractPathAbsolute } = ctxResult.value;
+  const { client, config, contractJson, dbConnection, onProgress, contractPathAbsolute } =
+    ctxResult.value;
+
+  // The aggregate loader (loader → planner → runner pipeline) catches
+  // layout / drift / disjointness violations on its own; the legacy
+  // per-space precheck + marker-check helpers are no longer needed at
+  // this surface. Marker-vs-on-disk drift surfaces through the planner's
+  // graph-walk strategy.
+  const { migrationsDir } = resolveMigrationPaths(options.config, config);
 
   try {
-    // Call dbInit with connection and progress callback
+    await client.connect(dbConnection);
+
     const result = await client.dbInit({
       contract: contractJson,
       mode: options.dryRun ? 'plan' : 'apply',
-      connection: dbConnection,
+      migrationsDir,
       onProgress,
     });
 
@@ -142,6 +152,7 @@ async function executeDbInitCommand(
           label: op.label,
           operationClass: op.operationClass,
         })),
+        ...ifDefined('preview', result.value.plan.preview),
       },
       ...(result.value.execution
         ? {
@@ -159,6 +170,7 @@ async function executeDbInitCommand(
             },
           }
         : {}),
+      ...ifDefined('perSpace', result.value.perSpace),
       summary: result.value.summary,
       timings: { total: Date.now() - startTime },
     };

package/src/commands/db-update.ts

@@ -14,6 +14,7 @@ import {
 } from '../utils/cli-errors';
 import type { MigrationCommandOptions } from '../utils/command-helpers';
 import {
+  resolveMigrationPaths,
   sanitizeErrorMessage,
   setCommandDescriptions,
   setCommandExamples,
@@ -80,14 +81,17 @@ async function executeDbUpdateCommand(
   if (!ctxResult.ok) {
     return ctxResult;
   }
-  const { client, contractJson, dbConnection, onProgress, contractPathAbsolute } = ctxResult.value;
+  const { client, config, contractJson, dbConnection, onProgress, contractPathAbsolute } =
+    ctxResult.value;
+  const { migrationsDir } = resolveMigrationPaths(options.config, config);
 
   try {
-    // Call dbUpdate with connection and progress callback
+    await client.connect(dbConnection);
+
     const result = await client.dbUpdate({
       contract: contractJson,
       mode: options.dryRun ? 'plan' : 'apply',
-      connection: dbConnection,
+      migrationsDir,
       ...(flags.yes ? { acceptDataLoss: true } : {}),
       onProgress,
     });
@@ -112,7 +116,7 @@ async function executeDbUpdateCommand(
           label: op.label,
           operationClass: op.operationClass,
         })),
-        ...ifDefined('sql', result.value.plan.sql),
+        ...ifDefined('preview', result.value.plan.preview),
       },
       ...ifDefined(
         'execution',
@@ -132,6 +136,7 @@ async function executeDbUpdateCommand(
             }
           : undefined,
       ),
+      ...ifDefined('perSpace', result.value.perSpace),
       summary: result.value.summary,
       timings: { total: Date.now() - startTime },
     };

package/src/commands/db-verify.ts

@@ -27,10 +27,12 @@ import {
   errorTargetMismatch,
   errorUnexpected,
 } from '../utils/cli-errors';
+import { combineSchemaResults } from '../utils/combine-schema-results';
 import {
   addGlobalOptions,
   maskConnectionUrl,
   resolveContractPath,
+  resolveMigrationPaths,
   setCommandDescriptions,
   setCommandExamples,
 } from '../utils/command-helpers';
@@ -346,22 +348,42 @@ async function executeDbVerifyCommand(
   const setupResult = await resolveVerifySetup(paths, options, mode);
   if (!setupResult.ok) return setupResult;
   const { contractJson, dbConnection, contractPathAbsolute } = setupResult.value;
+  const { migrationsDir } = resolveMigrationPaths(options.config, setupResult.value.config);
 
   const client = createVerifyClient(setupResult.value);
   const onProgress = createProgressAdapter({ ui, flags });
 
   try {
+    // Single-contract marker verification preserved for the existing
+    // marker / target / hash failure surface (`PN-RUN-3001/3002/3003`).
+    // The aggregate verifier (run below for the per-space marker /
+    // schema checks) does not duplicate this: it concerns itself with
+    // marker-vs-on-disk and orphan-marker drift, not the
+    // hash-mismatch-against-the-app-contract lane that today's
+    // `client.verify` covers.
     const verifyResult = await client.verify({
       contract: contractJson,
       connection: dbConnection,
       onProgress,
     });
 
-    // If verification failed, map to CLI structured error
     if (!verifyResult.ok) {
       return notOk(mapVerifyFailure(verifyResult));
     }
 
+    // Aggregate verifier (loader → verifier pipeline). Runs the layout
+    // precheck, marker-aware per-space verifier, and (full mode only)
+    // per-space pre-projected schema verification (closes F23).
+    const aggregateResult = await client.dbVerify({
+      contract: contractJson,
+      migrationsDir,
+      strict: options.strict ?? false,
+      skipSchema: mode === 'marker-only',
+      skipMarker: false,
+      onProgress,
+    });
+    if (!aggregateResult.ok) return notOk(aggregateResult.failure);
+
     if (mode === 'marker-only') {
       return ok({
         ok: true,
@@ -381,14 +403,13 @@ async function executeDbVerifyCommand(
       });
     }
 
-    const schemaVerifyResult = await client.schemaVerify({
-      contract: contractJson,
-      strict: options.strict ?? false,
-      onProgress,
-    });
-
-    if (!schemaVerifyResult.ok) {
-      return notOk(schemaVerifyResult);
+    const combined = combineSchemaResults(
+      aggregateResult.value.schemaResults,
+      aggregateResult.value.appSpaceId,
+      options.strict ?? false,
+    );
+    if (!combined.ok) {
+      return notOk(combined);
     }
 
     return ok({
@@ -401,9 +422,9 @@ async function executeDbVerifyCommand(
       ...ifDefined('missingCodecs', verifyResult.missingCodecs),
       ...ifDefined('codecCoverageSkipped', verifyResult.codecCoverageSkipped),
       schema: {
-        summary: schemaVerifyResult.summary,
-        counts: schemaVerifyResult.schema.counts,
-        strict: schemaVerifyResult.meta?.strict ?? false,
+        summary: combined.summary,
+        counts: combined.schema.counts,
+        strict: combined.meta?.strict ?? false,
       },
       meta: {
         ...(verifyResult.meta ?? {}),
@@ -429,19 +450,30 @@ async function executeDbSchemaOnlyVerifyCommand(
   const setupResult = await resolveVerifySetup(paths, options, 'schema-only');
   if (!setupResult.ok) return setupResult;
   const { contractJson, dbConnection, contractPathAbsolute } = setupResult.value;
+  const { migrationsDir } = resolveMigrationPaths(options.config, setupResult.value.config);
 
   const client = createVerifyClient(setupResult.value);
   const onProgress = createProgressAdapter({ ui, flags });
 
   try {
-    const schemaVerifyResult = await client.schemaVerify({
+    await client.connect(dbConnection);
+    const aggregateResult = await client.dbVerify({
       contract: contractJson,
+      migrationsDir,
       strict: options.strict ?? false,
-      connection: dbConnection,
+      skipSchema: false,
+      skipMarker: true,
       onProgress,
     });
+    if (!aggregateResult.ok) return notOk(aggregateResult.failure);
 
-    return ok(schemaVerifyResult);
+    return ok(
+      combineSchemaResults(
+        aggregateResult.value.schemaResults,
+        aggregateResult.value.appSpaceId,
+        options.strict ?? false,
+      ),
+    );
   } catch (error) {
     return wrapVerifyError(error, contractPathAbsolute, 'db verify --schema-only');
   } finally {

package/src/commands/init/index.ts

@@ -113,7 +113,7 @@ export function createInitCommand(): Command {
  *   we honour it (e.g. testing flows where stdin is stubbed).
  *
  * Exported so callers and tests can derive the same value without
- * touching `process` globals — F14 of the M1/M2 review.
+ * touching `process` globals.
  */
 export function deriveCanPrompt(opts: {
   readonly flagsInteractive: boolean | undefined;

package/src/commands/init/init.ts

@@ -569,7 +569,7 @@ async function runInstall(ctx: {
   /**
    * FR2.1 — set when the user already declares `@types/node` directly in
    * `dependencies` or `devDependencies`. We then skip adding it so a
-   * pinned major (e.g. `^18` for a Node 18 runtime) survives `init`
+   * locked major (e.g. `^18` for a Node 18 runtime) survives `init`
    * unchanged. Transitive presence is intentionally ignored: detecting
    * it requires lockfile introspection and the realistic clobber risk
    * is the direct-pin case.
@@ -585,7 +585,7 @@ async function runInstall(ctx: {
   // Pin it as a devDep rather than relying on a transitive resolution
   // through `dotenv` (whose types bundle is internal and not guaranteed
   // across versions). Skip when the user already declares `@types/node`
-  // directly so a pinned major (e.g. `^18` for a Node 18 runtime) is
+  // directly so a locked major (e.g. `^18` for a Node 18 runtime) is
   // preserved. Listed last so the install log still leads with the
   // user-relevant `prisma-next` line.
   const devDeps = hasTypesNode ? ['prisma-next'] : ['prisma-next', '@types/node'];

package/src/commands/init/templates/code-templates.ts

@@ -62,12 +62,12 @@ model User {
 
 function schemaSampleTsPostgres(): string {
   return `\`\`\`typescript
-import sqlFamily from '@prisma-next/family-sql/pack';
-import { defineContract } from '@prisma-next/sql-contract-ts/contract-builder';
-import postgresPack from '@prisma-next/target-postgres/pack';
+import { defineContract } from '@prisma-next/postgres/contract-builder';
+import sqlFamily from '@prisma-next/postgres/family';
+import postgresTarget from '@prisma-next/postgres/target';
 
 export const contract = defineContract(
-  { family: sqlFamily, target: postgresPack },
+  { family: sqlFamily, target: postgresTarget },
   ({ field, model }) => ({
     models: {
       User: model('User', {
@@ -85,9 +85,9 @@ export const contract = defineContract(
 
 function schemaSampleTsMongo(): string {
   return `\`\`\`typescript
-import mongoFamily from '@prisma-next/family-mongo/pack';
-import { defineContract } from '@prisma-next/mongo-contract-ts/contract-builder';
-import mongoTarget from '@prisma-next/target-mongo/pack';
+import { defineContract } from '@prisma-next/mongo/contract-builder';
+import mongoFamily from '@prisma-next/mongo/family';
+import mongoTarget from '@prisma-next/mongo/target';
 
 export const contract = defineContract(
   { family: mongoFamily, target: mongoTarget },
@@ -108,12 +108,15 @@ export const contract = defineContract(
 }
 
 function starterSchemaPslPostgres(): string {
-  return `model User {
+  return `// use prisma-next
+
+model User {
   id        Int      @id @default(autoincrement())
   email     String   @unique
   name      String?
   posts     Post[]
   createdAt DateTime @default(now())
+  updatedAt temporal.updatedAt()
 }
 
 model Post {
@@ -123,12 +126,15 @@ model Post {
   author    User     @relation(fields: [authorId], references: [id])
   authorId  Int
   createdAt DateTime @default(now())
+  updatedAt temporal.updatedAt()
 }
 `;
 }
 
 function starterSchemaPslMongo(): string {
-  return `model User {
+  return `// use prisma-next
+
+model User {
   id    ObjectId @id @map("_id")
   email String   @unique
   name  String?
@@ -148,12 +154,12 @@ model Post {
 }
 
 function starterSchemaTsPostgres(): string {
-  return `import sqlFamily from '@prisma-next/family-sql/pack';
-import { defineContract } from '@prisma-next/sql-contract-ts/contract-builder';
-import postgresPack from '@prisma-next/target-postgres/pack';
+  return `import { defineContract } from '@prisma-next/postgres/contract-builder';
+import sqlFamily from '@prisma-next/postgres/family';
+import postgresTarget from '@prisma-next/postgres/target';
 
 export const contract = defineContract(
-  { family: sqlFamily, target: postgresPack },
+  { family: sqlFamily, target: postgresTarget },
   ({ field, model, rel }) => ({
     models: {
       User: model('User', {
@@ -161,7 +167,8 @@ export const contract = defineContract(
           id: field.id.uuidv7(),
           email: field.text().unique(),
           name: field.text().optional(),
-          createdAt: field.createdAt(),
+          createdAt: field.temporal.createdAt(),
+          updatedAt: field.temporal.updatedAt(),
         },
         relations: {
           posts: rel.hasMany('Post', { by: 'authorId' }),
@@ -174,7 +181,8 @@ export const contract = defineContract(
           title: field.text(),
           content: field.text().optional(),
           authorId: field.uuid(),
-          createdAt: field.createdAt(),
+          createdAt: field.temporal.createdAt(),
+          updatedAt: field.temporal.updatedAt(),
         },
         relations: {
           author: rel.belongsTo('User', { from: 'authorId', to: 'id' }),
@@ -187,9 +195,9 @@ export const contract = defineContract(
 }
 
 function starterSchemaTsMongo(): string {
-  return `import mongoFamily from '@prisma-next/family-mongo/pack';
-import { defineContract } from '@prisma-next/mongo-contract-ts/contract-builder';
-import mongoTarget from '@prisma-next/target-mongo/pack';
+  return `import { defineContract } from '@prisma-next/mongo/contract-builder';
+import mongoFamily from '@prisma-next/mongo/family';
+import mongoTarget from '@prisma-next/mongo/target';
 
 export const contract = defineContract(
   { family: mongoFamily, target: mongoTarget },

package/src/commands/inspect-live-schema.ts

@@ -1,5 +1,5 @@
 import type { CoreSchemaView } from '@prisma-next/framework-components/control';
-import { validatePrintableSqlSchemaIR } from '@prisma-next/psl-printer';
+import type { PslDocumentAst } from '@prisma-next/framework-components/psl-ast';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { relative, resolve } from 'pathe';
 import { loadConfig } from '../config-loader';
@@ -33,6 +33,12 @@ export interface InspectLiveSchemaResult {
   readonly config: LoadedCliConfig;
   readonly schema: unknown;
   readonly schemaView: CoreSchemaView | undefined;
+  /**
+   * PSL AST inferred from the introspected schema, when the configured family
+   * implements `PslContractInferCapable`. `undefined` for families that do not
+   * support inference (e.g. Mongo today).
+   */
+  readonly pslContractAst: PslDocumentAst | undefined;
   readonly target: {
     readonly familyId: string;
     readonly id: string;
@@ -122,14 +128,12 @@ export async function inspectLiveSchema(
   const onProgress = createProgressAdapter({ ui, flags });
 
   try {
-    const schemaIR = await client.introspect({
+    const schema = await client.introspect({
       connection: dbConnection,
       onProgress,
     });
-    // TODO(TML-2251): Remove SQL-specific branching — SQL should use the same family-agnostic path as Mongo.
-    const schema =
-      config.family.familyId === 'sql' ? validatePrintableSqlSchemaIR(schemaIR) : schemaIR;
     const schemaView = client.toSchemaView(schema);
+    const pslContractAst = client.inferPslContract(schema);
 
     const dbUrl = typeof dbConnection === 'string' ? maskConnectionUrl(dbConnection) : undefined;
 
@@ -137,6 +141,7 @@ export async function inspectLiveSchema(
       config,
       schema,
       schemaView,
+      pslContractAst,
       target: {
         familyId: config.family.familyId,
         id: config.target.targetId,