@prisma-next/cli 0.11.0-dev.7 → 0.11.0-dev.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma-next/cli",
-  "version": "0.11.0-dev.7",
+  "version": "0.11.0-dev.8",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
@@ -14,15 +14,15 @@
   "dependencies": {
     "@clack/prompts": "^1.4.0",
     "@dagrejs/dagre": "^3.0.0",
-    "@prisma-next/config": "0.11.0-dev.7",
-    "@prisma-next/contract": "0.11.0-dev.7",
-    "@prisma-next/emitter": "0.11.0-dev.7",
-    "@prisma-next/errors": "0.11.0-dev.7",
-    "@prisma-next/framework-components": "0.11.0-dev.7",
-    "@prisma-next/migration-tools": "0.11.0-dev.7",
-    "@prisma-next/psl-printer": "0.11.0-dev.7",
-    "@prisma-next/cli-telemetry": "0.11.0-dev.7",
-    "@prisma-next/utils": "0.11.0-dev.7",
+    "@prisma-next/config": "0.11.0-dev.8",
+    "@prisma-next/contract": "0.11.0-dev.8",
+    "@prisma-next/emitter": "0.11.0-dev.8",
+    "@prisma-next/errors": "0.11.0-dev.8",
+    "@prisma-next/framework-components": "0.11.0-dev.8",
+    "@prisma-next/migration-tools": "0.11.0-dev.8",
+    "@prisma-next/psl-printer": "0.11.0-dev.8",
+    "@prisma-next/cli-telemetry": "0.11.0-dev.8",
+    "@prisma-next/utils": "0.11.0-dev.8",
     "arktype": "^2.2.0",
     "c12": "^3.3.4",
     "ci-info": "^4.3.1",
@@ -39,14 +39,14 @@
     "wrap-ansi": "^10.0.0"
   },
   "devDependencies": {
-    "@prisma-next/sql-contract": "0.11.0-dev.7",
-    "@prisma-next/sql-contract-emitter": "0.11.0-dev.7",
-    "@prisma-next/sql-contract-ts": "0.11.0-dev.7",
-    "@prisma-next/sql-operations": "0.11.0-dev.7",
-    "@prisma-next/sql-runtime": "0.11.0-dev.7",
-    "@prisma-next/test-utils": "0.11.0-dev.7",
-    "@prisma-next/tsconfig": "0.11.0-dev.7",
-    "@prisma-next/tsdown": "0.11.0-dev.7",
+    "@prisma-next/sql-contract": "0.11.0-dev.8",
+    "@prisma-next/sql-contract-emitter": "0.11.0-dev.8",
+    "@prisma-next/sql-contract-ts": "0.11.0-dev.8",
+    "@prisma-next/sql-operations": "0.11.0-dev.8",
+    "@prisma-next/sql-runtime": "0.11.0-dev.8",
+    "@prisma-next/test-utils": "0.11.0-dev.8",
+    "@prisma-next/tsconfig": "0.11.0-dev.8",
+    "@prisma-next/tsdown": "0.11.0-dev.8",
     "@types/node": "24.10.4",
     "tsdown": "0.22.0",
     "typescript": "5.9.3",

package/src/commands/db-init.ts

@@ -1,3 +1,4 @@
+import { MigrationToolsError } from '@prisma-next/migration-tools/errors';
 import { ifDefined } from '@prisma-next/utils/defined';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
@@ -10,6 +11,7 @@ import {
   errorRunnerFailed,
   errorRuntime,
   errorUnexpected,
+  mapMigrationToolsError,
 } from '../utils/cli-errors';
 import type { MigrationCommandOptions } from '../utils/command-helpers';
 import {
@@ -29,10 +31,18 @@ import {
   addMigrationCommandOptions,
   prepareMigrationContext,
 } from '../utils/migration-command-scaffold';
+import {
+  buildRefAdvancementFields,
+  computeRefAdvancementName,
+  type RefAdvancementFields,
+  readContractIR,
+} from '../utils/ref-advancement';
 import { handleResult } from '../utils/result-handler';
 import { createTerminalUI, type TerminalUI } from '../utils/terminal-ui';
 
-type DbInitOptions = MigrationCommandOptions;
+interface DbInitOptions extends MigrationCommandOptions {
+  readonly advanceRef?: string;
+}
 
 /**
  * Maps a DbInitFailure to a CliStructuredError for consistent error handling.
@@ -128,7 +138,7 @@ async function executeDbInitCommand(
   // 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);
+  const { migrationsDir, refsDir } = resolveMigrationPaths(options.config, config);
 
   try {
     await client.connect(dbConnection);
@@ -145,6 +155,39 @@ async function executeDbInitCommand(
       return notOk(mapDbInitFailure(result.failure));
     }
 
+    const advancementHash =
+      result.value.mode === 'apply'
+        ? (result.value.marker?.storageHash ?? result.value.destination.storageHash)
+        : result.value.destination.storageHash;
+
+    let refAdvancementFields: RefAdvancementFields = {
+      advancedRef: null,
+      plannedAdvanceRef: null,
+    };
+    if (
+      computeRefAdvancementName({
+        ...ifDefined('advanceRef', options.advanceRef),
+        ...ifDefined('db', options.db),
+      }) !== null
+    ) {
+      try {
+        const contractIR = await readContractIR(contractJson, contractPathAbsolute);
+        refAdvancementFields = await buildRefAdvancementFields({
+          ...ifDefined('advanceRef', options.advanceRef),
+          ...ifDefined('db', options.db),
+          refsDir,
+          contractIR,
+          mode: result.value.mode,
+          hash: advancementHash,
+        });
+      } catch (error) {
+        if (MigrationToolsError.is(error)) {
+          return notOk(mapMigrationToolsError(error));
+        }
+        throw error;
+      }
+    }
+
     // Convert success result to CLI output format
     const dbInitResult: MigrationCommandResult = {
       ok: true,
@@ -179,6 +222,8 @@ async function executeDbInitCommand(
           }
         : {}),
       ...ifDefined('perSpace', result.value.perSpace),
+      advancedRef: refAdvancementFields.advancedRef,
+      plannedAdvanceRef: refAdvancementFields.plannedAdvanceRef,
       summary: result.value.summary,
       timings: { total: Date.now() - startTime },
     };
@@ -229,6 +274,7 @@ export function createDbInitCommand(): Command {
     'prisma-next db init --db $DATABASE_URL --dry-run',
   ]);
   addMigrationCommandOptions(command);
+  command.option('--advance-ref <name>', 'Ref to advance to the post-command contract hash');
   command.action(async (options: DbInitOptions) => {
     const flags = parseGlobalFlagsOrExit(options);
     const startTime = Date.now();

package/src/commands/db-update.ts

@@ -38,11 +38,18 @@ import {
   addMigrationCommandOptions,
   prepareMigrationContext,
 } from '../utils/migration-command-scaffold';
+import {
+  buildRefAdvancementFields,
+  computeRefAdvancementName,
+  type RefAdvancementFields,
+  readContractIR,
+} from '../utils/ref-advancement';
 import { handleResult } from '../utils/result-handler';
 import { createTerminalUI, type TerminalUI } from '../utils/terminal-ui';
 
 interface DbUpdateOptions extends MigrationCommandOptions {
   readonly to?: string;
+  readonly advanceRef?: string;
 }
 
 /**
@@ -101,6 +108,7 @@ async function executeDbUpdateCommand(
   }
   const { client, config, dbConnection, onProgress, contractPathAbsolute } = ctxResult.value;
   let { contractJson } = ctxResult.value;
+  let contractJsonPathForSnapshot = contractPathAbsolute;
   const { migrationsDir, appMigrationsDir, refsDir } = resolveMigrationPaths(
     options.config,
     config,
@@ -130,6 +138,7 @@ async function executeDbUpdateCommand(
       const endContractPath = join(matchingBundle.dirPath, 'end-contract.json');
       const raw = await readFile(endContractPath, 'utf-8');
       contractJson = JSON.parse(raw) as Record<string, unknown>;
+      contractJsonPathForSnapshot = endContractPath;
     } catch (error) {
       if (MigrationToolsError.is(error)) {
         return notOk(mapMigrationToolsError(error));
@@ -157,6 +166,39 @@ async function executeDbUpdateCommand(
       return notOk(mapDbUpdateFailure(result.failure));
     }
 
+    const advancementHash =
+      result.value.mode === 'apply'
+        ? (result.value.marker?.storageHash ?? result.value.destination.storageHash)
+        : result.value.destination.storageHash;
+
+    let refAdvancementFields: RefAdvancementFields = {
+      advancedRef: null,
+      plannedAdvanceRef: null,
+    };
+    if (
+      computeRefAdvancementName({
+        ...ifDefined('advanceRef', options.advanceRef),
+        ...ifDefined('db', options.db),
+      }) !== null
+    ) {
+      try {
+        const contractIR = await readContractIR(contractJson, contractJsonPathForSnapshot);
+        refAdvancementFields = await buildRefAdvancementFields({
+          ...ifDefined('advanceRef', options.advanceRef),
+          ...ifDefined('db', options.db),
+          refsDir,
+          contractIR,
+          mode: result.value.mode,
+          hash: advancementHash,
+        });
+      } catch (error) {
+        if (MigrationToolsError.is(error)) {
+          return notOk(mapMigrationToolsError(error));
+        }
+        throw error;
+      }
+    }
+
     // Convert success result to CLI output format
     const dbUpdateResult: MigrationCommandResult = {
       ok: true,
@@ -193,6 +235,8 @@ async function executeDbUpdateCommand(
           : undefined,
       ),
       ...ifDefined('perSpace', result.value.perSpace),
+      advancedRef: refAdvancementFields.advancedRef,
+      plannedAdvanceRef: refAdvancementFields.plannedAdvanceRef,
       summary: result.value.summary,
       timings: { total: Date.now() - startTime },
     };
@@ -245,6 +289,7 @@ export function createDbUpdateCommand(): Command {
     '--to <contract>',
     'Target contract reference (hash, prefix, ref name, migration dir name, <dir>^, or ./path)',
   );
+  command.option('--advance-ref <name>', 'Ref to advance to the post-command contract hash');
   command.action(async (options: DbUpdateOptions) => {
     const flags = parseGlobalFlagsOrExit(options);
     const startTime = Date.now();

package/src/commands/migrate.ts

@@ -2,13 +2,14 @@ import { readFile } from 'node:fs/promises';
 import type { Contract } from '@prisma-next/contract/types';
 import { createControlStack } from '@prisma-next/framework-components/control';
 import { errorUnknownInvariant, MigrationToolsError } from '@prisma-next/migration-tools/errors';
+import { findLatestMigration, isGraphNode } from '@prisma-next/migration-tools/migration-graph';
 import { parseContractRef } from '@prisma-next/migration-tools/ref-resolution';
 import type { RefEntry } from '@prisma-next/migration-tools/refs';
 import { readRefs } from '@prisma-next/migration-tools/refs';
 import { ifDefined } from '@prisma-next/utils/defined';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
-
+import { join } from 'pathe';
 import { loadConfig } from '../config-loader';
 import { createControlClient } from '../control-api/client';
 import type {
@@ -23,6 +24,8 @@ import {
   errorDatabaseConnectionRequired,
   errorDriverRequired,
   errorFileNotFound,
+  errorMarkerMismatch,
+  errorPathUnreachable,
   errorRuntime,
   errorTargetMigrationNotSupported,
   errorUnexpected,
@@ -44,6 +47,7 @@ import { formatMigrationApplyCommandOutput } from '../utils/formatters/migration
 import { formatStyledHeader } from '../utils/formatters/styled';
 import type { CommonCommandOptions } from '../utils/global-flags';
 import { type GlobalFlags, parseGlobalFlagsOrExit } from '../utils/global-flags';
+import { executeRefAdvancement, readContractIR } from '../utils/ref-advancement';
 import { handleResult } from '../utils/result-handler';
 import { createTerminalUI, type TerminalUI } from '../utils/terminal-ui';
 
@@ -51,6 +55,7 @@ interface MigrateCommandOptions extends CommonCommandOptions {
   readonly db?: string;
   readonly config?: string;
   readonly to?: string;
+  readonly advanceRef?: string;
 }
 
 export interface MigrateResult {
@@ -72,9 +77,13 @@ export interface MigrateResult {
   readonly timings: {
     readonly total: number;
   };
+  readonly advancedRef?: { readonly name: string; readonly hash: string } | null;
 }
 
 function mapApplyFailure(failure: MigrationApplyFailure): CliStructuredErrorType {
+  if (failure.code === 'MIGRATION_PATH_NOT_FOUND') {
+    return errorPathUnreachable(failure);
+  }
   return errorRuntime(failure.summary, {
     why: failure.why ?? 'Migration runner failed',
     fix: 'Fix the issue and re-run `prisma-next migrate --to <contract>` — previously applied migrations are preserved.',
@@ -229,9 +238,21 @@ async function executeMigrateCommand(
   try {
     await client.connect(dbConnection);
 
+    const allMarkers = await client.readAllMarkers();
+    const appMarker = allMarkers.get('app') ?? null;
+    const { graph } = appPackages;
+
+    if (appMarker !== null && !isGraphNode(appMarker.storageHash, graph)) {
+      return notOk(
+        errorMarkerMismatch(
+          appMarker.storageHash,
+          [...graph.nodes].sort(),
+          findLatestMigration(graph)?.to ?? null,
+        ),
+      );
+    }
+
     if (refEntry && refEntry.invariants.length > 0) {
-      const allMarkers = await client.readAllMarkers();
-      const appMarker = allMarkers.get('app') ?? null;
       const declared = collectDeclaredInvariants(appPackages.graph);
       const known = new Set<string>(declared);
       for (const id of appMarker?.invariants ?? []) known.add(id);
@@ -268,6 +289,53 @@ async function executeMigrateCommand(
 
     const { value } = applyResult;
 
+    let advancedRef: { name: string; hash: string } | null = null;
+    if (options.advanceRef !== undefined) {
+      let contractJsonPathForSnapshot = contractPathAbsolute;
+      let contractJsonForSnapshot: Record<string, unknown> = JSON.parse(contractContent) as Record<
+        string,
+        unknown
+      >;
+      if (toArg && refEntry) {
+        const matchingBundle = appPackages.bundles.find((p) => p.metadata.to === refEntry.hash);
+        if (matchingBundle) {
+          const endContractPath = join(matchingBundle.dirPath, 'end-contract.json');
+          contractJsonPathForSnapshot = endContractPath;
+          try {
+            const raw = await readFile(endContractPath, 'utf-8');
+            contractJsonForSnapshot = JSON.parse(raw) as Record<string, unknown>;
+          } catch (error) {
+            if (error instanceof Error && (error as { code?: string }).code === 'ENOENT') {
+              return notOk(
+                errorFileNotFound(endContractPath, {
+                  why: `Bundle end-contract not found at ${endContractPath}`,
+                  fix: 'Re-emit the migration bundle or pick a different --to target.',
+                }),
+              );
+            }
+            throw error;
+          }
+        }
+      }
+      try {
+        const contractIR = await readContractIR(
+          contractJsonForSnapshot,
+          contractJsonPathForSnapshot,
+        );
+        advancedRef = await executeRefAdvancement(
+          refsDir,
+          options.advanceRef,
+          value.markerHash,
+          contractIR,
+        );
+      } catch (error) {
+        if (MigrationToolsError.is(error)) {
+          return notOk(mapMigrationToolsError(error));
+        }
+        throw error;
+      }
+    }
+
     return ok({
       ok: true,
       migrationsApplied: value.migrationsApplied,
@@ -278,6 +346,7 @@ async function executeMigrateCommand(
       perSpace: value.perSpace,
       ...ifDefined('pathDecision', value.pathDecision),
       timings: { total: Date.now() - startTime },
+      advancedRef,
     });
   } catch (error) {
     if (CliStructuredError.is(error)) {
@@ -318,6 +387,7 @@ export function createMigrateCommand(): Command {
       '--to <contract>',
       'Target contract reference (hash, prefix, ref name, migration dir name, <dir>^, or ./path)',
     )
+    .option('--advance-ref <name>', 'Advance the named ref to the post-apply marker after success')
     .action(async (options: MigrateCommandOptions) => {
       const flags = parseGlobalFlagsOrExit(options);
       const startTime = Date.now();