@prisma-next/cli 0.16.0-dev.3 → 0.16.0-dev.31

package/src/commands/migration-plan.ts

@@ -1,4 +1,4 @@
-import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { readFile } from 'node:fs/promises';
 import { loadConfig } from '@prisma-next/config-loader';
 import type { Contract } from '@prisma-next/contract/types';
 import { getEmittedArtifactPaths } from '@prisma-next/emitter';
@@ -9,15 +9,14 @@ import {
   type OperationPreview,
   type SchemaOwnership,
 } from '@prisma-next/framework-components/control';
-import { canonicalizeJson } from '@prisma-next/framework-components/utils';
+import {
+  snapshotsImportPathFrom,
+  writeContractSnapshot,
+} from '@prisma-next/migration-tools/contract-snapshot-store';
 import { MigrationToolsError } from '@prisma-next/migration-tools/errors';
 import { computeMigrationHash } from '@prisma-next/migration-tools/hash';
 import { deriveProvidedInvariants } from '@prisma-next/migration-tools/invariants';
-import {
-  copyFilesWithRename,
-  formatMigrationDirName,
-  writeMigrationPackage,
-} from '@prisma-next/migration-tools/io';
+import { formatMigrationDirName, writeMigrationPackage } from '@prisma-next/migration-tools/io';
 import type { MigrationMetadata } from '@prisma-next/migration-tools/metadata';
 import { writeMigrationTs } from '@prisma-next/migration-tools/migration-ts';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
@@ -62,27 +61,6 @@ interface MigrationPlanOptions extends CommonCommandOptions {
   readonly to?: string;
 }
 
-async function writeSnapshotContractArtifacts(
-  packageDir: string,
-  contractJson: unknown,
-  contractDts: string,
-  artifactBasename: 'start-contract' | 'end-contract',
-): Promise<void> {
-  await mkdir(packageDir, { recursive: true });
-  const jsonContent = `${canonicalizeJson(contractJson)}\n`;
-  const dtsContent = contractDts.endsWith('\n') ? contractDts : `${contractDts}\n`;
-  await writeFile(join(packageDir, `${artifactBasename}.json`), jsonContent);
-  await writeFile(join(packageDir, `${artifactBasename}.d.ts`), dtsContent);
-}
-
-async function writeSnapshotStartContract(
-  packageDir: string,
-  contractJson: unknown,
-  contractDts: string,
-): Promise<void> {
-  await writeSnapshotContractArtifacts(packageDir, contractJson, contractDts, 'start-contract');
-}
-
 type PlannerSuccess = {
   readonly plannedOps: readonly MigrationPlanOperation[];
   readonly migrationTsContent: string;
@@ -99,6 +77,7 @@ async function runPlannerLeg(
   fromContract: Contract | null,
   spaceId: string,
   ownership: SchemaOwnership,
+  snapshotsImportPath: string,
 ): Promise<Result<PlannerSuccess, CliStructuredError>> {
   const fromSchema = migrations.contractToSchema(fromContract, frameworkComponents);
   const plannerResult = planner.plan({
@@ -114,6 +93,7 @@ async function runPlannerLeg(
     // space in the aggregate, so it stays a genuine drop; a table another
     // space owns is never dropped.
     ownership,
+    snapshotsImportPath,
   });
   if (plannerResult.kind === 'failure') {
     return notOk(
@@ -309,21 +289,25 @@ async function executeMigrationPlanCommand(
   let toStorageHash: string = rawStorageHash;
 
   // When `--to <ref>` resolves a non-default destination, these carry its raw
-  // artifacts so the planned package's `end-contract.*` is written from the
-  // resolved target rather than copied from the emitted `contract.json`.
+  // artifacts so the planned package's destination snapshot store entry is
+  // written from the resolved target rather than copied from the emitted
+  // `contract.json`.
   let toArtifacts: { contractJson: unknown; contractDts: string } | null = null;
 
   let fromContract: Contract | null = null;
   let fromHash: string | null = null;
-  let fromContractSourceDir: string | null = null;
-  let snapshotStartContract: { contractJson: unknown; contractDts: string } | null = null;
+  let snapshotStartContract: {
+    readonly fromHash: string;
+    readonly contractJson: unknown;
+    readonly contractDts: string;
+  } | null = null;
   let isAutoBaseline = false;
 
   const tolerantAggregateResult = await loadContractSpaceAggregateForCli({
     targetId: config.target.targetId,
     migrationsDir,
     appContract: toContract,
-    extensionPacks: config.extensionPacks ?? [],
+    extensions: config.extensions ?? [],
     deserializeContract: (json: unknown) => familyInstance.deserializeContract(json),
   });
   if (!tolerantAggregateResult.ok) {
@@ -346,12 +330,12 @@ async function executeMigrationPlanCommand(
     case 'graph-node':
       fromHash = resolutionResult.value.fromHash;
       fromContract = resolutionResult.value.fromContract;
-      fromContractSourceDir = resolutionResult.value.sourceDir;
       break;
-    case 'snapshot':
+    case 'ref':
       fromHash = resolutionResult.value.fromHash;
       fromContract = resolutionResult.value.fromContract;
       snapshotStartContract = {
+        fromHash: resolutionResult.value.fromHash,
         contractJson: resolutionResult.value.contractJson,
         contractDts: resolutionResult.value.contractDts,
       };
@@ -360,6 +344,7 @@ async function executeMigrationPlanCommand(
       fromHash = resolutionResult.value.fromHash;
       fromContract = resolutionResult.value.fromContract;
       snapshotStartContract = {
+        fromHash: resolutionResult.value.fromHash,
         contractJson: resolutionResult.value.contractJson,
         contractDts: resolutionResult.value.contractDts,
       };
@@ -369,7 +354,7 @@ async function executeMigrationPlanCommand(
 
   // `--to <ref>` swaps the planner destination to an arbitrary resolved
   // contract (e.g. an ancestor / rollback target). The from-side resolution
-  // above is untouched; only the destination + its emitted `end-contract.*`
+  // above is untouched; only the destination + its snapshot store entry
   // change.
   if (options.to !== undefined) {
     const toResolution = await resolveToForPlan(options.to, {
@@ -386,15 +371,15 @@ async function executeMigrationPlanCommand(
     };
   }
 
-  // Phase 1 — seed: unconditionally re-emit per-space pinned artefacts
+  // Phase 1 — seed: unconditionally re-emit per-space pinned artifacts
   // (contract.json / contract.d.ts / refs/head.json) and materialise any
   // descriptor-shipped migration packages not yet on disk. Runs before
   // the no-op check so that an extension bump alone (with no structural
-  // app-space change) still re-pins extension artefacts on disk.
-  const canonicalExtensionInputs = toExtensionInputs(config.extensionPacks ?? []);
+  // app-space change) still re-pins extension artifacts on disk.
+  const canonicalExtensionInputs = toExtensionInputs(config.extensions ?? []);
   const seedResult = await runContractSpaceSeedPhase({
     migrationsDir,
-    extensionPacks: canonicalExtensionInputs,
+    extensions: canonicalExtensionInputs,
   });
   if (!flags.json && !flags.quiet) {
     for (const record of seedResult.seeded) {
@@ -449,7 +434,7 @@ async function executeMigrationPlanCommand(
     targetId: config.target.targetId,
     migrationsDir,
     appContract: toContract,
-    extensionPacks: config.extensionPacks ?? [],
+    extensions: config.extensions ?? [],
     deserializeContract: (json: unknown) => familyInstance.deserializeContract(json),
   });
   if (!aggregateResult.ok) {
@@ -460,27 +445,29 @@ async function executeMigrationPlanCommand(
   const frameworkComponents = assertFrameworkComponentsCompatible(
     config.family.familyId,
     config.target.targetId,
-    [config.target, config.adapter, ...(config.extensionPacks ?? [])],
+    [config.target, config.adapter, ...(config.extensions ?? [])],
   );
 
-  // Write the planned package's destination `end-contract.*`. With `--to`, the
-  // resolved target's raw artifacts are written; otherwise the emitted
-  // `contract.json` / `contract.d.ts` are copied verbatim (today's behaviour).
-  async function writeDestinationEndContract(packageDir: string): Promise<void> {
+  // Write the planned package's destination contract into the snapshot store.
+  // With `--to`, the resolved target's raw artifacts are written; otherwise
+  // the emitted `contract.json` / `contract.d.ts` are read from disk.
+  async function writeDestinationSnapshot(destHash: string): Promise<void> {
     if (toArtifacts !== null) {
-      await writeSnapshotContractArtifacts(
-        packageDir,
-        toArtifacts.contractJson,
-        toArtifacts.contractDts,
-        'end-contract',
-      );
+      await writeContractSnapshot(migrationsDir, destHash, {
+        contractJson: toArtifacts.contractJson,
+        contractDts: toArtifacts.contractDts,
+      });
       return;
     }
     const destinationArtifacts = getEmittedArtifactPaths(contractPathAbsolute);
-    await copyFilesWithRename(packageDir, [
-      { sourcePath: destinationArtifacts.jsonPath, destName: 'end-contract.json' },
-      { sourcePath: destinationArtifacts.dtsPath, destName: 'end-contract.d.ts' },
+    const [contractJsonRaw, contractDts] = await Promise.all([
+      readFile(destinationArtifacts.jsonPath, 'utf-8'),
+      readFile(destinationArtifacts.dtsPath, 'utf-8'),
     ]);
+    await writeContractSnapshot(migrationsDir, destHash, {
+      contractJson: JSON.parse(contractJsonRaw) as unknown,
+      contractDts,
+    });
   }
 
   try {
@@ -507,6 +494,7 @@ async function executeMigrationPlanCommand(
         null,
         aggregate.app.spaceId,
         aggregate,
+        snapshotsImportPathFrom(baselinePackageDir, migrationsDir),
       );
       if (!baselineLeg.ok) {
         return notOk(baselineLeg.failure);
@@ -519,12 +507,10 @@ async function executeMigrationPlanCommand(
         baselineTimestamp,
         baselineLeg.value,
       );
-      await writeSnapshotContractArtifacts(
-        baselinePackageDir,
-        snapshotStartContract.contractJson,
-        snapshotStartContract.contractDts,
-        'end-contract',
-      );
+      await writeContractSnapshot(migrationsDir, fromHash, {
+        contractJson: snapshotStartContract.contractJson,
+        contractDts: snapshotStartContract.contractDts,
+      });
 
       if (fromHash === toStorageHash) {
         const baselineOps = baselineLeg.value.hasPlaceholders ? [] : baselineLeg.value.plannedOps;
@@ -577,6 +563,7 @@ async function executeMigrationPlanCommand(
         fromContract,
         aggregate.app.spaceId,
         aggregate,
+        snapshotsImportPathFrom(deltaPackageDir, migrationsDir),
       );
       if (!deltaLeg.ok) {
         return notOk(deltaLeg.failure);
@@ -589,12 +576,11 @@ async function executeMigrationPlanCommand(
         deltaTimestamp,
         deltaLeg.value,
       );
-      await writeDestinationEndContract(deltaPackageDir);
-      await writeSnapshotStartContract(
-        deltaPackageDir,
-        snapshotStartContract.contractJson,
-        snapshotStartContract.contractDts,
-      );
+      await writeDestinationSnapshot(toStorageHash);
+      await writeContractSnapshot(migrationsDir, fromHash, {
+        contractJson: snapshotStartContract.contractJson,
+        contractDts: snapshotStartContract.contractDts,
+      });
 
       const deltaOps = deltaLeg.value.hasPlaceholders ? [] : deltaLeg.value.plannedOps;
       if (deltaLeg.value.hasPlaceholders) {
@@ -651,6 +637,7 @@ async function executeMigrationPlanCommand(
       fromContract,
       aggregate.app.spaceId,
       aggregate,
+      snapshotsImportPathFrom(packageDir, migrationsDir),
     );
     if (!deltaLeg.ok) {
       return notOk(deltaLeg.failure);
@@ -663,21 +650,12 @@ async function executeMigrationPlanCommand(
       timestamp,
       deltaLeg.value,
     );
-    await writeDestinationEndContract(packageDir);
-    if (fromContractSourceDir !== null) {
-      const sourceArtifacts = getEmittedArtifactPaths(
-        join(fromContractSourceDir, 'end-contract.json'),
-      );
-      await copyFilesWithRename(packageDir, [
-        { sourcePath: sourceArtifacts.jsonPath, destName: 'start-contract.json' },
-        { sourcePath: sourceArtifacts.dtsPath, destName: 'start-contract.d.ts' },
-      ]);
-    } else if (snapshotStartContract !== null) {
-      await writeSnapshotStartContract(
-        packageDir,
-        snapshotStartContract.contractJson,
-        snapshotStartContract.contractDts,
-      );
+    await writeDestinationSnapshot(toStorageHash);
+    if (snapshotStartContract !== null) {
+      await writeContractSnapshot(migrationsDir, snapshotStartContract.fromHash, {
+        contractJson: snapshotStartContract.contractJson,
+        contractDts: snapshotStartContract.contractDts,
+      });
     }
 
     if (deltaLeg.value.hasPlaceholders) {
@@ -953,10 +931,9 @@ export type PrefixResolutionFailure =
  *
  * Note: matches `metadata.to` (the contract hash this migration produces),
  * not `metadata.migrationHash` (the package's content-addressed identity).
- * Tries exact match first, then prefix match (auto-prepending `sha256:` when
- * the needle omits the scheme). Returns the matched package on success, or a
- * discriminated failure indicating whether the prefix was ambiguous or simply
- * not found.
+ * Tries exact match first, then prefix match. Returns the matched package on
+ * success, or a discriminated failure indicating whether the prefix was
+ * ambiguous or simply not found.
  *
  * @internal Exported for testing only.
  */
@@ -967,8 +944,7 @@ export function resolveBundleByPrefix<T extends { metadata: { to: string } }>(
   const exact = bundles.find((p) => p.metadata.to === needle);
   if (exact) return ok(exact);
 
-  const prefixWithScheme = needle.startsWith('sha256:') ? needle : `sha256:${needle}`;
-  const candidates = bundles.filter((p) => p.metadata.to.startsWith(prefixWithScheme));
+  const candidates = bundles.filter((p) => p.metadata.to.startsWith(needle));
 
   if (candidates.length === 1) return ok(candidates[0]!);
   if (candidates.length > 1) return notOk({ reason: 'ambiguous', count: candidates.length });

package/src/commands/migration-show.ts

@@ -119,7 +119,7 @@ async function executeMigrationShowCommand(
     target: config.target,
     adapter: config.adapter,
     ...ifDefined('driver', config.driver),
-    extensionPacks: config.extensionPacks ?? [],
+    extensions: config.extensions ?? [],
   });
 
   let contractJsonContent: string;
@@ -228,7 +228,7 @@ export function createMigrationShowCommand(): Command {
   );
   setCommandExamples(command, [
     'prisma-next migration show 20260101_100000_add_user',
-    'prisma-next migration show sha256:a1b2c3',
+    'prisma-next migration show a1b2c3',
     'prisma-next migration show 20260101_100000_add_user --json',
   ]);
   setCommandSeeAlso(command, [

package/src/commands/migration-status.ts

@@ -111,8 +111,7 @@ interface MigrationStatusCommandResult {
 }
 
 function shortDisplayHash(hash: string): string {
-  const stripped = hash.startsWith('sha256:') ? hash.slice(7) : hash;
-  return stripped.slice(0, 12);
+  return hash.slice(0, 12);
 }
 
 function resolveTarget(contractHash: string, activeRefHash: string | undefined): string {
@@ -421,7 +420,7 @@ export async function executeMigrationStatusCommand(
       target: config.target,
       adapter: config.adapter,
       driver: config.driver,
-      extensionPacks: config.extensionPacks ?? [],
+      extensions: config.extensions ?? [],
     });
     try {
       await client.connect(dbConnection);
@@ -660,10 +659,10 @@ export function createMigrationStatusCommand(): Command {
   setCommandExamples(command, [
     'prisma-next migration status --db $DATABASE_URL',
     'prisma-next migration status --to production --db $DATABASE_URL',
-    'prisma-next migration status --from sha256:abc --to production',
-    'prisma-next migration status --from sha256:abc --to production --json',
-    'prisma-next migration status --ascii --from sha256:abc --to production',
-    'prisma-next migration status --legend --from sha256:abc --to production',
+    'prisma-next migration status --from abc123 --to production',
+    'prisma-next migration status --from abc123 --to production --json',
+    'prisma-next migration status --ascii --from abc123 --to production',
+    'prisma-next migration status --legend --from abc123 --to production',
   ]);
   setCommandSeeAlso(command, [
     { verb: 'migration log', oneLiner: 'Show executed migration history' },

package/src/commands/ref.ts

@@ -1,16 +1,19 @@
-import { readFile } from 'node:fs/promises';
 import { loadConfig } from '@prisma-next/config-loader';
 import { EMPTY_CONTRACT_HASH } from '@prisma-next/migration-tools/constants';
+import {
+  contractSnapshotDir,
+  readContractSnapshotJson,
+} from '@prisma-next/migration-tools/contract-snapshot-store';
 import { 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 {
-  deleteRefPaired,
+  deleteRef,
   readRefs,
   validateRefName,
   validateRefValue,
-  writeRefPaired,
+  writeRef,
 } from '@prisma-next/migration-tools/refs';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
@@ -34,7 +37,6 @@ import {
 import { buildReadAggregate } from '../utils/contract-space-aggregate-loader';
 import { formatCommandHelp } from '../utils/formatters/help';
 import { parseGlobalFlags, parseGlobalFlagsOrExit } from '../utils/global-flags';
-import { readContractIR } from '../utils/ref-advancement';
 import { handleResult } from '../utils/result-handler';
 import { createTerminalUI } from '../utils/terminal-ui';
 
@@ -114,26 +116,29 @@ export async function executeRefSetCommand(
       return notOk(errorRefSetBundleNotFound(resolvedHash));
     }
 
-    const contractJsonPath = join(matchingBundle.dirPath, 'end-contract.json');
-    let contractJson: Record<string, unknown>;
+    const contractJsonPath = join(
+      contractSnapshotDir(migrationsDir, resolvedHash),
+      'contract.json',
+    );
     try {
-      const raw = await readFile(contractJsonPath, 'utf-8');
-      contractJson = JSON.parse(raw) as Record<string, unknown>;
+      await readContractSnapshotJson(migrationsDir, resolvedHash);
     } catch (readError) {
-      if (readError instanceof Error && (readError as NodeJS.ErrnoException).code === 'ENOENT') {
+      if (
+        MigrationToolsError.is(readError) &&
+        readError.code === 'MIGRATION.CONTRACT_SNAPSHOT_MISSING'
+      ) {
         return notOk(
           errorFileNotFound(contractJsonPath, {
-            why: `Migration bundle for hash ${resolvedHash} is missing its end-contract snapshot at ${contractJsonPath}`,
-            fix: 'Run `pnpm fixtures:check`, or re-emit the migration so its end-contract.json is restored.',
+            why: `Migration bundle for hash ${resolvedHash} is missing its contract snapshot at ${contractJsonPath}`,
+            fix: 'Restore migrations/snapshots/ from version control, or re-run the command that produced this migration to regenerate its snapshot.',
           }),
         );
       }
       throw readError;
     }
 
-    const contractIR = await readContractIR(contractJson, contractJsonPath);
     const entry: RefEntry = { hash: resolvedHash, invariants: [] };
-    await writeRefPaired(refsDir, name, entry, contractIR);
+    await writeRef(refsDir, name, entry);
     return ok({ ok: true as const, ref: name, hash: resolvedHash, invariants: [] });
   } catch (error) {
     if (error instanceof CliStructuredError) return notOk(error);
@@ -148,7 +153,7 @@ export async function executeRefDeleteCommand(
   try {
     const config = await loadConfig(options.config);
     const { refsDir } = resolveMigrationPaths(options.config, config);
-    await deleteRefPaired(refsDir, name);
+    await deleteRef(refsDir, name);
     return ok({ ok: true as const, ref: name, deleted: true as const });
   } catch (error) {
     if (error instanceof CliStructuredError) return notOk(error);