skybridge 0.0.0-dev.c163b5f → 0.0.0-dev.c17120e

package/dist/server/app.test.js

@@ -0,0 +1,231 @@
+import { Client, InMemoryTransport } from "@modelcontextprotocol/client";
+import { describe, expect, expectTypeOf, it } from "vitest";
+import { z } from "zod";
+import { Skybridge } from "./app.js";
+const oauthConfig = {
+    oauthMetadata: {
+        issuer: "https://issuer.example.com",
+        authorization_endpoint: "https://issuer.example.com/authorize",
+        token_endpoint: "https://issuer.example.com/token",
+        response_types_supported: ["code"],
+    },
+    verifier: {
+        verifyAccessToken: async () => ({
+            token: "t",
+            clientId: "c",
+            scopes: [],
+            extra: {},
+        }),
+    },
+};
+describe("Skybridge setup and handler", () => {
+    it("derives an app with outer middleware without changing the original", async () => {
+        const events = [];
+        let configured = 0;
+        let loaded = 0;
+        const app = new Skybridge({
+            name: "instance-hook",
+            version: "1",
+            setup: () => {
+                loaded += 1;
+                return "ready";
+            },
+            handler: (server, config) => server
+                .registerTool({
+                name: "echo",
+                inputSchema: { message: z.string() },
+                description: config,
+            }, async ({ message }) => {
+                events.push("handler");
+                return { content: message };
+            })
+                .mcpMiddleware("tools/call", async (_request, _extra, next) => {
+                events.push("app:before");
+                const result = await next();
+                events.push("app:after");
+                return result;
+            }),
+        });
+        const derived = app.withHandler((server, options, originalHandler) => {
+            expectTypeOf(options).toEqualTypeOf();
+            configured += 1;
+            server.mcpMiddleware("tools/list", async (_request, _extra, next) => {
+                const result = await next();
+                return {
+                    ...result,
+                    tools: result.tools.map((tool) => ({
+                        ...tool,
+                        description: "configured",
+                    })),
+                };
+            });
+            server.mcpMiddleware("tools/call", async (request, _extra, next) => {
+                events.push("hook:before");
+                request.params.arguments = { message: "configured" };
+                const result = await next();
+                events.push("hook:after");
+                return result;
+            });
+            return originalHandler(server, options);
+        });
+        expectTypeOf().toEqualTypeOf();
+        expectTypeOf().toEqualTypeOf();
+        const instances = await Promise.all([
+            derived.createServerInstance(),
+            derived.createServerInstance(),
+            app.createServerInstance(),
+        ]);
+        for (const [index, instance] of instances.entries()) {
+            const client = new Client({ name: "client", version: "1" });
+            const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+            await instance.connect(serverTransport);
+            await client.connect(clientTransport);
+            try {
+                const expected = index < 2 ? "configured" : "ready";
+                expect((await client.listTools()).tools[0]?.description).toBe(expected);
+                events.length = 0;
+                expect(await client.callTool({
+                    name: "echo",
+                    arguments: { message: "original" },
+                })).toMatchObject({
+                    content: [
+                        { type: "text", text: index < 2 ? "configured" : "original" },
+                    ],
+                });
+                expect(events).toEqual(index < 2
+                    ? [
+                        "hook:before",
+                        "app:before",
+                        "handler",
+                        "app:after",
+                        "hook:after",
+                    ]
+                    : ["app:before", "handler", "app:after"]);
+            }
+            finally {
+                await client.close();
+            }
+        }
+        expect(configured).toBe(3);
+        expect(loaded).toBe(2);
+    });
+    it("propagates a failed handler wrapper without changing the original app", async () => {
+        const app = new Skybridge({
+            name: "instance-hook",
+            version: "1",
+            handler: (server) => server,
+        });
+        await expect(app
+            .withHandler(() => {
+            throw new Error("configure failed");
+        })
+            .createServerInstance()).rejects.toThrow("configure failed");
+        const instance = await app.createServerInstance();
+        await instance.close();
+    });
+    it("infers additional tools returned by a handler wrapper", async () => {
+        const app = new Skybridge({
+            name: "wrapped-tools",
+            version: "1",
+            setup: async () => ({ greeting: "hello" }),
+            handler: (server, { greeting }) => server.registerTool({ name: "greet", inputSchema: { name: z.string() } }, ({ name }) => ({ content: `${greeting} ${name}` })),
+        });
+        expectTypeOf().toEqualTypeOf();
+        const derived = app.withHandler((server, options, originalHandler) => {
+            expectTypeOf(options).toEqualTypeOf();
+            return originalHandler(server, options).registerTool({ name: "echo", inputSchema: { message: z.string() } }, ({ message }) => ({ content: message }));
+        });
+        expectTypeOf().toEqualTypeOf();
+        expectTypeOf().toEqualTypeOf();
+        const client = new Client({ name: "client", version: "1" });
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await derived.connect(serverTransport);
+        await client.connect(clientTransport);
+        try {
+            expect(await client.callTool({ name: "greet", arguments: { name: "Ada" } })).toMatchObject({ content: [{ type: "text", text: "hello Ada" }] });
+            expect(await client.callTool({
+                name: "echo",
+                arguments: { message: "goodbye" },
+            })).toMatchObject({ content: [{ type: "text", text: "goodbye" }] });
+        }
+        finally {
+            await client.close();
+        }
+    });
+    it("resolves setup once and passes the context to the per-request handler", async () => {
+        let loads = 0;
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            setup: async () => {
+                loads++;
+                return { greeting: await Promise.resolve("hello") };
+            },
+            handler: (server, { greeting }) => server.registerTool({ name: "greet", description: "greet" }, async () => ({ content: [{ type: "text", text: greeting }] })),
+        });
+        expect(loads).toBe(0);
+        const call = async () => {
+            const client = new Client({ name: "client", version: "1.0.0" });
+            const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+            await app.connect(serverTransport);
+            await client.connect(clientTransport);
+            const result = await client.callTool({ name: "greet" });
+            await client.close();
+            return result;
+        };
+        expect(await call()).toMatchObject({
+            content: [{ type: "text", text: "hello" }],
+        });
+        expect(await call()).toMatchObject({
+            content: [{ type: "text", text: "hello" }],
+        });
+        expect(loads).toBe(1);
+    });
+    it("retries setup after a failed first resolution", async () => {
+        let attempts = 0;
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            setup: async () => {
+                attempts++;
+                if (attempts === 1) {
+                    throw new Error("transient");
+                }
+            },
+            handler: (server) => server,
+        });
+        const [, first] = InMemoryTransport.createLinkedPair();
+        await expect(app.connect(first)).rejects.toThrow("transient");
+        const [, second] = InMemoryTransport.createLinkedPair();
+        await expect(app.connect(second)).resolves.toBeUndefined();
+        expect(attempts).toBe(2);
+    });
+    it("rejects a handler that returns a promise", async () => {
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            // @ts-expect-error the handler runs per request and must stay synchronous
+            handler: async (server) => server,
+        });
+        const [, serverTransport] = InMemoryTransport.createLinkedPair();
+        await expect(app.connect(serverTransport)).rejects.toThrow(/must be synchronous/);
+    });
+    it("resolves an oauth function with the setup config before wiring the routes", async () => {
+        let seen;
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            setup: () => ({ issuer: "https://issuer.example.com" }),
+            oauth: (config) => {
+                seen = config;
+                return oauthConfig;
+            },
+            handler: (server) => server,
+        });
+        expect(seen).toBeUndefined();
+        const [, serverTransport] = InMemoryTransport.createLinkedPair();
+        await app.connect(serverTransport);
+        expect(seen).toEqual({ issuer: "https://issuer.example.com" });
+    });
+});
+//# sourceMappingURL=app.test.js.map

package/dist/server/app.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app.test.js","sourceRoot":"","sources":["../../src/server/app.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { Client, InMemoryTransport } from \"@modelcontextprotocol/client\";\nimport { describe, expect, expectTypeOf, it } from \"vitest\";\nimport { z } from \"zod\";\nimport { Skybridge } from \"./app.js\";\nimport type { ToolInput, ToolNames } from \"./inferUtilityTypes.js\";\n\nconst oauthConfig = {\n  oauthMetadata: {\n    issuer: \"https://issuer.example.com\",\n    authorization_endpoint: \"https://issuer.example.com/authorize\",\n    token_endpoint: \"https://issuer.example.com/token\",\n    response_types_supported: [\"code\"],\n  },\n  verifier: {\n    verifyAccessToken: async () => ({\n      token: \"t\",\n      clientId: \"c\",\n      scopes: [],\n      extra: {},\n    }),\n  },\n};\n\ndescribe(\"Skybridge setup and handler\", () => {\n  it(\"derives an app with outer middleware without changing the original\", async () => {\n    const events: string[] = [];\n    let configured = 0;\n    let loaded = 0;\n    const app = new Skybridge({\n      name: \"instance-hook\",\n      version: \"1\",\n      setup: () => {\n        loaded += 1;\n        return \"ready\";\n      },\n      handler: (server, config) =>\n        server\n          .registerTool(\n            {\n              name: \"echo\",\n              inputSchema: { message: z.string() },\n              description: config,\n            },\n            async ({ message }) => {\n              events.push(\"handler\");\n              return { content: message };\n            },\n          )\n          .mcpMiddleware(\"tools/call\", async (_request, _extra, next) => {\n            events.push(\"app:before\");\n            const result = await next();\n            events.push(\"app:after\");\n            return result;\n          }),\n    });\n    const derived = app.withHandler((server, options, originalHandler) => {\n      expectTypeOf(options).toEqualTypeOf<string>();\n      configured += 1;\n      server.mcpMiddleware(\"tools/list\", async (_request, _extra, next) => {\n        const result = await next();\n        return {\n          ...result,\n          tools: result.tools.map((tool) => ({\n            ...tool,\n            description: \"configured\",\n          })),\n        };\n      });\n      server.mcpMiddleware(\"tools/call\", async (request, _extra, next) => {\n        events.push(\"hook:before\");\n        request.params.arguments = { message: \"configured\" };\n        const result = await next();\n        events.push(\"hook:after\");\n        return result;\n      });\n      return originalHandler(server, options);\n    });\n    expectTypeOf<ToolNames<typeof derived>>().toEqualTypeOf<\"echo\">();\n    expectTypeOf<ToolInput<typeof derived, \"echo\">>().toEqualTypeOf<{\n      message: string;\n    }>();\n    const instances = await Promise.all([\n      derived.createServerInstance(),\n      derived.createServerInstance(),\n      app.createServerInstance(),\n    ]);\n    for (const [index, instance] of instances.entries()) {\n      const client = new Client({ name: \"client\", version: \"1\" });\n      const [clientTransport, serverTransport] =\n        InMemoryTransport.createLinkedPair();\n      await instance.connect(serverTransport);\n      await client.connect(clientTransport);\n      try {\n        const expected = index < 2 ? \"configured\" : \"ready\";\n        expect((await client.listTools()).tools[0]?.description).toBe(expected);\n        events.length = 0;\n        expect(\n          await client.callTool({\n            name: \"echo\",\n            arguments: { message: \"original\" },\n          }),\n        ).toMatchObject({\n          content: [\n            { type: \"text\", text: index < 2 ? \"configured\" : \"original\" },\n          ],\n        });\n        expect(events).toEqual(\n          index < 2\n            ? [\n                \"hook:before\",\n                \"app:before\",\n                \"handler\",\n                \"app:after\",\n                \"hook:after\",\n              ]\n            : [\"app:before\", \"handler\", \"app:after\"],\n        );\n      } finally {\n        await client.close();\n      }\n    }\n    expect(configured).toBe(3);\n    expect(loaded).toBe(2);\n  });\n\n  it(\"propagates a failed handler wrapper without changing the original app\", async () => {\n    const app = new Skybridge({\n      name: \"instance-hook\",\n      version: \"1\",\n      handler: (server) => server,\n    });\n    await expect(\n      app\n        .withHandler(() => {\n          throw new Error(\"configure failed\");\n        })\n        .createServerInstance(),\n    ).rejects.toThrow(\"configure failed\");\n    const instance = await app.createServerInstance();\n    await instance.close();\n  });\n\n  it(\"infers additional tools returned by a handler wrapper\", async () => {\n    const app = new Skybridge({\n      name: \"wrapped-tools\",\n      version: \"1\",\n      setup: async () => ({ greeting: \"hello\" }),\n      handler: (server, { greeting }) =>\n        server.registerTool(\n          { name: \"greet\", inputSchema: { name: z.string() } },\n          ({ name }) => ({ content: `${greeting} ${name}` }),\n        ),\n    });\n    expectTypeOf<ToolNames<typeof app>>().toEqualTypeOf<\"greet\">();\n    const derived = app.withHandler((server, options, originalHandler) => {\n      expectTypeOf(options).toEqualTypeOf<{ greeting: string }>();\n      return originalHandler(server, options).registerTool(\n        { name: \"echo\", inputSchema: { message: z.string() } },\n        ({ message }) => ({ content: message }),\n      );\n    });\n    expectTypeOf<ToolNames<typeof derived>>().toEqualTypeOf<\"greet\" | \"echo\">();\n    expectTypeOf<ToolInput<typeof derived, \"echo\">>().toEqualTypeOf<{\n      message: string;\n    }>();\n    const client = new Client({ name: \"client\", version: \"1\" });\n    const [clientTransport, serverTransport] =\n      InMemoryTransport.createLinkedPair();\n    await derived.connect(serverTransport);\n    await client.connect(clientTransport);\n    try {\n      expect(\n        await client.callTool({ name: \"greet\", arguments: { name: \"Ada\" } }),\n      ).toMatchObject({ content: [{ type: \"text\", text: \"hello Ada\" }] });\n      expect(\n        await client.callTool({\n          name: \"echo\",\n          arguments: { message: \"goodbye\" },\n        }),\n      ).toMatchObject({ content: [{ type: \"text\", text: \"goodbye\" }] });\n    } finally {\n      await client.close();\n    }\n  });\n\n  it(\"resolves setup once and passes the context to the per-request handler\", async () => {\n    let loads = 0;\n    const app = new Skybridge({\n      name: \"test\",\n      version: \"1.0.0\",\n      setup: async () => {\n        loads++;\n        return { greeting: await Promise.resolve(\"hello\") };\n      },\n      handler: (server, { greeting }) =>\n        server.registerTool(\n          { name: \"greet\", description: \"greet\" },\n          async () => ({ content: [{ type: \"text\", text: greeting }] }),\n        ),\n    });\n\n    expect(loads).toBe(0);\n\n    const call = async () => {\n      const client = new Client({ name: \"client\", version: \"1.0.0\" });\n      const [clientTransport, serverTransport] =\n        InMemoryTransport.createLinkedPair();\n      await app.connect(serverTransport);\n      await client.connect(clientTransport);\n      const result = await client.callTool({ name: \"greet\" });\n      await client.close();\n      return result;\n    };\n\n    expect(await call()).toMatchObject({\n      content: [{ type: \"text\", text: \"hello\" }],\n    });\n    expect(await call()).toMatchObject({\n      content: [{ type: \"text\", text: \"hello\" }],\n    });\n    expect(loads).toBe(1);\n  });\n\n  it(\"retries setup after a failed first resolution\", async () => {\n    let attempts = 0;\n    const app = new Skybridge({\n      name: \"test\",\n      version: \"1.0.0\",\n      setup: async () => {\n        attempts++;\n        if (attempts === 1) {\n          throw new Error(\"transient\");\n        }\n      },\n      handler: (server) => server,\n    });\n\n    const [, first] = InMemoryTransport.createLinkedPair();\n    await expect(app.connect(first)).rejects.toThrow(\"transient\");\n\n    const [, second] = InMemoryTransport.createLinkedPair();\n    await expect(app.connect(second)).resolves.toBeUndefined();\n    expect(attempts).toBe(2);\n  });\n\n  it(\"rejects a handler that returns a promise\", async () => {\n    const app = new Skybridge({\n      name: \"test\",\n      version: \"1.0.0\",\n      // @ts-expect-error the handler runs per request and must stay synchronous\n      handler: async (server) => server,\n    });\n    const [, serverTransport] = InMemoryTransport.createLinkedPair();\n    await expect(app.connect(serverTransport)).rejects.toThrow(\n      /must be synchronous/,\n    );\n  });\n\n  it(\"resolves an oauth function with the setup config before wiring the routes\", async () => {\n    let seen: unknown;\n    const app = new Skybridge({\n      name: \"test\",\n      version: \"1.0.0\",\n      setup: () => ({ issuer: \"https://issuer.example.com\" }),\n      oauth: (config) => {\n        seen = config;\n        return oauthConfig;\n      },\n      handler: (server) => server,\n    });\n\n    expect(seen).toBeUndefined();\n    const [, serverTransport] = InMemoryTransport.createLinkedPair();\n    await app.connect(serverTransport);\n    expect(seen).toEqual({ issuer: \"https://issuer.example.com\" });\n  });\n});\n"]}

package/dist/server/asset-base-url-transform-plugin.d.ts

@@ -1,11 +1,11 @@
 import type { Plugin } from "vite";
+export declare function isCssRequest(id: string): boolean;
 /**
- * Transforms asset import paths to use the development server base URL.
+ * Transforms asset import paths to resolve at runtime via `window.skybridge.serverUrl`,
+ * so they work both locally and behind tunnels.
  */
-export declare function assetBaseUrlTransform(code: string, devServerOrigin: string): string;
+export declare function assetBaseUrlTransform(code: string): string;
 /**
- * Vite plugin that transforms asset import paths to use the development server base URL.
+ * Vite plugin that transforms asset import paths to resolve at runtime via `window.skybridge.serverUrl`.
  */
-export declare function assetBaseUrlTransformPlugin(options: {
-    devServerOrigin: string;
-}): Plugin;
+export declare function assetBaseUrlTransformPlugin(): Plugin;

package/dist/server/asset-base-url-transform-plugin.js

@@ -1,26 +1,40 @@
+// Mirrors Vite's own `isCSSRequest`: matches the css family of extensions
+// either at the end of the id or right before the query string. Catches both
+// plain `.css` requests and SFC style blocks (e.g. `Foo.vue?vue&type=style&lang.css`).
+const CSS_LANGS_RE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
+export function isCssRequest(id) {
+    return CSS_LANGS_RE.test(id);
+}
 /**
- * Transforms asset import paths to use the development server base URL.
+ * Transforms asset import paths to resolve at runtime via `window.skybridge.serverUrl`,
+ * so they work both locally and behind tunnels.
  */
-export function assetBaseUrlTransform(code, devServerOrigin) {
-    const assetStringPattern = /(?<!https?:\/\/)(["'`])(\/[^"'`]+\.(svg|png|jpeg|jpg|gif|webp|mp3|mp4|woff|woff2|ttf|eot))\1/g;
-    code = code.replace(assetStringPattern, (_match, quote, assetPath) => {
-        return `${quote}${devServerOrigin}${assetPath}${quote}`;
+export function assetBaseUrlTransform(code) {
+    const assetStringPattern = /(?<!\bfrom\s)(?<!https?:\/\/)(["'`])(\/[^"'`]+\.(svg|png|jpeg|jpg|gif|webp|mp3|mp4|woff|woff2|ttf|eot))\1/g;
+    code = code.replace(assetStringPattern, (_match, _quote, assetPath) => {
+        return `(window.skybridge?.serverUrl ?? "") + "${assetPath}"`;
     });
     return code;
 }
 /**
- * Vite plugin that transforms asset import paths to use the development server base URL.
+ * Vite plugin that transforms asset import paths to resolve at runtime via `window.skybridge.serverUrl`.
  */
-export function assetBaseUrlTransformPlugin(options) {
-    const { devServerOrigin } = options;
+export function assetBaseUrlTransformPlugin() {
     return {
         name: "asset-base-url-transform",
-        enforce: "pre",
-        transform(code) {
+        transform(code, id) {
             if (!code) {
                 return null;
             }
-            const transformedCode = assetBaseUrlTransform(code, devServerOrigin);
+            // Vite serves CSS modules as JS that embeds the stylesheet as a string
+            // literal. Rewriting `url("/foo.woff2")` inside that string to a JS
+            // concatenation expression produces invalid CSS once it lands in a
+            // <style> tag. CSS asset URLs are already handled at build time by
+            // `experimental.renderBuiltUrl`, so skip CSS requests here.
+            if (isCssRequest(id)) {
+                return null;
+            }
+            const transformedCode = assetBaseUrlTransform(code);
             if (transformedCode === code) {
                 return null;
             }

package/dist/server/asset-base-url-transform-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"asset-base-url-transform-plugin.js","sourceRoot":"","sources":["../../src/server/asset-base-url-transform-plugin.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACnC,IAAY,EACZ,eAAuB;IAEvB,MAAM,kBAAkB,GACtB,+FAA+F,CAAC;IAElG,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;QACnE,OAAO,GAAG,KAAK,GAAG,eAAe,GAAG,SAAS,GAAG,KAAK,EAAE,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,2BAA2B,CAAC,OAE3C;IACC,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAEpC,OAAO;QACL,IAAI,EAAE,0BAA0B;QAChC,OAAO,EAAE,KAAK;QACd,SAAS,CAAC,IAAI;YACZ,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,eAAe,GAAG,qBAAqB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YAErE,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO;gBACL,IAAI,EAAE,eAAe;gBACrB,GAAG,EAAE,IAAI;aACV,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"asset-base-url-transform-plugin.js","sourceRoot":"","sources":["../../src/server/asset-base-url-transform-plugin.ts"],"names":[],"mappings":"AAEA,0EAA0E;AAC1E,6EAA6E;AAC7E,uFAAuF;AACvF,MAAM,YAAY,GAChB,6DAA6D,CAAC;AAEhE,MAAM,UAAU,YAAY,CAAC,EAAU;IACrC,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC/B,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAChD,MAAM,kBAAkB,GACtB,4GAA4G,CAAC;IAE/G,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE;QACpE,OAAO,0CAA0C,SAAS,GAAG,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,2BAA2B;IACzC,OAAO;QACL,IAAI,EAAE,0BAA0B;QAChC,SAAS,CAAC,IAAI,EAAE,EAAE;YAChB,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO,IAAI,CAAC;YACd,CAAC;YAED,uEAAuE;YACvE,oEAAoE;YACpE,mEAAmE;YACnE,mEAAmE;YACnE,4DAA4D;YAC5D,IAAI,YAAY,CAAC,EAAE,CAAC,EAAE,CAAC;gBACrB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,eAAe,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAEpD,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO;gBACL,IAAI,EAAE,eAAe;gBACrB,GAAG,EAAE,IAAI;aACV,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { Plugin } from \"vite\";\n\n// Mirrors Vite's own `isCSSRequest`: matches the css family of extensions\n// either at the end of the id or right before the query string. Catches both\n// plain `.css` requests and SFC style blocks (e.g. `Foo.vue?vue&type=style&lang.css`).\nconst CSS_LANGS_RE =\n  /\\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\\?)/;\n\nexport function isCssRequest(id: string): boolean {\n  return CSS_LANGS_RE.test(id);\n}\n\n/**\n * Transforms asset import paths to resolve at runtime via `window.skybridge.serverUrl`,\n * so they work both locally and behind tunnels.\n */\nexport function assetBaseUrlTransform(code: string): string {\n  const assetStringPattern =\n    /(?<!\\bfrom\\s)(?<!https?:\\/\\/)([\"'`])(\\/[^\"'`]+\\.(svg|png|jpeg|jpg|gif|webp|mp3|mp4|woff|woff2|ttf|eot))\\1/g;\n\n  code = code.replace(assetStringPattern, (_match, _quote, assetPath) => {\n    return `(window.skybridge?.serverUrl ?? \"\") + \"${assetPath}\"`;\n  });\n\n  return code;\n}\n\n/**\n * Vite plugin that transforms asset import paths to resolve at runtime via `window.skybridge.serverUrl`.\n */\nexport function assetBaseUrlTransformPlugin(): Plugin {\n  return {\n    name: \"asset-base-url-transform\",\n    transform(code, id) {\n      if (!code) {\n        return null;\n      }\n\n      // Vite serves CSS modules as JS that embeds the stylesheet as a string\n      // literal. Rewriting `url(\"/foo.woff2\")` inside that string to a JS\n      // concatenation expression produces invalid CSS once it lands in a\n      // <style> tag. CSS asset URLs are already handled at build time by\n      // `experimental.renderBuiltUrl`, so skip CSS requests here.\n      if (isCssRequest(id)) {\n        return null;\n      }\n\n      const transformedCode = assetBaseUrlTransform(code);\n\n      if (transformedCode === code) {\n        return null;\n      }\n\n      return {\n        code: transformedCode,\n        map: null,\n      };\n    },\n  };\n}\n"]}

package/dist/server/asset-base-url-transform-plugin.test.js

@@ -1,27 +1,26 @@
 import { describe, expect, it } from "vitest";
-import { assetBaseUrlTransform } from "./asset-base-url-transform-plugin.js";
+import { assetBaseUrlTransform, assetBaseUrlTransformPlugin, isCssRequest, } from "./asset-base-url-transform-plugin.js";
 describe("assetBaseUrlTransform", () => {
-    const devServerOrigin = "http://localhost:3000";
-    it("should transform asset paths in single, double, and backtick quotes", () => {
+    it("should transform asset paths to use window.skybridge.serverUrl", () => {
         const cases = [
             {
                 desc: "single-quoted",
                 code: `const image = '/assets/logo.png';`,
-                expected: `const image = '${devServerOrigin}/assets/logo.png';`,
+                expected: `const image = (window.skybridge?.serverUrl ?? "") + "/assets/logo.png";`,
             },
             {
                 desc: "double-quoted",
                 code: `const image = "/assets/logo.png";`,
-                expected: `const image = "${devServerOrigin}/assets/logo.png";`,
+                expected: `const image = (window.skybridge?.serverUrl ?? "") + "/assets/logo.png";`,
             },
             {
                 desc: "backtick-quoted",
                 code: "const image = `/assets/logo.png`;",
-                expected: `const image = \`${devServerOrigin}/assets/logo.png\`;`,
+                expected: `const image = (window.skybridge?.serverUrl ?? "") + "/assets/logo.png";`,
             },
         ];
         for (const { code, expected } of cases) {
-            const result = assetBaseUrlTransform(code, devServerOrigin);
+            const result = assetBaseUrlTransform(code);
             expect(result).toBe(expected);
         }
     });
@@ -31,10 +30,10 @@ describe("assetBaseUrlTransform", () => {
       const icon = '/assets/icon.svg';
       const font = '/assets/font.woff2';
     `;
-        const result = assetBaseUrlTransform(code, devServerOrigin);
-        expect(result).toContain(`${devServerOrigin}/assets/logo.png`);
-        expect(result).toContain(`${devServerOrigin}/assets/icon.svg`);
-        expect(result).toContain(`${devServerOrigin}/assets/font.woff2`);
+        const result = assetBaseUrlTransform(code);
+        expect(result).toContain(`(window.skybridge?.serverUrl ?? "") + "/assets/logo.png"`);
+        expect(result).toContain(`(window.skybridge?.serverUrl ?? "") + "/assets/icon.svg"`);
+        expect(result).toContain(`(window.skybridge?.serverUrl ?? "") + "/assets/font.woff2"`);
     });
     it("should not transform already absolute URLs", () => {
         const code = `
@@ -42,15 +41,94 @@ describe("assetBaseUrlTransform", () => {
       const http = 'http://example.com/image.png';
       const https = 'https://example.com/image.png';
     `;
-        const result = assetBaseUrlTransform(code, devServerOrigin);
-        expect(result).toContain(`${devServerOrigin}/assets/logo.png`);
+        const result = assetBaseUrlTransform(code);
+        expect(result).toContain(`(window.skybridge?.serverUrl ?? "") + "/assets/logo.png"`);
         expect(result).toContain("http://example.com/image.png");
         expect(result).toContain("https://example.com/image.png");
     });
     it("should not transform code without asset paths", () => {
         const code = `const text = "Hello World";`;
-        const result = assetBaseUrlTransform(code, devServerOrigin);
+        const result = assetBaseUrlTransform(code);
         expect(result).toBe(code);
     });
+    it("should not transform asset paths inside static `import ... from` clauses", () => {
+        // Reproducer for #713: a dep does `import * as sprite from './icons.svg'`,
+        // Vite resolves the relative path to absolute, then this transform used
+        // to rewrite the resolved string — producing invalid JS like
+        // `import * as sprite from (expr) + "..."` that crashes vite:import-analysis.
+        const cases = [
+            `import * as sprite from "/Users/me/proj/node_modules/pkg/icons.svg";`,
+            `import sprite from '/assets/icons.svg';`,
+            `import sprite from "/assets/icons.svg";`,
+            `export { default } from "/assets/icons.svg";`,
+            `export * from '/assets/sprites.svg';`,
+        ];
+        for (const code of cases) {
+            expect(assetBaseUrlTransform(code)).toBe(code);
+        }
+    });
+    it("should still transform value-position asset paths in files that also have unrelated imports", () => {
+        const code = [
+            `import { foo } from "./foo.js";`,
+            `import * as sprite from "/assets/sprite.svg";`,
+            `const logo = "/assets/logo.png";`,
+        ].join("\n");
+        const result = assetBaseUrlTransform(code);
+        // Imports untouched
+        expect(result).toContain(`from "./foo.js"`);
+        expect(result).toContain(`from "/assets/sprite.svg"`);
+        // Value-position rewritten
+        expect(result).toContain(`const logo = (window.skybridge?.serverUrl ?? "") + "/assets/logo.png";`);
+    });
+});
+describe("isCssRequest", () => {
+    it("returns true for CSS-family extensions", () => {
+        expect(isCssRequest("/src/styles.css")).toBe(true);
+        expect(isCssRequest("/src/styles.module.css")).toBe(true);
+        expect(isCssRequest("/src/styles.scss")).toBe(true);
+        expect(isCssRequest("/src/styles.sass")).toBe(true);
+        expect(isCssRequest("/src/styles.less")).toBe(true);
+        expect(isCssRequest("/src/styles.styl")).toBe(true);
+    });
+    it("returns true for CSS modules with Vite query strings", () => {
+        expect(isCssRequest("/src/styles.css?direct")).toBe(true);
+        expect(isCssRequest("/src/styles.css?inline")).toBe(true);
+        expect(isCssRequest("/src/styles.css?used")).toBe(true);
+        expect(isCssRequest("/src/Foo.vue?vue&type=style&lang.css")).toBe(true);
+    });
+    it("returns false for non-CSS modules", () => {
+        expect(isCssRequest("/src/index.tsx")).toBe(false);
+        expect(isCssRequest("/src/utils.ts")).toBe(false);
+        expect(isCssRequest("/src/Logo.svg")).toBe(false);
+        expect(isCssRequest("/src/notes.cssx")).toBe(false);
+    });
+});
+describe("assetBaseUrlTransformPlugin", () => {
+    function runTransform(id, code) {
+        const plugin = assetBaseUrlTransformPlugin();
+        const hook = plugin.transform;
+        if (!hook) {
+            throw new Error("plugin.transform is not defined");
+        }
+        const handler = typeof hook === "function" ? hook : hook.handler;
+        return handler.call(
+        // biome-ignore lint/suspicious/noExplicitAny: vitest harness for plugin hook
+        {}, code, id, { moduleType: "js" });
+    }
+    it("rewrites asset paths in JS modules", () => {
+        const result = runTransform("/src/widget.tsx", `const logo = "/assets/logo.png";`);
+        expect(result?.code).toContain(`(window.skybridge?.serverUrl ?? "") + "/assets/logo.png"`);
+    });
+    // Reproducer for #697: CSS imports are served as JS modules with the
+    // stylesheet embedded as a string. Rewriting url("/foo.woff2") inside that
+    // string would produce invalid CSS once the styles are injected.
+    it("does not rewrite asset paths when transforming a CSS module", () => {
+        const cssCode = `__vite__updateStyle("style-id", "@font-face { src: url(\\"/fonts/Brand.woff2\\") format(\\"woff2\\"); }");`;
+        expect(runTransform("/src/fonts.css", cssCode)).toBeNull();
+        expect(runTransform("/src/fonts.css?direct", cssCode)).toBeNull();
+        expect(runTransform("/src/fonts.css?inline", cssCode)).toBeNull();
+        expect(runTransform("/src/styles.scss", cssCode)).toBeNull();
+        expect(runTransform("/src/Foo.vue?vue&type=style&lang.css", cssCode)).toBeNull();
+    });
 });
 //# sourceMappingURL=asset-base-url-transform-plugin.test.js.map

package/dist/server/asset-base-url-transform-plugin.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"asset-base-url-transform-plugin.test.js","sourceRoot":"","sources":["../../src/server/asset-base-url-transform-plugin.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAE7E,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,MAAM,eAAe,GAAG,uBAAuB,CAAC;IAEhD,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,MAAM,KAAK,GAAG;YACZ;gBACE,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,mCAAmC;gBACzC,QAAQ,EAAE,kBAAkB,eAAe,oBAAoB;aAChE;YACD;gBACE,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,mCAAmC;gBACzC,QAAQ,EAAE,kBAAkB,eAAe,oBAAoB;aAChE;YACD;gBACE,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,mCAAmC;gBACzC,QAAQ,EAAE,mBAAmB,eAAe,qBAAqB;aAClE;SACF,CAAC;QAEF,KAAK,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,KAAK,EAAE,CAAC;YACvC,MAAM,MAAM,GAAG,qBAAqB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YAC5D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,IAAI,GAAG;;;;KAIZ,CAAC;QACF,MAAM,MAAM,GAAG,qBAAqB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAE5D,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,GAAG,eAAe,kBAAkB,CAAC,CAAC;QAC/D,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,GAAG,eAAe,kBAAkB,CAAC,CAAC;QAC/D,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,GAAG,eAAe,oBAAoB,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,IAAI,GAAG;;;;KAIZ,CAAC;QACF,MAAM,MAAM,GAAG,qBAAqB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAE5D,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,GAAG,eAAe,kBAAkB,CAAC,CAAC;QAC/D,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,8BAA8B,CAAC,CAAC;QACzD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,+BAA+B,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,IAAI,GAAG,6BAA6B,CAAC;QAC3C,MAAM,MAAM,GAAG,qBAAqB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAE5D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"asset-base-url-transform-plugin.test.js","sourceRoot":"","sources":["../../src/server/asset-base-url-transform-plugin.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { describe, expect, it } from \"vitest\";\nimport {\n  assetBaseUrlTransform,\n  assetBaseUrlTransformPlugin,\n  isCssRequest,\n} from \"./asset-base-url-transform-plugin.js\";\n\ndescribe(\"assetBaseUrlTransform\", () => {\n  it(\"should transform asset paths to use window.skybridge.serverUrl\", () => {\n    const cases = [\n      {\n        desc: \"single-quoted\",\n        code: `const image = '/assets/logo.png';`,\n        expected: `const image = (window.skybridge?.serverUrl ?? \"\") + \"/assets/logo.png\";`,\n      },\n      {\n        desc: \"double-quoted\",\n        code: `const image = \"/assets/logo.png\";`,\n        expected: `const image = (window.skybridge?.serverUrl ?? \"\") + \"/assets/logo.png\";`,\n      },\n      {\n        desc: \"backtick-quoted\",\n        code: \"const image = `/assets/logo.png`;\",\n        expected: `const image = (window.skybridge?.serverUrl ?? \"\") + \"/assets/logo.png\";`,\n      },\n    ];\n\n    for (const { code, expected } of cases) {\n      const result = assetBaseUrlTransform(code);\n      expect(result).toBe(expected);\n    }\n  });\n\n  it(\"should transform multiple asset paths\", () => {\n    const code = `\n      const logo = '/assets/logo.png';\n      const icon = '/assets/icon.svg';\n      const font = '/assets/font.woff2';\n    `;\n    const result = assetBaseUrlTransform(code);\n\n    expect(result).toContain(\n      `(window.skybridge?.serverUrl ?? \"\") + \"/assets/logo.png\"`,\n    );\n    expect(result).toContain(\n      `(window.skybridge?.serverUrl ?? \"\") + \"/assets/icon.svg\"`,\n    );\n    expect(result).toContain(\n      `(window.skybridge?.serverUrl ?? \"\") + \"/assets/font.woff2\"`,\n    );\n  });\n\n  it(\"should not transform already absolute URLs\", () => {\n    const code = `\n      const local = '/assets/logo.png';\n      const http = 'http://example.com/image.png';\n      const https = 'https://example.com/image.png';\n    `;\n    const result = assetBaseUrlTransform(code);\n\n    expect(result).toContain(\n      `(window.skybridge?.serverUrl ?? \"\") + \"/assets/logo.png\"`,\n    );\n    expect(result).toContain(\"http://example.com/image.png\");\n    expect(result).toContain(\"https://example.com/image.png\");\n  });\n\n  it(\"should not transform code without asset paths\", () => {\n    const code = `const text = \"Hello World\";`;\n    const result = assetBaseUrlTransform(code);\n\n    expect(result).toBe(code);\n  });\n\n  it(\"should not transform asset paths inside static `import ... from` clauses\", () => {\n    // Reproducer for #713: a dep does `import * as sprite from './icons.svg'`,\n    // Vite resolves the relative path to absolute, then this transform used\n    // to rewrite the resolved string — producing invalid JS like\n    // `import * as sprite from (expr) + \"...\"` that crashes vite:import-analysis.\n    const cases = [\n      `import * as sprite from \"/Users/me/proj/node_modules/pkg/icons.svg\";`,\n      `import sprite from '/assets/icons.svg';`,\n      `import sprite from \"/assets/icons.svg\";`,\n      `export { default } from \"/assets/icons.svg\";`,\n      `export * from '/assets/sprites.svg';`,\n    ];\n\n    for (const code of cases) {\n      expect(assetBaseUrlTransform(code)).toBe(code);\n    }\n  });\n\n  it(\"should still transform value-position asset paths in files that also have unrelated imports\", () => {\n    const code = [\n      `import { foo } from \"./foo.js\";`,\n      `import * as sprite from \"/assets/sprite.svg\";`,\n      `const logo = \"/assets/logo.png\";`,\n    ].join(\"\\n\");\n    const result = assetBaseUrlTransform(code);\n\n    // Imports untouched\n    expect(result).toContain(`from \"./foo.js\"`);\n    expect(result).toContain(`from \"/assets/sprite.svg\"`);\n    // Value-position rewritten\n    expect(result).toContain(\n      `const logo = (window.skybridge?.serverUrl ?? \"\") + \"/assets/logo.png\";`,\n    );\n  });\n});\n\ndescribe(\"isCssRequest\", () => {\n  it(\"returns true for CSS-family extensions\", () => {\n    expect(isCssRequest(\"/src/styles.css\")).toBe(true);\n    expect(isCssRequest(\"/src/styles.module.css\")).toBe(true);\n    expect(isCssRequest(\"/src/styles.scss\")).toBe(true);\n    expect(isCssRequest(\"/src/styles.sass\")).toBe(true);\n    expect(isCssRequest(\"/src/styles.less\")).toBe(true);\n    expect(isCssRequest(\"/src/styles.styl\")).toBe(true);\n  });\n\n  it(\"returns true for CSS modules with Vite query strings\", () => {\n    expect(isCssRequest(\"/src/styles.css?direct\")).toBe(true);\n    expect(isCssRequest(\"/src/styles.css?inline\")).toBe(true);\n    expect(isCssRequest(\"/src/styles.css?used\")).toBe(true);\n    expect(isCssRequest(\"/src/Foo.vue?vue&type=style&lang.css\")).toBe(true);\n  });\n\n  it(\"returns false for non-CSS modules\", () => {\n    expect(isCssRequest(\"/src/index.tsx\")).toBe(false);\n    expect(isCssRequest(\"/src/utils.ts\")).toBe(false);\n    expect(isCssRequest(\"/src/Logo.svg\")).toBe(false);\n    expect(isCssRequest(\"/src/notes.cssx\")).toBe(false);\n  });\n});\n\ndescribe(\"assetBaseUrlTransformPlugin\", () => {\n  type TransformResult = { code: string; map: null } | null;\n\n  function runTransform(id: string, code: string): TransformResult {\n    const plugin = assetBaseUrlTransformPlugin();\n    const hook = plugin.transform;\n    if (!hook) {\n      throw new Error(\"plugin.transform is not defined\");\n    }\n    const handler = typeof hook === \"function\" ? hook : hook.handler;\n    return handler.call(\n      // biome-ignore lint/suspicious/noExplicitAny: vitest harness for plugin hook\n      {} as any,\n      code,\n      id,\n      { moduleType: \"js\" },\n    ) as TransformResult;\n  }\n\n  it(\"rewrites asset paths in JS modules\", () => {\n    const result = runTransform(\n      \"/src/widget.tsx\",\n      `const logo = \"/assets/logo.png\";`,\n    );\n    expect(result?.code).toContain(\n      `(window.skybridge?.serverUrl ?? \"\") + \"/assets/logo.png\"`,\n    );\n  });\n\n  // Reproducer for #697: CSS imports are served as JS modules with the\n  // stylesheet embedded as a string. Rewriting url(\"/foo.woff2\") inside that\n  // string would produce invalid CSS once the styles are injected.\n  it(\"does not rewrite asset paths when transforming a CSS module\", () => {\n    const cssCode = `__vite__updateStyle(\"style-id\", \"@font-face { src: url(\\\\\"/fonts/Brand.woff2\\\\\") format(\\\\\"woff2\\\\\"); }\");`;\n\n    expect(runTransform(\"/src/fonts.css\", cssCode)).toBeNull();\n    expect(runTransform(\"/src/fonts.css?direct\", cssCode)).toBeNull();\n    expect(runTransform(\"/src/fonts.css?inline\", cssCode)).toBeNull();\n    expect(runTransform(\"/src/styles.scss\", cssCode)).toBeNull();\n    expect(\n      runTransform(\"/src/Foo.vue?vue&type=style&lang.css\", cssCode),\n    ).toBeNull();\n  });\n});\n"]}

package/dist/server/auth/discovery.d.ts

@@ -0,0 +1,33 @@
+import { z } from "zod/v4";
+/**
+ * Discovery doc validated as OAuth AS metadata + `jwks_uri`. The SDK's
+ * `OAuthMetadataSchema` omits `jwks_uri` (its client never verifies tokens), but
+ * we need it for JWKS token verification, so we extend the schema to keep it.
+ */
+declare const DiscoverySchema: z.ZodObject<{
+    issuer: z.ZodString;
+    authorization_endpoint: z.ZodURL;
+    token_endpoint: z.ZodURL;
+    registration_endpoint: z.ZodOptional<z.ZodURL>;
+    scopes_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    response_types_supported: z.ZodArray<z.ZodString>;
+    response_modes_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    grant_types_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    token_endpoint_auth_methods_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    token_endpoint_auth_signing_alg_values_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    service_documentation: z.ZodOptional<z.ZodURL>;
+    revocation_endpoint: z.ZodOptional<z.ZodURL>;
+    revocation_endpoint_auth_methods_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    revocation_endpoint_auth_signing_alg_values_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    introspection_endpoint: z.ZodOptional<z.ZodString>;
+    introspection_endpoint_auth_methods_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    introspection_endpoint_auth_signing_alg_values_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    code_challenge_methods_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    client_id_metadata_document_supported: z.ZodOptional<z.ZodBoolean>;
+    authorization_response_iss_parameter_supported: z.ZodCatch<z.ZodOptional<z.ZodBoolean>>;
+    jwks_uri: z.ZodOptional<z.ZodString>;
+}, z.core.$loose>;
+export type DiscoveredMetadata = z.infer<typeof DiscoverySchema>;
+/** Fetches and validates an authorization server's discovery document. */
+export declare function discoverAuthorizationServer(issuer: string): Promise<DiscoveredMetadata>;
+export {};

package/dist/server/auth/discovery.js

@@ -0,0 +1,56 @@
+import { OAuthMetadataSchema } from "@modelcontextprotocol/core";
+import { z } from "zod/v4";
+/**
+ * Discovery doc validated as OAuth AS metadata + `jwks_uri`. The SDK's
+ * `OAuthMetadataSchema` omits `jwks_uri` (its client never verifies tokens), but
+ * we need it for JWKS token verification, so we extend the schema to keep it.
+ */
+const DiscoverySchema = OAuthMetadataSchema.extend({
+    jwks_uri: z.string().optional(),
+});
+const WELL_KNOWN = [
+    "/.well-known/openid-configuration",
+    "/.well-known/oauth-authorization-server",
+];
+const DISCOVERY_TIMEOUT_MS = 5000;
+/** Fetches and validates an authorization server's discovery document. */
+export async function discoverAuthorizationServer(issuer) {
+    const base = issuer.replace(/\/$/, "");
+    const errors = [];
+    // First valid doc lacking a registration_endpoint, kept as a fallback so a
+    // genuinely non-DCR IdP still resolves (and is rejected later by the caller).
+    let fallback;
+    for (const path of WELL_KNOWN) {
+        const url = `${base}${path}`;
+        // Any failure (network/timeout, non-2xx, non-JSON, invalid metadata, issuer
+        // mismatch) records a per-URL reason and falls through to the next path.
+        try {
+            const res = await fetch(url, {
+                signal: AbortSignal.timeout(DISCOVERY_TIMEOUT_MS),
+            });
+            if (!res.ok) {
+                throw new Error(`HTTP ${res.status}`);
+            }
+            const meta = DiscoverySchema.parse(await res.json());
+            // RFC 8414 §3.3: issuer must match the fetch origin (slash-insensitive).
+            if (meta.issuer.replace(/\/$/, "") !== base) {
+                throw new Error(`issuer mismatch: ${meta.issuer}`);
+            }
+            // Prefer the document that advertises DCR: some IdPs (e.g. Clerk) serve a
+            // valid openid-configuration without `registration_endpoint` yet expose
+            // it at oauth-authorization-server. Keep looking past a doc that omits it.
+            if (meta.registration_endpoint) {
+                return meta;
+            }
+            fallback ??= meta;
+        }
+        catch (err) {
+            errors.push(`${url}: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    if (fallback) {
+        return fallback;
+    }
+    throw new Error(`OAuth discovery failed for ${issuer}: ${errors.join("; ")}`);
+}
+//# sourceMappingURL=discovery.js.map