@prisma-next/cli 0.3.0-pr.87.2 → 0.3.0-pr.88.2

package/dist/cli.js

@@ -1247,37 +1247,6 @@ function assertFrameworkComponentsCompatible(expectedFamilyId, expectedTargetId,
   }
   return frameworkComponents;
 }
-function assertContractRequirementsSatisfied({
-  contract,
-  stack
-}) {
-  const providedComponentIds = /* @__PURE__ */ new Set([stack.target.id, stack.adapter.id]);
-  for (const extension of stack.extensionPacks) {
-    providedComponentIds.add(extension.id);
-  }
-  const result = checkContractComponentRequirements({
-    contract,
-    expectedTargetFamily: stack.target.familyId,
-    expectedTargetId: stack.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}'.`
-    });
-  }
-  if (result.targetMismatch) {
-    throw errorConfigValidation("contract.target", {
-      why: `Contract target '${result.targetMismatch.actual}' does not match CLI target '${result.targetMismatch.expected}'.`
-    });
-  }
-  if (result.missingExtensionPackIds.length > 0) {
-    throw errorContractMissingExtensionPacks({
-      missingExtensionPacks: result.missingExtensionPackIds,
-      providedComponentIds: [...providedComponentIds]
-    });
-  }
-}
 
 // src/control-api/operations/db-init.ts
 import { notOk as notOk2, ok as ok2 } from "@prisma-next/utils/result";
@@ -1560,34 +1529,181 @@ var ControlClientImpl = class {
     };
   }
   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);
-    return familyInstance.verify({
-      driver,
-      contractIR,
-      expectedTargetId: this.options.target.targetId,
-      contractPath: ""
+    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);
-    return familyInstance.schemaVerify({
-      driver,
-      contractIR,
-      strict: options.strict ?? false,
-      contractPath: "",
-      frameworkComponents
+    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);
-    return familyInstance.sign({
-      driver,
-      contractIR,
-      contractPath: ""
+    onProgress?.({
+      action: "sign",
+      kind: "spanStart",
+      spanId: "sign",
+      label: "Signing database..."
     });
+    try {
+      const result = await familyInstance.sign({
+        driver,
+        contractIR,
+        contractPath: ""
+      });
+      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;
@@ -1632,10 +1748,59 @@ var ControlClientImpl = class {
     });
   }
   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;
-    return familyInstance.introspect({ driver });
+    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;
+    }
   }
 };
 
@@ -1905,14 +2070,111 @@ function createDbInitCommand() {
 // src/commands/db-introspect.ts
 import { readFile as readFile2 } from "fs/promises";
 import { relative as relative4, resolve as resolve4 } from "path";
-import {
-  errorDatabaseConnectionRequired as errorDatabaseConnectionRequired2,
-  errorDriverRequired as errorDriverRequired2,
-  errorRuntime as errorRuntime2,
-  errorUnexpected as errorUnexpected3
-} from "@prisma-next/core-control-plane/errors";
-import { createControlPlaneStack as createControlPlaneStack3 } from "@prisma-next/core-control-plane/types";
+import { notOk as notOk4, ok as ok4 } 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";
+  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") {
+        return notOk4(
+          errorUnexpected2(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?.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 notOk4(
+      errorDatabaseConnectionRequired({
+        why: `Database connection is required for db introspect (set db.connection in ${configPath}, or pass --db <url>)`
+      })
+    );
+  }
+  if (!config.driver) {
+    return notOk4(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("");
+    }
+    client.init();
+    let schemaView;
+    void contractIR;
+    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,
+      ...configPath || connectionForMeta ? {
+        meta: {
+          ...configPath ? { configPath } : {},
+          ...connectionForMeta ? { dbUrl: connectionForMeta } : {}
+        }
+      } : {},
+      timings: {
+        total: totalTime
+      }
+    };
+    return ok4({ introspectResult, schemaView });
+  } catch (error) {
+    if (error instanceof CliStructuredError) {
+      return notOk4(error);
+    }
+    return notOk4(
+      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(
@@ -1925,128 +2187,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?.connection && typeof config.db.connection === "string") {
-          const maskedUrl = config.db.connection.replace(/:([^:@]+)@/, ":****@");
-          details.push({ label: "database", value: maskedUrl });
-        }
-        const header = formatStyledHeader({
+    const startTime = Date.now();
+    if (flags.json === "ndjson") {
+      const result2 = notOk4(
+        errorJsonFormatNotSupported({
           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) {
-        throw errorDatabaseConnectionRequired2();
-      }
-      if (!config.driver) {
-        throw errorDriverRequired2();
-      }
-      const driverDescriptor = config.driver;
-      const driver = await withSpinner(() => driverDescriptor.create(dbConnection), {
-        message: "Connecting to database...",
-        flags
-      });
-      try {
-        const stack = createControlPlaneStack3({
-          target: config.target,
-          adapter: config.adapter,
-          driver: driverDescriptor,
-          extensionPacks: config.extensionPacks
-        });
-        const familyInstance = config.family.create(stack);
-        if (contractIR) {
-          const validatedContract = familyInstance.validateContractIR(contractIR);
-          assertContractRequirementsSatisfied({ contract: validatedContract, stack });
-          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 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,
-          ...configPath || connectionForMeta ? {
-            meta: {
-              ...configPath ? { configPath } : {},
-              ...connectionForMeta ? { dbUrl: connectionForMeta } : {}
-            }
-          } : {},
-          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") {
@@ -2066,122 +2221,128 @@ function createDbIntrospectCommand() {
 // src/commands/db-schema-verify.ts
 import { readFile as readFile3 } from "fs/promises";
 import { relative as relative5, resolve as resolve5 } from "path";
-import {
-  errorDatabaseConnectionRequired as errorDatabaseConnectionRequired3,
-  errorDriverRequired as errorDriverRequired3,
-  errorFileNotFound as errorFileNotFound2,
-  errorRuntime as errorRuntime3,
-  errorUnexpected as errorUnexpected4
-} from "@prisma-next/core-control-plane/errors";
-import { createControlPlaneStack as createControlPlaneStack4 } from "@prisma-next/core-control-plane/types";
+import { notOk as notOk5, ok as ok5 } from "@prisma-next/utils/result";
 import { Command as Command4 } from "commander";
-function createDbSchemaVerifyCommand() {
-  const command = new Command4("schema-verify");
-  setCommandDescriptions(
-    command,
-    "Check whether the database schema satisfies your contract",
-    "Verifies that your database schema satisfies the emitted contract. Compares table structures,\ncolumn types, constraints, and extensions. Reports any mismatches via a contract-shaped\nverification tree. This is a read-only operation that does not modify the database."
-  );
-  command.configureHelp({
-    formatHelp: (cmd) => {
-      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) => {
-    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({
-          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 stack = createControlPlaneStack4({
-        target: config.target,
-        adapter: config.adapter,
-        driver: driverDescriptor,
-        extensionPacks: config.extensionPacks
-      });
-      const familyInstance = config.family.create(stack);
-      const contractIR = familyInstance.validateContractIR(contractJson);
-      assertContractRequirementsSatisfied({ contract: contractIR, stack });
-      const dbConnection = options.db ?? config.db?.connection;
-      if (!dbConnection) {
-        throw errorDatabaseConnectionRequired3();
-      }
-      const driver = await withSpinner(() => driverDescriptor.create(dbConnection), {
-        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();
-      }
+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 readFile3(contractPathAbsolute, "utf-8");
+  } catch (error) {
+    if (error instanceof Error && error.code === "ENOENT") {
+      return notOk5(
+        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 notOk5(
+      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 notOk5(
+      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 notOk5(
+      errorDatabaseConnectionRequired({
+        why: `Database connection is required for db schema-verify (set db.connection in ${configPath}, or pass --db <url>)`
+      })
+    );
+  }
+  if (!config.driver) {
+    return notOk5(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 ok5(schemaVerifyResult);
+  } catch (error) {
+    if (error instanceof CliStructuredError) {
+      return notOk5(error);
+    }
+    return notOk5(
+      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(
+    command,
+    "Check whether the database schema satisfies your contract",
+    "Verifies that your database schema satisfies the emitted contract. Compares table structures,\ncolumn types, constraints, and extensions. Reports any mismatches via a contract-shaped\nverification tree. This is a read-only operation that does not modify the database."
+  );
+  command.configureHelp({
+    formatHelp: (cmd) => {
+      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)", 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);
+    if (flags.json === "ndjson") {
+      const result2 = notOk5(
+        errorJsonFormatNotSupported({
+          command: "db schema-verify",
+          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));
@@ -2204,15 +2365,112 @@ function createDbSchemaVerifyCommand() {
 // src/commands/db-sign.ts
 import { readFile as readFile4 } from "fs/promises";
 import { relative as relative6, resolve as resolve6 } from "path";
-import {
-  errorDatabaseConnectionRequired as errorDatabaseConnectionRequired4,
-  errorDriverRequired as errorDriverRequired4,
-  errorFileNotFound as errorFileNotFound3,
-  errorRuntime as errorRuntime4,
-  errorUnexpected as errorUnexpected5
-} from "@prisma-next/core-control-plane/errors";
-import { createControlPlaneStack as createControlPlaneStack5 } from "@prisma-next/core-control-plane/types";
+import { notOk as notOk6, ok as ok6 } 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 readFile4(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 sign (set db.connection in ${configPath}, or pass --db <url>)`
+      })
+    );
+  }
+  if (!config.driver) {
+    return notOk6(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 ok6({ schemaVerifyResult, signResult: void 0 });
+    }
+    const signResult = await client.sign({
+      contractIR: contractJson,
+      onProgress
+    });
+    if (!flags.quiet && flags.json !== "object" && process.stdout.isTTY) {
+      console.log("");
+    }
+    return ok6({ schemaVerifyResult: void 0, signResult });
+  } catch (error) {
+    if (error instanceof CliStructuredError) {
+      return notOk6(error);
+    }
+    return notOk6(
+      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(
@@ -2225,120 +2483,20 @@ 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 = notOk6(
+        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 dbConnection = options.db ?? config.db?.connection;
-      if (!dbConnection) {
-        throw errorDatabaseConnectionRequired4();
-      }
-      if (!config.driver) {
-        throw errorDriverRequired4();
-      }
-      const driverDescriptor = config.driver;
-      const stack = createControlPlaneStack5({
-        target: config.target,
-        adapter: config.adapter,
-        driver: driverDescriptor,
-        extensionPacks: config.extensionPacks
-      });
-      const familyInstance = config.family.create(stack);
-      const contractIR = familyInstance.validateContractIR(contractJson);
-      assertContractRequirementsSatisfied({ contract: contractIR, stack });
-      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(dbConnection);
-      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 exitCode2 = handleResult(result2, flags);
+      process.exit(exitCode2);
+    }
+    const result = await executeDbSignCommand(options, flags);
     const exitCode = handleResult(result, flags, (value) => {
       const { schemaVerifyResult, signResult } = value;
       if (schemaVerifyResult && !schemaVerifyResult.ok) {
@@ -2375,18 +2533,124 @@ function createDbSignCommand() {
 // src/commands/db-verify.ts
 import { readFile as readFile5 } from "fs/promises";
 import { relative as relative7, resolve as resolve7 } from "path";
-import {
-  errorDatabaseConnectionRequired as errorDatabaseConnectionRequired5,
-  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 { createControlPlaneStack as createControlPlaneStack6 } from "@prisma-next/core-control-plane/types";
+import { notOk as notOk7, ok as ok7 } 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 readFile5(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 verify (set db.connection in ${configPath}, or pass --db <url>)`
+      })
+    );
+  }
+  if (!config.driver) {
+    return notOk7(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 notOk7(mapVerifyFailure(verifyResult));
+    }
+    return ok7(verifyResult);
+  } catch (error) {
+    if (error instanceof CliStructuredError) {
+      return notOk7(error);
+    }
+    return notOk7(
+      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(
@@ -2399,112 +2663,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 = notOk7(
+        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 dbConnection = options.db ?? config.db?.connection;
-      if (!dbConnection) {
-        throw errorDatabaseConnectionRequired5();
-      }
-      if (!config.driver) {
-        throw errorDriverRequired5();
-      }
-      const driverDescriptor = config.driver;
-      const driver = await withSpinner(() => driverDescriptor.create(dbConnection), {
-        message: "Connecting to database...",
-        flags
-      });
-      try {
-        const stack = createControlPlaneStack6({
-          target: config.target,
-          adapter: config.adapter,
-          driver: driverDescriptor,
-          extensionPacks: config.extensionPacks
-        });
-        const familyInstance = config.family.create(stack);
-        const contractIR = familyInstance.validateContractIR(contractJson);
-        assertContractRequirementsSatisfied({ contract: contractIR, stack });
-        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));