Move table collection into createExecutor

Author: RhysSullivan

examples/all-plugins/src/main.ts

@@ -19,14 +19,7 @@
 
 import { Cause, Effect } from "effect";
 
-import {
-  SecretId,
-  Scope,
-  ScopeId,
-  SetSecretInput,
-  collectTables,
-  createExecutor,
-} from "@executor-js/sdk";
+import { SecretId, Scope, ScopeId, SetSecretInput, createExecutor } from "@executor-js/sdk";
 import { createSqliteTestFumaDb } from "@executor-js/sdk/testing";
 
 import { fileSecretsPlugin } from "@executor-js/plugin-file-secrets";
@@ -166,16 +159,15 @@ const program = Effect.gen(function* () {
   console.log("Building executor with every ported plugin");
   console.log("=".repeat(72));
 
-  const sqlite = yield* Effect.promise(() =>
-    createSqliteTestFumaDb({
-      tables: collectTables(plugins),
-      namespace: "executor_example_all_plugins",
-    }),
-  );
-
   const executor = yield* createExecutor({
     scopes: [scope],
-    db: sqlite.db,
+    db: ({ tables }) =>
+      Effect.promise(() =>
+        createSqliteTestFumaDb({
+          tables,
+          namespace: "executor_example_all_plugins",
+        }),
+      ),
     plugins,
     onElicitation: "accept-all" as const,
   });
@@ -437,7 +429,6 @@ const program = Effect.gen(function* () {
   console.log("-".repeat(72));
 
   yield* executor.close();
-  yield* Effect.promise(() => sqlite.close());
   console.log("Executor closed. Done.");
 });
 

examples/promise-sdk/src/main.ts

@@ -3,7 +3,6 @@
  * — no Effect knowledge needed. In-memory stores, runs anywhere.
  */
 import { createExecutor, SecretId, SetSecretInput } from "@executor-js/sdk/promise";
-import { collectTables } from "@executor-js/sdk/core";
 import { createSqliteTestFumaDb } from "@executor-js/sdk/testing";
 import { mcpPlugin } from "@executor-js/plugin-mcp/promise";
 import { openApiPlugin } from "@executor-js/plugin-openapi/promise";
@@ -14,13 +13,13 @@ import { graphqlPlugin } from "@executor-js/plugin-graphql/promise";
 // ---------------------------------------------------------------------------
 
 const plugins = [mcpPlugin(), openApiPlugin(), graphqlPlugin()] as const;
-const db = await createSqliteTestFumaDb({
-  tables: collectTables(plugins),
-  namespace: "executor_promise_example",
-});
 
 const executor = await createExecutor({
-  db: db.db,
+  db: ({ tables }) =>
+    createSqliteTestFumaDb({
+      tables,
+      namespace: "executor_promise_example",
+    }),
   scopes: [{ id: "my-app", name: "my-app" }],
   plugins,
   onElicitation: "accept-all",
@@ -120,4 +119,3 @@ const resolved = await executor.secrets.get("api-key");
 console.log("Secret:", resolved);
 
 await executor.close();
-await db.close();

packages/core/sdk/src/executor.ts

@@ -332,6 +332,17 @@ export type Executor<TPlugins extends readonly AnyPlugin[] = readonly []> = {
   readonly close: () => Effect.Effect<void, StorageFailure>;
 } & PluginExtensions<TPlugins>;
 
+export interface ExecutorDb {
+  readonly db: FumaDb;
+  readonly close?: () => Effect.Effect<void, StorageFailure> | Promise<void> | void;
+}
+
+export type ExecutorDbInput = FumaDb | ExecutorDb;
+
+export type ExecutorDbFactory = (config: {
+  readonly tables: FumaTables;
+}) => ExecutorDbInput | Effect.Effect<ExecutorDbInput, StorageFailure>;
+
 export interface ExecutorConfig<TPlugins extends readonly AnyPlugin[] = readonly []> {
   /**
    * Precedence-ordered scope stack. Innermost first; typical shape is
@@ -341,7 +352,7 @@ export interface ExecutorConfig<TPlugins extends readonly AnyPlugin[] = readonly
    * Must be non-empty.
    */
   readonly scopes: readonly Scope[];
-  readonly db: FumaDb;
+  readonly db: ExecutorDbInput | ExecutorDbFactory;
   readonly plugins?: TPlugins;
   /**
    * How to respond when a tool requests user input mid-invocation. Pass
@@ -751,7 +762,14 @@ export const createExecutor = <const TPlugins extends readonly AnyPlugin[] = rea
       const empty: readonly AnyPlugin[] = [];
       return empty as TPlugins;
     };
-    const { scopes, db: rootDbUntyped, plugins = defaultPlugins() } = config;
+    const { scopes, plugins = defaultPlugins() } = config;
+    const dbInput = yield* Effect.suspend(() => {
+      if (typeof config.db !== "function") return Effect.succeed(config.db);
+      const out = config.db({ tables: collectTables(plugins) });
+      return Effect.isEffect(out) ? out : Effect.succeed(out);
+    });
+    const rootDbUntyped = "db" in dbInput ? dbInput.db : dbInput;
+    const closeDb = "db" in dbInput ? dbInput.close : undefined;
 
     if (scopes.length === 0) {
       return yield* new StorageError({
@@ -3483,6 +3501,21 @@ export const createExecutor = <const TPlugins extends readonly AnyPlugin[] = rea
             yield* runtime.plugin.close();
           }
         }
+        if (closeDb) {
+          const out = closeDb();
+          if (Effect.isEffect(out)) {
+            yield* out;
+          } else if (out instanceof Promise) {
+            yield* Effect.tryPromise({
+              try: () => out,
+              catch: (cause) =>
+                new StorageError({
+                  message: "Executor database close failed",
+                  cause,
+                }),
+            });
+          }
+        }
       });
 
     // Public Executor surface — storage-backed methods surface

packages/core/sdk/src/index.ts

@@ -305,6 +305,9 @@ export {
 export {
   type Executor,
   type ExecutorConfig,
+  type ExecutorDb,
+  type ExecutorDbFactory,
+  type ExecutorDbInput,
   type OnElicitation,
   type InvokeOptions,
   createExecutor,

packages/core/sdk/src/promise-executor.ts

@@ -15,11 +15,12 @@
 import { Brand, Effect } from "effect";
 
 import {
+  collectTables,
   createExecutor as createEffectExecutor,
   type Executor as EffectExecutor,
   type OnElicitation,
 } from "./executor";
-import type { FumaDb } from "./fuma-runtime";
+import type { FumaDb, FumaTables } from "./fuma-runtime";
 import { ScopeId } from "./ids";
 import type { AnyPlugin } from "./plugin";
 import { Scope } from "./scope";
@@ -73,12 +74,21 @@ export interface ExecutorConfig<TPlugins extends readonly AnyPlugin[] = readonly
    * `{ id, name }` partials to build a multi-scope executor.
    */
   readonly scopes?: readonly { readonly id?: string; readonly name?: string }[];
+  readonly plugins?: TPlugins;
   /**
-   * FumaDB ORM handle for the configured Executor schema. Hosts choose
-   * their database engine and FumaDB adapter, then pass the query handle here.
+   * FumaDB ORM handle, or a factory that receives the full Executor table
+   * map after plugins have been applied. Public consumers usually want the
+   * factory form so `collectTables(plugins)` stays inside `createExecutor`.
    */
-  readonly db: FumaDb;
-  readonly plugins?: TPlugins;
+  readonly db:
+    | FumaDb
+    | { readonly db: FumaDb; readonly close?: () => Promise<void> | void }
+    | ((config: {
+        readonly tables: FumaTables;
+      }) =>
+        | FumaDb
+        | { readonly db: FumaDb; readonly close?: () => Promise<void> | void }
+        | Promise<FumaDb | { readonly db: FumaDb; readonly close?: () => Promise<void> | void }>);
   /**
    * How to respond when a tool requests user input mid-invocation. Pass
    * `"accept-all"` for tests / non-interactive hosts, or a handler
@@ -141,6 +151,10 @@ export const createExecutor = async <const TPlugins extends readonly AnyPlugin[]
   config: ExecutorConfig<TPlugins>,
 ): Promise<Executor<TPlugins>> => {
   const plugins = (config?.plugins ?? []) as TPlugins;
+  const db =
+    typeof config.db === "function"
+      ? await config.db({ tables: collectTables(plugins) })
+      : config.db;
 
   const scopes =
     config.scopes && config.scopes.length > 0
@@ -161,7 +175,7 @@ export const createExecutor = async <const TPlugins extends readonly AnyPlugin[]
 
   const effectConfig = {
     scopes,
-    db: config.db,
+    db,
     plugins,
     onElicitation: config.onElicitation,
   };

packages/core/sdk/src/promise.test.ts

@@ -1,7 +1,6 @@
 import { describe, expect, it } from "@effect/vitest";
 
 import { createExecutor } from "./promise";
-import { collectTables } from "./executor";
 import { definePlugin, tool } from "./plugin";
 import { createSqliteTestFumaDb } from "./sqlite-test-db";
 import { Effect, Schema } from "effect";
@@ -38,12 +37,12 @@ const echoPlugin = definePlugin(() => ({
 describe("promise/createExecutor", () => {
   it("returns Promise-shaped executor and invokes static tools", async () => {
     const plugins = [echoPlugin()] as const;
-    const db = await createSqliteTestFumaDb({
-      tables: collectTables(plugins),
-      namespace: "executor_promise_test",
-    });
     const executor = await createExecutor({
-      db: db.db,
+      db: ({ tables }) =>
+        createSqliteTestFumaDb({
+          tables,
+          namespace: "executor_promise_test",
+        }),
       plugins,
       onElicitation: "accept-all",
     });
@@ -55,17 +54,16 @@ describe("promise/createExecutor", () => {
     expect(out).toBe("hi");
 
     await executor.close();
-    await db.close();
   });
 
   it("promisifies plugin extension methods", async () => {
     const plugins = [echoPlugin()] as const;
-    const db = await createSqliteTestFumaDb({
-      tables: collectTables(plugins),
-      namespace: "executor_promise_test",
-    });
     const executor = await createExecutor({
-      db: db.db,
+      db: ({ tables }) =>
+        createSqliteTestFumaDb({
+          tables,
+          namespace: "executor_promise_test",
+        }),
       plugins,
       onElicitation: "accept-all",
     });
@@ -74,7 +72,6 @@ describe("promise/createExecutor", () => {
     expect(greeting).toBe("hello, world");
 
     await executor.close();
-    await db.close();
   });
 
   it("per-invoke onElicitation override wins over the executor-level default", async () => {
@@ -107,12 +104,12 @@ describe("promise/createExecutor", () => {
     }));
 
     const plugins = [approvedPlugin()] as const;
-    const db = await createSqliteTestFumaDb({
-      tables: collectTables(plugins),
-      namespace: "executor_promise_test",
-    });
     const executor = await createExecutor({
-      db: db.db,
+      db: ({ tables }) =>
+        createSqliteTestFumaDb({
+          tables,
+          namespace: "executor_promise_test",
+        }),
       plugins,
       onElicitation: "accept-all", // default → auto-approve
     });
@@ -137,6 +134,5 @@ describe("promise/createExecutor", () => {
     });
 
     await executor.close();
-    await db.close();
   });
 });