Move DB setup out of core SDK

Author: RhysSullivan

apps/cloud/package.json

@@ -65,6 +65,8 @@
     "@cloudflare/workers-types": "^4.20250620.0",
     "@effect/platform-node": "catalog:",
     "@effect/vitest": "catalog:",
+    "@electric-sql/pglite": "^0.4.4",
+    "@electric-sql/pglite-socket": "^0.1.4",
     "@executor-js/cli": "workspace:*",
     "@rhyssul/portless": "^0.13.0",
     "@tailwindcss/vite": "catalog:",

apps/cloud/scripts/dev-db.ts

@@ -11,9 +11,9 @@ import { setTimeout as sleep } from "node:timers/promises";
 import { resolve, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { collectTables } from "@executor-js/sdk";
-import { createPgliteFumaDb } from "@executor-js/sdk/pglite";
 import executorConfig from "../executor.config";
 import { ensureCloudSchema } from "../src/services/schema-init";
+import { createPgliteFumaDb } from "../src/services/pglite";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const PORT = 5433;

apps/cloud/scripts/test-globalsetup.ts

@@ -5,9 +5,9 @@
 // ---------------------------------------------------------------------------
 
 import { collectTables } from "@executor-js/sdk";
-import { createPgliteFumaDb, type PgliteFumaDb } from "@executor-js/sdk/pglite";
 import executorConfig from "../executor.config";
 import { ensureCloudSchema } from "../src/services/schema-init";
+import { createPgliteFumaDb, type PgliteFumaDb } from "../src/services/pglite";
 
 const PORT = 5434;
 

apps/cloud/src/mcp-session.e2e.node.test.ts

@@ -33,11 +33,11 @@ import {
   createExecutor,
   definePlugin,
 } from "@executor-js/sdk";
-import { createDrizzleFumaDb } from "@executor-js/sdk/drizzle";
 import { FetchHttpClient } from "effect/unstable/http";
 import { makeTestWorkOSVaultClient } from "@executor-js/plugin-workos-vault/testing";
 import executorConfig from "../executor.config";
 import { DbService } from "./services/db";
+import { createDrizzleFumaDb } from "./services/fuma";
 
 // ---------------------------------------------------------------------------
 // Test-only plugin: exposes one in-memory tool that elicits once. Lets the

apps/cloud/src/services/__test-harness__/api-harness.ts

@@ -27,7 +27,6 @@ import {
 import { createExecutionEngine } from "@executor-js/execution";
 import { makeQuickJsExecutor } from "@executor-js/runtime-quickjs";
 import { Scope, ScopeId, collectTables, createExecutor } from "@executor-js/sdk";
-import { createDrizzleFumaDb } from "@executor-js/sdk/drizzle";
 import { makeTestWorkOSVaultClient } from "@executor-js/plugin-workos-vault/testing";
 
 import executorConfig from "../../../executor.config";
@@ -38,6 +37,7 @@ import {
   RouterConfig,
 } from "../../api/protected-layers";
 import { DbService } from "../db";
+import { createDrizzleFumaDb } from "../fuma";
 
 export const TEST_BASE_URL = "http://test.local";
 export const TEST_ORG_HEADER = "x-test-org-id";

apps/cloud/src/services/db.ts

@@ -87,7 +87,7 @@ const getDirectPgliteRuntime = async (): Promise<DirectPgliteRuntime> => {
       { ensureCloudSchema },
     ] = await Promise.all([
       import("@executor-js/sdk"),
-      import("@executor-js/sdk/pglite"),
+      import("./pglite"),
       import("../../executor.config"),
       import("./schema-init"),
     ]);

apps/cloud/src/services/executor.ts

@@ -17,11 +17,11 @@ import {
   createExecutor,
   makeHostedHttpClientLayer,
 } from "@executor-js/sdk";
-import { createDrizzleFumaDb } from "@executor-js/sdk/drizzle";
 
 import { env } from "cloudflare:workers";
 import executorConfig from "../../executor.config";
 import { DbService } from "./db";
+import { createDrizzleFumaDb } from "./fuma";
 
 // ---------------------------------------------------------------------------
 // Plugin list lives in `executor.config.ts` — that file is the single source

packages/core/sdk/src/drizzle.ts apps/cloud/src/services/fuma.tspackages/core/sdk/src/drizzle.ts renamed to apps/cloud/src/services/fuma.ts

@@ -2,15 +2,7 @@ import { fumadb, type FumaDB } from "fumadb";
 import { drizzleAdapter, type DrizzleConfig } from "fumadb/adapters/drizzle";
 import { schema as fumaSchema } from "fumadb/schema";
 
-import type { FumaDb, FumaTables } from "./fuma-runtime";
-
-export {
-  createPostgresDrizzleSchema,
-  ensurePostgresFumaSchema,
-  type ExecutableDrizzleDb,
-  type PostgresDrizzleSchema,
-  type PostgresDrizzleSchemaOptions,
-} from "./drizzle-schema";
+import type { FumaDb, FumaTables } from "@executor-js/sdk";
 
 export interface DrizzleFumaDb {
   readonly db: FumaDb;
@@ -20,9 +12,9 @@ export interface DrizzleFumaDb {
 export interface CreateDrizzleFumaDbOptions<TTables extends FumaTables = FumaTables> {
   readonly db: DrizzleConfig["db"];
   readonly tables: TTables;
-  readonly namespace?: string;
+  readonly namespace: string;
   readonly version?: string;
-  readonly provider?: DrizzleConfig["provider"];
+  readonly provider: DrizzleConfig["provider"];
 }
 
 const asFumaDb = (db: unknown): FumaDb => db as FumaDb;
@@ -37,13 +29,13 @@ export const createDrizzleFumaDb = <const TTables extends FumaTables>(
     tables: options.tables,
   });
   const factory = fumadb({
-    namespace: options.namespace ?? "executor",
+    namespace: options.namespace,
     schemas: [latestSchema],
   });
   const fuma = factory.client(
     drizzleAdapter({
       db: options.db,
-      provider: options.provider ?? "postgresql",
+      provider: options.provider,
     }),
   );
 

packages/core/sdk/src/pglite.ts apps/cloud/src/services/pglite.tspackages/core/sdk/src/pglite.ts renamed to apps/cloud/src/services/pglite.ts

@@ -5,10 +5,14 @@ import {
 } from "@electric-sql/pglite-socket";
 import { drizzle, type PgliteDatabase } from "drizzle-orm/pglite";
 import type { FumaDB } from "fumadb";
+import {
+  createDrizzleRuntimeSchemaFromTables,
+  ensureDrizzleRuntimeSchemaFromTables,
+} from "fumadb/adapters/drizzle";
+
+import type { FumaDb, FumaTables } from "@executor-js/sdk";
 
-import type { FumaDb, FumaTables } from "./fuma-runtime";
-import { createDrizzleFumaDb } from "./drizzle";
-import { createPostgresDrizzleSchema, ensurePostgresFumaSchema } from "./drizzle-schema";
+import { createDrizzleFumaDb } from "./fuma";
 
 export interface PgliteFumaDb {
   readonly db: FumaDb;
@@ -22,7 +26,7 @@ export interface PgliteFumaDb {
 
 export interface CreatePgliteFumaDbOptions<TTables extends FumaTables = FumaTables> {
   readonly tables: TTables;
-  readonly namespace?: string;
+  readonly namespace: string;
   readonly version?: string;
   readonly dataDir?: string;
   readonly host?: string;
@@ -33,26 +37,29 @@ export const createPgliteFumaDb = async <const TTables extends FumaTables>(
   options: CreatePgliteFumaDbOptions<TTables>,
 ): Promise<PgliteFumaDb> => {
   const version = options.version ?? "1.0.0";
-  const namespace = options.namespace ?? "executor";
   const pglite = await PGlite.create(options.dataDir ?? "memory://");
-  const drizzleSchema = createPostgresDrizzleSchema({
+  const schema = createDrizzleRuntimeSchemaFromTables({
     tables: options.tables,
-    namespace,
+    namespace: options.namespace,
     version,
+    provider: "postgresql",
   });
   const drizzleDb = drizzle({
     client: pglite,
-    schema: drizzleSchema,
+    schema,
   });
-  await ensurePostgresFumaSchema(drizzleDb, {
+
+  await ensureDrizzleRuntimeSchemaFromTables(drizzleDb, {
     tables: options.tables,
-    namespace,
+    namespace: options.namespace,
     version,
+    provider: "postgresql",
   });
+
   const fuma = createDrizzleFumaDb({
     db: drizzleDb,
     tables: options.tables,
-    namespace,
+    namespace: options.namespace,
     version,
     provider: "postgresql",
   });

apps/cloud/src/services/schema-init.ts

@@ -1,5 +1,8 @@
 import { sql } from "drizzle-orm";
-import type { ExecutableDrizzleDb } from "@executor-js/sdk/drizzle";
+
+interface ExecutableDrizzleDb {
+  readonly execute: (query: ReturnType<typeof sql.raw>) => Promise<unknown>;
+}
 
 const statements = [
   `CREATE TABLE IF NOT EXISTS "accounts" (