@prisma-next/cli 0.14.0-dev.9 → 0.14.0-dev.90

package/dist/verify-DDCb0R2r.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"verify-DDCb0R2r.mjs","names":[],"sources":["../src/utils/formatters/verify.ts"],"sourcesContent":["import type {\n  CoreSchemaView,\n  ExpectationFailureReason,\n  IntrospectSchemaResult,\n  SchemaDiffIssue,\n  SchemaTreeNode,\n  SignDatabaseResult,\n  VerifyDatabaseResult,\n  VerifyDatabaseSchemaResult,\n} from '@prisma-next/framework-components/control';\nimport { ifDefined } from '@prisma-next/utils/defined';\nimport { bold, cyan, dim, green, magenta, red, yellow } from 'colorette';\nimport type { GlobalFlags } from '../global-flags';\nimport { createColorFormatter, formatDim, isVerbose } from './helpers';\n\n/** Human-readable label for each failure reason, prefixed onto an issue's message for display. */\nconst REASON_LABEL: Record<ExpectationFailureReason, string> = {\n  'not-found': 'missing',\n  'not-expected': 'extra',\n  'not-equal': 'mismatch',\n};\n\n/**\n * The issue's display text: its own path, prefixed with a human label for\n * why it's flagged. Turning `reason` (and the path) into prose is this\n * formatter's job, not the differ's — the differ's issue is data (`path` +\n * `reason` + nodes), not prose.\n */\nfunction formatIssueMessage(issue: SchemaDiffIssue): string {\n  return `${REASON_LABEL[issue.reason]}: ${issue.path.join('/')}`;\n}\n\n// ============================================================================\n// Verify Output Formatters\n// ============================================================================\n\nexport interface DbVerifyCommandSuccessResult {\n  readonly ok: true;\n  readonly mode: 'full' | 'marker-only';\n  readonly summary: string;\n  readonly contract: VerifyDatabaseResult['contract'];\n  readonly marker?: VerifyDatabaseResult['marker'];\n  readonly target: VerifyDatabaseResult['target'];\n  readonly missingCodecs?: VerifyDatabaseResult['missingCodecs'];\n  readonly codecCoverageSkipped?: VerifyDatabaseResult['codecCoverageSkipped'];\n  readonly schema?: {\n    readonly summary: string;\n    readonly strict: boolean;\n    /**\n     * Warn-graded finding messages (observed-policy drift). Informational —\n     * present on a passing verify; the full-mode result summarizes them as a\n     * flat message list.\n     */\n    readonly warnings?: readonly string[];\n  };\n  /**\n   * Live element names no contract space declares. In full success this is\n   * only ever non-empty in lenient mode — strict mode fails on it — and is\n   * rendered informationally.\n   */\n  readonly unclaimed?: readonly string[];\n  readonly warning?: string;\n  readonly meta?:\n    | (NonNullable<VerifyDatabaseResult['meta']> & {\n        readonly schemaVerification: 'performed' | 'skipped';\n      })\n    | {\n        readonly schemaVerification: 'performed' | 'skipped';\n      };\n  readonly timings: {\n    readonly total: number;\n  };\n}\n\n/**\n * Formats human-readable output for database verify.\n */\nexport function formatVerifyOutput(\n  result: DbVerifyCommandSuccessResult,\n  flags: GlobalFlags,\n): string {\n  if (flags.quiet) {\n    return '';\n  }\n\n  const lines: string[] = [];\n\n  const useColor = flags.color !== false;\n  const formatGreen = createColorFormatter(useColor, green);\n  const formatYellow = createColorFormatter(useColor, yellow);\n  const formatDimText = (text: string) => formatDim(useColor, text);\n  const verificationMode =\n    result.mode === 'full'\n      ? `marker + schema${result.schema?.strict ? ' (strict)' : ' (tolerant)'}`\n      : 'marker only (--marker-only)';\n\n  lines.push(`${formatGreen('✔')} ${result.summary}`);\n  lines.push(`${formatDimText(`  verification: ${verificationMode}`)}`);\n  lines.push(`${formatDimText(`  storageHash: ${result.contract.storageHash}`)}`);\n  if (result.contract.profileHash) {\n    lines.push(`${formatDimText(`  profileHash: ${result.contract.profileHash}`)}`);\n  }\n  if (result.schema?.warnings && result.schema.warnings.length > 0) {\n    lines.push('');\n    lines.push(formatYellow('Schema warnings:'));\n    for (const message of result.schema.warnings) {\n      lines.push(`  ${formatYellow('⚠')} ${message}`);\n    }\n  }\n\n  if (result.unclaimed && result.unclaimed.length > 0) {\n    lines.push('');\n    lines.push(formatYellow('Unclaimed elements (declared by no contract):'));\n    for (const name of result.unclaimed) {\n      lines.push(`  ${formatYellow('⚠')} ${name}`);\n    }\n  }\n\n  if (result.warning) {\n    lines.push('');\n    lines.push(`${formatYellow('⚠')} ${result.warning}`);\n  }\n\n  if (isVerbose(flags, 1)) {\n    if (result.codecCoverageSkipped) {\n      lines.push(\n        `${formatDimText('  Codec coverage check skipped (helper returned no supported types)')}`,\n      );\n    }\n    lines.push(`${formatDimText(`  Total time: ${result.timings.total}ms`)}`);\n  }\n\n  return lines.join('\\n');\n}\n\n/**\n * Formats JSON output for database verify.\n */\nexport function formatVerifyJson(result: DbVerifyCommandSuccessResult): string {\n  const output = {\n    ok: result.ok,\n    summary: result.summary,\n    mode: result.mode,\n    contract: result.contract,\n    ...ifDefined('marker', result.marker),\n    target: result.target,\n    ...ifDefined('missingCodecs', result.missingCodecs),\n    ...ifDefined('codecCoverageSkipped', result.codecCoverageSkipped),\n    ...ifDefined('schema', result.schema),\n    unclaimed: result.unclaimed ?? [],\n    ...ifDefined('warning', result.warning),\n    ...ifDefined('meta', result.meta),\n    timings: result.timings,\n  };\n\n  return JSON.stringify(output, null, 2);\n}\n\n/**\n * Formats JSON output for database introspection.\n */\nexport function formatIntrospectJson(result: IntrospectSchemaResult<unknown>): string {\n  return JSON.stringify(result, null, 2);\n}\n\n/**\n * Renders a schema tree structure from CoreSchemaView.\n * Status-glyph tree styling shared with the retired verification-tree renderer.\n */\nfunction renderSchemaTree(\n  node: SchemaTreeNode,\n  flags: GlobalFlags,\n  options: {\n    readonly isLast: boolean;\n    readonly prefix: string;\n    readonly useColor: boolean;\n    readonly formatDimText: (text: string) => string;\n    readonly isRoot?: boolean;\n  },\n): string[] {\n  const { isLast, prefix, useColor, formatDimText, isRoot = false } = options;\n  const lines: string[] = [];\n\n  // Format node label with color based on kind (matching schema-verify style)\n  let formattedLabel: string = node.label;\n\n  if (useColor) {\n    switch (node.kind) {\n      case 'root':\n        formattedLabel = bold(node.label);\n        break;\n      case 'entity': {\n        // Parse \"table tableName\" format - color \"table\" dim, tableName cyan\n        const tableMatch = node.label.match(/^table\\s+(.+)$/);\n        if (tableMatch?.[1]) {\n          const tableName = tableMatch[1];\n          formattedLabel = `${dim('table')} ${cyan(tableName)}`;\n        } else {\n          // Fallback: color entire label with cyan\n          formattedLabel = cyan(node.label);\n        }\n        break;\n      }\n      case 'collection': {\n        // \"columns\" grouping node - dim the label\n        formattedLabel = dim(node.label);\n        break;\n      }\n      case 'field': {\n        // Parse column name format: \"columnName: typeDisplay (nullability)\"\n        // Color code: column name (cyan), type (default), nullability (dim)\n        const columnMatch = node.label.match(/^([^:]+):\\s*(.+)$/);\n        if (columnMatch?.[1] && columnMatch[2]) {\n          const columnName = columnMatch[1];\n          const rest = columnMatch[2];\n          // Parse rest: \"typeDisplay (nullability)\"\n          const typeMatch = rest.match(/^([^\\s(]+)\\s*(\\([^)]+\\))$/);\n          if (typeMatch?.[1] && typeMatch[2]) {\n            const typeDisplay = typeMatch[1];\n            const nullability = typeMatch[2];\n            formattedLabel = `${cyan(columnName)}: ${typeDisplay} ${dim(nullability)}`;\n          } else {\n            // Fallback if format doesn't match\n            formattedLabel = `${cyan(columnName)}: ${rest}`;\n          }\n        } else {\n          formattedLabel = node.label;\n        }\n        break;\n      }\n      case 'index': {\n        // Parse index/unique constraint/primary key formats\n        // \"primary key: columnName\" -> dim \"primary key\", cyan columnName\n        const pkMatch = node.label.match(/^primary key:\\s*(.+)$/);\n        if (pkMatch?.[1]) {\n          const columnNames = pkMatch[1];\n          formattedLabel = `${dim('primary key')}: ${cyan(columnNames)}`;\n        } else {\n          // \"unique name\" -> dim \"unique\", cyan \"name\"\n          const uniqueMatch = node.label.match(/^unique\\s+(.+)$/);\n          if (uniqueMatch?.[1]) {\n            const name = uniqueMatch[1];\n            formattedLabel = `${dim('unique')} ${cyan(name)}`;\n          } else {\n            // \"index name\" or \"unique index name\" -> dim label prefix, cyan name\n            const indexMatch = node.label.match(/^(unique\\s+)?index\\s+(.+)$/);\n            if (indexMatch?.[2]) {\n              const indexPrefix = indexMatch[1] ? `${dim('unique')} ` : '';\n              const name = indexMatch[2];\n              formattedLabel = `${indexPrefix}${dim('index')} ${cyan(name)}`;\n            } else {\n              formattedLabel = dim(node.label);\n            }\n          }\n        }\n        break;\n      }\n      case 'dependency': {\n        // Parse extension message formats similar to schema-verify\n        // \"extensionName extension is enabled\" -> cyan extensionName, dim rest\n        const extMatch = node.label.match(/^([^\\s]+)\\s+(extension is enabled)$/);\n        if (extMatch?.[1] && extMatch[2]) {\n          const extName = extMatch[1];\n          const rest = extMatch[2];\n          formattedLabel = `${cyan(extName)} ${dim(rest)}`;\n        } else {\n          // Fallback: color entire label with magenta\n          formattedLabel = magenta(node.label);\n        }\n        break;\n      }\n      default:\n        formattedLabel = node.label;\n        break;\n    }\n  }\n\n  // Root node renders without tree characters or prefix\n  if (isRoot) {\n    lines.push(formattedLabel);\n  } else {\n    const treeChar = isLast ? '└' : '├';\n    const treePrefix = `${formatDimText(treeChar)}─ `;\n    lines.push(`${prefix}${treePrefix}${formattedLabel}`);\n  }\n\n  // Render children if present\n  if (node.children && node.children.length > 0) {\n    const childPrefix = isRoot ? '' : `${prefix}${isLast ? '   ' : `${formatDimText('│')}  `}`;\n    for (let i = 0; i < node.children.length; i++) {\n      const child = node.children[i];\n      if (!child) continue;\n      const isLastChild = i === node.children.length - 1;\n      const childLines = renderSchemaTree(child, flags, {\n        isLast: isLastChild,\n        prefix: childPrefix,\n        useColor,\n        formatDimText,\n        isRoot: false,\n      });\n      lines.push(...childLines);\n    }\n  }\n\n  return lines;\n}\n\n/**\n * Formats human-readable output for database introspection.\n */\nexport function formatIntrospectOutput(\n  result: IntrospectSchemaResult<unknown>,\n  schemaView: CoreSchemaView | undefined,\n  flags: GlobalFlags,\n): string {\n  if (flags.quiet) {\n    return '';\n  }\n\n  const lines: string[] = [];\n\n  const useColor = flags.color !== false;\n  const formatDimText = (text: string) => formatDim(useColor, text);\n\n  if (schemaView) {\n    // Render tree structure - root node is special (no tree characters)\n    const treeLines = renderSchemaTree(schemaView.root, flags, {\n      isLast: true,\n      prefix: '',\n      useColor,\n      formatDimText,\n      isRoot: true,\n    });\n    lines.push(...treeLines);\n  } else {\n    // Fallback: print summary when toSchemaView is not available\n    lines.push(`✔ ${result.summary}`);\n    if (isVerbose(flags, 1)) {\n      lines.push(`  Target: ${result.target.familyId}/${result.target.id}`);\n      if (result.meta?.dbUrl) {\n        lines.push(`  Database: ${result.meta.dbUrl}`);\n      }\n    }\n  }\n\n  // Add timings in verbose mode\n  if (isVerbose(flags, 1)) {\n    lines.push(`${formatDimText(`  Total time: ${result.timings.total}ms`)}`);\n  }\n\n  return lines.join('\\n');\n}\n\n/**\n * Formats human-readable output for database schema verification.\n */\nexport function formatSchemaVerifyOutput(\n  result: VerifyDatabaseSchemaResult,\n  flags: GlobalFlags,\n  unclaimed: readonly string[] = [],\n): string {\n  if (flags.quiet) {\n    return '';\n  }\n\n  const lines: string[] = [];\n\n  const useColor = flags.color !== false;\n  const formatGreen = createColorFormatter(useColor, green);\n  const formatRed = createColorFormatter(useColor, red);\n  const formatYellow = createColorFormatter(useColor, yellow);\n  const formatDimText = (text: string) => formatDim(useColor, text);\n\n  const issueMessages = result.schema.issues.map(formatIssueMessage);\n  if (issueMessages.length > 0) {\n    lines.push(formatRed('Schema issues:'));\n    for (const message of issueMessages) {\n      lines.push(`  ${formatRed('✖')} ${message}`);\n    }\n  }\n\n  const warningMessages = (result.schema.warnings?.issues ?? []).map(formatIssueMessage);\n  if (warningMessages.length > 0) {\n    if (lines.length > 0) lines.push('');\n    lines.push(formatYellow('Schema warnings:'));\n    for (const message of warningMessages) {\n      lines.push(`  ${formatYellow('⚠')} ${message}`);\n    }\n  }\n\n  if (unclaimed.length > 0) {\n    const strict = result.meta?.strict ?? false;\n    if (lines.length > 0) lines.push('');\n    lines.push(\n      (strict ? formatRed : formatYellow)('Unclaimed elements (declared by no contract):'),\n    );\n    for (const name of unclaimed) {\n      lines.push(`  ${(strict ? formatRed : formatYellow)(strict ? '✖' : '⚠')} ${name}`);\n    }\n  }\n\n  if (isVerbose(flags, 1)) {\n    lines.push(`${formatDimText(`  Total time: ${result.timings.total}ms`)}`);\n  }\n\n  // Blank line before summary\n  if (lines.length > 0) lines.push('');\n\n  // Summary line at the end: verdict with status glyph\n  if (result.ok) {\n    lines.push(`${formatGreen('✔')} ${result.summary}`);\n  } else {\n    const codeText = result.code ? ` (${result.code})` : '';\n    lines.push(`${formatRed('✖')} ${result.summary}${codeText}`);\n  }\n\n  return lines.join('\\n');\n}\n\n/**\n * Formats JSON output for database schema verification. The unclaimed-elements\n * list is a top-level field alongside the combined result, reported once for\n * the whole database.\n */\nexport function formatSchemaVerifyJson(\n  result: VerifyDatabaseSchemaResult,\n  unclaimed: readonly string[] = [],\n): string {\n  return JSON.stringify({ ...result, unclaimed }, null, 2);\n}\n\n// ============================================================================\n// Sign Output Formatters\n// ============================================================================\n\n/**\n * Formats human-readable output for database sign.\n */\nexport function formatSignOutput(result: SignDatabaseResult, flags: GlobalFlags): string {\n  if (flags.quiet) {\n    return '';\n  }\n\n  const lines: string[] = [];\n\n  const useColor = flags.color !== false;\n  const formatGreen = createColorFormatter(useColor, green);\n  const formatDimText = (text: string) => formatDim(useColor, text);\n\n  if (result.ok) {\n    // Main success message in white (not dimmed)\n    lines.push(`${formatGreen('✔')} Database signed`);\n\n    // Show from -> to hashes with clear labels\n    const previousHash = result.marker.previous?.storageHash ?? 'none';\n    const currentHash = result.contract.storageHash;\n\n    lines.push(`${formatDimText(`  from: ${previousHash}`)}`);\n    lines.push(`${formatDimText(`  to:   ${currentHash}`)}`);\n\n    if (isVerbose(flags, 1)) {\n      if (result.contract.profileHash) {\n        lines.push(`${formatDimText(`  profileHash: ${result.contract.profileHash}`)}`);\n      }\n      if (result.marker.previous?.profileHash) {\n        lines.push(\n          `${formatDimText(`  previous profileHash: ${result.marker.previous.profileHash}`)}`,\n        );\n      }\n      lines.push(`${formatDimText(`  Total time: ${result.timings.total}ms`)}`);\n    }\n  }\n\n  return lines.join('\\n');\n}\n\n/**\n * Formats JSON output for database sign.\n */\nexport function formatSignJson(result: SignDatabaseResult): string {\n  return JSON.stringify(result, null, 2);\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma-next/cli",
-  "version": "0.14.0-dev.9",
+  "version": "0.14.0-dev.90",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
@@ -8,46 +8,46 @@
     "prisma-next": "./dist/cli.js"
   },
   "dependencies": {
-    "@clack/prompts": "^1.4.0",
-    "@prisma-next/config": "0.14.0-dev.9",
-    "@prisma-next/config-loader": "0.14.0-dev.9",
-    "@prisma-next/contract": "0.14.0-dev.9",
-    "@prisma-next/emitter": "0.14.0-dev.9",
-    "@prisma-next/errors": "0.14.0-dev.9",
-    "@prisma-next/framework-components": "0.14.0-dev.9",
-    "@prisma-next/language-server": "0.14.0-dev.9",
-    "@prisma-next/migration-tools": "0.14.0-dev.9",
-    "@prisma-next/psl-parser": "0.14.0-dev.9",
-    "@prisma-next/psl-printer": "0.14.0-dev.9",
-    "@prisma-next/cli-telemetry": "0.14.0-dev.9",
-    "@prisma-next/utils": "0.14.0-dev.9",
-    "arktype": "^2.2.0",
+    "@clack/prompts": "^1.6.0",
+    "@prisma-next/config": "0.14.0-dev.90",
+    "@prisma-next/config-loader": "0.14.0-dev.90",
+    "@prisma-next/contract": "0.14.0-dev.90",
+    "@prisma-next/emitter": "0.14.0-dev.90",
+    "@prisma-next/errors": "0.14.0-dev.90",
+    "@prisma-next/framework-components": "0.14.0-dev.90",
+    "@prisma-next/language-server": "0.14.0-dev.90",
+    "@prisma-next/migration-tools": "0.14.0-dev.90",
+    "@prisma-next/psl-parser": "0.14.0-dev.90",
+    "@prisma-next/psl-printer": "0.14.0-dev.90",
+    "@prisma-next/cli-telemetry": "0.14.0-dev.90",
+    "@prisma-next/utils": "0.14.0-dev.90",
+    "arktype": "^2.2.2",
     "ci-info": "^4.3.1",
     "clipanion": "4.0.0-rc.4",
     "closest-match": "^1.3.3",
     "colorette": "^2.0.20",
     "commander": "^14.0.3",
-    "esbuild": "^0.28.0",
+    "esbuild": "^0.28.1",
     "jsonc-parser": "^3.3.1",
-    "package-manager-detector": "^1.6.0",
+    "package-manager-detector": "^1.7.0",
     "pathe": "^2.0.3",
     "string-width": "^8.2.1",
     "strip-ansi": "^7.2.0",
     "wrap-ansi": "^10.0.0"
   },
   "devDependencies": {
-    "@prisma-next/sql-contract": "0.14.0-dev.9",
-    "@prisma-next/sql-contract-emitter": "0.14.0-dev.9",
-    "@prisma-next/sql-contract-ts": "0.14.0-dev.9",
-    "@prisma-next/sql-operations": "0.14.0-dev.9",
-    "@prisma-next/sql-runtime": "0.14.0-dev.9",
-    "@prisma-next/test-utils": "0.14.0-dev.9",
-    "@prisma-next/tsconfig": "0.14.0-dev.9",
-    "@prisma-next/tsdown": "0.14.0-dev.9",
-    "@types/node": "25.9.1",
-    "tsdown": "0.22.1",
+    "@prisma-next/sql-contract": "0.14.0-dev.90",
+    "@prisma-next/sql-contract-emitter": "0.14.0-dev.90",
+    "@prisma-next/sql-contract-ts": "0.14.0-dev.90",
+    "@prisma-next/sql-operations": "0.14.0-dev.90",
+    "@prisma-next/sql-runtime": "0.14.0-dev.90",
+    "@prisma-next/test-utils": "0.14.0-dev.90",
+    "@prisma-next/tsconfig": "0.14.0-dev.90",
+    "@prisma-next/tsdown": "0.14.0-dev.90",
+    "@types/node": "25.9.4",
+    "tsdown": "0.22.3",
     "typescript": "5.9.3",
-    "vitest": "4.1.8"
+    "vitest": "4.1.10"
   },
   "peerDependencies": {
     "typescript": ">=5.9"

package/src/commands/db-verify.ts

@@ -1,10 +1,7 @@
 import { readFile } from 'node:fs/promises';
 import { loadConfig } from '@prisma-next/config-loader';
 import type { Contract } from '@prisma-next/contract/types';
-import type {
-  VerifyDatabaseResult,
-  VerifyDatabaseSchemaResult,
-} from '@prisma-next/framework-components/control';
+import type { VerifyDatabaseResult } from '@prisma-next/framework-components/control';
 import {
   createControlStack,
   VERIFY_CODE_HASH_MISMATCH,
@@ -29,7 +26,7 @@ import {
   errorTargetMismatch,
   errorUnexpected,
 } from '../utils/cli-errors';
-import { combineSchemaResults } from '../utils/combine-schema-results';
+import { type CombinedVerifyResult, combineVerifyResults } from '../utils/combine-verify-results';
 import {
   addGlobalOptions,
   maskConnectionUrl,
@@ -103,7 +100,7 @@ function mapVerifyFailure(verifyResult: VerifyDatabaseResult): CliStructuredErro
   return errorRuntime(verifyResult.summary);
 }
 
-type DbVerifyFailure = CliStructuredError | VerifyDatabaseSchemaResult;
+type DbVerifyFailure = CliStructuredError | CombinedVerifyResult;
 
 function errorInvalidVerifyMode(options: {
   readonly why: string;
@@ -419,12 +416,13 @@ async function executeDbVerifyCommand(
       });
     }
 
-    const combined = combineSchemaResults(
+    const combined = combineVerifyResults(
       aggregateResult.value.schemaResults,
       aggregateResult.value.appSpaceId,
       options.strict ?? false,
+      aggregateResult.value.unclaimed,
     );
-    if (!combined.ok) {
+    if (!combined.result.ok) {
       return notOk(combined);
     }
 
@@ -438,10 +436,13 @@ async function executeDbVerifyCommand(
       ...ifDefined('missingCodecs', verifyResult.missingCodecs),
       ...ifDefined('codecCoverageSkipped', verifyResult.codecCoverageSkipped),
       schema: {
-        summary: combined.summary,
-        counts: combined.schema.counts,
-        strict: combined.meta?.strict ?? false,
+        summary: combined.result.summary,
+        strict: combined.result.meta?.strict ?? false,
+        warnings: (combined.result.schema.warnings?.issues ?? []).map((issue) =>
+          issue.path.join('/'),
+        ),
       },
+      unclaimed: combined.unclaimed,
       meta: {
         ...(verifyResult.meta ?? {}),
         schemaVerification: 'performed',
@@ -459,7 +460,7 @@ async function executeDbSchemaOnlyVerifyCommand(
   options: DbVerifyOptions,
   flags: GlobalFlags,
   ui: TerminalUI,
-): Promise<Result<VerifyDatabaseSchemaResult, CliStructuredError>> {
+): Promise<Result<CombinedVerifyResult, CliStructuredError>> {
   const paths = await resolveVerifyPaths(options);
   renderVerifyHeader(paths, options, 'schema-only', flags, ui);
 
@@ -484,10 +485,11 @@ async function executeDbSchemaOnlyVerifyCommand(
     if (!aggregateResult.ok) return notOk(aggregateResult.failure);
 
     return ok(
-      combineSchemaResults(
+      combineVerifyResults(
         aggregateResult.value.schemaResults,
         aggregateResult.value.appSpaceId,
         options.strict ?? false,
+        aggregateResult.value.unclaimed,
       ),
     );
   } catch (error) {
@@ -542,18 +544,26 @@ export function createDbVerifyCommand(): Command {
 
       if (mode === 'schema-only') {
         const result = await executeDbSchemaOnlyVerifyCommand(options, flags, ui);
-        const exitCode = handleResult(result, flags, ui, (schemaVerifyResult) => {
+        const exitCode = handleResult(result, flags, ui, (combined) => {
           if (flags.json) {
-            ui.output(formatSchemaVerifyJson(schemaVerifyResult));
+            ui.output(formatSchemaVerifyJson(combined.result, combined.unclaimed));
           } else {
-            const output = formatSchemaVerifyOutput(schemaVerifyResult, flags);
+            // Always show schema-drift failures, even in quiet mode — exiting 1
+            // without diagnostics is unhelpful (same policy as the full-mode
+            // failure branch below).
+            const renderFlags = combined.result.ok ? flags : { ...flags, quiet: false };
+            const output = formatSchemaVerifyOutput(
+              combined.result,
+              renderFlags,
+              combined.unclaimed,
+            );
             if (output) {
               ui.log(output);
             }
           }
         });
 
-        if (result.ok && !result.value.ok) {
+        if (result.ok && !result.value.result.ok) {
           process.exit(1);
         }
 
@@ -580,11 +590,15 @@ export function createDbVerifyCommand(): Command {
       }
 
       if (flags.json) {
-        ui.output(formatSchemaVerifyJson(result.failure));
+        ui.output(formatSchemaVerifyJson(result.failure.result, result.failure.unclaimed));
       } else {
         // Always show schema-drift failures, even in quiet mode — exiting 1 without
         // diagnostics is unhelpful.
-        const output = formatSchemaVerifyOutput(result.failure, { ...flags, quiet: false });
+        const output = formatSchemaVerifyOutput(
+          result.failure.result,
+          { ...flags, quiet: false },
+          result.failure.unclaimed,
+        );
         if (output) {
           ui.log(output);
         }

package/src/commands/migrate.ts

@@ -2,7 +2,10 @@ import { readFile } from 'node:fs/promises';
 import { loadConfig } from '@prisma-next/config-loader';
 import type { Contract } from '@prisma-next/contract/types';
 import { createControlStack } from '@prisma-next/framework-components/control';
-import { type ContractSpaceMember, requireHeadRef } from '@prisma-next/migration-tools/aggregate';
+import {
+  type AggregateContractSpace,
+  requireHeadRef,
+} from '@prisma-next/migration-tools/aggregate';
 import { EMPTY_CONTRACT_HASH } from '@prisma-next/migration-tools/constants';
 import { errorUnknownInvariant, MigrationToolsError } from '@prisma-next/migration-tools/errors';
 import { findLatestMigration, isGraphNode } from '@prisma-next/migration-tools/migration-graph';
@@ -13,7 +16,7 @@ import { ifDefined } from '@prisma-next/utils/defined';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
 import { createControlClient } from '../control-api/client';
-import { planMemberPath } from '../control-api/operations/migrate';
+import { planSpacePath } from '../control-api/operations/migrate';
 import type {
   MigrateFailure,
   MigratePathDecision,
@@ -149,8 +152,8 @@ export interface MigrateResult {
  * Computes the path through the SAME seam as `executeMigrate`:
  * - `readAllMarkers()` for the from-state (when no `--from` is given), preserving
  *   the full marker including `invariants` (not just `storageHash`).
- * - `planMemberPath()` (shared with `executeMigrate`) for per-member path selection,
- *   which feeds `graphWalkStrategy()` with the same target hash, target invariants,
+ * - `planSpacePath()` (shared with `executeMigrate`) for per-space path selection,
+ *   which feeds `resolveRecordedPath()` with the same target hash, target invariants,
  *   and current marker as the real apply path uses.
  *
  * Returns BEFORE any write boundary (`runMigration` / marker / DDL). No
@@ -203,7 +206,7 @@ async function executeMigrateShowCommand(
   const appGraph = aggregate.app.graph();
 
   // Resolve the --to target (defaults to the on-disk contract, same as migrate).
-  // Also capture the ref's invariants so planMemberPath feeds graphWalkStrategy the
+  // Also capture the ref's invariants so planSpacePath feeds resolveRecordedPath the
   // same target invariants that real migrate would use (refInvariants ?? headRef.invariants).
   let targetHash: string = contractHash;
   let refInvariants: readonly string[] | undefined;
@@ -258,13 +261,13 @@ async function executeMigrateShowCommand(
   // - Explicit --from: parse it offline (no connection).
   // - Omitted: read the live DB marker via readAllMarkers() — the same source migrate uses.
   //
-  // Full marker records (storageHash + invariants) are preserved so planMemberPath
-  // can feed graphWalkStrategy the complete currentMarker — exactly as executeMigrate
+  // Full marker records (storageHash + invariants) are preserved so planSpacePath
+  // can feed resolveRecordedPath the complete currentMarker — exactly as executeMigrate
   // does via familyInstance.readAllMarkers(). A stripped { storageHash, invariants: [] }
   // marker would produce a different `required` set and a different (incorrect) path.
   type LiveMarker = { readonly storageHash: string; readonly invariants: readonly string[] };
   const markerBySpace = new Map<string, LiveMarker | null>();
-  const allMembers: ReadonlyArray<ContractSpaceMember> = [aggregate.app, ...aggregate.extensions];
+  const allSpaces: ReadonlyArray<AggregateContractSpace> = [aggregate.app, ...aggregate.extensions];
 
   if (hasExplicitFrom) {
     // @db with explicit --from requires a connection
@@ -301,7 +304,7 @@ async function executeMigrateShowCommand(
       } else {
         // Offline hypothetical: the --from ref only carries a hash (no live invariants).
         // Apply the from-hash marker to the APP space only. Extension spaces are left
-        // absent from markerBySpace (treated as null / greenfield by planMemberPath),
+        // absent from markerBySpace (treated as null / greenfield by planSpacePath),
         // so they plan from their own marker → own head — exactly as executeMigrate does.
         const fromHash = fromResult.value.hash;
         const offlineMarker: LiveMarker | null =
@@ -334,9 +337,9 @@ async function executeMigrateShowCommand(
       const allMarkers = await client.readAllMarkers();
       // Store the full marker record (storageHash + invariants) per space.
       // This is the same data executeMigrate uses via familyInstance.readAllMarkers().
-      for (const member of allMembers) {
-        const marker = allMarkers.get(member.spaceId);
-        markerBySpace.set(member.spaceId, marker ?? null);
+      for (const space of allSpaces) {
+        const marker = allMarkers.get(space.spaceId);
+        markerBySpace.set(space.spaceId, marker ?? null);
       }
     } catch (error) {
       if (CliStructuredError.is(error)) {
@@ -355,35 +358,35 @@ async function executeMigrateShowCommand(
     }
   }
 
-  // Walk the path via planMemberPath — the same helper executeMigrate uses.
-  // planMemberPath feeds graphWalkStrategy identical inputs (targetHash, targetInvariants,
+  // Walk the path via planSpacePath — the same helper executeMigrate uses.
+  // planSpacePath feeds resolveRecordedPath identical inputs (targetHash, targetInvariants,
   // currentMarker with full invariants), so the preview path is always the path migrate runs.
   //
   // Canonical schedule order: extensions alphabetically first, then app — mirroring the
   // runner's `applyOrder` in operations/migrate.ts so the "Will run, in order:" list
   // reflects the actual execution sequence (extensions install first, app last).
-  const canonicalOrderMembers: ReadonlyArray<ContractSpaceMember> = [
+  const canonicalOrderSpaces: ReadonlyArray<AggregateContractSpace> = [
     ...aggregate.extensions,
     aggregate.app,
   ];
   const orderedMigrations: MigrateShowMigration[] = [];
-  for (const member of canonicalOrderMembers) {
-    const isAppMember = member.spaceId === aggregate.app.spaceId;
-    const headRef = requireHeadRef(member);
-    const memberTargetHash = isAppMember ? targetHash : headRef.hash;
-    const memberRefInvariants = isAppMember ? refInvariants : undefined;
-    const liveMarker = markerBySpace.get(member.spaceId) ?? null;
-
-    const outcome = planMemberPath({
-      member,
+  for (const space of canonicalOrderSpaces) {
+    const isAppSpace = space.spaceId === aggregate.app.spaceId;
+    const headRef = requireHeadRef(space);
+    const spaceTargetHash = isAppSpace ? targetHash : headRef.hash;
+    const spaceRefInvariants = isAppSpace ? refInvariants : undefined;
+    const liveMarker = markerBySpace.get(space.spaceId) ?? null;
+
+    const outcome = planSpacePath({
+      space,
       aggregate,
-      targetHash: memberTargetHash,
-      refInvariants: memberRefInvariants,
+      targetHash: spaceTargetHash,
+      refInvariants: spaceRefInvariants,
       liveMarker,
     });
 
     if (outcome.kind === 'at-head') {
-      // Empty-graph member already at target — nothing to run for this space.
+      // Empty-graph space already at target — nothing to run for this space.
       continue;
     }
     if (outcome.kind === 'never-planned') {
@@ -417,7 +420,7 @@ async function executeMigrateShowCommand(
 
     for (const edge of outcome.plan.migrationEdges) {
       orderedMigrations.push({
-        spaceId: member.spaceId,
+        spaceId: space.spaceId,
         dirName: edge.dirName,
         migrationHash: edge.migrationHash,
         from: edge.from,
@@ -445,12 +448,12 @@ async function executeMigrateShowCommand(
     // before rendering. This ensures the name column, hash column, and ops column
     // start at the same horizontal offset across every space section AND the
     // "Will run, in order:" list below.
-    const memberLayouts = allMembers.map((member) => {
-      const isApp = member.spaceId === aggregate.app.spaceId;
-      const memberGraph = member.graph();
-      const rowModel = buildMigrationGraphRows(memberGraph, isApp ? { contractHash } : {});
+    const spaceLayouts = allSpaces.map((space) => {
+      const isApp = space.spaceId === aggregate.app.spaceId;
+      const spaceGraph = space.graph();
+      const rowModel = buildMigrationGraphRows(spaceGraph, isApp ? { contractHash } : {});
       const edgeAnnotations = new Map<string, MigrationEdgeAnnotation>();
-      for (const edge of memberGraph.migrationByHash.values()) {
+      for (const edge of spaceGraph.migrationByHash.values()) {
         edgeAnnotations.set(edge.migrationHash, {
           pathHighlight: onPathHashes.has(edge.migrationHash) ? 'on-path' : 'off-path',
         });
@@ -459,17 +462,17 @@ async function executeMigrateShowCommand(
       // green/continuous; off-path lanes dim. Rows, gutter, and labels all come
       // from this one grid.
       const grid = buildGrid(rowModel, {}, highlightFromEdgeAnnotations(edgeAnnotations));
-      return { member, isApp, memberGraph, rowModel, grid, edgeAnnotations };
+      return { space, isApp, spaceGraph, rowModel, grid, edgeAnnotations };
     });
 
     // Global max across all space grids so every section's labels share columns.
     const globalLabelColumn =
-      memberLayouts.length > 1
-        ? Math.max(...memberLayouts.map(({ grid }) => computeLabelColumn(grid, 'unicode')))
+      spaceLayouts.length > 1
+        ? Math.max(...spaceLayouts.map(({ grid }) => computeLabelColumn(grid, 'unicode')))
         : undefined;
     const globalMaxDirNameWidthFromLayouts =
-      memberLayouts.length > 1
-        ? Math.max(...memberLayouts.map(({ rowModel }) => computeMaxDirNameWidth(rowModel)))
+      spaceLayouts.length > 1
+        ? Math.max(...spaceLayouts.map(({ rowModel }) => computeMaxDirNameWidth(rowModel)))
         : undefined;
     // The run-list name column width must be at least as wide as the global tree dirName
     // width so that tree sections and the list align at the hash column.
@@ -485,10 +488,10 @@ async function executeMigrateShowCommand(
     runListLeftPad = globalLabelColumn;
 
     // Render each space section with globally computed widths.
-    const showSpaceHeadings = allMembers.length > 1;
+    const showSpaceHeadings = allSpaces.length > 1;
     const sections: string[] = [];
-    for (const { member, isApp, rowModel, grid, edgeAnnotations } of memberLayouts) {
-      const liveMarker = markerBySpace.get(member.spaceId) ?? null;
+    for (const { space, isApp, rowModel, grid, edgeAnnotations } of spaceLayouts) {
+      const liveMarker = markerBySpace.get(space.spaceId) ?? null;
       const liveMarkerHash = liveMarker?.storageHash ?? EMPTY_CONTRACT_HASH;
       const tree = renderMigrationGraphCommand({
         grid,
@@ -496,7 +499,7 @@ async function executeMigrateShowCommand(
         contractHash,
         isAppSpace: isApp,
         ...(needsLiveMarker ? { dbHash: liveMarkerHash } : {}),
-        refsByHash: listRefsByContractHash(member),
+        refsByHash: listRefsByContractHash(space),
         edgeAnnotationsByHash: edgeAnnotations,
         colorize,
         glyphMode: 'unicode',
@@ -505,7 +508,7 @@ async function executeMigrateShowCommand(
       });
       if (tree.length === 0) continue;
       if (showSpaceHeadings) {
-        sections.push(`${member.spaceId}:\n${indentMigrationGraphTreeBlock(tree, '  ')}`);
+        sections.push(`${space.spaceId}:\n${indentMigrationGraphTreeBlock(tree, '  ')}`);
       } else {
         sections.push(tree);
       }

package/src/commands/migration-check.ts

@@ -156,16 +156,16 @@ export async function enumerateCheckSpaces(
     candidateDirs.filter((name) => !RESERVED_SPACE_SUBDIR_NAMES.has(name)).filter(isValidSpaceId),
   );
   const spaces: CheckSpace[] = [];
-  for (const member of aggregate.spaces()) {
-    const spaceId = member.spaceId;
+  for (const space of aggregate.spaces()) {
+    const spaceId = space.spaceId;
     if (!isValidSpaceId(spaceId)) continue;
     if (!onDiskSpaceIds.has(spaceId)) continue;
     const migrationsDir = spaceMigrationDirectory(projectMigrationsDir, spaceId);
     spaces.push({
       spaceId,
-      packages: member.packages,
-      refs: member.refs,
-      graph: member.graph(),
+      packages: space.packages,
+      refs: space.refs,
+      graph: space.graph(),
       migrationsDir,
       refsDir: spaceRefsDirectory(migrationsDir),
     });

package/src/commands/migration-graph.ts

@@ -154,13 +154,13 @@ export async function executeMigrationGraphCommand(
   const treeSections: MigrationGraphTreeSection[] = [];
   const spaces: MigrationSpaceGraphEntry[] = [];
   for (const spaceEntry of scopedSpaces) {
-    const member = aggregate.space(spaceEntry.space);
-    if (member === undefined) {
+    const space = aggregate.space(spaceEntry.space);
+    if (space === undefined) {
       continue;
     }
-    const graph = member.graph();
+    const graph = space.graph();
     const isAppSpace = spaceEntry.space === aggregate.app.spaceId;
-    const refsByHash = listRefsByContractHash(member);
+    const refsByHash = listRefsByContractHash(space);
     const tree =
       spaceEntry.migrations.length === 0
         ? ''

package/src/commands/migration-list.ts

@@ -1,7 +1,7 @@
 import { loadConfig } from '@prisma-next/config-loader';
 import type {
+  AggregateContractSpace,
   ContractSpaceAggregate,
-  ContractSpaceMember,
 } from '@prisma-next/migration-tools/aggregate';
 import type { MigrationGraph } from '@prisma-next/migration-tools/graph';
 import { HEAD_REF_NAME, refsByContractHash } from '@prisma-next/migration-tools/refs';
@@ -59,18 +59,18 @@ function compareDirNamesDescending(a: MigrationListEntry, b: MigrationListEntry)
 
 /**
  * Ref names decorating a space's destination contract hashes. The
- * tolerant `member.refs` deliberately omits the structural `head.json`;
+ * tolerant `space.refs` deliberately omits the structural `head.json`;
  * for extension spaces the old enumerator surfaced it as a `head`
- * decoration on the tip migration, so fold `member.headRef` back in to
+ * decoration on the tip migration, so fold `space.headRef` back in to
  * keep that output. The app space synthesises its head, so it carries
  * no on-disk `head` ref to restore.
  */
 export function listRefsByContractHash(
-  member: ContractSpaceMember,
+  space: AggregateContractSpace,
 ): ReadonlyMap<string, readonly string[]> {
-  const byHash = new Map(refsByContractHash(member.refs));
-  if (member.spaceId !== APP_SPACE_ID && member.headRef !== null) {
-    const hash = member.headRef.hash;
+  const byHash = new Map(refsByContractHash(space.refs));
+  if (space.spaceId !== APP_SPACE_ID && space.headRef !== null) {
+    const hash = space.headRef.hash;
     const bucket = byHash.get(hash) ?? [];
     if (!bucket.includes(HEAD_REF_NAME)) {
       byHash.set(hash, [...bucket, HEAD_REF_NAME].sort());
@@ -92,7 +92,7 @@ async function orderedOnDiskSpaceIds(projectMigrationsDir: string): Promise<read
  * {@link MigrationSpaceListEntry} rows `migration list` displays.
  *
  * Space membership matches the on-disk contract-space directories (not the
- * aggregate's always-present synthesized app member when `migrations/app/`
+ * aggregate's always-present synthesized app space when `migrations/app/`
  * is absent); package and ref data come from `aggregate.space(id)`.
  */
 export async function migrationSpaceListEntriesFromAggregate(
@@ -103,12 +103,12 @@ export async function migrationSpaceListEntriesFromAggregate(
   const spaces: MigrationSpaceListEntry[] = [];
 
   for (const spaceId of spaceIds) {
-    const member = aggregate.space(spaceId);
-    if (member === undefined) {
+    const space = aggregate.space(spaceId);
+    if (space === undefined) {
       continue;
     }
-    const refsByHash = listRefsByContractHash(member);
-    const migrations: MigrationListEntry[] = member.packages
+    const refsByHash = listRefsByContractHash(space);
+    const migrations: MigrationListEntry[] = space.packages
       .map((pkg) => ({
         name: pkg.dirName,
         hash: pkg.metadata.migrationHash,