@fitzzero/quickdraw-core 5.1.2 → 5.1.3

package/dist/server/mcp/index.d.ts

@@ -1,15 +1,15 @@
-import { A as AnyService, d as Caller } from '../../caller-BT-Mv4bD.js';
+import { A as AnyService, d as Caller } from '../../caller-BTwGl7vm.js';
 import { IncomingHttpHeaders, IncomingMessage } from 'node:http';
-import { ap as MethodName, d as StandardSchemaV1, c as InferOutput } from '../../infer-BmoZsL9a.js';
+import { ap as MethodName, d as StandardSchemaV1, c as InferOutput } from '../../infer-Br62cnyW.js';
 import { Q as QuickdrawError, a as ErrorCode } from '../../errors-S-bxEIBC.js';
-import { P as PrincipalOfServices, C as ContractOfServices, D as Dispatcher, H as HttpRouter } from '../../http-DotQ5bj8.js';
-import { a as McpContext, b as McpContextOf, M as MaybePromise } from '../../types-CYliTP65.js';
+import { P as PrincipalOfServices, M as McpContextOfServices, C as ContractOfServices, D as Dispatcher, H as HttpRouter } from '../../http-YzLAar3w.js';
+import { M as MaybePromise, P as Principal } from '../../types-CLRCQGnO.js';
 import { L as Logger } from '../../logger-Yz93KzdV.js';
-import { A as AuthenticateResult } from '../../auth-DXiSJZaf.js';
+import { A as AuthenticateResult } from '../../auth-DtdYjrZ9.js';
 import { Readable, Writable } from 'node:stream';
 import { A as AllowedOrigin } from '../../origins-kvpxnVcW.js';
-import '../../envelope-DzWyIXjj.js';
-import '../../metrics-DW80Exve.js';
+import '../../envelope-BMBaxppV.js';
+import '../../metrics-CTVpw0gu.js';
 import 'socket.io';
 
 /** The JSON Schema of a tool's arguments. MCP requires an object schema. */
@@ -72,8 +72,7 @@ interface McpHttpRequest {
 }
 /** The session or request a tool call arrives on, as the registry's `principal` and `context` see it. */
 type McpRequest = McpStdioRequest | McpHttpRequest;
-/** The type of `ctx.mcp` for the services of `S`: their app's `QuickdrawTypes["mcp"]`. */
-type McpContextOfServices<S extends readonly AnyService[]> = [S[number]] extends [never] ? McpContext : McpContextOf<NonNullable<S[number]["~types"]>>;
+
 /** How a tool call ended: what the tool returned, or why it failed. */
 type McpCallResult = {
     readonly ok: true;
@@ -99,6 +98,18 @@ interface McpToolResult {
 interface McpCallOptions {
     /** The session or request the call arrived on. */
     readonly request: McpRequest;
+    /**
+     * Who the call acts for, when the app signed the caller in itself (its own
+     * MCP transport over `callMethod`, an in-process assistant): the
+     * registry's `principal` hook is not asked. `null` calls anonymously, and
+     * so does `undefined`: the hook is asked only when the key is absent. The
+     * `context` hook, bound arguments and the call's concurrency lane see this
+     * principal. One that carries no `serviceAccess` gets the grants the
+     * server's `auth.loadServiceAccess` loads, at each call, as `qd.caller`
+     * gives them; one that carries grants (`{}` included) keeps them. An
+     * in-process option: the HTTP routes never read it from a request.
+     */
+    readonly principal?: Principal | null;
     /** Cancels the call. Only queries stop early; a mutation runs to its end. */
     readonly signal?: AbortSignal;
     /**
@@ -125,8 +136,9 @@ interface McpToolCall<S extends readonly AnyService[] = readonly AnyService[], A
      */
     readonly arguments: Args;
     /**
-     * Who the call acts for, from the registry's `principal`. `null` only for
-     * an anonymous caller of a tool with `access: "public"`.
+     * Who the call acts for, from the registry's `principal` hook or the
+     * call's own `principal` option. `null` only for an anonymous caller of a
+     * tool with `access: "public"`.
      */
     readonly principal: PrincipalOfServices<S> | null;
     /** The fields the registry's `context` produced for the call, if any. */
@@ -239,7 +251,9 @@ interface McpRegistryOptions<S extends readonly AnyService[], Tools extends read
      * Without it every call is anonymous. An HTTP request's queries share the
      * lane of its bearer token: a hook that authenticates by anything else (a
      * cookie, an API key header) must refuse a request whose bearer token it
-     * does not verify, or a caller makes a lane per made-up token.
+     * does not verify, or a caller makes a lane per made-up token. A call
+     * whose options give `principal` (an app that signed the caller in
+     * itself) is not asked about.
      */
     readonly principal?: (request: McpRequest) => MaybePromise<AuthenticateResult<PrincipalOfServices<S>>>;
     /**
@@ -289,16 +303,18 @@ interface McpRegistry {
     has(name: string): boolean;
     /**
      * Calls the tool `name` with the client's `args` in the session of
-     * `options.request`. Resolves with the tool's value or its failure (an
-     * unknown name is `NOT_FOUND`), after `options.respond` was given it.
-     * Never rejects.
+     * `options.request`, as `options.principal` when it is given. Resolves
+     * with the tool's value or its failure (an unknown name is `NOT_FOUND`),
+     * after `options.respond` was given it. Never rejects.
      */
     call(name: string, args: unknown, options: McpCallOptions): Promise<McpCallResult>;
     /**
      * Calls a method's tool by its service and method name with the method's
      * `input` as it is, without the tool's argument mapping: the shape 4.1's
-     * HTTP route took. Bound arguments are filled as for `call`. A method that
-     * is not a tool is `NOT_FOUND`.
+     * HTTP route took. Bound arguments are filled as for `call`, and
+     * `options.principal` says who calls as for `call`: an app's own MCP
+     * transport over it passes the caller it signed in. A method that is not
+     * a tool is `NOT_FOUND`.
      */
     callMethod(service: string, method: string, input: unknown, options: McpCallOptions): Promise<McpCallResult>;
 }
@@ -452,4 +468,4 @@ type McpHttpReply = {
  */
 declare function createMcpHttpRouter(options: McpHttpRouterOptions): HttpRouter;
 
-export { type DescribeToolsOptions, MCP_PROTOCOL_VERSION, type McpBindCall, type McpBinder, type McpCallOptions, type McpCallResult, type McpContextOfServices, type McpCustomTool, type McpHttpReply, type McpHttpRequest, type McpHttpRouterOptions, type McpInputSchema, type McpMethodRef, type McpRegistry, type McpRegistryOptions, type McpRequest, type McpStdioRequest, type McpStdioServer, type McpStdioServerOptions, type McpTextContent, type McpTool, type McpToolAccess, type McpToolAnnotations, type McpToolArguments, type McpToolCall, type McpToolInputSchema, type McpToolResult, bootstrapMcpServer, createMcpHttpRouter, createMcpRegistry, createMcpStdioServer, describeTools, toToolResult };
+export { type DescribeToolsOptions, MCP_PROTOCOL_VERSION, type McpBindCall, type McpBinder, type McpCallOptions, type McpCallResult, McpContextOfServices, type McpCustomTool, type McpHttpReply, type McpHttpRequest, type McpHttpRouterOptions, type McpInputSchema, type McpMethodRef, type McpRegistry, type McpRegistryOptions, type McpRequest, type McpStdioRequest, type McpStdioServer, type McpStdioServerOptions, type McpTextContent, type McpTool, type McpToolAccess, type McpToolAnnotations, type McpToolArguments, type McpToolCall, type McpToolInputSchema, type McpToolResult, bootstrapMcpServer, createMcpHttpRouter, createMcpRegistry, createMcpStdioServer, describeTools, toToolResult };

package/dist/server/mcp/index.js

@@ -3,6 +3,7 @@ import {
 } from "../../chunk-XNLWBZIG.js";
 import {
   NEVER_ABORTED,
+  callerGrantsOf,
   checkKind,
   inputKeys,
   lazyMembers,
@@ -11,38 +12,42 @@ import {
   pointerToken,
   referenced,
   runtimeOf,
-  toQuickdrawError
-} from "../../chunk-MBH6IDSM.js";
+  toQuickdrawError,
+  withCallerGrants
+} from "../../chunk-OCZJ4EYV.js";
 import {
   describeError
-} from "../../chunk-LCC7HNFP.js";
+} from "../../chunk-RZXJTDH5.js";
 import {
   originAllowlist
 } from "../../chunk-NO4M6PO5.js";
 import {
   isForbiddenCredential,
   isJsonRequest,
+  isPrincipal,
   isRefusal,
   readJsonInput,
   toPrincipal,
   unreadable
-} from "../../chunk-RJ5I2VO3.js";
+} from "../../chunk-PHCURHC7.js";
 import "../../chunk-DUBU3BB3.js";
 import "../../chunk-AK23XSWD.js";
+import {
+  consoleLogger
+} from "../../chunk-DKE6QO26.js";
 import {
   hasJsonSchema,
   isStandardSchema
 } from "../../chunk-47AEXVDM.js";
-import "../../chunk-Z2LZ7IZ7.js";
-import {
-  consoleLogger
-} from "../../chunk-DKE6QO26.js";
+import "../../chunk-SN3OZVEQ.js";
+import "../../chunk-7Y5ROPXL.js";
 import {
   INTERNAL_MESSAGE,
   QuickdrawError,
   httpStatus,
   toWire
-} from "../../chunk-4YO5H5ON.js";
+} from "../../chunk-Q4OGQM5I.js";
+import "../../chunk-QSU47XEX.js";
 
 // src/server/mcp/tools.ts
 var JSON_SCHEMA_TARGET = "draft-07";
@@ -347,8 +352,20 @@ async function contextOf(settings, request, principal) {
   }
   return fields;
 }
-async function openSession(settings, request) {
-  const principal = await principalOf(settings, request);
+function givenPrincipal(principal) {
+  if (principal === null || principal === void 0) {
+    return null;
+  }
+  if (!isPrincipal(principal)) {
+    throw new TypeError(
+      "An MCP call's principal must be a principal with a non-empty string userId, or null"
+    );
+  }
+  return principal;
+}
+async function openSession(settings, options) {
+  const { request } = options;
+  const principal = Object.hasOwn(options, "principal") ? await withCallerGrants(givenPrincipal(options.principal), callerGrantsOf(settings.dispatcher)) : await principalOf(settings, request);
   const mcp = await contextOf(settings, request, principal);
   return { principal, mcp, connectionId: laneOf(request, principal) };
 }
@@ -617,7 +634,7 @@ function resolveRegistry(options) {
 async function inSession(settings, name, options, run) {
   let session;
   try {
-    session = await openSession(settings, options.request);
+    session = await openSession(settings, options);
   } catch (error) {
     return settle(settings, options, failure(settings, error, name));
   }