@prisma-next/cli 0.3.0-dev.3 → 0.3.0-dev.30

package/dist/cli.js

@@ -7,6 +7,7 @@ import { Command as Command7 } from "commander";
 import { mkdirSync, writeFileSync } from "fs";
 import { dirname as dirname2, relative as relative2, resolve as resolve2 } from "path";
 import { errorContractConfigMissing as errorContractConfigMissing2 } from "@prisma-next/core-control-plane/errors";
+import { notOk as notOk3, ok as ok3 } from "@prisma-next/utils/result";
 import { Command } from "commander";
 
 // src/config-loader.ts
@@ -52,8 +53,14 @@ async function loadConfig(configPath) {
   }
 }
 
-// src/utils/action.ts
-import { notOk, ok } from "@prisma-next/utils/result";
+// src/control-api/client.ts
+import { createControlPlaneStack } from "@prisma-next/core-control-plane/stack";
+import { notOk as notOk2, ok as ok2 } from "@prisma-next/utils/result";
+
+// src/utils/framework-components.ts
+import {
+  checkContractComponentRequirements
+} from "@prisma-next/contract/framework-components";
 
 // src/utils/cli-errors.ts
 import {
@@ -63,7 +70,7 @@ import {
   errorContractConfigMissing,
   errorContractMissingExtensionPacks,
   errorContractValidationFailed,
-  errorDatabaseUrlRequired,
+  errorDatabaseConnectionRequired,
   errorDriverRequired,
   errorFamilyReadMarkerSqlRequired,
   errorFileNotFound,
@@ -78,18 +85,693 @@ import {
   errorUnexpected as errorUnexpected2
 } from "@prisma-next/core-control-plane/errors";
 
-// src/utils/action.ts
-async function performAction(fn) {
-  try {
-    const value = await fn();
-    return ok(value);
-  } catch (error) {
-    if (error instanceof CliStructuredError) {
-      return notOk(error);
+// src/utils/framework-components.ts
+function assertFrameworkComponentsCompatible(expectedFamilyId, expectedTargetId, frameworkComponents) {
+  for (let i = 0; i < frameworkComponents.length; i++) {
+    const component = frameworkComponents[i];
+    if (typeof component !== "object" || component === null) {
+      throw errorConfigValidation("frameworkComponents[]", {
+        why: `Framework component at index ${i} must be an object`
+      });
+    }
+    const record = component;
+    if (!Object.hasOwn(record, "kind")) {
+      throw errorConfigValidation("frameworkComponents[].kind", {
+        why: `Framework component at index ${i} must have 'kind' property`
+      });
+    }
+    const kind = record["kind"];
+    if (kind !== "target" && kind !== "adapter" && kind !== "extension" && kind !== "driver") {
+      throw errorConfigValidation("frameworkComponents[].kind", {
+        why: `Framework component at index ${i} has invalid kind '${String(kind)}' (must be 'target', 'adapter', 'extension', or 'driver')`
+      });
+    }
+    if (!Object.hasOwn(record, "familyId")) {
+      throw errorConfigValidation("frameworkComponents[].familyId", {
+        why: `Framework component at index ${i} (kind: ${String(kind)}) must have 'familyId' property`
+      });
+    }
+    const familyId = record["familyId"];
+    if (familyId !== expectedFamilyId) {
+      throw errorConfigValidation("frameworkComponents[].familyId", {
+        why: `Framework component at index ${i} (kind: ${String(kind)}) has familyId '${String(familyId)}' but expected '${expectedFamilyId}'`
+      });
+    }
+    if (!Object.hasOwn(record, "targetId")) {
+      throw errorConfigValidation("frameworkComponents[].targetId", {
+        why: `Framework component at index ${i} (kind: ${String(kind)}) must have 'targetId' property`
+      });
+    }
+    const targetId = record["targetId"];
+    if (targetId !== expectedTargetId) {
+      throw errorConfigValidation("frameworkComponents[].targetId", {
+        why: `Framework component at index ${i} (kind: ${String(kind)}) has targetId '${String(targetId)}' but expected '${expectedTargetId}'`
+      });
+    }
+  }
+  return frameworkComponents;
+}
+
+// src/control-api/operations/db-init.ts
+import { notOk, ok } from "@prisma-next/utils/result";
+async function executeDbInit(options) {
+  const { driver, familyInstance, contractIR, mode, migrations, frameworkComponents, onProgress } = options;
+  const planner = migrations.createPlanner(familyInstance);
+  const runner = migrations.createRunner(familyInstance);
+  const introspectSpanId = "introspect";
+  onProgress?.({
+    action: "dbInit",
+    kind: "spanStart",
+    spanId: introspectSpanId,
+    label: "Introspecting database schema"
+  });
+  const schemaIR = await familyInstance.introspect({ driver });
+  onProgress?.({
+    action: "dbInit",
+    kind: "spanEnd",
+    spanId: introspectSpanId,
+    outcome: "ok"
+  });
+  const policy = { allowedOperationClasses: ["additive"] };
+  const planSpanId = "plan";
+  onProgress?.({
+    action: "dbInit",
+    kind: "spanStart",
+    spanId: planSpanId,
+    label: "Planning migration"
+  });
+  const plannerResult = await planner.plan({
+    contract: contractIR,
+    schema: schemaIR,
+    policy,
+    frameworkComponents
+  });
+  if (plannerResult.kind === "failure") {
+    onProgress?.({
+      action: "dbInit",
+      kind: "spanEnd",
+      spanId: planSpanId,
+      outcome: "error"
+    });
+    return notOk({
+      code: "PLANNING_FAILED",
+      summary: "Migration planning failed due to conflicts",
+      conflicts: plannerResult.conflicts,
+      why: void 0,
+      meta: void 0
+    });
+  }
+  const migrationPlan = plannerResult.plan;
+  onProgress?.({
+    action: "dbInit",
+    kind: "spanEnd",
+    spanId: planSpanId,
+    outcome: "ok"
+  });
+  const checkMarkerSpanId = "checkMarker";
+  onProgress?.({
+    action: "dbInit",
+    kind: "spanStart",
+    spanId: checkMarkerSpanId,
+    label: "Checking contract marker"
+  });
+  const existingMarker = await familyInstance.readMarker({ driver });
+  if (existingMarker) {
+    const markerMatchesDestination = existingMarker.coreHash === migrationPlan.destination.coreHash && (!migrationPlan.destination.profileHash || existingMarker.profileHash === migrationPlan.destination.profileHash);
+    if (markerMatchesDestination) {
+      onProgress?.({
+        action: "dbInit",
+        kind: "spanEnd",
+        spanId: checkMarkerSpanId,
+        outcome: "skipped"
+      });
+      const result2 = {
+        mode,
+        plan: { operations: [] },
+        ...mode === "apply" ? {
+          execution: { operationsPlanned: 0, operationsExecuted: 0 },
+          marker: {
+            coreHash: existingMarker.coreHash,
+            profileHash: existingMarker.profileHash
+          }
+        } : {},
+        summary: "Database already at target contract state"
+      };
+      return ok(result2);
+    }
+    onProgress?.({
+      action: "dbInit",
+      kind: "spanEnd",
+      spanId: checkMarkerSpanId,
+      outcome: "error"
+    });
+    return notOk({
+      code: "MARKER_ORIGIN_MISMATCH",
+      summary: "Existing contract marker does not match plan destination",
+      marker: {
+        coreHash: existingMarker.coreHash,
+        profileHash: existingMarker.profileHash
+      },
+      destination: {
+        coreHash: migrationPlan.destination.coreHash,
+        profileHash: migrationPlan.destination.profileHash
+      },
+      why: void 0,
+      conflicts: void 0,
+      meta: void 0
+    });
+  }
+  onProgress?.({
+    action: "dbInit",
+    kind: "spanEnd",
+    spanId: checkMarkerSpanId,
+    outcome: "ok"
+  });
+  if (mode === "plan") {
+    const result2 = {
+      mode: "plan",
+      plan: { operations: migrationPlan.operations },
+      summary: `Planned ${migrationPlan.operations.length} operation(s)`
+    };
+    return ok(result2);
+  }
+  const applySpanId = "apply";
+  onProgress?.({
+    action: "dbInit",
+    kind: "spanStart",
+    spanId: applySpanId,
+    label: "Applying migration plan"
+  });
+  const callbacks = onProgress ? {
+    onOperationStart: (op) => {
+      onProgress({
+        action: "dbInit",
+        kind: "spanStart",
+        spanId: `operation:${op.id}`,
+        parentSpanId: applySpanId,
+        label: op.label
+      });
+    },
+    onOperationComplete: (op) => {
+      onProgress({
+        action: "dbInit",
+        kind: "spanEnd",
+        spanId: `operation:${op.id}`,
+        outcome: "ok"
+      });
     }
-    throw error;
+  } : void 0;
+  const runnerResult = await runner.execute({
+    plan: migrationPlan,
+    driver,
+    destinationContract: contractIR,
+    policy,
+    ...callbacks ? { callbacks } : {},
+    // db init plans and applies back-to-back from a fresh introspection, so per-operation
+    // pre/postchecks and the idempotency probe are usually redundant overhead. We still
+    // enforce marker/origin compatibility and a full schema verification after apply.
+    executionChecks: {
+      prechecks: false,
+      postchecks: false,
+      idempotencyChecks: false
+    },
+    frameworkComponents
+  });
+  if (!runnerResult.ok) {
+    onProgress?.({
+      action: "dbInit",
+      kind: "spanEnd",
+      spanId: applySpanId,
+      outcome: "error"
+    });
+    return notOk({
+      code: "RUNNER_FAILED",
+      summary: runnerResult.failure.summary,
+      why: runnerResult.failure.why,
+      meta: runnerResult.failure.meta,
+      conflicts: void 0
+    });
   }
+  const execution = runnerResult.value;
+  onProgress?.({
+    action: "dbInit",
+    kind: "spanEnd",
+    spanId: applySpanId,
+    outcome: "ok"
+  });
+  const result = {
+    mode: "apply",
+    plan: { operations: migrationPlan.operations },
+    execution: {
+      operationsPlanned: execution.operationsPlanned,
+      operationsExecuted: execution.operationsExecuted
+    },
+    marker: migrationPlan.destination.profileHash ? {
+      coreHash: migrationPlan.destination.coreHash,
+      profileHash: migrationPlan.destination.profileHash
+    } : { coreHash: migrationPlan.destination.coreHash },
+    summary: `Applied ${execution.operationsExecuted} operation(s), marker written`
+  };
+  return ok(result);
+}
+
+// src/control-api/client.ts
+function createControlClient(options) {
+  return new ControlClientImpl(options);
 }
+var ControlClientImpl = class {
+  options;
+  stack = null;
+  driver = null;
+  familyInstance = null;
+  frameworkComponents = null;
+  initialized = false;
+  defaultConnection;
+  constructor(options) {
+    this.options = options;
+    this.defaultConnection = options.connection;
+  }
+  init() {
+    if (this.initialized) {
+      return;
+    }
+    this.stack = createControlPlaneStack({
+      target: this.options.target,
+      adapter: this.options.adapter,
+      driver: this.options.driver,
+      extensionPacks: this.options.extensionPacks
+    });
+    this.familyInstance = this.options.family.create(this.stack);
+    const rawComponents = [
+      this.options.target,
+      this.options.adapter,
+      ...this.options.extensionPacks ?? []
+    ];
+    this.frameworkComponents = assertFrameworkComponentsCompatible(
+      this.options.family.familyId,
+      this.options.target.targetId,
+      rawComponents
+    );
+    this.initialized = true;
+  }
+  async connect(connection) {
+    this.init();
+    if (this.driver) {
+      throw new Error("Already connected. Call close() before reconnecting.");
+    }
+    const resolvedConnection = connection ?? this.defaultConnection;
+    if (resolvedConnection === void 0) {
+      throw new Error(
+        "No connection provided. Pass a connection to connect() or provide a default connection when creating the client."
+      );
+    }
+    if (!this.stack?.driver) {
+      throw new Error(
+        "Driver is not configured. Pass a driver descriptor when creating the control client to enable database operations."
+      );
+    }
+    this.driver = await this.stack?.driver.create(resolvedConnection);
+  }
+  async close() {
+    if (this.driver) {
+      await this.driver.close();
+      this.driver = null;
+    }
+  }
+  async ensureConnected() {
+    this.init();
+    if (!this.driver && this.defaultConnection !== void 0) {
+      await this.connect(this.defaultConnection);
+    }
+    if (!this.driver || !this.familyInstance || !this.frameworkComponents) {
+      throw new Error("Not connected. Call connect(connection) first.");
+    }
+    return {
+      driver: this.driver,
+      familyInstance: this.familyInstance,
+      frameworkComponents: this.frameworkComponents
+    };
+  }
+  async verify(options) {
+    const { onProgress } = options;
+    if (options.connection !== void 0) {
+      onProgress?.({
+        action: "verify",
+        kind: "spanStart",
+        spanId: "connect",
+        label: "Connecting to database..."
+      });
+      try {
+        await this.connect(options.connection);
+        onProgress?.({
+          action: "verify",
+          kind: "spanEnd",
+          spanId: "connect",
+          outcome: "ok"
+        });
+      } catch (error) {
+        onProgress?.({
+          action: "verify",
+          kind: "spanEnd",
+          spanId: "connect",
+          outcome: "error"
+        });
+        throw error;
+      }
+    }
+    const { driver, familyInstance } = await this.ensureConnected();
+    const contractIR = familyInstance.validateContractIR(options.contractIR);
+    onProgress?.({
+      action: "verify",
+      kind: "spanStart",
+      spanId: "verify",
+      label: "Verifying contract marker..."
+    });
+    try {
+      const result = await familyInstance.verify({
+        driver,
+        contractIR,
+        expectedTargetId: this.options.target.targetId,
+        contractPath: ""
+      });
+      onProgress?.({
+        action: "verify",
+        kind: "spanEnd",
+        spanId: "verify",
+        outcome: result.ok ? "ok" : "error"
+      });
+      return result;
+    } catch (error) {
+      onProgress?.({
+        action: "verify",
+        kind: "spanEnd",
+        spanId: "verify",
+        outcome: "error"
+      });
+      throw error;
+    }
+  }
+  async schemaVerify(options) {
+    const { onProgress } = options;
+    if (options.connection !== void 0) {
+      onProgress?.({
+        action: "schemaVerify",
+        kind: "spanStart",
+        spanId: "connect",
+        label: "Connecting to database..."
+      });
+      try {
+        await this.connect(options.connection);
+        onProgress?.({
+          action: "schemaVerify",
+          kind: "spanEnd",
+          spanId: "connect",
+          outcome: "ok"
+        });
+      } catch (error) {
+        onProgress?.({
+          action: "schemaVerify",
+          kind: "spanEnd",
+          spanId: "connect",
+          outcome: "error"
+        });
+        throw error;
+      }
+    }
+    const { driver, familyInstance, frameworkComponents } = await this.ensureConnected();
+    const contractIR = familyInstance.validateContractIR(options.contractIR);
+    onProgress?.({
+      action: "schemaVerify",
+      kind: "spanStart",
+      spanId: "schemaVerify",
+      label: "Verifying database schema..."
+    });
+    try {
+      const result = await familyInstance.schemaVerify({
+        driver,
+        contractIR,
+        strict: options.strict ?? false,
+        contractPath: "",
+        frameworkComponents
+      });
+      onProgress?.({
+        action: "schemaVerify",
+        kind: "spanEnd",
+        spanId: "schemaVerify",
+        outcome: result.ok ? "ok" : "error"
+      });
+      return result;
+    } catch (error) {
+      onProgress?.({
+        action: "schemaVerify",
+        kind: "spanEnd",
+        spanId: "schemaVerify",
+        outcome: "error"
+      });
+      throw error;
+    }
+  }
+  async sign(options) {
+    const { onProgress } = options;
+    if (options.connection !== void 0) {
+      onProgress?.({
+        action: "sign",
+        kind: "spanStart",
+        spanId: "connect",
+        label: "Connecting to database..."
+      });
+      try {
+        await this.connect(options.connection);
+        onProgress?.({
+          action: "sign",
+          kind: "spanEnd",
+          spanId: "connect",
+          outcome: "ok"
+        });
+      } catch (error) {
+        onProgress?.({
+          action: "sign",
+          kind: "spanEnd",
+          spanId: "connect",
+          outcome: "error"
+        });
+        throw error;
+      }
+    }
+    const { driver, familyInstance } = await this.ensureConnected();
+    const contractIR = familyInstance.validateContractIR(options.contractIR);
+    onProgress?.({
+      action: "sign",
+      kind: "spanStart",
+      spanId: "sign",
+      label: "Signing database..."
+    });
+    try {
+      const result = await familyInstance.sign({
+        driver,
+        contractIR,
+        contractPath: options.contractPath ?? "",
+        ...options.configPath ? { configPath: options.configPath } : {}
+      });
+      onProgress?.({
+        action: "sign",
+        kind: "spanEnd",
+        spanId: "sign",
+        outcome: "ok"
+      });
+      return result;
+    } catch (error) {
+      onProgress?.({
+        action: "sign",
+        kind: "spanEnd",
+        spanId: "sign",
+        outcome: "error"
+      });
+      throw error;
+    }
+  }
+  async dbInit(options) {
+    const { onProgress } = options;
+    if (options.connection !== void 0) {
+      onProgress?.({
+        action: "dbInit",
+        kind: "spanStart",
+        spanId: "connect",
+        label: "Connecting to database..."
+      });
+      try {
+        await this.connect(options.connection);
+        onProgress?.({
+          action: "dbInit",
+          kind: "spanEnd",
+          spanId: "connect",
+          outcome: "ok"
+        });
+      } catch (error) {
+        onProgress?.({
+          action: "dbInit",
+          kind: "spanEnd",
+          spanId: "connect",
+          outcome: "error"
+        });
+        throw error;
+      }
+    }
+    const { driver, familyInstance, frameworkComponents } = await this.ensureConnected();
+    if (!this.options.target.migrations) {
+      throw new Error(`Target "${this.options.target.targetId}" does not support migrations`);
+    }
+    const contractIR = familyInstance.validateContractIR(options.contractIR);
+    return executeDbInit({
+      driver,
+      familyInstance,
+      contractIR,
+      mode: options.mode,
+      migrations: this.options.target.migrations,
+      frameworkComponents,
+      ...onProgress ? { onProgress } : {}
+    });
+  }
+  async introspect(options) {
+    const onProgress = options?.onProgress;
+    if (options?.connection !== void 0) {
+      onProgress?.({
+        action: "introspect",
+        kind: "spanStart",
+        spanId: "connect",
+        label: "Connecting to database..."
+      });
+      try {
+        await this.connect(options.connection);
+        onProgress?.({
+          action: "introspect",
+          kind: "spanEnd",
+          spanId: "connect",
+          outcome: "ok"
+        });
+      } catch (error) {
+        onProgress?.({
+          action: "introspect",
+          kind: "spanEnd",
+          spanId: "connect",
+          outcome: "error"
+        });
+        throw error;
+      }
+    }
+    const { driver, familyInstance } = await this.ensureConnected();
+    const _schema = options?.schema;
+    void _schema;
+    onProgress?.({
+      action: "introspect",
+      kind: "spanStart",
+      spanId: "introspect",
+      label: "Introspecting database schema..."
+    });
+    try {
+      const result = await familyInstance.introspect({ driver });
+      onProgress?.({
+        action: "introspect",
+        kind: "spanEnd",
+        spanId: "introspect",
+        outcome: "ok"
+      });
+      return result;
+    } catch (error) {
+      onProgress?.({
+        action: "introspect",
+        kind: "spanEnd",
+        spanId: "introspect",
+        outcome: "error"
+      });
+      throw error;
+    }
+  }
+  toSchemaView(schemaIR) {
+    this.init();
+    if (this.familyInstance?.toSchemaView) {
+      return this.familyInstance.toSchemaView(schemaIR);
+    }
+    return void 0;
+  }
+  async emit(options) {
+    const { onProgress, contractConfig } = options;
+    this.init();
+    if (!this.familyInstance) {
+      throw new Error("Family instance was not initialized. This is a bug.");
+    }
+    let contractRaw;
+    onProgress?.({
+      action: "emit",
+      kind: "spanStart",
+      spanId: "resolveSource",
+      label: "Resolving contract source..."
+    });
+    try {
+      switch (contractConfig.source.kind) {
+        case "loader":
+          contractRaw = await contractConfig.source.load();
+          break;
+        case "value":
+          contractRaw = contractConfig.source.value;
+          break;
+      }
+      onProgress?.({
+        action: "emit",
+        kind: "spanEnd",
+        spanId: "resolveSource",
+        outcome: "ok"
+      });
+    } catch (error) {
+      onProgress?.({
+        action: "emit",
+        kind: "spanEnd",
+        spanId: "resolveSource",
+        outcome: "error"
+      });
+      return notOk2({
+        code: "CONTRACT_SOURCE_INVALID",
+        summary: "Failed to resolve contract source",
+        why: error instanceof Error ? error.message : String(error),
+        meta: void 0
+      });
+    }
+    onProgress?.({
+      action: "emit",
+      kind: "spanStart",
+      spanId: "emit",
+      label: "Emitting contract..."
+    });
+    try {
+      const emitResult = await this.familyInstance.emitContract({ contractIR: contractRaw });
+      onProgress?.({
+        action: "emit",
+        kind: "spanEnd",
+        spanId: "emit",
+        outcome: "ok"
+      });
+      return ok2({
+        coreHash: emitResult.coreHash,
+        profileHash: emitResult.profileHash,
+        contractJson: emitResult.contractJson,
+        contractDts: emitResult.contractDts
+      });
+    } catch (error) {
+      onProgress?.({
+        action: "emit",
+        kind: "spanEnd",
+        spanId: "emit",
+        outcome: "error"
+      });
+      return notOk2({
+        code: "EMIT_FAILED",
+        summary: "Failed to emit contract",
+        why: error instanceof Error ? error.message : String(error),
+        meta: void 0
+      });
+    }
+  }
+};
 
 // src/utils/command-helpers.ts
 function setCommandDescriptions(command, shortDescription, longDescription) {
@@ -1040,6 +1722,47 @@ function formatRootHelp(options) {
 `;
 }
 
+// src/utils/progress-adapter.ts
+import ora from "ora";
+function createProgressAdapter(options) {
+  const { flags } = options;
+  const shouldShowProgress = !flags.quiet && flags.json !== "object" && process.stdout.isTTY;
+  if (!shouldShowProgress) {
+    return () => {
+    };
+  }
+  const activeSpans = /* @__PURE__ */ new Map();
+  return (event) => {
+    if (event.kind === "spanStart") {
+      if (event.parentSpanId) {
+        console.log(`  \u2192 ${event.label}...`);
+        return;
+      }
+      const spinner = ora({
+        text: event.label,
+        color: flags.color !== false ? "cyan" : false
+      }).start();
+      activeSpans.set(event.spanId, {
+        spinner,
+        startTime: Date.now()
+      });
+    } else if (event.kind === "spanEnd") {
+      const spanState = activeSpans.get(event.spanId);
+      if (spanState) {
+        const elapsed = Date.now() - spanState.startTime;
+        if (event.outcome === "error") {
+          spanState.spinner.fail(`${spanState.spinner.text} (failed)`);
+        } else if (event.outcome === "skipped") {
+          spanState.spinner.info(`${spanState.spinner.text} (skipped)`);
+        } else {
+          spanState.spinner.succeed(`${spanState.spinner.text} (${elapsed}ms)`);
+        }
+        activeSpans.delete(event.spanId);
+      }
+    }
+  };
+}
+
 // src/utils/result-handler.ts
 function handleResult(result, flags, onSuccess) {
   if (result.ok) {
@@ -1058,31 +1781,122 @@ function handleResult(result, flags, onSuccess) {
   return exitCode;
 }
 
-// src/utils/spinner.ts
-import ora from "ora";
-async function withSpinner(operation, options) {
-  const { message, flags } = options;
-  const shouldShowSpinner = !flags.quiet && flags.json !== "object" && process.stdout.isTTY;
-  if (!shouldShowSpinner) {
-    return operation();
-  }
-  const startTime = Date.now();
-  const spinner = ora({
-    text: message,
-    color: flags.color !== false ? "cyan" : false
-  }).start();
+// src/commands/contract-emit.ts
+function mapEmitFailure(failure) {
+  if (failure.code === "CONTRACT_SOURCE_INVALID") {
+    return errorRuntime(failure.summary, {
+      why: failure.why ?? "Contract source is invalid",
+      fix: "Check your contract source configuration in prisma-next.config.ts"
+    });
+  }
+  if (failure.code === "EMIT_FAILED") {
+    return errorRuntime(failure.summary, {
+      why: failure.why ?? "Failed to emit contract",
+      fix: "Check your contract configuration and ensure the source is valid"
+    });
+  }
+  const exhaustive = failure.code;
+  throw new Error(`Unhandled EmitFailure code: ${exhaustive}`);
+}
+async function executeContractEmitCommand(options, flags, startTime) {
+  let config;
+  try {
+    config = await loadConfig(options.config);
+  } catch (error) {
+    if (error instanceof CliStructuredError) {
+      return notOk3(error);
+    }
+    return notOk3(
+      errorUnexpected2(error instanceof Error ? error.message : String(error), {
+        why: "Failed to load config"
+      })
+    );
+  }
+  if (!config.contract) {
+    return notOk3(
+      errorContractConfigMissing2({
+        why: "Config.contract is required for emit. Define it in your config: contract: { source: ..., output: ..., types: ... }"
+      })
+    );
+  }
+  const contractConfig = config.contract;
+  if (!contractConfig.output || !contractConfig.types) {
+    return notOk3(
+      errorContractConfigMissing2({
+        why: "Contract config must have output and types paths. This should not happen if defineConfig() was used."
+      })
+    );
+  }
+  const outputJsonPath = resolve2(contractConfig.output);
+  const outputDtsPath = resolve2(contractConfig.types);
+  if (flags.json !== "object" && !flags.quiet) {
+    const configPath = options.config ? relative2(process.cwd(), resolve2(options.config)) : "prisma-next.config.ts";
+    const contractPath = relative2(process.cwd(), outputJsonPath);
+    const typesPath = relative2(process.cwd(), outputDtsPath);
+    const header = formatStyledHeader({
+      command: "contract emit",
+      description: "Write your contract to JSON and sign it",
+      url: "https://pris.ly/contract-emit",
+      details: [
+        { label: "config", value: configPath },
+        { label: "contract", value: contractPath },
+        { label: "types", value: typesPath }
+      ],
+      flags
+    });
+    console.log(header);
+  }
+  const client = createControlClient({
+    family: config.family,
+    target: config.target,
+    adapter: config.adapter,
+    extensionPacks: config.extensionPacks ?? []
+  });
+  const onProgress = createProgressAdapter({ flags });
   try {
-    const result = await operation();
-    const elapsed = Date.now() - startTime;
-    spinner.succeed(`${message} (${elapsed}ms)`);
-    return result;
+    const source = typeof contractConfig.source === "function" ? { kind: "loader", load: contractConfig.source } : { kind: "value", value: contractConfig.source };
+    const result = await client.emit({
+      contractConfig: {
+        source,
+        output: outputJsonPath,
+        types: outputDtsPath
+      },
+      onProgress
+    });
+    if (!result.ok) {
+      return notOk3(mapEmitFailure(result.failure));
+    }
+    mkdirSync(dirname2(outputJsonPath), { recursive: true });
+    mkdirSync(dirname2(outputDtsPath), { recursive: true });
+    writeFileSync(outputJsonPath, result.value.contractJson, "utf-8");
+    writeFileSync(outputDtsPath, result.value.contractDts, "utf-8");
+    if (!flags.quiet && flags.json !== "object" && process.stdout.isTTY) {
+      console.log("");
+    }
+    const emitResult = {
+      coreHash: result.value.coreHash,
+      profileHash: result.value.profileHash,
+      outDir: dirname2(outputJsonPath),
+      files: {
+        json: outputJsonPath,
+        dts: outputDtsPath
+      },
+      timings: { total: Date.now() - startTime }
+    };
+    return ok3(emitResult);
   } catch (error) {
-    spinner.fail(`${message} failed: ${error instanceof Error ? error.message : String(error)}`);
-    throw error;
+    if (CliStructuredError.is(error)) {
+      return notOk3(error);
+    }
+    return notOk3(
+      errorUnexpected2("Unexpected error during contract emit", {
+        why: error instanceof Error ? error.message : String(error)
+      })
+    );
+  } finally {
+    await client.close();
   }
 }
-
-// src/commands/contract-emit.ts
 function createContractEmitCommand() {
   const command = new Command("emit");
   setCommandDescriptions(
@@ -1097,83 +1911,8 @@ function createContractEmitCommand() {
     }
   }).option("--config <path>", "Path to prisma-next.config.ts").option("--json [format]", "Output as JSON (object or ndjson)", false).option("-q, --quiet", "Quiet mode: errors only").option("-v, --verbose", "Verbose output: debug info, timings").option("-vv, --trace", "Trace output: deep internals, stack traces").option("--timestamps", "Add timestamps to output").option("--color", "Force color output").option("--no-color", "Disable color output").action(async (options) => {
     const flags = parseGlobalFlags(options);
-    const result = await performAction(async () => {
-      const config = await loadConfig(options.config);
-      if (!config.contract) {
-        throw errorContractConfigMissing2({
-          why: "Config.contract is required for emit. Define it in your config: contract: { source: ..., output: ..., types: ... }"
-        });
-      }
-      const contractConfig = config.contract;
-      if (!contractConfig.output || !contractConfig.types) {
-        throw errorContractConfigMissing2({
-          why: "Contract config must have output and types paths. This should not happen if defineConfig() was used."
-        });
-      }
-      const outputJsonPath = resolve2(contractConfig.output);
-      const outputDtsPath = resolve2(contractConfig.types);
-      if (flags.json !== "object" && !flags.quiet) {
-        const configPath = options.config ? relative2(process.cwd(), resolve2(options.config)) : "prisma-next.config.ts";
-        const contractPath = relative2(process.cwd(), outputJsonPath);
-        const typesPath = relative2(process.cwd(), outputDtsPath);
-        const header = formatStyledHeader({
-          command: "contract emit",
-          description: "Write your contract to JSON and sign it",
-          url: "https://pris.ly/contract-emit",
-          details: [
-            { label: "config", value: configPath },
-            { label: "contract", value: contractPath },
-            { label: "types", value: typesPath }
-          ],
-          flags
-        });
-        console.log(header);
-      }
-      if (!config.driver) {
-        throw errorContractConfigMissing2({
-          why: "Config.driver is required. Even though emit does not use the driver, it is required by ControlFamilyDescriptor.create()"
-        });
-      }
-      const familyInstance = config.family.create({
-        target: config.target,
-        adapter: config.adapter,
-        driver: config.driver,
-        extensionPacks: config.extensionPacks ?? []
-      });
-      let contractRaw;
-      if (typeof contractConfig.source === "function") {
-        contractRaw = await contractConfig.source();
-      } else {
-        contractRaw = contractConfig.source;
-      }
-      const emitResult = await withSpinner(
-        () => familyInstance.emitContract({ contractIR: contractRaw }),
-        {
-          message: "Emitting contract...",
-          flags
-        }
-      );
-      mkdirSync(dirname2(outputJsonPath), { recursive: true });
-      mkdirSync(dirname2(outputDtsPath), { recursive: true });
-      writeFileSync(outputJsonPath, emitResult.contractJson, "utf-8");
-      writeFileSync(outputDtsPath, emitResult.contractDts, "utf-8");
-      if (!flags.quiet && flags.json !== "object" && process.stdout.isTTY) {
-        console.log("");
-      }
-      return {
-        coreHash: emitResult.coreHash,
-        profileHash: emitResult.profileHash,
-        outDir: dirname2(outputJsonPath),
-        files: {
-          json: outputJsonPath,
-          dts: outputDtsPath
-        },
-        timings: {
-          total: 0
-          // Timing is handled by emitContract internally if needed
-        }
-      };
-    });
+    const startTime = Date.now();
+    const result = await executeContractEmitCommand(options, flags, startTime);
     const exitCode = handleResult(result, flags, (emitResult) => {
       if (flags.json === "object") {
         console.log(formatEmitJson(emitResult));
@@ -1195,94 +1934,187 @@ function createContractEmitCommand() {
 // src/commands/db-init.ts
 import { readFile } from "fs/promises";
 import { relative as relative3, resolve as resolve3 } from "path";
-import { redactDatabaseUrl } from "@prisma-next/utils/redact-db-url";
+import { notOk as notOk4, ok as ok4 } from "@prisma-next/utils/result";
 import { Command as Command2 } from "commander";
-
-// src/utils/framework-components.ts
-import {
-  checkContractComponentRequirements
-} from "@prisma-next/contract/framework-components";
-function assertFrameworkComponentsCompatible(expectedFamilyId, expectedTargetId, frameworkComponents) {
-  for (let i = 0; i < frameworkComponents.length; i++) {
-    const component = frameworkComponents[i];
-    if (typeof component !== "object" || component === null) {
-      throw errorConfigValidation("frameworkComponents[]", {
-        why: `Framework component at index ${i} must be an object`
-      });
-    }
-    const record = component;
-    if (!Object.hasOwn(record, "kind")) {
-      throw errorConfigValidation("frameworkComponents[].kind", {
-        why: `Framework component at index ${i} must have 'kind' property`
-      });
-    }
-    const kind = record["kind"];
-    if (kind !== "target" && kind !== "adapter" && kind !== "extension" && kind !== "driver") {
-      throw errorConfigValidation("frameworkComponents[].kind", {
-        why: `Framework component at index ${i} has invalid kind '${String(kind)}' (must be 'target', 'adapter', 'extension', or 'driver')`
-      });
+function mapDbInitFailure(failure) {
+  if (failure.code === "PLANNING_FAILED") {
+    return errorMigrationPlanningFailed({ conflicts: failure.conflicts ?? [] });
+  }
+  if (failure.code === "MARKER_ORIGIN_MISMATCH") {
+    const mismatchParts = [];
+    if (failure.marker?.coreHash !== failure.destination?.coreHash && failure.marker?.coreHash && failure.destination?.coreHash) {
+      mismatchParts.push(
+        `coreHash (marker: ${failure.marker.coreHash}, destination: ${failure.destination.coreHash})`
+      );
     }
-    if (!Object.hasOwn(record, "familyId")) {
-      throw errorConfigValidation("frameworkComponents[].familyId", {
-        why: `Framework component at index ${i} (kind: ${String(kind)}) must have 'familyId' property`
-      });
+    if (failure.marker?.profileHash !== failure.destination?.profileHash && failure.marker?.profileHash && failure.destination?.profileHash) {
+      mismatchParts.push(
+        `profileHash (marker: ${failure.marker.profileHash}, destination: ${failure.destination.profileHash})`
+      );
     }
-    const familyId = record["familyId"];
-    if (familyId !== expectedFamilyId) {
-      throw errorConfigValidation("frameworkComponents[].familyId", {
-        why: `Framework component at index ${i} (kind: ${String(kind)}) has familyId '${String(familyId)}' but expected '${expectedFamilyId}'`
-      });
+    return errorRuntime(
+      `Existing contract marker does not match plan destination.${mismatchParts.length > 0 ? ` Mismatch in ${mismatchParts.join(" and ")}.` : ""}`,
+      {
+        why: "Database has an existing contract marker that does not match the target contract",
+        fix: "If bootstrapping, drop/reset the database then re-run `prisma-next db init`; otherwise reconcile schema/marker using your migration workflow",
+        meta: {
+          code: "MARKER_ORIGIN_MISMATCH",
+          ...failure.marker?.coreHash ? { markerCoreHash: failure.marker.coreHash } : {},
+          ...failure.destination?.coreHash ? { destinationCoreHash: failure.destination.coreHash } : {},
+          ...failure.marker?.profileHash ? { markerProfileHash: failure.marker.profileHash } : {},
+          ...failure.destination?.profileHash ? { destinationProfileHash: failure.destination.profileHash } : {}
+        }
+      }
+    );
+  }
+  if (failure.code === "RUNNER_FAILED") {
+    return errorRuntime(failure.summary, {
+      why: failure.why ?? "Migration runner failed",
+      fix: "Fix the schema mismatch (db init is additive-only), or drop/reset the database and re-run `prisma-next db init`",
+      meta: {
+        code: "RUNNER_FAILED",
+        ...failure.meta ?? {}
+      }
+    });
+  }
+  const exhaustive = failure.code;
+  throw new Error(`Unhandled DbInitFailure code: ${exhaustive}`);
+}
+async function executeDbInitCommand(options, flags, startTime) {
+  const config = await loadConfig(options.config);
+  const configPath = options.config ? relative3(process.cwd(), resolve3(options.config)) : "prisma-next.config.ts";
+  const contractPathAbsolute = config.contract?.output ? resolve3(config.contract.output) : resolve3("src/prisma/contract.json");
+  const contractPath = relative3(process.cwd(), contractPathAbsolute);
+  if (flags.json !== "object" && !flags.quiet) {
+    const details = [
+      { label: "config", value: configPath },
+      { label: "contract", value: contractPath }
+    ];
+    if (options.db) {
+      details.push({ label: "database", value: options.db });
     }
-    if (!Object.hasOwn(record, "targetId")) {
-      throw errorConfigValidation("frameworkComponents[].targetId", {
-        why: `Framework component at index ${i} (kind: ${String(kind)}) must have 'targetId' property`
-      });
+    if (options.plan) {
+      details.push({ label: "mode", value: "plan (dry run)" });
     }
-    const targetId = record["targetId"];
-    if (targetId !== expectedTargetId) {
-      throw errorConfigValidation("frameworkComponents[].targetId", {
-        why: `Framework component at index ${i} (kind: ${String(kind)}) has targetId '${String(targetId)}' but expected '${expectedTargetId}'`
-      });
+    const header = formatStyledHeader({
+      command: "db init",
+      description: "Bootstrap a database to match the current contract",
+      url: "https://pris.ly/db-init",
+      details,
+      flags
+    });
+    console.log(header);
+  }
+  let contractJsonContent;
+  try {
+    contractJsonContent = await readFile(contractPathAbsolute, "utf-8");
+  } catch (error) {
+    if (error instanceof Error && error.code === "ENOENT") {
+      return notOk4(
+        errorFileNotFound(contractPathAbsolute, {
+          why: `Contract file not found at ${contractPathAbsolute}`,
+          fix: `Run \`prisma-next contract emit\` to generate ${contractPath}, or update \`config.contract.output\` in ${configPath}`
+        })
+      );
     }
+    return notOk4(
+      errorUnexpected2(error instanceof Error ? error.message : String(error), {
+        why: `Failed to read contract file: ${error instanceof Error ? error.message : String(error)}`
+      })
+    );
   }
-  return frameworkComponents;
-}
-function assertContractRequirementsSatisfied({
-  contract,
-  family,
-  target,
-  adapter,
-  extensionPacks
-}) {
-  const providedComponentIds = /* @__PURE__ */ new Set([target.id, adapter.id]);
-  for (const extension of extensionPacks ?? []) {
-    providedComponentIds.add(extension.id);
-  }
-  const result = checkContractComponentRequirements({
-    contract,
-    expectedTargetFamily: family.familyId,
-    expectedTargetId: target.targetId,
-    providedComponentIds
-  });
-  if (result.familyMismatch) {
-    throw errorConfigValidation("contract.targetFamily", {
-      why: `Contract was emitted for family '${result.familyMismatch.actual}' but CLI config is wired to '${result.familyMismatch.expected}'.`
-    });
+  let contractJson;
+  try {
+    contractJson = JSON.parse(contractJsonContent);
+  } catch (error) {
+    return notOk4(
+      errorContractValidationFailed(
+        `Contract JSON is invalid: ${error instanceof Error ? error.message : String(error)}`,
+        { where: { path: contractPathAbsolute } }
+      )
+    );
   }
-  if (result.targetMismatch) {
-    throw errorConfigValidation("contract.target", {
-      why: `Contract target '${result.targetMismatch.actual}' does not match CLI target '${result.targetMismatch.expected}'.`
-    });
+  const dbConnection = options.db ?? config.db?.connection;
+  if (!dbConnection) {
+    return notOk4(
+      errorDatabaseConnectionRequired({
+        why: `Database connection is required for db init (set db.connection in ${configPath}, or pass --db <url>)`
+      })
+    );
   }
-  if (result.missingExtensionPackIds.length > 0) {
-    throw errorContractMissingExtensionPacks({
-      missingExtensionPacks: result.missingExtensionPackIds,
-      providedComponentIds: [...providedComponentIds]
+  if (!config.driver) {
+    return notOk4(errorDriverRequired({ why: "Config.driver is required for db init" }));
+  }
+  if (!config.target.migrations) {
+    return notOk4(
+      errorTargetMigrationNotSupported({
+        why: `Target "${config.target.id}" does not support migrations`
+      })
+    );
+  }
+  const client = createControlClient({
+    family: config.family,
+    target: config.target,
+    adapter: config.adapter,
+    driver: config.driver,
+    extensionPacks: config.extensionPacks ?? []
+  });
+  const onProgress = createProgressAdapter({ flags });
+  try {
+    const result = await client.dbInit({
+      contractIR: contractJson,
+      mode: options.plan ? "plan" : "apply",
+      connection: dbConnection,
+      onProgress
     });
+    if (!result.ok) {
+      return notOk4(mapDbInitFailure(result.failure));
+    }
+    const profileHash = result.value.marker?.profileHash;
+    const dbInitResult = {
+      ok: true,
+      mode: result.value.mode,
+      plan: {
+        targetId: config.target.targetId,
+        destination: {
+          coreHash: result.value.marker?.coreHash ?? "",
+          ...profileHash ? { profileHash } : {}
+        },
+        operations: result.value.plan.operations.map((op) => ({
+          id: op.id,
+          label: op.label,
+          operationClass: op.operationClass
+        }))
+      },
+      ...result.value.execution ? {
+        execution: {
+          operationsPlanned: result.value.execution.operationsPlanned,
+          operationsExecuted: result.value.execution.operationsExecuted
+        }
+      } : {},
+      ...result.value.marker ? {
+        marker: {
+          coreHash: result.value.marker.coreHash,
+          ...result.value.marker.profileHash ? { profileHash: result.value.marker.profileHash } : {}
+        }
+      } : {},
+      summary: result.value.summary,
+      timings: { total: Date.now() - startTime }
+    };
+    return ok4(dbInitResult);
+  } catch (error) {
+    if (CliStructuredError.is(error)) {
+      return notOk4(error);
+    }
+    return notOk4(
+      errorUnexpected2(error instanceof Error ? error.message : String(error), {
+        why: `Unexpected error during db init: ${error instanceof Error ? error.message : String(error)}`
+      })
+    );
+  } finally {
+    await client.close();
   }
 }
-
-// src/commands/db-init.ts
 function createDbInitCommand() {
   const command = new Command2("init");
   setCommandDescriptions(
@@ -1298,280 +2130,18 @@ function createDbInitCommand() {
   }).option("--db <url>", "Database connection string").option("--config <path>", "Path to prisma-next.config.ts").option("--plan", "Preview planned operations without applying", false).option("--json [format]", "Output as JSON (object)", false).option("-q, --quiet", "Quiet mode: errors only").option("-v, --verbose", "Verbose output: debug info, timings").option("-vv, --trace", "Trace output: deep internals, stack traces").option("--timestamps", "Add timestamps to output").option("--color", "Force color output").option("--no-color", "Disable color output").action(async (options) => {
     const flags = parseGlobalFlags(options);
     const startTime = Date.now();
-    const result = await performAction(async () => {
-      if (flags.json === "ndjson") {
-        throw errorJsonFormatNotSupported({
+    if (flags.json === "ndjson") {
+      const result2 = notOk4(
+        errorJsonFormatNotSupported({
           command: "db init",
           format: "ndjson",
           supportedFormats: ["object"]
-        });
-      }
-      const config = await loadConfig(options.config);
-      const configPath = options.config ? relative3(process.cwd(), resolve3(options.config)) : "prisma-next.config.ts";
-      const contractPathAbsolute = config.contract?.output ? resolve3(config.contract.output) : resolve3("src/prisma/contract.json");
-      const contractPath = relative3(process.cwd(), contractPathAbsolute);
-      if (flags.json !== "object" && !flags.quiet) {
-        const details = [
-          { label: "config", value: configPath },
-          { label: "contract", value: contractPath }
-        ];
-        if (options.db) {
-          details.push({ label: "database", value: options.db });
-        }
-        if (options.plan) {
-          details.push({ label: "mode", value: "plan (dry run)" });
-        }
-        const header = formatStyledHeader({
-          command: "db init",
-          description: "Bootstrap a database to match the current contract",
-          url: "https://pris.ly/db-init",
-          details,
-          flags
-        });
-        console.log(header);
-      }
-      let contractJsonContent;
-      try {
-        contractJsonContent = await readFile(contractPathAbsolute, "utf-8");
-      } catch (error) {
-        if (error instanceof Error && error.code === "ENOENT") {
-          throw errorFileNotFound(contractPathAbsolute, {
-            why: `Contract file not found at ${contractPathAbsolute}`,
-            fix: `Run \`prisma-next contract emit\` to generate ${contractPath}, or update \`config.contract.output\` in ${configPath}`
-          });
-        }
-        throw errorUnexpected2(error instanceof Error ? error.message : String(error), {
-          why: `Failed to read contract file: ${error instanceof Error ? error.message : String(error)}`
-        });
-      }
-      let contractJson;
-      try {
-        contractJson = JSON.parse(contractJsonContent);
-      } catch (error) {
-        throw errorContractValidationFailed(
-          `Contract JSON is invalid: ${error instanceof Error ? error.message : String(error)}`,
-          { where: { path: contractPathAbsolute } }
-        );
-      }
-      const dbUrl = options.db ?? config.db?.url;
-      if (!dbUrl) {
-        throw errorDatabaseUrlRequired({
-          why: `Database URL is required for db init (set db.url in ${configPath}, or pass --db <url>)`
-        });
-      }
-      if (!config.driver) {
-        throw errorDriverRequired({ why: "Config.driver is required for db init" });
-      }
-      const driverDescriptor = config.driver;
-      if (!config.target.migrations) {
-        throw errorTargetMigrationNotSupported({
-          why: `Target "${config.target.id}" does not support migrations`
-        });
-      }
-      const migrations = config.target.migrations;
-      let driver;
-      try {
-        driver = await withSpinner(() => driverDescriptor.create(dbUrl), {
-          message: "Connecting to database...",
-          flags
-        });
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        const code = error.code;
-        const redacted = redactDatabaseUrl(dbUrl);
-        throw errorRuntime("Database connection failed", {
-          why: message,
-          fix: "Verify the database URL, ensure the database is reachable, and confirm credentials/permissions",
-          meta: {
-            ...typeof code !== "undefined" ? { code } : {},
-            ...redacted
-          }
-        });
-      }
-      try {
-        const familyInstance = config.family.create({
-          target: config.target,
-          adapter: config.adapter,
-          driver: driverDescriptor,
-          extensionPacks: config.extensionPacks ?? []
-        });
-        const rawComponents = [config.target, config.adapter, ...config.extensionPacks ?? []];
-        const frameworkComponents = assertFrameworkComponentsCompatible(
-          config.family.familyId,
-          config.target.targetId,
-          rawComponents
-        );
-        const contractIR = familyInstance.validateContractIR(contractJson);
-        assertContractRequirementsSatisfied({
-          contract: contractIR,
-          family: config.family,
-          target: config.target,
-          adapter: config.adapter,
-          extensionPacks: config.extensionPacks
-        });
-        const planner = migrations.createPlanner(familyInstance);
-        const runner = migrations.createRunner(familyInstance);
-        const schemaIR = await withSpinner(() => familyInstance.introspect({ driver }), {
-          message: "Introspecting database schema...",
-          flags
-        });
-        const policy = { allowedOperationClasses: ["additive"] };
-        const plannerResult = await withSpinner(
-          async () => planner.plan({
-            contract: contractIR,
-            schema: schemaIR,
-            policy,
-            frameworkComponents
-          }),
-          {
-            message: "Planning migration...",
-            flags
-          }
-        );
-        if (plannerResult.kind === "failure") {
-          throw errorMigrationPlanningFailed({ conflicts: plannerResult.conflicts });
-        }
-        const migrationPlan = plannerResult.plan;
-        const existingMarker = await familyInstance.readMarker({ driver });
-        if (existingMarker) {
-          const markerMatchesDestination = existingMarker.coreHash === migrationPlan.destination.coreHash && (!migrationPlan.destination.profileHash || existingMarker.profileHash === migrationPlan.destination.profileHash);
-          if (markerMatchesDestination) {
-            const dbInitResult2 = {
-              ok: true,
-              mode: options.plan ? "plan" : "apply",
-              plan: {
-                targetId: migrationPlan.targetId,
-                destination: migrationPlan.destination,
-                operations: []
-              },
-              ...options.plan ? {} : {
-                execution: { operationsPlanned: 0, operationsExecuted: 0 },
-                marker: {
-                  coreHash: existingMarker.coreHash,
-                  profileHash: existingMarker.profileHash
-                }
-              },
-              summary: "Database already at target contract state",
-              timings: { total: Date.now() - startTime }
-            };
-            return dbInitResult2;
-          }
-          const coreHashMismatch = existingMarker.coreHash !== migrationPlan.destination.coreHash;
-          const profileHashMismatch = migrationPlan.destination.profileHash && existingMarker.profileHash !== migrationPlan.destination.profileHash;
-          const mismatchParts = [];
-          if (coreHashMismatch) {
-            mismatchParts.push(
-              `coreHash (marker: ${existingMarker.coreHash}, destination: ${migrationPlan.destination.coreHash})`
-            );
-          }
-          if (profileHashMismatch) {
-            mismatchParts.push(
-              `profileHash (marker: ${existingMarker.profileHash}, destination: ${migrationPlan.destination.profileHash})`
-            );
-          }
-          throw errorRuntime(
-            `Existing contract marker does not match plan destination. Mismatch in ${mismatchParts.join(" and ")}.`,
-            {
-              why: "Database has an existing contract marker that does not match the target contract",
-              fix: "If bootstrapping, drop/reset the database then re-run `prisma-next db init`; otherwise reconcile schema/marker using your migration workflow",
-              meta: {
-                code: "MARKER_ORIGIN_MISMATCH",
-                markerCoreHash: existingMarker.coreHash,
-                destinationCoreHash: migrationPlan.destination.coreHash,
-                ...existingMarker.profileHash ? { markerProfileHash: existingMarker.profileHash } : {},
-                ...migrationPlan.destination.profileHash ? { destinationProfileHash: migrationPlan.destination.profileHash } : {}
-              }
-            }
-          );
-        }
-        if (options.plan) {
-          const dbInitResult2 = {
-            ok: true,
-            mode: "plan",
-            plan: {
-              targetId: migrationPlan.targetId,
-              destination: migrationPlan.destination,
-              operations: migrationPlan.operations.map((op) => ({
-                id: op.id,
-                label: op.label,
-                operationClass: op.operationClass
-              }))
-            },
-            summary: `Planned ${migrationPlan.operations.length} operation(s)`,
-            timings: { total: Date.now() - startTime }
-          };
-          return dbInitResult2;
-        }
-        if (!flags.quiet && flags.json !== "object") {
-          console.log("Applying migration plan and verifying schema...");
-        }
-        const callbacks = {
-          onOperationStart: (op) => {
-            if (!flags.quiet && flags.json !== "object") {
-              console.log(`  \u2192 ${op.label}...`);
-            }
-          },
-          onOperationComplete: (_op) => {
-          }
-        };
-        const runnerResult = await runner.execute({
-          plan: migrationPlan,
-          driver,
-          destinationContract: contractIR,
-          policy,
-          callbacks,
-          // db init plans and applies back-to-back from a fresh introspection, so per-operation
-          // pre/postchecks and the idempotency probe are usually redundant overhead. We still
-          // enforce marker/origin compatibility and a full schema verification after apply.
-          executionChecks: {
-            prechecks: false,
-            postchecks: false,
-            idempotencyChecks: false
-          },
-          frameworkComponents
-        });
-        if (!runnerResult.ok) {
-          const meta = {
-            code: runnerResult.failure.code,
-            ...runnerResult.failure.meta ?? {}
-          };
-          const sqlState = typeof meta["sqlState"] === "string" ? meta["sqlState"] : void 0;
-          const fix = sqlState === "42501" ? "Grant the database user sufficient privileges (insufficient_privilege), or run db init as a more privileged role" : runnerResult.failure.code === "SCHEMA_VERIFY_FAILED" ? "Fix the schema mismatch (db init is additive-only), or drop/reset the database and re-run `prisma-next db init`" : void 0;
-          throw errorRuntime(runnerResult.failure.summary, {
-            why: runnerResult.failure.why ?? `Migration runner failed: ${runnerResult.failure.code}`,
-            ...fix ? { fix } : {},
-            meta
-          });
-        }
-        const execution = runnerResult.value;
-        const dbInitResult = {
-          ok: true,
-          mode: "apply",
-          plan: {
-            targetId: migrationPlan.targetId,
-            destination: migrationPlan.destination,
-            operations: migrationPlan.operations.map((op) => ({
-              id: op.id,
-              label: op.label,
-              operationClass: op.operationClass
-            }))
-          },
-          execution: {
-            operationsPlanned: execution.operationsPlanned,
-            operationsExecuted: execution.operationsExecuted
-          },
-          marker: migrationPlan.destination.profileHash ? {
-            coreHash: migrationPlan.destination.coreHash,
-            profileHash: migrationPlan.destination.profileHash
-          } : { coreHash: migrationPlan.destination.coreHash },
-          summary: `Applied ${execution.operationsExecuted} operation(s), marker written`,
-          timings: { total: Date.now() - startTime }
-        };
-        return dbInitResult;
-      } finally {
-        await driver.close();
-      }
-    });
+        })
+      );
+      const exitCode2 = handleResult(result2, flags);
+      process.exit(exitCode2);
+    }
+    const result = await executeDbInitCommand(options, flags, startTime);
     const exitCode = handleResult(result, flags, (dbInitResult) => {
       if (flags.json === "object") {
         console.log(formatDbInitJson(dbInitResult));
@@ -1588,15 +2158,92 @@ function createDbInitCommand() {
 }
 
 // src/commands/db-introspect.ts
-import { readFile as readFile2 } from "fs/promises";
 import { relative as relative4, resolve as resolve4 } from "path";
-import {
-  errorDatabaseUrlRequired as errorDatabaseUrlRequired2,
-  errorDriverRequired as errorDriverRequired2,
-  errorRuntime as errorRuntime2,
-  errorUnexpected as errorUnexpected3
-} from "@prisma-next/core-control-plane/errors";
+import { notOk as notOk5, ok as ok5 } from "@prisma-next/utils/result";
 import { Command as Command3 } from "commander";
+async function executeDbIntrospectCommand(options, flags, startTime) {
+  const config = await loadConfig(options.config);
+  const configPath = options.config ? relative4(process.cwd(), resolve4(options.config)) : "prisma-next.config.ts";
+  if (flags.json !== "object" && !flags.quiet) {
+    const details = [
+      { label: "config", value: configPath }
+    ];
+    if (options.db) {
+      const maskedUrl = options.db.replace(/:([^:@]+)@/, ":****@");
+      details.push({ label: "database", value: maskedUrl });
+    } else if (config.db?.connection && typeof config.db.connection === "string") {
+      const maskedUrl = config.db.connection.replace(/:([^:@]+)@/, ":****@");
+      details.push({ label: "database", value: maskedUrl });
+    }
+    const header = formatStyledHeader({
+      command: "db introspect",
+      description: "Inspect the database schema",
+      url: "https://pris.ly/db-introspect",
+      details,
+      flags
+    });
+    console.log(header);
+  }
+  const dbConnection = options.db ?? config.db?.connection;
+  if (!dbConnection) {
+    return notOk5(
+      errorDatabaseConnectionRequired({
+        why: `Database connection is required for db introspect (set db.connection in ${configPath}, or pass --db <url>)`
+      })
+    );
+  }
+  if (!config.driver) {
+    return notOk5(errorDriverRequired({ why: "Config.driver is required for db introspect" }));
+  }
+  const client = createControlClient({
+    family: config.family,
+    target: config.target,
+    adapter: config.adapter,
+    driver: config.driver,
+    extensionPacks: config.extensionPacks ?? []
+  });
+  const onProgress = createProgressAdapter({ flags });
+  try {
+    const schemaIR = await client.introspect({
+      connection: dbConnection,
+      onProgress
+    });
+    if (!flags.quiet && flags.json !== "object" && process.stdout.isTTY) {
+      console.log("");
+    }
+    const schemaView = client.toSchemaView(schemaIR);
+    const totalTime = Date.now() - startTime;
+    const connectionForMeta = typeof dbConnection === "string" ? dbConnection.replace(/:([^:@]+)@/, ":****@") : void 0;
+    const introspectResult = {
+      ok: true,
+      summary: "Schema introspected successfully",
+      target: {
+        familyId: config.family.familyId,
+        id: config.target.targetId
+      },
+      schema: schemaIR,
+      meta: {
+        ...configPath ? { configPath } : {},
+        ...connectionForMeta ? { dbUrl: connectionForMeta } : {}
+      },
+      timings: {
+        total: totalTime
+      }
+    };
+    return ok5({ introspectResult, schemaView });
+  } catch (error) {
+    if (error instanceof CliStructuredError) {
+      return notOk5(error);
+    }
+    return notOk5(
+      errorUnexpected2(error instanceof Error ? error.message : String(error), {
+        why: `Unexpected error during db introspect: ${error instanceof Error ? error.message : String(error)}`
+      })
+    );
+  } finally {
+    await client.close();
+  }
+}
 function createDbIntrospectCommand() {
   const command = new Command3("introspect");
   setCommandDescriptions(
@@ -1609,137 +2256,21 @@ function createDbIntrospectCommand() {
       const flags = parseGlobalFlags({});
       return formatCommandHelp({ command: cmd, flags });
     }
-  }).option("--db <url>", "Database connection string").option("--config <path>", "Path to prisma-next.config.ts").option("--json [format]", "Output as JSON (object or ndjson)", false).option("-q, --quiet", "Quiet mode: errors only").option("-v, --verbose", "Verbose output: debug info, timings").option("-vv, --trace", "Trace output: deep internals, stack traces").option("--timestamps", "Add timestamps to output").option("--color", "Force color output").option("--no-color", "Disable color output").action(async (options) => {
+  }).option("--db <url>", "Database connection string").option("--config <path>", "Path to prisma-next.config.ts").option("--json [format]", "Output as JSON (object)", false).option("-q, --quiet", "Quiet mode: errors only").option("-v, --verbose", "Verbose output: debug info, timings").option("-vv, --trace", "Trace output: deep internals, stack traces").option("--timestamps", "Add timestamps to output").option("--color", "Force color output").option("--no-color", "Disable color output").action(async (options) => {
     const flags = parseGlobalFlags(options);
-    const result = await performAction(async () => {
-      const startTime = Date.now();
-      const config = await loadConfig(options.config);
-      const configPath = options.config ? relative4(process.cwd(), resolve4(options.config)) : "prisma-next.config.ts";
-      let contractIR;
-      if (config.contract?.output) {
-        const contractPath = resolve4(config.contract.output);
-        try {
-          const contractJsonContent = await readFile2(contractPath, "utf-8");
-          contractIR = JSON.parse(contractJsonContent);
-        } catch (error) {
-          if (error instanceof Error && error.code !== "ENOENT") {
-            throw errorUnexpected3(error.message, {
-              why: `Failed to read contract file: ${error.message}`
-            });
-          }
-        }
-      }
-      if (flags.json !== "object" && !flags.quiet) {
-        const details = [
-          { label: "config", value: configPath }
-        ];
-        if (options.db) {
-          const maskedUrl = options.db.replace(/:([^:@]+)@/, ":****@");
-          details.push({ label: "database", value: maskedUrl });
-        } else if (config.db?.url) {
-          const maskedUrl = config.db.url.replace(/:([^:@]+)@/, ":****@");
-          details.push({ label: "database", value: maskedUrl });
-        }
-        const header = formatStyledHeader({
+    const startTime = Date.now();
+    if (flags.json === "ndjson") {
+      const result2 = notOk5(
+        errorJsonFormatNotSupported({
           command: "db introspect",
-          description: "Inspect the database schema",
-          url: "https://pris.ly/db-introspect",
-          details,
-          flags
-        });
-        console.log(header);
-      }
-      const dbUrl = options.db ?? config.db?.url;
-      if (!dbUrl) {
-        throw errorDatabaseUrlRequired2();
-      }
-      if (!config.driver) {
-        throw errorDriverRequired2();
-      }
-      const driverDescriptor = config.driver;
-      const driver = await withSpinner(() => driverDescriptor.create(dbUrl), {
-        message: "Connecting to database...",
-        flags
-      });
-      try {
-        const familyInstance = config.family.create({
-          target: config.target,
-          adapter: config.adapter,
-          driver: driverDescriptor,
-          extensionPacks: config.extensionPacks ?? []
-        });
-        if (contractIR) {
-          const validatedContract = familyInstance.validateContractIR(contractIR);
-          assertContractRequirementsSatisfied({
-            contract: validatedContract,
-            family: config.family,
-            target: config.target,
-            adapter: config.adapter,
-            extensionPacks: config.extensionPacks
-          });
-          contractIR = validatedContract;
-        }
-        let schemaIR;
-        try {
-          schemaIR = await withSpinner(
-            () => familyInstance.introspect({
-              driver,
-              contractIR
-            }),
-            {
-              message: "Introspecting database schema...",
-              flags
-            }
-          );
-        } catch (error) {
-          throw errorRuntime2(error instanceof Error ? error.message : String(error), {
-            why: `Failed to introspect database: ${error instanceof Error ? error.message : String(error)}`
-          });
-        }
-        let schemaView;
-        if (familyInstance.toSchemaView) {
-          try {
-            schemaView = familyInstance.toSchemaView(schemaIR);
-          } catch (error) {
-            if (flags.verbose) {
-              console.error(
-                `Warning: Failed to project schema to view: ${error instanceof Error ? error.message : String(error)}`
-              );
-            }
-          }
-        }
-        const totalTime = Date.now() - startTime;
-        if (!flags.quiet && flags.json !== "object" && process.stdout.isTTY) {
-          console.log("");
-        }
-        const introspectResult = {
-          ok: true,
-          summary: "Schema introspected successfully",
-          target: {
-            familyId: config.family.familyId,
-            id: config.target.targetId
-          },
-          schema: schemaIR,
-          ...configPath || options.db || config.db?.url ? {
-            meta: {
-              ...configPath ? { configPath } : {},
-              ...options.db || config.db?.url ? {
-                dbUrl: (options.db ?? config.db?.url ?? "").replace(
-                  /:([^:@]+)@/,
-                  ":****@"
-                )
-              } : {}
-            }
-          } : {},
-          timings: {
-            total: totalTime
-          }
-        };
-        return { introspectResult, schemaView };
-      } finally {
-        await driver.close();
-      }
-    });
+          format: "ndjson",
+          supportedFormats: ["object"]
+        })
+      );
+      const exitCode2 = handleResult(result2, flags);
+      process.exit(exitCode2);
+    }
+    const result = await executeDbIntrospectCommand(options, flags, startTime);
     const exitCode = handleResult(result, flags, (value) => {
       const { introspectResult, schemaView } = value;
       if (flags.json === "object") {
@@ -1757,16 +2288,104 @@ function createDbIntrospectCommand() {
 }
 
 // src/commands/db-schema-verify.ts
-import { readFile as readFile3 } from "fs/promises";
+import { readFile as readFile2 } from "fs/promises";
 import { relative as relative5, resolve as resolve5 } from "path";
-import {
-  errorDatabaseUrlRequired as errorDatabaseUrlRequired3,
-  errorDriverRequired as errorDriverRequired3,
-  errorFileNotFound as errorFileNotFound2,
-  errorRuntime as errorRuntime3,
-  errorUnexpected as errorUnexpected4
-} from "@prisma-next/core-control-plane/errors";
+import { notOk as notOk6, ok as ok6 } from "@prisma-next/utils/result";
 import { Command as Command4 } from "commander";
+async function executeDbSchemaVerifyCommand(options, flags) {
+  const config = await loadConfig(options.config);
+  const configPath = options.config ? relative5(process.cwd(), resolve5(options.config)) : "prisma-next.config.ts";
+  const contractPathAbsolute = config.contract?.output ? resolve5(config.contract.output) : resolve5("src/prisma/contract.json");
+  const contractPath = relative5(process.cwd(), contractPathAbsolute);
+  if (flags.json !== "object" && !flags.quiet) {
+    const details = [
+      { label: "config", value: configPath },
+      { label: "contract", value: contractPath }
+    ];
+    if (options.db) {
+      details.push({ label: "database", value: options.db });
+    }
+    const header = formatStyledHeader({
+      command: "db schema-verify",
+      description: "Check whether the database schema satisfies your contract",
+      url: "https://pris.ly/db-schema-verify",
+      details,
+      flags
+    });
+    console.log(header);
+  }
+  let contractJsonContent;
+  try {
+    contractJsonContent = await readFile2(contractPathAbsolute, "utf-8");
+  } catch (error) {
+    if (error instanceof Error && error.code === "ENOENT") {
+      return notOk6(
+        errorFileNotFound(contractPathAbsolute, {
+          why: `Contract file not found at ${contractPathAbsolute}`,
+          fix: `Run \`prisma-next contract emit\` to generate ${contractPath}, or update \`config.contract.output\` in ${configPath}`
+        })
+      );
+    }
+    return notOk6(
+      errorUnexpected2(error instanceof Error ? error.message : String(error), {
+        why: `Failed to read contract file: ${error instanceof Error ? error.message : String(error)}`
+      })
+    );
+  }
+  let contractJson;
+  try {
+    contractJson = JSON.parse(contractJsonContent);
+  } catch (error) {
+    return notOk6(
+      errorContractValidationFailed(
+        `Contract JSON is invalid: ${error instanceof Error ? error.message : String(error)}`,
+        { where: { path: contractPathAbsolute } }
+      )
+    );
+  }
+  const dbConnection = options.db ?? config.db?.connection;
+  if (!dbConnection) {
+    return notOk6(
+      errorDatabaseConnectionRequired({
+        why: `Database connection is required for db schema-verify (set db.connection in ${configPath}, or pass --db <url>)`
+      })
+    );
+  }
+  if (!config.driver) {
+    return notOk6(errorDriverRequired({ why: "Config.driver is required for db schema-verify" }));
+  }
+  const client = createControlClient({
+    family: config.family,
+    target: config.target,
+    adapter: config.adapter,
+    driver: config.driver,
+    extensionPacks: config.extensionPacks ?? []
+  });
+  const onProgress = createProgressAdapter({ flags });
+  try {
+    const schemaVerifyResult = await client.schemaVerify({
+      contractIR: contractJson,
+      strict: options.strict ?? false,
+      connection: dbConnection,
+      onProgress
+    });
+    if (!flags.quiet && flags.json !== "object" && process.stdout.isTTY) {
+      console.log("");
+    }
+    return ok6(schemaVerifyResult);
+  } catch (error) {
+    if (error instanceof CliStructuredError) {
+      return notOk6(error);
+    }
+    return notOk6(
+      errorUnexpected2(error instanceof Error ? error.message : String(error), {
+        why: `Unexpected error during db schema-verify: ${error instanceof Error ? error.message : String(error)}`
+      })
+    );
+  } finally {
+    await client.close();
+  }
+}
 function createDbSchemaVerifyCommand() {
   const command = new Command4("schema-verify");
   setCommandDescriptions(
@@ -1779,106 +2398,20 @@ function createDbSchemaVerifyCommand() {
       const flags = parseGlobalFlags({});
       return formatCommandHelp({ command: cmd, flags });
     }
-  }).option("--db <url>", "Database connection string").option("--config <path>", "Path to prisma-next.config.ts").option("--json [format]", "Output as JSON (object or ndjson)", false).option("--strict", "Strict mode: extra schema elements cause failures", false).option("-q, --quiet", "Quiet mode: errors only").option("-v, --verbose", "Verbose output: debug info, timings").option("-vv, --trace", "Trace output: deep internals, stack traces").option("--timestamps", "Add timestamps to output").option("--color", "Force color output").option("--no-color", "Disable color output").action(async (options) => {
+  }).option("--db <url>", "Database connection string").option("--config <path>", "Path to prisma-next.config.ts").option("--json [format]", "Output as JSON (object)", false).option("--strict", "Strict mode: extra schema elements cause failures", false).option("-q, --quiet", "Quiet mode: errors only").option("-v, --verbose", "Verbose output: debug info, timings").option("-vv, --trace", "Trace output: deep internals, stack traces").option("--timestamps", "Add timestamps to output").option("--color", "Force color output").option("--no-color", "Disable color output").action(async (options) => {
     const flags = parseGlobalFlags(options);
-    const result = await performAction(async () => {
-      const config = await loadConfig(options.config);
-      const configPath = options.config ? relative5(process.cwd(), resolve5(options.config)) : "prisma-next.config.ts";
-      const contractPathAbsolute = config.contract?.output ? resolve5(config.contract.output) : resolve5("src/prisma/contract.json");
-      const contractPath = relative5(process.cwd(), contractPathAbsolute);
-      if (flags.json !== "object" && !flags.quiet) {
-        const details = [
-          { label: "config", value: configPath },
-          { label: "contract", value: contractPath }
-        ];
-        if (options.db) {
-          details.push({ label: "database", value: options.db });
-        }
-        const header = formatStyledHeader({
+    if (flags.json === "ndjson") {
+      const result2 = notOk6(
+        errorJsonFormatNotSupported({
           command: "db schema-verify",
-          description: "Check whether the database schema satisfies your contract",
-          url: "https://pris.ly/db-schema-verify",
-          details,
-          flags
-        });
-        console.log(header);
-      }
-      let contractJsonContent;
-      try {
-        contractJsonContent = await readFile3(contractPathAbsolute, "utf-8");
-      } catch (error) {
-        if (error instanceof Error && error.code === "ENOENT") {
-          throw errorFileNotFound2(contractPathAbsolute, {
-            why: `Contract file not found at ${contractPathAbsolute}`
-          });
-        }
-        throw errorUnexpected4(error instanceof Error ? error.message : String(error), {
-          why: `Failed to read contract file: ${error instanceof Error ? error.message : String(error)}`
-        });
-      }
-      const contractJson = JSON.parse(contractJsonContent);
-      if (!config.driver) {
-        throw errorDriverRequired3();
-      }
-      const driverDescriptor = config.driver;
-      const familyInstance = config.family.create({
-        target: config.target,
-        adapter: config.adapter,
-        driver: driverDescriptor,
-        extensionPacks: config.extensionPacks ?? []
-      });
-      const contractIR = familyInstance.validateContractIR(contractJson);
-      assertContractRequirementsSatisfied({
-        contract: contractIR,
-        family: config.family,
-        target: config.target,
-        adapter: config.adapter,
-        extensionPacks: config.extensionPacks
-      });
-      const dbUrl = options.db ?? config.db?.url;
-      if (!dbUrl) {
-        throw errorDatabaseUrlRequired3();
-      }
-      const driver = await withSpinner(() => driverDescriptor.create(dbUrl), {
-        message: "Connecting to database...",
-        flags
-      });
-      try {
-        const rawComponents = [config.target, config.adapter, ...config.extensionPacks ?? []];
-        const frameworkComponents = assertFrameworkComponentsCompatible(
-          config.family.familyId,
-          config.target.targetId,
-          rawComponents
-        );
-        let schemaVerifyResult;
-        try {
-          schemaVerifyResult = await withSpinner(
-            () => familyInstance.schemaVerify({
-              driver,
-              contractIR,
-              strict: options.strict ?? false,
-              contractPath: contractPathAbsolute,
-              configPath,
-              frameworkComponents
-            }),
-            {
-              message: "Verifying database schema...",
-              flags
-            }
-          );
-        } catch (error) {
-          throw errorRuntime3(error instanceof Error ? error.message : String(error), {
-            why: `Failed to verify database schema: ${error instanceof Error ? error.message : String(error)}`
-          });
-        }
-        if (!flags.quiet && flags.json !== "object" && process.stdout.isTTY) {
-          console.log("");
-        }
-        return schemaVerifyResult;
-      } finally {
-        await driver.close();
-      }
-    });
+          format: "ndjson",
+          supportedFormats: ["object"]
+        })
+      );
+      const exitCode2 = handleResult(result2, flags);
+      process.exit(exitCode2);
+    }
+    const result = await executeDbSchemaVerifyCommand(options, flags);
     const exitCode = handleResult(result, flags, (schemaVerifyResult) => {
       if (flags.json === "object") {
         console.log(formatSchemaVerifyJson(schemaVerifyResult));
@@ -1899,16 +2432,116 @@ function createDbSchemaVerifyCommand() {
 }
 
 // src/commands/db-sign.ts
-import { readFile as readFile4 } from "fs/promises";
+import { readFile as readFile3 } from "fs/promises";
 import { relative as relative6, resolve as resolve6 } from "path";
-import {
-  errorDatabaseUrlRequired as errorDatabaseUrlRequired4,
-  errorDriverRequired as errorDriverRequired4,
-  errorFileNotFound as errorFileNotFound3,
-  errorRuntime as errorRuntime4,
-  errorUnexpected as errorUnexpected5
-} from "@prisma-next/core-control-plane/errors";
+import { notOk as notOk7, ok as ok7 } from "@prisma-next/utils/result";
 import { Command as Command5 } from "commander";
+async function executeDbSignCommand(options, flags) {
+  const config = await loadConfig(options.config);
+  const configPath = options.config ? relative6(process.cwd(), resolve6(options.config)) : "prisma-next.config.ts";
+  const contractPathAbsolute = config.contract?.output ? resolve6(config.contract.output) : resolve6("src/prisma/contract.json");
+  const contractPath = relative6(process.cwd(), contractPathAbsolute);
+  if (flags.json !== "object" && !flags.quiet) {
+    const details = [
+      { label: "config", value: configPath },
+      { label: "contract", value: contractPath }
+    ];
+    if (options.db) {
+      details.push({ label: "database", value: options.db });
+    }
+    const header = formatStyledHeader({
+      command: "db sign",
+      description: "Sign the database with your contract so you can safely run queries",
+      url: "https://pris.ly/db-sign",
+      details,
+      flags
+    });
+    console.log(header);
+  }
+  let contractJsonContent;
+  try {
+    contractJsonContent = await readFile3(contractPathAbsolute, "utf-8");
+  } catch (error) {
+    if (error instanceof Error && error.code === "ENOENT") {
+      return notOk7(
+        errorFileNotFound(contractPathAbsolute, {
+          why: `Contract file not found at ${contractPathAbsolute}`,
+          fix: `Run \`prisma-next contract emit\` to generate ${contractPath}, or update \`config.contract.output\` in ${configPath}`
+        })
+      );
+    }
+    return notOk7(
+      errorUnexpected2(error instanceof Error ? error.message : String(error), {
+        why: `Failed to read contract file: ${error instanceof Error ? error.message : String(error)}`
+      })
+    );
+  }
+  let contractJson;
+  try {
+    contractJson = JSON.parse(contractJsonContent);
+  } catch (error) {
+    return notOk7(
+      errorContractValidationFailed(
+        `Contract JSON is invalid: ${error instanceof Error ? error.message : String(error)}`,
+        { where: { path: contractPathAbsolute } }
+      )
+    );
+  }
+  const dbConnection = options.db ?? config.db?.connection;
+  if (!dbConnection) {
+    return notOk7(
+      errorDatabaseConnectionRequired({
+        why: `Database connection is required for db sign (set db.connection in ${configPath}, or pass --db <url>)`
+      })
+    );
+  }
+  if (!config.driver) {
+    return notOk7(errorDriverRequired({ why: "Config.driver is required for db sign" }));
+  }
+  const client = createControlClient({
+    family: config.family,
+    target: config.target,
+    adapter: config.adapter,
+    driver: config.driver,
+    extensionPacks: config.extensionPacks ?? []
+  });
+  const onProgress = createProgressAdapter({ flags });
+  try {
+    const schemaVerifyResult = await client.schemaVerify({
+      contractIR: contractJson,
+      strict: false,
+      connection: dbConnection,
+      onProgress
+    });
+    if (!schemaVerifyResult.ok) {
+      if (!flags.quiet && flags.json !== "object" && process.stdout.isTTY) {
+        console.log("");
+      }
+      return notOk7(schemaVerifyResult);
+    }
+    const signResult = await client.sign({
+      contractIR: contractJson,
+      contractPath,
+      configPath,
+      onProgress
+    });
+    if (!flags.quiet && flags.json !== "object" && process.stdout.isTTY) {
+      console.log("");
+    }
+    return ok7(signResult);
+  } catch (error) {
+    if (error instanceof CliStructuredError) {
+      return notOk7(error);
+    }
+    return notOk7(
+      errorUnexpected2(error instanceof Error ? error.message : String(error), {
+        why: `Unexpected error during db sign: ${error instanceof Error ? error.message : String(error)}`
+      })
+    );
+  } finally {
+    await client.close();
+  }
+}
 function createDbSignCommand() {
   const command = new Command5("sign");
   setCommandDescriptions(
@@ -1921,172 +2554,170 @@ function createDbSignCommand() {
       const flags = parseGlobalFlags({});
       return formatCommandHelp({ command: cmd, flags });
     }
-  }).option("--db <url>", "Database connection string").option("--config <path>", "Path to prisma-next.config.ts").option("--json [format]", "Output as JSON (object or ndjson)", false).option("-q, --quiet", "Quiet mode: errors only").option("-v, --verbose", "Verbose output: debug info, timings").option("-vv, --trace", "Trace output: deep internals, stack traces").option("--timestamps", "Add timestamps to output").option("--color", "Force color output").option("--no-color", "Disable color output").action(async (options) => {
+  }).option("--db <url>", "Database connection string").option("--config <path>", "Path to prisma-next.config.ts").option("--json [format]", "Output as JSON (object)", false).option("-q, --quiet", "Quiet mode: errors only").option("-v, --verbose", "Verbose output: debug info, timings").option("-vv, --trace", "Trace output: deep internals, stack traces").option("--timestamps", "Add timestamps to output").option("--color", "Force color output").option("--no-color", "Disable color output").action(async (options) => {
     const flags = parseGlobalFlags(options);
-    const result = await performAction(async () => {
-      const config = await loadConfig(options.config);
-      const configPath = options.config ? relative6(process.cwd(), resolve6(options.config)) : "prisma-next.config.ts";
-      const contractPathAbsolute = config.contract?.output ? resolve6(config.contract.output) : resolve6("src/prisma/contract.json");
-      const contractPath = relative6(process.cwd(), contractPathAbsolute);
-      if (flags.json !== "object" && !flags.quiet) {
-        const details = [
-          { label: "config", value: configPath },
-          { label: "contract", value: contractPath }
-        ];
-        if (options.db) {
-          details.push({ label: "database", value: options.db });
-        }
-        const header = formatStyledHeader({
+    if (flags.json === "ndjson") {
+      const result2 = notOk7(
+        errorJsonFormatNotSupported({
           command: "db sign",
-          description: "Sign the database with your contract so you can safely run queries",
-          url: "https://pris.ly/db-sign",
-          details,
-          flags
-        });
-        console.log(header);
-      }
-      let contractJsonContent;
-      try {
-        contractJsonContent = await readFile4(contractPathAbsolute, "utf-8");
-      } catch (error) {
-        if (error instanceof Error && error.code === "ENOENT") {
-          throw errorFileNotFound3(contractPathAbsolute, {
-            why: `Contract file not found at ${contractPathAbsolute}`
-          });
-        }
-        throw errorUnexpected5(error instanceof Error ? error.message : String(error), {
-          why: `Failed to read contract file: ${error instanceof Error ? error.message : String(error)}`
-        });
-      }
-      const contractJson = JSON.parse(contractJsonContent);
-      const dbUrl = options.db ?? config.db?.url;
-      if (!dbUrl) {
-        throw errorDatabaseUrlRequired4();
-      }
-      if (!config.driver) {
-        throw errorDriverRequired4();
-      }
-      const driverDescriptor = config.driver;
-      const familyInstance = config.family.create({
-        target: config.target,
-        adapter: config.adapter,
-        driver: driverDescriptor,
-        extensionPacks: config.extensionPacks ?? []
-      });
-      const contractIR = familyInstance.validateContractIR(contractJson);
-      assertContractRequirementsSatisfied({
-        contract: contractIR,
-        family: config.family,
-        target: config.target,
-        adapter: config.adapter,
-        extensionPacks: config.extensionPacks
-      });
-      const rawComponents = [config.target, config.adapter, ...config.extensionPacks ?? []];
-      const frameworkComponents = assertFrameworkComponentsCompatible(
-        config.family.familyId,
-        config.target.targetId,
-        rawComponents
+          format: "ndjson",
+          supportedFormats: ["object"]
+        })
       );
-      const driver = await driverDescriptor.create(dbUrl);
-      try {
-        let schemaVerifyResult;
-        try {
-          schemaVerifyResult = await withSpinner(
-            () => familyInstance.schemaVerify({
-              driver,
-              contractIR,
-              strict: false,
-              contractPath: contractPathAbsolute,
-              configPath,
-              frameworkComponents
-            }),
-            {
-              message: "Verifying database satisfies contract",
-              flags
-            }
-          );
-        } catch (error) {
-          throw errorRuntime4(error instanceof Error ? error.message : String(error), {
-            why: `Failed to verify database schema: ${error instanceof Error ? error.message : String(error)}`
-          });
-        }
-        if (!schemaVerifyResult.ok) {
-          return { schemaVerifyResult, signResult: void 0 };
-        }
-        let signResult;
-        try {
-          signResult = await withSpinner(
-            () => familyInstance.sign({
-              driver,
-              contractIR,
-              contractPath: contractPathAbsolute,
-              configPath
-            }),
-            {
-              message: "Signing database...",
-              flags
-            }
-          );
-        } catch (error) {
-          throw errorRuntime4(error instanceof Error ? error.message : String(error), {
-            why: `Failed to sign database: ${error instanceof Error ? error.message : String(error)}`
-          });
-        }
-        if (!flags.quiet && flags.json !== "object" && process.stdout.isTTY) {
-          console.log("");
-        }
-        return { schemaVerifyResult: void 0, signResult };
-      } finally {
-        await driver.close();
-      }
-    });
-    const exitCode = handleResult(result, flags, (value) => {
-      const { schemaVerifyResult, signResult } = value;
-      if (schemaVerifyResult && !schemaVerifyResult.ok) {
-        if (flags.json === "object") {
-          console.log(formatSchemaVerifyJson(schemaVerifyResult));
-        } else {
-          const output = formatSchemaVerifyOutput(schemaVerifyResult, flags);
-          if (output) {
-            console.log(output);
-          }
-        }
-        return;
-      }
-      if (signResult) {
-        if (flags.json === "object") {
-          console.log(formatSignJson(signResult));
-        } else {
-          const output = formatSignOutput(signResult, flags);
-          if (output) {
-            console.log(output);
-          }
+      const exitCode = handleResult(result2, flags);
+      process.exit(exitCode);
+    }
+    const result = await executeDbSignCommand(options, flags);
+    if (result.ok) {
+      if (flags.json === "object") {
+        console.log(formatSignJson(result.value));
+      } else {
+        const output = formatSignOutput(result.value, flags);
+        if (output) {
+          console.log(output);
         }
       }
-    });
-    if (result.ok && result.value.schemaVerifyResult && !result.value.schemaVerifyResult.ok) {
-      process.exit(1);
-    } else {
+      process.exit(0);
+    }
+    const failure = result.failure;
+    if (failure instanceof CliStructuredError) {
+      const exitCode = handleResult(result, flags);
       process.exit(exitCode);
     }
+    if (flags.json === "object") {
+      console.log(formatSchemaVerifyJson(failure));
+    } else {
+      const output = formatSchemaVerifyOutput(failure, flags);
+      if (output) {
+        console.log(output);
+      }
+    }
+    process.exit(1);
   });
   return command;
 }
 
 // src/commands/db-verify.ts
-import { readFile as readFile5 } from "fs/promises";
+import { readFile as readFile4 } from "fs/promises";
 import { relative as relative7, resolve as resolve7 } from "path";
-import {
-  errorDatabaseUrlRequired as errorDatabaseUrlRequired5,
-  errorDriverRequired as errorDriverRequired5,
-  errorFileNotFound as errorFileNotFound4,
-  errorHashMismatch as errorHashMismatch2,
-  errorMarkerMissing as errorMarkerMissing2,
-  errorRuntime as errorRuntime5,
-  errorTargetMismatch as errorTargetMismatch2,
-  errorUnexpected as errorUnexpected6
-} from "@prisma-next/core-control-plane/errors";
+import { notOk as notOk8, ok as ok8 } from "@prisma-next/utils/result";
 import { Command as Command6 } from "commander";
+function mapVerifyFailure(verifyResult) {
+  if (!verifyResult.ok && verifyResult.code) {
+    if (verifyResult.code === "PN-RTM-3001") {
+      return errorMarkerMissing();
+    }
+    if (verifyResult.code === "PN-RTM-3002") {
+      return errorHashMismatch({
+        expected: verifyResult.contract.coreHash,
+        ...verifyResult.marker?.coreHash ? { actual: verifyResult.marker.coreHash } : {}
+      });
+    }
+    if (verifyResult.code === "PN-RTM-3003") {
+      return errorTargetMismatch(
+        verifyResult.target.expected,
+        verifyResult.target.actual ?? "unknown"
+      );
+    }
+  }
+  return errorRuntime(verifyResult.summary);
+}
+async function executeDbVerifyCommand(options, flags) {
+  const config = await loadConfig(options.config);
+  const configPath = options.config ? relative7(process.cwd(), resolve7(options.config)) : "prisma-next.config.ts";
+  const contractPathAbsolute = config.contract?.output ? resolve7(config.contract.output) : resolve7("src/prisma/contract.json");
+  const contractPath = relative7(process.cwd(), contractPathAbsolute);
+  if (flags.json !== "object" && !flags.quiet) {
+    const details = [
+      { label: "config", value: configPath },
+      { label: "contract", value: contractPath }
+    ];
+    if (options.db) {
+      details.push({ label: "database", value: options.db });
+    }
+    const header = formatStyledHeader({
+      command: "db verify",
+      description: "Check whether the database has been signed with your contract",
+      url: "https://pris.ly/db-verify",
+      details,
+      flags
+    });
+    console.log(header);
+  }
+  let contractJsonContent;
+  try {
+    contractJsonContent = await readFile4(contractPathAbsolute, "utf-8");
+  } catch (error) {
+    if (error instanceof Error && error.code === "ENOENT") {
+      return notOk8(
+        errorFileNotFound(contractPathAbsolute, {
+          why: `Contract file not found at ${contractPathAbsolute}`,
+          fix: `Run \`prisma-next contract emit\` to generate ${contractPath}, or update \`config.contract.output\` in ${configPath}`
+        })
+      );
+    }
+    return notOk8(
+      errorUnexpected2(error instanceof Error ? error.message : String(error), {
+        why: `Failed to read contract file: ${error instanceof Error ? error.message : String(error)}`
+      })
+    );
+  }
+  let contractJson;
+  try {
+    contractJson = JSON.parse(contractJsonContent);
+  } catch (error) {
+    return notOk8(
+      errorContractValidationFailed(
+        `Contract JSON is invalid: ${error instanceof Error ? error.message : String(error)}`,
+        { where: { path: contractPathAbsolute } }
+      )
+    );
+  }
+  const dbConnection = options.db ?? config.db?.connection;
+  if (!dbConnection) {
+    return notOk8(
+      errorDatabaseConnectionRequired({
+        why: `Database connection is required for db verify (set db.connection in ${configPath}, or pass --db <url>)`
+      })
+    );
+  }
+  if (!config.driver) {
+    return notOk8(errorDriverRequired({ why: "Config.driver is required for db verify" }));
+  }
+  const client = createControlClient({
+    family: config.family,
+    target: config.target,
+    adapter: config.adapter,
+    driver: config.driver,
+    extensionPacks: config.extensionPacks ?? []
+  });
+  const onProgress = createProgressAdapter({ flags });
+  try {
+    const verifyResult = await client.verify({
+      contractIR: contractJson,
+      connection: dbConnection,
+      onProgress
+    });
+    if (!flags.quiet && flags.json !== "object" && process.stdout.isTTY) {
+      console.log("");
+    }
+    if (!verifyResult.ok) {
+      return notOk8(mapVerifyFailure(verifyResult));
+    }
+    return ok8(verifyResult);
+  } catch (error) {
+    if (error instanceof CliStructuredError) {
+      return notOk8(error);
+    }
+    return notOk8(
+      errorUnexpected2(error instanceof Error ? error.message : String(error), {
+        why: `Unexpected error during db verify: ${error instanceof Error ? error.message : String(error)}`
+      })
+    );
+  } finally {
+    await client.close();
+  }
+}
 function createDbVerifyCommand() {
   const command = new Command6("verify");
   setCommandDescriptions(
@@ -2099,117 +2730,20 @@ function createDbVerifyCommand() {
       const flags = parseGlobalFlags({});
       return formatCommandHelp({ command: cmd, flags });
     }
-  }).option("--db <url>", "Database connection string").option("--config <path>", "Path to prisma-next.config.ts").option("--json [format]", "Output as JSON (object or ndjson)", false).option("-q, --quiet", "Quiet mode: errors only").option("-v, --verbose", "Verbose output: debug info, timings").option("-vv, --trace", "Trace output: deep internals, stack traces").option("--timestamps", "Add timestamps to output").option("--color", "Force color output").option("--no-color", "Disable color output").action(async (options) => {
+  }).option("--db <url>", "Database connection string").option("--config <path>", "Path to prisma-next.config.ts").option("--json [format]", "Output as JSON (object)", false).option("-q, --quiet", "Quiet mode: errors only").option("-v, --verbose", "Verbose output: debug info, timings").option("-vv, --trace", "Trace output: deep internals, stack traces").option("--timestamps", "Add timestamps to output").option("--color", "Force color output").option("--no-color", "Disable color output").action(async (options) => {
     const flags = parseGlobalFlags(options);
-    const result = await performAction(async () => {
-      const config = await loadConfig(options.config);
-      const configPath = options.config ? relative7(process.cwd(), resolve7(options.config)) : "prisma-next.config.ts";
-      const contractPathAbsolute = config.contract?.output ? resolve7(config.contract.output) : resolve7("src/prisma/contract.json");
-      const contractPath = relative7(process.cwd(), contractPathAbsolute);
-      if (flags.json !== "object" && !flags.quiet) {
-        const details = [
-          { label: "config", value: configPath },
-          { label: "contract", value: contractPath }
-        ];
-        if (options.db) {
-          details.push({ label: "database", value: options.db });
-        }
-        const header = formatStyledHeader({
+    if (flags.json === "ndjson") {
+      const result2 = notOk8(
+        errorJsonFormatNotSupported({
           command: "db verify",
-          description: "Check whether the database has been signed with your contract",
-          url: "https://pris.ly/db-verify",
-          details,
-          flags
-        });
-        console.log(header);
-      }
-      let contractJsonContent;
-      try {
-        contractJsonContent = await readFile5(contractPathAbsolute, "utf-8");
-      } catch (error) {
-        if (error instanceof Error && error.code === "ENOENT") {
-          throw errorFileNotFound4(contractPathAbsolute, {
-            why: `Contract file not found at ${contractPathAbsolute}`
-          });
-        }
-        throw errorUnexpected6(error instanceof Error ? error.message : String(error), {
-          why: `Failed to read contract file: ${error instanceof Error ? error.message : String(error)}`
-        });
-      }
-      const contractJson = JSON.parse(contractJsonContent);
-      const dbUrl = options.db ?? config.db?.url;
-      if (!dbUrl) {
-        throw errorDatabaseUrlRequired5();
-      }
-      if (!config.driver) {
-        throw errorDriverRequired5();
-      }
-      const driverDescriptor = config.driver;
-      const driver = await withSpinner(() => driverDescriptor.create(dbUrl), {
-        message: "Connecting to database...",
-        flags
-      });
-      try {
-        const familyInstance = config.family.create({
-          target: config.target,
-          adapter: config.adapter,
-          driver: driverDescriptor,
-          extensionPacks: config.extensionPacks ?? []
-        });
-        const contractIR = familyInstance.validateContractIR(contractJson);
-        assertContractRequirementsSatisfied({
-          contract: contractIR,
-          family: config.family,
-          target: config.target,
-          adapter: config.adapter,
-          extensionPacks: config.extensionPacks
-        });
-        let verifyResult;
-        try {
-          verifyResult = await withSpinner(
-            () => familyInstance.verify({
-              driver,
-              contractIR,
-              expectedTargetId: config.target.targetId,
-              contractPath: contractPathAbsolute,
-              configPath
-            }),
-            {
-              message: "Verifying database schema...",
-              flags
-            }
-          );
-        } catch (error) {
-          throw errorUnexpected6(error instanceof Error ? error.message : String(error), {
-            why: `Failed to verify database: ${error instanceof Error ? error.message : String(error)}`
-          });
-        }
-        if (!verifyResult.ok && verifyResult.code) {
-          if (verifyResult.code === "PN-RTM-3001") {
-            throw errorMarkerMissing2();
-          }
-          if (verifyResult.code === "PN-RTM-3002") {
-            throw errorHashMismatch2({
-              expected: verifyResult.contract.coreHash,
-              ...verifyResult.marker?.coreHash ? { actual: verifyResult.marker.coreHash } : {}
-            });
-          }
-          if (verifyResult.code === "PN-RTM-3003") {
-            throw errorTargetMismatch2(
-              verifyResult.target.expected,
-              verifyResult.target.actual ?? "unknown"
-            );
-          }
-          throw errorRuntime5(verifyResult.summary);
-        }
-        if (!flags.quiet && flags.json !== "object" && process.stdout.isTTY) {
-          console.log("");
-        }
-        return verifyResult;
-      } finally {
-        await driver.close();
-      }
-    });
+          format: "ndjson",
+          supportedFormats: ["object"]
+        })
+      );
+      const exitCode2 = handleResult(result2, flags);
+      process.exit(exitCode2);
+    }
+    const result = await executeDbVerifyCommand(options, flags);
     const exitCode = handleResult(result, flags, (verifyResult) => {
       if (flags.json === "object") {
         console.log(formatVerifyJson(verifyResult));