skybridge 0.0.0-dev.ef862d8 → 0.0.0-dev.f05bf4f

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (134) hide show
  1. package/dist/src/server/devtoolsStaticServer.d.ts +4 -0
  2. package/dist/src/server/devtoolsStaticServer.js +22 -12
  3. package/dist/src/server/devtoolsStaticServer.js.map +1 -1
  4. package/dist/src/server/index.d.ts +1 -1
  5. package/dist/src/server/server.d.ts +21 -9
  6. package/dist/src/server/server.js +51 -31
  7. package/dist/src/server/server.js.map +1 -1
  8. package/dist/src/server/templateHelper.d.ts +3 -0
  9. package/dist/src/server/templateHelper.js.map +1 -1
  10. package/dist/src/server/templates/development.hbs +41 -2
  11. package/dist/src/server/templates/production.hbs +1 -0
  12. package/dist/src/server/widgetsDevServer.js +11 -3
  13. package/dist/src/server/widgetsDevServer.js.map +1 -1
  14. package/dist/src/test/utils.d.ts +11 -0
  15. package/dist/src/test/utils.js +20 -0
  16. package/dist/src/test/utils.js.map +1 -1
  17. package/dist/src/test/widget.test.js +64 -16
  18. package/dist/src/test/widget.test.js.map +1 -1
  19. package/dist/src/web/bridges/adaptors/apps-sdk-adaptor.d.ts +13 -0
  20. package/dist/src/web/bridges/adaptors/apps-sdk-adaptor.js +33 -0
  21. package/dist/src/web/bridges/adaptors/apps-sdk-adaptor.js.map +1 -0
  22. package/dist/src/web/bridges/adaptors/mcp-app-adaptor.d.ts +16 -0
  23. package/dist/src/web/bridges/adaptors/mcp-app-adaptor.js +115 -0
  24. package/dist/src/web/bridges/adaptors/mcp-app-adaptor.js.map +1 -0
  25. package/dist/src/web/bridges/apps-sdk-bridge.d.ts +10 -0
  26. package/dist/src/web/bridges/apps-sdk-bridge.js +46 -0
  27. package/dist/src/web/bridges/apps-sdk-bridge.js.map +1 -0
  28. package/dist/src/web/bridges/hooks/use-adaptor.d.ts +2 -0
  29. package/dist/src/web/bridges/hooks/use-adaptor.js +8 -0
  30. package/dist/src/web/bridges/hooks/use-adaptor.js.map +1 -0
  31. package/dist/src/web/bridges/hooks/use-apps-sdk-bridge.d.ts +2 -0
  32. package/dist/src/web/bridges/hooks/use-apps-sdk-bridge.js +7 -0
  33. package/dist/src/web/bridges/hooks/use-apps-sdk-bridge.js.map +1 -0
  34. package/dist/src/web/bridges/hooks/use-bridge.d.ts +2 -0
  35. package/dist/src/web/bridges/hooks/use-bridge.js +8 -0
  36. package/dist/src/web/bridges/hooks/use-bridge.js.map +1 -0
  37. package/dist/src/web/bridges/hooks/use-mcp-app-bridge.d.ts +5 -0
  38. package/dist/src/web/bridges/hooks/use-mcp-app-bridge.js +7 -0
  39. package/dist/src/web/bridges/hooks/use-mcp-app-bridge.js.map +1 -0
  40. package/dist/src/web/bridges/hooks/use-mcp-app-bridge.test.js +41 -0
  41. package/dist/src/web/bridges/hooks/use-mcp-app-bridge.test.js.map +1 -0
  42. package/dist/src/web/bridges/index.d.ts +4 -0
  43. package/dist/src/web/bridges/index.js +5 -0
  44. package/dist/src/web/bridges/index.js.map +1 -0
  45. package/dist/src/web/bridges/mcp-app-bridge.d.ts +38 -0
  46. package/dist/src/web/bridges/mcp-app-bridge.js +162 -0
  47. package/dist/src/web/bridges/mcp-app-bridge.js.map +1 -0
  48. package/dist/src/web/bridges/types.d.ts +57 -0
  49. package/dist/src/web/bridges/types.js +2 -0
  50. package/dist/src/web/bridges/types.js.map +1 -0
  51. package/dist/src/web/data-llm.js +4 -2
  52. package/dist/src/web/data-llm.js.map +1 -1
  53. package/dist/src/web/generate-helpers.test-d.js +31 -2
  54. package/dist/src/web/generate-helpers.test-d.js.map +1 -1
  55. package/dist/src/web/hooks/index.d.ts +2 -3
  56. package/dist/src/web/hooks/index.js +2 -3
  57. package/dist/src/web/hooks/index.js.map +1 -1
  58. package/dist/src/web/hooks/test/utils.d.ts +10 -0
  59. package/dist/src/web/hooks/test/utils.js +40 -0
  60. package/dist/src/web/hooks/test/utils.js.map +1 -0
  61. package/dist/src/web/hooks/use-call-tool.js +12 -4
  62. package/dist/src/web/hooks/use-call-tool.js.map +1 -1
  63. package/dist/src/web/hooks/use-call-tool.test.js +26 -0
  64. package/dist/src/web/hooks/use-call-tool.test.js.map +1 -1
  65. package/dist/src/web/hooks/use-display-mode.d.ts +1 -1
  66. package/dist/src/web/hooks/use-display-mode.js +6 -3
  67. package/dist/src/web/hooks/use-display-mode.js.map +1 -1
  68. package/dist/src/web/hooks/use-display-mode.test.js +1 -0
  69. package/dist/src/web/hooks/use-display-mode.test.js.map +1 -1
  70. package/dist/src/web/hooks/use-layout.d.ts +22 -0
  71. package/dist/src/web/hooks/use-layout.js +23 -0
  72. package/dist/src/web/hooks/use-layout.js.map +1 -0
  73. package/dist/src/web/hooks/use-layout.test.js +95 -0
  74. package/dist/src/web/hooks/use-layout.test.js.map +1 -0
  75. package/dist/src/web/hooks/use-open-external.js +5 -3
  76. package/dist/src/web/hooks/use-open-external.js.map +1 -1
  77. package/dist/src/web/hooks/use-open-external.test.js +41 -15
  78. package/dist/src/web/hooks/use-open-external.test.js.map +1 -1
  79. package/dist/src/web/hooks/use-openai-global.d.ts +2 -1
  80. package/dist/src/web/hooks/use-openai-global.js +3 -22
  81. package/dist/src/web/hooks/use-openai-global.js.map +1 -1
  82. package/dist/src/web/hooks/use-request-modal.d.ts +6 -3
  83. package/dist/src/web/hooks/use-request-modal.js +6 -1
  84. package/dist/src/web/hooks/use-request-modal.js.map +1 -1
  85. package/dist/src/web/hooks/use-request-modal.test.js +35 -2
  86. package/dist/src/web/hooks/use-request-modal.test.js.map +1 -1
  87. package/dist/src/web/hooks/use-send-follow-up-message.js +3 -6
  88. package/dist/src/web/hooks/use-send-follow-up-message.js.map +1 -1
  89. package/dist/src/web/hooks/use-tool-info.d.ts +12 -1
  90. package/dist/src/web/hooks/use-tool-info.js +15 -9
  91. package/dist/src/web/hooks/use-tool-info.js.map +1 -1
  92. package/dist/src/web/hooks/use-tool-info.test-d.js +40 -4
  93. package/dist/src/web/hooks/use-tool-info.test-d.js.map +1 -1
  94. package/dist/src/web/hooks/use-tool-info.test.js +117 -46
  95. package/dist/src/web/hooks/use-tool-info.test.js.map +1 -1
  96. package/dist/src/web/hooks/use-user.d.ts +18 -0
  97. package/dist/src/web/hooks/use-user.js +19 -0
  98. package/dist/src/web/hooks/use-user.js.map +1 -0
  99. package/dist/src/web/hooks/use-user.test.js +93 -0
  100. package/dist/src/web/hooks/use-user.test.js.map +1 -0
  101. package/dist/src/web/hooks/use-widget-state.js +2 -2
  102. package/dist/src/web/hooks/use-widget-state.js.map +1 -1
  103. package/dist/src/web/hooks/use-widget-state.test.js +1 -0
  104. package/dist/src/web/hooks/use-widget-state.test.js.map +1 -1
  105. package/dist/src/web/index.d.ts +1 -0
  106. package/dist/src/web/index.js +1 -0
  107. package/dist/src/web/index.js.map +1 -1
  108. package/dist/src/web/plugin/plugin.js +10 -4
  109. package/dist/src/web/plugin/plugin.js.map +1 -1
  110. package/dist/src/web/plugin/transform-data-llm.js +6 -3
  111. package/dist/src/web/plugin/transform-data-llm.js.map +1 -1
  112. package/dist/src/web/proxy.js +5 -0
  113. package/dist/src/web/proxy.js.map +1 -1
  114. package/dist/src/web/types.d.ts +24 -8
  115. package/dist/src/web/types.js.map +1 -1
  116. package/package.json +20 -15
  117. package/dist/src/web/hooks/use-locale.d.ts +0 -1
  118. package/dist/src/web/hooks/use-locale.js +0 -5
  119. package/dist/src/web/hooks/use-locale.js.map +0 -1
  120. package/dist/src/web/hooks/use-locale.test.js +0 -21
  121. package/dist/src/web/hooks/use-locale.test.js.map +0 -1
  122. package/dist/src/web/hooks/use-theme.d.ts +0 -1
  123. package/dist/src/web/hooks/use-theme.js +0 -5
  124. package/dist/src/web/hooks/use-theme.js.map +0 -1
  125. package/dist/src/web/hooks/use-theme.test.js +0 -26
  126. package/dist/src/web/hooks/use-theme.test.js.map +0 -1
  127. package/dist/src/web/hooks/use-user-agent.d.ts +0 -1
  128. package/dist/src/web/hooks/use-user-agent.js +0 -5
  129. package/dist/src/web/hooks/use-user-agent.js.map +0 -1
  130. package/dist/src/web/hooks/use-user-agent.test.js +0 -31
  131. package/dist/src/web/hooks/use-user-agent.test.js.map +0 -1
  132. /package/dist/src/web/{hooks/use-locale.test.d.ts → bridges/hooks/use-mcp-app-bridge.test.d.ts} +0 -0
  133. /package/dist/src/web/hooks/{use-theme.test.d.ts → use-layout.test.d.ts} +0 -0
  134. /package/dist/src/web/hooks/{use-user-agent.test.d.ts → use-user.test.d.ts} +0 -0
@@ -2,6 +2,10 @@ import { type RequestHandler } from "express";
2
2
  /**
3
3
  * Serve the built devtools React app
4
4
  * This router serves static files from the devtools's dist directory.
5
+ *
6
+ * **Note:** This requires `@skybridge/devtools` to be installed as a peer dependency.
7
+ * Install it with: `pnpm add -D @skybridge/devtools` (or `npm install -D @skybridge/devtools`)
8
+ *
5
9
  * It should be installed at the application root, like so:
6
10
  *
7
11
  * const app = express();
@@ -1,11 +1,15 @@
1
- import { readFileSync } from "node:fs";
1
+ import { createRequire } from "node:module";
2
2
  import path from "node:path";
3
- import { fileURLToPath } from "node:url";
4
3
  import cors from "cors";
5
4
  import express, {} from "express";
5
+ const require = createRequire(import.meta.url);
6
6
  /**
7
7
  * Serve the built devtools React app
8
8
  * This router serves static files from the devtools's dist directory.
9
+ *
10
+ * **Note:** This requires `@skybridge/devtools` to be installed as a peer dependency.
11
+ * Install it with: `pnpm add -D @skybridge/devtools` (or `npm install -D @skybridge/devtools`)
12
+ *
9
13
  * It should be installed at the application root, like so:
10
14
  *
11
15
  * const app = express();
@@ -18,20 +22,26 @@ import express, {} from "express";
18
22
  */
19
23
  export const devtoolsStaticServer = async () => {
20
24
  const router = express.Router();
21
- const currentDir = path.dirname(fileURLToPath(import.meta.url));
22
- const devtoolsPath = path.join(currentDir, "..", "devtools");
25
+ let devtoolsPath;
26
+ try {
27
+ const devtoolsPackagePath = require.resolve("@skybridge/devtools/package.json");
28
+ devtoolsPath = path.join(path.dirname(devtoolsPackagePath), "dist");
29
+ }
30
+ catch (error) {
31
+ throw new Error("@skybridge/devtools is not installed. Please install it as a dev dependency:\n" +
32
+ " pnpm add -D @skybridge/devtools\n" +
33
+ " or\n" +
34
+ " npm install -D @skybridge/devtools", { cause: error });
35
+ }
23
36
  router.use(cors());
24
37
  router.use(express.static(devtoolsPath));
25
38
  router.get("/", (_req, res, next) => {
26
39
  const indexHtmlPath = path.join(devtoolsPath, "index.html");
27
- try {
28
- const indexHtml = readFileSync(indexHtmlPath, "utf-8");
29
- res.setHeader("Content-Type", "text/html");
30
- res.send(indexHtml);
31
- }
32
- catch (error) {
33
- next(error);
34
- }
40
+ res.sendFile(indexHtmlPath, (error) => {
41
+ if (error) {
42
+ next(error);
43
+ }
44
+ });
35
45
  });
36
46
  return router;
37
47
  };
@@ -1 +1 @@
1
- {"version":3,"file":"devtoolsStaticServer.js","sourceRoot":"","sources":["../../../src/server/devtoolsStaticServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,EAAE,EAAuB,MAAM,SAAS,CAAC;AAEvD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,IAA6B,EAAE;IACtE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAChC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;IAE7D,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IAEnB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;IAEzC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAClC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAC5D,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;YACvD,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;YAC3C,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
1
+ {"version":3,"file":"devtoolsStaticServer.js","sourceRoot":"","sources":["../../../src/server/devtoolsStaticServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,EAAE,EAAuB,MAAM,SAAS,CAAC;AAEvD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,IAA6B,EAAE;IACtE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAChC,IAAI,YAAoB,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO,CACzC,kCAAkC,CACnC,CAAC;QACF,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC,CAAC;IACtE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,gFAAgF;YAC9E,qCAAqC;YACrC,QAAQ;YACR,sCAAsC,EACxC,EAAE,KAAK,EAAE,KAAK,EAAE,CACjB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IAEnB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;IAEzC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAClC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAC5D,GAAG,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;YACpC,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,CAAC,KAAK,CAAC,CAAC;YACd,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
@@ -1,5 +1,5 @@
1
1
  export { devtoolsStaticServer } from "./devtoolsStaticServer.js";
2
2
  export type { AnyToolRegistry, InferTools, ToolInput, ToolNames, ToolOutput, ToolResponseMetadata, } from "./inferUtilityTypes.js";
3
- export type { McpServerTypes, ToolDef } from "./server.js";
3
+ export type { McpServerTypes, ToolDef, WidgetHostType } from "./server.js";
4
4
  export { McpServer } from "./server.js";
5
5
  export { widgetsDevServer } from "./widgetsDevServer.js";
@@ -7,16 +7,22 @@ export type ToolDef<TInput = unknown, TOutput = unknown, TResponseMetadata = unk
7
7
  output: TOutput;
8
8
  responseMetadata: TResponseMetadata;
9
9
  };
10
+ export type WidgetHostType = "apps-sdk" | "mcp-app";
10
11
  type McpServerOriginalResourceConfig = Omit<Resource, "uri" | "name" | "mimeType">;
11
12
  type McpServerOriginalToolConfig = Omit<Parameters<typeof McpServerBase.prototype.registerTool<ZodRawShapeCompat, ZodRawShapeCompat>>[1], "inputSchema" | "outputSchema">;
13
+ type Simplify<T> = {
14
+ [K in keyof T]: T[K];
15
+ };
12
16
  type ExtractStructuredContent<T> = T extends {
13
17
  structuredContent: infer SC;
14
- } ? SC : never;
15
- type ExtractMeta<T> = Extract<T, {
18
+ } ? Simplify<SC> : never;
19
+ type ExtractMeta<T> = [Extract<T, {
20
+ _meta: unknown;
21
+ }>] extends [never] ? unknown : Extract<T, {
16
22
  _meta: unknown;
17
23
  }> extends {
18
24
  _meta: infer M;
19
- } ? M : unknown;
25
+ } ? Simplify<M> : unknown;
20
26
  /**
21
27
  * Type-level marker interface for cross-package type inference.
22
28
  * This enables TypeScript to infer tool types across package boundaries
@@ -29,9 +35,6 @@ type ExtractMeta<T> = Extract<T, {
29
35
  export interface McpServerTypes<TTools extends Record<string, ToolDef>> {
30
36
  readonly tools: TTools;
31
37
  }
32
- type Simplify<T> = {
33
- [K in keyof T]: T[K];
34
- };
35
38
  type ShapeOutput<Shape extends ZodRawShapeCompat> = Simplify<{
36
39
  [K in keyof Shape as undefined extends SchemaOutput<Shape[K]> ? never : K]: SchemaOutput<Shape[K]>;
37
40
  } & {
@@ -48,15 +51,24 @@ type ToolConfig<TInput extends ZodRawShapeCompat | AnySchema> = {
48
51
  annotations?: ToolAnnotations;
49
52
  _meta?: Record<string, unknown>;
50
53
  };
51
- type ToolHandler<TInput extends ZodRawShapeCompat, TReturn extends CallToolResult = CallToolResult> = (args: ShapeOutput<TInput>, extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => TReturn | Promise<TReturn>;
54
+ type ToolHandler<TInput extends ZodRawShapeCompat, TReturn extends {
55
+ content: CallToolResult["content"];
56
+ } = CallToolResult> = (args: ShapeOutput<TInput>, extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => TReturn | Promise<TReturn>;
52
57
  export declare class McpServer<TTools extends Record<string, ToolDef> = Record<never, ToolDef>> extends McpServerBase {
53
58
  readonly $types: McpServerTypes<TTools>;
54
- registerWidget<TName extends string, TInput extends ZodRawShapeCompat, TReturn extends CallToolResult>(name: TName, resourceConfig: McpServerOriginalResourceConfig, toolConfig: McpServerOriginalToolConfig & {
59
+ registerWidget<TName extends string, TInput extends ZodRawShapeCompat, TReturn extends {
60
+ content: CallToolResult["content"];
61
+ }>(name: TName, resourceConfig: McpServerOriginalResourceConfig, toolConfig: McpServerOriginalToolConfig & {
55
62
  inputSchema?: TInput;
56
63
  outputSchema?: ZodRawShapeCompat | AnySchema;
57
64
  }, toolCallback: ToolHandler<TInput, TReturn>): AddTool<TTools, TName, TInput, ExtractStructuredContent<TReturn>, ExtractMeta<TReturn>>;
58
- registerTool<TName extends string, InputArgs extends ZodRawShapeCompat, TReturn extends CallToolResult>(name: TName, config: ToolConfig<InputArgs>, cb: ToolHandler<InputArgs, TReturn>): AddTool<TTools, TName, InputArgs, ExtractStructuredContent<TReturn>, ExtractMeta<TReturn>>;
65
+ registerTool<TName extends string, InputArgs extends ZodRawShapeCompat, TReturn extends {
66
+ content: CallToolResult["content"];
67
+ }>(name: TName, config: ToolConfig<InputArgs>, cb: ToolHandler<InputArgs, TReturn>): AddTool<TTools, TName, InputArgs, ExtractStructuredContent<TReturn>, ExtractMeta<TReturn>>;
59
68
  registerTool<InputArgs extends ZodRawShapeCompat>(name: string, config: ToolConfig<InputArgs>, cb: ToolHandler<InputArgs>): RegisteredTool;
69
+ private registerWidgetResource;
60
70
  private lookupDistFile;
71
+ private lookupDistFileWithIndexFallback;
72
+ private readManifest;
61
73
  }
62
74
  export {};
@@ -4,45 +4,36 @@ import { McpServer as McpServerBase, } from "@modelcontextprotocol/sdk/server/mc
4
4
  import { templateHelper } from "./templateHelper.js";
5
5
  export class McpServer extends McpServerBase {
6
6
  registerWidget(name, resourceConfig, toolConfig, toolCallback) {
7
- const uri = `ui://widgets/${name}.html`;
8
7
  const resourceMetadata = {
9
8
  ...(resourceConfig._meta ?? {}),
10
9
  };
11
10
  if (toolConfig.description !== undefined) {
12
11
  resourceMetadata["openai/widgetDescription"] = toolConfig.description;
13
12
  }
14
- this.registerResource(name, uri, {
15
- ...resourceConfig,
16
- _meta: resourceMetadata,
17
- }, async (_uri, extra) => {
18
- const serverUrl = process.env.NODE_ENV === "production"
19
- ? `https://${extra?.requestInfo?.headers?.["x-forwarded-host"] ??
20
- extra?.requestInfo?.headers?.host}`
21
- : `http://localhost:3000`;
22
- const html = process.env.NODE_ENV === "production"
23
- ? templateHelper.renderProduction({
24
- serverUrl,
25
- widgetFile: this.lookupDistFile(`src/widgets/${name}.tsx`),
26
- styleFile: this.lookupDistFile("style.css"),
27
- })
28
- : templateHelper.renderDevelopment({
29
- serverUrl,
30
- widgetName: name,
31
- });
32
- return {
33
- contents: [
34
- {
35
- uri,
36
- mimeType: "text/html+skybridge",
37
- text: html,
38
- },
39
- ],
40
- };
13
+ const appsSdkResourceConfig = {
14
+ hostType: "apps-sdk",
15
+ uri: `ui://widgets/apps-sdk/${name}.html`,
16
+ mimeType: "text/html+skybridge",
17
+ };
18
+ const extAppsResourceConfig = {
19
+ hostType: "mcp-app",
20
+ uri: `ui://widgets/ext-apps/${name}.html`,
21
+ mimeType: "text/html;profile=mcp-app",
22
+ };
23
+ [appsSdkResourceConfig, extAppsResourceConfig].forEach(({ hostType, uri, mimeType }) => {
24
+ this.registerWidgetResource({
25
+ name,
26
+ hostType,
27
+ widgetUri: uri,
28
+ mimeType,
29
+ resourceConfig,
30
+ resourceMetadata,
31
+ });
41
32
  });
42
33
  const toolMeta = {
43
34
  ...toolConfig._meta,
44
- "openai/outputTemplate": uri,
45
- "ui/resourceUri": uri,
35
+ "openai/outputTemplate": appsSdkResourceConfig.uri,
36
+ "ui/resourceUri": extAppsResourceConfig.uri,
46
37
  };
47
38
  this.registerTool(name, {
48
39
  ...toolConfig,
@@ -54,9 +45,38 @@ export class McpServer extends McpServerBase {
54
45
  super.registerTool(name, config, cb);
55
46
  return this;
56
47
  }
48
+ registerWidgetResource({ name, hostType, widgetUri, mimeType, resourceConfig, resourceMetadata, }) {
49
+ this.registerResource(name, widgetUri, { ...resourceConfig, _meta: resourceMetadata }, async (uri, extra) => {
50
+ const serverUrl = process.env.NODE_ENV === "production"
51
+ ? `https://${extra?.requestInfo?.headers?.["x-forwarded-host"] ?? extra?.requestInfo?.headers?.host}`
52
+ : `http://localhost:3000`;
53
+ const html = process.env.NODE_ENV === "production"
54
+ ? templateHelper.renderProduction({
55
+ hostType,
56
+ serverUrl,
57
+ widgetFile: this.lookupDistFileWithIndexFallback(`src/widgets/${name}`),
58
+ styleFile: this.lookupDistFile("style.css"),
59
+ })
60
+ : templateHelper.renderDevelopment({
61
+ hostType,
62
+ serverUrl,
63
+ widgetName: name,
64
+ });
65
+ return { contents: [{ uri: uri.href, mimeType, text: html }] };
66
+ });
67
+ }
57
68
  lookupDistFile(key) {
58
- const manifest = JSON.parse(readFileSync(path.join(process.cwd(), "dist", "assets", ".vite", "manifest.json"), "utf-8"));
69
+ const manifest = this.readManifest();
59
70
  return manifest[key]?.file;
60
71
  }
72
+ lookupDistFileWithIndexFallback(basePath) {
73
+ const manifest = this.readManifest();
74
+ const flatFileKey = `${basePath}.tsx`;
75
+ const indexFileKey = `${basePath}/index.tsx`;
76
+ return manifest[flatFileKey]?.file ?? manifest[indexFileKey]?.file;
77
+ }
78
+ readManifest() {
79
+ return JSON.parse(readFileSync(path.join(process.cwd(), "dist", "assets", ".vite", "manifest.json"), "utf-8"));
80
+ }
61
81
  }
62
82
  //# sourceMappingURL=server.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACL,SAAS,IAAI,aAAa,GAG3B,MAAM,yCAAyC,CAAC;AAcjD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA0HrD,MAAM,OAAO,SAEX,SAAQ,aAAa;IAGrB,cAAc,CAKZ,IAAW,EACX,cAA+C,EAC/C,UAGC,EACD,YAA0C;QAQ1C,MAAM,GAAG,GAAG,gBAAgB,IAAI,OAAO,CAAC;QACxC,MAAM,gBAAgB,GAAiB;YACrC,GAAG,CAAC,cAAc,CAAC,KAAK,IAAI,EAAE,CAAC;SAChC,CAAC;QACF,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACzC,gBAAgB,CAAC,0BAA0B,CAAC,GAAG,UAAU,CAAC,WAAW,CAAC;QACxE,CAAC;QAED,IAAI,CAAC,gBAAgB,CACnB,IAAI,EACJ,GAAG,EACH;YACE,GAAG,cAAc;YACjB,KAAK,EAAE,gBAAgB;SACxB,EACD,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;YACpB,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;gBACnC,CAAC,CAAC,WACE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,kBAAkB,CAAC;oBACjD,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,IAC/B,EAAE;gBACJ,CAAC,CAAC,uBAAuB,CAAC;YAE9B,MAAM,IAAI,GACR,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;gBACnC,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC;oBAC9B,SAAS;oBACT,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,eAAe,IAAI,MAAM,CAAC;oBAC1D,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC;iBAC5C,CAAC;gBACJ,CAAC,CAAC,cAAc,CAAC,iBAAiB,CAAC;oBAC/B,SAAS;oBACT,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;YAET,OAAO;gBACL,QAAQ,EAAE;oBACR;wBACE,GAAG;wBACH,QAAQ,EAAE,qBAAqB;wBAC/B,IAAI,EAAE,IAAI;qBACX;iBACF;aACF,CAAC;QACJ,CAAC,CACF,CAAC;QAEF,MAAM,QAAQ,GAAa;YACzB,GAAG,UAAU,CAAC,KAAK;YACnB,uBAAuB,EAAE,GAAG;YAC5B,gBAAgB,EAAE,GAAG;SACtB,CAAC;QAEF,IAAI,CAAC,YAAY,CACf,IAAI,EACJ;YACE,GAAG,UAAU;YACb,KAAK,EAAE,QAAQ;SAChB,EACD,YAAY,CACb,CAAC;QAEF,OAAO,IAMN,CAAC;IACJ,CAAC;IAwBQ,YAAY,CACnB,IAAY,EACZ,MAA6B,EAC7B,EAA2B;QAE3B,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,cAAc,CAAC,GAAW;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CACzB,YAAY,CACV,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAC,EACpE,OAAO,CACR,CACF,CAAC;QAEF,OAAO,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC;IAC7B,CAAC;CACF"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACL,SAAS,IAAI,aAAa,GAG3B,MAAM,yCAAyC,CAAC;AAcjD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAqIrD,MAAM,OAAO,SAEX,SAAQ,aAAa;IAGrB,cAAc,CAKZ,IAAW,EACX,cAA+C,EAC/C,UAGC,EACD,YAA0C;QAQ1C,MAAM,gBAAgB,GAAiB;YACrC,GAAG,CAAC,cAAc,CAAC,KAAK,IAAI,EAAE,CAAC;SAChC,CAAC;QACF,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACzC,gBAAgB,CAAC,0BAA0B,CAAC,GAAG,UAAU,CAAC,WAAW,CAAC;QACxE,CAAC;QAED,MAAM,qBAAqB,GAAyB;YAClD,QAAQ,EAAE,UAAU;YACpB,GAAG,EAAE,yBAAyB,IAAI,OAAO;YACzC,QAAQ,EAAE,qBAAqB;SAChC,CAAC;QAEF,MAAM,qBAAqB,GAAyB;YAClD,QAAQ,EAAE,SAAS;YACnB,GAAG,EAAE,yBAAyB,IAAI,OAAO;YACzC,QAAQ,EAAE,2BAA2B;SACtC,CAAC;QAEF,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,CAAC,OAAO,CACpD,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE;YAC9B,IAAI,CAAC,sBAAsB,CAAC;gBAC1B,IAAI;gBACJ,QAAQ;gBACR,SAAS,EAAE,GAAG;gBACd,QAAQ;gBACR,cAAc;gBACd,gBAAgB;aACjB,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QAEF,MAAM,QAAQ,GAAa;YACzB,GAAG,UAAU,CAAC,KAAK;YACnB,uBAAuB,EAAE,qBAAqB,CAAC,GAAG;YAClD,gBAAgB,EAAE,qBAAqB,CAAC,GAAG;SAC5C,CAAC;QAEF,IAAI,CAAC,YAAY,CACf,IAAI,EACJ;YACE,GAAG,UAAU;YACb,KAAK,EAAE,QAAQ;SAChB,EACD,YAAY,CACb,CAAC;QAEF,OAAO,IAMN,CAAC;IACJ,CAAC;IAwBQ,YAAY,CACnB,IAAY,EACZ,MAA6B,EAC7B,EAA2B;QAE3B,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,sBAAsB,CAAC,EAC7B,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,cAAc,EACd,gBAAgB,GAQjB;QACC,IAAI,CAAC,gBAAgB,CACnB,IAAI,EACJ,SAAS,EACT,EAAE,GAAG,cAAc,EAAE,KAAK,EAAE,gBAAgB,EAAE,EAC9C,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;YACnB,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;gBACnC,CAAC,CAAC,WAAW,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,kBAAkB,CAAC,IAAI,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE;gBACrG,CAAC,CAAC,uBAAuB,CAAC;YAE9B,MAAM,IAAI,GACR,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;gBACnC,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC;oBAC9B,QAAQ;oBACR,SAAS;oBACT,UAAU,EAAE,IAAI,CAAC,+BAA+B,CAC9C,eAAe,IAAI,EAAE,CACtB;oBACD,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC;iBAC5C,CAAC;gBACJ,CAAC,CAAC,cAAc,CAAC,iBAAiB,CAAC;oBAC/B,QAAQ;oBACR,SAAS;oBACT,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;YAET,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QACjE,CAAC,CACF,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,GAAW;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACrC,OAAO,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC;IAC7B,CAAC;IAEO,+BAA+B,CAAC,QAAgB;QACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAErC,MAAM,WAAW,GAAG,GAAG,QAAQ,MAAM,CAAC;QACtC,MAAM,YAAY,GAAG,GAAG,QAAQ,YAAY,CAAC;QAC7C,OAAO,QAAQ,CAAC,WAAW,CAAC,EAAE,IAAI,IAAI,QAAQ,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC;IACrE,CAAC;IAEO,YAAY;QAClB,OAAO,IAAI,CAAC,KAAK,CACf,YAAY,CACV,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAC,EACpE,OAAO,CACR,CACF,CAAC;IACJ,CAAC;CACF"}
@@ -1,12 +1,15 @@
1
+ import type { WidgetHostType } from "./server.js";
1
2
  declare class TemplateHelper {
2
3
  private templateCache;
3
4
  private loadTemplate;
4
5
  renderProduction(data: {
6
+ hostType: WidgetHostType;
5
7
  serverUrl: string;
6
8
  widgetFile: string;
7
9
  styleFile: string;
8
10
  }): string;
9
11
  renderDevelopment(data: {
12
+ hostType: WidgetHostType;
10
13
  serverUrl: string;
11
14
  widgetName: string;
12
15
  }): string;
@@ -1 +1 @@
1
- {"version":3,"file":"templateHelper.js","sourceRoot":"","sources":["../../../src/server/templateHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,MAAM,cAAc;IACV,aAAa,GAAG,IAAI,GAAG,EAAsC,CAAC;IAE9D,YAAY,CAAC,YAAoB;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACpD,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;QACzE,MAAM,cAAc,GAAG,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAEpD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC/C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,gBAAgB,CAAC,IAIhB;QACC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACjD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,iBAAiB,CAAC,IAA+C;QAC/D,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QAClD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}
1
+ {"version":3,"file":"templateHelper.js","sourceRoot":"","sources":["../../../src/server/templateHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,UAAU,MAAM,YAAY,CAAC;AAGpC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,MAAM,cAAc;IACV,aAAa,GAAG,IAAI,GAAG,EAAsC,CAAC;IAE9D,YAAY,CAAC,YAAoB;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACpD,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;QACzE,MAAM,cAAc,GAAG,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAEpD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC/C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,gBAAgB,CAAC,IAKhB;QACC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACjD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,iBAAiB,CAAC,IAIjB;QACC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QAClD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}
@@ -1,12 +1,51 @@
1
1
  <base href="{{serverUrl}}" />
2
+ <script type="module">window.skybridge = { hostType: "{{hostType}}" };</script>
2
3
  <script type="module">
3
- import { injectIntoGlobalHook } from "{{serverUrl}}/@react-refresh";
4
+ import { injectIntoGlobalHook } from "{{serverUrl}}/assets/@react-refresh";
4
5
  injectIntoGlobalHook(window); window.$RefreshReg$ = () => {};
5
6
  window.$RefreshSig$ = () => (type) => type;
6
7
  window.__vite_plugin_react_preamble_installed__ = true;
7
8
  </script>
8
9
  <script type="module" src="{{serverUrl}}/@vite/client"></script>
10
+ <script type="module">
11
+ // Checks for browser support and shows error if local network access is denied
12
+ (async () => {
13
+ if (!navigator.permissions?.query) {
14
+ return;
15
+ }
16
+
17
+ try {
18
+ const status = await navigator.permissions.query({ name: "local-network-access" });
19
+ if (status.state === "denied") {
20
+ const errorDiv = document.createElement("div");
21
+ errorDiv.style.cssText = "background: #fef2f2; border: 2px solid #ef4444; border-radius: 8px; padding: 16px; text-align: center; z-index: 10000; font-family: system-ui, sans-serif;";
22
+
23
+ const errorTitle = document.createElement("div");
24
+ errorTitle.style.cssText = "color: #ef4444; font-size: 18px; font-weight: 600; margin-bottom: 8px;";
25
+ errorTitle.textContent = "Error: Local network access permission is denied.";
26
+
27
+ const errorMessage = document.createElement("div");
28
+ errorMessage.style.cssText = "color: #ef4444; font-size: 14px;";
29
+ errorMessage.textContent = "Local network access is required for your widget to connect to the local dev server. Please enable it in your browser settings. ";
30
+
31
+ const link = document.createElement("a");
32
+ link.href = "https://developer.chrome.com/blog/local-network-access";
33
+ link.target = "_blank";
34
+ link.rel = "noopener noreferrer";
35
+ link.style.cssText = "color: #ef4444; text-decoration: underline;";
36
+ link.textContent = "Learn more";
37
+ errorMessage.appendChild(link);
38
+
39
+ errorDiv.appendChild(errorTitle);
40
+ errorDiv.appendChild(errorMessage);
41
+ document.body.appendChild(errorDiv);
42
+ }
43
+ } catch (e) {
44
+ // Permission API doesn't support local-network-access, ignore silently
45
+ }
46
+ })();
47
+ </script>
9
48
  <div id="root"></div>
10
49
  <script type="module" id="dev-widget-entry">
11
- import('{{serverUrl}}/src/widgets/{{widgetName}}.tsx');
50
+ import('{{serverUrl}}/src/widgets/{{widgetName}}');
12
51
  </script>
@@ -1,4 +1,5 @@
1
1
  <base href="{{serverUrl}}" />
2
+ <script type="module">window.skybridge = { hostType: "{{hostType}}" };</script>
2
3
  <div id="root"></div>
3
4
  <script type="module">
4
5
  import('{{serverUrl}}/assets/{{widgetFile}}');
@@ -1,3 +1,4 @@
1
+ import { existsSync } from "node:fs";
1
2
  import path from "node:path";
2
3
  import cors from "cors";
3
4
  import express, {} from "express";
@@ -14,10 +15,17 @@ import express, {} from "express";
14
15
  export const widgetsDevServer = async () => {
15
16
  const router = express.Router();
16
17
  const { createServer, searchForWorkspaceRoot, loadConfigFromFile } = await import("vite");
17
- const workspaceRoot = searchForWorkspaceRoot(process.cwd());
18
- const webAppRoot = path.join(workspaceRoot, "web");
18
+ // Since 0.16.0, the template is a single package that does not rely on workspace.
19
+ // It means that, when starting the server, the working dir is the template root
20
+ // hence we don't need to walk up the tree to find the workspace, which does not exist anymore.
21
+ let webAppRoot = path.join(process.cwd(), "web");
22
+ // fallback to the old behavior for backward compatibility
23
+ const hasWebAppRoot = existsSync(webAppRoot);
24
+ if (!hasWebAppRoot) {
25
+ const workspaceRoot = searchForWorkspaceRoot(process.cwd());
26
+ webAppRoot = path.join(workspaceRoot, "web");
27
+ }
19
28
  const configResult = await loadConfigFromFile({ command: "serve", mode: "development" }, path.join(webAppRoot, "vite.config.ts"), webAppRoot);
20
- // biome-ignore lint/correctness/noUnusedVariables: Remove build-specific options that don't apply to dev server
21
29
  const { build, preview, ...devConfig } = configResult?.config || {};
22
30
  const vite = await createServer({
23
31
  ...devConfig,
@@ -1 +1 @@
1
- {"version":3,"file":"widgetsDevServer.js","sourceRoot":"","sources":["../../../src/server/widgetsDevServer.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,EAAE,EAAuB,MAAM,SAAS,CAAC;AAEvD;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,IAA6B,EAAE;IAClE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAEhC,MAAM,EAAE,YAAY,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,GAChE,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;IACvB,MAAM,aAAa,GAAG,sBAAsB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;IAEnD,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAC3C,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,EACzC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC,EACvC,UAAU,CACX,CAAC;IAEF,gHAAgH;IAChH,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,GAAG,YAAY,EAAE,MAAM,IAAI,EAAE,CAAC;IAEpE,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC;QAC9B,GAAG,SAAS;QACZ,UAAU,EAAE,KAAK,EAAE,kFAAkF;QACrG,OAAO,EAAE,QAAQ;QACjB,MAAM,EAAE;YACN,YAAY,EAAE,IAAI;YAClB,cAAc,EAAE,IAAI;SACrB;QACD,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE;YACZ,OAAO,EAAE,CAAC,OAAO,EAAE,kBAAkB,CAAC;SACvC;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IACnB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAElC,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
1
+ {"version":3,"file":"widgetsDevServer.js","sourceRoot":"","sources":["../../../src/server/widgetsDevServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,EAAE,EAAuB,MAAM,SAAS,CAAC;AACvD;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,IAA6B,EAAE;IAClE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAEhC,MAAM,EAAE,YAAY,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,GAChE,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;IAEvB,kFAAkF;IAClF,gFAAgF;IAChF,+FAA+F;IAC/F,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;IAEjD,0DAA0D;IAC1D,MAAM,aAAa,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;IAC7C,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,aAAa,GAAG,sBAAsB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5D,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAC3C,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,EACzC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC,EACvC,UAAU,CACX,CAAC;IAEF,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,GAAG,YAAY,EAAE,MAAM,IAAI,EAAE,CAAC;IAEpE,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC;QAC9B,GAAG,SAAS;QACZ,UAAU,EAAE,KAAK,EAAE,kFAAkF;QACrG,OAAO,EAAE,QAAQ;QACjB,MAAM,EAAE;YACN,YAAY,EAAE,IAAI;YAClB,cAAc,EAAE,IAAI;SACrB;QACD,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE;YACZ,OAAO,EAAE,CAAC,OAAO,EAAE,kBAAkB,CAAC;SACvC;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IACnB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAElC,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
@@ -104,6 +104,17 @@ export declare function createMinimalTestServer(): McpServer<Record<never, impor
104
104
  }[];
105
105
  }, unknown>;
106
106
  }>;
107
+ export declare function createInterfaceTestServer(): McpServer<Record<never, import("../server/server.js").ToolDef<unknown, unknown, unknown>> & {
108
+ "interface-widget": import("../server/server.js").ToolDef<{
109
+ id: string;
110
+ }, {
111
+ itemName: string;
112
+ quantity: number;
113
+ }, {
114
+ processedBy: string;
115
+ version: number;
116
+ }>;
117
+ }>;
107
118
  /**
108
119
  * Mock extra parameter for resource callback
109
120
  */
@@ -197,6 +197,26 @@ export function createMinimalTestServer() {
197
197
  };
198
198
  });
199
199
  }
200
+ export function createInterfaceTestServer() {
201
+ return new McpServer({ name: "interface-test-app", version: "1.0.0" }, {}).registerWidget("interface-widget", {}, {
202
+ description: "Widget with interface-typed output",
203
+ inputSchema: {
204
+ id: z.string(),
205
+ },
206
+ }, async ({ id }) => {
207
+ return {
208
+ content: [{ type: "text", text: `Item ${id}` }],
209
+ structuredContent: {
210
+ itemName: "Test Item",
211
+ quantity: 42,
212
+ },
213
+ _meta: {
214
+ processedBy: "test",
215
+ version: 1,
216
+ },
217
+ };
218
+ });
219
+ }
200
220
  /**
201
221
  * Mock extra parameter for resource callback
202
222
  */
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/test/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/test/utils.ts"],"names":[],"mappings":"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"}
@@ -2,17 +2,15 @@ import { afterEach, beforeEach, describe, expect, it, vi, } from "vitest";
2
2
  import { createMockExtra, createMockMcpServer, resetTestEnv, setTestEnv, } from "./utils.js";
3
3
  const mockManifest = {
4
4
  "src/widgets/my-widget.tsx": { file: "my-widget.js" },
5
+ "src/widgets/folder-widget/index.tsx": { file: "folder-widget.js" },
5
6
  "style.css": { file: "style.css" },
6
7
  };
7
- vi.mock("node:fs", async () => {
8
- const actual = await vi.importActual("node:fs");
8
+ const actual = vi.hoisted(() => require("node:fs"));
9
+ vi.mock("node:fs", () => {
9
10
  const readFileSyncImpl = (path, ...args) => {
10
11
  if (typeof path === "string" && path.includes("manifest.json")) {
11
12
  return JSON.stringify(mockManifest);
12
13
  }
13
- // Type assertion needed because readFileSync has overloads with different parameter types
14
- // Using @ts-expect-error because the overloads are complex and we're forwarding args
15
- // @ts-expect-error - readFileSync overloads require complex type handling
16
14
  return actual.readFileSync(path, ...args);
17
15
  };
18
16
  const readFileSync = vi.fn(readFileSyncImpl);
@@ -42,26 +40,27 @@ describe("McpServer.registerWidget", () => {
42
40
  const mockToolConfig = { description: "Test tool" };
43
41
  server.registerWidget("my-widget", mockRegisterResourceConfig, mockToolConfig, mockToolCallback);
44
42
  // Get the resource callback function
45
- const resourceCallback = mockRegisterResource.mock
43
+ const appsSdkResourceCallback = mockRegisterResource.mock
46
44
  .calls[0]?.[3];
47
- expect(resourceCallback).toBeDefined();
45
+ expect(appsSdkResourceCallback).toBeDefined();
48
46
  const serverUrl = "http://localhost:3000";
49
47
  const mockExtra = createMockExtra("__not_used__");
50
- const result = await resourceCallback(new URL("ui://widgets/my-widget.html"), mockExtra);
48
+ const result = await appsSdkResourceCallback(new URL("ui://widgets/apps-sdk/my-widget.html"), mockExtra);
51
49
  expect(mockRegisterTool).toHaveBeenCalled();
52
50
  expect(result).toEqual({
53
51
  contents: [
54
52
  {
55
- uri: "ui://widgets/my-widget.html",
53
+ uri: "ui://widgets/apps-sdk/my-widget.html",
56
54
  mimeType: "text/html+skybridge",
57
55
  text: expect.stringContaining('<div id="root"></div>'),
58
56
  },
59
57
  ],
60
58
  });
61
59
  // Check development-specific content
62
- expect(result.contents[0]?.text).toContain(`${serverUrl}/@react-refresh`);
60
+ expect(result.contents[0]?.text).toContain(`${serverUrl}/assets/@react-refresh`);
63
61
  expect(result.contents[0]?.text).toContain(`${serverUrl}/@vite/client`);
64
- expect(result.contents[0]?.text).toContain(`${serverUrl}/src/widgets/my-widget.tsx`);
62
+ expect(result.contents[0]?.text).toContain(`${serverUrl}/src/widgets/my-widget`);
63
+ expect(result.contents[0]?.text).not.toContain(`${serverUrl}/src/widgets/my-widget.tsx`);
65
64
  });
66
65
  it("should generate correct HTML for production mode", async () => {
67
66
  setTestEnv({ NODE_ENV: "production" });
@@ -70,26 +69,75 @@ describe("McpServer.registerWidget", () => {
70
69
  const mockToolConfig = { description: "Test tool" };
71
70
  server.registerWidget("my-widget", mockRegisterResourceConfig, mockToolConfig, mockToolCallback);
72
71
  // Get the resource callback function
73
- const resourceCallback = mockRegisterResource.mock
72
+ const appsSdkResourceCallback = mockRegisterResource.mock
74
73
  .calls[0]?.[3];
75
- expect(resourceCallback).toBeDefined();
74
+ expect(appsSdkResourceCallback).toBeDefined();
76
75
  const serverUrl = "https://myapp.com";
77
76
  const mockExtra = createMockExtra(serverUrl);
78
- const result = await resourceCallback(new URL("ui://widgets/my-widget.html"), mockExtra);
77
+ const result = await appsSdkResourceCallback(new URL("ui://widgets/apps-sdk/my-widget.html"), mockExtra);
79
78
  expect(result).toEqual({
80
79
  contents: [
81
80
  {
82
- uri: "ui://widgets/my-widget.html",
81
+ uri: "ui://widgets/apps-sdk/my-widget.html",
83
82
  mimeType: "text/html+skybridge",
84
83
  text: expect.stringContaining('<div id="root"></div>'),
85
84
  },
86
85
  ],
87
86
  });
88
87
  // Check production-specific content
89
- expect(result.contents[0]?.text).not.toContain(`${serverUrl}@react-refresh`);
88
+ expect(result.contents[0]?.text).not.toContain(`${serverUrl}/assets/@react-refresh`);
90
89
  expect(result.contents[0]?.text).not.toContain(`${serverUrl}@vite/client`);
91
90
  expect(result.contents[0]?.text).toContain(`${serverUrl}/assets/my-widget.js`);
92
91
  expect(result.contents[0]?.text).toContain(`${serverUrl}/assets/style.css`);
93
92
  });
93
+ it("should resolve folder-based widgets (barrel files) in production mode", async () => {
94
+ setTestEnv({ NODE_ENV: "production" });
95
+ const mockToolCallback = vi.fn();
96
+ const mockRegisterResourceConfig = { description: "Folder widget" };
97
+ const mockToolConfig = { description: "Folder tool" };
98
+ server.registerWidget("folder-widget", mockRegisterResourceConfig, mockToolConfig, mockToolCallback);
99
+ const appsSdkResourceCallback = mockRegisterResource.mock
100
+ .calls[0]?.[3];
101
+ expect(appsSdkResourceCallback).toBeDefined();
102
+ const serverUrl = "https://myapp.com";
103
+ const mockExtra = createMockExtra(serverUrl);
104
+ const result = await appsSdkResourceCallback(new URL("ui://widgets/apps-sdk/folder-widget.html"), mockExtra);
105
+ // Should resolve to folder-widget.js from the manifest entry "src/widgets/folder-widget/index.tsx"
106
+ expect(result.contents[0]?.text).toContain(`${serverUrl}/assets/folder-widget.js`);
107
+ });
108
+ it("should register resources with correct hostType for both apps-sdk and ext-apps formats", async () => {
109
+ const mockToolCallback = vi.fn();
110
+ const mockRegisterResourceConfig = { description: "Test widget" };
111
+ const mockToolConfig = { description: "Test tool" };
112
+ server.registerWidget("my-widget", mockRegisterResourceConfig, mockToolConfig, mockToolCallback);
113
+ expect(mockRegisterResource).toHaveBeenCalledTimes(2);
114
+ const appsSdkCallback = mockRegisterResource.mock
115
+ .calls[0]?.[3];
116
+ const appsSdkResult = await appsSdkCallback(new URL("ui://widgets/apps-sdk/my-widget.html"), createMockExtra("__not_used__"));
117
+ expect(appsSdkResult).toEqual({
118
+ contents: [
119
+ {
120
+ uri: "ui://widgets/apps-sdk/my-widget.html",
121
+ mimeType: "text/html+skybridge",
122
+ text: expect.stringContaining('<div id="root"></div>'),
123
+ },
124
+ ],
125
+ });
126
+ expect(appsSdkResult.contents[0]?.text).toContain('window.skybridge = { hostType: "apps-sdk" }');
127
+ const extAppsResourceCallback = mockRegisterResource.mock
128
+ .calls[1]?.[3];
129
+ expect(extAppsResourceCallback).toBeDefined();
130
+ const extAppsResult = await extAppsResourceCallback(new URL("ui://widgets/ext-apps/my-widget.html"), createMockExtra("__not_used__"));
131
+ expect(extAppsResult).toEqual({
132
+ contents: [
133
+ {
134
+ uri: "ui://widgets/ext-apps/my-widget.html",
135
+ mimeType: "text/html;profile=mcp-app",
136
+ text: expect.stringContaining('<div id="root"></div>'),
137
+ },
138
+ ],
139
+ });
140
+ expect(extAppsResult.contents[0]?.text).toContain('window.skybridge = { hostType: "mcp-app" }');
141
+ });
94
142
  });
95
143
  //# sourceMappingURL=widget.test.js.map