skybridge 0.0.0-dev.81ea105 → 0.0.0-dev.81fd90a

package/dist/server/server.js

@@ -2,16 +2,16 @@ import crypto from "node:crypto";
 import { readFileSync } from "node:fs";
 import http from "node:http";
 import path from "node:path";
-import { Server as SdkServer, } from "@modelcontextprotocol/sdk/server/index.js";
-import { McpServer as McpServerBase } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpServer as McpServerBase, } from "@modelcontextprotocol/server";
 import { mergeWith, union } from "es-toolkit";
 import express, {} from "express";
+import { warnOnLargeToolOutput } from "../context-warnings.js";
 import { authToSecuritySchemes, evaluateSecuritySchemes, inBandChallengeResult, } from "./auth/security-schemes.js";
 import { setupOAuth } from "./auth/setup.js";
 import { createApp } from "./express.js";
 import { hostFromUserAgent } from "./host.js";
 import { createMiddlewareEntry } from "./metric.js";
-import { buildMiddlewareChain, getHandlerMaps } from "./middleware.js";
+import { buildMiddlewareChain, captureToolError, getHandlerMaps, } from "./middleware.js";
 import { resolveServerOrigin } from "./requestOrigin.js";
 import { discoverSkills, registerSkills, SKILLS_EXTENSION_KEY, } from "./skills.js";
 import { templateHelper } from "./templateHelper.js";
@@ -130,26 +130,6 @@ function withSkillsCapability(options, skybridgeOptions) {
         },
     };
 }
-// Collapses registerTool's two overloads into a single { config, cb } shape.
-//   registerTool("greet", { description }, handler)
-//     -> { config: { name: "greet", description }, cb: handler }
-//   registerTool({ name: "greet", description }, handler)
-//     -> { config: { name: "greet", description }, cb: handler }
-function normalizeRegisterToolArgs(args) {
-    if (typeof args[0] === "string") {
-        return {
-            config: {
-                name: args[0],
-                ...args[1],
-            },
-            cb: args[2],
-        };
-    }
-    return {
-        config: args[0],
-        cb: args[1],
-    };
-}
 export class McpServer extends McpServerBaseOmitted {
     /**
      * The underlying Express app. Use this to extend the HTTP server with
@@ -169,6 +149,8 @@ export class McpServer extends McpServerBaseOmitted {
     customErrorMiddleware = [];
     mcpMiddlewareEntries = [];
     mcpMiddlewareApplied = false;
+    middlewareEntriesCache = null;
+    registrations = [];
     claimedViews = new Map();
     viewMetaBuilders = new Map();
     /**
@@ -206,6 +188,43 @@ export class McpServer extends McpServerBaseOmitted {
         }
         this.setupSkills(Boolean(skybridgeOptions?.skills));
     }
+    registerResource(...args) {
+        return this.recordInherited("registerResource", args);
+    }
+    /**
+     * Register a prompt, recorded so every per-request instance carries it.
+     * Signature owned by Skybridge (not inherited) so a typed wrapper can land
+     * in a minor without a type-level break.
+     */
+    registerPrompt(name, config, cb) {
+        return this.recordInherited("registerPrompt", [
+            name,
+            config,
+            cb,
+        ]);
+    }
+    recordInherited(method, args) {
+        const base = McpServerBase.prototype[method];
+        let registered;
+        this.record((target) => {
+            const result = base.apply(target, args);
+            if (target === this) {
+                registered = result;
+            }
+        });
+        return registered;
+    }
+    skillRegistrar() {
+        const registerResource = this.registerResource.bind(this);
+        return {
+            registerResource,
+            server: {
+                setRequestHandler: ((...args) => {
+                    this.recordRequestHandler(...args);
+                }),
+            },
+        };
+    }
     setupSkills(enabled) {
         const manifest = pendingSkillsManifest;
         pendingSkillsManifest = null;
@@ -216,7 +235,7 @@ export class McpServer extends McpServerBaseOmitted {
         if (skills.length === 0) {
             console.warn(`skybridge: the "skills" option is enabled but no skills were found in "${SKILLS_DIR}". Add a <name>/SKILL.md there, or remove the option.`);
         }
-        registerSkills(this, skills);
+        registerSkills(this.skillRegistrar(), skills);
     }
     use(pathOrHandler, ...handlers) {
         // Branching is load-bearing: Express's `app.use` overloads can't be
@@ -352,7 +371,12 @@ export class McpServer extends McpServerBaseOmitted {
             toolsListSecuritySchemesEntry,
             ...this.mcpMiddlewareEntries,
         ];
-        const { requestHandlers, notificationHandlers } = getHandlerMaps(this.server);
+        this.middlewareEntriesCache = entries;
+        this.instrumentHandlers(this.server);
+    }
+    instrumentHandlers(server) {
+        const entries = this.middlewareEntriesCache ?? [];
+        const { requestHandlers, notificationHandlers } = getHandlerMaps(server);
         const instrumentMap = (map, isNotification) => {
             for (const [method, handler] of map) {
                 map.set(method, buildMiddlewareChain(method, isNotification, handler, entries));
@@ -376,23 +400,36 @@ export class McpServer extends McpServerBaseOmitted {
         return McpServerBase.prototype.connect.call(this, transport);
     }
     /**
-     * Per-request stateless connect. The SDK's `Protocol` only allows one
-     * transport per instance, so we can't reuse this `McpServer` across
-     * concurrent requests. The SDK's idiomatic fix is a `() => McpServer`
-     * factory, but that would break Skybridge's singleton API — so instead
-     * we build a fresh underlying `Server` per request and share the main
-     * server's handler maps by reference. The cast is unavoidable: there's
-     * no public API to inject handler maps. `getHandlerMaps` validates the
-     * read side and fails fast on SDK field renames.
+     * Build a fresh server for one stateless HTTP request, as
+     * `createMcpHandler`'s factory contract requires: every registration is
+     * replayed onto the new instance so the SDK's handler closures belong to
+     * the instance whose protocol era it stamps. Sharing the singleton's
+     * handler maps instead would bind them to an instance that is never
+     * marked, pinning every request to the 2025 codec and letting concurrent
+     * callers overwrite each other's negotiated version.
      */
-    async connectStatelessTransport(transport) {
+    createStatelessServerInstance() {
         this.applyMcpMiddleware();
-        const { requestHandlers, notificationHandlers } = getHandlerMaps(this.server);
-        const fresh = new SdkServer(this.serverInfo, this.serverOptions);
-        const target = fresh;
-        target._requestHandlers = requestHandlers;
-        target._notificationHandlers = notificationHandlers;
-        await fresh.connect(transport);
+        const fresh = new McpServerBase(this.serverInfo, this.serverOptions);
+        for (const apply of this.registrations) {
+            apply(fresh);
+        }
+        this.instrumentHandlers(fresh.server);
+        return fresh.server;
+    }
+    /**
+     * Apply an SDK registration to the singleton and remember it, so each
+     * per-request instance can be built with the same surface.
+     */
+    record(apply) {
+        this.registrations.push(apply);
+        apply(this);
+    }
+    /** Records a raw request handler (used for methods the SDK has no sugar for). */
+    recordRequestHandler(...args) {
+        this.record((target) => {
+            target.server.setRequestHandler(...args);
+        });
     }
     /**
      * Start the HTTP server. Listens on `process.env.__PORT` (default `3000`),
@@ -467,13 +504,9 @@ export class McpServer extends McpServerBaseOmitted {
         }
         this.claimedViews.set(component, toolName);
     }
-    resolveViewRequestContext(extra) {
+    resolveViewRequestContext(ctx) {
         const isProduction = process.env.NODE_ENV === "production";
-        const headers = extra?.requestInfo?.headers || {};
-        const header = (key) => {
-            const val = headers[key];
-            return Array.isArray(val) ? val[0] : val;
-        };
+        const header = (key) => ctx?.http?.req?.headers.get(key) ?? undefined;
         const isClaude = hostFromUserAgent(header("user-agent")) === "claude";
         const serverUrl = resolveServerOrigin(header);
         // Path prefix the proxy routed this request under (e.g. `foo.com/v1`). Read
@@ -489,7 +522,7 @@ export class McpServer extends McpServerBaseOmitted {
         }
         let contentMetaOverrides = {};
         if (isClaude) {
-            const pathname = extra?.requestInfo?.url?.pathname ?? "";
+            const pathname = ctx?.http?.req ? new URL(ctx.http.req.url).pathname : "";
             const rawUrl = header("x-alpic-forwarded-url") ?? `${serverUrl}${pathname}`;
             // Strip a lone trailing slash so the hash matches the connector URL
             // as registered with Claude (which has no trailing slash on bare origins).
@@ -618,20 +651,24 @@ export class McpServer extends McpServerBaseOmitted {
         this.viewUriByPath.set(`ui://widgets/apps-sdk/${component}.html`, canonicalUri);
         this.viewUriByPath.set(`ui://widgets/ext-apps/${component}.html`, canonicalUri);
     }
-    decorateToolHandler(cb, { attachViewUUID, securitySchemes, }) {
+    decorateToolHandler(cb, { attachViewUUID, securitySchemes, toolName, }) {
         return async (args, extra) => {
             if (this.oauthEnabled) {
-                const failure = evaluateSecuritySchemes(securitySchemes, extra.authInfo);
+                const failure = evaluateSecuritySchemes(securitySchemes, extra.http?.authInfo);
                 if (failure) {
-                    const headers = extra?.requestInfo?.headers ?? {};
-                    const header = (key) => {
-                        const value = headers[key];
-                        return Array.isArray(value) ? value[0] : value;
-                    };
+                    const header = (key) => extra.http?.req?.headers.get(key) ?? undefined;
                     return inBandChallengeResult(failure, this.resolveResourceMetadataUrl?.(header));
                 }
             }
-            const result = await cb(args, extra);
+            let result;
+            try {
+                result = await cb(args, extra);
+            }
+            catch (error) {
+                captureToolError(extra, error);
+                throw error;
+            }
+            warnOnLargeToolOutput(result, toolName);
             return {
                 ...result,
                 content: normalizeContent(result.content),
@@ -693,9 +730,10 @@ export class McpServer extends McpServerBaseOmitted {
         }
         return JSON.parse(readFileSync(path.join(process.cwd(), "dist", "assets", ".vite", "manifest.json"), "utf-8"));
     }
-    registerTool(...args) {
+    registerTool(rawConfig, rawCb) {
         const baseFn = McpServerBase.prototype.registerTool;
-        const { config, cb } = normalizeRegisterToolArgs(args);
+        const config = rawConfig;
+        const cb = rawCb;
         const { name, view, auth, securitySchemes: rawSecuritySchemes, _meta: userToolMeta, ...toolFields } = config;
         const authNeedsProvider = auth !== undefined &&
             (!auth.allowsAnonymous || Boolean(auth.scopes?.length));
@@ -723,8 +761,13 @@ export class McpServer extends McpServerBaseOmitted {
         const wrappedCb = this.decorateToolHandler(cb, {
             attachViewUUID: Boolean(view),
             securitySchemes,
+            toolName: name,
+        });
+        this.record((target) => {
+            baseFn.call(target, name, { ...toolFields, _meta: toolMeta }, toolFields.inputSchema === undefined
+                ? (extra) => wrappedCb({}, extra)
+                : wrappedCb);
         });
-        baseFn.call(this, name, { ...toolFields, _meta: toolMeta }, wrappedCb);
         return this;
     }
 }