Tighten plugin FumaDB table typing

Author: RhysSullivan

packages/core/sdk/src/fuma-runtime.ts

@@ -1,6 +1,6 @@
 import { Cause, Context, Data, Effect, Exit, Layer, Predicate } from "effect";
 import type { AbstractQuery } from "fumadb/query";
-import type { AnySchema, AnyTable } from "fumadb/schema";
+import type { AnySchema, AnyTable, Schema as FumaSchema } from "fumadb/schema";
 
 export class StorageError extends Data.TaggedError("StorageError")<{
   readonly message: string;
@@ -14,6 +14,9 @@ export class UniqueViolationError extends Data.TaggedError("UniqueViolationError
 export type StorageFailure = StorageError | UniqueViolationError;
 
 export type FumaTables = Record<string, AnyTable>;
+export type TablesToFumaSchema<TTables extends FumaTables | undefined> = TTables extends FumaTables
+  ? FumaSchema<"latest", TTables>
+  : AnySchema;
 export type FumaDb<TSchema extends AnySchema = AnySchema> = AbstractQuery<TSchema>;
 export type FumaRow<TTable extends AnyTable> = Omit<
   {
@@ -83,9 +86,12 @@ class TransactionEffectDefect {
   constructor(readonly cause: unknown) {}
 }
 
-export type IFumaClient = Readonly<{
-  db: FumaDb;
-  use: <A>(label: string, fn: (db: FumaDb) => Promise<A>) => Effect.Effect<A, StorageFailure>;
+export type IFumaClient<TSchema extends AnySchema = AnySchema> = Readonly<{
+  db: FumaDb<TSchema>;
+  use: <A>(
+    label: string,
+    fn: (db: FumaDb<TSchema>) => Promise<A>,
+  ) => Effect.Effect<A, StorageFailure>;
   transaction: <A, E>(effect: Effect.Effect<A, E>) => Effect.Effect<A, E | StorageFailure>;
 }>;
 

packages/core/sdk/src/index.ts

@@ -298,7 +298,6 @@ export {
   type SecretListEntry,
   type Elicit,
   definePlugin,
-  defineSchema,
   tool,
 } from "./plugin";
 

packages/core/sdk/src/plugin.ts

@@ -3,7 +3,13 @@ import type { Context, Layer } from "effect";
 import type { HttpClient } from "effect/unstable/http";
 import type { HttpApiGroup } from "effect/unstable/httpapi";
 import type { StandardJSONSchemaV1, StandardSchemaV1 } from "@standard-schema/spec";
-import type { FumaDb, FumaTables, IFumaClient, StorageFailure } from "./fuma-runtime";
+import type {
+  FumaDb,
+  FumaTables,
+  IFumaClient,
+  StorageFailure,
+  TablesToFumaSchema,
+} from "./fuma-runtime";
 
 import type { PluginBlobStore } from "./blob";
 import type {
@@ -44,7 +50,7 @@ import type { Usage, UsagesForConnectionInput, UsagesForSecretInput } from "./us
 // and writes stamp an explicit `scope_id`.
 // ---------------------------------------------------------------------------
 
-export interface StorageDeps<_TTables extends FumaTables | undefined = undefined> {
+export interface StorageDeps<TTables extends FumaTables | undefined = undefined> {
   /**
    * Precedence-ordered scope stack visible to this executor. Innermost
    * first. Reads on scoped tables walk every scope; writes require the
@@ -53,19 +59,12 @@ export interface StorageDeps<_TTables extends FumaTables | undefined = undefined
    */
   readonly scopes: readonly Scope[];
   /** Plugin-facing FumaDB query handle. Plugins call FumaDB directly. */
-  readonly db: FumaDb;
+  readonly db: FumaDb<TablesToFumaSchema<TTables>>;
   /** Effect boundary around the same FumaDB handle for stores implemented in Effect. */
-  readonly fuma: IFumaClient;
+  readonly fuma: IFumaClient<TablesToFumaSchema<TTables>>;
   readonly blobs: PluginBlobStore;
 }
 
-// ---------------------------------------------------------------------------
-// defineSchema — compatibility name for plugin tables. It returns FumaDB table
-// definitions directly; there is no Executor-specific schema DSL anymore.
-// ---------------------------------------------------------------------------
-
-export const defineSchema = <const TTables extends FumaTables>(tables: TTables): TTables => tables;
-
 // ---------------------------------------------------------------------------
 // Elicit — suspends the fiber, calls the invoke-time elicitation
 // handler, resumes with the user's response. Available on both static

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

@@ -12,7 +12,7 @@ import {
   matchPattern,
   resolveToolPolicy,
 } from "./policies";
-import { definePlugin, defineSchema } from "./plugin";
+import { definePlugin } from "./plugin";
 import { makeTestExecutor } from "./testing";
 
 // ---------------------------------------------------------------------------
@@ -268,9 +268,9 @@ const recordingHandler = (calls: { count: number }): ElicitationHandler =>
 const decliningHandler: ElicitationHandler = () =>
   Effect.succeed(ElicitationResponse.make({ action: "decline" }));
 
-const policyTestSchema = defineSchema({
+const policyTestSchema = {
   ptest_marker: scopedExecutorTable("ptest_marker", {}),
-});
+};
 
 const policyTestPlugin = definePlugin(() => ({
   id: "ptest" as const,

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

@@ -2,7 +2,7 @@ import { describe, expect, it } from "@effect/vitest";
 
 import { createExecutor } from "./promise";
 import { collectTables } from "./executor";
-import { definePlugin, defineSchema, tool } from "./plugin";
+import { definePlugin, tool } from "./plugin";
 import { createSqliteTestFumaDb } from "./sqlite-test-db";
 import { Effect, Schema } from "effect";
 
@@ -11,7 +11,7 @@ import { Effect, Schema } from "effect";
 // nested methods (executor.tools.*) and plugin extensions.
 const echoPlugin = definePlugin(() => ({
   id: "echo" as const,
-  schema: defineSchema({}),
+  schema: {},
   storage: () => ({}),
   staticSources: () => [
     {
@@ -84,7 +84,7 @@ describe("promise/createExecutor", () => {
     // wrapped invocation error.
     const approvedPlugin = definePlugin(() => ({
       id: "ap" as const,
-      schema: defineSchema({}),
+      schema: {},
       storage: () => ({}),
       staticSources: () => [
         {

packages/plugins/google-discovery/src/sdk/binding-store.ts

@@ -16,7 +16,7 @@ import { Effect, Option, Schema } from "effect";
 
 import {
   dateColumn,
-  defineSchema,
+  type FumaTables,
   jsonColumn,
   nullableTextColumn,
   scopedExecutorTable,
@@ -46,7 +46,7 @@ export const GOOGLE_DISCOVERY_OAUTH_SESSION_TTL_MS = 15 * 60 * 1000;
 // Schema — plugin-declared tables merged with coreSchema at executor start.
 // ---------------------------------------------------------------------------
 
-export const googleDiscoverySchema = defineSchema({
+export const googleDiscoverySchema = {
   google_discovery_source: scopedExecutorTable("google_discovery_source", {
     name: textColumn("name"),
     // Plugin-private structural config minus auth/credentials —
@@ -89,7 +89,7 @@ export const googleDiscoverySchema = defineSchema({
     binding: jsonColumn("binding"),
     created_at: dateColumn("created_at"),
   }),
-});
+} satisfies FumaTables;
 
 export type GoogleDiscoverySchema = typeof googleDiscoverySchema;
 

packages/plugins/graphql/src/sdk/store.ts

@@ -2,7 +2,7 @@ import { Effect, Schema } from "effect";
 
 import {
   ConfiguredCredentialBinding,
-  defineSchema,
+  type FumaTables,
   jsonColumn,
   nullableTextColumn,
   scopedExecutorTable,
@@ -35,7 +35,7 @@ import {
 //     internal opaque data).
 // ---------------------------------------------------------------------------
 
-export const graphqlSchema = defineSchema({
+export const graphqlSchema = {
   graphql_source: scopedExecutorTable("graphql_source", {
     name: textColumn("name"),
     endpoint: textColumn("endpoint"),
@@ -62,7 +62,7 @@ export const graphqlSchema = defineSchema({
     source_id: textColumn("source_id"),
     binding: jsonColumn("binding"),
   }),
-});
+} satisfies FumaTables;
 
 export type GraphqlSchema = typeof graphqlSchema;
 

packages/plugins/mcp/src/sdk/binding-store.ts

@@ -21,7 +21,7 @@ import { Effect, Option, Schema } from "effect";
 import {
   ConfiguredCredentialBinding,
   dateColumn,
-  defineSchema,
+  type FumaTables,
   jsonColumn,
   nullableTextColumn,
   scopedExecutorTable,
@@ -44,7 +44,7 @@ import {
 // Schema
 // ---------------------------------------------------------------------------
 
-export const mcpSchema = defineSchema({
+export const mcpSchema = {
   mcp_source: scopedExecutorTable("mcp_source", {
     name: textColumn("name"),
     // Plugin-private structural data minus the ref-bearing fields
@@ -84,7 +84,7 @@ export const mcpSchema = defineSchema({
     binding: jsonColumn("binding"),
     created_at: dateColumn("created_at"),
   }),
-});
+} satisfies FumaTables;
 
 export type McpSchema = typeof mcpSchema;