@salesforce/sdk-chat 1.60.1 → 1.61.0

package/dist/index.d.ts

@@ -1,15 +1,21 @@
-import type { ChatSDK, SDKOptions } from "@salesforce/sdk-core";
+import type { ChatSDK, SDKOptions, McpAppsSessionOptions } from "@salesforce/sdk-core";
 /**
  * Options for creating a ChatSDK instance.
  */
 export interface ChatSDKOptions extends SDKOptions {
+    /** MCP Apps session options (app identity, handshake timeout) */
+    mcpApps?: McpAppsSessionOptions;
 }
 /**
  * Create and initialize a ChatSDK instance based on the detected surface
  *
+ * For MCP Apps surfaces, this performs the SEP-1865 handshake (ui/initialize)
+ * via the shared {@link McpAppsSession} singleton on the first call.
+ *
  * @param options - Optional configuration including surface override
  * @returns Promise resolving to an initialized ChatSDK instance
  */
 export declare function createChatSDK(options?: ChatSDKOptions): Promise<ChatSDK>;
+export { MCPAppsChatSDK } from "./mcpapps.js";
 export type { ChatMessage, ChatSDK, DisplayMode, ResourceRequest, SDKOptions, ToolCall, ToolState, } from "@salesforce/sdk-core";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAKhE;;GAEG;AAEH,MAAM,WAAW,cAAe,SAAQ,UAAU;CAAG;AAErD;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAe9E;AAED,YAAY,EACX,WAAW,EACX,OAAO,EACP,WAAW,EACX,eAAe,EACf,UAAU,EACV,QAAQ,EACR,SAAS,GACT,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAKvF;;GAEG;AACH,MAAM,WAAW,cAAe,SAAQ,UAAU;IACjD,iEAAiE;IACjE,OAAO,CAAC,EAAE,qBAAqB,CAAC;CAChC;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAyB9E;AAED,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,YAAY,EACX,WAAW,EACX,OAAO,EACP,WAAW,EACX,eAAe,EACf,UAAU,EACV,QAAQ,EACR,SAAS,GACT,MAAM,sBAAsB,CAAC"}

package/dist/index.js

@@ -3,13 +3,16 @@
  * All rights reserved.
  * For full license text, see the LICENSE.txt file
  */
-import { getSurface, Surface } from "@salesforce/sdk-core";
+import { getSurface, Surface, McpAppsSession } from "@salesforce/sdk-core";
 import { MCPAppsChatSDK } from "./mcpapps.js";
 import { OpenAIChatSDK } from "./openai.js";
 import { SalesforceACCChatSDK } from "./salesforce-acc.js";
 /**
  * Create and initialize a ChatSDK instance based on the detected surface
  *
+ * For MCP Apps surfaces, this performs the SEP-1865 handshake (ui/initialize)
+ * via the shared {@link McpAppsSession} singleton on the first call.
+ *
  * @param options - Optional configuration including surface override
  * @returns Promise resolving to an initialized ChatSDK instance
  */
@@ -23,9 +26,20 @@ export async function createChatSDK(options) {
             return {};
         case Surface.SalesforceACC:
             return new SalesforceACCChatSDK();
-        case Surface.MCPApps:
-            return new MCPAppsChatSDK();
+        case Surface.MCPApps: {
+            const session = await McpAppsSession.getInstance(options?.mcpApps);
+            if (session.handshakeSucceeded) {
+                return new MCPAppsChatSDK(session);
+            }
+            // Handshake timed out — not a real MCP Apps host.
+            // Fall back to OpenAI if available, otherwise empty.
+            if (window.openai) {
+                return new OpenAIChatSDK();
+            }
+            return {};
+        }
         default:
             return {};
     }
 }
+export { MCPAppsChatSDK } from "./mcpapps.js";

package/dist/mcpapps.d.ts

@@ -4,19 +4,24 @@
  * For full license text, see the LICENSE.txt file
  */
 import type { ChatSDK, ChatMessage, ResourceRequest, ToolCall, ToolState, DisplayMode } from "@salesforce/sdk-core";
-import { JsonRpcClient } from "@salesforce/sdk-core";
+import type { McpAppsSession } from "@salesforce/sdk-core";
 /**
- * Chat SDK implementation for Webapp and MicroFrontend surfaces using MCP Apps protocol
+ * Chat SDK implementation for MCP Apps surface using the shared McpAppsSession.
+ *
  * Supports: sendMessageToHost, callTool, readResource, accessToolInput, accessToolOutput,
  * accessToolMetadata (stub), onToolCanceled, subscribe
- * Extends JsonRpcClient for JSON-RPC 2.0 notification support
+ *
+ * Uses a shared {@link McpAppsSession} for JSON-RPC 2.0 transport instead of
+ * owning its own postMessage listener, avoiding duplicate listeners and ID
+ * counter collisions when used alongside MCPAppsViewSDK.
  */
-export declare class MCPAppsChatSDK extends JsonRpcClient implements ChatSDK {
+export declare class MCPAppsChatSDK implements ChatSDK {
+    private session;
     private chatHostContext;
     private globals;
     private canceledCallbacks;
     private subscriptions;
-    constructor();
+    constructor(session: McpAppsSession);
     /**
      * Handle host context change notifications from the host
      * @param params - Partial host context update from the host
@@ -53,5 +58,6 @@ export declare class MCPAppsChatSDK extends JsonRpcClient implements ChatSDK {
     accessToolMetadata<T>(): T | null;
     onToolCanceled(callback: (reason: string) => void): () => void;
     subscribe(callback: () => void): () => void;
+    private notifySubscribers;
 }
 //# sourceMappingURL=mcpapps.d.ts.map

package/dist/mcpapps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcpapps.d.ts","sourceRoot":"","sources":["../src/mcpapps.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EACX,OAAO,EACP,WAAW,EACX,eAAe,EACf,QAAQ,EACR,SAAS,EACT,WAAW,EACX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAarD;;;;;GAKG;AACH,qBAAa,cAAe,SAAQ,aAAc,YAAW,OAAO;IACnE,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,OAAO,CAGR;IACP,OAAO,CAAC,iBAAiB,CAAuC;IAChE,OAAO,CAAC,aAAa,CAAyB;;IA0B9C;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IAchC;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IASxB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAUvB;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAQ3B;;;;OAIG;IACG,cAAc,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,WAAW,CAAA;KAAE,CAAC;IAOjE,iBAAiB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAUtD,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC;IAQ3C,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC;IAO3D,eAAe,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI;IAMzC,gBAAgB,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI;IAM1C,kBAAkB,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAKjC,cAAc,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,IAAI;IAS9D,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;CAS3C"}
+{"version":3,"file":"mcpapps.d.ts","sourceRoot":"","sources":["../src/mcpapps.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EACX,OAAO,EACP,WAAW,EACX,eAAe,EACf,QAAQ,EACR,SAAS,EACT,WAAW,EACX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAa3D;;;;;;;;;GASG;AACH,qBAAa,cAAe,YAAW,OAAO;IASjC,OAAO,CAAC,OAAO;IAR3B,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,OAAO,CAGR;IACP,OAAO,CAAC,iBAAiB,CAAuC;IAChE,OAAO,CAAC,aAAa,CAAyB;gBAE1B,OAAO,EAAE,cAAc;IAmB3C;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IAehC;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IASxB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAUvB;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;;;OAIG;IACG,cAAc,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,WAAW,CAAA;KAAE,CAAC;IAOjE,iBAAiB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAYtD,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC;IAQ3C,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC;IAO3D,eAAe,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI;IAMzC,gBAAgB,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI;IAM1C,kBAAkB,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAKjC,cAAc,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,IAAI;IAS9D,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAQ3C,OAAO,CAAC,iBAAiB;CAGzB"}

package/dist/mcpapps.js

@@ -1,25 +1,26 @@
-import { JsonRpcClient } from "@salesforce/sdk-core";
 /**
- * Chat SDK implementation for Webapp and MicroFrontend surfaces using MCP Apps protocol
+ * Chat SDK implementation for MCP Apps surface using the shared McpAppsSession.
+ *
  * Supports: sendMessageToHost, callTool, readResource, accessToolInput, accessToolOutput,
  * accessToolMetadata (stub), onToolCanceled, subscribe
- * Extends JsonRpcClient for JSON-RPC 2.0 notification support
+ *
+ * Uses a shared {@link McpAppsSession} for JSON-RPC 2.0 transport instead of
+ * owning its own postMessage listener, avoiding duplicate listeners and ID
+ * counter collisions when used alongside MCPAppsViewSDK.
  */
-export class MCPAppsChatSDK extends JsonRpcClient {
+export class MCPAppsChatSDK {
+    session;
     chatHostContext = {};
     globals = {};
     canceledCallbacks = new Set();
     subscriptions = new Set();
-    constructor() {
-        super(); // Sets up JSON-RPC message listener
-        // Register notification handler for display mode
-        this.registerNotificationHandler("ui/notifications/host-context-changed", (params) => this.handleHostContextChanged(params));
-        // Register notification handler for tool results
-        this.registerNotificationHandler("ui/notifications/tool-result", (params) => this.handleToolResult(params));
-        // Register notification handler for tool input
-        this.registerNotificationHandler("ui/notifications/tool-input", (params) => this.handleToolInput(params));
-        // Register notification handler for tool cancelled
-        this.registerNotificationHandler("ui/notifications/tool-cancelled", (params) => this.handleToolCancelled(params));
+    constructor(session) {
+        this.session = session;
+        // Register notification handlers on the shared session
+        session.registerNotificationHandler("ui/notifications/host-context-changed", (params) => this.handleHostContextChanged(params));
+        session.registerNotificationHandler("ui/notifications/tool-result", (params) => this.handleToolResult(params));
+        session.registerNotificationHandler("ui/notifications/tool-input", (params) => this.handleToolInput(params));
+        session.registerNotificationHandler("ui/notifications/tool-cancelled", (params) => this.handleToolCancelled(params));
     }
     /**
      * Handle host context change notifications from the host
@@ -28,12 +29,12 @@ export class MCPAppsChatSDK extends JsonRpcClient {
     handleHostContextChanged(params) {
         const contextUpdate = params;
         if (contextUpdate.displayMode) {
-            // Update stored host context
             this.chatHostContext = {
                 ...this.chatHostContext,
                 displayMode: contextUpdate.displayMode,
             };
         }
+        this.notifySubscribers();
     }
     /**
      * Handle tool result notifications from the host
@@ -42,8 +43,8 @@ export class MCPAppsChatSDK extends JsonRpcClient {
     handleToolResult(params) {
         const toolResult = params;
         if (toolResult.content !== undefined) {
-            // Store tool output from notification
             this.globals.toolOutput = toolResult.content;
+            this.notifySubscribers();
         }
     }
     /**
@@ -54,8 +55,8 @@ export class MCPAppsChatSDK extends JsonRpcClient {
         const toolInput = params;
         // Only store non-empty arguments - treat empty object as "no input"
         if (toolInput.arguments !== undefined && Object.keys(toolInput.arguments).length > 0) {
-            // Store tool input from notification
             this.globals.toolInput = toolInput.arguments;
+            this.notifySubscribers();
         }
     }
     /**
@@ -65,7 +66,6 @@ export class MCPAppsChatSDK extends JsonRpcClient {
     handleToolCancelled(params) {
         const cancellation = params;
         const reason = cancellation.reason ?? "";
-        // Notify all registered cancellation callbacks
         this.canceledCallbacks.forEach((callback) => callback(reason));
     }
     /**
@@ -74,29 +74,31 @@ export class MCPAppsChatSDK extends JsonRpcClient {
      * @returns Promise with the new display mode (confirmed by host)
      */
     async setDisplayMode(mode) {
-        const response = await this.request("ui/request-display-mode", {
+        const response = await this.session.request("ui/request-display-mode", {
             displayMode: mode,
         });
         return response;
     }
     async sendMessageToHost(message) {
-        await this.request("ui/message", {
+        await this.session.request("ui/message", {
             role: "user",
-            content: {
-                type: "text",
-                text: message.content,
-            },
+            content: [
+                {
+                    type: "text",
+                    text: message.content,
+                },
+            ],
         });
     }
     async callTool(toolCall) {
-        const result = await this.request("tools/call", {
+        const result = await this.session.request("tools/call", {
             name: toolCall.toolName,
             arguments: toolCall.params ?? {},
         });
         return result;
     }
     async readResource(request) {
-        const result = await this.request("resources/read", {
+        const result = await this.session.request("resources/read", {
             uri: request.uri,
         });
         return result;
@@ -125,11 +127,12 @@ export class MCPAppsChatSDK extends JsonRpcClient {
         };
     }
     subscribe(callback) {
-        // Add callback to subscriptions set
         this.subscriptions.add(callback);
-        // Return cleanup function
         return () => {
             this.subscriptions.delete(callback);
         };
     }
+    notifySubscribers() {
+        this.subscriptions.forEach((callback) => callback());
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/sdk-chat",
-  "version": "1.60.1",
+  "version": "1.61.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "type": "module",
   "main": "./dist/index.js",
@@ -26,7 +26,7 @@
     "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "@salesforce/sdk-core": "^1.60.1"
+    "@salesforce/sdk-core": "^1.61.0"
   },
   "devDependencies": {
     "vitest": "^4.0.6"
@@ -34,5 +34,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "df8e4adab0a8fdbc63977912da1179fee4e4ec78"
+  "gitHead": "07b4d7294c9f02c91b55788e157094db22168873"
 }