@protobase/server 0.58.0 → 0.58.2

package/dist/admin-options.d.ts

@@ -5,6 +5,7 @@ import { MapOptions } from "./maps/map-settings.js";
 import { PluginOption } from "./plugins/plugin-settings.js";
 import { SourceOption } from "./sources/source-settings.js";
 import { CorsOrigins } from "./api-cors.js";
+import { AssistantTool } from "./assistant/tools.js";
 import { AssistantOptions } from "./assistant/assistant-settings.js";
 import { LocaleOption } from "./locale/locale-option.js";
 import { McpWrites } from "./mcp/mcp-writes.js";
@@ -75,12 +76,16 @@ export type AdminOptions = {
    * `writes: { rolesWithoutApproval: ['service'] }` lets a user holding one of those roles, such as a service account
    * with no person present, write without the approval; any other user is still asked. Each must be a role the app's
    * users can hold.
+   * `tools`: the app's own tools, offered after the built-in ones whatever `writes` says, each run as the caller under
+   * their access rules. One that changes data asks through `approve`, which `rolesWithoutApproval` skips too; one that
+   * never calls it writes unasked. A name taken twice, or by a built-in tool, stops startup.
    * `false`: the host serves its own MCP endpoint at `auth.mcp.path`, in front of this app. This app then answers 404
    * there and needs no `forAudience`, while the OAuth provider's discovery stays.
    */
   mcp?: {
     sql?: boolean;
     writes?: McpWrites;
+    tools?: AssistantTool[];
   } | false;
   /**
    * The websites whose browser code may call the API (`/api/*` but `/api/auth/*`) besides the app's own origins (see

package/dist/assistant/tools.d.ts

@@ -21,7 +21,7 @@ export type ToolContext = {
   show: (part: AssistantPart) => void;
   /** Asks the user to approve with a card in that message (see `requestApproval`). */
   approve: (request: ApprovalRequest) => Promise<ApprovalAnswer>;
-  /** The app's resources as the session's user, through their access rules and write hooks (built-in assistant only). */
+  /** The app's resources as the session's user, through their access rules and write hooks. */
   records: ToolRecords;
   /** The resources the caller may read, each restricted to their fields, with their views. */
   resources: () => Promise<ReadableResources>;
@@ -38,7 +38,7 @@ export type ToolAnnotations = {
 };
 /**
  * A function the model may call during a turn. `parameters` is the JSON Schema of its arguments; `run` gets them
- * parsed, but not checked against the schema, and returns what the model reads as the result.
+ * parsed, checked against the schema over MCP but not in the dock, and returns what the model reads as the result.
  */
 export type AssistantTool = {
   name: string;

package/dist/create-admin.js

@@ -334,7 +334,8 @@ const createAdmin = ({ resources: appResources, views: appViews = [], pages = []
 			db,
 			sql: options.mcp !== false && options.mcp?.sql === true,
 			writes,
-			commented
+			commented,
+			own: options.mcp !== false && options.mcp?.tools || []
 		});
 		const approvals = mcpApprovals();
 		const { resource } = auth.mcp;

package/dist/mcp/mcp-authenticator.js

@@ -1,15 +1,15 @@
 import { isMcpWrites } from "./mcp-writes.js";
 //#region src/mcp/mcp-authenticator.ts
 const hasAudiences = (authenticate) => typeof authenticate.forAudience === "function";
-const isMcpOptions = (options) => options === void 0 || options === false || typeof options === "object" && options !== null && !Array.isArray(options) && Object.entries(options).every(([name, value]) => value === void 0 || name === "sql" && typeof value === "boolean" || name === "writes" && isMcpWrites(value));
+const isMcpOptions = (options) => options === void 0 || options === false || typeof options === "object" && options !== null && !Array.isArray(options) && Object.entries(options).every(([name, value]) => value === void 0 || name === "sql" && typeof value === "boolean" || name === "writes" && isMcpWrites(value) || name === "tools" && Array.isArray(value));
 /**
 * The authenticator of the MCP endpoint's tokens, when MCP is on (`auth.mcp`); none when the host serves its
 * own (`options.mcp: false`). Stops the server at startup when `options.mcp` is neither `false` nor
-* `{ sql?: boolean; writes?: boolean | { resources?: string[]; rolesWithoutApproval?: string[] } }`, when it is set without MCP, or when `authenticate` cannot verify tokens for
+* `{ sql?: boolean; writes?: boolean | { resources?: string[]; rolesWithoutApproval?: string[] }; tools?: AssistantTool[] }`, when it is set without MCP, or when `authenticate` cannot verify tokens for
 * another audience.
 */
 const mcpAuthenticator = (authenticate, mcp, options) => {
-	if (!isMcpOptions(options)) throw new Error("options.mcp takes false or { sql?: boolean, writes?: boolean | { resources?: [<resource>, ...], rolesWithoutApproval?: [<role>, ...] } }");
+	if (!isMcpOptions(options)) throw new Error("options.mcp takes false or { sql?: boolean, writes?: boolean | { resources?: [<resource>, ...], rolesWithoutApproval?: [<role>, ...] }, tools?: [<tool>, ...] }");
 	if (options === false) return void 0;
 	if (options && !mcp) throw new Error("mcpEndpoint needs auth.mcp in protobase.config.ts");
 	if (!mcp) return void 0;

package/dist/mcp/mcp-tools.d.ts

@@ -18,6 +18,14 @@ export type McpToolsInput = {
    * those of them that `writes` lists when it lists some. None by default.
    */
   commented?: string[];
+  /** The app's own tools, offered to every caller after the built-in ones. */
+  own?: AssistantTool[];
 };
-export declare const mcpTools: ({ db, sql, writes, commented }: McpToolsInput) => (session: Session) => AssistantTool[];
+/**
+ * The MCP tools for a caller: the record tools, the write tools when `writes` is on, the comment tools when a resource
+ * takes comments, read-only SQL when `sql` is on and the caller sees the assistant, then the app's own tools. The
+ * tools are built once and only chosen per session: the MCP server compiles each tool's schema, and a schema object made
+ * per request would be compiled again.
+ */
+export declare const mcpTools: ({ db, sql, writes, commented, own }: McpToolsInput) => (session: Session) => AssistantTool[];
 //#endregion

package/dist/mcp/mcp-tools.js

@@ -1,16 +1,33 @@
 import { seesAssistant } from "../assistant/assistant-settings.js";
+import { checkedTools } from "../assistant/checked-tools.js";
 import { readOnlyQueryTool } from "../assistant/query-tools.js";
 import { readRecordTools } from "../assistant/record-tools.js";
 import { writeRecordTools } from "../assistant/write-record-tools.js";
 import { batchWriteTool } from "../assistant/batch-write-tool.js";
 import { commentTools } from "../assistant/comment-tools.js";
 //#region src/mcp/mcp-tools.ts
+const writeTools = (input) => [...writeRecordTools(input), batchWriteTool(input)];
+const builtInNames = (db) => new Set([
+	...readRecordTools(),
+	...writeTools({}),
+	...commentTools({ commented: ["comments"] }, {}),
+	readOnlyQueryTool(db)
+].map((tool) => tool.name));
+/** The app's own tools; one whose name is taken twice, or by a built-in tool, stops the server at startup. */
+const checkedOwnTools = (db, own) => {
+	const builtIn = builtInNames(db);
+	const taken = own.find((tool) => builtIn.has(tool.name));
+	if (taken) throw new Error(`The MCP tool "${taken.name}" has the name of a built-in MCP tool; give it another name`);
+	return checkedTools(own);
+};
 /**
-* The default MCP tools for a caller: the record tools, the write tools when `writes` is on, the comment tools when a
-* resource takes comments, and read-only SQL when `sql` is on and the caller sees the assistant.
+* The MCP tools for a caller: the record tools, the write tools when `writes` is on, the comment tools when a resource
+* takes comments, read-only SQL when `sql` is on and the caller sees the assistant, then the app's own tools. The
+* tools are built once and only chosen per session: the MCP server compiles each tool's schema, and a schema object made
+* per request would be compiled again.
 */
-const writeTools = (input) => [...writeRecordTools(input), batchWriteTool(input)];
-const mcpTools = ({ db, sql, writes, commented = [] }) => {
+const mcpTools = ({ db, sql, writes, commented = [], own = [] }) => {
+	const ownTools = checkedOwnTools(db, own);
 	const read = readRecordTools();
 	const limits = writes === false ? false : writes === true || !writes.resources ? {} : { resources: writes.resources };
 	const write = limits === false ? [] : writeTools(limits);
@@ -20,7 +37,8 @@ const mcpTools = ({ db, sql, writes, commented = [] }) => {
 		...read,
 		...write,
 		...comments,
-		...seesAssistant(session.user.roles) ? query : []
+		...seesAssistant(session.user.roles) ? query : [],
+		...ownTools
 	];
 };
 //#endregion

package/dist/package.js

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "0.58.0";
+var version = "0.58.2";
 //#endregion
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/server",
-  "version": "0.58.0",
+  "version": "0.58.2",
   "description": "The Protobase REST API as a Hono app, with Better Auth sign-in.",
   "license": "Apache-2.0",
   "repository": {
@@ -41,9 +41,9 @@
     "@better-auth/passkey": "^1.7.12",
     "@better-auth/sso": "^1.7.12",
     "@modelcontextprotocol/server": "^2.3.1",
-    "@protobase/layout": "0.58.0",
-    "@protobase/query": "0.58.0",
-    "@protobase/schema": "0.58.0",
+    "@protobase/layout": "0.58.2",
+    "@protobase/query": "0.58.2",
+    "@protobase/schema": "0.58.2",
     "@react-email/render": "^2.1.0",
     "@scalar/hono-api-reference": "^0.12.10",
     "@sentry/core": "^11.7.0",