skybridge 0.0.0-dev.f57f202 → 0.0.0-dev.f58ff90

package/dist/server/tool-extra.test.js

@@ -4,6 +4,7 @@ import { Client, StreamableHTTPClientTransport, } from "@modelcontextprotocol/cl
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { z } from "zod";
 import { Skybridge } from "./app.js";
+import { requestFormInput } from "./form-input.js";
 vi.mock("@skybridge/devtools", () => ({
     devtoolsStaticServer: () => ((_r, _s, n) => n()),
 }));
@@ -84,5 +85,83 @@ describe("stateless server instances", () => {
         expect(negotiated).toBe("2026-07-28");
         expect(result.structuredContent).toBe(42);
     });
+    it("asks for an OpenAI form over multi-round-trip requests", async () => {
+        const { createApp } = await import("./express.js");
+        const requestedSchema = {
+            type: "object",
+            properties: {
+                part: {
+                    type: "string",
+                    oneOf: [{ const: "bolt", title: "M6 bolt", description: "Fastener" }],
+                },
+                drawing: {
+                    type: "string",
+                    format: "uri",
+                    "x-openai-input": {
+                        type: "resource",
+                        options: [{ uri: "cad://drawings/bolt", name: "bolt" }],
+                    },
+                },
+            },
+            required: ["part"],
+        };
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server.registerTool({ name: "pick-part" }, (_args, extra) => {
+                const result = requestFormInput(extra, {
+                    key: "part",
+                    message: "Choose a part",
+                    requestedSchema,
+                });
+                if ("resultType" in result) {
+                    return result;
+                }
+                return {
+                    content: `${result.action}:${result.action === "accept" && result.content.part}`,
+                };
+            }),
+        });
+        const httpServer = http.createServer();
+        const expressApp = await createApp({ app, httpServer });
+        const listening = http.createServer(expressApp);
+        await new Promise((r) => listening.listen(0, r));
+        openServer = listening;
+        const port = listening.address().port;
+        const client = new Client({ name: "c", version: "0.0.0" }, {
+            capabilities: {
+                elicitation: { form: {} },
+                extensions: { "openai/elicitation": { form: {} } },
+            },
+            versionNegotiation: { mode: "auto" },
+        });
+        const asked = [];
+        let answer = { part: "bolt", drawing: "cad://drawings/bolt" };
+        client.setRequestHandler("elicitation/create", (request) => {
+            asked.push(request.params);
+            return { action: "accept", content: answer };
+        });
+        await client.connect(new StreamableHTTPClientTransport(new URL(`http://localhost:${port}/mcp`)));
+        const result = await client.callTool({ name: "pick-part" });
+        expect(result.content).toEqual([{ type: "text", text: "accept:bolt" }]);
+        expect(asked).toEqual([
+            {
+                mode: "form",
+                message: "Choose a part",
+                requestedSchema: { type: "object", properties: {} },
+                _meta: { "openai/elicitation": { requestedSchema } },
+            },
+        ]);
+        for (answer of [
+            { part: "washer", drawing: "cad://drawings/bolt" },
+            { part: "bolt", drawing: "cad://drawings/other" },
+        ]) {
+            await expect(client.callTool({ name: "pick-part" })).resolves.toMatchObject({
+                isError: true,
+                content: [{ text: expect.stringContaining("does not match") }],
+            });
+        }
+        await client.close();
+    });
 });
 //# sourceMappingURL=tool-extra.test.js.map

package/dist/server/tool-extra.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-extra.test.js","sourceRoot":"","sources":["../../src/server/tool-extra.test.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACL,MAAM,EACN,6BAA6B,GAC9B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACpC,oBAAoB,EAAE,GAAG,EAAE,CACzB,CAAC,CAAC,EAAW,EAAE,EAAW,EAAE,CAAa,EAAE,EAAE,CAAC,CAAC,EAAE,CAAmB;CACvE,CAAC,CAAC,CAAC;AACJ,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACpC,cAAc,EAAE,GAAG,EAAE,CACnB,CAAC,CAAC,EAAW,EAAE,EAAW,EAAE,CAAa,EAAE,EAAE,CAAC,CAAC,EAAE,CAAmB;CACvE,CAAC,CAAC,CAAC;AAEJ,IAAI,UAAmC,CAAC;AACxC,SAAS,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;AAErC,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QACnD,IAAI,UAAmB,CAAC;QACxB,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC;YACxB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAClB,MAAM,CAAC,YAAY,CACjB;gBACE,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,qBAAqB;gBAClC,WAAW,EAAE,EAAE;aAChB,EACD,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACf,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,eAAe,CAAC,CAAC;gBACnD,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YACrD,CAAC,CACF;SACJ,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACvC,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAChD,MAAM,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACvD,UAAU,GAAG,SAAS,CAAC;QACvB,MAAM,IAAI,GAAI,SAAS,CAAC,OAAO,EAAuB,CAAC,IAAI,CAAC;QAE5D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAC3D,MAAM,MAAM,CAAC,OAAO,CAClB,IAAI,6BAA6B,CAC/B,IAAI,GAAG,CAAC,oBAAoB,IAAI,MAAM,CAAC,CACxC,CACF,CAAC;QACF,MAAM,MAAM,CAAC,QAAQ,CAAC;YACpB,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,EAAE;YACb,KAAK,EAAE,EAAE,eAAe,EAAE,OAAO,EAAE;SACpC,CAAC,CAAC;QACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QAErB,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;QAClF,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC;YACxB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAClB,MAAM,CAAC,YAAY,CACjB,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,EAAE,EACrD,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CACpD;SACJ,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,oBAAoB,EAAE,CAAC;QAE/C,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QACnD,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC;YACxB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAClB,MAAM,CAAC,YAAY,CACjB;gBACE,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,qCAAqC;gBAClD,WAAW,EAAE,EAAE;gBACf,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;aACzB,EACD,GAAG,EAAE,CAAC,CAAC;gBACL,iBAAiB,EAAE,EAAE;gBACrB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aACxC,CAAC,CACH;SACJ,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACvC,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAChD,MAAM,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACvD,UAAU,GAAG,SAAS,CAAC;QACvB,MAAM,IAAI,GAAI,SAAS,CAAC,OAAO,EAAuB,CAAC,IAAI,CAAC;QAE5D,MAAM,MAAM,GAAG,IAAI,MAAM,CACvB,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,EAC/B,EAAE,kBAAkB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CACzC,CAAC;QACF,MAAM,MAAM,CAAC,OAAO,CAClB,IAAI,6BAA6B,CAC/B,IAAI,GAAG,CAAC,oBAAoB,IAAI,MAAM,CAAC,CACxC,CACF,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;QACxE,MAAM,UAAU,GAAG,MAAM,CAAC,4BAA4B,EAAE,CAAC;QACzD,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QAErB,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["// @vitest-environment node\nimport http from \"node:http\";\nimport {\n  Client,\n  StreamableHTTPClientTransport,\n} from \"@modelcontextprotocol/client\";\nimport type { RequestHandler } from \"express\";\nimport { afterEach, describe, expect, it, vi } from \"vitest\";\nimport { z } from \"zod\";\nimport { Skybridge } from \"./app.js\";\n\nvi.mock(\"@skybridge/devtools\", () => ({\n  devtoolsStaticServer: () =>\n    ((_r: unknown, _s: unknown, n: () => void) => n()) as RequestHandler,\n}));\nvi.mock(\"./viewsDevServer.js\", () => ({\n  viewsDevServer: () =>\n    ((_r: unknown, _s: unknown, n: () => void) => n()) as RequestHandler,\n}));\n\nlet openServer: http.Server | undefined;\nafterEach(() => openServer?.close());\n\ndescribe(\"tool handler extra\", () => {\n  it(\"exposes the client hints the host sent on the request\", async () => {\n    const { createApp } = await import(\"./express.js\");\n    let seenLocale: unknown;\n    const app = new Skybridge({\n      name: \"t\",\n      version: \"0.0.0\",\n      handler: (server) =>\n        server.registerTool(\n          {\n            name: \"hints\",\n            description: \"Reads client hints.\",\n            inputSchema: {},\n          },\n          (_args, extra) => {\n            seenLocale = extra.mcpReq._meta?.[\"openai/locale\"];\n            return { content: [{ type: \"text\", text: \"ok\" }] };\n          },\n        ),\n    });\n\n    const httpServer = http.createServer();\n    const expressApp = await createApp({ app, httpServer });\n    const listening = http.createServer(expressApp);\n    await new Promise<void>((r) => listening.listen(0, r));\n    openServer = listening;\n    const port = (listening.address() as { port: number }).port;\n\n    const client = new Client({ name: \"c\", version: \"0.0.0\" });\n    await client.connect(\n      new StreamableHTTPClientTransport(\n        new URL(`http://localhost:${port}/mcp`),\n      ),\n    );\n    await client.callTool({\n      name: \"hints\",\n      arguments: {},\n      _meta: { \"openai/locale\": \"fr-FR\" },\n    });\n    await client.close();\n\n    expect(seenLocale).toBe(\"fr-FR\");\n  });\n});\n\ndescribe(\"stateless server instances\", () => {\n  it(\"carries the registered capabilities onto each per-request instance\", async () => {\n    const app = new Skybridge({\n      name: \"t\",\n      version: \"0.0.0\",\n      handler: (server) =>\n        server.registerTool(\n          { name: \"a-tool\", description: \"d\", inputSchema: {} },\n          () => ({ content: [{ type: \"text\", text: \"ok\" }] }),\n        ),\n    });\n\n    const fresh = await app.createServerInstance();\n\n    expect(fresh.getCapabilities().tools).toBeDefined();\n  });\n\n  it(\"serves a 2026-era caller with that era's result shape\", async () => {\n    const { createApp } = await import(\"./express.js\");\n    const app = new Skybridge({\n      name: \"t\",\n      version: \"0.0.0\",\n      handler: (server) =>\n        server.registerTool(\n          {\n            name: \"scalar\",\n            description: \"Returns a scalar structuredContent.\",\n            inputSchema: {},\n            outputSchema: z.number(),\n          },\n          () => ({\n            structuredContent: 42,\n            content: [{ type: \"text\", text: \"42\" }],\n          }),\n        ),\n    });\n\n    const httpServer = http.createServer();\n    const expressApp = await createApp({ app, httpServer });\n    const listening = http.createServer(expressApp);\n    await new Promise<void>((r) => listening.listen(0, r));\n    openServer = listening;\n    const port = (listening.address() as { port: number }).port;\n\n    const client = new Client(\n      { name: \"c\", version: \"0.0.0\" },\n      { versionNegotiation: { mode: \"auto\" } },\n    );\n    await client.connect(\n      new StreamableHTTPClientTransport(\n        new URL(`http://localhost:${port}/mcp`),\n      ),\n    );\n    const result = await client.callTool({ name: \"scalar\", arguments: {} });\n    const negotiated = client.getNegotiatedProtocolVersion();\n    await client.close();\n\n    expect(negotiated).toBe(\"2026-07-28\");\n    expect(result.structuredContent).toBe(42);\n  });\n});\n"]}
+{"version":3,"file":"tool-extra.test.js","sourceRoot":"","sources":["../../src/server/tool-extra.test.ts"],"names":[],"mappings":"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","sourcesContent":["// @vitest-environment node\nimport http from \"node:http\";\nimport {\n  Client,\n  StreamableHTTPClientTransport,\n} from \"@modelcontextprotocol/client\";\nimport type { RequestHandler } from \"express\";\nimport { afterEach, describe, expect, it, vi } from \"vitest\";\nimport { z } from \"zod\";\nimport { Skybridge } from \"./app.js\";\nimport { requestFormInput } from \"./form-input.js\";\n\nvi.mock(\"@skybridge/devtools\", () => ({\n  devtoolsStaticServer: () =>\n    ((_r: unknown, _s: unknown, n: () => void) => n()) as RequestHandler,\n}));\nvi.mock(\"./viewsDevServer.js\", () => ({\n  viewsDevServer: () =>\n    ((_r: unknown, _s: unknown, n: () => void) => n()) as RequestHandler,\n}));\n\nlet openServer: http.Server | undefined;\nafterEach(() => openServer?.close());\n\ndescribe(\"tool handler extra\", () => {\n  it(\"exposes the client hints the host sent on the request\", async () => {\n    const { createApp } = await import(\"./express.js\");\n    let seenLocale: unknown;\n    const app = new Skybridge({\n      name: \"t\",\n      version: \"0.0.0\",\n      handler: (server) =>\n        server.registerTool(\n          {\n            name: \"hints\",\n            description: \"Reads client hints.\",\n            inputSchema: {},\n          },\n          (_args, extra) => {\n            seenLocale = extra.mcpReq._meta?.[\"openai/locale\"];\n            return { content: [{ type: \"text\", text: \"ok\" }] };\n          },\n        ),\n    });\n\n    const httpServer = http.createServer();\n    const expressApp = await createApp({ app, httpServer });\n    const listening = http.createServer(expressApp);\n    await new Promise<void>((r) => listening.listen(0, r));\n    openServer = listening;\n    const port = (listening.address() as { port: number }).port;\n\n    const client = new Client({ name: \"c\", version: \"0.0.0\" });\n    await client.connect(\n      new StreamableHTTPClientTransport(\n        new URL(`http://localhost:${port}/mcp`),\n      ),\n    );\n    await client.callTool({\n      name: \"hints\",\n      arguments: {},\n      _meta: { \"openai/locale\": \"fr-FR\" },\n    });\n    await client.close();\n\n    expect(seenLocale).toBe(\"fr-FR\");\n  });\n});\n\ndescribe(\"stateless server instances\", () => {\n  it(\"carries the registered capabilities onto each per-request instance\", async () => {\n    const app = new Skybridge({\n      name: \"t\",\n      version: \"0.0.0\",\n      handler: (server) =>\n        server.registerTool(\n          { name: \"a-tool\", description: \"d\", inputSchema: {} },\n          () => ({ content: [{ type: \"text\", text: \"ok\" }] }),\n        ),\n    });\n\n    const fresh = await app.createServerInstance();\n\n    expect(fresh.getCapabilities().tools).toBeDefined();\n  });\n\n  it(\"serves a 2026-era caller with that era's result shape\", async () => {\n    const { createApp } = await import(\"./express.js\");\n    const app = new Skybridge({\n      name: \"t\",\n      version: \"0.0.0\",\n      handler: (server) =>\n        server.registerTool(\n          {\n            name: \"scalar\",\n            description: \"Returns a scalar structuredContent.\",\n            inputSchema: {},\n            outputSchema: z.number(),\n          },\n          () => ({\n            structuredContent: 42,\n            content: [{ type: \"text\", text: \"42\" }],\n          }),\n        ),\n    });\n\n    const httpServer = http.createServer();\n    const expressApp = await createApp({ app, httpServer });\n    const listening = http.createServer(expressApp);\n    await new Promise<void>((r) => listening.listen(0, r));\n    openServer = listening;\n    const port = (listening.address() as { port: number }).port;\n\n    const client = new Client(\n      { name: \"c\", version: \"0.0.0\" },\n      { versionNegotiation: { mode: \"auto\" } },\n    );\n    await client.connect(\n      new StreamableHTTPClientTransport(\n        new URL(`http://localhost:${port}/mcp`),\n      ),\n    );\n    const result = await client.callTool({ name: \"scalar\", arguments: {} });\n    const negotiated = client.getNegotiatedProtocolVersion();\n    await client.close();\n\n    expect(negotiated).toBe(\"2026-07-28\");\n    expect(result.structuredContent).toBe(42);\n  });\n\n  it(\"asks for an OpenAI form over multi-round-trip requests\", async () => {\n    const { createApp } = await import(\"./express.js\");\n    const requestedSchema = {\n      type: \"object\" as const,\n      properties: {\n        part: {\n          type: \"string\" as const,\n          oneOf: [{ const: \"bolt\", title: \"M6 bolt\", description: \"Fastener\" }],\n        },\n        drawing: {\n          type: \"string\" as const,\n          format: \"uri\" as const,\n          \"x-openai-input\": {\n            type: \"resource\" as const,\n            options: [{ uri: \"cad://drawings/bolt\", name: \"bolt\" }],\n          },\n        },\n      },\n      required: [\"part\"],\n    };\n    const app = new Skybridge({\n      name: \"t\",\n      version: \"0.0.0\",\n      handler: (server) =>\n        server.registerTool({ name: \"pick-part\" }, (_args, extra) => {\n          const result = requestFormInput(extra, {\n            key: \"part\",\n            message: \"Choose a part\",\n            requestedSchema,\n          });\n          if (\"resultType\" in result) {\n            return result;\n          }\n          return {\n            content: `${result.action}:${result.action === \"accept\" && result.content.part}`,\n          };\n        }),\n    });\n    const httpServer = http.createServer();\n    const expressApp = await createApp({ app, httpServer });\n    const listening = http.createServer(expressApp);\n    await new Promise<void>((r) => listening.listen(0, r));\n    openServer = listening;\n    const port = (listening.address() as { port: number }).port;\n\n    const client = new Client(\n      { name: \"c\", version: \"0.0.0\" },\n      {\n        capabilities: {\n          elicitation: { form: {} },\n          extensions: { \"openai/elicitation\": { form: {} } },\n        },\n        versionNegotiation: { mode: \"auto\" },\n      },\n    );\n    const asked: unknown[] = [];\n    let answer = { part: \"bolt\", drawing: \"cad://drawings/bolt\" };\n    client.setRequestHandler(\"elicitation/create\", (request) => {\n      asked.push(request.params);\n      return { action: \"accept\", content: answer };\n    });\n    await client.connect(\n      new StreamableHTTPClientTransport(\n        new URL(`http://localhost:${port}/mcp`),\n      ),\n    );\n\n    const result = await client.callTool({ name: \"pick-part\" });\n    expect(result.content).toEqual([{ type: \"text\", text: \"accept:bolt\" }]);\n    expect(asked).toEqual([\n      {\n        mode: \"form\",\n        message: \"Choose a part\",\n        requestedSchema: { type: \"object\", properties: {} },\n        _meta: { \"openai/elicitation\": { requestedSchema } },\n      },\n    ]);\n\n    for (answer of [\n      { part: \"washer\", drawing: \"cad://drawings/bolt\" },\n      { part: \"bolt\", drawing: \"cad://drawings/other\" },\n    ]) {\n      await expect(\n        client.callTool({ name: \"pick-part\" }),\n      ).resolves.toMatchObject({\n        isError: true,\n        content: [{ text: expect.stringContaining(\"does not match\") }],\n      });\n    }\n    await client.close();\n  });\n});\n"]}

package/dist/server/view-resource-resolution.test.js

@@ -157,6 +157,41 @@ describe("view resource resolution (cache key)", () => {
             await teardown();
         }
     });
+    it("preloads the view entry and its static imports (prod)", async () => {
+        process.env.NODE_ENV = "production";
+        __setBuildManifest({
+            "src/views/widget.tsx": {
+                isEntry: true,
+                name: "widget",
+                file: "assets/widget-ABC123.js",
+                imports: ["_shared.js", "_ui.js"],
+                dynamicImports: ["src/lazy.tsx"],
+            },
+            "_shared.js": { file: "assets/shared-DEF456.js" },
+            "_ui.js": { file: "assets/ui-GHI789.js", imports: ["_shared.js"] },
+            "src/lazy.tsx": { file: "assets/lazy-JKL012.js", isDynamicEntry: true },
+            "style.css": { file: "assets/style-XYZ.css" },
+        });
+        const { client, teardown } = await connect(registerWidget);
+        try {
+            const { contents } = await client.readResource({
+                uri: "ui://views/ext-apps/widget.html",
+            });
+            const { text } = textContent(contents);
+            const preloaded = [
+                ...text.matchAll(/<link rel="modulepreload" crossorigin href="[^"]*\/assets\/(assets\/[^"]+)" \/>/g),
+            ].map((match) => match[1]);
+            expect(preloaded).toEqual([
+                "assets/widget-ABC123.js",
+                "assets/shared-DEF456.js",
+                "assets/ui-GHI789.js",
+            ]);
+            expect(text.indexOf("modulepreload")).toBeLessThan(text.indexOf("import("));
+        }
+        finally {
+            await teardown();
+        }
+    });
     // Back-compat: older Skybridge advertised the view at `ui://views/apps-sdk/...`
     // via openai/outputTemplate. We no longer advertise it, but apps published then
     // have it cached, so the read must still resolve to the ext-apps content.

package/dist/server/view-resource-resolution.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"view-resource-resolution.test.js","sourceRoot":"","sources":["../../src/server/view-resource-resolution.test.ts"],"names":[],"mappings":"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","sourcesContent":["import http from \"node:http\";\nimport {\n  Client,\n  InMemoryTransport,\n  StreamableHTTPClientTransport,\n} from \"@modelcontextprotocol/client\";\nimport type { RequestHandler } from \"express\";\nimport { afterEach, describe, expect, it, vi } from \"vitest\";\nimport { __setBuildManifest, type McpServer, Skybridge } from \"./index.js\";\n\nvi.mock(\"@skybridge/devtools\", () => ({\n  devtoolsStaticServer: () =>\n    ((_req: unknown, _res: unknown, next: () => void) =>\n      next()) as RequestHandler,\n}));\nvi.mock(\"./viewsDevServer.js\", () => ({\n  viewsDevServer: (_httpServer: unknown) =>\n    ((_req: unknown, _res: unknown, next: () => void) =>\n      next()) as RequestHandler,\n}));\n\n// Mirror what the Skybridge Vite plugin generates in `.skybridge/views.d.ts`:\n// narrow `ViewName` so `component: \"widget\"` typechecks against the registry.\ndeclare module \"./server.js\" {\n  interface ViewNameRegistry {\n    widget: true;\n  }\n}\n\n// SKY-435: a view resource must resolve no matter the `?v=` query param value.\n// The version param is a content-derived cache key for external consumers\n// (it busts host/CDN caches when the bundle changes); it is not part of the\n// resource's identity, so a stale, absent, or arbitrary param must still serve\n// the underlying asset.\n\nfunction buildApp(register: (server: McpServer) => void) {\n  return new Skybridge({\n    name: \"test\",\n    version: \"1.0.0\",\n    handler: (server) => {\n      register(server);\n      return server;\n    },\n  });\n}\n\nasync function connect(register: (server: McpServer) => void) {\n  const instance = await buildApp(register).createServerInstance();\n  const client = new Client({ name: \"test-client\", version: \"1.0.0\" });\n  const [clientTransport, serverTransport] =\n    InMemoryTransport.createLinkedPair();\n  await instance.connect(serverTransport);\n  await client.connect(clientTransport);\n  return {\n    client,\n    teardown: async () => {\n      await client.close();\n      await instance.close();\n    },\n  };\n}\n\nlet openHttpServer: http.Server | undefined;\nafterEach(() => openHttpServer?.close());\n\n// Connect over real HTTP so forwarded proxy headers reach the resource handler.\nasync function connectHttp(\n  register: (server: McpServer) => void,\n  headers: Record<string, string>,\n) {\n  const { createApp } = await import(\"./express.js\");\n  const app = buildApp(register);\n  const httpServer = http.createServer();\n  await createApp({ app, httpServer });\n  const listening = http.createServer(app.express);\n  await new Promise<void>((resolve) => listening.listen(0, resolve));\n  openHttpServer = listening;\n  const port = (listening.address() as { port: number }).port;\n\n  const client = new Client({ name: \"test-client\", version: \"1.0.0\" });\n  const transport = new StreamableHTTPClientTransport(\n    new URL(`http://localhost:${port}/mcp`),\n    { requestInit: { headers } },\n  );\n  await client.connect(transport);\n  return {\n    client,\n    teardown: async () => {\n      await client.close();\n    },\n  };\n}\n\nfunction registerWidget(server: McpServer) {\n  server.registerTool(\n    { name: \"show\", description: \"show\", view: { component: \"widget\" } },\n    () => ({ content: [{ type: \"text\" as const, text: \"ok\" }] }),\n  );\n}\n\n/** Narrow a read-resource content entry to its text variant. */\nfunction textContent(contents: Array<{ uri: string }>): {\n  uri: string;\n  text: string;\n} {\n  return contents[0] as { uri: string; text: string };\n}\n\ndescribe(\"view resource resolution (cache key)\", () => {\n  afterEach(() => {\n    delete process.env.NODE_ENV;\n  });\n\n  it(\"resolves regardless of the ?v= param and echoes the requested URI\", async () => {\n    const { client, teardown } = await connect(registerWidget);\n\n    const { resources } = await client.listResources();\n    const listed = resources.find((r) =>\n      r.uri.startsWith(\"ui://views/ext-apps/widget.html\"),\n    );\n    // Dev build advertises no cache key.\n    expect(listed?.uri).toBe(\"ui://views/ext-apps/widget.html\");\n\n    // A stale/arbitrary/absent param all resolve the same underlying asset,\n    // and the response echoes the URI the consumer asked for (never rewritten).\n    for (const uri of [\n      \"ui://views/ext-apps/widget.html?v=stale123\",\n      \"ui://views/ext-apps/widget.html?v=whatever-else\",\n      \"ui://views/ext-apps/widget.html\",\n    ]) {\n      const { contents } = await client.readResource({ uri });\n      expect(contents).toHaveLength(1);\n      const content = textContent(contents);\n      expect(typeof content.text).toBe(\"string\");\n      expect(content.text.length).toBeGreaterThan(0);\n      expect(content.uri).toBe(uri);\n    }\n\n    await teardown();\n  });\n\n  it(\"resolves a stale cache key when the canonical URI carries ?v= (prod)\", async () => {\n    process.env.NODE_ENV = \"production\";\n    __setBuildManifest({\n      \"src/views/widget.tsx\": {\n        isEntry: true,\n        name: \"widget\",\n        file: \"assets/widget-ABC123.js\",\n      },\n      \"style.css\": { file: \"assets/style-XYZ.css\" },\n    } as unknown as Record<string, { file: string }>);\n\n    const { client, teardown } = await connect(registerWidget);\n\n    const { resources } = await client.listResources();\n    const listed = resources.find((r) =>\n      r.uri.startsWith(\"ui://views/ext-apps/widget.html\"),\n    );\n    // Production advertises a content-derived cache key.\n    expect(listed?.uri).toMatch(\n      /^ui:\\/\\/views\\/ext-apps\\/widget\\.html\\?v=[0-9a-f]{8}$/,\n    );\n\n    // A consumer holding a stale key still resolves the current asset.\n    const staleUri = \"ui://views/ext-apps/widget.html?v=00000000\";\n    const { contents } = await client.readResource({ uri: staleUri });\n    expect(contents).toHaveLength(1);\n    const content = textContent(contents);\n    expect(typeof content.text).toBe(\"string\");\n    expect(content.uri).toBe(staleUri);\n\n    await teardown();\n  });\n\n  it(\"still throws for an unknown view path\", async () => {\n    const { client, teardown } = await connect(registerWidget);\n\n    await expect(\n      client.readResource({ uri: \"ui://views/ext-apps/nope.html?v=1\" }),\n    ).rejects.toThrow();\n\n    await teardown();\n  });\n\n  // A proxy routing the request under a path prefix sends x-forwarded-prefix;\n  // the view's asset URLs must carry that prefix (and the forwarded origin) so\n  // they resolve back through the same routing. Per-request, so one process can\n  // serve many hosts/prefixes at once.\n  it(\"prefixes emitted asset URLs with x-forwarded-prefix (prod)\", async () => {\n    process.env.NODE_ENV = \"production\";\n    __setBuildManifest({\n      \"src/views/widget.tsx\": {\n        isEntry: true,\n        name: \"widget\",\n        file: \"assets/widget-ABC123.js\",\n      },\n      \"style.css\": { file: \"assets/style-XYZ.css\" },\n    } as unknown as Record<string, { file: string }>);\n\n    const { client, teardown } = await connectHttp(registerWidget, {\n      \"x-forwarded-host\": \"foo.com\",\n      \"x-forwarded-proto\": \"https\",\n      \"x-forwarded-prefix\": \"/v1/canary\",\n    });\n    try {\n      const { contents } = await client.readResource({\n        uri: \"ui://views/ext-apps/widget.html\",\n      });\n      const { text } = textContent(contents);\n      // Forwarded origin + prefix. (`assets/assets` is the existing layout: the\n      // manifest `file` already carries `assets/` and the template prepends\n      // `/assets/`; build.tsx's `_redirects` collapses it on the asset host.)\n      expect(text).toContain(\n        \"https://foo.com/v1/canary/assets/assets/widget-ABC123.js\",\n      );\n      expect(text).toContain(\n        \"https://foo.com/v1/canary/assets/assets/style-XYZ.css\",\n      );\n      // No unprefixed asset URL leaks through.\n      expect(text).not.toContain(\"foo.com/assets/\");\n    } finally {\n      await teardown();\n    }\n  });\n\n  // Back-compat: older Skybridge advertised the view at `ui://views/apps-sdk/...`\n  // via openai/outputTemplate. We no longer advertise it, but apps published then\n  // have it cached, so the read must still resolve to the ext-apps content.\n  it(\"resolves the legacy apps-sdk URL to the ext-apps content\", async () => {\n    const { client, teardown } = await connect(registerWidget);\n\n    const legacyUri = \"ui://views/apps-sdk/widget.html\";\n    const { contents } = await client.readResource({ uri: legacyUri });\n\n    expect(contents).toHaveLength(1);\n    const content = contents[0] as {\n      uri: string;\n      text: string;\n      mimeType: string;\n    };\n    expect(content.mimeType).toBe(\"text/html;profile=mcp-app\");\n    expect(content.text.length).toBeGreaterThan(0);\n    // The response echoes the requested (legacy) URI, never the canonical one.\n    expect(content.uri).toBe(legacyUri);\n\n    await teardown();\n  });\n});\n"]}
+{"version":3,"file":"view-resource-resolution.test.js","sourceRoot":"","sources":["../../src/server/view-resource-resolution.test.ts"],"names":[],"mappings":"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","sourcesContent":["import http from \"node:http\";\nimport {\n  Client,\n  InMemoryTransport,\n  StreamableHTTPClientTransport,\n} from \"@modelcontextprotocol/client\";\nimport type { RequestHandler } from \"express\";\nimport { afterEach, describe, expect, it, vi } from \"vitest\";\nimport { __setBuildManifest, type McpServer, Skybridge } from \"./index.js\";\n\nvi.mock(\"@skybridge/devtools\", () => ({\n  devtoolsStaticServer: () =>\n    ((_req: unknown, _res: unknown, next: () => void) =>\n      next()) as RequestHandler,\n}));\nvi.mock(\"./viewsDevServer.js\", () => ({\n  viewsDevServer: (_httpServer: unknown) =>\n    ((_req: unknown, _res: unknown, next: () => void) =>\n      next()) as RequestHandler,\n}));\n\n// Mirror what the Skybridge Vite plugin generates in `.skybridge/views.d.ts`:\n// narrow `ViewName` so `component: \"widget\"` typechecks against the registry.\ndeclare module \"./server.js\" {\n  interface ViewNameRegistry {\n    widget: true;\n  }\n}\n\n// SKY-435: a view resource must resolve no matter the `?v=` query param value.\n// The version param is a content-derived cache key for external consumers\n// (it busts host/CDN caches when the bundle changes); it is not part of the\n// resource's identity, so a stale, absent, or arbitrary param must still serve\n// the underlying asset.\n\nfunction buildApp(register: (server: McpServer) => void) {\n  return new Skybridge({\n    name: \"test\",\n    version: \"1.0.0\",\n    handler: (server) => {\n      register(server);\n      return server;\n    },\n  });\n}\n\nasync function connect(register: (server: McpServer) => void) {\n  const instance = await buildApp(register).createServerInstance();\n  const client = new Client({ name: \"test-client\", version: \"1.0.0\" });\n  const [clientTransport, serverTransport] =\n    InMemoryTransport.createLinkedPair();\n  await instance.connect(serverTransport);\n  await client.connect(clientTransport);\n  return {\n    client,\n    teardown: async () => {\n      await client.close();\n      await instance.close();\n    },\n  };\n}\n\nlet openHttpServer: http.Server | undefined;\nafterEach(() => openHttpServer?.close());\n\n// Connect over real HTTP so forwarded proxy headers reach the resource handler.\nasync function connectHttp(\n  register: (server: McpServer) => void,\n  headers: Record<string, string>,\n) {\n  const { createApp } = await import(\"./express.js\");\n  const app = buildApp(register);\n  const httpServer = http.createServer();\n  await createApp({ app, httpServer });\n  const listening = http.createServer(app.express);\n  await new Promise<void>((resolve) => listening.listen(0, resolve));\n  openHttpServer = listening;\n  const port = (listening.address() as { port: number }).port;\n\n  const client = new Client({ name: \"test-client\", version: \"1.0.0\" });\n  const transport = new StreamableHTTPClientTransport(\n    new URL(`http://localhost:${port}/mcp`),\n    { requestInit: { headers } },\n  );\n  await client.connect(transport);\n  return {\n    client,\n    teardown: async () => {\n      await client.close();\n    },\n  };\n}\n\nfunction registerWidget(server: McpServer) {\n  server.registerTool(\n    { name: \"show\", description: \"show\", view: { component: \"widget\" } },\n    () => ({ content: [{ type: \"text\" as const, text: \"ok\" }] }),\n  );\n}\n\n/** Narrow a read-resource content entry to its text variant. */\nfunction textContent(contents: Array<{ uri: string }>): {\n  uri: string;\n  text: string;\n} {\n  return contents[0] as { uri: string; text: string };\n}\n\ndescribe(\"view resource resolution (cache key)\", () => {\n  afterEach(() => {\n    delete process.env.NODE_ENV;\n  });\n\n  it(\"resolves regardless of the ?v= param and echoes the requested URI\", async () => {\n    const { client, teardown } = await connect(registerWidget);\n\n    const { resources } = await client.listResources();\n    const listed = resources.find((r) =>\n      r.uri.startsWith(\"ui://views/ext-apps/widget.html\"),\n    );\n    // Dev build advertises no cache key.\n    expect(listed?.uri).toBe(\"ui://views/ext-apps/widget.html\");\n\n    // A stale/arbitrary/absent param all resolve the same underlying asset,\n    // and the response echoes the URI the consumer asked for (never rewritten).\n    for (const uri of [\n      \"ui://views/ext-apps/widget.html?v=stale123\",\n      \"ui://views/ext-apps/widget.html?v=whatever-else\",\n      \"ui://views/ext-apps/widget.html\",\n    ]) {\n      const { contents } = await client.readResource({ uri });\n      expect(contents).toHaveLength(1);\n      const content = textContent(contents);\n      expect(typeof content.text).toBe(\"string\");\n      expect(content.text.length).toBeGreaterThan(0);\n      expect(content.uri).toBe(uri);\n    }\n\n    await teardown();\n  });\n\n  it(\"resolves a stale cache key when the canonical URI carries ?v= (prod)\", async () => {\n    process.env.NODE_ENV = \"production\";\n    __setBuildManifest({\n      \"src/views/widget.tsx\": {\n        isEntry: true,\n        name: \"widget\",\n        file: \"assets/widget-ABC123.js\",\n      },\n      \"style.css\": { file: \"assets/style-XYZ.css\" },\n    } as unknown as Record<string, { file: string }>);\n\n    const { client, teardown } = await connect(registerWidget);\n\n    const { resources } = await client.listResources();\n    const listed = resources.find((r) =>\n      r.uri.startsWith(\"ui://views/ext-apps/widget.html\"),\n    );\n    // Production advertises a content-derived cache key.\n    expect(listed?.uri).toMatch(\n      /^ui:\\/\\/views\\/ext-apps\\/widget\\.html\\?v=[0-9a-f]{8}$/,\n    );\n\n    // A consumer holding a stale key still resolves the current asset.\n    const staleUri = \"ui://views/ext-apps/widget.html?v=00000000\";\n    const { contents } = await client.readResource({ uri: staleUri });\n    expect(contents).toHaveLength(1);\n    const content = textContent(contents);\n    expect(typeof content.text).toBe(\"string\");\n    expect(content.uri).toBe(staleUri);\n\n    await teardown();\n  });\n\n  it(\"still throws for an unknown view path\", async () => {\n    const { client, teardown } = await connect(registerWidget);\n\n    await expect(\n      client.readResource({ uri: \"ui://views/ext-apps/nope.html?v=1\" }),\n    ).rejects.toThrow();\n\n    await teardown();\n  });\n\n  // A proxy routing the request under a path prefix sends x-forwarded-prefix;\n  // the view's asset URLs must carry that prefix (and the forwarded origin) so\n  // they resolve back through the same routing. Per-request, so one process can\n  // serve many hosts/prefixes at once.\n  it(\"prefixes emitted asset URLs with x-forwarded-prefix (prod)\", async () => {\n    process.env.NODE_ENV = \"production\";\n    __setBuildManifest({\n      \"src/views/widget.tsx\": {\n        isEntry: true,\n        name: \"widget\",\n        file: \"assets/widget-ABC123.js\",\n      },\n      \"style.css\": { file: \"assets/style-XYZ.css\" },\n    } as unknown as Record<string, { file: string }>);\n\n    const { client, teardown } = await connectHttp(registerWidget, {\n      \"x-forwarded-host\": \"foo.com\",\n      \"x-forwarded-proto\": \"https\",\n      \"x-forwarded-prefix\": \"/v1/canary\",\n    });\n    try {\n      const { contents } = await client.readResource({\n        uri: \"ui://views/ext-apps/widget.html\",\n      });\n      const { text } = textContent(contents);\n      // Forwarded origin + prefix. (`assets/assets` is the existing layout: the\n      // manifest `file` already carries `assets/` and the template prepends\n      // `/assets/`; build.tsx's `_redirects` collapses it on the asset host.)\n      expect(text).toContain(\n        \"https://foo.com/v1/canary/assets/assets/widget-ABC123.js\",\n      );\n      expect(text).toContain(\n        \"https://foo.com/v1/canary/assets/assets/style-XYZ.css\",\n      );\n      // No unprefixed asset URL leaks through.\n      expect(text).not.toContain(\"foo.com/assets/\");\n    } finally {\n      await teardown();\n    }\n  });\n\n  it(\"preloads the view entry and its static imports (prod)\", async () => {\n    process.env.NODE_ENV = \"production\";\n    __setBuildManifest({\n      \"src/views/widget.tsx\": {\n        isEntry: true,\n        name: \"widget\",\n        file: \"assets/widget-ABC123.js\",\n        imports: [\"_shared.js\", \"_ui.js\"],\n        dynamicImports: [\"src/lazy.tsx\"],\n      },\n      \"_shared.js\": { file: \"assets/shared-DEF456.js\" },\n      \"_ui.js\": { file: \"assets/ui-GHI789.js\", imports: [\"_shared.js\"] },\n      \"src/lazy.tsx\": { file: \"assets/lazy-JKL012.js\", isDynamicEntry: true },\n      \"style.css\": { file: \"assets/style-XYZ.css\" },\n    } as unknown as Record<string, { file: string }>);\n\n    const { client, teardown } = await connect(registerWidget);\n    try {\n      const { contents } = await client.readResource({\n        uri: \"ui://views/ext-apps/widget.html\",\n      });\n      const { text } = textContent(contents);\n      const preloaded = [\n        ...text.matchAll(\n          /<link rel=\"modulepreload\" crossorigin href=\"[^\"]*\\/assets\\/(assets\\/[^\"]+)\" \\/>/g,\n        ),\n      ].map((match) => match[1]);\n      expect(preloaded).toEqual([\n        \"assets/widget-ABC123.js\",\n        \"assets/shared-DEF456.js\",\n        \"assets/ui-GHI789.js\",\n      ]);\n      expect(text.indexOf(\"modulepreload\")).toBeLessThan(\n        text.indexOf(\"import(\"),\n      );\n    } finally {\n      await teardown();\n    }\n  });\n\n  // Back-compat: older Skybridge advertised the view at `ui://views/apps-sdk/...`\n  // via openai/outputTemplate. We no longer advertise it, but apps published then\n  // have it cached, so the read must still resolve to the ext-apps content.\n  it(\"resolves the legacy apps-sdk URL to the ext-apps content\", async () => {\n    const { client, teardown } = await connect(registerWidget);\n\n    const legacyUri = \"ui://views/apps-sdk/widget.html\";\n    const { contents } = await client.readResource({ uri: legacyUri });\n\n    expect(contents).toHaveLength(1);\n    const content = contents[0] as {\n      uri: string;\n      text: string;\n      mimeType: string;\n    };\n    expect(content.mimeType).toBe(\"text/html;profile=mcp-app\");\n    expect(content.text.length).toBeGreaterThan(0);\n    // The response echoes the requested (legacy) URI, never the canonical one.\n    expect(content.uri).toBe(legacyUri);\n\n    await teardown();\n  });\n});\n"]}

package/dist/web/bridges/adaptor.d.ts

@@ -1,4 +1,4 @@
-import type { Adaptor, AnyViewToolHandler, CallToolOptions, CallToolResponse, DownloadParams, DownloadResult, FileMetadata, HostContext, HostContextStore, ModelContextParams, OpenExternalOptions, RequestDisplayMode, RequestModalOptions, RequestSizeOptions, SendFollowUpMessageOptions, SetViewStateAction, UploadFileOptions, ViewToolConfig } from "./types.js";
+import type { Adaptor, AnyViewToolHandler, CallToolOptions, CallToolResponse, DownloadParams, DownloadResult, FileMetadata, FileResource, FileResourceContent, FileResourceWriteResult, FollowUpMessage, HostContext, HostContextStore, ModelContextParams, OpenExternalOptions, RequestDisplayMode, RequestModalOptions, RequestSizeOptions, ResourceRepresentation, SendFollowUpMessageOptions, SetViewStateAction, UploadFileOptions, ViewToolConfig } from "./types.js";
 /**
  * @internal
  * Single composite implementation of {@link Adaptor}. Composes the MCP App
@@ -16,6 +16,8 @@ export declare class HostAdaptor implements Adaptor {
     private readonly viewStateListeners;
     private _viewUUID;
     private _modelContext;
+    private readonly resourceListeners;
+    private resourceApp?;
     private _polyfillDisplay;
     private readonly polyfillDisplayListeners;
     private readonly polyfillDisplayStore;
@@ -34,12 +36,17 @@ export declare class HostAdaptor implements Adaptor {
     }>;
     requestClose: () => Promise<void>;
     requestSize: (size: RequestSizeOptions) => Promise<void>;
-    sendFollowUpMessage: (prompt: string, options?: SendFollowUpMessageOptions) => Promise<void>;
+    sendFollowUpMessage: (prompt: FollowUpMessage, options?: SendFollowUpMessageOptions) => Promise<void>;
     openExternal: (href: string, options?: OpenExternalOptions) => void;
     download: (params: DownloadParams) => Promise<DownloadResult>;
     setViewState: (stateOrUpdater: SetViewStateAction) => Promise<void>;
     updateModelContext: (params: ModelContextParams) => Promise<string | undefined>;
     private sendModelContext;
+    openFile: (path: string) => Promise<void>;
+    readResource: (uri: string, representation?: ResourceRepresentation) => Promise<FileResource>;
+    watchResource: (uri: string, onUpdate: () => void) => (() => void);
+    writeResource: (uri: string, content: FileResourceContent, ifMatch?: string) => Promise<FileResourceWriteResult>;
+    private getResourceApp;
     uploadFile: (file: File, options?: UploadFileOptions) => Promise<FileMetadata>;
     getFileDownloadUrl: (file: FileMetadata) => Promise<{
         downloadUrl: string;

package/dist/web/bridges/adaptor.js

@@ -1,7 +1,17 @@
+import { ResultSchema } from "@modelcontextprotocol/core";
+import * as z from "zod/v4";
 import { warnOnLargeViewState } from "../../context-warnings.js";
 import { AppsSdkBridge } from "./apps-sdk/bridge.js";
 import { McpAppBridge } from "./mcp-app/bridge.js";
 import { NotSupportedError } from "./types.js";
+const ResourceMetaSchema = z.object({
+    writable: z.boolean().optional(),
+    etag: z.string().optional(),
+});
+const WriteResultSchema = z.discriminatedUnion("outcome", [
+    z.object({ outcome: z.enum(["saved", "conflict"]), etag: z.string() }),
+    z.object({ outcome: z.literal("too-large"), maxBytes: z.number() }),
+]);
 const STORAGE_PREFIX = "sb:";
 const MAX_STORAGE_ENTRIES = 200;
 function isImage(mimeType) {
@@ -42,6 +52,8 @@ export class HostAdaptor {
     viewStateListeners = new Set();
     _viewUUID = null;
     _modelContext = null;
+    resourceListeners = new Map();
+    resourceApp;
     _polyfillDisplay = { mode: "inline" };
     polyfillDisplayListeners = new Set();
     polyfillDisplayStore;
@@ -103,9 +115,7 @@ export class HostAdaptor {
         }
         const app = await this.mcp.getApp();
         const params = { name, arguments: args ?? undefined };
-        const response = timeout === undefined
-            ? await app.callServerTool(params)
-            : await app.callServerTool(params, { timeout });
+        const response = await app.callServerTool(params, { timeout });
         return {
             content: response.content,
             structuredContent: response.structuredContent ?? {},
@@ -132,7 +142,8 @@ export class HostAdaptor {
         await app.sendSizeChanged(size);
     };
     sendFollowUpMessage = async (prompt, options) => {
-        if (this.openai) {
+        const target = options?.target;
+        if (this.openai && typeof prompt === "string" && target !== "new") {
             await this.openai.sendFollowUpMessage({
                 prompt,
                 scrollToBottom: options?.scrollToBottom,
@@ -140,10 +151,18 @@ export class HostAdaptor {
             return;
         }
         const app = await this.mcp.getApp();
-        await app.sendMessage({
+        if (target === "new" &&
+            !app.getHostCapabilities()?.experimental?.["openai/message"]) {
+            throw new NotSupportedError("sendFollowUpMessage", "the host does not advertise openai/message, so it can't open a new conversation");
+        }
+        const result = await app.sendMessage({
             role: "user",
-            content: [{ type: "text", text: prompt }],
+            content: typeof prompt === "string" ? [{ type: "text", text: prompt }] : prompt,
+            ...(target === "new" && { _meta: { "openai/message": { target } } }),
         });
+        if (result?.isError) {
+            throw new Error("The host rejected the follow-up message.");
+        }
     };
     openExternal = (href, options) => {
         if (this.openai) {
@@ -205,11 +224,15 @@ export class HostAdaptor {
         const previous = this._modelContext;
         this._modelContext = params;
         const result = await this.sendModelContext().catch((error) => {
-            this._modelContext = previous;
+            if (this._modelContext === params) {
+                this._modelContext = previous;
+            }
             throw error;
         });
-        const updateId = result._meta?.["openai/modelContext"]?.updateId;
-        return typeof updateId === "string" ? updateId : undefined;
+        const parsed = z
+            .object({ updateId: z.string() })
+            .safeParse(result._meta?.["openai/modelContext"]);
+        return parsed.success ? parsed.data.updateId : undefined;
     };
     async sendModelContext() {
         const viewState = this.openai ? null : this._viewState;
@@ -236,10 +259,84 @@ export class HostAdaptor {
             ],
         });
     }
+    openFile = async (path) => {
+        const app = await this.mcp.getApp();
+        if (!app.getHostCapabilities()?.experimental?.["openai/files"]) {
+            throw new NotSupportedError("openFile", "the host does not advertise openai/files");
+        }
+        await app.request({ method: "openai/files/open", params: { path } }, ResultSchema);
+    };
+    readResource = async (uri, representation) => {
+        const app = await this.mcp.getApp();
+        const { contents } = await app.readServerResource({
+            uri,
+            ...(representation && {
+                _meta: { "openai/resource": { representation } },
+            }),
+        });
+        const item = contents.find((content) => content.uri === uri) ?? contents[0];
+        if (!item) {
+            throw new Error(`The host returned no contents for ${uri}.`);
+        }
+        const { data: meta } = ResourceMetaSchema.safeParse(item._meta?.["openai/resource"]);
+        return {
+            ...("text" in item ? { text: item.text } : { blob: item.blob }),
+            mimeType: item.mimeType,
+            writable: meta?.writable ?? false,
+            etag: meta?.etag,
+        };
+    };
+    watchResource = (uri, onUpdate) => {
+        const listeners = this.resourceListeners.get(uri) ?? new Set();
+        if (listeners.size === 0) {
+            this.resourceListeners.set(uri, listeners);
+            this.getResourceApp()
+                .then((app) => app?.request({ method: "resources/subscribe", params: { uri } }, ResultSchema))
+                .catch((error) => {
+                console.warn(`Failed to subscribe to ${uri}.`, error);
+            });
+        }
+        listeners.add(onUpdate);
+        return () => {
+            if (listeners.delete(onUpdate) && listeners.size === 0) {
+                this.resourceListeners.delete(uri);
+                this.getResourceApp()
+                    .then((app) => app?.request({ method: "resources/unsubscribe", params: { uri } }, ResultSchema))
+                    .catch(() => { });
+            }
+        };
+    };
+    writeResource = async (uri, content, ifMatch) => {
+        const app = await this.getResourceApp();
+        if (!app) {
+            throw new NotSupportedError("writeResource", "the host does not advertise openai/resource");
+        }
+        return app.request({
+            method: "openai/resources/write",
+            params: { uri, ...content, ...(ifMatch && { ifMatch }) },
+        }, WriteResultSchema);
+    };
+    getResourceApp() {
+        this.resourceApp ??= this.mcp.getApp().then((app) => {
+            if (!app.getHostCapabilities()?.experimental?.["openai/resource"]) {
+                return undefined;
+            }
+            app.setNotificationHandler("notifications/resources/updated", ({ params }) => {
+                this.resourceListeners.get(params.uri)?.forEach((l) => {
+                    l();
+                });
+            });
+            return app;
+        });
+        return this.resourceApp;
+    }
     uploadFile = async (file, options) => {
         if (!this.openai) {
             throw new NotSupportedError("uploadFile");
         }
+        if (!this.openai.uploadFile) {
+            throw new NotSupportedError("uploadFile", "not available on the current host version");
+        }
         const metadata = await this.openai.uploadFile(file, options);
         if (isImage(metadata.mimeType ?? file.type)) {
             await this.trackFileIds(metadata.fileId);
@@ -250,6 +347,9 @@ export class HostAdaptor {
         if (!this.openai) {
             return Promise.reject(new NotSupportedError("getFileDownloadUrl"));
         }
+        if (!this.openai.getFileDownloadUrl) {
+            return Promise.reject(new NotSupportedError("getFileDownloadUrl", "not available on the current host version"));
+        }
         return this.openai.getFileDownloadUrl(file);
     };
     selectFiles = async () => {
@@ -257,7 +357,7 @@ export class HostAdaptor {
             throw new NotSupportedError("selectFiles");
         }
         if (!this.openai.selectFiles) {
-            throw new Error("selectFiles is not supported by the current host version.");
+            throw new NotSupportedError("selectFiles", "not available on the current host version");
         }
         const files = await this.openai.selectFiles();
         const imageIds = [];
@@ -285,6 +385,9 @@ export class HostAdaptor {
         if (!this.openai) {
             return Promise.reject(new NotSupportedError("setOpenInAppUrl"));
         }
+        if (!this.openai.setOpenInAppUrl) {
+            return Promise.reject(new NotSupportedError("setOpenInAppUrl", "not available on the current host version"));
+        }
         const trimmed = href.trim();
         if (!trimmed) {
             return Promise.reject(new Error("The href parameter is required."));