skybridge 0.0.0-dev.bc9c12c → 0.0.0-dev.bcb73da

package/dist/server/server.js

@@ -1,25 +1,15 @@
 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 { mergeWith, union } from "es-toolkit";
-import express, {} from "express";
-import { setupOAuth } from "./auth/setup.js";
-import { createApp } from "./express.js";
-import { createMiddlewareEntry } from "./metric.js";
-import { buildMiddlewareChain, getHandlerMaps } from "./middleware.js";
+import { McpServer as McpServerBase, } from "@modelcontextprotocol/server";
+import { warnOnLargeToolOutput } from "../context-warnings.js";
+import { authToSecuritySchemes, evaluateSecuritySchemes, inBandChallengeResult, } from "./auth/security-schemes.js";
+import { hostFromUserAgent } from "./host.js";
+import { captureToolError } from "./middleware.js";
 import { resolveServerOrigin } from "./requestOrigin.js";
 import { discoverSkills, registerSkills, SKILLS_EXTENSION_KEY, } from "./skills.js";
 import { templateHelper } from "./templateHelper.js";
-const mergeWithUnion = (target, source) => {
-    return mergeWith(target, source, (targetVal, sourceVal) => {
-        if (Array.isArray(targetVal) && Array.isArray(sourceVal)) {
-            return union(targetVal, sourceVal);
-        }
-    });
-};
+const unionOf = (base, extra) => extra ? [...new Set([...base, ...extra])] : base;
 const SKILLS_DIR = "src/skills";
 /**
  * Normalize an `x-forwarded-prefix` value into a leading-slash, no-trailing-slash
@@ -62,35 +52,6 @@ export function normalizeContent(content) {
     return [content];
 }
 const McpServerBaseOmitted = McpServerBase;
-/**
- * The Skybridge server. Extends the MCP SDK's `McpServer` with a typed tool
- * registry, view resources, an embedded Express app, and protocol-level
- * middleware. Construct it with the same `Implementation` info you would pass
- * to the SDK, chain {@link McpServer.registerTool} calls to declare tools,
- * then call {@link McpServer.run} to start the HTTP server.
- *
- * The `TTools` generic accumulates each registered tool's input/output/meta
- * shape, so `typeof server` carries enough information for view-side helpers
- * like {@link generateHelpers} to produce fully-typed hooks.
- *
- * @typeParam TTools - Accumulated tool registry. Filled in by `registerTool`
- * chaining; you almost never set this manually.
- *
- * @example
- * ```ts
- * const server = new McpServer({ name: "my-app", version: "1.0.0" }, {})
- *   .registerTool({
- *     name: "search",
- *     inputSchema: { query: z.string() },
- *     view: { component: "search" },
- *   }, async ({ query }) => ({ content: `Results for ${query}` }));
- *
- * await server.run();
- * export type AppType = typeof server;
- * ```
- *
- * @see https://docs.skybridge.tech/api-reference/mcp-server
- */
 // Side channel populated by `dist/__entry.js` before user code is imported.
 // Set at module scope rather than passed through the constructor because the
 // wrapper has the manifest before the user's `new McpServer(...)` runs, and
@@ -108,8 +69,12 @@ export function __setBuildManifest(manifest) {
     pendingBuildManifest = manifest;
 }
 let pendingSkillsManifest = null;
+let cachedDiskManifest = null;
+let discoveredSkills = null;
+let warnedOnMissingSkills = false;
 export function __setSkillsManifest(manifest) {
     pendingSkillsManifest = manifest;
+    discoveredSkills = null;
 }
 // Pure and `this`-free so it can run inside the `super(...)` call, before `this`
 // exists — the capability must be present for the `initialize` response.
@@ -128,25 +93,37 @@ function withSkillsCapability(options, skybridgeOptions) {
         },
     };
 }
+/**
+ * Typed registration sugar over the MCP SDK's `McpServer`: a tool registry
+ * that carries input/output/meta shapes, view resources, per-tool security
+ * schemes, and prompt/resource registration. A {@link Skybridge} app builds
+ * one of these per request and hands it to your `handler`; chain
+ * {@link McpServer.registerTool} calls on it and return the result.
+ *
+ * The `TTools` generic accumulates each registered tool's input/output/meta
+ * shape, so `typeof app` carries enough information for view-side helpers
+ * like {@link generateHelpers} to produce fully-typed hooks.
+ *
+ * @typeParam TTools - Accumulated tool registry. Filled in by `registerTool`
+ * chaining; you almost never set this manually.
+ *
+ * @example
+ * ```ts
+ * export const app = new Skybridge({
+ *   name: "my-app",
+ *   version: "1.0.0",
+ *   handler: (server) =>
+ *     server.registerTool({
+ *       name: "search",
+ *       inputSchema: { query: z.string() },
+ *       view: { component: "search" },
+ *     }, async ({ query }) => ({ content: `Results for ${query}` })),
+ * });
+ * ```
+ *
+ * @see https://docs.skybridge.tech/api-reference/mcp-server
+ */
 export class McpServer extends McpServerBaseOmitted {
-    /**
-     * The underlying Express app. Use this to extend the HTTP server with
-     * custom routes, middleware, or settings — e.g.
-     * `server.express.get("/health", ...)`.
-     *
-     * `express.json()` is pre-applied — tune it via the constructor's third
-     * argument, e.g. `new McpServer(info, {}, { json: { limit: "10mb" } })`.
-     * Register your handlers before `run()`;
-     * after `run()`, dev-mode middleware, the `/mcp` route, and the default
-     * error handler are appended in that order.
-     *
-     * Note: Alpic Cloud only routes traffic to `/mcp` — custom routes work
-     * locally and on self-hosted deployments.
-     */
-    express;
-    customErrorMiddleware = [];
-    mcpMiddlewareEntries = [];
-    mcpMiddlewareApplied = false;
     claimedViews = new Map();
     viewMetaBuilders = new Map();
     /**
@@ -157,78 +134,64 @@ export class McpServer extends McpServerBaseOmitted {
      */
     viewUriByPath = new Map();
     viteManifest = null;
-    serverInfo;
-    serverOptions;
+    oauthEnabled = false;
+    resolveResourceMetadataUrl;
+    toolSecuritySchemes = new Map();
+    userMiddlewareEntries = [];
     constructor(serverInfo, options, skybridgeOptions) {
-        const mergedOptions = withSkillsCapability(options, skybridgeOptions);
-        super(serverInfo, mergedOptions);
-        this.serverInfo = serverInfo;
-        this.serverOptions = mergedOptions;
-        this.express = express();
-        this.express.use(express.json(skybridgeOptions?.json));
-        if (skybridgeOptions?.oauth) {
-            setupOAuth(this.express, skybridgeOptions.oauth);
-        }
+        super(serverInfo, withSkillsCapability(options, skybridgeOptions));
+        this.oauthEnabled = Boolean(skybridgeOptions?.oauth);
         // Pick up the manifest if `dist/__entry.js` primed it before importing
-        // user code. Consume-once: clear after the first construction so a
-        // subsequent test that doesn't prime can't inherit stale state.
-        // Explicit `setViteManifest` calls still win because they happen after
-        // construction.
+        // user code. Explicit `setViteManifest` calls still win because they
+        // happen after construction.
         if (pendingBuildManifest) {
             this.setViteManifest(pendingBuildManifest);
-            pendingBuildManifest = null;
         }
         this.setupSkills(Boolean(skybridgeOptions?.skills));
     }
+    /**
+     * The per-tool security schemes collected during registration, keyed by tool
+     * name. Read by the OAuth layer to decide whether anonymous requests are
+     * allowed and which schemes gate a given `tools/call`.
+     *
+     * @internal
+     */
+    get securitySchemesByTool() {
+        return this.toolSecuritySchemes;
+    }
+    /**
+     * Inject the resolver the app uses to build the protected-resource metadata
+     * URL, so tool handlers can emit in-band auth challenges.
+     *
+     * @internal
+     */
+    setResourceMetadataUrlResolver(resolve) {
+        this.resolveResourceMetadataUrl = resolve;
+        return this;
+    }
     setupSkills(enabled) {
-        const manifest = pendingSkillsManifest;
-        pendingSkillsManifest = null;
         if (!enabled) {
             return;
         }
-        const skills = manifest ?? discoverSkills(SKILLS_DIR);
-        if (skills.length === 0) {
+        discoveredSkills ??= pendingSkillsManifest ?? discoverSkills(SKILLS_DIR);
+        if (discoveredSkills.length === 0 && !warnedOnMissingSkills) {
+            warnedOnMissingSkills = true;
             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);
-    }
-    use(pathOrHandler, ...handlers) {
-        // Branching is load-bearing: Express's `app.use` overloads can't be
-        // resolved against a `string | RequestHandler` union, so we narrow.
-        if (typeof pathOrHandler === "string") {
-            this.express.use(pathOrHandler, ...handlers);
-        }
-        else {
-            this.express.use(pathOrHandler, ...handlers);
-        }
-        return this;
-    }
-    useOnError(pathOrHandler, ...handlers) {
-        if (typeof pathOrHandler === "string") {
-            this.customErrorMiddleware.push({ path: pathOrHandler, handlers });
-        }
-        else {
-            this.customErrorMiddleware.push({
-                handlers: [pathOrHandler, ...handlers],
-            });
-        }
-        return this;
+        registerSkills(this, discoveredSkills);
     }
     mcpMiddleware(filterOrHandler, 
     // biome-ignore lint/suspicious/noExplicitAny: overloads narrow the handler type at call sites; implementation must accept all variants
     maybeHandler) {
-        if (this.mcpMiddlewareApplied) {
-            throw new Error("Cannot register MCP middleware after run() or connect() has been called");
-        }
         const handler = maybeHandler;
         if (typeof filterOrHandler === "function") {
-            this.mcpMiddlewareEntries.push({
+            this.userMiddlewareEntries.push({
                 filter: null,
                 handler: filterOrHandler,
             });
         }
         else if (handler) {
-            this.mcpMiddlewareEntries.push({
+            this.userMiddlewareEntries.push({
                 filter: filterOrHandler,
                 handler,
             });
@@ -238,11 +201,15 @@ export class McpServer extends McpServerBaseOmitted {
         }
         return this;
     }
-    applyMcpMiddleware() {
-        if (this.mcpMiddlewareApplied) {
-            return;
-        }
-        this.mcpMiddlewareApplied = true;
+    /**
+     * This instance's protocol-level middleware: the framework's own entries
+     * (view `_meta` on `resources/list`, version-agnostic view resolution on
+     * `resources/read`, the top-level `securitySchemes` mirror on `tools/list`)
+     * followed by the ones registered via {@link McpServer.mcpMiddleware}.
+     *
+     * @internal
+     */
+    protocolMiddlewareEntries() {
         // Surface view-resource _meta on `resources/list` (per ext-apps spec:
         // hosts/checkers read CSP & domain at list time before fetching content).
         const viewListMetaEntry = {
@@ -299,123 +266,31 @@ export class McpServer extends McpServerBaseOmitted {
                 }
             },
         };
-        const monitoringEntry = createMiddlewareEntry();
-        const entries = [
-            ...(monitoringEntry ? [monitoringEntry] : []),
+        // ChatGPT reads `securitySchemes` at the tool descriptor top level (SEP-1488,
+        // still Draft), but the SDK's registerTool strips unknown top-level fields, so
+        // it's stashed in `_meta` at registration. This restores it to the top level
+        // on tools/list output. Remove once SEP-1488 lands and the SDK preserves it.
+        //   { name: "checkout", _meta: { securitySchemes: [{ type: "oauth2" }] } }
+        //     -> { name: "checkout", _meta: {…}, securitySchemes: [{ type: "oauth2" }] }
+        const toolsListSecuritySchemesEntry = {
+            filter: "tools/list",
+            handler: async (_req, _extra, next) => {
+                const result = (await next());
+                for (const tool of result.tools) {
+                    const schemes = tool._meta?.securitySchemes;
+                    if (schemes && !("securitySchemes" in tool)) {
+                        tool.securitySchemes = schemes;
+                    }
+                }
+                return result;
+            },
+        };
+        return [
             viewListMetaEntry,
             viewReadResolveEntry,
-            ...this.mcpMiddlewareEntries,
+            toolsListSecuritySchemesEntry,
+            ...this.userMiddlewareEntries,
         ];
-        if (entries.length === 0) {
-            return;
-        }
-        const { requestHandlers, notificationHandlers } = getHandlerMaps(this.server);
-        const instrumentMap = (map, isNotification) => {
-            for (const [method, handler] of map) {
-                map.set(method, buildMiddlewareChain(method, isNotification, handler, entries));
-            }
-            const originalSet = map.set.bind(map);
-            map.set = (method, handler) => originalSet(method, buildMiddlewareChain(method, isNotification, handler, entries));
-        };
-        instrumentMap(requestHandlers, false);
-        instrumentMap(notificationHandlers, true);
-    }
-    /**
-     * Connect to an MCP transport (override of the SDK's `connect`). Use this
-     * when you're embedding Skybridge in a host that already manages its own
-     * transport (e.g. stdio for desktop apps); for HTTP, prefer {@link McpServer.run}
-     * which sets the transport up for you. Locks in any middleware registered
-     * via {@link McpServer.mcpMiddleware} — further calls to that method will
-     * throw afterwards.
-     */
-    async connect(transport) {
-        this.applyMcpMiddleware();
-        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.
-     */
-    async connectStatelessTransport(transport) {
-        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);
-    }
-    /**
-     * Start the HTTP server. Listens on `process.env.__PORT` (default `3000`),
-     * mounts the `/mcp` route, applies any custom Express middleware registered
-     * via {@link McpServer.use} / {@link McpServer.useOnError}, and locks in
-     * any MCP middleware registered via {@link McpServer.mcpMiddleware}.
-     *
-     * On Cloudflare Workers / workerd, returns an object exposing `fetch` so
-     * the runtime can bridge incoming requests to the Node HTTP server. On
-     * Vercel (`VERCEL === "1"`), returns the Express app directly so the
-     * serverless function entry can call it as a `(req, res)` handler. On
-     * Node, returns `undefined` once listening.
-     */
-    async run() {
-        this.applyMcpMiddleware();
-        if (process.env.VERCEL === "1") {
-            // createApp only reads httpServer inside its dev-only branch
-            // (viewsDevServer); under VERCEL=1 + NODE_ENV=production it's a
-            // bare object passed to satisfy the required parameter.
-            const httpServer = http.createServer();
-            await createApp({
-                mcpServer: this,
-                httpServer,
-                errorMiddleware: this.customErrorMiddleware,
-            });
-            return this.express;
-        }
-        const httpServer = http.createServer();
-        await createApp({
-            mcpServer: this,
-            httpServer,
-            errorMiddleware: this.customErrorMiddleware,
-        });
-        httpServer.on("request", this.express);
-        const port = parseInt(process.env.__PORT ?? "3000", 10);
-        await new Promise((resolve, reject) => {
-            httpServer.on("error", (error) => {
-                console.error("Failed to start server:", error);
-                reject(error);
-            });
-            httpServer.listen(port, () => {
-                resolve();
-            });
-        });
-        // On workerd, bridge the Node http server to a Workers fetch handler.
-        // The specifier is held in a variable to sidestep tsc's module resolution
-        // (`cloudflare:node` only exists under wrangler/workerd).
-        if (typeof navigator !== "undefined" &&
-            navigator.userAgent === "Cloudflare-Workers") {
-            const cloudflareNode = "cloudflare:node";
-            const { httpServerHandler } = await import(cloudflareNode);
-            return httpServerHandler({ port });
-        }
-        const shutdown = () => {
-            // Drop both handlers so a second signal falls through to Node's default
-            // (force-quit on a second Ctrl+C while drain is hanging).
-            process.off("SIGTERM", shutdown);
-            process.off("SIGINT", shutdown);
-            httpServer.close(() => process.exit(0));
-            // Force exit if connections don't drain in time so the port is still
-            // released promptly (e.g. for nodemon restarts).
-            setTimeout(() => process.exit(0), 3000).unref();
-        };
-        process.on("SIGTERM", shutdown);
-        process.on("SIGINT", shutdown);
-        return undefined;
     }
     enforceOneToolPerView(component, toolName) {
         const existingTool = this.claimedViews.get(component);
@@ -424,14 +299,10 @@ 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 isClaude = header("user-agent") === "Claude-User";
+        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
         // per-request so one process can serve many hosts/prefixes at once: the
@@ -446,7 +317,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).
@@ -466,46 +337,26 @@ export class McpServer extends McpServerBaseOmitted {
         // `tools/list` calls when the bundle hasn't changed.
         const versionParam = this.computeViewVersionParam(view.component);
         const viewResource = {
-            hostType: "mcp-app",
             uri: `ui://views/ext-apps/${view.component}.html${versionParam}`,
             mimeType: "text/html;profile=mcp-app",
             buildContentMeta: ({ resourceDomains, connectDomains, domain, baseUriDomains }, overrides) => {
-                const defaults = {
-                    ui: {
-                        csp: {
-                            resourceDomains,
-                            connectDomains,
-                            baseUriDomains,
-                        },
-                        domain,
-                    },
-                };
-                const fromView = {
+                const ui = {
                     ui: {
                         ...(view.description && { description: view.description }),
                         ...(view.prefersBorder !== undefined && {
                             prefersBorder: view.prefersBorder,
                         }),
-                        ...(view.domain && { domain: view.domain }),
+                        domain: overrides.domain ?? view.domain ?? domain,
                         csp: {
-                            ...(view.csp?.resourceDomains && {
-                                resourceDomains: view.csp.resourceDomains,
-                            }),
-                            ...(view.csp?.connectDomains && {
-                                connectDomains: view.csp.connectDomains,
-                            }),
+                            resourceDomains: unionOf(resourceDomains, view.csp?.resourceDomains),
+                            connectDomains: unionOf(connectDomains, view.csp?.connectDomains),
+                            baseUriDomains: unionOf(baseUriDomains, view.csp?.baseUriDomains),
                             ...(view.csp?.frameDomains && {
                                 frameDomains: view.csp.frameDomains,
                             }),
-                            ...(view.csp?.baseUriDomains && {
-                                baseUriDomains: view.csp.baseUriDomains,
-                            }),
                         },
                     },
                 };
-                const ui = mergeWithUnion(mergeWithUnion(defaults, fromView), {
-                    ui: overrides,
-                });
                 const base = {
                     ...ui,
                     ...(view.description && {
@@ -531,7 +382,7 @@ export class McpServer extends McpServerBaseOmitted {
         toolMeta.ui = { ...toolMeta.ui, resourceUri: viewResource.uri };
     }
     registerViewResource({ name, viewResource, view, }) {
-        const { hostType, uri: viewUri, mimeType, buildContentMeta } = viewResource;
+        const { uri: viewUri, mimeType, buildContentMeta } = viewResource;
         const buildMeta = (extra) => {
             const { serverUrl, connectDomains, contentMetaOverrides } = this.resolveViewRequestContext(extra);
             return buildContentMeta({
@@ -553,13 +404,11 @@ export class McpServer extends McpServerBaseOmitted {
             const viewBase = `${serverUrl}${assetsBasePath}`;
             const html = isProduction
                 ? templateHelper.renderProduction({
-                    hostType,
                     serverUrl: viewBase,
                     viewFile: this.lookupViewFile(view.component),
                     styleFile: this.lookupDistFile("style.css") ?? "",
                 })
                 : templateHelper.renderDevelopment({
-                    hostType,
                     serverUrl: viewBase,
                     viewName: view.component,
                 });
@@ -575,9 +424,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);
     }
-    wrapHandler(cb, { attachViewUUID }) {
+    decorateToolHandler(cb, { attachViewUUID, securitySchemes, toolName, }) {
         return async (args, extra) => {
-            const result = await cb(args, extra);
+            if (this.oauthEnabled) {
+                const failure = evaluateSecuritySchemes(securitySchemes, extra.http?.authInfo);
+                if (failure) {
+                    const header = (key) => extra.http?.req?.headers.get(key) ?? undefined;
+                    return inBandChallengeResult(failure, this.resolveResourceMetadataUrl?.(header));
+                }
+            }
+            let result;
+            try {
+                result = await cb(args, extra);
+            }
+            catch (error) {
+                captureToolError(extra, error);
+                throw error;
+            }
+            warnOnLargeToolOutput(result, toolName);
             return {
                 ...result,
                 content: normalizeContent(result.content),
@@ -637,18 +501,25 @@ export class McpServer extends McpServerBaseOmitted {
         if (this.viteManifest) {
             return this.viteManifest;
         }
-        return JSON.parse(readFileSync(path.join(process.cwd(), "dist", "assets", ".vite", "manifest.json"), "utf-8"));
+        cachedDiskManifest ??= JSON.parse(readFileSync(path.join(process.cwd(), "dist", "assets", ".vite", "manifest.json"), "utf-8"));
+        return cachedDiskManifest ?? {};
     }
-    registerTool(...args) {
+    registerTool(rawConfig, rawCb) {
         const baseFn = McpServerBase.prototype.registerTool;
-        if (typeof args[0] === "string") {
-            baseFn.call(this, args[0], args[1], args[2]);
-            return this;
+        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));
+        if (rawSecuritySchemes === undefined &&
+            authNeedsProvider &&
+            !this.oauthEnabled) {
+            throw new Error(`Tool "${name}" sets \`auth: ${JSON.stringify(auth)}\` but the server has no \`oauth\` provider configured.`);
         }
-        const config = args[0];
-        const cb = args[1];
-        const { name, view, securitySchemes, _meta: userToolMeta, ...toolFields } = config;
+        const securitySchemes = rawSecuritySchemes ??
+            (auth && this.oauthEnabled ? authToSecuritySchemes(auth) : undefined);
         const toolMeta = { ...userToolMeta };
+        this.toolSecuritySchemes.set(name, securitySchemes);
         if (securitySchemes) {
             // SEP-1488 puts `securitySchemes` at the top level of the tool
             // descriptor, but the SDK's `registerTool` drops unknown top-level
@@ -661,8 +532,14 @@ export class McpServer extends McpServerBaseOmitted {
             this.enforceOneToolPerView(view.component, name);
             this.registerViewResources(name, view, toolMeta);
         }
-        const wrappedCb = this.wrapHandler(cb, { attachViewUUID: Boolean(view) });
-        baseFn.call(this, name, { ...toolFields, _meta: toolMeta }, wrappedCb);
+        const wrappedCb = this.decorateToolHandler(cb, {
+            attachViewUUID: Boolean(view),
+            securitySchemes,
+            toolName: name,
+        });
+        baseFn.call(this, name, { ...toolFields, _meta: toolMeta }, toolFields.inputSchema === undefined
+            ? (extra) => wrappedCb({}, extra)
+            : wrappedCb);
         return this;
     }
 }