better-supabase 0.9.0 → 0.11.0

package/dist/jwks-cache-C4rA69hD.js

@@ -0,0 +1,49 @@
+import { n as dbError } from "./errors-BV1SKTVs.js";
+import { a as ok, r as err } from "./result-DIeYscA3.js";
+import { a as jwksOf } from "./jws-CwBB5QAT.js";
+//#region src/core/jwks-cache.ts
+/** The most bytes read from a JWKS response. */
+const MAX_JWKS_BYTES = 262144;
+/**
+* A cached key set. A URL is fetched on first use and again after
+* `cacheSeconds`; a refresh for an unknown `kid` refetches at most once per
+* `refetchSeconds`, so a stream of forged `kid`s can't hammer the issuer.
+* Concurrent callers share one fetch.
+*/
+function jwksSource(input, options = {}) {
+	const parse = (value) => jwksOf(value, options.rsa === void 0 ? {} : { rsa: options.rsa });
+	if (!(input instanceof URL) && typeof input !== "function") {
+		const keys = parse(input);
+		return () => Promise.resolve(ok(keys));
+	}
+	const now = options.now ?? Date.now;
+	const cacheMs = (options.cacheSeconds ?? 300) * 1e3;
+	const refetchMs = (options.refetchSeconds ?? 30) * 1e3;
+	let cached;
+	let pending;
+	const load = async () => {
+		if (typeof input === "function") return ok(parse(await input()));
+		const response = await (options.fetch ?? fetch)(input, { headers: { accept: "application/jwk-set+json, application/json" } });
+		if (!response.ok) return err(dbError("network", `The JWKS answered ${response.status}`, { code: "JWKS_FETCH_FAILED" }));
+		const text = await response.text();
+		if (text.length > MAX_JWKS_BYTES) return err(dbError("network", "The JWKS response is too large", { code: "JWKS_FETCH_FAILED" }));
+		return ok(parse(JSON.parse(text)));
+	};
+	return async (refresh) => {
+		const age = cached ? now() - cached.at : Number.POSITIVE_INFINITY;
+		if (cached && age < (refresh ? refetchMs : cacheMs)) return ok(cached.keys);
+		pending ??= load().catch((cause) => err(dbError("network", `The JWKS could not be loaded: ${cause instanceof Error ? cause.message : String(cause)}`, { code: "JWKS_FETCH_FAILED" }))).then((result) => {
+			if (result.ok) cached = {
+				keys: result.data,
+				at: now()
+			};
+			return result;
+		}).finally(() => {
+			pending = void 0;
+		});
+		const result = await pending;
+		return !result.ok && cached ? ok(cached.keys) : result;
+	};
+}
+//#endregion
+export { jwksSource as t };

package/dist/{jws-milwSg7E.js → jws-CwBB5QAT.js}

@@ -1,8 +1,10 @@
 import { n as isRecord } from "./guards-6F2bCtQR.js";
-import { a as toBase64Url, r as fromBase64 } from "./base64-BmeCBgGo.js";
+import { a as toBase64Url, r as fromBase64 } from "./base64-D4aqdnDR.js";
 //#region src/core/jws.ts
-const encoder = /* @__PURE__ */ new TextEncoder();
-const decoder = /* @__PURE__ */ new TextDecoder();
+let encoderInstance;
+let decoderInstance;
+const encoder = { encode: (text) => (encoderInstance ??= new TextEncoder()).encode(text) };
+const decoder = { decode: (bytes) => (decoderInstance ??= new TextDecoder()).decode(bytes) };
 const EC = {
 	name: "ECDSA",
 	namedCurve: "P-256"

package/dist/{kit-D5S7KNFe.d.ts → kit-BeZX2pR_.d.ts}

@@ -1,7 +1,7 @@
-import { b as DbError } from "./result-Cj3yWhjH.js";
-import { r as AuthState } from "./resolve-w9EpHzuM.js";
-import { t as AuthSession } from "./view-Dv0A949a.js";
-import { r as GuardOptions } from "./respond-C7I8kLK_.js";
+import { b as DbError } from "./result-BREt7qOh.js";
+import { r as AuthState } from "./resolve-Bqb8TMTt.js";
+import { t as AuthSession } from "./view-Bf7e07rQ.js";
+import { r as GuardOptions } from "./respond-CEBC6KUX.js";
 import { StandardSchemaV1 } from "@standard-schema/spec";
 //#region src/server/kit.d.ts
 /** What a server action returns: plain data, safe across any serialization boundary. */

package/dist/{kit-MUK34-ZG.js → kit-LTbHrWWD.js}

@@ -1,10 +1,10 @@
-import { n as dbError } from "./errors-8i6tSICm.js";
-import { n as validate } from "./standard-B5fe2gnW.js";
+import { n as dbError } from "./errors-BV1SKTVs.js";
+import { n as validate } from "./standard-B1BigegP.js";
 import { n as claimAt } from "./claims-PqzCxaTD.js";
-import { t as authContext } from "./context-BDDgjoxz.js";
-import { n as toSession } from "./view-DZ63nqwt.js";
-import { o as settle, r as guard } from "./respond-DdhZ9Wbn.js";
-import { n as checkPermission } from "./authorizer-DH7DjkL3.js";
+import { t as authContext } from "./context-BiwgsycK.js";
+import { n as toSession } from "./view-CYX1wsgp.js";
+import { o as settle, r as guard } from "./respond-Bhp3G__q.js";
+import { n as checkPermission } from "./authorizer-B3yyCVUF.js";
 //#region src/server/kit.ts
 /** `FormData` as a plain object; repeated keys become arrays. */
 function formDataObject(form) {

package/dist/{knowledge-CJ_Mm3ic.js → knowledge-BbdXOJvY.js}

@@ -1,10 +1,10 @@
 import { t as DbException } from "./db-exception-CnWcYPxL.js";
-import { n as dbError } from "./errors-8i6tSICm.js";
-import { a as ok, r as err, t as AsyncResult } from "./result-BlgnMB0H.js";
+import { n as dbError } from "./errors-BV1SKTVs.js";
+import { a as ok, r as err, t as AsyncResult } from "./result-DIeYscA3.js";
 import { t as vectorLiteral } from "./search-BtoWY6n_.js";
 import { n as isRecord } from "./guards-6F2bCtQR.js";
-import { C as optionalText, D as recordOf, I as textOf, O as recordOrEmpty, f as errorText, h as instantOf, j as run, k as recordsOf, n as applyTemporal, o as blockCall, p as injectableOf } from "./block-helpers-CfG_MvDR.js";
-import { r as withBlockHooks } from "./block-hooks-BsXncUlZ.js";
+import { C as optionalText, D as recordOf, I as textOf, O as recordOrEmpty, f as errorText, h as instantOf, j as run, k as recordsOf, n as applyTemporal, o as blockCall, p as injectableOf } from "./block-helpers-DkVZNDrj.js";
+import { r as withBlockHooks } from "./block-hooks-C22vuIUd.js";
 //#region src/blocks/knowledge/knowledge.ts
 const SCOPES = /* @__PURE__ */ new Set([
 	"organization",

package/dist/{knowledge-BXQ2-V0a.d.ts → knowledge-CRk1jOAJ.d.ts}

@@ -1,11 +1,11 @@
 /// <reference lib="esnext.temporal" />
-import { t as AsyncResult, w as ErrorMapper } from "./result-Cj3yWhjH.js";
+import { T as ErrorMapper, t as AsyncResult } from "./result-BREt7qOh.js";
 import { n as Logger } from "./logger-DWVYUmwi.js";
-import { t as BlockTransport } from "./block-transport-DaGGXjIw.js";
-import { r as BlockTemporalOptions } from "./block-helpers-C86hPEjI.js";
-import { n as BlockHooks } from "./block-hooks-BLPWD3Jt.js";
-import { f as AiFiles, o as AiFile } from "./types-pNY_UpDs.js";
-import { g as JobHandler } from "./types-CdP0z5tS.js";
+import { t as BlockTransport } from "./block-transport-DezJPPA0.js";
+import { r as BlockTemporalOptions } from "./block-helpers-CjcQM1yA.js";
+import { n as BlockHooks } from "./block-hooks-DcPJHztl.js";
+import { f as AiFiles, o as AiFile } from "./types-DO9xWsGC.js";
+import { g as JobHandler } from "./types-BEEFkNFY.js";
 //#region src/blocks/knowledge/knowledge.d.ts
 /**
  * Turns texts into vectors. `model` is stored with each document, so a

package/dist/lint/index.d.ts

@@ -42,7 +42,7 @@ export interface RuleModule {
     CallExpression(node: CallExpression): void;
   };
 }
-export type RuleId = "no-unbounded-find-many" | "no-delete-many-without-where" | "max-limit" | "require-order-by" | "unbounded-read" | "require-max-affected";
+export type RuleId = "no-unbounded-find-many" | "no-delete-many-without-where" | "max-limit" | "require-order-by" | "unbounded-read" | "require-max-affected" | "require-escape-like";
 /** The part of `supabase/snapshot.json` that `largeTables` reads. */
 export interface LintSnapshot {
   readonly extras: {

package/dist/lint/index.js

@@ -66,6 +66,42 @@ const FIND_METHODS = /* @__PURE__ */ new Set([
 	"findFirst",
 	"paginate"
 ]);
+/** Whether `node` calls `escapeLike(...)`, imported bare or through a namespace. */
+function isEscapeLike(node) {
+	if (node.type !== "CallExpression") return false;
+	const { callee } = node;
+	if (callee.type === "Identifier") return callee.name === "escapeLike";
+	return methodName(node) === "escapeLike";
+}
+/**
+* Whether a `like` or `ilike` value may carry a caller's `%` and `_`
+* unescaped: a variable, a property, or a template or `+` concatenation
+* with one that isn't wrapped in `escapeLike(...)`. Literals pass.
+*/
+function unescapedPattern(node) {
+	const part = (child) => !isEscapeLike(child) && unescapedPattern(child);
+	switch (node.type) {
+		case "Identifier":
+		case "MemberExpression": return true;
+		case "TemplateLiteral": return node.expressions.some(part);
+		case "BinaryExpression": {
+			const { operator, left, right } = node;
+			return operator === "+" && (part(left) || part(right));
+		}
+		default: return false;
+	}
+}
+/** Every `like` and `ilike` value in a `where` object, through `AND`, `OR`, `NOT` and relations. */
+function likeValues(node) {
+	if (node.type === "ArrayExpression") return node.elements.flatMap((element) => element ? likeValues(element) : []);
+	if (node.type !== "ObjectExpression") return [];
+	return node.properties.flatMap((property) => {
+		if (property.type !== "Property") return [];
+		const entry = property;
+		const name = keyName(entry);
+		return name === "like" || name === "ilike" ? [entry.value] : likeValues(entry.value);
+	});
+}
 /**
 * The tables `gen` marked as large (an estimated 10,000 rows or more), as
 * `schema.name`, for the `unbounded-read` rule's `tables` option.
@@ -183,7 +219,15 @@ const rules = {
 			minimum: 0
 		} },
 		additionalProperties: false
-	}])
+	}]),
+	"require-escape-like": rule("Escape values passed to like and ilike", "require-escape-like", { unescaped: "This like pattern takes a value whose % and _ act as wildcards. Use ieq, contains or startsWith, or wrap the value in escapeLike()." }, (context) => ({ CallExpression(node) {
+		const where = argsOf(node)?.get("where");
+		if (where === void 0) return;
+		for (const value of likeValues(where)) if (unescapedPattern(value)) context.report({
+			node: value,
+			messageId: "unescaped"
+		});
+	} }))
 };
 const plugin = {
 	meta: { name: "better-supabase" },
@@ -195,7 +239,8 @@ const plugin = {
 			"better-supabase/no-unbounded-find-many": "warn",
 			"better-supabase/max-limit": "warn",
 			"better-supabase/require-order-by": "warn",
-			"better-supabase/unbounded-read": "warn"
+			"better-supabase/unbounded-read": "warn",
+			"better-supabase/require-escape-like": "warn"
 		}
 	} }
 };

package/dist/list/index.d.ts

@@ -1,4 +1,4 @@
-import { _ as FilterRule, a as FilterDateValue, b as encodeFilterQuery, c as FilterFieldLabels, f as FilterNode, g as FilterRelativeDate, h as FilterQuery, i as FilterCombinator, l as FilterFieldType, m as FilterOperatorSpec, n as FILTER_OPERATOR_LABELS, o as FilterField, p as FilterOperatorArity, r as FilterClock, s as FilterFieldInfo, t as FILTER_OPERATORS, u as FilterGroupNode, v as ListFilterConfig, y as decodeFilterQuery } from "../filter-query-BKmRYrTE.js";
-import { _ as UNSET, a as ListExtra, c as ListParseOptions, d as ListQuery, f as ListQueryConfig, g as ParserSpec, h as OpenApiParameter, i as ListDefinition, l as ListParseResult, m as ListSearchParams, n as FacetCounts, o as ListPage, p as ListQueryInput, r as FacetInfo, s as ListPagination, t as FacetCountFields, u as ListParsers, v as defineListQuery } from "../list-query-PvP3pPGQ.js";
-import { n as FilterRecordField, r as evaluateFilterQuery, t as FilterEvaluation } from "../filter-evaluate-CjcFq0RT.js";
+import { _ as FilterRule, a as FilterDateValue, b as encodeFilterQuery, c as FilterFieldLabels, f as FilterNode, g as FilterRelativeDate, h as FilterQuery, i as FilterCombinator, l as FilterFieldType, m as FilterOperatorSpec, n as FILTER_OPERATOR_LABELS, o as FilterField, p as FilterOperatorArity, r as FilterClock, s as FilterFieldInfo, t as FILTER_OPERATORS, u as FilterGroupNode, v as ListFilterConfig, y as decodeFilterQuery } from "../filter-query-Bc_Qa8V_.js";
+import { _ as UNSET, a as ListExtra, c as ListParseOptions, d as ListQuery, f as ListQueryConfig, g as ParserSpec, h as OpenApiParameter, i as ListDefinition, l as ListParseResult, m as ListSearchParams, n as FacetCounts, o as ListPage, p as ListQueryInput, r as FacetInfo, s as ListPagination, t as FacetCountFields, u as ListParsers, v as defineListQuery } from "../list-query-FhFXzObg.js";
+import { n as FilterRecordField, r as evaluateFilterQuery, t as FilterEvaluation } from "../filter-evaluate-BJcaL3o1.js";
 export { FILTER_OPERATORS, FILTER_OPERATOR_LABELS, type FacetCountFields, type FacetCounts, type FacetInfo, type FilterClock, type FilterCombinator, type FilterDateValue, type FilterEvaluation, type FilterField, type FilterFieldInfo, type FilterFieldLabels, type FilterFieldType, type FilterGroupNode, type FilterNode, type FilterOperatorArity, type FilterOperatorSpec, type FilterQuery, type FilterRecordField, type FilterRelativeDate, type FilterRule, type ListDefinition, type ListExtra, type ListFilterConfig, type ListPage, type ListPagination, type ListParseOptions, type ListParseResult, type ListParsers, type ListQuery, type ListQueryConfig, type ListQueryInput, type ListSearchParams, type OpenApiParameter, type ParserSpec, UNSET, decodeFilterQuery, defineListQuery, encodeFilterQuery, evaluateFilterQuery };

package/dist/{list-query-PvP3pPGQ.d.ts → list-query-FhFXzObg.d.ts}

@@ -1,8 +1,8 @@
-import { E as ValidationIssue, t as AsyncResult } from "./result-Cj3yWhjH.js";
-import { M as Row, a as AnyModels, i as AnyFunctions, z as TableKey } from "./types-YfwpIE-d.js";
-import { l as CountMode } from "./executor-DoE-5iM8.js";
-import { Bt as WhereInput, E as OffsetPageArgs, F as RepositoryOf, Lt as SelectArg, Nt as Payload, T as OffsetPage, g as CursorPageArgs, h as CursorPage, jt as OrderByArg, t as BetterSupabase, wt as IncludeArg, x as FindExt } from "./define-DxHHbNEb.js";
-import { c as FilterFieldLabels, h as FilterQuery, o as FilterField, r as FilterClock, s as FilterFieldInfo, v as ListFilterConfig } from "./filter-query-BKmRYrTE.js";
+import { D as ValidationIssue, t as AsyncResult } from "./result-BREt7qOh.js";
+import { B as TableKey, N as Row, a as AnyModels, i as AnyFunctions } from "./types-BrpW5ixT.js";
+import { l as CountMode } from "./executor-BnMC0lj3.js";
+import { Bt as WhereInput, E as OffsetPageArgs, F as RepositoryOf, Lt as SelectArg, Nt as Payload, T as OffsetPage, g as CursorPageArgs, h as CursorPage, jt as OrderByArg, t as BetterSupabase, wt as IncludeArg, x as FindExt } from "./define-M_r1d2AT.js";
+import { c as FilterFieldLabels, h as FilterQuery, o as FilterField, r as FilterClock, s as FilterFieldInfo, v as ListFilterConfig } from "./filter-query-Bc_Qa8V_.js";
 import { StandardSchemaV1 } from "@standard-schema/spec";
 //#region src/list/list-query.d.ts
 /** Facet value meaning "not set": filters with `is null`. */

package/dist/management-D1gG89z2.d.ts

@@ -0,0 +1,53 @@
+//#region src/create/supabase/management.d.ts
+declare const SMART_REGIONS: readonly ["americas", "emea", "apac"];
+type SmartRegion = (typeof SMART_REGIONS)[number];
+/** A Supabase project ref: lowercase letters and digits, never a path. */
+declare function isProjectRef(value: string): boolean;
+interface SupabaseOrganization {
+  readonly id: string;
+  readonly slug: string;
+  readonly name: string;
+}
+interface SupabaseProject {
+  readonly ref: string;
+  readonly name: string;
+  readonly organization_slug: string;
+  readonly region: string;
+  readonly status: string;
+}
+interface SupabaseLint {
+  readonly name: string;
+  readonly title: string;
+  readonly level: "ERROR" | "WARN" | "INFO";
+  readonly detail?: string | undefined;
+  readonly remediation?: string | undefined;
+}
+/** A Management API call that failed; `status` is the HTTP status, 0 for a bad response. */
+declare class ManagementError extends Error {
+  override readonly name = "ManagementError";
+  readonly status: number;
+  constructor(message: string, status: number);
+}
+/** The Management API calls the deploy flow makes. */
+interface ManagementClient {
+  organizations(): Promise<SupabaseOrganization[]>;
+  projects(): Promise<SupabaseProject[]>;
+  createProject(input: {
+    name: string;
+    organizationSlug: string;
+    region: SmartRegion;
+    dbPass: string;
+  }): Promise<SupabaseProject>;
+  project(ref: string): Promise<SupabaseProject>;
+  databaseHealthy(ref: string): Promise<boolean>;
+  publicTableCount(ref: string): Promise<number>;
+  applyMigration(ref: string, name: string, query: string): Promise<void>;
+  securityLints(ref: string): Promise<readonly SupabaseLint[]>;
+}
+/**
+ * The Management API calls the deploy dialog makes, with the user's OAuth
+ * access token. Responses are parsed, and every failure is a `ManagementError`.
+ */
+declare function managementClient(accessToken: string, fetchImpl?: typeof fetch): ManagementClient;
+//#endregion
+export { SupabaseLint as a, isProjectRef as c, SmartRegion as i, managementClient as l, ManagementError as n, SupabaseOrganization as o, SMART_REGIONS as r, SupabaseProject as s, ManagementClient as t };

package/dist/mcp/index.d.ts

@@ -1,11 +1,11 @@
-import { a as AnyModels, i as AnyFunctions, z as TableKey } from "../types-YfwpIE-d.js";
-import { t as OperationTable } from "../operations-C9-UcReN.js";
+import { B as TableKey, a as AnyModels, i as AnyFunctions } from "../types-BrpW5ixT.js";
+import { t as OperationTable } from "../operations-DQCWqkt3.js";
 import { D as ResourceOperation } from "../model-lUafmeBQ.js";
 import { s as PermissionRef, t as AnyAuthorizer } from "../authorizer-eiOjo-3l.js";
-import { t as BetterSupabase } from "../define-DxHHbNEb.js";
-import { i as ServerContext, s as ServerOptions, t as BetterServer } from "../server-types-OohhIQb2.js";
-import { r as GuardOptions } from "../respond-C7I8kLK_.js";
-import { l as ResourceRouteOptions } from "../resource-types-D2vEQVXI.js";
+import { t as BetterSupabase } from "../define-M_r1d2AT.js";
+import { a as ServerContext, c as ServerOptions, n as BetterServer } from "../server-types-BKN_R4Ws.js";
+import { r as GuardOptions } from "../respond-CEBC6KUX.js";
+import { l as ResourceRouteOptions } from "../resource-types-CGr0BbL-.js";
 import { StandardSchemaV1 } from "@standard-schema/spec";
 //#region src/mcp/json-rpc.d.ts
 /** A JSON object. */
@@ -22,7 +22,7 @@ type RequiredRoles = readonly string[] | {
   readonly claim?: string;
 };
 //#endregion
-//#region src/mcp/mcp.d.ts
+//#region src/mcp/protocol.d.ts
 export declare const MCP_PROTOCOL_VERSION: string;
 /** MCP tool annotations (hints for clients, not guarantees). */
 interface ToolAnnotations {
@@ -41,11 +41,44 @@ interface ToolInfo {
   readonly outputSchema?: Json;
   readonly annotations?: ToolAnnotations;
 }
-interface ToolContext<M extends AnyModels, F extends AnyFunctions, E, C = unknown, P = unknown> extends ServerContext<M, F, E, C, P> {
+interface ToolResult {
+  readonly content: readonly {
+    readonly type: "text";
+    readonly text: string;
+  }[];
+  readonly structuredContent?: Json;
+  readonly isError?: boolean;
+}
+/** What a server tells clients about itself. */
+interface ServerDescription {
+  readonly info: {
+    readonly name: string;
+    readonly version: string;
+    readonly title?: string;
+  };
+  readonly instructions?: string;
+}
+/** A server that one transport-free dispatcher can answer for. */
+interface ProtocolServer extends ServerDescription {
+  listTools(): Promise<readonly ToolInfo[]>;
+  /** The tool's result, or `undefined` when no tool has the name. */
+  callTool(name: string, args: unknown): Promise<ToolResult | undefined>;
+}
+/**
+ * The JSON-RPC response to one message, or `undefined` for a notification.
+ * It answers `initialize`, `server/discover`, `ping`, `tools/list` and
+ * `tools/call`, for message-based transports such as stdio.
+ */
+export declare function answerMessage(message: unknown, server: ProtocolServer): Promise<Json | undefined>;
+/** The response to one line of a newline-delimited JSON-RPC stream. */
+export declare function answerLine(line: string, server: ProtocolServer): Promise<Json | undefined>;
+//#endregion
+//#region src/mcp/mcp.d.ts
+interface ToolContext<M extends AnyModels, F extends AnyFunctions, E, C = unknown, P = unknown, B = unknown> extends ServerContext<M, F, E, C, P, B> {
   readonly request: Request;
   readonly signal: AbortSignal;
 }
-interface McpTool<M extends AnyModels, F extends AnyFunctions, E, C = unknown, P = unknown> {
+interface McpTool<M extends AnyModels, F extends AnyFunctions, E, C = unknown, P = unknown, B = unknown> {
   readonly info: ToolInfo;
   /**
    * The input schema in another dialect, for clients on an older protocol
@@ -60,7 +93,7 @@ interface McpTool<M extends AnyModels, F extends AnyFunctions, E, C = unknown, P
   readonly permission?: unknown;
   /** The provider operation the tool checks, in place of `mcp.tool.<name>`. */
   readonly operation?: string;
-  run(args: never, ctx: ToolContext<M, F, E, C, P>): unknown;
+  run(args: never, ctx: ToolContext<M, F, E, C, P, B>): unknown;
 }
 /** What the `authorize` and `visible` hooks see of a tool. */
 interface ToolRef {
@@ -77,7 +110,7 @@ type ToolDecision = {
   /** OAuth scopes the call needs, sent in an `insufficient_scope` challenge. */
   readonly scopes?: readonly string[];
 };
-interface ToolDefinition<M extends AnyModels, F extends AnyFunctions, E, I, C = unknown, P = unknown, Ref = unknown> {
+interface ToolDefinition<M extends AnyModels, F extends AnyFunctions, E, I, C = unknown, P = unknown, Ref = unknown, B = unknown> {
   readonly name: string;
   readonly title?: string;
   readonly description: string;
@@ -108,7 +141,7 @@ interface ToolDefinition<M extends AnyModels, F extends AnyFunctions, E, I, C =
    * `mcp.tool.<name>` (`invoices.void`).
    */
   readonly operation?: string;
-  run(args: I, ctx: ToolContext<M, F, E, C, P>): unknown;
+  run(args: I, ctx: ToolContext<M, F, E, C, P, B>): unknown;
 }
 /** A table's tools: the REST resource options, plus `meta` per operation for `authorize` and `visible`. */
 type ToolResourceOptions<M extends AnyModels, T extends TableKey<M>, Ref = string> = ResourceRouteOptions<M, T, Ref> & {
@@ -120,7 +153,7 @@ type ToolResourceOptions<M extends AnyModels, T extends TableKey<M>, Ref = strin
   readonly meta?: { readonly [K in ResourceOperation]?: unknown; };
 };
 type ToolResources<M extends AnyModels, Ref = string> = { readonly [T in TableKey<M>]?: ToolResourceOptions<M, T, Ref> | true; };
-interface McpOptions<M extends AnyModels, F extends AnyFunctions, E, C = unknown, P = unknown, Ref = string> extends ServerOptions, Omit<GuardOptions, "scopes"> {
+interface McpOptions<M extends AnyModels, F extends AnyFunctions, E, C = unknown, P = unknown, Ref = string, B = unknown> extends ServerOptions, Omit<GuardOptions, "scopes"> {
   readonly name: string;
   readonly version: string;
   readonly title?: string;
@@ -128,7 +161,7 @@ interface McpOptions<M extends AnyModels, F extends AnyFunctions, E, C = unknown
   readonly instructions?: string;
   /** Tables exposed as tools: `<table>_list`, `_get`, `_create`, `_update`, `_delete`. */
   readonly resources?: ToolResources<M, Ref>;
-  readonly tools?: readonly McpTool<M, F, E, C, P>[];
+  readonly tools?: readonly McpTool<M, F, E, C, P, B>[];
   /**
    * The authorization provider's operations (`authorization.operations` in
    * the config). A tool's `mcp.tool.<name>` entry replaces its `permission`,
@@ -197,14 +230,14 @@ interface McpOptions<M extends AnyModels, F extends AnyFunctions, E, C = unknown
    * validate in the repository). A refusal is a tool error; a refusal with
    * `scopes` is a 403 `insufficient_scope` challenge naming them.
    */
-  readonly authorize?: (ctx: ToolContext<M, F, E, C, P>, tool: ToolRef, args: unknown) => ToolDecision | Promise<ToolDecision>;
+  readonly authorize?: (ctx: ToolContext<M, F, E, C, P, B>, tool: ToolRef, args: unknown) => ToolDecision | Promise<ToolDecision>;
   /**
    * Whether the caller sees a tool in `tools/list`. A hidden tool is called
    * like an unknown one. Lists are cached per token (`cacheScope: 'private'`).
    */
-  readonly visible?: (ctx: ToolContext<M, F, E, C, P>, tool: ToolRef) => boolean | Promise<boolean>;
+  readonly visible?: (ctx: ToolContext<M, F, E, C, P, B>, tool: ToolRef) => boolean | Promise<boolean>;
 }
-interface BetterMcp<M extends AnyModels, F extends AnyFunctions, E, C = unknown, P = unknown, Ref = string> extends BetterServer<M, F, E, C, P> {
+interface BetterMcp<M extends AnyModels, F extends AnyFunctions, E, C = unknown, P = unknown, Ref = string, B = unknown> extends BetterServer<M, F, E, C, P, B> {
   /** Everything in one handler: the MCP endpoint and `/.well-known/oauth-protected-resource`. */
   readonly fetch: (request: Request) => Promise<Response>;
   /** The Streamable HTTP endpoint (POST JSON-RPC). */
@@ -213,28 +246,20 @@ interface BetterMcp<M extends AnyModels, F extends AnyFunctions, E, C = unknown,
   metadata(request: Request): Response;
   readonly tools: readonly ToolInfo[];
   /** Adds a tool typed against this app's repositories. */
-  tool<I = Record<string, unknown>>(definition: ToolDefinition<M, F, E, I, C, P, Ref>): this;
+  tool<I = Record<string, unknown>>(definition: ToolDefinition<M, F, E, I, C, P, Ref, B>): this;
   /** Calls a tool directly, e.g. from tests or another transport. */
-  call(name: string, args: unknown, ctx: ToolContext<M, F, E, C, P>): Promise<ToolResult>;
-}
-interface ToolResult {
-  readonly content: readonly {
-    readonly type: "text";
-    readonly text: string;
-  }[];
-  readonly structuredContent?: Json;
-  readonly isError?: boolean;
+  call(name: string, args: unknown, ctx: ToolContext<M, F, E, C, P, B>): Promise<ToolResult>;
 }
 /** A custom tool. Pass it in `createMcp({ tools: [...] })`. */
-export declare function defineTool<M extends AnyModels, F extends AnyFunctions, E, I = Record<string, unknown>, C = unknown, P = unknown, Ref = unknown>(definition: ToolDefinition<M, F, E, I, C, P, Ref>): McpTool<M, F, E, C, P>;
+export declare function defineTool<M extends AnyModels, F extends AnyFunctions, E, I = Record<string, unknown>, C = unknown, P = unknown, Ref = unknown, B = unknown>(definition: ToolDefinition<M, F, E, I, C, P, Ref, B>): McpTool<M, F, E, C, P, B>;
 /**
  * An MCP server (Streamable HTTP, stateless) whose tools run as the caller:
  * the Bearer token from the MCP client is verified and every query goes
  * through RLS. Answers 401 with RFC 9728 metadata so clients can sign in with
  * Supabase Auth's OAuth server.
  */
-export declare function createMcp<M extends AnyModels, D, F extends AnyFunctions, E, C = unknown, P = unknown, A extends AnyAuthorizer | undefined = undefined>(betterSupabase: BetterSupabase<M, D, F, E, C, P>, options: McpOptions<M, F, E, C, P, PermissionRef<A>> & {
+export declare function createMcp<M extends AnyModels, D, F extends AnyFunctions, E, C = unknown, P = unknown, A extends AnyAuthorizer | undefined = undefined, B = unknown>(betterSupabase: BetterSupabase<M, D, F, E, C, P, B>, options: McpOptions<M, F, E, C, P, PermissionRef<A>, B> & {
   readonly authorizer?: A;
-}): BetterMcp<M, F, E, C, P, PermissionRef<A>>;
+}): BetterMcp<M, F, E, C, P, PermissionRef<A>, B>;
 //#endregion
-export type { BetterMcp, GuardOptions, McpOptions, McpTool, ResourceRouteOptions, ToolAnnotations, ToolContext, ToolDecision, ToolDefinition, ToolInfo, ToolRef, ToolResourceOptions, ToolResources, ToolResult };
+export type { BetterMcp, GuardOptions, McpOptions, McpTool, ProtocolServer, ResourceRouteOptions, ServerDescription, ToolAnnotations, ToolContext, ToolDecision, ToolDefinition, ToolInfo, ToolRef, ToolResourceOptions, ToolResources, ToolResult };