@prisma-next/cli 0.12.0-dev.21 → 0.12.0-dev.23

package/package.json

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

package/src/commands/migration-list.ts

@@ -26,10 +26,7 @@ import {
   setCommandSeeAlso,
 } from '../utils/command-helpers';
 import { buildReadAggregate } from '../utils/contract-space-aggregate-loader';
-import {
-  buildMigrationListTopologyBySpace,
-  renderMigrationListWithStyle,
-} from '../utils/formatters/migration-list-render';
+import { renderMigrationListWithStyle } from '../utils/formatters/migration-list-render';
 import { createAnsiMigrationListStyler } from '../utils/formatters/migration-list-styler';
 import type {
   MigrationListEntry,
@@ -143,8 +140,9 @@ export function renderMigrationListHumanOutput(
   options: MigrationListHumanRenderOptions,
 ): string {
   const styler = createAnsiMigrationListStyler({ useColor: options.useColor });
-  const topologyBySpaceId = buildMigrationListTopologyBySpace(result);
-  return renderMigrationListWithStyle(result, styler, options.glyphMode, topologyBySpaceId);
+  return renderMigrationListWithStyle(result, styler, options.glyphMode, {
+    colorize: options.useColor,
+  });
 }
 
 /**
@@ -222,7 +220,7 @@ export async function executeMigrationListCommand(
   if (!flags.json && !flags.quiet) {
     const header = formatStyledHeader({
       command: 'migration list',
-      description: 'List on-disk migrations, latest first, per contract space',
+      description: 'List on-disk migrations per contract space',
       details: [
         { label: 'config', value: configPath },
         { label: 'migrations', value: migrationsRelative },
@@ -253,15 +251,13 @@ export function createMigrationListCommand(): Command {
   const command = new Command('list');
   setCommandDescriptions(
     command,
-    'List on-disk migrations, latest first, per contract space',
+    'List on-disk migrations per contract space',
     'Enumerates every on-disk migration under migrations/<space>/ for every\n' +
-      'contract space found on disk, latest first. Offline — does not consult\n' +
-      'the database. Each row leads with a kind glyph (* forward, ↩ rollback,\n' +
-      '⟲ self), then dirName, then source → destination contract hashes\n' +
-      '(7-char git-style). Self-edges show a single hash. Invariants render as\n' +
-      '{...}; refs on the destination as (production, db). Pass --space <id>\n' +
-      'to narrow to one contract space. --ascii forces ASCII kind glyphs\n' +
-      '(orthogonal to --no-color).',
+      'contract space found on disk. Offline — does not consult the database.\n' +
+      'Human output draws the shared migration graph tree with operation counts,\n' +
+      'invariants on each migration row, and refs on destination contract nodes.\n' +
+      'Pass --space <id> to narrow to one contract space. --ascii forces ASCII\n' +
+      'tree glyphs (orthogonal to --no-color).',
   );
   setCommandExamples(command, [
     'prisma-next migration list',

package/src/commands/migration-log.ts

@@ -1,9 +1,6 @@
-import type { MigrationPlanOperation } from '@prisma-next/framework-components/control';
-import { EMPTY_CONTRACT_HASH } from '@prisma-next/migration-tools/constants';
+import type { LedgerEntryRecord } from '@prisma-next/contract/types';
 import { MigrationToolsError } from '@prisma-next/migration-tools/errors';
-import { findPath } from '@prisma-next/migration-tools/migration-graph';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
-import { cyan, dim } from 'colorette';
 import { Command } from 'commander';
 import { loadConfig } from '../config-loader';
 import { createControlClient } from '../control-api/client';
@@ -23,7 +20,12 @@ import {
   setCommandSeeAlso,
   targetSupportsMigrations,
 } from '../utils/command-helpers';
-import { buildReadAggregate } from '../utils/contract-space-aggregate-loader';
+import { createAnsiMigrationListStyler } from '../utils/formatters/migration-list-styler';
+import {
+  MIGRATION_LOG_EMPTY_MESSAGE,
+  renderMigrationLogTable,
+  serializeLedgerEntriesForJson,
+} from '../utils/formatters/migration-log-table';
 import { formatStyledHeader } from '../utils/formatters/styled';
 import type { CommonCommandOptions } from '../utils/global-flags';
 import { type GlobalFlags, parseGlobalFlagsOrExit } from '../utils/global-flags';
@@ -33,34 +35,16 @@ import { createTerminalUI, type TerminalUI } from '../utils/terminal-ui';
 interface MigrationLogOptions extends CommonCommandOptions {
   readonly db?: string;
   readonly config?: string;
-}
-
-export interface MigrationLogEntry {
-  readonly dirName: string;
-  readonly from: string;
-  readonly to: string;
-  readonly migrationHash: string;
-  readonly operationCount: number;
-  readonly createdAt: string;
-}
-
-export interface MigrationLogResult {
-  readonly ok: true;
-  readonly markerHash: string | null;
-  readonly applied: readonly MigrationLogEntry[];
-  readonly summary: string;
+  readonly utc?: boolean;
 }
 
 export async function executeMigrationLogCommand(
   options: MigrationLogOptions,
   flags: GlobalFlags,
   ui: TerminalUI,
-): Promise<Result<MigrationLogResult, CliStructuredError>> {
+): Promise<Result<readonly LedgerEntryRecord[], CliStructuredError>> {
   const config = await loadConfig(options.config);
-  const { configPath, appMigrationsRelative, migrationsDir } = resolveMigrationPaths(
-    options.config,
-    config,
-  );
+  const { configPath } = resolveMigrationPaths(options.config, config);
 
   const dbConnection = options.db ?? config.db?.connection;
   if (!dbConnection) {
@@ -81,10 +65,9 @@ export async function executeMigrationLogCommand(
   if (!flags.json && !flags.quiet) {
     const header = formatStyledHeader({
       command: 'migration log',
-      description: 'Show executed migration history',
+      description: 'Show executed migration history from the database ledger',
       details: [
         { label: 'config', value: configPath },
-        { label: 'migrations', value: appMigrationsRelative },
         ...(typeof dbConnection === 'string'
           ? [{ label: 'database', value: maskConnectionUrl(dbConnection) }]
           : []),
@@ -94,13 +77,6 @@ export async function executeMigrationLogCommand(
     ui.stderr(header);
   }
 
-  const loaded = await buildReadAggregate(config, { migrationsDir });
-  if (!loaded.ok) {
-    return loaded;
-  }
-  const graph = loaded.value.aggregate.app.graph();
-  const bundles = loaded.value.aggregate.app.packages;
-
   const client = createControlClient({
     family: config.family,
     target: config.target,
@@ -111,47 +87,8 @@ export async function executeMigrationLogCommand(
 
   try {
     await client.connect(dbConnection);
-    const marker = await client.readMarker();
-    const markerHash = marker?.storageHash ?? null;
-
-    if (!markerHash) {
-      return ok({
-        ok: true,
-        markerHash: null,
-        applied: [],
-        summary: 'No migrations applied (database has no marker)',
-      });
-    }
-
-    const appliedPath = findPath(graph, EMPTY_CONTRACT_HASH, markerHash);
-    if (appliedPath === null) {
-      return notOk(
-        errorUnexpected('Database marker is not reachable from migration history', {
-          why: `Marker hash ${markerHash} is not reachable from the root of the on-disk migration graph.`,
-          fix: 'The database may have been migrated outside this project. Use `migration status` to inspect the current state.',
-        }),
-      );
-    }
-    const pkgByDirName = new Map(bundles.map((p) => [p.dirName, p]));
-    const entries: MigrationLogEntry[] = appliedPath.map((edge) => {
-      const pkg = pkgByDirName.get(edge.dirName);
-      const ops = (pkg?.ops ?? []) as readonly MigrationPlanOperation[];
-      return {
-        dirName: edge.dirName,
-        from: edge.from,
-        to: edge.to,
-        migrationHash: edge.migrationHash,
-        operationCount: ops.length,
-        createdAt: edge.createdAt,
-      };
-    });
-
-    return ok({
-      ok: true,
-      markerHash,
-      applied: entries,
-      summary: `${entries.length} migration(s) applied`,
-    });
+    const ledger = await client.readLedger();
+    return ok(ledger);
   } catch (error) {
     if (CliStructuredError.is(error)) return notOk(error);
     if (MigrationToolsError.is(error)) return notOk(mapMigrationToolsError(error));
@@ -170,11 +107,12 @@ export function createMigrationLogCommand(): Command {
   setCommandDescriptions(
     command,
     'Show executed migration history',
-    'Reads the database marker and displays the applied migration chain\n' +
-      'from the initial state to the current marker position.',
+    'Reads the database ledger and displays every applied migration edge\n' +
+      'in chronological order, including rollbacks and re-applies.',
   );
   setCommandExamples(command, [
     'prisma-next migration log --db $DATABASE_URL',
+    'prisma-next migration log --utc --db $DATABASE_URL',
     'prisma-next migration log --json --db $DATABASE_URL',
   ]);
   setCommandSeeAlso(command, [
@@ -186,24 +124,20 @@ export function createMigrationLogCommand(): Command {
   addGlobalOptions(command)
     .option('--db <url>', 'Database connection string')
     .option('--config <path>', 'Path to prisma-next.config.ts')
+    .option('--utc', 'Render human timestamps in UTC instead of local time')
     .action(async (options: MigrationLogOptions) => {
       const flags = parseGlobalFlagsOrExit(options);
       const ui = createTerminalUI(flags);
       const result = await executeMigrationLogCommand(options, flags, ui);
-      const exitCode = handleResult(result, flags, ui, (logResult) => {
+      const exitCode = handleResult(result, flags, ui, (entries) => {
         if (flags.json) {
-          ui.output(JSON.stringify(logResult, null, 2));
+          ui.output(JSON.stringify(serializeLedgerEntriesForJson(entries), null, 2));
         } else if (!flags.quiet) {
-          const c = (fn: (s: string) => string, s: string) => (flags.color !== false ? fn(s) : s);
-          if (logResult.applied.length === 0) {
-            ui.log(logResult.summary);
+          if (entries.length === 0) {
+            ui.output(MIGRATION_LOG_EMPTY_MESSAGE);
           } else {
-            for (const entry of logResult.applied) {
-              ui.log(
-                `${c(cyan, '✓')} ${entry.dirName}  ${c(dim, entry.migrationHash.slice(0, 16) + '…')}  ${entry.operationCount} op(s)`,
-              );
-            }
-            ui.log(`\n${logResult.summary}`);
+            const styler = createAnsiMigrationListStyler({ useColor: ui.useColor });
+            ui.output(renderMigrationLogTable(entries, { utc: options.utc === true, styler }));
           }
         }
       });

package/src/control-api/client.ts

@@ -451,10 +451,10 @@ class ControlClientImpl implements ControlClient {
     return familyInstance.readAllMarkers({ driver });
   }
 
-  /** Reads the per-migration journal for `space` (defaults to the app contract space). */
-  async readLedger(space = APP_SPACE_ID): Promise<readonly LedgerEntryRecord[]> {
+  /** Reads the per-migration journal; omit `space` to return every space. */
+  async readLedger(space?: string): Promise<readonly LedgerEntryRecord[]> {
     const { driver, familyInstance } = await this.ensureConnected();
-    return familyInstance.readLedger({ driver, space });
+    return familyInstance.readLedger({ driver, ...ifDefined('space', space) });
   }
 
   async migrationApply(options: MigrationApplyOptions): Promise<MigrationApplyResult> {

package/src/utils/formatters/migration-graph-tree-render.ts

@@ -27,8 +27,15 @@ const LABEL_GAP = 2;
  */
 const DB_MARKER_NAME = 'db';
 
+export interface MigrationEdgeAnnotation {
+  readonly status?: 'applied' | 'pending';
+  readonly operationCount?: number;
+  readonly invariants?: readonly string[];
+}
+
 export interface RenderMigrationGraphTreeOptions {
   readonly refsByHash?: ReadonlyMap<string, readonly string[]>;
+  readonly edgeAnnotationsByHash?: ReadonlyMap<string, MigrationEdgeAnnotation>;
   readonly dbHash?: string;
   readonly contractHash?: string;
   readonly activeRefName?: string;
@@ -571,6 +578,28 @@ function createTreeStyler(opts: RenderMigrationGraphTreeOptions): MigrationListS
   };
 }
 
+function formatEdgeAnnotationSuffix(
+  migrationHash: string,
+  opts: RenderMigrationGraphTreeOptions,
+  style: MigrationListStyler,
+): string {
+  const annotation = opts.edgeAnnotationsByHash?.get(migrationHash);
+  if (annotation === undefined) {
+    return '';
+  }
+  const segments: string[] = [];
+  if (annotation.operationCount !== undefined) {
+    segments.push(`${annotation.operationCount} ops`);
+  }
+  if (annotation.invariants !== undefined && annotation.invariants.length > 0) {
+    segments.push(style.invariants(annotation.invariants));
+  }
+  if (segments.length === 0) {
+    return '';
+  }
+  return `  ${segments.join('  ')}`;
+}
+
 function formatEdgeHashColumn(
   edge: ClassifiedEdge,
   style: MigrationListStyler,
@@ -784,7 +813,8 @@ export function renderMigrationGraphTree(
         : style.dirName;
     const dirName = `${dirNameStyler(edge.dirName)}${dirNamePadding}`;
     const hashColumn = formatEdgeHashColumn(edge, style, hashLength, palette);
-    lines.push(trimTrailingWhitespace(`${gutterPad}${dirName}${hashColumn}`));
+    const annotationSuffix = formatEdgeAnnotationSuffix(edge.migrationHash, opts, style);
+    lines.push(trimTrailingWhitespace(`${gutterPad}${dirName}${hashColumn}${annotationSuffix}`));
   }
 
   return lines.join('\n');

package/src/utils/formatters/migration-list-data-column.ts

@@ -1,32 +1,10 @@
 import type { GlyphMode } from '../glyph-mode';
-import type { MigrationEdgeKind } from './migration-list-graph-topology';
-import type { MigrationListStyler } from './migration-list-render';
-import type { MigrationListEntry } from './migration-list-types';
 
 export const MIGRATION_LIST_HASH_WIDTH = 7;
 export const MIGRATION_LIST_EMPTY_SOURCE = '∅';
 export const MIGRATION_LIST_ASCII_EMPTY_SOURCE = '-';
 export const MIGRATION_LIST_FORWARD_EDGE_GLYPH = '→';
 export const MIGRATION_LIST_ASCII_FORWARD_EDGE_GLYPH = '->';
-export const MIGRATION_LIST_DECORATION_PREFIX = '  ';
-
-export const MIGRATION_LIST_UNICODE_KIND_GLYPH: Record<MigrationEdgeKind, string> = {
-  forward: '*',
-  rollback: '↩',
-  self: '⟲',
-};
-
-export const MIGRATION_LIST_ASCII_KIND_GLYPH: Record<MigrationEdgeKind, string> = {
-  forward: '*',
-  rollback: '<',
-  self: '~',
-};
-
-export function migrationListKindGlyph(glyphMode: GlyphMode, edgeKind: MigrationEdgeKind): string {
-  return glyphMode === 'ascii'
-    ? MIGRATION_LIST_ASCII_KIND_GLYPH[edgeKind]
-    : MIGRATION_LIST_UNICODE_KIND_GLYPH[edgeKind];
-}
 
 export function migrationListForwardArrow(glyphMode: GlyphMode): string {
   return glyphMode === 'ascii'
@@ -42,74 +20,3 @@ export function abbreviateContractHash(hash: string): string {
   const stripped = hash.startsWith('sha256:') ? hash.slice(7) : hash;
   return stripped.slice(0, MIGRATION_LIST_HASH_WIDTH);
 }
-
-export function computeMigrationDirNameWidth(migrations: readonly MigrationListEntry[]): number {
-  if (migrations.length === 0) return 0;
-  return Math.max(...migrations.map((entry) => entry.dirName.length)) + 2;
-}
-
-function formatSourceColumn(
-  from: string | null,
-  style: MigrationListStyler,
-  emptySource: string,
-): string {
-  if (from === null) {
-    return style.glyph(emptySource) + ' '.repeat(MIGRATION_LIST_HASH_WIDTH - emptySource.length);
-  }
-  return style.sourceHash(abbreviateContractHash(from));
-}
-
-export function formatDecorations(
-  providedInvariants: readonly string[],
-  refs: readonly string[],
-  style: MigrationListStyler,
-): string {
-  const blocks: string[] = [];
-  if (providedInvariants.length > 0) {
-    blocks.push(style.invariants(providedInvariants));
-  }
-  if (refs.length > 0) {
-    blocks.push(style.refs(refs));
-  }
-  if (blocks.length === 0) return '';
-  return `${MIGRATION_LIST_DECORATION_PREFIX}${blocks.join(' ')}`;
-}
-
-export interface MigrationDataColumnOptions {
-  readonly dirNameWidth: number;
-  readonly edgeKind: MigrationEdgeKind;
-  readonly style: MigrationListStyler;
-  readonly forwardArrow?: string;
-  readonly emptySource?: string;
-}
-
-export function formatMigrationDataColumn(
-  migration: MigrationListEntry,
-  options: MigrationDataColumnOptions,
-): string {
-  const {
-    dirNameWidth,
-    edgeKind,
-    style,
-    forwardArrow = MIGRATION_LIST_FORWARD_EDGE_GLYPH,
-    emptySource = MIGRATION_LIST_EMPTY_SOURCE,
-  } = options;
-  const dirNamePadding = ' '.repeat(Math.max(0, dirNameWidth - migration.dirName.length));
-  const dirName = `${style.dirName(migration.dirName)}${dirNamePadding}`;
-  const decorations = formatDecorations(migration.providedInvariants, migration.refs, style);
-
-  if (edgeKind === 'self') {
-    const contractHash = migration.from ?? migration.to;
-    const hash = style.sourceHash(abbreviateContractHash(contractHash));
-    return `${dirName}${hash}${decorations}`;
-  }
-
-  const source = formatSourceColumn(migration.from, style, emptySource);
-  const arrow = style.glyph(forwardArrow);
-  const dest = style.destHash(abbreviateContractHash(migration.to));
-  return `${dirName}${source} ${arrow} ${dest}${decorations}`;
-}
-
-export function formatNodeLineDataColumn(contractHash: string, style: MigrationListStyler): string {
-  return style.sourceHash(abbreviateContractHash(contractHash));
-}

package/src/utils/formatters/migration-list-graph-topology.ts

@@ -11,8 +11,7 @@ export interface MigrationListGraphTopology {
 }
 
 // ---------------------------------------------------------------------------
-// Shared classifier — operates on a normalized edge shape common to both
-// MigrationListEntry (Tier-2) and MigrationEdge / MigrationGraph (Tier-3).
+// Shared classifier — operates on a normalized edge shape for MigrationGraph.
 // ---------------------------------------------------------------------------
 
 interface NormalizedEdge {
@@ -315,9 +314,6 @@ function canonicalFrom(from: string | null): string {
 
 /**
  * Classify forward/rollback/self for a Tier-2 `MigrationListEntry[]` edge set.
- * Returns the kind of each migration plus the forward in/out degree of each
- * contract node. This is the established Tier-2 surface; its behaviour is
- * unchanged — only its implementation now delegates to the shared classifier.
  */
 export function classifyMigrationListGraphTopology(
   entries: readonly MigrationListEntry[],
@@ -333,8 +329,6 @@ export function classifyMigrationListGraphTopology(
 
 /**
  * Classify forward/rollback/self for a `MigrationGraph` edge set (Tier-3).
- * Delegates to the same shared classifier as `classifyMigrationListGraphTopology`
- * so both tiers agree on forward/rollback/self without duplicating logic.
  */
 export function classifyMigrationGraphTopology(graph: MigrationGraph): MigrationListGraphTopology {
   const normalized: NormalizedEdge[] = [];