@actuate-media/cli 0.12.0 → 0.12.1

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> @actuate-media/cli@0.12.0 build /home/runner/work/actuatecms/actuatecms/packages/cli
+> @actuate-media/cli@0.12.1 build /home/runner/work/actuatecms/actuatecms/packages/cli
 > tsc
 

package/.turbo/turbo-test.log

@@ -1,60 +1,60 @@
 
-> @actuate-media/cli@0.12.0 test /home/runner/work/actuatecms/actuatecms/packages/cli
+> @actuate-media/cli@0.12.1 test /home/runner/work/actuatecms/actuatecms/packages/cli
 > vitest run
 
 
  RUN  v4.1.8 /home/runner/work/actuatecms/actuatecms/packages/cli
 
- ✓ dist/__tests__/db-sync.test.js (10 tests) 233ms
- ✓ dist/__tests__/seed.test.js (10 tests) 128ms
- ✓ src/__tests__/db-sync.test.ts (10 tests) 219ms
- ✓ dist/__tests__/deployment-diagnostics.test.js (9 tests) 35ms
- ✓ src/__tests__/seed.test.ts (10 tests) 164ms
+ ✓ dist/__tests__/db-sync.test.js (10 tests) 460ms
+ ✓ dist/__tests__/seed.test.js (10 tests) 199ms
+ ✓ src/__tests__/db-sync.test.ts (10 tests) 394ms
+ ✓ dist/__tests__/deployment-diagnostics.test.js (9 tests) 62ms
+ ✓ src/__tests__/seed.test.ts (10 tests) 166ms
  ✓ src/__tests__/deployment-diagnostics.test.ts (9 tests) 49ms
 - Reading canonical Actuate schema...
-✔ Actuate CMS models added to schema.
-- Running prisma generate...
 stdout | dist/__tests__/db-init.test.js > db:init (WS-D D5 — canonical schema, no stale fragment) > command > injects canonical models with @@map and no duplicate datasource/generator
+✔ Actuate CMS models added to schema.
 ✔ Prisma client generated.
+- Running prisma generate...
 ℹ Run `npx prisma migrate dev --name actuate-cms` to create the migration.
 
 stdout | dist/__tests__/db-init.test.js > db:init (WS-D D5 — canonical schema, no stale fragment) > command > fails clearly when cms-core cannot be located
+ℹ Install it first: `npm install @actuate-media/cms-core`.
 - Reading canonical Actuate schema...
 ✖ Could not locate @actuate-media/cms-core.
-ℹ Install it first: `npm install @actuate-media/cms-core`.
 
 - Reading canonical Actuate schema...
-✔ Actuate CMS models added to schema.
 stdout | dist/__tests__/db-init.test.js > db:init (WS-D D5 — canonical schema, no stale fragment) > command > is idempotent without --force
 ✔ Prisma client generated.
-- Running prisma generate...
 ℹ Run `npx prisma migrate dev --name actuate-cms` to create the migration.
 
+✔ Actuate CMS models added to schema.
+- Running prisma generate...
 - Reading canonical Actuate schema...
 ℹ Actuate CMS models already present in schema. Use --force to overwrite.
- ✓ dist/__tests__/db-init.test.js (4 tests) 228ms
+ ✓ dist/__tests__/db-init.test.js (4 tests) 340ms
 - Reading canonical Actuate schema...
+✔ Actuate CMS models added to schema.
+- Running prisma generate...
 stdout | src/__tests__/db-init.test.ts > db:init (WS-D D5 — canonical schema, no stale fragment) > command > injects canonical models with @@map and no duplicate datasource/generator
 ✔ Prisma client generated.
 ℹ Run `npx prisma migrate dev --name actuate-cms` to create the migration.
 
-✔ Actuate CMS models added to schema.
-- Running prisma generate...
 - Reading canonical Actuate schema...
-stdout | src/__tests__/db-init.test.ts > db:init (WS-D D5 — canonical schema, no stale fragment) > command > fails clearly when cms-core cannot be located
 ✖ Could not locate @actuate-media/cms-core.
+stdout | src/__tests__/db-init.test.ts > db:init (WS-D D5 — canonical schema, no stale fragment) > command > fails clearly when cms-core cannot be located
 ℹ Install it first: `npm install @actuate-media/cms-core`.
 
 - Reading canonical Actuate schema...
 stdout | src/__tests__/db-init.test.ts > db:init (WS-D D5 — canonical schema, no stale fragment) > command > is idempotent without --force
 ✔ Prisma client generated.
-✔ Actuate CMS models added to schema.
 ℹ Run `npx prisma migrate dev --name actuate-cms` to create the migration.
-- Running prisma generate...
+✔ Actuate CMS models added to schema.
 
+- Running prisma generate...
 - Reading canonical Actuate schema...
 ℹ Actuate CMS models already present in schema. Use --force to overwrite.
- ✓ src/__tests__/db-init.test.ts (4 tests) 246ms
+ ✓ src/__tests__/db-init.test.ts (4 tests) 127ms
 stdout | dist/__tests__/mcp-init.test.js > mcp:init > creates both editor configs with placeholder key and git-ignores them
 ✔ Created .cursor/mcp.json
 
@@ -183,7 +183,7 @@ Next steps
   3. Restart Cursor / VS Code so the MCP server is picked up
   Tip: pass --url https://your-site.com to target a deployed CMS instead.
 
- ✓ dist/__tests__/mcp-init.test.js (6 tests) 249ms
+ ✓ dist/__tests__/mcp-init.test.js (6 tests) 484ms
 stdout | src/__tests__/mcp-init.test.ts > mcp:init > creates both editor configs with placeholder key and git-ignores them
 ✔ Created .cursor/mcp.json
 
@@ -312,34 +312,36 @@ Next steps
   3. Restart Cursor / VS Code so the MCP server is picked up
   Tip: pass --url https://your-site.com to target a deployed CMS instead.
 
- ✓ src/__tests__/mcp-init.test.ts (6 tests) 134ms
- ✓ dist/__tests__/form-seed.test.js (10 tests) 31ms
- ✓ src/__tests__/form-seed.test.ts (10 tests) 34ms
- ✓ dist/__tests__/vercel-env-matrix.test.js (6 tests) 28ms
- ✓ src/__tests__/vercel-env-matrix.test.ts (6 tests) 30ms
- ✓ dist/__tests__/load-dotenv.test.js (3 tests) 37ms
- ✓ src/__tests__/load-dotenv.test.ts (3 tests) 44ms
+ ✓ src/__tests__/mcp-init.test.ts (6 tests) 429ms
+ ✓ dist/__tests__/form-seed.test.js (10 tests) 60ms
+ ✓ src/__tests__/form-seed.test.ts (10 tests) 70ms
+ ✓ dist/__tests__/prisma-client-path.test.js (6 tests) 68ms
+ ✓ src/__tests__/prisma-client-path.test.ts (6 tests) 81ms
+ ✓ dist/__tests__/vercel-env-matrix.test.js (6 tests) 95ms
+ ✓ src/__tests__/vercel-env-matrix.test.ts (6 tests) 58ms
+ ✓ dist/__tests__/load-dotenv.test.js (3 tests) 105ms
+ ✓ src/__tests__/load-dotenv.test.ts (3 tests) 116ms
 - Reading canonical Actuate schema...
 ✔ Actuate CMS models added to schema.
-- Running prisma generate...
 stdout | dist/__tests__/schema-fragment.test.js > db:init schema fragment > injects all deploy-critical Actuate models
 ✔ Prisma client generated.
 ℹ Run `npx prisma migrate dev --name actuate-cms` to create the migration.
 
- ✓ dist/__tests__/schema-fragment.test.js (1 test) 80ms
+- Running prisma generate...
+ ✓ dist/__tests__/schema-fragment.test.js (1 test) 132ms
 - Reading canonical Actuate schema...
 ✔ Actuate CMS models added to schema.
+- Running prisma generate...
 stdout | src/__tests__/schema-fragment.test.ts > db:init schema fragment > injects all deploy-critical Actuate models
 ✔ Prisma client generated.
-- Running prisma generate...
 ℹ Run `npx prisma migrate dev --name actuate-cms` to create the migration.
 
- ✓ src/__tests__/schema-fragment.test.ts (1 test) 66ms
- ✓ dist/__tests__/init.test.js (2 tests) 16ms
- ✓ src/__tests__/init.test.ts (2 tests) 15ms
+ ✓ src/__tests__/schema-fragment.test.ts (1 test) 123ms
+ ✓ dist/__tests__/init.test.js (2 tests) 36ms
+ ✓ src/__tests__/init.test.ts (2 tests) 48ms
 
- Test Files  20 passed (20)
-      Tests  122 passed (122)
-   Start at  05:27:27
-   Duration  21.87s (transform 2.20s, setup 0ms, import 5.83s, tests 2.07s, environment 21ms)
+ Test Files  22 passed (22)
+      Tests  134 passed (134)
+   Start at  17:49:50
+   Duration  37.73s (transform 3.12s, setup 0ms, import 8.53s, tests 3.70s, environment 22ms)
 

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @actuate-media/cli
 
+## 0.12.1
+
+### Patch Changes
+
+- 13aae89: Fix CLI database connection for Prisma 7 projects: resolve custom generator output paths from schema.prisma, prefer lib/prisma.ts getPrisma(), and handle Windows paths for migrate:meta and migrate:schema.
+
 ## 0.12.0
 
 ### Minor Changes

package/dist/__tests__/prisma-client-path.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=prisma-client-path.test.d.ts.map

package/dist/__tests__/prisma-client-path.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prisma-client-path.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/prisma-client-path.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/prisma-client-path.test.js

@@ -0,0 +1,66 @@
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import { afterEach, describe, expect, it } from 'vitest';
+import { findPrismaSchemaFile, parsePrismaGeneratorOutputDir, resolveClientEntryInDir, resolveProjectPrismaClientModule, } from '../utils/prisma-client-path.js';
+describe('prisma-client-path', () => {
+    let tempDir = null;
+    afterEach(() => {
+        if (tempDir)
+            rmSync(tempDir, { recursive: true, force: true });
+        tempDir = null;
+    });
+    function writeSchema(root, output) {
+        mkdirSync(path.join(root, 'prisma'), { recursive: true });
+        writeFileSync(path.join(root, 'prisma', 'schema.prisma'), `generator client {
+  provider = "prisma-client"
+  output   = "${output}"
+}
+
+datasource db {
+  provider = "postgresql"
+}
+`);
+    }
+    function writeClient(clientPath) {
+        mkdirSync(path.dirname(clientPath), { recursive: true });
+        writeFileSync(clientPath, 'export class PrismaClient {}');
+    }
+    it('finds prisma/schema.prisma in the project root', () => {
+        tempDir = mkdtempSync(path.join(tmpdir(), 'actuate-cli-prisma-'));
+        writeSchema(tempDir, '../generated/prisma');
+        expect(findPrismaSchemaFile(tempDir)).toBe(path.join(tempDir, 'prisma', 'schema.prisma'));
+    });
+    it('resolves relative generator output from the schema directory', () => {
+        tempDir = mkdtempSync(path.join(tmpdir(), 'actuate-cli-prisma-'));
+        writeSchema(tempDir, '../generated/prisma');
+        const schemaPath = path.join(tempDir, 'prisma', 'schema.prisma');
+        expect(parsePrismaGeneratorOutputDir(schemaPath)).toBe(path.join(tempDir, 'generated', 'prisma'));
+    });
+    it('resolves custom output paths used by Prisma 7 scaffolds', () => {
+        tempDir = mkdtempSync(path.join(tmpdir(), 'actuate-cli-prisma-'));
+        writeSchema(tempDir, '../src/generated/prisma');
+        const schemaPath = path.join(tempDir, 'prisma', 'schema.prisma');
+        expect(parsePrismaGeneratorOutputDir(schemaPath)).toBe(path.join(tempDir, 'src', 'generated', 'prisma'));
+    });
+    it('locates client.ts via schema output before default fallbacks', () => {
+        tempDir = mkdtempSync(path.join(tmpdir(), 'actuate-cli-prisma-'));
+        writeSchema(tempDir, '../src/generated/prisma');
+        const clientPath = path.join(tempDir, 'src', 'generated', 'prisma', 'client.ts');
+        writeClient(clientPath);
+        expect(resolveProjectPrismaClientModule(tempDir)).toBe(clientPath);
+    });
+    it('falls back to generated/prisma/client.ts when schema output is missing', () => {
+        tempDir = mkdtempSync(path.join(tmpdir(), 'actuate-cli-prisma-'));
+        const clientPath = path.join(tempDir, 'generated', 'prisma', 'client.ts');
+        writeClient(clientPath);
+        expect(resolveProjectPrismaClientModule(tempDir)).toBe(clientPath);
+    });
+    it('resolveClientEntryInDir prefers client.ts over index.ts', () => {
+        tempDir = mkdtempSync(path.join(tmpdir(), 'actuate-cli-prisma-entry-'));
+        writeFileSync(path.join(tempDir, 'index.ts'), 'export {}');
+        writeFileSync(path.join(tempDir, 'client.ts'), 'export class PrismaClient {}');
+        expect(resolveClientEntryInDir(tempDir)).toBe(path.join(tempDir, 'client.ts'));
+    });
+});
+//# sourceMappingURL=prisma-client-path.test.js.map

package/dist/__tests__/prisma-client-path.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prisma-client-path.test.js","sourceRoot":"","sources":["../../src/__tests__/prisma-client-path.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAExD,OAAO,EACL,oBAAoB,EACpB,6BAA6B,EAC7B,uBAAuB,EACvB,gCAAgC,GACjC,MAAM,gCAAgC,CAAA;AAEvC,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,OAAO,GAAkB,IAAI,CAAA;IAEjC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO;YAAE,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QAC9D,OAAO,GAAG,IAAI,CAAA;IAChB,CAAC,CAAC,CAAA;IAEF,SAAS,WAAW,CAAC,IAAY,EAAE,MAAc;QAC/C,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACzD,aAAa,CACX,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,eAAe,CAAC,EAC1C;;gBAEU,MAAM;;;;;;CAMrB,CACI,CAAA;IACH,CAAC;IAED,SAAS,WAAW,CAAC,UAAkB;QACrC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACxD,aAAa,CAAC,UAAU,EAAE,8BAA8B,CAAC,CAAA;IAC3D,CAAC;IAED,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAA;QACjE,WAAW,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAA;QAC3C,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAA;IAC3F,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAA;QACjE,WAAW,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAA;QAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAA;QAChE,MAAM,CAAC,6BAA6B,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CACpD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,QAAQ,CAAC,CAC1C,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAA;QACjE,WAAW,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAA;QAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAA;QAChE,MAAM,CAAC,6BAA6B,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CACpD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,CAAC,CACjD,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAA;QACjE,WAAW,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAA;QAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;QAChF,WAAW,CAAC,UAAU,CAAC,CAAA;QACvB,MAAM,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACpE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;QAChF,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAA;QACjE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;QACzE,WAAW,CAAC,UAAU,CAAC,CAAA;QACvB,MAAM,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACpE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,2BAA2B,CAAC,CAAC,CAAA;QACvE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,WAAW,CAAC,CAAA;QAC1D,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,8BAA8B,CAAC,CAAA;QAC9E,MAAM,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAA;IAChF,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/utils/database.d.ts

@@ -5,9 +5,11 @@
  * Resolution order mirrors how a scaffolded Actuate project exposes Prisma:
  *   1. If `cms-core` already has an initialized client (e.g. set up by the host
  *      app in-process), reuse it.
- *   2. Otherwise build a client from the project's generated Prisma client
- *      (`generated/prisma/client.ts`, Prisma 7 + pg driver adapter).
- *   3. Fall back to a plain `@prisma/client` resolved from the project.
+ *   2. Otherwise call `getPrisma()` from `lib/prisma.ts` when the project ships
+ *      one (Prisma 7 + pg adapter / Accelerate — same path Next.js uses).
+ *   3. Otherwise build a client from the schema's `output` path (custom or
+ *      default `generated/prisma/client.ts`) via tsx + pg driver adapter.
+ *   4. Fall back to a plain `@prisma/client` resolved from the project.
  *
  * The returned `disconnect()` only tears down clients this helper created — a
  * pre-initialized in-process client is left untouched.

package/dist/utils/database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;GAaG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC;IAEtD,EAAE,EAAE,GAAG,CAAA;IACP,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAChC,CAAC,CAiBD"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC;IAEtD,EAAE,EAAE,GAAG,CAAA;IACP,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAChC,CAAC,CAiBD"}

package/dist/utils/database.js

@@ -1,7 +1,7 @@
-import { existsSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import path from 'node:path';
 import { pathToFileURL } from 'node:url';
+import { findLibPrismaHelper, resolveProjectPrismaClientModule } from './prisma-client-path.js';
 /**
  * Shared helper for CLI commands that need a live connection to the consumer
  * project's database (seed, populate, data migrations…).
@@ -9,9 +9,11 @@ import { pathToFileURL } from 'node:url';
  * Resolution order mirrors how a scaffolded Actuate project exposes Prisma:
  *   1. If `cms-core` already has an initialized client (e.g. set up by the host
  *      app in-process), reuse it.
- *   2. Otherwise build a client from the project's generated Prisma client
- *      (`generated/prisma/client.ts`, Prisma 7 + pg driver adapter).
- *   3. Fall back to a plain `@prisma/client` resolved from the project.
+ *   2. Otherwise call `getPrisma()` from `lib/prisma.ts` when the project ships
+ *      one (Prisma 7 + pg adapter / Accelerate — same path Next.js uses).
+ *   3. Otherwise build a client from the schema's `output` path (custom or
+ *      default `generated/prisma/client.ts`) via tsx + pg driver adapter.
+ *   4. Fall back to a plain `@prisma/client` resolved from the project.
  *
  * The returned `disconnect()` only tears down clients this helper created — a
  * pre-initialized in-process client is left untouched.
@@ -32,27 +34,65 @@ export async function connectProjectDatabase() {
         },
     };
 }
+const ACCELERATED_DB_URL_PREFIXES = ['prisma://', 'prisma+postgres://'];
+function isAcceleratedDbUrl(url) {
+    const trimmed = url?.trim();
+    if (!trimmed)
+        return false;
+    return ACCELERATED_DB_URL_PREFIXES.some((prefix) => trimmed.startsWith(prefix));
+}
+async function importModule(specifier, requireFromProject) {
+    const href = pathToFileURL(requireFromProject.resolve(specifier)).href;
+    return import(href);
+}
+async function tryLibPrismaClient() {
+    const helperPath = findLibPrismaHelper();
+    if (!helperPath)
+        return null;
+    const { tsImport } = await import('tsx/esm/api');
+    const mod = (await tsImport(pathToFileURL(helperPath).href, import.meta.url));
+    const getPrisma = mod.getPrisma ?? mod.default?.getPrisma;
+    if (typeof getPrisma !== 'function')
+        return null;
+    return getPrisma();
+}
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- see above.
 async function createProjectPrismaClient() {
     if (!process.env.DATABASE_URL) {
         throw new Error('DATABASE_URL is required to connect to the project database.');
     }
+    const fromLib = await tryLibPrismaClient();
+    if (fromLib)
+        return fromLib;
     const requireFromProject = createRequire(path.join(process.cwd(), 'package.json'));
-    const generatedClient = path.resolve('generated', 'prisma', 'client.ts');
-    if (existsSync(generatedClient)) {
+    const generatedClient = resolveProjectPrismaClientModule();
+    if (generatedClient) {
+        const url = process.env.DATABASE_URL;
         const [{ tsImport }, adapterModule, pgModule] = await Promise.all([
             import('tsx/esm/api'),
-            import(pathToFileURL(requireFromProject.resolve('@prisma/adapter-pg')).href),
-            import(pathToFileURL(requireFromProject.resolve('pg')).href),
+            importModule('@prisma/adapter-pg', requireFromProject),
+            importModule('pg', requireFromProject),
         ]);
         const { PrismaClient } = (await tsImport(pathToFileURL(generatedClient).href, import.meta.url));
+        if (isAcceleratedDbUrl(url)) {
+            let withAccelerate;
+            try {
+                const ext = (await importModule('@prisma/extension-accelerate', requireFromProject));
+                withAccelerate = ext.withAccelerate;
+            }
+            catch {
+                throw new Error('DATABASE_URL uses Prisma Accelerate but @prisma/extension-accelerate is not installed. Run `lib/prisma.ts` via adding it, or install the extension.');
+            }
+            const client = new PrismaClient({ accelerateUrl: url }).$extends(withAccelerate());
+            return client;
+        }
         const { PrismaPg } = adapterModule;
         const pg = pgModule.default ?? pgModule;
-        const pool = new pg.Pool({ connectionString: process.env.DATABASE_URL });
+        const pool = new pg.Pool({ connectionString: url });
         const adapter = new PrismaPg(pool);
         return new PrismaClient({ adapter });
     }
-    const clientModule = (await import(pathToFileURL(requireFromProject.resolve('@prisma/client')).href));
+    const clientModule = (await importModule('@prisma/client', requireFromProject));
     return new clientModule.PrismaClient();
 }
 //# sourceMappingURL=database.js.map

package/dist/utils/database.js.map

@@ -1 +1 @@
-{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB;IAK1C,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAA;IAElF,IAAI,eAAe,EAAE,EAAE,CAAC;QACtB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAO,EAAE,UAAU,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC,EAAE,CAAA;IACzD,CAAC;IAED,MAAM,EAAE,GAAG,MAAM,yBAAyB,EAAE,CAAA;IAC5C,MAAM,CAAC,EAAE,CAAC,CAAA;IACV,OAAO;QACL,EAAE;QACF,UAAU,EAAE,KAAK,IAAI,EAAE;YACrB,IAAI,OAAO,EAAE,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;gBACzC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAA;YACxB,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAED,4EAA4E;AAC5E,KAAK,UAAU,yBAAyB;IACtC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAA;IACjF,CAAC;IAED,MAAM,kBAAkB,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAC,CAAA;IAClF,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;IAExE,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAChC,MAAM,CAAC,EAAE,QAAQ,EAAE,EAAE,aAAa,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAChE,MAAM,CAAC,aAAa,CAAC;YACrB,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5E,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;SAC7D,CAAC,CAAA;QACF,MAAM,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,QAAQ,CACtC,aAAa,CAAC,eAAe,CAAC,CAAC,IAAI,EACnC,MAAM,CAAC,IAAI,CAAC,GAAG,CAChB,CAEA,CAAA;QACD,MAAM,EAAE,QAAQ,EAAE,GAAG,aAA6D,CAAA;QAClF,MAAM,EAAE,GAAI,QAA0C,CAAC,OAAO,IAAI,QAAQ,CAAA;QAC1E,MAAM,IAAI,GAAG,IAAK,EAAU,CAAC,IAAI,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAA;QACjF,MAAM,OAAO,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAA;QAClC,OAAO,IAAI,YAAY,CAAC,EAAE,OAAO,EAAS,CAAC,CAAA;IAC7C,CAAC;IAED,MAAM,YAAY,GAAG,CAAC,MAAM,MAAM,CAChC,aAAa,CAAC,kBAAkB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CACjE,CAEA,CAAA;IACD,OAAO,IAAI,YAAY,CAAC,YAAY,EAAE,CAAA;AACxC,CAAC"}
+{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"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"}

package/dist/utils/prisma-client-path.d.ts

@@ -0,0 +1,20 @@
+/** Locate the consumer project's Prisma schema file. */
+export declare function findPrismaSchemaFile(cwd?: string): string | null;
+/**
+ * Parse `generator client { output = "..." }` and return the absolute output
+ * directory. Relative paths resolve from the schema file's directory (Prisma
+ * convention), including `../generated/prisma` layouts.
+ */
+export declare function parsePrismaGeneratorOutputDir(schemaPath: string): string | null;
+/** First existing Prisma client entry file inside `dir`. */
+export declare function resolveClientEntryInDir(dir: string): string | null;
+/**
+ * Resolve the generated Prisma client module path for CLI database commands.
+ * Reads the schema's custom `output` path before falling back to common
+ * scaffold locations (`generated/prisma`, `src/generated`, …).
+ */
+export declare function resolveProjectPrismaClientModule(cwd?: string): string | null;
+/** Project helpers that wrap Prisma 7 + driver adapters (preferred when present). */
+export declare const LIB_PRISMA_HELPERS: readonly ["lib/prisma.ts", "lib/prisma.js", "lib/prisma.mjs"];
+export declare function findLibPrismaHelper(cwd?: string): string | null;
+//# sourceMappingURL=prisma-client-path.d.ts.map

package/dist/utils/prisma-client-path.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prisma-client-path.d.ts","sourceRoot":"","sources":["../../src/utils/prisma-client-path.ts"],"names":[],"mappings":"AASA,wDAAwD;AACxD,wBAAgB,oBAAoB,CAAC,GAAG,SAAgB,GAAG,MAAM,GAAG,IAAI,CAMvE;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAc/E;AAED,4DAA4D;AAC5D,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMlE;AAED;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,GAAG,SAAgB,GAAG,MAAM,GAAG,IAAI,CAgBnF;AAED,qFAAqF;AACrF,eAAO,MAAM,kBAAkB,+DAAgE,CAAA;AAE/F,wBAAgB,mBAAmB,CAAC,GAAG,SAAgB,GAAG,MAAM,GAAG,IAAI,CAMtE"}

package/dist/utils/prisma-client-path.js

@@ -0,0 +1,77 @@
+import { existsSync, readFileSync } from 'node:fs';
+import path from 'node:path';
+const SCHEMA_CANDIDATES = ['prisma/schema.prisma', 'schema.prisma'];
+const CLIENT_ENTRY_NAMES = ['client.ts', 'client.js', 'client.mjs', 'index.ts', 'index.js'];
+const OUTPUT_DIR_FALLBACKS = [['generated', 'prisma'], ['src', 'generated'], ['generated']];
+/** Locate the consumer project's Prisma schema file. */
+export function findPrismaSchemaFile(cwd = process.cwd()) {
+    for (const rel of SCHEMA_CANDIDATES) {
+        const candidate = path.join(cwd, rel);
+        if (existsSync(candidate))
+            return candidate;
+    }
+    return null;
+}
+/**
+ * Parse `generator client { output = "..." }` and return the absolute output
+ * directory. Relative paths resolve from the schema file's directory (Prisma
+ * convention), including `../generated/prisma` layouts.
+ */
+export function parsePrismaGeneratorOutputDir(schemaPath) {
+    let content;
+    try {
+        content = readFileSync(schemaPath, 'utf8');
+    }
+    catch {
+        return null;
+    }
+    const match = content.match(/output\s*=\s*"([^"]+)"/);
+    if (!match?.[1])
+        return null;
+    const raw = match[1].replace(/\//g, path.sep);
+    if (path.isAbsolute(raw))
+        return raw;
+    return path.resolve(path.dirname(schemaPath), raw);
+}
+/** First existing Prisma client entry file inside `dir`. */
+export function resolveClientEntryInDir(dir) {
+    for (const name of CLIENT_ENTRY_NAMES) {
+        const candidate = path.join(dir, name);
+        if (existsSync(candidate))
+            return candidate;
+    }
+    return null;
+}
+/**
+ * Resolve the generated Prisma client module path for CLI database commands.
+ * Reads the schema's custom `output` path before falling back to common
+ * scaffold locations (`generated/prisma`, `src/generated`, …).
+ */
+export function resolveProjectPrismaClientModule(cwd = process.cwd()) {
+    const schemaPath = findPrismaSchemaFile(cwd);
+    if (schemaPath) {
+        const outputDir = parsePrismaGeneratorOutputDir(schemaPath);
+        if (outputDir) {
+            const entry = resolveClientEntryInDir(outputDir);
+            if (entry)
+                return entry;
+        }
+    }
+    for (const parts of OUTPUT_DIR_FALLBACKS) {
+        const entry = resolveClientEntryInDir(path.resolve(cwd, ...parts));
+        if (entry)
+            return entry;
+    }
+    return null;
+}
+/** Project helpers that wrap Prisma 7 + driver adapters (preferred when present). */
+export const LIB_PRISMA_HELPERS = ['lib/prisma.ts', 'lib/prisma.js', 'lib/prisma.mjs'];
+export function findLibPrismaHelper(cwd = process.cwd()) {
+    for (const rel of LIB_PRISMA_HELPERS) {
+        const candidate = path.join(cwd, rel);
+        if (existsSync(candidate))
+            return candidate;
+    }
+    return null;
+}
+//# sourceMappingURL=prisma-client-path.js.map

package/dist/utils/prisma-client-path.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prisma-client-path.js","sourceRoot":"","sources":["../../src/utils/prisma-client-path.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actuate-media/cli",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "CLI for Actuate CMS — migrations, codegen, imports, exports, and upgrades",
   "repository": {
     "type": "git",

package/src/__tests__/prisma-client-path.test.ts

@@ -0,0 +1,87 @@
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import path from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+
+import {
+  findPrismaSchemaFile,
+  parsePrismaGeneratorOutputDir,
+  resolveClientEntryInDir,
+  resolveProjectPrismaClientModule,
+} from '../utils/prisma-client-path.js'
+
+describe('prisma-client-path', () => {
+  let tempDir: string | null = null
+
+  afterEach(() => {
+    if (tempDir) rmSync(tempDir, { recursive: true, force: true })
+    tempDir = null
+  })
+
+  function writeSchema(root: string, output: string) {
+    mkdirSync(path.join(root, 'prisma'), { recursive: true })
+    writeFileSync(
+      path.join(root, 'prisma', 'schema.prisma'),
+      `generator client {
+  provider = "prisma-client"
+  output   = "${output}"
+}
+
+datasource db {
+  provider = "postgresql"
+}
+`,
+    )
+  }
+
+  function writeClient(clientPath: string) {
+    mkdirSync(path.dirname(clientPath), { recursive: true })
+    writeFileSync(clientPath, 'export class PrismaClient {}')
+  }
+
+  it('finds prisma/schema.prisma in the project root', () => {
+    tempDir = mkdtempSync(path.join(tmpdir(), 'actuate-cli-prisma-'))
+    writeSchema(tempDir, '../generated/prisma')
+    expect(findPrismaSchemaFile(tempDir)).toBe(path.join(tempDir, 'prisma', 'schema.prisma'))
+  })
+
+  it('resolves relative generator output from the schema directory', () => {
+    tempDir = mkdtempSync(path.join(tmpdir(), 'actuate-cli-prisma-'))
+    writeSchema(tempDir, '../generated/prisma')
+    const schemaPath = path.join(tempDir, 'prisma', 'schema.prisma')
+    expect(parsePrismaGeneratorOutputDir(schemaPath)).toBe(
+      path.join(tempDir, 'generated', 'prisma'),
+    )
+  })
+
+  it('resolves custom output paths used by Prisma 7 scaffolds', () => {
+    tempDir = mkdtempSync(path.join(tmpdir(), 'actuate-cli-prisma-'))
+    writeSchema(tempDir, '../src/generated/prisma')
+    const schemaPath = path.join(tempDir, 'prisma', 'schema.prisma')
+    expect(parsePrismaGeneratorOutputDir(schemaPath)).toBe(
+      path.join(tempDir, 'src', 'generated', 'prisma'),
+    )
+  })
+
+  it('locates client.ts via schema output before default fallbacks', () => {
+    tempDir = mkdtempSync(path.join(tmpdir(), 'actuate-cli-prisma-'))
+    writeSchema(tempDir, '../src/generated/prisma')
+    const clientPath = path.join(tempDir, 'src', 'generated', 'prisma', 'client.ts')
+    writeClient(clientPath)
+    expect(resolveProjectPrismaClientModule(tempDir)).toBe(clientPath)
+  })
+
+  it('falls back to generated/prisma/client.ts when schema output is missing', () => {
+    tempDir = mkdtempSync(path.join(tmpdir(), 'actuate-cli-prisma-'))
+    const clientPath = path.join(tempDir, 'generated', 'prisma', 'client.ts')
+    writeClient(clientPath)
+    expect(resolveProjectPrismaClientModule(tempDir)).toBe(clientPath)
+  })
+
+  it('resolveClientEntryInDir prefers client.ts over index.ts', () => {
+    tempDir = mkdtempSync(path.join(tmpdir(), 'actuate-cli-prisma-entry-'))
+    writeFileSync(path.join(tempDir, 'index.ts'), 'export {}')
+    writeFileSync(path.join(tempDir, 'client.ts'), 'export class PrismaClient {}')
+    expect(resolveClientEntryInDir(tempDir)).toBe(path.join(tempDir, 'client.ts'))
+  })
+})

package/src/utils/database.ts

@@ -1,8 +1,9 @@
-import { existsSync } from 'node:fs'
 import { createRequire } from 'node:module'
 import path from 'node:path'
 import { pathToFileURL } from 'node:url'
 
+import { findLibPrismaHelper, resolveProjectPrismaClientModule } from './prisma-client-path.js'
+
 /**
  * Shared helper for CLI commands that need a live connection to the consumer
  * project's database (seed, populate, data migrations…).
@@ -10,9 +11,11 @@ import { pathToFileURL } from 'node:url'
  * Resolution order mirrors how a scaffolded Actuate project exposes Prisma:
  *   1. If `cms-core` already has an initialized client (e.g. set up by the host
  *      app in-process), reuse it.
- *   2. Otherwise build a client from the project's generated Prisma client
- *      (`generated/prisma/client.ts`, Prisma 7 + pg driver adapter).
- *   3. Fall back to a plain `@prisma/client` resolved from the project.
+ *   2. Otherwise call `getPrisma()` from `lib/prisma.ts` when the project ships
+ *      one (Prisma 7 + pg adapter / Accelerate — same path Next.js uses).
+ *   3. Otherwise build a client from the schema's `output` path (custom or
+ *      default `generated/prisma/client.ts`) via tsx + pg driver adapter.
+ *   4. Fall back to a plain `@prisma/client` resolved from the project.
  *
  * The returned `disconnect()` only tears down clients this helper created — a
  * pre-initialized in-process client is left untouched.
@@ -40,20 +43,51 @@ export async function connectProjectDatabase(): Promise<{
   }
 }
 
+const ACCELERATED_DB_URL_PREFIXES = ['prisma://', 'prisma+postgres://'] as const
+
+function isAcceleratedDbUrl(url: string | undefined): boolean {
+  const trimmed = url?.trim()
+  if (!trimmed) return false
+  return ACCELERATED_DB_URL_PREFIXES.some((prefix) => trimmed.startsWith(prefix))
+}
+
+async function importModule(specifier: string, requireFromProject: NodeRequire): Promise<unknown> {
+  const href = pathToFileURL(requireFromProject.resolve(specifier)).href
+  return import(href)
+}
+
+async function tryLibPrismaClient(): Promise<any | null> {
+  const helperPath = findLibPrismaHelper()
+  if (!helperPath) return null
+
+  const { tsImport } = await import('tsx/esm/api')
+  const mod = (await tsImport(pathToFileURL(helperPath).href, import.meta.url)) as {
+    getPrisma?: () => unknown
+    default?: { getPrisma?: () => unknown }
+  }
+  const getPrisma = mod.getPrisma ?? mod.default?.getPrisma
+  if (typeof getPrisma !== 'function') return null
+  return getPrisma()
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- see above.
 async function createProjectPrismaClient(): Promise<any> {
   if (!process.env.DATABASE_URL) {
     throw new Error('DATABASE_URL is required to connect to the project database.')
   }
 
+  const fromLib = await tryLibPrismaClient()
+  if (fromLib) return fromLib
+
   const requireFromProject = createRequire(path.join(process.cwd(), 'package.json'))
-  const generatedClient = path.resolve('generated', 'prisma', 'client.ts')
+  const generatedClient = resolveProjectPrismaClientModule()
 
-  if (existsSync(generatedClient)) {
+  if (generatedClient) {
+    const url = process.env.DATABASE_URL
     const [{ tsImport }, adapterModule, pgModule] = await Promise.all([
       import('tsx/esm/api'),
-      import(pathToFileURL(requireFromProject.resolve('@prisma/adapter-pg')).href),
-      import(pathToFileURL(requireFromProject.resolve('pg')).href),
+      importModule('@prisma/adapter-pg', requireFromProject),
+      importModule('pg', requireFromProject),
     ])
     const { PrismaClient } = (await tsImport(
       pathToFileURL(generatedClient).href,
@@ -61,16 +95,31 @@ async function createProjectPrismaClient(): Promise<any> {
     )) as {
       PrismaClient: new (options?: unknown) => any
     }
+
+    if (isAcceleratedDbUrl(url)) {
+      let withAccelerate: () => unknown
+      try {
+        const ext = (await importModule('@prisma/extension-accelerate', requireFromProject)) as {
+          withAccelerate: () => unknown
+        }
+        withAccelerate = ext.withAccelerate
+      } catch {
+        throw new Error(
+          'DATABASE_URL uses Prisma Accelerate but @prisma/extension-accelerate is not installed. Run `lib/prisma.ts` via adding it, or install the extension.',
+        )
+      }
+      const client = new PrismaClient({ accelerateUrl: url } as never).$extends(withAccelerate())
+      return client
+    }
+
     const { PrismaPg } = adapterModule as { PrismaPg: new (pool: unknown) => unknown }
     const pg = (pgModule as { default?: typeof pgModule }).default ?? pgModule
-    const pool = new (pg as any).Pool({ connectionString: process.env.DATABASE_URL })
+    const pool = new (pg as any).Pool({ connectionString: url })
     const adapter = new PrismaPg(pool)
     return new PrismaClient({ adapter } as any)
   }
 
-  const clientModule = (await import(
-    pathToFileURL(requireFromProject.resolve('@prisma/client')).href
-  )) as {
+  const clientModule = (await importModule('@prisma/client', requireFromProject)) as {
     PrismaClient: new () => any
   }
   return new clientModule.PrismaClient()

package/src/utils/prisma-client-path.ts

@@ -0,0 +1,81 @@
+import { existsSync, readFileSync } from 'node:fs'
+import path from 'node:path'
+
+const SCHEMA_CANDIDATES = ['prisma/schema.prisma', 'schema.prisma'] as const
+
+const CLIENT_ENTRY_NAMES = ['client.ts', 'client.js', 'client.mjs', 'index.ts', 'index.js'] as const
+
+const OUTPUT_DIR_FALLBACKS = [['generated', 'prisma'], ['src', 'generated'], ['generated']] as const
+
+/** Locate the consumer project's Prisma schema file. */
+export function findPrismaSchemaFile(cwd = process.cwd()): string | null {
+  for (const rel of SCHEMA_CANDIDATES) {
+    const candidate = path.join(cwd, rel)
+    if (existsSync(candidate)) return candidate
+  }
+  return null
+}
+
+/**
+ * Parse `generator client { output = "..." }` and return the absolute output
+ * directory. Relative paths resolve from the schema file's directory (Prisma
+ * convention), including `../generated/prisma` layouts.
+ */
+export function parsePrismaGeneratorOutputDir(schemaPath: string): string | null {
+  let content: string
+  try {
+    content = readFileSync(schemaPath, 'utf8')
+  } catch {
+    return null
+  }
+
+  const match = content.match(/output\s*=\s*"([^"]+)"/)
+  if (!match?.[1]) return null
+
+  const raw = match[1].replace(/\//g, path.sep)
+  if (path.isAbsolute(raw)) return raw
+  return path.resolve(path.dirname(schemaPath), raw)
+}
+
+/** First existing Prisma client entry file inside `dir`. */
+export function resolveClientEntryInDir(dir: string): string | null {
+  for (const name of CLIENT_ENTRY_NAMES) {
+    const candidate = path.join(dir, name)
+    if (existsSync(candidate)) return candidate
+  }
+  return null
+}
+
+/**
+ * Resolve the generated Prisma client module path for CLI database commands.
+ * Reads the schema's custom `output` path before falling back to common
+ * scaffold locations (`generated/prisma`, `src/generated`, …).
+ */
+export function resolveProjectPrismaClientModule(cwd = process.cwd()): string | null {
+  const schemaPath = findPrismaSchemaFile(cwd)
+  if (schemaPath) {
+    const outputDir = parsePrismaGeneratorOutputDir(schemaPath)
+    if (outputDir) {
+      const entry = resolveClientEntryInDir(outputDir)
+      if (entry) return entry
+    }
+  }
+
+  for (const parts of OUTPUT_DIR_FALLBACKS) {
+    const entry = resolveClientEntryInDir(path.resolve(cwd, ...parts))
+    if (entry) return entry
+  }
+
+  return null
+}
+
+/** Project helpers that wrap Prisma 7 + driver adapters (preferred when present). */
+export const LIB_PRISMA_HELPERS = ['lib/prisma.ts', 'lib/prisma.js', 'lib/prisma.mjs'] as const
+
+export function findLibPrismaHelper(cwd = process.cwd()): string | null {
+  for (const rel of LIB_PRISMA_HELPERS) {
+    const candidate = path.join(cwd, rel)
+    if (existsSync(candidate)) return candidate
+  }
+  return null
+}