diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdd9e972d..6c7858a57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Setup package publishing for mono-repo packages. ([#1520](https://github.com/finos/FDC3/pull/1520))
 * Implementation PR for FDC3 for the Web ([#896](https://github.com/finos/FDC3/pull/896))
 * Adjusted reference Desktop Agent implementation for FDC3 for Web to open a new app instance when raiseIntent is called with an appId but no instanceId ([#1556](https://github.com/finos/FDC3/pull/1556))
+* Added `addIntentListenerWithContext` to `DesktopAgent` and implemented in `DesktopAgentProxy`
 
 ### Changed
 
diff --git a/packages/fdc3-agent-proxy/src/DesktopAgentProxy.ts b/packages/fdc3-agent-proxy/src/DesktopAgentProxy.ts
index fcf5fb49f..32c77e74f 100644
--- a/packages/fdc3-agent-proxy/src/DesktopAgentProxy.ts
+++ b/packages/fdc3-agent-proxy/src/DesktopAgentProxy.ts
@@ -66,6 +66,7 @@ export class DesktopAgentProxy implements DesktopAgent, Connectable {
     this.findIntentsByContext = this.findIntentsByContext.bind(this);
     this.raiseIntent = this.raiseIntent.bind(this);
     this.addIntentListener = this.addIntentListener.bind(this);
+    this.addIntentListenerWithContext = this.addIntentListenerWithContext.bind(this);
     this.raiseIntentForContext = this.raiseIntentForContext.bind(this);
     this.open = this.open.bind(this);
     this.findInstances = this.findInstances.bind(this);
@@ -183,6 +184,10 @@ export class DesktopAgentProxy implements DesktopAgent, Connectable {
     return this.intents.addIntentListener(intent, handler);
   }
 
+  addIntentListenerWithContext(intent: string, contextType: string | string[], handler: IntentHandler) {
+    return this.intents.addIntentListenerWithContext(intent, contextType, handler);
+  }
+
   raiseIntentForContext(context: Context, app?: string | AppIdentifier): Promise<IntentResolution> {
     return this.intents.raiseIntentForContext(context, this.ensureAppId(app));
   }
diff --git a/packages/fdc3-agent-proxy/src/intents/DefaultIntentSupport.ts b/packages/fdc3-agent-proxy/src/intents/DefaultIntentSupport.ts
index 71111b8f4..d7f5b6cf3 100644
--- a/packages/fdc3-agent-proxy/src/intents/DefaultIntentSupport.ts
+++ b/packages/fdc3-agent-proxy/src/intents/DefaultIntentSupport.ts
@@ -217,7 +217,23 @@ export class DefaultIntentSupport implements IntentSupport {
   }
 
   async addIntentListener(intent: string, handler: IntentHandler): Promise<Listener> {
-    const out = new DefaultIntentListener(this.messaging, intent, handler, this.messageExchangeTimeout);
+    const out = new DefaultIntentListener(this.messaging, intent, null, handler, this.messageExchangeTimeout);
+    await out.register();
+    return out;
+  }
+
+  async addIntentListenerWithContext(
+    intent: string,
+    contextType: string | string[],
+    handler: IntentHandler
+  ): Promise<Listener> {
+    const out = new DefaultIntentListener(
+      this.messaging,
+      intent,
+      Array.isArray(contextType) ? contextType : [contextType],
+      handler,
+      this.messageExchangeTimeout
+    );
     await out.register();
     return out;
   }
diff --git a/packages/fdc3-agent-proxy/src/intents/IntentSupport.ts b/packages/fdc3-agent-proxy/src/intents/IntentSupport.ts
index 9069ca0d0..7b346645c 100644
--- a/packages/fdc3-agent-proxy/src/intents/IntentSupport.ts
+++ b/packages/fdc3-agent-proxy/src/intents/IntentSupport.ts
@@ -7,4 +7,9 @@ export interface IntentSupport {
   raiseIntent(intent: string, context: Context, app?: AppIdentifier): Promise<IntentResolution>;
   raiseIntentForContext(context: Context, app?: AppIdentifier): Promise<IntentResolution>;
   addIntentListener(intent: string, handler: IntentHandler): Promise<Listener>;
+  addIntentListenerWithContext(
+    intent: string,
+    contextType: string | string[],
+    handler: IntentHandler
+  ): Promise<Listener>;
 }
diff --git a/packages/fdc3-agent-proxy/src/listeners/DefaultIntentListener.ts b/packages/fdc3-agent-proxy/src/listeners/DefaultIntentListener.ts
index 0e71bc2ed..7e921123a 100644
--- a/packages/fdc3-agent-proxy/src/listeners/DefaultIntentListener.ts
+++ b/packages/fdc3-agent-proxy/src/listeners/DefaultIntentListener.ts
@@ -7,13 +7,16 @@ import {
   IntentEvent,
   IntentResultRequest,
   IntentResultResponse,
-  //RaiseIntentResponse,
 } from '@finos/fdc3-schema/dist/generated/api/BrowserTypes';
 
 export class DefaultIntentListener extends AbstractListener<IntentHandler, AddIntentListenerRequest> {
-  readonly intent: string;
-
-  constructor(messaging: Messaging, intent: string, action: IntentHandler, messageExchangeTimeout: number) {
+  constructor(
+    messaging: Messaging,
+    private readonly intent: string,
+    private readonly contexts: string[] | null,
+    action: IntentHandler,
+    messageExchangeTimeout: number
+  ) {
     super(
       messaging,
       messageExchangeTimeout,
@@ -24,11 +27,14 @@ export class DefaultIntentListener extends AbstractListener<IntentHandler, AddIn
       'intentListenerUnsubscribeRequest',
       'intentListenerUnsubscribeResponse'
     );
-    this.intent = intent;
   }
 
   filter(m: IntentEvent): boolean {
-    return m.type == 'intentEvent' && m.payload.intent == this.intent;
+    return (
+      m.type == 'intentEvent' &&
+      m.payload.intent == this.intent &&
+      (this.context == null || this.context.includes(m.payload.context.type))
+    );
   }
 
   action(m: IntentEvent): void {
diff --git a/packages/fdc3-context/generated/context/ContextTypes.ts b/packages/fdc3-context/generated/context/ContextTypes.ts
index 99bf6e8e9..829e0938e 100644
--- a/packages/fdc3-context/generated/context/ContextTypes.ts
+++ b/packages/fdc3-context/generated/context/ContextTypes.ts
@@ -1980,6 +1980,10 @@ export interface Trade {
    * A human-readable summary of the trade.
    */
   name?: string;
+  /**
+   * Additional notes or comments about the trade.
+   */
+  notes?: string;
   /**
    * A product that is the subject of the trade.
    */
@@ -2044,6 +2048,10 @@ export interface TradeElement {
    * A human-readable summary of the trade.
    */
   name?: string;
+  /**
+   * Additional notes or comments about the trade.
+   */
+  notes?: string;
   /**
    * A product that is the subject of the trade.
    */
@@ -3067,6 +3075,7 @@ const typeMap: any = {
     [
       { json: 'id', js: 'id', typ: m('') },
       { json: 'name', js: 'name', typ: u(undefined, '') },
+      { json: 'notes', js: 'notes', typ: u(undefined, '') },
       { json: 'product', js: 'product', typ: r('ProductObject') },
       { json: 'type', js: 'type', typ: r('TradeType') },
     ],
@@ -3085,6 +3094,7 @@ const typeMap: any = {
     [
       { json: 'id', js: 'id', typ: m('') },
       { json: 'name', js: 'name', typ: u(undefined, '') },
+      { json: 'notes', js: 'notes', typ: u(undefined, '') },
       { json: 'product', js: 'product', typ: r('ProductObject') },
       { json: 'type', js: 'type', typ: r('TradeType') },
     ],
diff --git a/packages/fdc3-get-agent/test/step-definitions/desktop-agent.steps.ts b/packages/fdc3-get-agent/test/step-definitions/desktop-agent.steps.ts
index eeea07ffb..6b9ce0977 100644
--- a/packages/fdc3-get-agent/test/step-definitions/desktop-agent.steps.ts
+++ b/packages/fdc3-get-agent/test/step-definitions/desktop-agent.steps.ts
@@ -223,6 +223,7 @@ Given('A Dummy Desktop Agent in {string}', async function (this: CustomWorld, fi
     raiseIntent: notImplemented,
     raiseIntentForContext: notImplemented,
     addIntentListener: notImplemented,
+    addIntentListenerWithContext: notImplemented,
     addContextListener: notImplemented,
     addEventListener: notImplemented,
     getUserChannels: notImplemented,
diff --git a/packages/fdc3-schema/generated/api/BrowserTypes.ts b/packages/fdc3-schema/generated/api/BrowserTypes.ts
index 957048c6d..5b3829ccf 100644
--- a/packages/fdc3-schema/generated/api/BrowserTypes.ts
+++ b/packages/fdc3-schema/generated/api/BrowserTypes.ts
@@ -1,15 +1,7 @@
 // To parse this data:
 //
-//   import { Convert, WebConnectionProtocol1Hello, WebConnectionProtocol2LoadURL, WebConnectionProtocol3Handshake, WebConnectionProtocol4ValidateAppIdentity, WebConnectionProtocol5ValidateAppIdentityFailedResponse, WebConnectionProtocol5ValidateAppIdentitySuccessResponse, WebConnectionProtocol6Goodbye, WebConnectionProtocolMessage, AddContextListenerRequest, AddContextListenerResponse, AddEventListenerRequest, AddEventListenerResponse, AddIntentListenerRequest, AddIntentListenerResponse, AgentEventMessage, AgentResponseMessage, AppRequestMessage, BroadcastEvent, BroadcastRequest, BroadcastResponse, ChannelChangedEvent, ContextListenerUnsubscribeRequest, ContextListenerUnsubscribeResponse, CreatePrivateChannelRequest, CreatePrivateChannelResponse, EventListenerUnsubscribeRequest, EventListenerUnsubscribeResponse, Fdc3UserInterfaceChannelSelected, Fdc3UserInterfaceChannels, Fdc3UserInterfaceDrag, Fdc3UserInterfaceHandshake, Fdc3UserInterfaceHello, Fdc3UserInterfaceMessage, Fdc3UserInterfaceResolve, Fdc3UserInterfaceResolveAction, Fdc3UserInterfaceRestyle, FindInstancesRequest, FindInstancesResponse, FindIntentRequest, FindIntentResponse, FindIntentsByContextRequest, FindIntentsByContextResponse, GetAppMetadataRequest, GetAppMetadataResponse, GetCurrentChannelRequest, GetCurrentChannelResponse, GetCurrentContextRequest, GetCurrentContextResponse, GetInfoRequest, GetInfoResponse, GetOrCreateChannelRequest, GetOrCreateChannelResponse, GetUserChannelsRequest, GetUserChannelsResponse, HeartbeatAcknowledgementRequest, HeartbeatEvent, IntentEvent, IntentListenerUnsubscribeRequest, IntentListenerUnsubscribeResponse, IntentResultRequest, IntentResultResponse, JoinUserChannelRequest, JoinUserChannelResponse, LeaveCurrentChannelRequest, LeaveCurrentChannelResponse, OpenRequest, OpenResponse, PrivateChannelAddEventListenerRequest, PrivateChannelAddEventListenerResponse, PrivateChannelDisconnectRequest, PrivateChannelDisconnectResponse, PrivateChannelOnAddContextListenerEvent, PrivateChannelOnDisconnectEvent, PrivateChannelOnUnsubscribeEvent, PrivateChannelUnsubscribeEventListenerRequest, PrivateChannelUnsubscribeEventListenerResponse, RaiseIntentForContextRequest, RaiseIntentForContextResponse, RaiseIntentRequest, RaiseIntentResponse, RaiseIntentResultResponse } from "./file";
+//   import { Convert, AddContextListenerRequest, AddContextListenerResponse, AddEventListenerRequest, AddEventListenerResponse, AddIntentListenerRequest, AddIntentListenerResponse, AgentEventMessage, AgentResponseMessage, AppRequestMessage, BroadcastEvent, BroadcastRequest, BroadcastResponse, ChannelChangedEvent, ContextListenerUnsubscribeRequest, ContextListenerUnsubscribeResponse, CreatePrivateChannelRequest, CreatePrivateChannelResponse, EventListenerUnsubscribeRequest, EventListenerUnsubscribeResponse, Fdc3UserInterfaceChannels, Fdc3UserInterfaceChannelSelected, Fdc3UserInterfaceDrag, Fdc3UserInterfaceHandshake, Fdc3UserInterfaceHello, Fdc3UserInterfaceMessage, Fdc3UserInterfaceResolve, Fdc3UserInterfaceResolveAction, Fdc3UserInterfaceRestyle, FindInstancesRequest, FindInstancesResponse, FindIntentRequest, FindIntentResponse, FindIntentsByContextRequest, FindIntentsByContextResponse, GetAppMetadataRequest, GetAppMetadataResponse, GetCurrentChannelRequest, GetCurrentChannelResponse, GetCurrentContextRequest, GetCurrentContextResponse, GetInfoRequest, GetInfoResponse, GetOrCreateChannelRequest, GetOrCreateChannelResponse, GetUserChannelsRequest, GetUserChannelsResponse, HeartbeatAcknowledgementRequest, HeartbeatEvent, IntentEvent, IntentListenerUnsubscribeRequest, IntentListenerUnsubscribeResponse, IntentResultRequest, IntentResultResponse, JoinUserChannelRequest, JoinUserChannelResponse, LeaveCurrentChannelRequest, LeaveCurrentChannelResponse, OpenRequest, OpenResponse, PrivateChannelAddEventListenerRequest, PrivateChannelAddEventListenerResponse, PrivateChannelDisconnectRequest, PrivateChannelDisconnectResponse, PrivateChannelOnAddContextListenerEvent, PrivateChannelOnDisconnectEvent, PrivateChannelOnUnsubscribeEvent, PrivateChannelUnsubscribeEventListenerRequest, PrivateChannelUnsubscribeEventListenerResponse, RaiseIntentForContextRequest, RaiseIntentForContextResponse, RaiseIntentRequest, RaiseIntentResponse, RaiseIntentResultResponse, WebConnectionProtocol1Hello, WebConnectionProtocol2LoadURL, WebConnectionProtocol3Handshake, WebConnectionProtocol4ValidateAppIdentity, WebConnectionProtocol5ValidateAppIdentityFailedResponse, WebConnectionProtocol5ValidateAppIdentitySuccessResponse, WebConnectionProtocol6Goodbye, WebConnectionProtocolMessage } from "./file";
 //
-//   const webConnectionProtocol1Hello = Convert.toWebConnectionProtocol1Hello(json);
-//   const webConnectionProtocol2LoadURL = Convert.toWebConnectionProtocol2LoadURL(json);
-//   const webConnectionProtocol3Handshake = Convert.toWebConnectionProtocol3Handshake(json);
-//   const webConnectionProtocol4ValidateAppIdentity = Convert.toWebConnectionProtocol4ValidateAppIdentity(json);
-//   const webConnectionProtocol5ValidateAppIdentityFailedResponse = Convert.toWebConnectionProtocol5ValidateAppIdentityFailedResponse(json);
-//   const webConnectionProtocol5ValidateAppIdentitySuccessResponse = Convert.toWebConnectionProtocol5ValidateAppIdentitySuccessResponse(json);
-//   const webConnectionProtocol6Goodbye = Convert.toWebConnectionProtocol6Goodbye(json);
-//   const webConnectionProtocolMessage = Convert.toWebConnectionProtocolMessage(json);
 //   const addContextListenerRequest = Convert.toAddContextListenerRequest(json);
 //   const addContextListenerResponse = Convert.toAddContextListenerResponse(json);
 //   const addEventListenerRequest = Convert.toAddEventListenerRequest(json);
@@ -29,8 +21,8 @@
 //   const createPrivateChannelResponse = Convert.toCreatePrivateChannelResponse(json);
 //   const eventListenerUnsubscribeRequest = Convert.toEventListenerUnsubscribeRequest(json);
 //   const eventListenerUnsubscribeResponse = Convert.toEventListenerUnsubscribeResponse(json);
-//   const fdc3UserInterfaceChannelSelected = Convert.toFdc3UserInterfaceChannelSelected(json);
 //   const fdc3UserInterfaceChannels = Convert.toFdc3UserInterfaceChannels(json);
+//   const fdc3UserInterfaceChannelSelected = Convert.toFdc3UserInterfaceChannelSelected(json);
 //   const fdc3UserInterfaceDrag = Convert.toFdc3UserInterfaceDrag(json);
 //   const fdc3UserInterfaceHandshake = Convert.toFdc3UserInterfaceHandshake(json);
 //   const fdc3UserInterfaceHello = Convert.toFdc3UserInterfaceHello(json);
@@ -83,582 +75,486 @@
 //   const raiseIntentRequest = Convert.toRaiseIntentRequest(json);
 //   const raiseIntentResponse = Convert.toRaiseIntentResponse(json);
 //   const raiseIntentResultResponse = Convert.toRaiseIntentResultResponse(json);
+//   const webConnectionProtocol1Hello = Convert.toWebConnectionProtocol1Hello(json);
+//   const webConnectionProtocol2LoadURL = Convert.toWebConnectionProtocol2LoadURL(json);
+//   const webConnectionProtocol3Handshake = Convert.toWebConnectionProtocol3Handshake(json);
+//   const webConnectionProtocol4ValidateAppIdentity = Convert.toWebConnectionProtocol4ValidateAppIdentity(json);
+//   const webConnectionProtocol5ValidateAppIdentityFailedResponse = Convert.toWebConnectionProtocol5ValidateAppIdentityFailedResponse(json);
+//   const webConnectionProtocol5ValidateAppIdentitySuccessResponse = Convert.toWebConnectionProtocol5ValidateAppIdentitySuccessResponse(json);
+//   const webConnectionProtocol6Goodbye = Convert.toWebConnectionProtocol6Goodbye(json);
+//   const webConnectionProtocolMessage = Convert.toWebConnectionProtocolMessage(json);
 //
 // These functions will throw an error if the JSON doesn't
 // match the expected interface, even if the JSON is valid.
 
 /**
- * Hello message sent by an application to a parent window or frame when attempting to
- * establish connectivity to a Desktop Agent.
+ * A request to add a context listener to a specified Channel OR to the current user
+ * channel. Where the listener is added to the current user channel (channelId == null), and
+ * this app has already been added to a user channel, client code should make a subsequent
+ * request to get the current context of that channel for this listener and then call its
+ * handler with it.
  *
- * A message used during the connection flow for an application to a Desktop Agent in a
- * browser window. Used for messages sent in either direction.
+ * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface WebConnectionProtocol1Hello {
+export interface AddContextListenerRequest {
   /**
-   * Metadata for a Web Connection Protocol message.
+   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
-  meta: WebConnectionProtocol1HelloMeta;
+  meta: AddContextListenerRequestMeta;
   /**
-   * The message payload, containing data pertaining to this connection step.
+   * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: WebConnectionProtocol1HelloPayload;
+  payload: AddContextListenerRequestPayload;
   /**
-   * Identifies the type of the connection step message.
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'WCP1Hello';
+  type: 'addContextListenerRequest';
 }
 
 /**
- * Metadata for a Web Connection Protocol message.
+ * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
  */
-export interface WebConnectionProtocol1HelloMeta {
-  connectionAttemptUuid: string;
+export interface AddContextListenerRequestMeta {
+  requestUuid: string;
+  /**
+   * Field that represents the source application that a request or response was received
+   * from. Please note that this may be set by an app or Desktop Agent proxy for debugging
+   * purposes but a Desktop Agent should make its own determination of the source of a message
+   * to avoid spoofing.
+   */
+  source?: AppIdentifier;
   timestamp: Date;
 }
 
 /**
- * The message payload, containing data pertaining to this connection step.
+ * Field that represents the source application that a request or response was received
+ * from. Please note that this may be set by an app or Desktop Agent proxy for debugging
+ * purposes but a Desktop Agent should make its own determination of the source of a message
+ * to avoid spoofing.
+ *
+ * Identifies an application, or instance of an application, and is used to target FDC3 API
+ * calls, such as `fdc3.open` or `fdc3.raiseIntent` at specific applications or application
+ * instances.
+ *
+ * Will always include at least an `appId` field, which uniquely identifies a specific app.
+ *
+ * If the `instanceId` field is set then the `AppMetadata` object represents a specific
+ * instance of the application that may be addressed using that Id.
+ *
+ * Field that represents the source application that the request being responded to was
+ * received from, for debugging purposes.
+ *
+ * Details of the application instance that broadcast the context.
+ *
+ * The App resolution option chosen.
+ *
+ * Details of the application instance that raised the intent.
+ *
+ * Identifier for the app instance that was selected (or started) to resolve the intent.
+ * `source.instanceId` MUST be set, indicating the specific app instance that
+ * received the intent.
  */
-export interface WebConnectionProtocol1HelloPayload {
+export interface AppIdentifier {
   /**
-   * The current URL of the page attempting to connect. This may differ from the identityUrl,
-   * but the origins MUST match.
+   * The unique application identifier located within a specific application directory
+   * instance. An example of an appId might be 'app@sub.root'.
    */
-  actualUrl: string;
+  appId: string;
   /**
-   * A flag that may be used to indicate that a channel selector user interface is or is not
-   * required. Set to `false` if the app includes its own interface for selecting channels or
-   * does not work with user channels.
+   * The Desktop Agent that the app is available on. Used in Desktop Agent Bridging to
+   * identify the Desktop Agent to target.
    */
-  channelSelector?: boolean;
+  desktopAgent?: string;
   /**
-   * The version of FDC3 API that the app supports.
+   * An optional instance identifier, indicating that this object represents a specific
+   * instance of the application described.
    */
-  fdc3Version: string;
+  instanceId?: string;
+  [property: string]: any;
+}
+
+/**
+ * The message payload typically contains the arguments to FDC3 API functions.
+ */
+export interface AddContextListenerRequestPayload {
   /**
-   * URL to use for the identity of the application. Desktop Agents MUST validate that the
-   * origin of the message matches the URL, but MAY implement custom comparison logic.
+   * The id of the channel to add the listener to or `null` indicating that it should listen
+   * to the current user channel (at the time of broadcast).
    */
-  identityUrl: string;
+  channelId: null | string;
   /**
-   * A flag that may be used to indicate that an intent resolver is or is not required. Set to
-   * `false` if no intents, or only targeted intents, are raised.
+   * The type of context to listen for OR `null` indicating that it should listen to all
+   * context types.
    */
-  intentResolver?: boolean;
-  [property: string]: any;
+  contextType: null | string;
 }
 
 /**
- * Identifies the type of the connection step message.
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Request' appended.
  */
 
 /**
- * Response from a Desktop Agent to an application requesting access to it indicating that
- * it should load a specified URL into a hidden iframe in order to establish connectivity to
- * a Desktop Agent.
+ * A response to a addContextListener request. Where the listener was added to the current
+ * user channel (channelId == null), and this app has already been added to a user channel,
+ * client code should make a subsequent request to get the current context of that channel
+ * for this listener and then call its handler with it.
  *
- * A message used during the connection flow for an application to a Desktop Agent in a
- * browser window. Used for messages sent in either direction.
+ * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
+ * payload contains an `error` property, the request was unsuccessful.
  */
-export interface WebConnectionProtocol2LoadURL {
+export interface AddContextListenerResponse {
   /**
-   * Metadata for a Web Connection Protocol message.
+   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
-  meta: WebConnectionProtocol1HelloMeta;
+  meta: AddContextListenerResponseMeta;
   /**
-   * The message payload, containing data pertaining to this connection step.
+   * A payload for a response to an API call that will contain any return values or an `error`
+   * property containing a standardized error message indicating that the request was
+   * unsuccessful.
    */
-  payload: WebConnectionProtocol2LoadURLPayload;
+  payload: AddContextListenerResponsePayload;
   /**
-   * Identifies the type of the connection step message.
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'WCP2LoadUrl';
+  type: 'addContextListenerResponse';
 }
 
 /**
- * The message payload, containing data pertaining to this connection step.
+ * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
  */
-export interface WebConnectionProtocol2LoadURLPayload {
+export interface AddContextListenerResponseMeta {
+  requestUuid: string;
+  responseUuid: string;
   /**
-   * A URL which can be used to establish communication with the Desktop Agent, via loading
-   * the URL into an iframe and restarting the Web Connection protocol with the iframe as the
-   * target.
+   * Field that represents the source application that the request being responded to was
+   * received from, for debugging purposes.
    */
-  iframeUrl: string;
-  [property: string]: any;
+  source?: AppIdentifier;
+  timestamp: Date;
 }
 
 /**
- * Identifies the type of the connection step message.
+ * A payload for a response to an API call that will contain any return values or an `error`
+ * property containing a standardized error message indicating that the request was
+ * unsuccessful.
  */
+export interface AddContextListenerResponsePayload {
+  error?: PurpleError;
+  listenerUUID?: string;
+}
 
 /**
- * Handshake message sent by the Desktop Agent to the app (with a MessagePort appended) that
- * should be used for subsequent communication steps.
+ * Constants representing the errors that can be encountered when calling the `open` method
+ * on the DesktopAgent object (`fdc3`).
  *
- * A message used during the connection flow for an application to a Desktop Agent in a
- * browser window. Used for messages sent in either direction.
+ * Constants representing the errors that can be encountered when calling the `findIntent`,
+ * `findIntentsByContext`, `raiseIntent` or `raiseIntentForContext` methods on the
+ * DesktopAgent (`fdc3`).
  */
-export interface WebConnectionProtocol3Handshake {
+export type PurpleError =
+  | 'AccessDenied'
+  | 'CreationFailed'
+  | 'MalformedContext'
+  | 'NoChannelFound'
+  | 'ApiTimeout'
+  | 'InvalidArguments';
+
+/**
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Response' appended.
+ */
+
+/**
+ * A request to add an event listener for a specified event type to the Desktop Agent.
+ *
+ * A request message from an FDC3-enabled app to a Desktop Agent.
+ */
+export interface AddEventListenerRequest {
   /**
-   * Metadata for a Web Connection Protocol message.
+   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
-  meta: WebConnectionProtocol1HelloMeta;
+  meta: AddContextListenerRequestMeta;
   /**
-   * The message payload, containing data pertaining to this connection step.
+   * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: WebConnectionProtocol3HandshakePayload;
+  payload: AddEventListenerRequestPayload;
   /**
-   * Identifies the type of the connection step message.
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'WCP3Handshake';
+  type: 'addEventListenerRequest';
 }
 
 /**
- * The message payload, containing data pertaining to this connection step.
+ * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface WebConnectionProtocol3HandshakePayload {
-  /**
-   * Indicates a custom timeout (in milliseconds) that should be used for API message
-   * exchanges that may involve launching an application, instead of the default 100,000
-   * millisecond timeout.
-   */
-  appLaunchTimeout?: number;
-  /**
-   * Indicates whether a channel selector user interface is required and the URL to use to do
-   * so. Set to `true` to use the default or `false` to disable the channel selector (as the
-   * Desktop Agent will handle it another way).
-   */
-  channelSelectorUrl: boolean | string;
-  /**
-   * The version of FDC3 API that the Desktop Agent will provide support for.
-   */
-  fdc3Version: string;
-  /**
-   * Indicates whether an intent resolver user interface is required and the URL to use to do
-   * so. Set to `true` to use the default or `false` to disable the intent resolver (as the
-   * Desktop Agent will handle it another way).
-   */
-  intentResolverUrl: boolean | string;
+export interface AddEventListenerRequestPayload {
   /**
-   * Indicates a custom timeout (in milliseconds) that should be used for the majority of API
-   * message exchanges instead of the default 10,000 millisecond timeout.
+   * The type of the event to be listened to or `null` to listen to all event types.
    */
-  messageExchangeTimeout?: number;
+  type: 'USER_CHANNEL_CHANGED' | null;
 }
 
 /**
- * Identifies the type of the connection step message.
+ * The type of a (non-context and non-intent) event that may be received via the FDC3 API's
+ * addEventListener function.
  */
 
 /**
- * Identity Validation request from an app attempting to connect to a Desktop Agent.
- *
- * A message used during the connection flow for an application to a Desktop Agent in a
- * browser window. Used for messages sent in either direction.
- */
-export interface WebConnectionProtocol4ValidateAppIdentity {
-  /**
-   * Metadata for a Web Connection Protocol message.
-   */
-  meta: WebConnectionProtocol1HelloMeta;
-  /**
-   * The message payload, containing data pertaining to this connection step.
-   */
-  payload: WebConnectionProtocol4ValidateAppIdentityPayload;
-  /**
-   * Identifies the type of the connection step message.
-   */
-  type: 'WCP4ValidateAppIdentity';
-}
-
-/**
- * The message payload, containing data pertaining to this connection step.
- */
-export interface WebConnectionProtocol4ValidateAppIdentityPayload {
-  /**
-   * The current URL of the page attempting to connect. This may differ from the identityUrl,
-   * but the origins MUST match.
-   */
-  actualUrl: string;
-  /**
-   * URL to use for the identity of the application. Desktop Agents MUST validate that the
-   * origin of the message matches the URL, but MAY implement custom comparison logic.
-   */
-  identityUrl: string;
-  /**
-   * If an application has previously connected to the Desktop Agent, it may specify its prior
-   * instance id and associated instance UUID to request the same same instance Id be assigned.
-   */
-  instanceId?: string;
-  /**
-   * Instance UUID associated with the requested instanceId.
-   */
-  instanceUuid?: string;
-}
-
-/**
- * Identifies the type of the connection step message.
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Request' appended.
  */
 
 /**
- * Message sent by the Desktop Agent to an app if their identity validation fails.
+ * A response to an addEventListener request.
  *
- * A message used during the connection flow for an application to a Desktop Agent in a
- * browser window. Used for messages sent in either direction.
+ * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
+ * payload contains an `error` property, the request was unsuccessful.
  */
-export interface WebConnectionProtocol5ValidateAppIdentityFailedResponse {
+export interface AddEventListenerResponse {
   /**
-   * Metadata for a Web Connection Protocol message.
+   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
-  meta: WebConnectionProtocol1HelloMeta;
+  meta: AddContextListenerResponseMeta;
   /**
-   * The message payload, containing data pertaining to this connection step.
+   * A payload for a response to an API call that will contain any return values or an `error`
+   * property containing a standardized error message indicating that the request was
+   * unsuccessful.
    */
-  payload: WebConnectionProtocol5ValidateAppIdentityFailedResponsePayload;
+  payload: AddEventListenerResponsePayload;
   /**
-   * Identifies the type of the connection step message.
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'WCP5ValidateAppIdentityFailedResponse';
+  type: 'addEventListenerResponse';
 }
 
 /**
- * The message payload, containing data pertaining to this connection step.
+ * A payload for a response to an API call that will contain any return values or an `error`
+ * property containing a standardized error message indicating that the request was
+ * unsuccessful.
  */
-export interface WebConnectionProtocol5ValidateAppIdentityFailedResponsePayload {
-  message?: string;
+export interface AddEventListenerResponsePayload {
+  error?: ResponsePayloadError;
+  listenerUUID?: string;
 }
 
 /**
- * Identifies the type of the connection step message.
- */
-
-/**
- * Message sent by the Desktop Agent to an app after successful identity validation.
+ * Constants representing the errors that can be encountered when calling the `open` method
+ * on the DesktopAgent object (`fdc3`).
  *
- * A message used during the connection flow for an application to a Desktop Agent in a
- * browser window. Used for messages sent in either direction.
+ * Constants representing the errors that can be encountered when calling the `findIntent`,
+ * `findIntentsByContext`, `raiseIntent` or `raiseIntentForContext` methods on the
+ * DesktopAgent (`fdc3`).
  */
-export interface WebConnectionProtocol5ValidateAppIdentitySuccessResponse {
-  /**
-   * Metadata for a Web Connection Protocol message.
-   */
-  meta: WebConnectionProtocol1HelloMeta;
-  /**
-   * The message payload, containing data pertaining to this connection step.
-   */
-  payload: WebConnectionProtocol5ValidateAppIdentitySuccessResponsePayload;
-  /**
-   * Identifies the type of the connection step message.
-   */
-  type: 'WCP5ValidateAppIdentityResponse';
-}
+export type ResponsePayloadError =
+  | 'AccessDenied'
+  | 'CreationFailed'
+  | 'MalformedContext'
+  | 'NoChannelFound'
+  | 'ApiTimeout'
+  | 'InvalidArguments'
+  | 'AppNotFound'
+  | 'AppTimeout'
+  | 'DesktopAgentNotFound'
+  | 'ErrorOnLaunch'
+  | 'ResolverUnavailable'
+  | 'IntentDeliveryFailed'
+  | 'NoAppsFound'
+  | 'ResolverTimeout'
+  | 'TargetAppUnavailable'
+  | 'TargetInstanceUnavailable'
+  | 'UserCancelledResolution'
+  | 'IntentHandlerRejected'
+  | 'NoResultReturned'
+  | 'AgentDisconnected'
+  | 'NotConnectedToBridge'
+  | 'ResponseToBridgeTimedOut'
+  | 'MalformedMessage';
 
 /**
- * The message payload, containing data pertaining to this connection step.
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Response' appended.
  */
-export interface WebConnectionProtocol5ValidateAppIdentitySuccessResponsePayload {
-  /**
-   * The appId that the app's identity was validated against.
-   */
-  appId: string;
-  /**
-   * Implementation metadata for the Desktop Agent, which includes an appMetadata element
-   * containing a copy of the app's own metadata.
-   */
-  implementationMetadata: ImplementationMetadata;
-  /**
-   * The instance Id granted to the application by the Desktop Agent.
-   */
-  instanceId: string;
-  /**
-   * Instance UUID associated with the instanceId granted, which may be used to retrieve the
-   * same instanceId if the app is reloaded or navigates.
-   */
-  instanceUuid: string;
-}
 
 /**
- * Implementation metadata for the Desktop Agent, which includes an appMetadata element
- * containing a copy of the app's own metadata.
- *
- * Includes Metadata for the current application.
+ * A request to add an Intent listener for a specified intent type.
  *
- * Metadata relating to the FDC3 Desktop Agent implementation and its provider.
+ * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface ImplementationMetadata {
-  /**
-   * The calling application instance's own metadata, according to the Desktop Agent (MUST
-   * include at least the `appId` and `instanceId`).
-   */
-  appMetadata: AppMetadata;
-  /**
-   * The version number of the FDC3 specification that the implementation provides.
-   * The string must be a numeric semver version, e.g. 1.2 or 1.2.1.
-   */
-  fdc3Version: string;
+export interface AddIntentListenerRequest {
   /**
-   * Metadata indicating whether the Desktop Agent implements optional features of
-   * the Desktop Agent API.
+   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
-  optionalFeatures: OptionalFeatures;
+  meta: AddContextListenerRequestMeta;
   /**
-   * The name of the provider of the Desktop Agent implementation (e.g. Finsemble, Glue42,
-   * OpenFin etc.).
+   * The message payload typically contains the arguments to FDC3 API functions.
    */
-  provider: string;
+  payload: AddIntentListenerRequestPayload;
   /**
-   * The version of the provider of the Desktop Agent implementation (e.g. 5.3.0).
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  providerVersion?: string;
+  type: 'addIntentListenerRequest';
 }
 
 /**
- * The calling application instance's own metadata, according to the Desktop Agent (MUST
- * include at least the `appId` and `instanceId`).
- *
- * Extends an `AppIdentifier`, describing an application or instance of an application, with
- * additional descriptive metadata that is usually provided by an FDC3 App Directory that
- * the Desktop Agent connects to.
- *
- * The additional information from an app directory can aid in rendering UI elements, such
- * as a launcher menu or resolver UI. This includes a title, description, tooltip and icon
- * and screenshot URLs.
- *
- * Note that as `AppMetadata` instances are also `AppIdentifiers` they may be passed to the
- * `app` argument of `fdc3.open`, `fdc3.raiseIntent` etc.
+ * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface AppMetadata {
-  /**
-   * The unique application identifier located within a specific application directory
-   * instance. An example of an appId might be 'app@sub.root'.
-   */
-  appId: string;
-  /**
-   * A longer, multi-paragraph description for the application that could include markup.
-   */
-  description?: string;
-  /**
-   * The Desktop Agent that the app is available on. Used in Desktop Agent Bridging to
-   * identify the Desktop Agent to target.
-   */
-  desktopAgent?: string;
-  /**
-   * A list of icon URLs for the application that can be used to render UI elements.
-   */
-  icons?: Icon[];
-  /**
-   * An optional instance identifier, indicating that this object represents a specific
-   * instance of the application described.
-   */
-  instanceId?: string;
-  /**
-   * An optional set of, implementation specific, metadata fields that can be used to
-   * disambiguate instances, such as a window title or screen position. Must only be set if
-   * `instanceId` is set.
-   */
-  instanceMetadata?: { [key: string]: any };
-  /**
-   * The 'friendly' app name.
-   * This field was used with the `open` and `raiseIntent` calls in FDC3 <2.0, which now
-   * require an `AppIdentifier` wth `appId` set.
-   * Note that for display purposes the `title` field should be used, if set, in preference to
-   * this field.
-   */
-  name?: string;
-  /**
-   * The type of output returned for any intent specified during resolution. May express a
-   * particular context type (e.g. "fdc3.instrument"), channel (e.g. "channel") or a channel
-   * that will receive a specified type (e.g. "channel<fdc3.instrument>").
-   */
-  resultType?: null | string;
-  /**
-   * Images representing the app in common usage scenarios that can be used to render UI
-   * elements.
-   */
-  screenshots?: Image[];
-  /**
-   * A more user-friendly application title that can be used to render UI elements.
-   */
-  title?: string;
-  /**
-   * A tooltip for the application that can be used to render UI elements.
-   */
-  tooltip?: string;
+export interface AddIntentListenerRequestPayload {
   /**
-   * The Version of the application.
+   * The name of the intent to listen for.
    */
-  version?: string;
+  intent: string;
 }
 
 /**
- * Describes an Icon image that may be used to represent the application.
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Request' appended.
  */
-export interface Icon {
-  /**
-   * The icon dimension, formatted as `<height>x<width>`.
-   */
-  size?: string;
-  /**
-   * The icon url.
-   */
-  src: string;
-  /**
-   * Icon media type. If not present the Desktop Agent may use the src file extension.
-   */
-  type?: string;
-}
 
 /**
- * Describes an image file, typically a screenshot, that often represents the application in
- * a common usage scenario.
+ * A response to a addIntentListener request.
+ *
+ * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
+ * payload contains an `error` property, the request was unsuccessful.
  */
-export interface Image {
-  /**
-   * Caption for the image.
-   */
-  label?: string;
+export interface AddIntentListenerResponse {
   /**
-   * The image dimension, formatted as `<height>x<width>`.
+   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
-  size?: string;
+  meta: AddContextListenerResponseMeta;
   /**
-   * The image url.
+   * A payload for a response to an API call that will contain any return values or an `error`
+   * property containing a standardized error message indicating that the request was
+   * unsuccessful.
    */
-  src: string;
+  payload: PayloadObject;
   /**
-   * Image media type. If not present the Desktop Agent may use the src file extension.
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type?: string;
+  type: 'addIntentListenerResponse';
 }
 
 /**
- * Metadata indicating whether the Desktop Agent implements optional features of
- * the Desktop Agent API.
+ * A payload for a response to an API call that will contain any return values or an `error`
+ * property containing a standardized error message indicating that the request was
+ * unsuccessful.
  */
-export interface OptionalFeatures {
-  /**
-   * Used to indicate whether the experimental Desktop Agent Bridging
-   * feature is implemented by the Desktop Agent.
-   */
-  DesktopAgentBridging: boolean;
-  /**
-   * Used to indicate whether the exposure of 'originating app metadata' for
-   * context and intent messages is supported by the Desktop Agent.
-   */
-  OriginatingAppMetadata: boolean;
-  /**
-   * Used to indicate whether the optional `fdc3.joinUserChannel`,
-   * `fdc3.getCurrentChannel` and `fdc3.leaveCurrentChannel` are implemented by
-   * the Desktop Agent.
-   */
-  UserChannelMembershipAPIs: boolean;
+export interface PayloadObject {
+  error?: FluffyError;
+  listenerUUID?: string;
+  [property: string]: any;
 }
 
 /**
- * Identifies the type of the connection step message.
- */
-
-/**
- * Goodbye message to be sent to the Desktop Agent when disconnecting (e.g. when closing the
- * window or navigating). Desktop Agents should close the MessagePort after receiving this
- * message, but retain instance details in case the application reconnects (e.g. after a
- * navigation event).
+ * Constants representing the errors that can be encountered when calling the `open` method
+ * on the DesktopAgent object (`fdc3`).
  *
- * A message used during the connection flow for an application to a Desktop Agent in a
- * browser window. Used for messages sent in either direction.
+ * Constants representing the errors that can be encountered when calling the `findIntent`,
+ * `findIntentsByContext`, `raiseIntent` or `raiseIntentForContext` methods on the
+ * DesktopAgent (`fdc3`).
  */
-export interface WebConnectionProtocol6Goodbye {
-  /**
-   * Metadata for a Web Connection Protocol message.
-   */
-  meta: WebConnectionProtocol6GoodbyeMeta;
-  /**
-   * Identifies the type of the connection step message.
-   */
-  type: 'WCP6Goodbye';
-}
+export type FluffyError =
+  | 'MalformedContext'
+  | 'ApiTimeout'
+  | 'InvalidArguments'
+  | 'DesktopAgentNotFound'
+  | 'ResolverUnavailable'
+  | 'IntentDeliveryFailed'
+  | 'NoAppsFound'
+  | 'ResolverTimeout'
+  | 'TargetAppUnavailable'
+  | 'TargetInstanceUnavailable'
+  | 'UserCancelledResolution';
 
 /**
- * Metadata for a Web Connection Protocol message.
+ * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
  */
-export interface WebConnectionProtocol6GoodbyeMeta {
+export interface AgentEventMessageMeta {
+  eventUuid: string;
   timestamp: Date;
 }
 
 /**
- * Identifies the type of the connection step message.
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Response' appended.
  */
+export type EventMessageType =
+  | 'addEventListenerEvent'
+  | 'broadcastEvent'
+  | 'channelChangedEvent'
+  | 'heartbeatEvent'
+  | 'intentEvent'
+  | 'privateChannelOnAddContextListenerEvent'
+  | 'privateChannelOnDisconnectEvent'
+  | 'privateChannelOnUnsubscribeEvent';
 
 /**
- * A message used during the connection flow for an application to a Desktop Agent in a
- * browser window. Used for messages sent in either direction.
+ * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
  */
-export interface WebConnectionProtocolMessage {
-  /**
-   * Metadata for a Web Connection Protocol message.
-   */
-  meta: ConnectionStepMetadata;
-  /**
-   * The message payload, containing data pertaining to this connection step.
-   */
-  payload?: { [key: string]: any };
+export interface AgentResponseMessageMeta {
+  requestUuid: string;
+  responseUuid: string;
   /**
-   * Identifies the type of the connection step message.
+   * Field that represents the source application that the request being responded to was
+   * received from, for debugging purposes.
    */
-  type: ConnectionStepMessageType;
-}
-
-/**
- * Metadata for a Web Connection Protocol message.
- */
-export interface ConnectionStepMetadata {
+  source?: AppIdentifier;
   timestamp: Date;
-  connectionAttemptUuid?: string;
 }
 
 /**
- * Identifies the type of the connection step message.
+ * A payload for a response to an API call that will contain any return values or an `error`
+ * property containing a standardized error message indicating that the request was
+ * unsuccessful.
  */
-export type ConnectionStepMessageType =
-  | 'WCP1Hello'
-  | 'WCP2LoadUrl'
-  | 'WCP3Handshake'
-  | 'WCP4ValidateAppIdentity'
-  | 'WCP5ValidateAppIdentityFailedResponse'
-  | 'WCP5ValidateAppIdentityResponse'
-  | 'WCP6Goodbye';
+export interface AgentResponseMessageResponsePayload {
+  error?: ResponsePayloadError;
+  [property: string]: any;
+}
 
 /**
- * A request to add a context listener to a specified Channel OR to the current user
- * channel. Where the listener is added to the current user channel (channelId == null), and
- * this app has already been added to a user channel, client code should make a subsequent
- * request to get the current context of that channel for this listener and then call its
- * handler with it.
- *
- * A request message from an FDC3-enabled app to a Desktop Agent.
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Response' appended.
  */
-export interface AddContextListenerRequest {
-  /**
-   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
-   */
-  meta: AddContextListenerRequestMeta;
-  /**
-   * The message payload typically contains the arguments to FDC3 API functions.
-   */
-  payload: AddContextListenerRequestPayload;
-  /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Request' appended.
-   */
-  type: 'addContextListenerRequest';
-}
+export type ResponseMessageType =
+  | 'addContextListenerResponse'
+  | 'addEventListenerResponse'
+  | 'addIntentListenerResponse'
+  | 'broadcastResponse'
+  | 'contextListenerUnsubscribeResponse'
+  | 'createPrivateChannelResponse'
+  | 'eventListenerUnsubscribeResponse'
+  | 'findInstancesResponse'
+  | 'findIntentResponse'
+  | 'findIntentsByContextResponse'
+  | 'getAppMetadataResponse'
+  | 'getCurrentChannelResponse'
+  | 'getCurrentContextResponse'
+  | 'getInfoResponse'
+  | 'getOrCreateChannelResponse'
+  | 'getUserChannelsResponse'
+  | 'intentListenerUnsubscribeResponse'
+  | 'intentResultResponse'
+  | 'joinUserChannelResponse'
+  | 'leaveCurrentChannelResponse'
+  | 'openResponse'
+  | 'privateChannelAddEventListenerResponse'
+  | 'privateChannelDisconnectResponse'
+  | 'privateChannelUnsubscribeEventListenerResponse'
+  | 'raiseIntentForContextResponse'
+  | 'raiseIntentResponse'
+  | 'raiseIntentResultResponse';
 
 /**
  * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
  */
-export interface AddContextListenerRequestMeta {
+export interface AppRequestMessageMeta {
   requestUuid: string;
   /**
    * Field that represents the source application that a request or response was received
@@ -671,151 +567,163 @@ export interface AddContextListenerRequestMeta {
 }
 
 /**
- * Field that represents the source application that a request or response was received
- * from. Please note that this may be set by an app or Desktop Agent proxy for debugging
- * purposes but a Desktop Agent should make its own determination of the source of a message
- * to avoid spoofing.
- *
- * Identifies an application, or instance of an application, and is used to target FDC3 API
- * calls, such as `fdc3.open` or `fdc3.raiseIntent` at specific applications or application
- * instances.
- *
- * Will always include at least an `appId` field, which uniquely identifies a specific app.
- *
- * If the `instanceId` field is set then the `AppMetadata` object represents a specific
- * instance of the application that may be addressed using that Id.
- *
- * Field that represents the source application that the request being responded to was
- * received from, for debugging purposes.
- *
- * Details of the application instance that broadcast the context.
- *
- * The App resolution option chosen.
- *
- * Details of the application instance that raised the intent.
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Request' appended.
+ */
+export type RequestMessageType =
+  | 'addContextListenerRequest'
+  | 'addEventListenerRequest'
+  | 'addIntentListenerRequest'
+  | 'broadcastRequest'
+  | 'contextListenerUnsubscribeRequest'
+  | 'createPrivateChannelRequest'
+  | 'eventListenerUnsubscribeRequest'
+  | 'findInstancesRequest'
+  | 'findIntentRequest'
+  | 'findIntentsByContextRequest'
+  | 'getAppMetadataRequest'
+  | 'getCurrentChannelRequest'
+  | 'getCurrentContextRequest'
+  | 'getInfoRequest'
+  | 'getOrCreateChannelRequest'
+  | 'getUserChannelsRequest'
+  | 'heartbeatAcknowledgementRequest'
+  | 'intentListenerUnsubscribeRequest'
+  | 'intentResultRequest'
+  | 'joinUserChannelRequest'
+  | 'leaveCurrentChannelRequest'
+  | 'openRequest'
+  | 'privateChannelAddEventListenerRequest'
+  | 'privateChannelDisconnectRequest'
+  | 'privateChannelUnsubscribeEventListenerRequest'
+  | 'raiseIntentForContextRequest'
+  | 'raiseIntentRequest';
+
+/**
+ * An event message from the Desktop Agent to an app indicating that context has been
+ * broadcast on a channel it is listening to, or specifically to this app instance if it was
+ * launched via `fdc3.open` and context was passed.
  *
- * Identifier for the app instance that was selected (or started) to resolve the intent.
- * `source.instanceId` MUST be set, indicating the specific app instance that
- * received the intent.
+ * A message from a Desktop Agent to an FDC3-enabled app representing an event.
  */
-export interface AppIdentifier {
+export interface BroadcastEvent {
   /**
-   * The unique application identifier located within a specific application directory
-   * instance. An example of an appId might be 'app@sub.root'.
+   * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
    */
-  appId: string;
+  meta: BroadcastEventMeta;
   /**
-   * The Desktop Agent that the app is available on. Used in Desktop Agent Bridging to
-   * identify the Desktop Agent to target.
+   * The message payload contains details of the event that the app is being notified about.
    */
-  desktopAgent?: string;
+  payload: BroadcastEventPayload;
   /**
-   * An optional instance identifier, indicating that this object represents a specific
-   * instance of the application described.
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  instanceId?: string;
-  [property: string]: any;
+  type: 'broadcastEvent';
 }
 
 /**
- * The message payload typically contains the arguments to FDC3 API functions.
+ * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
  */
-export interface AddContextListenerRequestPayload {
+export interface BroadcastEventMeta {
+  eventUuid: string;
+  timestamp: Date;
+}
+
+/**
+ * The message payload contains details of the event that the app is being notified about.
+ */
+export interface BroadcastEventPayload {
   /**
-   * The id of the channel to add the listener to or `null` indicating that it should listen
-   * to the current user channel (at the time of broadcast).
+   * The Id of the channel that the broadcast was sent on. May be `null` if the context is
+   * being broadcast due to a call `fdc3.open` that passed context.
    */
   channelId: null | string;
   /**
-   * The type of context to listen for OR `null` indicating that it should listen to all
-   * context types.
+   * The context object that was broadcast.
    */
-  contextType: null | string;
+  context: Context;
+  /**
+   * Details of the application instance that broadcast the context.
+   */
+  originatingApp?: AppIdentifier;
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Request' appended.
- */
-
-/**
- * A response to a addContextListener request. Where the listener was added to the current
- * user channel (channelId == null), and this app has already been added to a user channel,
- * client code should make a subsequent request to get the current context of that channel
- * for this listener and then call its handler with it.
+ * The context object that was broadcast.
  *
- * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
- * payload contains an `error` property, the request was unsuccessful.
+ * The context object that is to be broadcast.
+ *
+ * The context object passed with the raised intent.
+ *
+ * If a Context object is passed in, this object will be provided to the opened application
+ * via a contextListener. The Context argument is functionally equivalent to opening the
+ * target app with no context and broadcasting the context directly to it.
+ *
+ * The `fdc3.context` type defines the basic contract or "shape" for all data exchanged by
+ * FDC3 operations. As such, it is not really meant to be used on its own, but is imported
+ * by more specific type definitions (standardized or custom) to provide the structure and
+ * properties shared by all FDC3 context data types.
+ *
+ * The key element of FDC3 context types is their mandatory `type` property, which is used
+ * to identify what type of data the object represents, and what shape it has.
+ *
+ * The FDC3 context type, and all derived types, define the minimum set of fields a context
+ * data object of a particular type can be expected to have, but this can always be extended
+ * with custom fields as appropriate.
  */
-export interface AddContextListenerResponse {
-  /**
-   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
-   */
-  meta: AddContextListenerResponseMeta;
+export interface Context {
   /**
-   * A payload for a response to an API call that will contain any return values or an `error`
-   * property containing a standardized error message indicating that the request was
-   * unsuccessful.
+   * Context data objects may include a set of equivalent key-value pairs that can be used to
+   * help applications identify and look up the context type they receive in their own domain.
+   * The idea behind this design is that applications can provide as many equivalent
+   * identifiers to a target application as possible, e.g. an instrument may be represented by
+   * an ISIN, CUSIP or Bloomberg identifier.
+   *
+   * Identifiers do not make sense for all types of data, so the `id` property is therefore
+   * optional, but some derived types may choose to require at least one identifier.
+   * Identifier values SHOULD always be of type string.
    */
-  payload: AddContextListenerResponsePayload;
+  id?: { [key: string]: any };
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   * Context data objects may include a name property that can be used for more information,
+   * or display purposes. Some derived types may require the name object as mandatory,
+   * depending on use case.
    */
-  type: 'addContextListenerResponse';
-}
-
-/**
- * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
- */
-export interface AddContextListenerResponseMeta {
-  requestUuid: string;
-  responseUuid: string;
+  name?: string;
   /**
-   * Field that represents the source application that the request being responded to was
-   * received from, for debugging purposes.
+   * The type property is the only _required_ part of the FDC3 context data schema. The FDC3
+   * [API](https://fdc3.finos.org/docs/api/spec) relies on the `type` property being present
+   * to route shared context data appropriately.
+   *
+   * FDC3 [Intents](https://fdc3.finos.org/docs/intents/spec) also register the context data
+   * types they support in an FDC3 [App
+   * Directory](https://fdc3.finos.org/docs/app-directory/overview), used for intent discovery
+   * and routing.
+   *
+   * Standardized FDC3 context types have well-known `type` properties prefixed with the
+   * `fdc3` namespace, e.g. `fdc3.instrument`. For non-standard types, e.g. those defined and
+   * used by a particular organization, the convention is to prefix them with an
+   * organization-specific namespace, e.g. `blackrock.fund`.
+   *
+   * See the [Context Data Specification](https://fdc3.finos.org/docs/context/spec) for more
+   * information about context data types.
    */
-  source?: AppIdentifier;
-  timestamp: Date;
-}
-
-/**
- * A payload for a response to an API call that will contain any return values or an `error`
- * property containing a standardized error message indicating that the request was
- * unsuccessful.
- */
-export interface AddContextListenerResponsePayload {
-  error?: PurpleError;
-  listenerUUID?: string;
+  type: string;
+  [property: string]: any;
 }
 
-/**
- * Constants representing the errors that can be encountered when calling the `open` method
- * on the DesktopAgent object (`fdc3`).
- *
- * Constants representing the errors that can be encountered when calling the `findIntent`,
- * `findIntentsByContext`, `raiseIntent` or `raiseIntentForContext` methods on the
- * DesktopAgent (`fdc3`).
- */
-export type PurpleError =
-  | 'AccessDenied'
-  | 'CreationFailed'
-  | 'MalformedContext'
-  | 'NoChannelFound'
-  | 'ApiTimeout'
-  | 'InvalidArguments';
-
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
  * the message relates to, e.g. 'findIntent', with 'Response' appended.
  */
 
 /**
- * A request to add an event listener for a specified event type to the Desktop Agent.
+ * A request to broadcast context on a channel.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface AddEventListenerRequest {
+export interface BroadcastRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -823,41 +731,40 @@ export interface AddEventListenerRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: AddEventListenerRequestPayload;
+  payload: BroadcastRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'addEventListenerRequest';
+  type: 'broadcastRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface AddEventListenerRequestPayload {
+export interface BroadcastRequestPayload {
   /**
-   * The type of the event to be listened to or `null` to listen to all event types.
+   * The Id of the Channel that the broadcast was sent on.
    */
-  type: 'USER_CHANNEL_CHANGED' | null;
+  channelId: string;
+  /**
+   * The context object that is to be broadcast.
+   */
+  context: Context;
 }
 
-/**
- * The type of a (non-context and non-intent) event that may be received via the FDC3 API's
- * addEventListener function.
- */
-
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
  * the message relates to, e.g. 'findIntent', with 'Request' appended.
  */
 
 /**
- * A response to an addEventListener request.
+ * A response to a request to broadcast context on a channel.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface AddEventListenerResponse {
+export interface BroadcastResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -867,12 +774,12 @@ export interface AddEventListenerResponse {
    * property containing a standardized error message indicating that the request was
    * unsuccessful.
    */
-  payload: AddEventListenerResponsePayload;
+  payload: BroadcastResponseResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'addEventListenerResponse';
+  type: 'broadcastResponse';
 }
 
 /**
@@ -880,393 +787,258 @@ export interface AddEventListenerResponse {
  * property containing a standardized error message indicating that the request was
  * unsuccessful.
  */
-export interface AddEventListenerResponsePayload {
+export interface BroadcastResponseResponsePayload {
   error?: ResponsePayloadError;
-  listenerUUID?: string;
+  [property: string]: any;
 }
 
-/**
- * Constants representing the errors that can be encountered when calling the `open` method
- * on the DesktopAgent object (`fdc3`).
- *
- * Constants representing the errors that can be encountered when calling the `findIntent`,
- * `findIntentsByContext`, `raiseIntent` or `raiseIntentForContext` methods on the
- * DesktopAgent (`fdc3`).
- */
-export type ResponsePayloadError =
-  | 'AccessDenied'
-  | 'CreationFailed'
-  | 'MalformedContext'
-  | 'NoChannelFound'
-  | 'ApiTimeout'
-  | 'InvalidArguments'
-  | 'AppNotFound'
-  | 'AppTimeout'
-  | 'DesktopAgentNotFound'
-  | 'ErrorOnLaunch'
-  | 'ResolverUnavailable'
-  | 'IntentDeliveryFailed'
-  | 'NoAppsFound'
-  | 'ResolverTimeout'
-  | 'TargetAppUnavailable'
-  | 'TargetInstanceUnavailable'
-  | 'UserCancelledResolution'
-  | 'IntentHandlerRejected'
-  | 'NoResultReturned'
-  | 'AgentDisconnected'
-  | 'NotConnectedToBridge'
-  | 'ResponseToBridgeTimedOut'
-  | 'MalformedMessage';
-
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
  * the message relates to, e.g. 'findIntent', with 'Response' appended.
  */
 
 /**
- * A request to add an Intent listener for a specified intent type.
+ * An event message from the Desktop Agent to an app indicating that its current user
+ * channel has changed.
  *
- * A request message from an FDC3-enabled app to a Desktop Agent.
+ * A message from a Desktop Agent to an FDC3-enabled app representing an event.
  */
-export interface AddIntentListenerRequest {
+export interface ChannelChangedEvent {
   /**
-   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
+   * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
    */
-  meta: AddContextListenerRequestMeta;
+  meta: BroadcastEventMeta;
   /**
-   * The message payload typically contains the arguments to FDC3 API functions.
+   * The message payload contains details of the event that the app is being notified about.
    */
-  payload: AddIntentListenerRequestPayload;
+  payload: ChannelChangedEventPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Request' appended.
+   * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'addIntentListenerRequest';
+  type: 'channelChangedEvent';
 }
 
 /**
- * The message payload typically contains the arguments to FDC3 API functions.
+ * The message payload contains details of the event that the app is being notified about.
  */
-export interface AddIntentListenerRequestPayload {
+export interface ChannelChangedEventPayload {
   /**
-   * The name of the intent to listen for.
+   * The Id of the channel that the app was added to or `null` if it was removed from a
+   * channel.
    */
-  intent: string;
+  newChannelId: null | string;
 }
 
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Request' appended.
+ * the message relates to, e.g. 'findIntent', with 'Response' appended.
  */
 
 /**
- * A response to a addIntentListener request.
+ * A request to unsubscribe a context listener.
  *
- * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
- * payload contains an `error` property, the request was unsuccessful.
+ * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface AddIntentListenerResponse {
+export interface ContextListenerUnsubscribeRequest {
   /**
-   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
+   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
-  meta: AddContextListenerResponseMeta;
+  meta: AddContextListenerRequestMeta;
   /**
-   * A payload for a response to an API call that will contain any return values or an `error`
-   * property containing a standardized error message indicating that the request was
-   * unsuccessful.
+   * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: PayloadObject;
+  payload: ContextListenerUnsubscribeRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'addIntentListenerResponse';
-}
-
-/**
- * A payload for a response to an API call that will contain any return values or an `error`
- * property containing a standardized error message indicating that the request was
- * unsuccessful.
- */
-export interface PayloadObject {
-  error?: FluffyError;
-  listenerUUID?: string;
-  [property: string]: any;
+  type: 'contextListenerUnsubscribeRequest';
 }
 
 /**
- * Constants representing the errors that can be encountered when calling the `open` method
- * on the DesktopAgent object (`fdc3`).
- *
- * Constants representing the errors that can be encountered when calling the `findIntent`,
- * `findIntentsByContext`, `raiseIntent` or `raiseIntentForContext` methods on the
- * DesktopAgent (`fdc3`).
- */
-export type FluffyError =
-  | 'MalformedContext'
-  | 'ApiTimeout'
-  | 'InvalidArguments'
-  | 'DesktopAgentNotFound'
-  | 'ResolverUnavailable'
-  | 'IntentDeliveryFailed'
-  | 'NoAppsFound'
-  | 'ResolverTimeout'
-  | 'TargetAppUnavailable'
-  | 'TargetInstanceUnavailable'
-  | 'UserCancelledResolution';
-
-/**
- * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
+ * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface AgentEventMessageMeta {
-  eventUuid: string;
-  timestamp: Date;
+export interface ContextListenerUnsubscribeRequestPayload {
+  listenerUUID: string;
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Response' appended.
- */
-export type EventMessageType =
-  | 'addEventListenerEvent'
-  | 'broadcastEvent'
-  | 'channelChangedEvent'
-  | 'heartbeatEvent'
-  | 'intentEvent'
-  | 'privateChannelOnAddContextListenerEvent'
-  | 'privateChannelOnDisconnectEvent'
-  | 'privateChannelOnUnsubscribeEvent';
-
-/**
- * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Request' appended.
  */
-export interface AgentResponseMessageMeta {
-  requestUuid: string;
-  responseUuid: string;
-  /**
-   * Field that represents the source application that the request being responded to was
-   * received from, for debugging purposes.
-   */
-  source?: AppIdentifier;
-  timestamp: Date;
-}
 
 /**
- * A payload for a response to an API call that will contain any return values or an `error`
- * property containing a standardized error message indicating that the request was
- * unsuccessful.
+ * A response to a contextListenerUnsubscribe request.
+ *
+ * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
+ * payload contains an `error` property, the request was unsuccessful.
  */
-export interface AgentResponseMessageResponsePayload {
-  error?: ResponsePayloadError;
-  [property: string]: any;
+export interface ContextListenerUnsubscribeResponse {
+  /**
+   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
+   */
+  meta: AddContextListenerResponseMeta;
+  /**
+   * A payload for a response to an API call that will contain any return values or an `error`
+   * property containing a standardized error message indicating that the request was
+   * unsuccessful.
+   */
+  payload: BroadcastResponseResponsePayload;
+  /**
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   */
+  type: 'contextListenerUnsubscribeResponse';
 }
 
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
  * the message relates to, e.g. 'findIntent', with 'Response' appended.
  */
-export type ResponseMessageType =
-  | 'addContextListenerResponse'
-  | 'addEventListenerResponse'
-  | 'addIntentListenerResponse'
-  | 'broadcastResponse'
-  | 'contextListenerUnsubscribeResponse'
-  | 'createPrivateChannelResponse'
-  | 'eventListenerUnsubscribeResponse'
-  | 'findInstancesResponse'
-  | 'findIntentResponse'
-  | 'findIntentsByContextResponse'
-  | 'getAppMetadataResponse'
-  | 'getCurrentChannelResponse'
-  | 'getCurrentContextResponse'
-  | 'getInfoResponse'
-  | 'getOrCreateChannelResponse'
-  | 'getUserChannelsResponse'
-  | 'intentListenerUnsubscribeResponse'
-  | 'intentResultResponse'
-  | 'joinUserChannelResponse'
-  | 'leaveCurrentChannelResponse'
-  | 'openResponse'
-  | 'privateChannelAddEventListenerResponse'
-  | 'privateChannelDisconnectResponse'
-  | 'privateChannelUnsubscribeEventListenerResponse'
-  | 'raiseIntentForContextResponse'
-  | 'raiseIntentResponse'
-  | 'raiseIntentResultResponse';
 
 /**
- * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
+ * Request to return a Channel with an auto-generated identity that is intended for private
+ * communication between applications.
+ *
+ * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface AppRequestMessageMeta {
-  requestUuid: string;
+export interface CreatePrivateChannelRequest {
   /**
-   * Field that represents the source application that a request or response was received
-   * from. Please note that this may be set by an app or Desktop Agent proxy for debugging
-   * purposes but a Desktop Agent should make its own determination of the source of a message
-   * to avoid spoofing.
+   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
-  source?: AppIdentifier;
-  timestamp: Date;
+  meta: AddContextListenerRequestMeta;
+  /**
+   * The message payload typically contains the arguments to FDC3 API functions.
+   */
+  payload: CreatePrivateChannelRequestPayload;
+  /**
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Request' appended.
+   */
+  type: 'createPrivateChannelRequest';
 }
 
+/**
+ * The message payload typically contains the arguments to FDC3 API functions.
+ */
+export interface CreatePrivateChannelRequestPayload {}
+
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
  * the message relates to, e.g. 'findIntent', with 'Request' appended.
  */
-export type RequestMessageType =
-  | 'addContextListenerRequest'
-  | 'addEventListenerRequest'
-  | 'addIntentListenerRequest'
-  | 'broadcastRequest'
-  | 'contextListenerUnsubscribeRequest'
-  | 'createPrivateChannelRequest'
-  | 'eventListenerUnsubscribeRequest'
-  | 'findInstancesRequest'
-  | 'findIntentRequest'
-  | 'findIntentsByContextRequest'
-  | 'getAppMetadataRequest'
-  | 'getCurrentChannelRequest'
-  | 'getCurrentContextRequest'
-  | 'getInfoRequest'
-  | 'getOrCreateChannelRequest'
-  | 'getUserChannelsRequest'
-  | 'heartbeatAcknowledgementRequest'
-  | 'intentListenerUnsubscribeRequest'
-  | 'intentResultRequest'
-  | 'joinUserChannelRequest'
-  | 'leaveCurrentChannelRequest'
-  | 'openRequest'
-  | 'privateChannelAddEventListenerRequest'
-  | 'privateChannelDisconnectRequest'
-  | 'privateChannelUnsubscribeEventListenerRequest'
-  | 'raiseIntentForContextRequest'
-  | 'raiseIntentRequest';
 
 /**
- * An event message from the Desktop Agent to an app indicating that context has been
- * broadcast on a channel it is listening to, or specifically to this app instance if it was
- * launched via `fdc3.open` and context was passed.
+ * A response to a createPrivateChannel request.
  *
- * A message from a Desktop Agent to an FDC3-enabled app representing an event.
+ * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
+ * payload contains an `error` property, the request was unsuccessful.
  */
-export interface BroadcastEvent {
+export interface CreatePrivateChannelResponse {
   /**
-   * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
+   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
-  meta: BroadcastEventMeta;
+  meta: AddContextListenerResponseMeta;
   /**
-   * The message payload contains details of the event that the app is being notified about.
+   * A payload for a response to an API call that will contain any return values or an `error`
+   * property containing a standardized error message indicating that the request was
+   * unsuccessful.
    */
-  payload: BroadcastEventPayload;
+  payload: CreatePrivateChannelResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'broadcastEvent';
+  type: 'createPrivateChannelResponse';
 }
 
 /**
- * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
+ * A payload for a response to an API call that will contain any return values or an `error`
+ * property containing a standardized error message indicating that the request was
+ * unsuccessful.
  */
-export interface BroadcastEventMeta {
-  eventUuid: string;
-  timestamp: Date;
+export interface CreatePrivateChannelResponsePayload {
+  error?: PurpleError;
+  privateChannel?: Channel;
 }
 
 /**
- * The message payload contains details of the event that the app is being notified about.
+ * Represents a context channel that applications can use to send and receive
+ * context data.
+ *
+ * Please note that There are differences in behavior when you interact with a
+ * User channel via the `DesktopAgent` interface and the `Channel` interface.
+ * Specifically, when 'joining' a User channel or adding a context listener
+ * when already joined to a channel via the `DesktopAgent` interface, existing
+ * context (matching the type of the context listener) on the channel is
+ * received by the context listener immediately. Whereas, when a context
+ * listener is added via the Channel interface, context is not received
+ * automatically, but may be retrieved manually via the `getCurrentContext()`
+ * function.
  */
-export interface BroadcastEventPayload {
+export interface Channel {
   /**
-   * The Id of the channel that the broadcast was sent on. May be `null` if the context is
-   * being broadcast due to a call `fdc3.open` that passed context.
+   * Channels may be visualized and selectable by users. DisplayMetadata may be used to
+   * provide hints on how to see them.
+   * For App channels, displayMetadata would typically not be present.
    */
-  channelId: null | string;
+  displayMetadata?: DisplayMetadata;
   /**
-   * The context object that was broadcast.
+   * Constant that uniquely identifies this channel.
    */
-  context: Context;
+  id: string;
   /**
-   * Details of the application instance that broadcast the context.
+   * Uniquely defines each channel type.
+   * Can be "user", "app" or "private".
    */
-  originatingApp?: AppIdentifier;
+  type: Type;
 }
 
 /**
- * The context object that was broadcast.
- *
- * The context object that is to be broadcast.
- *
- * The context object passed with the raised intent.
- *
- * If a Context object is passed in, this object will be provided to the opened application
- * via a contextListener. The Context argument is functionally equivalent to opening the
- * target app with no context and broadcasting the context directly to it.
- *
- * The `fdc3.context` type defines the basic contract or "shape" for all data exchanged by
- * FDC3 operations. As such, it is not really meant to be used on its own, but is imported
- * by more specific type definitions (standardized or custom) to provide the structure and
- * properties shared by all FDC3 context data types.
- *
- * The key element of FDC3 context types is their mandatory `type` property, which is used
- * to identify what type of data the object represents, and what shape it has.
+ * Channels may be visualized and selectable by users. DisplayMetadata may be used to
+ * provide hints on how to see them.
+ * For App channels, displayMetadata would typically not be present.
  *
- * The FDC3 context type, and all derived types, define the minimum set of fields a context
- * data object of a particular type can be expected to have, but this can always be extended
- * with custom fields as appropriate.
+ * A system channel will be global enough to have a presence across many apps. This gives us
+ * some hints
+ * to render them in a standard way. It is assumed it may have other properties too, but if
+ * it has these,
+ * this is their meaning.
  */
-export interface Context {
+export interface DisplayMetadata {
   /**
-   * Context data objects may include a set of equivalent key-value pairs that can be used to
-   * help applications identify and look up the context type they receive in their own domain.
-   * The idea behind this design is that applications can provide as many equivalent
-   * identifiers to a target application as possible, e.g. an instrument may be represented by
-   * an ISIN, CUSIP or Bloomberg identifier.
-   *
-   * Identifiers do not make sense for all types of data, so the `id` property is therefore
-   * optional, but some derived types may choose to require at least one identifier.
-   * Identifier values SHOULD always be of type string.
+   * The color that should be associated within this channel when displaying this channel in a
+   * UI, e.g: `0xFF0000`.
    */
-  id?: { [key: string]: any };
+  color?: string;
   /**
-   * Context data objects may include a name property that can be used for more information,
-   * or display purposes. Some derived types may require the name object as mandatory,
-   * depending on use case.
+   * A URL of an image that can be used to display this channel.
    */
-  name?: string;
+  glyph?: string;
   /**
-   * The type property is the only _required_ part of the FDC3 context data schema. The FDC3
-   * [API](https://fdc3.finos.org/docs/api/spec) relies on the `type` property being present
-   * to route shared context data appropriately.
-   *
-   * FDC3 [Intents](https://fdc3.finos.org/docs/intents/spec) also register the context data
-   * types they support in an FDC3 [App
-   * Directory](https://fdc3.finos.org/docs/app-directory/overview), used for intent discovery
-   * and routing.
-   *
-   * Standardized FDC3 context types have well-known `type` properties prefixed with the
-   * `fdc3` namespace, e.g. `fdc3.instrument`. For non-standard types, e.g. those defined and
-   * used by a particular organization, the convention is to prefix them with an
-   * organization-specific namespace, e.g. `blackrock.fund`.
-   *
-   * See the [Context Data Specification](https://fdc3.finos.org/docs/context/spec) for more
-   * information about context data types.
-   */
-  type: string;
-  [property: string]: any;
+   * A user-readable name for this channel, e.g: `"Red"`.
+   */
+  name?: string;
 }
 
+/**
+ * Uniquely defines each channel type.
+ * Can be "user", "app" or "private".
+ */
+export type Type = 'app' | 'private' | 'user';
+
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
  * the message relates to, e.g. 'findIntent', with 'Response' appended.
  */
 
 /**
- * A request to broadcast context on a channel.
+ * A request to unsubscribe an event listener.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface BroadcastRequest {
+export interface EventListenerUnsubscribeRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -1274,26 +1046,19 @@ export interface BroadcastRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: BroadcastRequestPayload;
+  payload: EventListenerUnsubscribeRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'broadcastRequest';
+  type: 'eventListenerUnsubscribeRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface BroadcastRequestPayload {
-  /**
-   * The Id of the Channel that the broadcast was sent on.
-   */
-  channelId: string;
-  /**
-   * The context object that is to be broadcast.
-   */
-  context: Context;
+export interface EventListenerUnsubscribeRequestPayload {
+  listenerUUID: string;
 }
 
 /**
@@ -1302,12 +1067,12 @@ export interface BroadcastRequestPayload {
  */
 
 /**
- * A response to a request to broadcast context on a channel.
+ * A response to an eventListenerUnsubscribe request.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface BroadcastResponse {
+export interface EventListenerUnsubscribeResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -1322,17 +1087,7 @@ export interface BroadcastResponse {
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'broadcastResponse';
-}
-
-/**
- * A payload for a response to an API call that will contain any return values or an `error`
- * property containing a standardized error message indicating that the request was
- * unsuccessful.
- */
-export interface BroadcastResponseResponsePayload {
-  error?: ResponsePayloadError;
-  [property: string]: any;
+  type: 'eventListenerUnsubscribeResponse';
 }
 
 /**
@@ -1341,412 +1096,450 @@ export interface BroadcastResponseResponsePayload {
  */
 
 /**
- * An event message from the Desktop Agent to an app indicating that its current user
- * channel has changed.
+ * Setup message sent by the DA proxy code in getAgent() to a channel selector UI in an
+ * iframe with the channel definitions and current channel selection.
  *
- * A message from a Desktop Agent to an FDC3-enabled app representing an event.
+ * A message used to communicate with user interface frames injected by `getAgent()` for
+ * displaying UI elements such as the intent resolver or channel selector. Used for messages
+ * sent in either direction.
  */
-export interface ChannelChangedEvent {
-  /**
-   * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
-   */
-  meta: BroadcastEventMeta;
+export interface Fdc3UserInterfaceChannels {
   /**
-   * The message payload contains details of the event that the app is being notified about.
+   * The message payload.
    */
-  payload: ChannelChangedEventPayload;
+  payload: Fdc3UserInterfaceChannelsPayload;
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   * Identifies the type of the message to or from the user interface frame.
    */
-  type: 'channelChangedEvent';
+  type: 'Fdc3UserInterfaceChannels';
 }
 
 /**
- * The message payload contains details of the event that the app is being notified about.
+ * The message payload.
  */
-export interface ChannelChangedEventPayload {
+export interface Fdc3UserInterfaceChannelsPayload {
   /**
-   * The Id of the channel that the app was added to or `null` if it was removed from a
-   * channel.
+   * The id of the channel that should be currently selected, or `null` if none should be
+   * selected.
    */
-  newChannelId: null | string;
+  selected: null | string;
+  /**
+   * User Channel definitions.```````s
+   */
+  userChannels: Channel[];
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Response' appended.
+ * Identifies the type of the message to or from the user interface frame.
  */
 
 /**
- * A request to unsubscribe a context listener.
+ * Message from a channel selector UI to the DA proxy sent when the channel selection
+ * changes.
  *
- * A request message from an FDC3-enabled app to a Desktop Agent.
+ * A message used to communicate with user interface frames injected by `getAgent()` for
+ * displaying UI elements such as the intent resolver or channel selector. Used for messages
+ * sent in either direction.
  */
-export interface ContextListenerUnsubscribeRequest {
-  /**
-   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
-   */
-  meta: AddContextListenerRequestMeta;
+export interface Fdc3UserInterfaceChannelSelected {
   /**
-   * The message payload typically contains the arguments to FDC3 API functions.
+   * The message payload.
    */
-  payload: ContextListenerUnsubscribeRequestPayload;
+  payload: Fdc3UserInterfaceChannelSelectedPayload;
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Request' appended.
+   * Identifies the type of the message to or from the user interface frame.
    */
-  type: 'contextListenerUnsubscribeRequest';
+  type: 'Fdc3UserInterfaceChannelSelected';
 }
 
 /**
- * The message payload typically contains the arguments to FDC3 API functions.
+ * The message payload.
  */
-export interface ContextListenerUnsubscribeRequestPayload {
-  listenerUUID: string;
+export interface Fdc3UserInterfaceChannelSelectedPayload {
+  /**
+   * The id of the channel that should be currently selected, or `null` if none should be
+   * selected.
+   */
+  selected: null | string;
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Request' appended.
+ * Identifies the type of the message to or from the user interface frame.
  */
 
 /**
- * A response to a contextListenerUnsubscribe request.
+ * Message from a UI iframe to the DA proxy (setup by `getAgent()`) indicating that the user
+ * is dragging the UI to a new location and providing the offset to apply to the location.
+ * The DA proxy implementation should limit the location to the current bounds of the
+ * window's viewport.
  *
- * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
- * payload contains an `error` property, the request was unsuccessful.
+ * A message used to communicate with user interface frames injected by `getAgent()` for
+ * displaying UI elements such as the intent resolver or channel selector. Used for messages
+ * sent in either direction.
  */
-export interface ContextListenerUnsubscribeResponse {
-  /**
-   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
-   */
-  meta: AddContextListenerResponseMeta;
+export interface Fdc3UserInterfaceDrag {
   /**
-   * A payload for a response to an API call that will contain any return values or an `error`
-   * property containing a standardized error message indicating that the request was
-   * unsuccessful.
+   * The message payload.
    */
-  payload: BroadcastResponseResponsePayload;
+  payload: Fdc3UserInterfaceDragPayload;
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   * Identifies the type of the message to or from the user interface frame.
    */
-  type: 'contextListenerUnsubscribeResponse';
+  type: 'Fdc3UserInterfaceDrag';
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Response' appended.
- */
-
-/**
- * Request to return a Channel with an auto-generated identity that is intended for private
- * communication between applications.
- *
- * A request message from an FDC3-enabled app to a Desktop Agent.
+ * The message payload.
  */
-export interface CreatePrivateChannelRequest {
-  /**
-   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
-   */
-  meta: AddContextListenerRequestMeta;
-  /**
-   * The message payload typically contains the arguments to FDC3 API functions.
-   */
-  payload: CreatePrivateChannelRequestPayload;
+export interface Fdc3UserInterfaceDragPayload {
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Request' appended.
+   * The offset to move the frame by.
    */
-  type: 'createPrivateChannelRequest';
+  mouseOffsets: MouseOffsets;
 }
 
 /**
- * The message payload typically contains the arguments to FDC3 API functions.
+ * The offset to move the frame by.
  */
-export interface CreatePrivateChannelRequestPayload {}
+export interface MouseOffsets {
+  x: number;
+  y: number;
+}
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Request' appended.
+ * Identifies the type of the message to or from the user interface frame.
  */
 
 /**
- * A response to a createPrivateChannel request.
+ * Handshake message sent back to a user interface from the DA proxy code (setup by
+ * `getAgent()`) over the `MessagePort` provided in the preceding Fdc3UserInterfaceHello
+ * message, confirming that it is listening to the `MessagePort` for further communication.
  *
- * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
- * payload contains an `error` property, the request was unsuccessful.
+ * A message used to communicate with user interface frames injected by `getAgent()` for
+ * displaying UI elements such as the intent resolver or channel selector. Used for messages
+ * sent in either direction.
  */
-export interface CreatePrivateChannelResponse {
+export interface Fdc3UserInterfaceHandshake {
   /**
-   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
+   * The message payload.
    */
-  meta: AddContextListenerResponseMeta;
+  payload: Fdc3UserInterfaceHandshakePayload;
   /**
-   * A payload for a response to an API call that will contain any return values or an `error`
-   * property containing a standardized error message indicating that the request was
-   * unsuccessful.
+   * Identifies the type of the message to or from the user interface frame.
    */
-  payload: CreatePrivateChannelResponsePayload;
+  type: 'Fdc3UserInterfaceHandshake';
+}
+
+/**
+ * The message payload.
+ */
+export interface Fdc3UserInterfaceHandshakePayload {
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   * The version of FDC3 API that the Desktop Agent will provide support for.
    */
-  type: 'createPrivateChannelResponse';
+  fdc3Version: string;
 }
 
 /**
- * A payload for a response to an API call that will contain any return values or an `error`
- * property containing a standardized error message indicating that the request was
- * unsuccessful.
+ * Identifies the type of the message to or from the user interface frame.
  */
-export interface CreatePrivateChannelResponsePayload {
-  error?: PurpleError;
-  privateChannel?: Channel;
-}
 
 /**
- * Represents a context channel that applications can use to send and receive
- * context data.
+ * Hello message sent by a UI to the Desktop Agent proxy setup by `getAgent()` to indicate
+ * it is ready to communicate, containing initial CSS to set on the iframe, and including an
+ * appended `MessagePort` to be used for further communication.
  *
- * Please note that There are differences in behavior when you interact with a
- * User channel via the `DesktopAgent` interface and the `Channel` interface.
- * Specifically, when 'joining' a User channel or adding a context listener
- * when already joined to a channel via the `DesktopAgent` interface, existing
- * context (matching the type of the context listener) on the channel is
- * received by the context listener immediately. Whereas, when a context
- * listener is added via the Channel interface, context is not received
- * automatically, but may be retrieved manually via the `getCurrentContext()`
- * function.
+ * A message used to communicate with user interface frames injected by `getAgent()` for
+ * displaying UI elements such as the intent resolver or channel selector. Used for messages
+ * sent in either direction.
  */
-export interface Channel {
+export interface Fdc3UserInterfaceHello {
   /**
-   * Channels may be visualized and selectable by users. DisplayMetadata may be used to
-   * provide hints on how to see them.
-   * For App channels, displayMetadata would typically not be present.
+   * The message payload.
    */
-  displayMetadata?: DisplayMetadata;
+  payload: Fdc3UserInterfaceHelloPayload;
   /**
-   * Constant that uniquely identifies this channel.
+   * Identifies the type of the message to or from the user interface frame.
+   */
+  type: 'Fdc3UserInterfaceHello';
+}
+
+/**
+ * The message payload.
+ */
+export interface Fdc3UserInterfaceHelloPayload {
+  /**
+   * Details about the UI implementation, such as vendor and version, for logging purposes.
    */
-  id: string;
+  implementationDetails: string;
   /**
-   * Uniquely defines each channel type.
-   * Can be "user", "app" or "private".
+   * A constrained set of styling properties that should be set on the user interface before
+   * it is displayed. Note `position` cannot be specified and should always be set to `fixed`.
    */
-  type: Type;
+  initialCSS: InitialCSS;
 }
 
 /**
- * Channels may be visualized and selectable by users. DisplayMetadata may be used to
- * provide hints on how to see them.
- * For App channels, displayMetadata would typically not be present.
- *
- * A system channel will be global enough to have a presence across many apps. This gives us
- * some hints
- * to render them in a standard way. It is assumed it may have other properties too, but if
- * it has these,
- * this is their meaning.
+ * A constrained set of styling properties that should be set on the user interface before
+ * it is displayed. Note `position` cannot be specified and should always be set to `fixed`.
  */
-export interface DisplayMetadata {
+export interface InitialCSS {
   /**
-   * The color that should be associated within this channel when displaying this channel in a
-   * UI, e.g: `0xFF0000`.
+   * The initial bottom property to apply to the iframe.
    */
-  color?: string;
+  bottom?: string;
   /**
-   * A URL of an image that can be used to display this channel.
+   * The initial height of the iframe.
    */
-  glyph?: string;
+  height?: string;
   /**
-   * A user-readable name for this channel, e.g: `"Red"`.
+   * The initial left property to apply to the iframe.
    */
-  name?: string;
-}
-
-/**
- * Uniquely defines each channel type.
- * Can be "user", "app" or "private".
- */
-export type Type = 'app' | 'private' | 'user';
-
-/**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Response' appended.
- */
-
-/**
- * A request to unsubscribe an event listener.
- *
- * A request message from an FDC3-enabled app to a Desktop Agent.
- */
-export interface EventListenerUnsubscribeRequest {
+  left?: string;
   /**
-   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
+   * The maximum height to apply to the iframe.
    */
-  meta: AddContextListenerRequestMeta;
+  maxHeight?: string;
   /**
-   * The message payload typically contains the arguments to FDC3 API functions.
+   * The maximum with to apply to the iframe.
    */
-  payload: EventListenerUnsubscribeRequestPayload;
+  maxWidth?: string;
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Request' appended.
+   * The initial right property to apply to the iframe.
    */
-  type: 'eventListenerUnsubscribeRequest';
-}
-
-/**
- * The message payload typically contains the arguments to FDC3 API functions.
- */
-export interface EventListenerUnsubscribeRequestPayload {
-  listenerUUID: string;
+  right?: string;
+  /**
+   * The initial top property to apply to the iframe.
+   */
+  top?: string;
+  /**
+   * The transition property to apply to the iframe.
+   */
+  transition?: string;
+  /**
+   * The initial width of the iframe.
+   */
+  width?: string;
+  /**
+   * The initial zindex to apply to the iframe.
+   */
+  zIndex?: string;
+  [property: string]: any;
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Request' appended.
+ * Identifies the type of the message to or from the user interface frame.
  */
 
 /**
- * A response to an eventListenerUnsubscribe request.
- *
- * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
- * payload contains an `error` property, the request was unsuccessful.
+ * A message used to communicate with user interface frames injected by `getAgent()` for
+ * displaying UI elements such as the intent resolver or channel selector. Used for messages
+ * sent in either direction.
  */
-export interface EventListenerUnsubscribeResponse {
-  /**
-   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
-   */
-  meta: AddContextListenerResponseMeta;
+export interface Fdc3UserInterfaceMessage {
   /**
-   * A payload for a response to an API call that will contain any return values or an `error`
-   * property containing a standardized error message indicating that the request was
-   * unsuccessful.
+   * The message payload.
    */
-  payload: BroadcastResponseResponsePayload;
+  payload?: { [key: string]: any };
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   * Identifies the type of the message to or from the user interface frame.
    */
-  type: 'eventListenerUnsubscribeResponse';
+  type: Fdc3UserInterfaceMessageType;
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Response' appended.
+ * Identifies the type of the message to or from the user interface frame.
  */
+export type Fdc3UserInterfaceMessageType =
+  | 'Fdc3UserInterfaceHello'
+  | 'Fdc3UserInterfaceHandshake'
+  | 'Fdc3UserInterfaceRestyle'
+  | 'Fdc3UserInterfaceDrag'
+  | 'Fdc3UserInterfaceResolve'
+  | 'Fdc3UserInterfaceResolveAction'
+  | 'Fdc3UserInterfaceChannels'
+  | 'Fdc3UserInterfaceChannelSelected';
 
 /**
- * Message from a channel selector UI to the DA proxy sent when the channel selection
- * changes.
+ * Setup message sent by the DA proxy code in getAgent() to an intent resolver UI with the
+ * resolver data to setup the UI.
  *
  * A message used to communicate with user interface frames injected by `getAgent()` for
  * displaying UI elements such as the intent resolver or channel selector. Used for messages
  * sent in either direction.
  */
-export interface Fdc3UserInterfaceChannelSelected {
+export interface Fdc3UserInterfaceResolve {
   /**
    * The message payload.
    */
-  payload: Fdc3UserInterfaceChannelSelectedPayload;
+  payload: Fdc3UserInterfaceResolvePayload;
   /**
    * Identifies the type of the message to or from the user interface frame.
    */
-  type: 'Fdc3UserInterfaceChannelSelected';
+  type: 'Fdc3UserInterfaceResolve';
 }
 
 /**
  * The message payload.
  */
-export interface Fdc3UserInterfaceChannelSelectedPayload {
+export interface Fdc3UserInterfaceResolvePayload {
   /**
-   * The id of the channel that should be currently selected, or `null` if none should be
-   * selected.
+   * An array of AppIntent objects defining the resolution options.
    */
-  selected: null | string;
+  appIntents: AppIntent[];
+  context: Context;
 }
 
 /**
- * Identifies the type of the message to or from the user interface frame.
+ * An interface that relates an intent to apps.
+ *
+ * Used if a raiseIntent request requires additional resolution (e.g. by showing an intent
+ * resolver) before it can be handled.
  */
+export interface AppIntent {
+  /**
+   * Details of applications that can resolve the intent.
+   */
+  apps: AppMetadata[];
+  /**
+   * Details of the intent whose relationship to resolving applications is being described.
+   */
+  intent: IntentMetadata;
+}
 
 /**
- * Setup message sent by the DA proxy code in getAgent() to a channel selector UI in an
- * iframe with the channel definitions and current channel selection.
+ * Extends an `AppIdentifier`, describing an application or instance of an application, with
+ * additional descriptive metadata that is usually provided by an FDC3 App Directory that
+ * the Desktop Agent connects to.
  *
- * A message used to communicate with user interface frames injected by `getAgent()` for
- * displaying UI elements such as the intent resolver or channel selector. Used for messages
- * sent in either direction.
+ * The additional information from an app directory can aid in rendering UI elements, such
+ * as a launcher menu or resolver UI. This includes a title, description, tooltip and icon
+ * and screenshot URLs.
+ *
+ * Note that as `AppMetadata` instances are also `AppIdentifiers` they may be passed to the
+ * `app` argument of `fdc3.open`, `fdc3.raiseIntent` etc.
+ *
+ * The calling application instance's own metadata, according to the Desktop Agent (MUST
+ * include at least the `appId` and `instanceId`).
  */
-export interface Fdc3UserInterfaceChannels {
+export interface AppMetadata {
   /**
-   * The message payload.
+   * The unique application identifier located within a specific application directory
+   * instance. An example of an appId might be 'app@sub.root'.
    */
-  payload: Fdc3UserInterfaceChannelsPayload;
+  appId: string;
+  /**
+   * A longer, multi-paragraph description for the application that could include markup.
+   */
+  description?: string;
+  /**
+   * The Desktop Agent that the app is available on. Used in Desktop Agent Bridging to
+   * identify the Desktop Agent to target.
+   */
+  desktopAgent?: string;
+  /**
+   * A list of icon URLs for the application that can be used to render UI elements.
+   */
+  icons?: Icon[];
+  /**
+   * An optional instance identifier, indicating that this object represents a specific
+   * instance of the application described.
+   */
+  instanceId?: string;
+  /**
+   * An optional set of, implementation specific, metadata fields that can be used to
+   * disambiguate instances, such as a window title or screen position. Must only be set if
+   * `instanceId` is set.
+   */
+  instanceMetadata?: { [key: string]: any };
+  /**
+   * The 'friendly' app name.
+   * This field was used with the `open` and `raiseIntent` calls in FDC3 <2.0, which now
+   * require an `AppIdentifier` wth `appId` set.
+   * Note that for display purposes the `title` field should be used, if set, in preference to
+   * this field.
+   */
+  name?: string;
+  /**
+   * The type of output returned for any intent specified during resolution. May express a
+   * particular context type (e.g. "fdc3.instrument"), channel (e.g. "channel") or a channel
+   * that will receive a specified type (e.g. "channel<fdc3.instrument>").
+   */
+  resultType?: null | string;
+  /**
+   * Images representing the app in common usage scenarios that can be used to render UI
+   * elements.
+   */
+  screenshots?: Image[];
+  /**
+   * A more user-friendly application title that can be used to render UI elements.
+   */
+  title?: string;
+  /**
+   * A tooltip for the application that can be used to render UI elements.
+   */
+  tooltip?: string;
+  /**
+   * The Version of the application.
+   */
+  version?: string;
+}
+
+/**
+ * Describes an Icon image that may be used to represent the application.
+ */
+export interface Icon {
+  /**
+   * The icon dimension, formatted as `<height>x<width>`.
+   */
+  size?: string;
+  /**
+   * The icon url.
+   */
+  src: string;
   /**
-   * Identifies the type of the message to or from the user interface frame.
+   * Icon media type. If not present the Desktop Agent may use the src file extension.
    */
-  type: 'Fdc3UserInterfaceChannels';
+  type?: string;
 }
 
 /**
- * The message payload.
+ * Describes an image file, typically a screenshot, that often represents the application in
+ * a common usage scenario.
  */
-export interface Fdc3UserInterfaceChannelsPayload {
+export interface Image {
   /**
-   * The id of the channel that should be currently selected, or `null` if none should be
-   * selected.
+   * Caption for the image.
    */
-  selected: null | string;
+  label?: string;
   /**
-   * User Channel definitions.```````s
+   * The image dimension, formatted as `<height>x<width>`.
    */
-  userChannels: Channel[];
-}
-
-/**
- * Identifies the type of the message to or from the user interface frame.
- */
-
-/**
- * Message from a UI iframe to the DA proxy (setup by `getAgent()`) indicating that the user
- * is dragging the UI to a new location and providing the offset to apply to the location.
- * The DA proxy implementation should limit the location to the current bounds of the
- * window's viewport.
- *
- * A message used to communicate with user interface frames injected by `getAgent()` for
- * displaying UI elements such as the intent resolver or channel selector. Used for messages
- * sent in either direction.
- */
-export interface Fdc3UserInterfaceDrag {
+  size?: string;
   /**
-   * The message payload.
+   * The image url.
    */
-  payload: Fdc3UserInterfaceDragPayload;
+  src: string;
   /**
-   * Identifies the type of the message to or from the user interface frame.
+   * Image media type. If not present the Desktop Agent may use the src file extension.
    */
-  type: 'Fdc3UserInterfaceDrag';
+  type?: string;
 }
 
 /**
- * The message payload.
+ * Details of the intent whose relationship to resolving applications is being described.
+ *
+ * Metadata describing an Intent.
  */
-export interface Fdc3UserInterfaceDragPayload {
+export interface IntentMetadata {
   /**
-   * The offset to move the frame by.
+   * Display name for the intent.
    */
-  mouseOffsets: MouseOffsets;
-}
-
-/**
- * The offset to move the frame by.
- */
-export interface MouseOffsets {
-  x: number;
-  y: number;
+  displayName?: string;
+  /**
+   * The unique name of the intent that can be invoked by the raiseIntent call.
+   */
+  name: string;
 }
 
 /**
@@ -1754,85 +1547,87 @@ export interface MouseOffsets {
  */
 
 /**
- * Handshake message sent back to a user interface from the DA proxy code (setup by
- * `getAgent()`) over the `MessagePort` provided in the preceding Fdc3UserInterfaceHello
- * message, confirming that it is listening to the `MessagePort` for further communication.
+ * Message from an intent resolver UI to DA proxy code in getAgent() reporting a user
+ * action.
  *
  * A message used to communicate with user interface frames injected by `getAgent()` for
  * displaying UI elements such as the intent resolver or channel selector. Used for messages
  * sent in either direction.
  */
-export interface Fdc3UserInterfaceHandshake {
+export interface Fdc3UserInterfaceResolveAction {
   /**
    * The message payload.
    */
-  payload: Fdc3UserInterfaceHandshakePayload;
+  payload: Fdc3UserInterfaceResolveActionPayload;
   /**
    * Identifies the type of the message to or from the user interface frame.
    */
-  type: 'Fdc3UserInterfaceHandshake';
+  type: 'Fdc3UserInterfaceResolveAction';
 }
 
 /**
  * The message payload.
  */
-export interface Fdc3UserInterfaceHandshakePayload {
+export interface Fdc3UserInterfaceResolveActionPayload {
+  action: Action;
   /**
-   * The version of FDC3 API that the Desktop Agent will provide support for.
+   * The App resolution option chosen.
    */
-  fdc3Version: string;
+  appIdentifier?: AppIdentifier;
+  /**
+   * The intent resolved.
+   */
+  intent?: string;
 }
 
+export type Action = 'hover' | 'click' | 'cancel';
+
 /**
  * Identifies the type of the message to or from the user interface frame.
  */
 
 /**
- * Hello message sent by a UI to the Desktop Agent proxy setup by `getAgent()` to indicate
- * it is ready to communicate, containing initial CSS to set on the iframe, and including an
- * appended `MessagePort` to be used for further communication.
+ * Message from a UI frame to the DA proxy code (setup by `getAgent()`) with updated styling
+ * information to apply to it. Can be used to implement a pop-open or close interaction or
+ * other transition needed by a UI implementation.
  *
  * A message used to communicate with user interface frames injected by `getAgent()` for
  * displaying UI elements such as the intent resolver or channel selector. Used for messages
  * sent in either direction.
  */
-export interface Fdc3UserInterfaceHello {
+export interface Fdc3UserInterfaceRestyle {
   /**
    * The message payload.
    */
-  payload: Fdc3UserInterfaceHelloPayload;
+  payload: Fdc3UserInterfaceRestylePayload;
   /**
    * Identifies the type of the message to or from the user interface frame.
    */
-  type: 'Fdc3UserInterfaceHello';
+  type: 'Fdc3UserInterfaceRestyle';
 }
 
 /**
  * The message payload.
  */
-export interface Fdc3UserInterfaceHelloPayload {
-  /**
-   * Details about the UI implementation, such as vendor and version, for logging purposes.
-   */
-  implementationDetails: string;
+export interface Fdc3UserInterfaceRestylePayload {
   /**
-   * A constrained set of styling properties that should be set on the user interface before
-   * it is displayed. Note `position` cannot be specified and should always be set to `fixed`.
+   * A constrained set of styling properties that should be applied to the frame. Note
+   * `position` cannot be set, and should always be `fixed`.
    */
-  initialCSS: InitialCSS;
+  updatedCSS: UpdatedCSS;
 }
 
 /**
- * A constrained set of styling properties that should be set on the user interface before
- * it is displayed. Note `position` cannot be specified and should always be set to `fixed`.
+ * A constrained set of styling properties that should be applied to the frame. Note
+ * `position` cannot be set, and should always be `fixed`.
  */
-export interface InitialCSS {
+export interface UpdatedCSS {
   /**
    * The initial bottom property to apply to the iframe.
    */
   bottom?: string;
   /**
-   * The initial height of the iframe.
+   * The updated height of the iframe.
    */
   height?: string;
   /**
@@ -1840,11 +1635,11 @@ export interface InitialCSS {
    */
   left?: string;
   /**
-   * The maximum height to apply to the iframe.
+   * The updated maximum height to apply to the iframe.
    */
   maxHeight?: string;
   /**
-   * The maximum with to apply to the iframe.
+   * The updated maximum with to apply to the iframe.
    */
   maxWidth?: string;
   /**
@@ -1856,249 +1651,441 @@ export interface InitialCSS {
    */
   top?: string;
   /**
-   * The transition property to apply to the iframe.
+   * The updated transition property to apply to the iframe.
+   */
+  transition?: string;
+  /**
+   * The updated width of the iframe.
+   */
+  width?: string;
+  /**
+   * The updated zIndex to apply to the iframe.
+   */
+  zIndex?: string;
+  [property: string]: any;
+}
+
+/**
+ * Identifies the type of the message to or from the user interface frame.
+ */
+
+/**
+ * A request for details of instances of a particular app.
+ *
+ * A request message from an FDC3-enabled app to a Desktop Agent.
+ */
+export interface FindInstancesRequest {
+  /**
+   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
+   */
+  meta: AddContextListenerRequestMeta;
+  /**
+   * The message payload typically contains the arguments to FDC3 API functions.
+   */
+  payload: FindInstancesRequestPayload;
+  /**
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Request' appended.
+   */
+  type: 'findInstancesRequest';
+}
+
+/**
+ * The message payload typically contains the arguments to FDC3 API functions.
+ */
+export interface FindInstancesRequestPayload {
+  app: AppIdentifier;
+}
+
+/**
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Request' appended.
+ */
+
+/**
+ * A response to a findInstances request.
+ *
+ * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
+ * payload contains an `error` property, the request was unsuccessful.
+ */
+export interface FindInstancesResponse {
+  /**
+   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
+   */
+  meta: AddContextListenerResponseMeta;
+  /**
+   * A payload for a response to an API call that will contain any return values or an `error`
+   * property containing a standardized error message indicating that the request was
+   * unsuccessful.
+   */
+  payload: FindInstancesResponsePayload;
+  /**
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   */
+  type: 'findInstancesResponse';
+}
+
+/**
+ * A payload for a response to an API call that will contain any return values or an `error`
+ * property containing a standardized error message indicating that the request was
+ * unsuccessful.
+ *
+ * The message payload contains a flag indicating whether the API call was successful, plus
+ * any return values for the FDC3 API function called, or indicating that the request
+ * resulted in an error and including a standardized error message.
+ */
+export interface FindInstancesResponsePayload {
+  error?: FindInstancesErrors;
+  appIdentifiers?: AppMetadata[];
+}
+
+/**
+ * Constants representing the errors that can be encountered when calling the `open` method
+ * on the DesktopAgent object (`fdc3`).
+ *
+ * Constants representing the errors that can be encountered when calling the `findIntent`,
+ * `findIntentsByContext`, `raiseIntent` or `raiseIntentForContext` methods on the
+ * DesktopAgent (`fdc3`).
+ *
+ * Unique identifier for a request or event message. Required in all message types.
+ *
+ * Unique identifier for a response to a specific message and must always be accompanied by
+ * a RequestUuid.
+ *
+ * Unique identifier for a `listener` object returned by a Desktop Agent to an app in
+ * response to addContextListener, addIntentListener or one of the PrivateChannel event
+ * listeners and used to identify it in messages (e.g. when unsubscribing).
+ *
+ * Unique identifier for an event message sent from a Desktop Agent to an app.
+ *
+ * Unique identifier for a for an attempt to connect to a Desktop Agent. A Unique UUID
+ * should be used in the first (WCP1Hello) message and should be quoted in all subsequent
+ * messages to link them to the same connection attempt.
+ *
+ * Should be set if the raiseIntent request returned an error.
+ */
+export type FindInstancesErrors =
+  | 'MalformedContext'
+  | 'ApiTimeout'
+  | 'InvalidArguments'
+  | 'DesktopAgentNotFound'
+  | 'ResolverUnavailable'
+  | 'IntentDeliveryFailed'
+  | 'NoAppsFound'
+  | 'ResolverTimeout'
+  | 'TargetAppUnavailable'
+  | 'TargetInstanceUnavailable'
+  | 'UserCancelledResolution'
+  | 'AgentDisconnected'
+  | 'NotConnectedToBridge'
+  | 'ResponseToBridgeTimedOut'
+  | 'MalformedMessage';
+
+/**
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Response' appended.
+ */
+
+/**
+ * A request for details of apps available to resolve a particular intent and context pair.
+ *
+ * A request message from an FDC3-enabled app to a Desktop Agent.
+ */
+export interface FindIntentRequest {
+  /**
+   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
-  transition?: string;
+  meta: AddContextListenerRequestMeta;
   /**
-   * The initial width of the iframe.
+   * The message payload typically contains the arguments to FDC3 API functions.
    */
-  width?: string;
+  payload: FindIntentRequestPayload;
   /**
-   * The initial zindex to apply to the iframe.
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  zIndex?: string;
-  [property: string]: any;
+  type: 'findIntentRequest';
 }
 
 /**
- * Identifies the type of the message to or from the user interface frame.
+ * The message payload typically contains the arguments to FDC3 API functions.
+ */
+export interface FindIntentRequestPayload {
+  context?: Context;
+  intent: string;
+  resultType?: string;
+}
+
+/**
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Request' appended.
  */
 
 /**
- * A message used to communicate with user interface frames injected by `getAgent()` for
- * displaying UI elements such as the intent resolver or channel selector. Used for messages
- * sent in either direction.
+ * A response to a findIntent request.
+ *
+ * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
+ * payload contains an `error` property, the request was unsuccessful.
  */
-export interface Fdc3UserInterfaceMessage {
+export interface FindIntentResponse {
   /**
-   * The message payload.
+   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
-  payload?: { [key: string]: any };
+  meta: AddContextListenerResponseMeta;
   /**
-   * Identifies the type of the message to or from the user interface frame.
+   * A payload for a response to an API call that will contain any return values or an `error`
+   * property containing a standardized error message indicating that the request was
+   * unsuccessful.
    */
-  type: Fdc3UserInterfaceMessageType;
+  payload: FindIntentResponsePayload;
+  /**
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   */
+  type: 'findIntentResponse';
 }
 
 /**
- * Identifies the type of the message to or from the user interface frame.
+ * A payload for a response to an API call that will contain any return values or an `error`
+ * property containing a standardized error message indicating that the request was
+ * unsuccessful.
  */
-export type Fdc3UserInterfaceMessageType =
-  | 'Fdc3UserInterfaceHello'
-  | 'Fdc3UserInterfaceHandshake'
-  | 'Fdc3UserInterfaceRestyle'
-  | 'Fdc3UserInterfaceDrag'
-  | 'Fdc3UserInterfaceResolve'
-  | 'Fdc3UserInterfaceResolveAction'
-  | 'Fdc3UserInterfaceChannels'
-  | 'Fdc3UserInterfaceChannelSelected';
+export interface FindIntentResponsePayload {
+  error?: FindInstancesErrors;
+  appIntent?: AppIntent;
+}
 
 /**
- * Setup message sent by the DA proxy code in getAgent() to an intent resolver UI with the
- * resolver data to setup the UI.
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Response' appended.
+ */
+
+/**
+ * A request for details of intents and apps available to resolve them for a particular
+ * context.
  *
- * A message used to communicate with user interface frames injected by `getAgent()` for
- * displaying UI elements such as the intent resolver or channel selector. Used for messages
- * sent in either direction.
+ * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface Fdc3UserInterfaceResolve {
+export interface FindIntentsByContextRequest {
   /**
-   * The message payload.
+   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
-  payload: Fdc3UserInterfaceResolvePayload;
+  meta: AddContextListenerRequestMeta;
   /**
-   * Identifies the type of the message to or from the user interface frame.
+   * The message payload typically contains the arguments to FDC3 API functions.
    */
-  type: 'Fdc3UserInterfaceResolve';
+  payload: FindIntentsByContextRequestPayload;
+  /**
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Request' appended.
+   */
+  type: 'findIntentsByContextRequest';
 }
 
 /**
- * The message payload.
+ * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface Fdc3UserInterfaceResolvePayload {
-  /**
-   * An array of AppIntent objects defining the resolution options.
-   */
-  appIntents: AppIntent[];
+export interface FindIntentsByContextRequestPayload {
   context: Context;
+  resultType?: string;
 }
 
 /**
- * An interface that relates an intent to apps.
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Request' appended.
+ */
+
+/**
+ * A response to a findIntentsByContext request.
  *
- * Used if a raiseIntent request requires additional resolution (e.g. by showing an intent
- * resolver) before it can be handled.
+ * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
+ * payload contains an `error` property, the request was unsuccessful.
  */
-export interface AppIntent {
+export interface FindIntentsByContextResponse {
   /**
-   * Details of applications that can resolve the intent.
+   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
-  apps: AppMetadata[];
+  meta: AddContextListenerResponseMeta;
   /**
-   * Details of the intent whose relationship to resolving applications is being described.
+   * A payload for a response to an API call that will contain any return values or an `error`
+   * property containing a standardized error message indicating that the request was
+   * unsuccessful.
    */
-  intent: IntentMetadata;
+  payload: FindIntentsByContextResponsePayload;
+  /**
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   */
+  type: 'findIntentsByContextResponse';
 }
 
 /**
- * Details of the intent whose relationship to resolving applications is being described.
- *
- * Metadata describing an Intent.
+ * A payload for a response to an API call that will contain any return values or an `error`
+ * property containing a standardized error message indicating that the request was
+ * unsuccessful.
  */
-export interface IntentMetadata {
-  /**
-   * Display name for the intent.
-   */
-  displayName?: string;
-  /**
-   * The unique name of the intent that can be invoked by the raiseIntent call.
-   */
-  name: string;
+export interface FindIntentsByContextResponsePayload {
+  error?: FindInstancesErrors;
+  appIntents?: AppIntent[];
 }
 
 /**
- * Identifies the type of the message to or from the user interface frame.
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Response' appended.
  */
 
 /**
- * Message from an intent resolver UI to DA proxy code in getAgent() reporting a user
- * action.
+ * A request for metadata about an app.
  *
- * A message used to communicate with user interface frames injected by `getAgent()` for
- * displaying UI elements such as the intent resolver or channel selector. Used for messages
- * sent in either direction.
+ * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface Fdc3UserInterfaceResolveAction {
+export interface GetAppMetadataRequest {
   /**
-   * The message payload.
+   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
-  payload: Fdc3UserInterfaceResolveActionPayload;
+  meta: AddContextListenerRequestMeta;
   /**
-   * Identifies the type of the message to or from the user interface frame.
+   * The message payload typically contains the arguments to FDC3 API functions.
    */
-  type: 'Fdc3UserInterfaceResolveAction';
+  payload: GetAppMetadataRequestPayload;
+  /**
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Request' appended.
+   */
+  type: 'getAppMetadataRequest';
 }
 
 /**
- * The message payload.
+ * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface Fdc3UserInterfaceResolveActionPayload {
-  action: Action;
-  /**
-   * The App resolution option chosen.
-   */
-  appIdentifier?: AppIdentifier;
-  /**
-   * The intent resolved.
-   */
-  intent?: string;
+export interface GetAppMetadataRequestPayload {
+  app: AppIdentifier;
 }
 
-export type Action = 'hover' | 'click' | 'cancel';
-
 /**
- * Identifies the type of the message to or from the user interface frame.
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Request' appended.
  */
 
 /**
- * Message from a UI frame to the DA proxy code (setup by `getAgent()`) with updated styling
- * information to apply to it. Can be used to implement a pop-open or close interaction or
- * other transition needed by a UI implementation.
+ * A response to a getAppMetadata request.
  *
- * A message used to communicate with user interface frames injected by `getAgent()` for
- * displaying UI elements such as the intent resolver or channel selector. Used for messages
- * sent in either direction.
+ * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
+ * payload contains an `error` property, the request was unsuccessful.
  */
-export interface Fdc3UserInterfaceRestyle {
+export interface GetAppMetadataResponse {
   /**
-   * The message payload.
+   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
-  payload: Fdc3UserInterfaceRestylePayload;
+  meta: AddContextListenerResponseMeta;
   /**
-   * Identifies the type of the message to or from the user interface frame.
+   * A payload for a response to an API call that will contain any return values or an `error`
+   * property containing a standardized error message indicating that the request was
+   * unsuccessful.
    */
-  type: 'Fdc3UserInterfaceRestyle';
+  payload: GetAppMetadataResponsePayload;
+  /**
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   */
+  type: 'getAppMetadataResponse';
 }
 
 /**
- * The message payload.
+ * A payload for a response to an API call that will contain any return values or an `error`
+ * property containing a standardized error message indicating that the request was
+ * unsuccessful.
  */
-export interface Fdc3UserInterfaceRestylePayload {
-  /**
-   * A constrained set of styling properties that should be applied to the frame. Note
-   * `position` cannot be set, and should always be `fixed`.
-   */
-  updatedCSS: UpdatedCSS;
+export interface GetAppMetadataResponsePayload {
+  error?: FindInstancesErrors;
+  appMetadata?: AppMetadata;
 }
 
 /**
- * A constrained set of styling properties that should be applied to the frame. Note
- * `position` cannot be set, and should always be `fixed`.
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Response' appended.
+ */
+
+/**
+ * A request to return the Channel object for the current User channel membership. Returns
+ * `null` if the app is not joined to a channel.
+ *
+ * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface UpdatedCSS {
-  /**
-   * The initial bottom property to apply to the iframe.
-   */
-  bottom?: string;
-  /**
-   * The updated height of the iframe.
-   */
-  height?: string;
-  /**
-   * The initial left property to apply to the iframe.
-   */
-  left?: string;
-  /**
-   * The updated maximum height to apply to the iframe.
-   */
-  maxHeight?: string;
+export interface GetCurrentChannelRequest {
   /**
-   * The updated maximum with to apply to the iframe.
+   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
-  maxWidth?: string;
+  meta: AddContextListenerRequestMeta;
   /**
-   * The initial right property to apply to the iframe.
+   * The message payload typically contains the arguments to FDC3 API functions.
    */
-  right?: string;
+  payload: GetCurrentChannelRequestPayload;
   /**
-   * The initial top property to apply to the iframe.
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  top?: string;
+  type: 'getCurrentChannelRequest';
+}
+
+/**
+ * The message payload typically contains the arguments to FDC3 API functions.
+ */
+export interface GetCurrentChannelRequestPayload {}
+
+/**
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Request' appended.
+ */
+
+/**
+ * A response to a getCurrentChannel request.
+ *
+ * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
+ * payload contains an `error` property, the request was unsuccessful.
+ */
+export interface GetCurrentChannelResponse {
   /**
-   * The updated transition property to apply to the iframe.
+   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
-  transition?: string;
+  meta: AddContextListenerResponseMeta;
   /**
-   * The updated width of the iframe.
+   * A payload for a response to an API call that will contain any return values or an `error`
+   * property containing a standardized error message indicating that the request was
+   * unsuccessful.
    */
-  width?: string;
+  payload: GetCurrentChannelResponsePayload;
   /**
-   * The updated zIndex to apply to the iframe.
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  zIndex?: string;
-  [property: string]: any;
+  type: 'getCurrentChannelResponse';
 }
 
 /**
- * Identifies the type of the message to or from the user interface frame.
+ * A payload for a response to an API call that will contain any return values or an `error`
+ * property containing a standardized error message indicating that the request was
+ * unsuccessful.
+ */
+export interface GetCurrentChannelResponsePayload {
+  error?: ResponsePayloadError;
+  channel?: Channel | null;
+}
+
+/**
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Response' appended.
  */
 
 /**
- * A request for details of instances of a particular app.
+ * A request to return the current context (either of a specified type or most recent
+ * broadcast) of a specified Channel. Returns `null` if no context (of the requested type if
+ * one was specified) is available in the channel.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface FindInstancesRequest {
+export interface GetCurrentContextRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -2106,19 +2093,27 @@ export interface FindInstancesRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: FindInstancesRequestPayload;
+  payload: GetCurrentContextRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'findInstancesRequest';
+  type: 'getCurrentContextRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface FindInstancesRequestPayload {
-  app: AppIdentifier;
+export interface GetCurrentContextRequestPayload {
+  /**
+   * The id of the channel to return the current context of.
+   */
+  channelId: string;
+  /**
+   * The type of context to return for OR `null` indicating that the most recently broadcast
+   * context on the channel should be returned.
+   */
+  contextType: null | string;
 }
 
 /**
@@ -2127,12 +2122,12 @@ export interface FindInstancesRequestPayload {
  */
 
 /**
- * A response to a findInstances request.
+ * A response to a getCurrentContext request.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface FindInstancesResponse {
+export interface GetCurrentContextResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -2142,81 +2137,40 @@ export interface FindInstancesResponse {
    * property containing a standardized error message indicating that the request was
    * unsuccessful.
    */
-  payload: FindInstancesResponsePayload;
+  payload: GetCurrentContextResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'findInstancesResponse';
+  type: 'getCurrentContextResponse';
 }
 
 /**
  * A payload for a response to an API call that will contain any return values or an `error`
  * property containing a standardized error message indicating that the request was
  * unsuccessful.
- *
- * The message payload contains a flag indicating whether the API call was successful, plus
- * any return values for the FDC3 API function called, or indicating that the request
- * resulted in an error and including a standardized error message.
  */
-export interface FindInstancesResponsePayload {
-  error?: FindInstancesErrors;
-  appIdentifiers?: AppMetadata[];
+export interface GetCurrentContextResponsePayload {
+  error?: PurpleError;
+  /**
+   * The most recently broadcast context object (of the specified type, if one was specified),
+   * or `null` if none was available in the channel.
+   */
+  context?: null | Context;
 }
 
-/**
- * Constants representing the errors that can be encountered when calling the `open` method
- * on the DesktopAgent object (`fdc3`).
- *
- * Constants representing the errors that can be encountered when calling the `findIntent`,
- * `findIntentsByContext`, `raiseIntent` or `raiseIntentForContext` methods on the
- * DesktopAgent (`fdc3`).
- *
- * Unique identifier for a for an attempt to connect to a Desktop Agent. A Unique UUID
- * should be used in the first (WCP1Hello) message and should be quoted in all subsequent
- * messages to link them to the same connection attempt.
- *
- * Unique identifier for a request or event message. Required in all message types.
- *
- * Unique identifier for a response to a specific message and must always be accompanied by
- * a RequestUuid.
- *
- * Unique identifier for a `listener` object returned by a Desktop Agent to an app in
- * response to addContextListener, addIntentListener or one of the PrivateChannel event
- * listeners and used to identify it in messages (e.g. when unsubscribing).
- *
- * Unique identifier for an event message sent from a Desktop Agent to an app.
- *
- * Should be set if the raiseIntent request returned an error.
- */
-export type FindInstancesErrors =
-  | 'MalformedContext'
-  | 'ApiTimeout'
-  | 'InvalidArguments'
-  | 'DesktopAgentNotFound'
-  | 'ResolverUnavailable'
-  | 'IntentDeliveryFailed'
-  | 'NoAppsFound'
-  | 'ResolverTimeout'
-  | 'TargetAppUnavailable'
-  | 'TargetInstanceUnavailable'
-  | 'UserCancelledResolution'
-  | 'AgentDisconnected'
-  | 'NotConnectedToBridge'
-  | 'ResponseToBridgeTimedOut'
-  | 'MalformedMessage';
-
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
  * the message relates to, e.g. 'findIntent', with 'Response' appended.
  */
 
 /**
- * A request for details of apps available to resolve a particular intent and context pair.
+ * Request to retrieve information about the FDC3 Desktop Agent implementation and the
+ * metadata of the calling application according to the Desktop Agent.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface FindIntentRequest {
+export interface GetInfoRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -2224,22 +2178,18 @@ export interface FindIntentRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: FindIntentRequestPayload;
+  payload: GetInfoRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'findIntentRequest';
+  type: 'getInfoRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface FindIntentRequestPayload {
-  context?: Context;
-  intent: string;
-  resultType?: string;
-}
+export interface GetInfoRequestPayload {}
 
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
@@ -2247,12 +2197,12 @@ export interface FindIntentRequestPayload {
  */
 
 /**
- * A response to a findIntent request.
+ * A response to a getInfo request.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface FindIntentResponse {
+export interface GetInfoResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -2262,12 +2212,12 @@ export interface FindIntentResponse {
    * property containing a standardized error message indicating that the request was
    * unsuccessful.
    */
-  payload: FindIntentResponsePayload;
+  payload: GetInfoResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'findIntentResponse';
+  type: 'getInfoResponse';
 }
 
 /**
@@ -2275,9 +2225,67 @@ export interface FindIntentResponse {
  * property containing a standardized error message indicating that the request was
  * unsuccessful.
  */
-export interface FindIntentResponsePayload {
-  error?: FindInstancesErrors;
-  appIntent?: AppIntent;
+export interface GetInfoResponsePayload {
+  error?: ResponsePayloadError;
+  implementationMetadata?: ImplementationMetadata;
+}
+
+/**
+ * Implementation metadata for the Desktop Agent, which includes an appMetadata element
+ * containing a copy of the app's own metadata.
+ *
+ * Includes Metadata for the current application.
+ *
+ * Metadata relating to the FDC3 Desktop Agent implementation and its provider.
+ */
+export interface ImplementationMetadata {
+  /**
+   * The calling application instance's own metadata, according to the Desktop Agent (MUST
+   * include at least the `appId` and `instanceId`).
+   */
+  appMetadata: AppMetadata;
+  /**
+   * The version number of the FDC3 specification that the implementation provides.
+   * The string must be a numeric semver version, e.g. 1.2 or 1.2.1.
+   */
+  fdc3Version: string;
+  /**
+   * Metadata indicating whether the Desktop Agent implements optional features of
+   * the Desktop Agent API.
+   */
+  optionalFeatures: OptionalFeatures;
+  /**
+   * The name of the provider of the Desktop Agent implementation (e.g. Finsemble, Glue42,
+   * OpenFin etc.).
+   */
+  provider: string;
+  /**
+   * The version of the provider of the Desktop Agent implementation (e.g. 5.3.0).
+   */
+  providerVersion?: string;
+}
+
+/**
+ * Metadata indicating whether the Desktop Agent implements optional features of
+ * the Desktop Agent API.
+ */
+export interface OptionalFeatures {
+  /**
+   * Used to indicate whether the experimental Desktop Agent Bridging
+   * feature is implemented by the Desktop Agent.
+   */
+  DesktopAgentBridging: boolean;
+  /**
+   * Used to indicate whether the exposure of 'originating app metadata' for
+   * context and intent messages is supported by the Desktop Agent.
+   */
+  OriginatingAppMetadata: boolean;
+  /**
+   * Used to indicate whether the optional `fdc3.joinUserChannel`,
+   * `fdc3.getCurrentChannel` and `fdc3.leaveCurrentChannel` are implemented by
+   * the Desktop Agent.
+   */
+  UserChannelMembershipAPIs: boolean;
 }
 
 /**
@@ -2286,12 +2294,12 @@ export interface FindIntentResponsePayload {
  */
 
 /**
- * A request for details of intents and apps available to resolve them for a particular
- * context.
+ * Request to return a Channel with an auto-generated identity that is intended for private
+ * communication between applications.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface FindIntentsByContextRequest {
+export interface GetOrCreateChannelRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -2299,20 +2307,22 @@ export interface FindIntentsByContextRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: FindIntentsByContextRequestPayload;
+  payload: GetOrCreateChannelRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'findIntentsByContextRequest';
+  type: 'getOrCreateChannelRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface FindIntentsByContextRequestPayload {
-  context: Context;
-  resultType?: string;
+export interface GetOrCreateChannelRequestPayload {
+  /**
+   * The id of the channel to return
+   */
+  channelId: string;
 }
 
 /**
@@ -2321,12 +2331,12 @@ export interface FindIntentsByContextRequestPayload {
  */
 
 /**
- * A response to a findIntentsByContext request.
+ * A response to a getOrCreateChannel request.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface FindIntentsByContextResponse {
+export interface GetOrCreateChannelResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -2336,12 +2346,12 @@ export interface FindIntentsByContextResponse {
    * property containing a standardized error message indicating that the request was
    * unsuccessful.
    */
-  payload: FindIntentsByContextResponsePayload;
+  payload: GetOrCreateChannelResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'findIntentsByContextResponse';
+  type: 'getOrCreateChannelResponse';
 }
 
 /**
@@ -2349,9 +2359,9 @@ export interface FindIntentsByContextResponse {
  * property containing a standardized error message indicating that the request was
  * unsuccessful.
  */
-export interface FindIntentsByContextResponsePayload {
-  error?: FindInstancesErrors;
-  appIntents?: AppIntent[];
+export interface GetOrCreateChannelResponsePayload {
+  error?: PurpleError;
+  channel?: Channel;
 }
 
 /**
@@ -2360,11 +2370,11 @@ export interface FindIntentsByContextResponsePayload {
  */
 
 /**
- * A request for metadata about an app.
+ * Request to retrieve a list of the User Channels available for the app to join.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface GetAppMetadataRequest {
+export interface GetUserChannelsRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -2372,20 +2382,18 @@ export interface GetAppMetadataRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: GetAppMetadataRequestPayload;
+  payload: GetUserChannelsRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'getAppMetadataRequest';
+  type: 'getUserChannelsRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface GetAppMetadataRequestPayload {
-  app: AppIdentifier;
-}
+export interface GetUserChannelsRequestPayload {}
 
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
@@ -2393,12 +2401,12 @@ export interface GetAppMetadataRequestPayload {
  */
 
 /**
- * A response to a getAppMetadata request.
+ * A response to a getUserChannels request.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface GetAppMetadataResponse {
+export interface GetUserChannelsResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -2408,12 +2416,12 @@ export interface GetAppMetadataResponse {
    * property containing a standardized error message indicating that the request was
    * unsuccessful.
    */
-  payload: GetAppMetadataResponsePayload;
+  payload: GetUserChannelsResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'getAppMetadataResponse';
+  type: 'getUserChannelsResponse';
 }
 
 /**
@@ -2421,9 +2429,9 @@ export interface GetAppMetadataResponse {
  * property containing a standardized error message indicating that the request was
  * unsuccessful.
  */
-export interface GetAppMetadataResponsePayload {
-  error?: FindInstancesErrors;
-  appMetadata?: AppMetadata;
+export interface GetUserChannelsResponsePayload {
+  error?: PurpleError;
+  userChannels?: Channel[];
 }
 
 /**
@@ -2432,12 +2440,12 @@ export interface GetAppMetadataResponsePayload {
  */
 
 /**
- * A request to return the Channel object for the current User channel membership. Returns
- * `null` if the app is not joined to a channel.
+ * A request that serves as an acknowledgement of a heartbeat event from the Desktop Agent
+ * and indicates that an application window or frame is still alive.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface GetCurrentChannelRequest {
+export interface HeartbeatAcknowledgementRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -2445,18 +2453,23 @@ export interface GetCurrentChannelRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: GetCurrentChannelRequestPayload;
+  payload: HeartbeatAcknowledgementRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'getCurrentChannelRequest';
+  type: 'heartbeatAcknowledgementRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface GetCurrentChannelRequestPayload {}
+export interface HeartbeatAcknowledgementRequestPayload {
+  /**
+   * The eventUuid value of the HeartbeatEvent that the acknowledgement being sent relates to.
+   */
+  heartbeatEventUuid: string;
+}
 
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
@@ -2464,37 +2477,81 @@ export interface GetCurrentChannelRequestPayload {}
  */
 
 /**
- * A response to a getCurrentChannel request.
+ * A heartbeat message from the Desktop Agent to an app indicating that the Desktop Agent is
+ * alive and that the application should send a heartbeatResponseRequest to the agent in
+ * response.
  *
- * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
- * payload contains an `error` property, the request was unsuccessful.
+ * A message from a Desktop Agent to an FDC3-enabled app representing an event.
  */
-export interface GetCurrentChannelResponse {
+export interface HeartbeatEvent {
   /**
-   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
+   * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
    */
-  meta: AddContextListenerResponseMeta;
+  meta: BroadcastEventMeta;
   /**
-   * A payload for a response to an API call that will contain any return values or an `error`
-   * property containing a standardized error message indicating that the request was
-   * unsuccessful.
+   * The message payload contains details of the event that the app is being notified about.
    */
-  payload: GetCurrentChannelResponsePayload;
+  payload: HeartbeatEventPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'getCurrentChannelResponse';
+  type: 'heartbeatEvent';
 }
 
 /**
- * A payload for a response to an API call that will contain any return values or an `error`
- * property containing a standardized error message indicating that the request was
- * unsuccessful.
+ * The message payload contains details of the event that the app is being notified about.
  */
-export interface GetCurrentChannelResponsePayload {
-  error?: ResponsePayloadError;
-  channel?: Channel | null;
+export interface HeartbeatEventPayload {}
+
+/**
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Response' appended.
+ */
+
+/**
+ * An event message from the Desktop Agent to an app indicating that it has been selected to
+ * resolve a raised intent and context.
+ *
+ * A message from a Desktop Agent to an FDC3-enabled app representing an event.
+ */
+export interface IntentEvent {
+  /**
+   * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
+   */
+  meta: BroadcastEventMeta;
+  /**
+   * The message payload contains details of the event that the app is being notified about.
+   */
+  payload: IntentEventPayload;
+  /**
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   */
+  type: 'intentEvent';
+}
+
+/**
+ * The message payload contains details of the event that the app is being notified about.
+ */
+export interface IntentEventPayload {
+  /**
+   * The context object passed with the raised intent.
+   */
+  context: Context;
+  /**
+   * The intent that was raised.
+   */
+  intent: string;
+  /**
+   * Details of the application instance that raised the intent.
+   */
+  originatingApp?: AppIdentifier;
+  /**
+   * The requestUuid value of the raiseIntentRequest that the intentEvent being sent relates
+   * to.
+   */
+  raiseIntentRequestUuid: string;
 }
 
 /**
@@ -2503,13 +2560,11 @@ export interface GetCurrentChannelResponsePayload {
  */
 
 /**
- * A request to return the current context (either of a specified type or most recent
- * broadcast) of a specified Channel. Returns `null` if no context (of the requested type if
- * one was specified) is available in the channel.
+ * A request to unsubscribe a context listener.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface GetCurrentContextRequest {
+export interface IntentListenerUnsubscribeRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -2517,27 +2572,19 @@ export interface GetCurrentContextRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: GetCurrentContextRequestPayload;
+  payload: IntentListenerUnsubscribeRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'getCurrentContextRequest';
+  type: 'intentListenerUnsubscribeRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface GetCurrentContextRequestPayload {
-  /**
-   * The id of the channel to return the current context of.
-   */
-  channelId: string;
-  /**
-   * The type of context to return for OR `null` indicating that the most recently broadcast
-   * context on the channel should be returned.
-   */
-  contextType: null | string;
+export interface IntentListenerUnsubscribeRequestPayload {
+  listenerUUID: string;
 }
 
 /**
@@ -2546,12 +2593,12 @@ export interface GetCurrentContextRequestPayload {
  */
 
 /**
- * A response to a getCurrentContext request.
+ * A response to a intentListenerUnsubscribe request.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface GetCurrentContextResponse {
+export interface IntentListenerUnsubscribeResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -2561,26 +2608,12 @@ export interface GetCurrentContextResponse {
    * property containing a standardized error message indicating that the request was
    * unsuccessful.
    */
-  payload: GetCurrentContextResponsePayload;
+  payload: BroadcastResponseResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'getCurrentContextResponse';
-}
-
-/**
- * A payload for a response to an API call that will contain any return values or an `error`
- * property containing a standardized error message indicating that the request was
- * unsuccessful.
- */
-export interface GetCurrentContextResponsePayload {
-  error?: PurpleError;
-  /**
-   * The most recently broadcast context object (of the specified type, if one was specified),
-   * or `null` if none was available in the channel.
-   */
-  context?: null | Context;
+  type: 'intentListenerUnsubscribeResponse';
 }
 
 /**
@@ -2589,12 +2622,13 @@ export interface GetCurrentContextResponsePayload {
  */
 
 /**
- * Request to retrieve information about the FDC3 Desktop Agent implementation and the
- * metadata of the calling application according to the Desktop Agent.
+ * A request to deliver a result for an intent (which may include a `void` result that just
+ * indicates that the handler has run, returning no result). The result is tied to the
+ * intentEvent it relates to by quoting the `eventUuid` of the intentEvent in its payload.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface GetInfoRequest {
+export interface IntentResultRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -2602,18 +2636,33 @@ export interface GetInfoRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: GetInfoRequestPayload;
+  payload: IntentResultRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'getInfoRequest';
+  type: 'intentResultRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface GetInfoRequestPayload {}
+export interface IntentResultRequestPayload {
+  /**
+   * The eventUuid value of the intentEvent that the result being sent relates to.
+   */
+  intentEventUuid: string;
+  intentResult: IntentResult;
+  /**
+   * The requestUuid value of the raiseIntentRequest that the result being sent relates to.
+   */
+  raiseIntentRequestUuid: string;
+}
+
+export interface IntentResult {
+  context?: Context;
+  channel?: Channel;
+}
 
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
@@ -2621,12 +2670,12 @@ export interface GetInfoRequestPayload {}
  */
 
 /**
- * A response to a getInfo request.
+ * A response to a request to deliver an intent result.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface GetInfoResponse {
+export interface IntentResultResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -2636,22 +2685,12 @@ export interface GetInfoResponse {
    * property containing a standardized error message indicating that the request was
    * unsuccessful.
    */
-  payload: GetInfoResponsePayload;
+  payload: BroadcastResponseResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'getInfoResponse';
-}
-
-/**
- * A payload for a response to an API call that will contain any return values or an `error`
- * property containing a standardized error message indicating that the request was
- * unsuccessful.
- */
-export interface GetInfoResponsePayload {
-  error?: ResponsePayloadError;
-  implementationMetadata?: ImplementationMetadata;
+  type: 'intentResultResponse';
 }
 
 /**
@@ -2660,12 +2699,13 @@ export interface GetInfoResponsePayload {
  */
 
 /**
- * Request to return a Channel with an auto-generated identity that is intended for private
- * communication between applications.
+ * Request to join the app to the specified User channel. On successfully joining a channel,
+ * client code should make subsequent requests to get the current context of that channel
+ * for all registered context listeners and then call their handlers with it.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface GetOrCreateChannelRequest {
+export interface JoinUserChannelRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -2673,20 +2713,20 @@ export interface GetOrCreateChannelRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: GetOrCreateChannelRequestPayload;
+  payload: JoinUserChannelRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'getOrCreateChannelRequest';
+  type: 'joinUserChannelRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface GetOrCreateChannelRequestPayload {
+export interface JoinUserChannelRequestPayload {
   /**
-   * The id of the channel to return
+   * The id of the channel to join.
    */
   channelId: string;
 }
@@ -2697,12 +2737,14 @@ export interface GetOrCreateChannelRequestPayload {
  */
 
 /**
- * A response to a getOrCreateChannel request.
+ * A response to a joinUserChannel request. On receipt of this response, client code should
+ * make subsequent requests to get the current context of that channel for all registered
+ * context listeners and then call their handlers with it.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface GetOrCreateChannelResponse {
+export interface JoinUserChannelResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -2712,12 +2754,12 @@ export interface GetOrCreateChannelResponse {
    * property containing a standardized error message indicating that the request was
    * unsuccessful.
    */
-  payload: GetOrCreateChannelResponsePayload;
+  payload: JoinUserChannelResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'getOrCreateChannelResponse';
+  type: 'joinUserChannelResponse';
 }
 
 /**
@@ -2725,9 +2767,8 @@ export interface GetOrCreateChannelResponse {
  * property containing a standardized error message indicating that the request was
  * unsuccessful.
  */
-export interface GetOrCreateChannelResponsePayload {
+export interface JoinUserChannelResponsePayload {
   error?: PurpleError;
-  channel?: Channel;
 }
 
 /**
@@ -2736,11 +2777,11 @@ export interface GetOrCreateChannelResponsePayload {
  */
 
 /**
- * Request to retrieve a list of the User Channels available for the app to join.
+ * Request to remove the app from any User channel membership.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface GetUserChannelsRequest {
+export interface LeaveCurrentChannelRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -2748,18 +2789,18 @@ export interface GetUserChannelsRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: GetUserChannelsRequestPayload;
+  payload: LeaveCurrentChannelRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'getUserChannelsRequest';
+  type: 'leaveCurrentChannelRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface GetUserChannelsRequestPayload {}
+export interface LeaveCurrentChannelRequestPayload {}
 
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
@@ -2767,12 +2808,12 @@ export interface GetUserChannelsRequestPayload {}
  */
 
 /**
- * A response to a getUserChannels request.
+ * A response to a leaveCurrentChannel request.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface GetUserChannelsResponse {
+export interface LeaveCurrentChannelResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -2782,12 +2823,12 @@ export interface GetUserChannelsResponse {
    * property containing a standardized error message indicating that the request was
    * unsuccessful.
    */
-  payload: GetUserChannelsResponsePayload;
+  payload: LeaveCurrentChannelResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'getUserChannelsResponse';
+  type: 'leaveCurrentChannelResponse';
 }
 
 /**
@@ -2795,9 +2836,8 @@ export interface GetUserChannelsResponse {
  * property containing a standardized error message indicating that the request was
  * unsuccessful.
  */
-export interface GetUserChannelsResponsePayload {
+export interface LeaveCurrentChannelResponsePayload {
   error?: PurpleError;
-  userChannels?: Channel[];
 }
 
 /**
@@ -2806,12 +2846,11 @@ export interface GetUserChannelsResponsePayload {
  */
 
 /**
- * A request that serves as an acknowledgement of a heartbeat event from the Desktop Agent
- * and indicates that an application window or frame is still alive.
+ * A request to open an application.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface HeartbeatAcknowledgementRequest {
+export interface OpenRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -2819,22 +2858,25 @@ export interface HeartbeatAcknowledgementRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: HeartbeatAcknowledgementRequestPayload;
+  payload: OpenRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'heartbeatAcknowledgementRequest';
+  type: 'openRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface HeartbeatAcknowledgementRequestPayload {
+export interface OpenRequestPayload {
+  app: AppIdentifier;
   /**
-   * The eventUuid value of the HeartbeatEvent that the acknowledgement being sent relates to.
+   * If a Context object is passed in, this object will be provided to the opened application
+   * via a contextListener. The Context argument is functionally equivalent to opening the
+   * target app with no context and broadcasting the context directly to it.
    */
-  heartbeatEventUuid: string;
+  context?: Context;
 }
 
 /**
@@ -2843,82 +2885,60 @@ export interface HeartbeatAcknowledgementRequestPayload {
  */
 
 /**
- * A heartbeat message from the Desktop Agent to an app indicating that the Desktop Agent is
- * alive and that the application should send a heartbeatResponseRequest to the agent in
- * response.
+ * A response to a open request.
  *
- * A message from a Desktop Agent to an FDC3-enabled app representing an event.
+ * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
+ * payload contains an `error` property, the request was unsuccessful.
  */
-export interface HeartbeatEvent {
+export interface OpenResponse {
   /**
-   * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
+   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
-  meta: BroadcastEventMeta;
+  meta: AddContextListenerResponseMeta;
   /**
-   * The message payload contains details of the event that the app is being notified about.
+   * A payload for a response to an API call that will contain any return values or an `error`
+   * property containing a standardized error message indicating that the request was
+   * unsuccessful.
    */
-  payload: HeartbeatEventPayload;
+  payload: OpenResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'heartbeatEvent';
+  type: 'openResponse';
 }
 
 /**
- * The message payload contains details of the event that the app is being notified about.
- */
-export interface HeartbeatEventPayload {}
-
-/**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Response' appended.
- */
-
-/**
- * An event message from the Desktop Agent to an app indicating that it has been selected to
- * resolve a raised intent and context.
- *
- * A message from a Desktop Agent to an FDC3-enabled app representing an event.
+ * A payload for a response to an API call that will contain any return values or an `error`
+ * property containing a standardized error message indicating that the request was
+ * unsuccessful.
  */
-export interface IntentEvent {
-  /**
-   * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
-   */
-  meta: BroadcastEventMeta;
-  /**
-   * The message payload contains details of the event that the app is being notified about.
-   */
-  payload: IntentEventPayload;
-  /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Response' appended.
-   */
-  type: 'intentEvent';
+export interface OpenResponsePayload {
+  error?: OpenErrorResponsePayload;
+  appIdentifier?: AppIdentifier;
 }
 
 /**
- * The message payload contains details of the event that the app is being notified about.
+ * Constants representing the errors that can be encountered when calling the `open` method
+ * on the DesktopAgent object (`fdc3`).
+ *
+ * Constants representing the errors that can be encountered when calling the `findIntent`,
+ * `findIntentsByContext`, `raiseIntent` or `raiseIntentForContext` methods on the
+ * DesktopAgent (`fdc3`).
  */
-export interface IntentEventPayload {
-  /**
-   * The context object passed with the raised intent.
-   */
-  context: Context;
-  /**
-   * The intent that was raised.
-   */
-  intent: string;
-  /**
-   * Details of the application instance that raised the intent.
-   */
-  originatingApp?: AppIdentifier;
-  /**
-   * The requestUuid value of the raiseIntentRequest that the intentEvent being sent relates
-   * to.
-   */
-  raiseIntentRequestUuid: string;
-}
+export type OpenErrorResponsePayload =
+  | 'MalformedContext'
+  | 'ApiTimeout'
+  | 'InvalidArguments'
+  | 'AppNotFound'
+  | 'AppTimeout'
+  | 'DesktopAgentNotFound'
+  | 'ErrorOnLaunch'
+  | 'ResolverUnavailable'
+  | 'AgentDisconnected'
+  | 'NotConnectedToBridge'
+  | 'ResponseToBridgeTimedOut'
+  | 'MalformedMessage';
 
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
@@ -2926,11 +2946,11 @@ export interface IntentEventPayload {
  */
 
 /**
- * A request to unsubscribe a context listener.
+ * A request to add an event listener to a specific PrivateChannel.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface IntentListenerUnsubscribeRequest {
+export interface PrivateChannelAddEventListenerRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -2938,33 +2958,46 @@ export interface IntentListenerUnsubscribeRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: IntentListenerUnsubscribeRequestPayload;
+  payload: PrivateChannelAddEventListenerRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'intentListenerUnsubscribeRequest';
+  type: 'privateChannelAddEventListenerRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface IntentListenerUnsubscribeRequestPayload {
-  listenerUUID: string;
+export interface PrivateChannelAddEventListenerRequestPayload {
+  /**
+   * The type of PrivateChannel event that the listener should be applied to, or null for all
+   * event types.
+   */
+  listenerType: PrivateChannelEventType | null;
+  /**
+   * The Id of the PrivateChannel that the listener should be added to.
+   */
+  privateChannelId: string;
 }
 
+/**
+ * Type defining valid type strings for Private Channel events.
+ */
+export type PrivateChannelEventType = 'addContextListener' | 'unsubscribe' | 'disconnect';
+
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
  * the message relates to, e.g. 'findIntent', with 'Request' appended.
  */
 
 /**
- * A response to a intentListenerUnsubscribe request.
+ * A response to a privateChannelAddEventListener request.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface IntentListenerUnsubscribeResponse {
+export interface PrivateChannelAddEventListenerResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -2974,12 +3007,22 @@ export interface IntentListenerUnsubscribeResponse {
    * property containing a standardized error message indicating that the request was
    * unsuccessful.
    */
-  payload: BroadcastResponseResponsePayload;
+  payload: PrivateChannelAddEventListenerResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'intentListenerUnsubscribeResponse';
+  type: 'privateChannelAddEventListenerResponse';
+}
+
+/**
+ * A payload for a response to an API call that will contain any return values or an `error`
+ * property containing a standardized error message indicating that the request was
+ * unsuccessful.
+ */
+export interface PrivateChannelAddEventListenerResponsePayload {
+  error?: PurpleError;
+  listenerUUID?: string;
 }
 
 /**
@@ -2988,13 +3031,12 @@ export interface IntentListenerUnsubscribeResponse {
  */
 
 /**
- * A request to deliver a result for an intent (which may include a `void` result that just
- * indicates that the handler has run, returning no result). The result is tied to the
- * intentEvent it relates to by quoting the `eventUuid` of the intentEvent in its payload.
+ * Request that indicates that a participant will no longer interact with a specified
+ * `PrivateChannel`.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface IntentResultRequest {
+export interface PrivateChannelDisconnectRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -3002,32 +3044,22 @@ export interface IntentResultRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: IntentResultRequestPayload;
+  payload: PrivateChannelDisconnectRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'intentResultRequest';
+  type: 'privateChannelDisconnectRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface IntentResultRequestPayload {
-  /**
-   * The eventUuid value of the intentEvent that the result being sent relates to.
-   */
-  intentEventUuid: string;
-  intentResult: IntentResult;
+export interface PrivateChannelDisconnectRequestPayload {
   /**
-   * The requestUuid value of the raiseIntentRequest that the result being sent relates to.
+   * The Id of the Channel that should be disconnected from
    */
-  raiseIntentRequestUuid: string;
-}
-
-export interface IntentResult {
-  context?: Context;
-  channel?: Channel;
+  channelId: string;
 }
 
 /**
@@ -3036,12 +3068,12 @@ export interface IntentResult {
  */
 
 /**
- * A response to a request to deliver an intent result.
+ * A response to a privateChannelDisconnect request.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface IntentResultResponse {
+export interface PrivateChannelDisconnectResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -3051,12 +3083,63 @@ export interface IntentResultResponse {
    * property containing a standardized error message indicating that the request was
    * unsuccessful.
    */
-  payload: BroadcastResponseResponsePayload;
+  payload: PrivateChannelDisconnectResponsePayload;
+  /**
+   * Identifies the type of the message and it is typically set to the FDC3 function name that
+   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   */
+  type: 'privateChannelDisconnectResponse';
+}
+
+/**
+ * A payload for a response to an API call that will contain any return values or an `error`
+ * property containing a standardized error message indicating that the request was
+ * unsuccessful.
+ */
+export interface PrivateChannelDisconnectResponsePayload {
+  error?: PurpleError;
+}
+
+/**
+ * Identifies the type of the message and it is typically set to the FDC3 function name that
+ * the message relates to, e.g. 'findIntent', with 'Response' appended.
+ */
+
+/**
+ * An event message from the Desktop Agent to an app indicating that another app has added a
+ * context listener to a specific PrivateChannel.
+ *
+ * A message from a Desktop Agent to an FDC3-enabled app representing an event.
+ */
+export interface PrivateChannelOnAddContextListenerEvent {
+  /**
+   * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
+   */
+  meta: BroadcastEventMeta;
+  /**
+   * The message payload contains details of the event that the app is being notified about.
+   */
+  payload: PrivateChannelOnAddContextListenerEventPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'intentResultResponse';
+  type: 'privateChannelOnAddContextListenerEvent';
+}
+
+/**
+ * The message payload contains details of the event that the app is being notified about.
+ */
+export interface PrivateChannelOnAddContextListenerEventPayload {
+  /**
+   * The type of the context listener added to the channel by another app, or null if it will
+   * listen to all types.
+   */
+  contextType: null | string;
+  /**
+   * The Id of the PrivateChannel that the listener was added to.
+   */
+  privateChannelId: string;
 }
 
 /**
@@ -3065,76 +3148,77 @@ export interface IntentResultResponse {
  */
 
 /**
- * Request to join the app to the specified User channel. On successfully joining a channel,
- * client code should make subsequent requests to get the current context of that channel
- * for all registered context listeners and then call their handlers with it.
+ * An event message from the Desktop Agent to an app indicating that another app has
+ * disconnected from a specific PrivateChannel and will no longer interact with it.
  *
- * A request message from an FDC3-enabled app to a Desktop Agent.
+ * A message from a Desktop Agent to an FDC3-enabled app representing an event.
  */
-export interface JoinUserChannelRequest {
+export interface PrivateChannelOnDisconnectEvent {
   /**
-   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
+   * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
    */
-  meta: AddContextListenerRequestMeta;
+  meta: BroadcastEventMeta;
   /**
-   * The message payload typically contains the arguments to FDC3 API functions.
+   * The message payload contains details of the event that the app is being notified about.
    */
-  payload: JoinUserChannelRequestPayload;
+  payload: PrivateChannelOnDisconnectEventPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Request' appended.
+   * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'joinUserChannelRequest';
+  type: 'privateChannelOnDisconnectEvent';
 }
 
 /**
- * The message payload typically contains the arguments to FDC3 API functions.
+ * The message payload contains details of the event that the app is being notified about.
  */
-export interface JoinUserChannelRequestPayload {
+export interface PrivateChannelOnDisconnectEventPayload {
   /**
-   * The id of the channel to join.
+   * The Id of the PrivateChannel that the app has disconnected from.
    */
-  channelId: string;
+  privateChannelId: string;
 }
 
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Request' appended.
+ * the message relates to, e.g. 'findIntent', with 'Response' appended.
  */
 
 /**
- * A response to a joinUserChannel request. On receipt of this response, client code should
- * make subsequent requests to get the current context of that channel for all registered
- * context listeners and then call their handlers with it.
+ * An event message from the Desktop Agent to an app indicating that another app has
+ * unsubscribed a context listener from a specific PrivateChannel.
  *
- * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
- * payload contains an `error` property, the request was unsuccessful.
+ * A message from a Desktop Agent to an FDC3-enabled app representing an event.
  */
-export interface JoinUserChannelResponse {
+export interface PrivateChannelOnUnsubscribeEvent {
   /**
-   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
+   * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
    */
-  meta: AddContextListenerResponseMeta;
+  meta: BroadcastEventMeta;
   /**
-   * A payload for a response to an API call that will contain any return values or an `error`
-   * property containing a standardized error message indicating that the request was
-   * unsuccessful.
+   * The message payload contains details of the event that the app is being notified about.
    */
-  payload: JoinUserChannelResponsePayload;
+  payload: PrivateChannelOnUnsubscribeEventPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'joinUserChannelResponse';
+  type: 'privateChannelOnUnsubscribeEvent';
 }
 
 /**
- * A payload for a response to an API call that will contain any return values or an `error`
- * property containing a standardized error message indicating that the request was
- * unsuccessful.
+ * The message payload contains details of the event that the app is being notified about.
  */
-export interface JoinUserChannelResponsePayload {
-  error?: PurpleError;
+export interface PrivateChannelOnUnsubscribeEventPayload {
+  /**
+   * The type of the context listener unsubscribed from the channel by another app, or null if
+   * it was listening to all types.
+   */
+  contextType: null | string;
+  /**
+   * The Id of the PrivateChannel that the listener was unsubscribed from.
+   */
+  privateChannelId: string;
 }
 
 /**
@@ -3143,11 +3227,11 @@ export interface JoinUserChannelResponsePayload {
  */
 
 /**
- * Request to remove the app from any User channel membership.
+ * A request to unsubscribe a context listener.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface LeaveCurrentChannelRequest {
+export interface PrivateChannelUnsubscribeEventListenerRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -3155,18 +3239,20 @@ export interface LeaveCurrentChannelRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: LeaveCurrentChannelRequestPayload;
+  payload: PrivateChannelUnsubscribeEventListenerRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'leaveCurrentChannelRequest';
+  type: 'privateChannelUnsubscribeEventListenerRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface LeaveCurrentChannelRequestPayload {}
+export interface PrivateChannelUnsubscribeEventListenerRequestPayload {
+  listenerUUID: string;
+}
 
 /**
  * Identifies the type of the message and it is typically set to the FDC3 function name that
@@ -3174,12 +3260,12 @@ export interface LeaveCurrentChannelRequestPayload {}
  */
 
 /**
- * A response to a leaveCurrentChannel request.
+ * A response to a privateChannelUnsubscribeEventListener request.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface LeaveCurrentChannelResponse {
+export interface PrivateChannelUnsubscribeEventListenerResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -3189,21 +3275,12 @@ export interface LeaveCurrentChannelResponse {
    * property containing a standardized error message indicating that the request was
    * unsuccessful.
    */
-  payload: LeaveCurrentChannelResponsePayload;
+  payload: BroadcastResponseResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'leaveCurrentChannelResponse';
-}
-
-/**
- * A payload for a response to an API call that will contain any return values or an `error`
- * property containing a standardized error message indicating that the request was
- * unsuccessful.
- */
-export interface LeaveCurrentChannelResponsePayload {
-  error?: PurpleError;
+  type: 'privateChannelUnsubscribeEventListenerResponse';
 }
 
 /**
@@ -3212,11 +3289,11 @@ export interface LeaveCurrentChannelResponsePayload {
  */
 
 /**
- * A request to open an application.
+ * A request to raise an unspecified intent for a specified context.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface OpenRequest {
+export interface RaiseIntentForContextRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -3224,25 +3301,20 @@ export interface OpenRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: OpenRequestPayload;
+  payload: RaiseIntentForContextRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'openRequest';
+  type: 'raiseIntentForContextRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface OpenRequestPayload {
-  app: AppIdentifier;
-  /**
-   * If a Context object is passed in, this object will be provided to the opened application
-   * via a contextListener. The Context argument is functionally equivalent to opening the
-   * target app with no context and broadcasting the context directly to it.
-   */
-  context?: Context;
+export interface RaiseIntentForContextRequestPayload {
+  app?: AppIdentifier;
+  context: Context;
 }
 
 /**
@@ -3251,12 +3323,12 @@ export interface OpenRequestPayload {
  */
 
 /**
- * A response to a open request.
+ * A response to a raiseIntentForContext request.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface OpenResponse {
+export interface RaiseIntentForContextResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -3265,130 +3337,89 @@ export interface OpenResponse {
    * A payload for a response to an API call that will contain any return values or an `error`
    * property containing a standardized error message indicating that the request was
    * unsuccessful.
+   *
+   * There are 3 possible responses to a raiseIntentForContext request, each of which sets a
+   * single property in the payload: Success (`intentResolution`), Needs further resolution
+   * (`appIntents`) or Error (`error`).
    */
-  payload: OpenResponsePayload;
+  payload: RaiseIntentForContextResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'openResponse';
+  type: 'raiseIntentForContextResponse';
 }
 
 /**
  * A payload for a response to an API call that will contain any return values or an `error`
  * property containing a standardized error message indicating that the request was
  * unsuccessful.
- */
-export interface OpenResponsePayload {
-  error?: OpenErrorResponsePayload;
-  appIdentifier?: AppIdentifier;
-}
-
-/**
- * Constants representing the errors that can be encountered when calling the `open` method
- * on the DesktopAgent object (`fdc3`).
  *
- * Constants representing the errors that can be encountered when calling the `findIntent`,
- * `findIntentsByContext`, `raiseIntent` or `raiseIntentForContext` methods on the
- * DesktopAgent (`fdc3`).
- */
-export type OpenErrorResponsePayload =
-  | 'MalformedContext'
-  | 'ApiTimeout'
-  | 'InvalidArguments'
-  | 'AppNotFound'
-  | 'AppTimeout'
-  | 'DesktopAgentNotFound'
-  | 'ErrorOnLaunch'
-  | 'ResolverUnavailable'
-  | 'AgentDisconnected'
-  | 'NotConnectedToBridge'
-  | 'ResponseToBridgeTimedOut'
-  | 'MalformedMessage';
-
-/**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Response' appended.
- */
-
-/**
- * A request to add an event listener to a specific PrivateChannel.
+ * There are 3 possible responses to a raiseIntentForContext request, each of which sets a
+ * single property in the payload: Success (`intentResolution`), Needs further resolution
+ * (`appIntents`) or Error (`error`).
  *
- * A request message from an FDC3-enabled app to a Desktop Agent.
+ * Response to a raiseIntentForContext request that needs additional resolution (i.e. show
+ * an intent resolver UI).
+ *
+ * Used if a raiseIntent request resulted in an error.
  */
-export interface PrivateChannelAddEventListenerRequest {
-  /**
-   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
-   */
-  meta: AddContextListenerRequestMeta;
-  /**
-   * The message payload typically contains the arguments to FDC3 API functions.
-   */
-  payload: PrivateChannelAddEventListenerRequestPayload;
+export interface RaiseIntentForContextResponsePayload {
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Request' appended.
+   * Should be set if the raiseIntent request returned an error.
    */
-  type: 'privateChannelAddEventListenerRequest';
-}
-
-/**
- * The message payload typically contains the arguments to FDC3 API functions.
- */
-export interface PrivateChannelAddEventListenerRequestPayload {
+  error?: FindInstancesErrors;
   /**
-   * The type of PrivateChannel event that the listener should be applied to, or null for all
-   * event types.
+   * Used if the raiseIntent request was successfully resolved.
    */
-  listenerType: PrivateChannelEventType | null;
+  intentResolution?: IntentResolution;
   /**
-   * The Id of the PrivateChannel that the listener should be added to.
+   * Used if a raiseIntentForContext request requires additional resolution (e.g. by showing
+   * an intent resolver) before it can be handled.
    */
-  privateChannelId: string;
+  appIntents?: AppIntent[];
 }
 
 /**
- * Type defining valid type strings for Private Channel events.
- */
-export type PrivateChannelEventType = 'addContextListener' | 'unsubscribe' | 'disconnect';
-
-/**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Request' appended.
- */
-
-/**
- * A response to a privateChannelAddEventListener request.
+ * Used if the raiseIntent request was successfully resolved.
  *
- * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
- * payload contains an `error` property, the request was unsuccessful.
+ * IntentResolution provides a standard format for data returned upon resolving an intent.
+ *
+ * ```javascript
+ * //resolve a "Chain" type intent
+ * let resolution = await agent.raiseIntent("intentName", context);
+ *
+ * //resolve a "Client-Service" type intent with a data response or a Channel
+ * let resolution = await agent.raiseIntent("intentName", context);
+ * try {
+ * const result = await resolution.getResult();
+ * if (result && result.broadcast) {
+ * console.log(`${resolution.source} returned a channel with id ${result.id}`);
+ * } else if (result){
+ * console.log(`${resolution.source} returned data: ${JSON.stringify(result)}`);
+ * } else {
+ * console.error(`${resolution.source} didn't return data`
+ * }
+ * } catch(error) {
+ * console.error(`${resolution.source} returned an error: ${error}`);
+ * }
+ *
+ * // Use metadata about the resolving app instance to target a further intent
+ * await agent.raiseIntent("intentName", context, resolution.source);
+ * ```
  */
-export interface PrivateChannelAddEventListenerResponse {
-  /**
-   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
-   */
-  meta: AddContextListenerResponseMeta;
+export interface IntentResolution {
   /**
-   * A payload for a response to an API call that will contain any return values or an `error`
-   * property containing a standardized error message indicating that the request was
-   * unsuccessful.
+   * The intent that was raised. May be used to determine which intent the user
+   * chose in response to `fdc3.raiseIntentForContext()`.
    */
-  payload: PrivateChannelAddEventListenerResponsePayload;
+  intent: string;
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   * Identifier for the app instance that was selected (or started) to resolve the intent.
+   * `source.instanceId` MUST be set, indicating the specific app instance that
+   * received the intent.
    */
-  type: 'privateChannelAddEventListenerResponse';
-}
-
-/**
- * A payload for a response to an API call that will contain any return values or an `error`
- * property containing a standardized error message indicating that the request was
- * unsuccessful.
- */
-export interface PrivateChannelAddEventListenerResponsePayload {
-  error?: PurpleError;
-  listenerUUID?: string;
+  source: AppIdentifier;
 }
 
 /**
@@ -3397,12 +3428,11 @@ export interface PrivateChannelAddEventListenerResponsePayload {
  */
 
 /**
- * Request that indicates that a participant will no longer interact with a specified
- * `PrivateChannel`.
+ * A request to raise an intent for a context.
  *
  * A request message from an FDC3-enabled app to a Desktop Agent.
  */
-export interface PrivateChannelDisconnectRequest {
+export interface RaiseIntentRequest {
   /**
    * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
    */
@@ -3410,22 +3440,21 @@ export interface PrivateChannelDisconnectRequest {
   /**
    * The message payload typically contains the arguments to FDC3 API functions.
    */
-  payload: PrivateChannelDisconnectRequestPayload;
+  payload: RaiseIntentRequestPayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Request' appended.
    */
-  type: 'privateChannelDisconnectRequest';
+  type: 'raiseIntentRequest';
 }
 
 /**
  * The message payload typically contains the arguments to FDC3 API functions.
  */
-export interface PrivateChannelDisconnectRequestPayload {
-  /**
-   * The Id of the Channel that should be disconnected from
-   */
-  channelId: string;
+export interface RaiseIntentRequestPayload {
+  app?: AppIdentifier;
+  context: Context;
+  intent: string;
 }
 
 /**
@@ -3434,12 +3463,12 @@ export interface PrivateChannelDisconnectRequestPayload {
  */
 
 /**
- * A response to a privateChannelDisconnect request.
+ * A response to a raiseIntent request.
  *
  * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
  * payload contains an `error` property, the request was unsuccessful.
  */
-export interface PrivateChannelDisconnectResponse {
+export interface RaiseIntentResponse {
   /**
    * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
@@ -3448,22 +3477,47 @@ export interface PrivateChannelDisconnectResponse {
    * A payload for a response to an API call that will contain any return values or an `error`
    * property containing a standardized error message indicating that the request was
    * unsuccessful.
+   *
+   * There are 3 possible responses to a raiseIntent request, each of which sets a single
+   * property in the payload: Success (`intentResolution`), Needs further resolution
+   * (`appIntent`) or Error (`error`).
    */
-  payload: PrivateChannelDisconnectResponsePayload;
+  payload: RaiseIntentResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'privateChannelDisconnectResponse';
+  type: 'raiseIntentResponse';
 }
 
 /**
  * A payload for a response to an API call that will contain any return values or an `error`
  * property containing a standardized error message indicating that the request was
  * unsuccessful.
+ *
+ * There are 3 possible responses to a raiseIntent request, each of which sets a single
+ * property in the payload: Success (`intentResolution`), Needs further resolution
+ * (`appIntent`) or Error (`error`).
+ *
+ * Response to a raiseIntent request that needs additional resolution (i.e. show an intent
+ * resolver UI).
+ *
+ * Used if a raiseIntent request resulted in an error.
  */
-export interface PrivateChannelDisconnectResponsePayload {
-  error?: PurpleError;
+export interface RaiseIntentResponsePayload {
+  /**
+   * Should be set if the raiseIntent request returned an error.
+   */
+  error?: FindInstancesErrors;
+  /**
+   * Used if the raiseIntent request was successfully resolved.
+   */
+  intentResolution?: IntentResolution;
+  /**
+   * Used if a raiseIntent request requires additional resolution (e.g. by showing an intent
+   * resolver) before it can be handled.
+   */
+  appIntent?: AppIntent;
 }
 
 /**
@@ -3472,40 +3526,39 @@ export interface PrivateChannelDisconnectResponsePayload {
  */
 
 /**
- * An event message from the Desktop Agent to an app indicating that another app has added a
- * context listener to a specific PrivateChannel.
+ * A secondary response to a request to raise an intent used to deliver the intent result.
+ * This message should quote the original requestUuid of the raiseIntentRequest message in
+ * its `meta.requestUuid` field.
  *
- * A message from a Desktop Agent to an FDC3-enabled app representing an event.
+ * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
+ * payload contains an `error` property, the request was unsuccessful.
  */
-export interface PrivateChannelOnAddContextListenerEvent {
+export interface RaiseIntentResultResponse {
   /**
-   * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
+   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
    */
-  meta: BroadcastEventMeta;
+  meta: AddContextListenerResponseMeta;
   /**
-   * The message payload contains details of the event that the app is being notified about.
+   * A payload for a response to an API call that will contain any return values or an `error`
+   * property containing a standardized error message indicating that the request was
+   * unsuccessful.
    */
-  payload: PrivateChannelOnAddContextListenerEventPayload;
+  payload: RaiseIntentResultResponsePayload;
   /**
    * Identifies the type of the message and it is typically set to the FDC3 function name that
    * the message relates to, e.g. 'findIntent', with 'Response' appended.
    */
-  type: 'privateChannelOnAddContextListenerEvent';
+  type: 'raiseIntentResultResponse';
 }
 
 /**
- * The message payload contains details of the event that the app is being notified about.
+ * A payload for a response to an API call that will contain any return values or an `error`
+ * property containing a standardized error message indicating that the request was
+ * unsuccessful.
  */
-export interface PrivateChannelOnAddContextListenerEventPayload {
-  /**
-   * The type of the context listener added to the channel by another app, or null if it will
-   * listen to all types.
-   */
-  contextType: null | string;
-  /**
-   * The Id of the PrivateChannel that the listener was added to.
-   */
-  privateChannelId: string;
+export interface RaiseIntentResultResponsePayload {
+  error?: ResponsePayloadError;
+  intentResult?: IntentResult;
 }
 
 /**
@@ -3514,501 +3567,374 @@ export interface PrivateChannelOnAddContextListenerEventPayload {
  */
 
 /**
- * An event message from the Desktop Agent to an app indicating that another app has
- * disconnected from a specific PrivateChannel and will no longer interact with it.
+ * Hello message sent by an application to a parent window or frame when attempting to
+ * establish connectivity to a Desktop Agent.
  *
- * A message from a Desktop Agent to an FDC3-enabled app representing an event.
+ * A message used during the connection flow for an application to a Desktop Agent in a
+ * browser window. Used for messages sent in either direction.
  */
-export interface PrivateChannelOnDisconnectEvent {
+export interface WebConnectionProtocol1Hello {
   /**
-   * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
+   * Metadata for a Web Connection Protocol message.
    */
-  meta: BroadcastEventMeta;
+  meta: WebConnectionProtocol1HelloMeta;
   /**
-   * The message payload contains details of the event that the app is being notified about.
+   * The message payload, containing data pertaining to this connection step.
    */
-  payload: PrivateChannelOnDisconnectEventPayload;
+  payload: WebConnectionProtocol1HelloPayload;
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   * Identifies the type of the connection step message.
    */
-  type: 'privateChannelOnDisconnectEvent';
+  type: 'WCP1Hello';
 }
 
 /**
- * The message payload contains details of the event that the app is being notified about.
+ * Metadata for a Web Connection Protocol message.
  */
-export interface PrivateChannelOnDisconnectEventPayload {
-  /**
-   * The Id of the PrivateChannel that the app has disconnected from.
-   */
-  privateChannelId: string;
+export interface WebConnectionProtocol1HelloMeta {
+  connectionAttemptUuid: string;
+  timestamp: Date;
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Response' appended.
- */
-
-/**
- * An event message from the Desktop Agent to an app indicating that another app has
- * unsubscribed a context listener from a specific PrivateChannel.
- *
- * A message from a Desktop Agent to an FDC3-enabled app representing an event.
+ * The message payload, containing data pertaining to this connection step.
  */
-export interface PrivateChannelOnUnsubscribeEvent {
+export interface WebConnectionProtocol1HelloPayload {
   /**
-   * Metadata for messages sent by a Desktop Agent to an app notifying it of an event.
+   * The current URL of the page attempting to connect. This may differ from the identityUrl,
+   * but the origins MUST match.
    */
-  meta: BroadcastEventMeta;
+  actualUrl: string;
   /**
-   * The message payload contains details of the event that the app is being notified about.
+   * A flag that may be used to indicate that a channel selector user interface is or is not
+   * required. Set to `false` if the app includes its own interface for selecting channels or
+   * does not work with user channels.
    */
-  payload: PrivateChannelOnUnsubscribeEventPayload;
+  channelSelector?: boolean;
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   * The version of FDC3 API that the app supports.
    */
-  type: 'privateChannelOnUnsubscribeEvent';
-}
-
-/**
- * The message payload contains details of the event that the app is being notified about.
- */
-export interface PrivateChannelOnUnsubscribeEventPayload {
+  fdc3Version: string;
   /**
-   * The type of the context listener unsubscribed from the channel by another app, or null if
-   * it was listening to all types.
+   * URL to use for the identity of the application. Desktop Agents MUST validate that the
+   * origin of the message matches the URL, but MAY implement custom comparison logic.
    */
-  contextType: null | string;
+  identityUrl: string;
   /**
-   * The Id of the PrivateChannel that the listener was unsubscribed from.
+   * A flag that may be used to indicate that an intent resolver is or is not required. Set to
+   * `false` if no intents, or only targeted intents, are raised.
    */
-  privateChannelId: string;
+  intentResolver?: boolean;
+  [property: string]: any;
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Response' appended.
+ * Identifies the type of the connection step message.
  */
 
 /**
- * A request to unsubscribe a context listener.
+ * Response from a Desktop Agent to an application requesting access to it indicating that
+ * it should load a specified URL into a hidden iframe in order to establish connectivity to
+ * a Desktop Agent.
  *
- * A request message from an FDC3-enabled app to a Desktop Agent.
+ * A message used during the connection flow for an application to a Desktop Agent in a
+ * browser window. Used for messages sent in either direction.
  */
-export interface PrivateChannelUnsubscribeEventListenerRequest {
+export interface WebConnectionProtocol2LoadURL {
   /**
-   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
+   * Metadata for a Web Connection Protocol message.
    */
-  meta: AddContextListenerRequestMeta;
+  meta: WebConnectionProtocol1HelloMeta;
   /**
-   * The message payload typically contains the arguments to FDC3 API functions.
+   * The message payload, containing data pertaining to this connection step.
    */
-  payload: PrivateChannelUnsubscribeEventListenerRequestPayload;
+  payload: WebConnectionProtocol2LoadURLPayload;
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Request' appended.
+   * Identifies the type of the connection step message.
    */
-  type: 'privateChannelUnsubscribeEventListenerRequest';
-}
-
-/**
- * The message payload typically contains the arguments to FDC3 API functions.
- */
-export interface PrivateChannelUnsubscribeEventListenerRequestPayload {
-  listenerUUID: string;
+  type: 'WCP2LoadUrl';
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Request' appended.
- */
-
-/**
- * A response to a privateChannelUnsubscribeEventListener request.
- *
- * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
- * payload contains an `error` property, the request was unsuccessful.
- */
-export interface PrivateChannelUnsubscribeEventListenerResponse {
-  /**
-   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
-   */
-  meta: AddContextListenerResponseMeta;
-  /**
-   * A payload for a response to an API call that will contain any return values or an `error`
-   * property containing a standardized error message indicating that the request was
-   * unsuccessful.
-   */
-  payload: BroadcastResponseResponsePayload;
+ * The message payload, containing data pertaining to this connection step.
+ */
+export interface WebConnectionProtocol2LoadURLPayload {
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   * A URL which can be used to establish communication with the Desktop Agent, via loading
+   * the URL into an iframe and restarting the Web Connection protocol with the iframe as the
+   * target.
    */
-  type: 'privateChannelUnsubscribeEventListenerResponse';
+  iframeUrl: string;
+  [property: string]: any;
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Response' appended.
+ * Identifies the type of the connection step message.
  */
 
 /**
- * A request to raise an unspecified intent for a specified context.
+ * Handshake message sent by the Desktop Agent to the app (with a MessagePort appended) that
+ * should be used for subsequent communication steps.
  *
- * A request message from an FDC3-enabled app to a Desktop Agent.
+ * A message used during the connection flow for an application to a Desktop Agent in a
+ * browser window. Used for messages sent in either direction.
  */
-export interface RaiseIntentForContextRequest {
+export interface WebConnectionProtocol3Handshake {
   /**
-   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
+   * Metadata for a Web Connection Protocol message.
    */
-  meta: AddContextListenerRequestMeta;
+  meta: WebConnectionProtocol1HelloMeta;
   /**
-   * The message payload typically contains the arguments to FDC3 API functions.
+   * The message payload, containing data pertaining to this connection step.
    */
-  payload: RaiseIntentForContextRequestPayload;
+  payload: WebConnectionProtocol3HandshakePayload;
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Request' appended.
+   * Identifies the type of the connection step message.
    */
-  type: 'raiseIntentForContextRequest';
+  type: 'WCP3Handshake';
 }
 
 /**
- * The message payload typically contains the arguments to FDC3 API functions.
+ * The message payload, containing data pertaining to this connection step.
  */
-export interface RaiseIntentForContextRequestPayload {
-  app?: AppIdentifier;
-  context: Context;
+export interface WebConnectionProtocol3HandshakePayload {
+  /**
+   * Indicates a custom timeout (in milliseconds) that should be used for API message
+   * exchanges that may involve launching an application, instead of the default 100,000
+   * millisecond timeout.
+   */
+  appLaunchTimeout?: number;
+  /**
+   * Indicates whether a channel selector user interface is required and the URL to use to do
+   * so. Set to `true` to use the default or `false` to disable the channel selector (as the
+   * Desktop Agent will handle it another way).
+   */
+  channelSelectorUrl: boolean | string;
+  /**
+   * The version of FDC3 API that the Desktop Agent will provide support for.
+   */
+  fdc3Version: string;
+  /**
+   * Indicates whether an intent resolver user interface is required and the URL to use to do
+   * so. Set to `true` to use the default or `false` to disable the intent resolver (as the
+   * Desktop Agent will handle it another way).
+   */
+  intentResolverUrl: boolean | string;
+  /**
+   * Indicates a custom timeout (in milliseconds) that should be used for the majority of API
+   * message exchanges instead of the default 10,000 millisecond timeout.
+   */
+  messageExchangeTimeout?: number;
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Request' appended.
+ * Identifies the type of the connection step message.
  */
 
 /**
- * A response to a raiseIntentForContext request.
+ * Identity Validation request from an app attempting to connect to a Desktop Agent.
  *
- * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
- * payload contains an `error` property, the request was unsuccessful.
+ * A message used during the connection flow for an application to a Desktop Agent in a
+ * browser window. Used for messages sent in either direction.
  */
-export interface RaiseIntentForContextResponse {
+export interface WebConnectionProtocol4ValidateAppIdentity {
   /**
-   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
+   * Metadata for a Web Connection Protocol message.
    */
-  meta: AddContextListenerResponseMeta;
+  meta: WebConnectionProtocol1HelloMeta;
   /**
-   * A payload for a response to an API call that will contain any return values or an `error`
-   * property containing a standardized error message indicating that the request was
-   * unsuccessful.
-   *
-   * There are 3 possible responses to a raiseIntentForContext request, each of which sets a
-   * single property in the payload: Success (`intentResolution`), Needs further resolution
-   * (`appIntents`) or Error (`error`).
+   * The message payload, containing data pertaining to this connection step.
    */
-  payload: RaiseIntentForContextResponsePayload;
+  payload: WebConnectionProtocol4ValidateAppIdentityPayload;
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   * Identifies the type of the connection step message.
    */
-  type: 'raiseIntentForContextResponse';
+  type: 'WCP4ValidateAppIdentity';
 }
 
 /**
- * A payload for a response to an API call that will contain any return values or an `error`
- * property containing a standardized error message indicating that the request was
- * unsuccessful.
- *
- * There are 3 possible responses to a raiseIntentForContext request, each of which sets a
- * single property in the payload: Success (`intentResolution`), Needs further resolution
- * (`appIntents`) or Error (`error`).
- *
- * Response to a raiseIntentForContext request that needs additional resolution (i.e. show
- * an intent resolver UI).
- *
- * Used if a raiseIntent request resulted in an error.
+ * The message payload, containing data pertaining to this connection step.
  */
-export interface RaiseIntentForContextResponsePayload {
-  /**
-   * Should be set if the raiseIntent request returned an error.
-   */
-  error?: FindInstancesErrors;
+export interface WebConnectionProtocol4ValidateAppIdentityPayload {
   /**
-   * Used if the raiseIntent request was successfully resolved.
+   * The current URL of the page attempting to connect. This may differ from the identityUrl,
+   * but the origins MUST match.
    */
-  intentResolution?: IntentResolution;
+  actualUrl: string;
   /**
-   * Used if a raiseIntentForContext request requires additional resolution (e.g. by showing
-   * an intent resolver) before it can be handled.
+   * URL to use for the identity of the application. Desktop Agents MUST validate that the
+   * origin of the message matches the URL, but MAY implement custom comparison logic.
    */
-  appIntents?: AppIntent[];
-}
-
-/**
- * Used if the raiseIntent request was successfully resolved.
- *
- * IntentResolution provides a standard format for data returned upon resolving an intent.
- *
- * ```javascript
- * //resolve a "Chain" type intent
- * let resolution = await agent.raiseIntent("intentName", context);
- *
- * //resolve a "Client-Service" type intent with a data response or a Channel
- * let resolution = await agent.raiseIntent("intentName", context);
- * try {
- * const result = await resolution.getResult();
- * if (result && result.broadcast) {
- * console.log(`${resolution.source} returned a channel with id ${result.id}`);
- * } else if (result){
- * console.log(`${resolution.source} returned data: ${JSON.stringify(result)}`);
- * } else {
- * console.error(`${resolution.source} didn't return data`
- * }
- * } catch(error) {
- * console.error(`${resolution.source} returned an error: ${error}`);
- * }
- *
- * // Use metadata about the resolving app instance to target a further intent
- * await agent.raiseIntent("intentName", context, resolution.source);
- * ```
- */
-export interface IntentResolution {
+  identityUrl: string;
   /**
-   * The intent that was raised. May be used to determine which intent the user
-   * chose in response to `fdc3.raiseIntentForContext()`.
+   * If an application has previously connected to the Desktop Agent, it may specify its prior
+   * instance id and associated instance UUID to request the same same instance Id be assigned.
    */
-  intent: string;
+  instanceId?: string;
   /**
-   * Identifier for the app instance that was selected (or started) to resolve the intent.
-   * `source.instanceId` MUST be set, indicating the specific app instance that
-   * received the intent.
+   * Instance UUID associated with the requested instanceId.
    */
-  source: AppIdentifier;
+  instanceUuid?: string;
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Response' appended.
+ * Identifies the type of the connection step message.
  */
 
 /**
- * A request to raise an intent for a context.
+ * Message sent by the Desktop Agent to an app if their identity validation fails.
  *
- * A request message from an FDC3-enabled app to a Desktop Agent.
+ * A message used during the connection flow for an application to a Desktop Agent in a
+ * browser window. Used for messages sent in either direction.
  */
-export interface RaiseIntentRequest {
+export interface WebConnectionProtocol5ValidateAppIdentityFailedResponse {
   /**
-   * Metadata for a request message sent by an FDC3-enabled app to a Desktop Agent.
+   * Metadata for a Web Connection Protocol message.
    */
-  meta: AddContextListenerRequestMeta;
+  meta: WebConnectionProtocol1HelloMeta;
   /**
-   * The message payload typically contains the arguments to FDC3 API functions.
+   * The message payload, containing data pertaining to this connection step.
    */
-  payload: RaiseIntentRequestPayload;
+  payload: WebConnectionProtocol5ValidateAppIdentityFailedResponsePayload;
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Request' appended.
+   * Identifies the type of the connection step message.
    */
-  type: 'raiseIntentRequest';
+  type: 'WCP5ValidateAppIdentityFailedResponse';
 }
 
 /**
- * The message payload typically contains the arguments to FDC3 API functions.
+ * The message payload, containing data pertaining to this connection step.
  */
-export interface RaiseIntentRequestPayload {
-  app?: AppIdentifier;
-  context: Context;
-  intent: string;
+export interface WebConnectionProtocol5ValidateAppIdentityFailedResponsePayload {
+  message?: string;
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Request' appended.
+ * Identifies the type of the connection step message.
  */
 
 /**
- * A response to a raiseIntent request.
+ * Message sent by the Desktop Agent to an app after successful identity validation.
  *
- * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
- * payload contains an `error` property, the request was unsuccessful.
+ * A message used during the connection flow for an application to a Desktop Agent in a
+ * browser window. Used for messages sent in either direction.
  */
-export interface RaiseIntentResponse {
+export interface WebConnectionProtocol5ValidateAppIdentitySuccessResponse {
   /**
-   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
+   * Metadata for a Web Connection Protocol message.
    */
-  meta: AddContextListenerResponseMeta;
+  meta: WebConnectionProtocol1HelloMeta;
   /**
-   * A payload for a response to an API call that will contain any return values or an `error`
-   * property containing a standardized error message indicating that the request was
-   * unsuccessful.
-   *
-   * There are 3 possible responses to a raiseIntent request, each of which sets a single
-   * property in the payload: Success (`intentResolution`), Needs further resolution
-   * (`appIntent`) or Error (`error`).
+   * The message payload, containing data pertaining to this connection step.
    */
-  payload: RaiseIntentResponsePayload;
+  payload: WebConnectionProtocol5ValidateAppIdentitySuccessResponsePayload;
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   * Identifies the type of the connection step message.
    */
-  type: 'raiseIntentResponse';
+  type: 'WCP5ValidateAppIdentityResponse';
+}
+
+/**
+ * The message payload, containing data pertaining to this connection step.
+ */
+export interface WebConnectionProtocol5ValidateAppIdentitySuccessResponsePayload {
+  /**
+   * The appId that the app's identity was validated against.
+   */
+  appId: string;
+  /**
+   * Implementation metadata for the Desktop Agent, which includes an appMetadata element
+   * containing a copy of the app's own metadata.
+   */
+  implementationMetadata: ImplementationMetadata;
+  /**
+   * The instance Id granted to the application by the Desktop Agent.
+   */
+  instanceId: string;
+  /**
+   * Instance UUID associated with the instanceId granted, which may be used to retrieve the
+   * same instanceId if the app is reloaded or navigates.
+   */
+  instanceUuid: string;
 }
 
 /**
- * A payload for a response to an API call that will contain any return values or an `error`
- * property containing a standardized error message indicating that the request was
- * unsuccessful.
- *
- * There are 3 possible responses to a raiseIntent request, each of which sets a single
- * property in the payload: Success (`intentResolution`), Needs further resolution
- * (`appIntent`) or Error (`error`).
- *
- * Response to a raiseIntent request that needs additional resolution (i.e. show an intent
- * resolver UI).
+ * Identifies the type of the connection step message.
+ */
+
+/**
+ * Goodbye message to be sent to the Desktop Agent when disconnecting (e.g. when closing the
+ * window or navigating). Desktop Agents should close the MessagePort after receiving this
+ * message, but retain instance details in case the application reconnects (e.g. after a
+ * navigation event).
  *
- * Used if a raiseIntent request resulted in an error.
+ * A message used during the connection flow for an application to a Desktop Agent in a
+ * browser window. Used for messages sent in either direction.
  */
-export interface RaiseIntentResponsePayload {
-  /**
-   * Should be set if the raiseIntent request returned an error.
-   */
-  error?: FindInstancesErrors;
+export interface WebConnectionProtocol6Goodbye {
   /**
-   * Used if the raiseIntent request was successfully resolved.
+   * Metadata for a Web Connection Protocol message.
    */
-  intentResolution?: IntentResolution;
+  meta: WebConnectionProtocol6GoodbyeMeta;
   /**
-   * Used if a raiseIntent request requires additional resolution (e.g. by showing an intent
-   * resolver) before it can be handled.
+   * Identifies the type of the connection step message.
    */
-  appIntent?: AppIntent;
+  type: 'WCP6Goodbye';
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Response' appended.
+ * Metadata for a Web Connection Protocol message.
  */
+export interface WebConnectionProtocol6GoodbyeMeta {
+  timestamp: Date;
+}
 
 /**
- * A secondary response to a request to raise an intent used to deliver the intent result.
- * This message should quote the original requestUuid of the raiseIntentRequest message in
- * its `meta.requestUuid` field.
- *
- * A message from a Desktop Agent to an FDC3-enabled app responding to an API call. If the
- * payload contains an `error` property, the request was unsuccessful.
+ * Identifies the type of the connection step message.
  */
-export interface RaiseIntentResultResponse {
+
+/**
+ * A message used during the connection flow for an application to a Desktop Agent in a
+ * browser window. Used for messages sent in either direction.
+ */
+export interface WebConnectionProtocolMessage {
   /**
-   * Metadata for messages sent by a Desktop Agent to an app in response to an API call.
+   * Metadata for a Web Connection Protocol message.
    */
-  meta: AddContextListenerResponseMeta;
+  meta: ConnectionStepMetadata;
   /**
-   * A payload for a response to an API call that will contain any return values or an `error`
-   * property containing a standardized error message indicating that the request was
-   * unsuccessful.
+   * The message payload, containing data pertaining to this connection step.
    */
-  payload: RaiseIntentResultResponsePayload;
+  payload?: { [key: string]: any };
   /**
-   * Identifies the type of the message and it is typically set to the FDC3 function name that
-   * the message relates to, e.g. 'findIntent', with 'Response' appended.
+   * Identifies the type of the connection step message.
    */
-  type: 'raiseIntentResultResponse';
+  type: ConnectionStepMessageType;
 }
 
 /**
- * A payload for a response to an API call that will contain any return values or an `error`
- * property containing a standardized error message indicating that the request was
- * unsuccessful.
+ * Metadata for a Web Connection Protocol message.
  */
-export interface RaiseIntentResultResponsePayload {
-  error?: ResponsePayloadError;
-  intentResult?: IntentResult;
+export interface ConnectionStepMetadata {
+  timestamp: Date;
+  connectionAttemptUuid?: string;
 }
 
 /**
- * Identifies the type of the message and it is typically set to the FDC3 function name that
- * the message relates to, e.g. 'findIntent', with 'Response' appended.
+ * Identifies the type of the connection step message.
  */
+export type ConnectionStepMessageType =
+  | 'WCP1Hello'
+  | 'WCP2LoadUrl'
+  | 'WCP3Handshake'
+  | 'WCP4ValidateAppIdentity'
+  | 'WCP5ValidateAppIdentityFailedResponse'
+  | 'WCP5ValidateAppIdentityResponse'
+  | 'WCP6Goodbye';
 
 // Converts JSON strings to/from your types
 // and asserts the results of JSON.parse at runtime
 export class Convert {
-  public static toWebConnectionProtocol1Hello(json: string): WebConnectionProtocol1Hello {
-    return cast(JSON.parse(json), r('WebConnectionProtocol1Hello'));
-  }
-
-  public static webConnectionProtocol1HelloToJson(value: WebConnectionProtocol1Hello): string {
-    return JSON.stringify(uncast(value, r('WebConnectionProtocol1Hello')), null, 2);
-  }
-
-  public static toWebConnectionProtocol2LoadURL(json: string): WebConnectionProtocol2LoadURL {
-    return cast(JSON.parse(json), r('WebConnectionProtocol2LoadURL'));
-  }
-
-  public static webConnectionProtocol2LoadURLToJson(value: WebConnectionProtocol2LoadURL): string {
-    return JSON.stringify(uncast(value, r('WebConnectionProtocol2LoadURL')), null, 2);
-  }
-
-  public static toWebConnectionProtocol3Handshake(json: string): WebConnectionProtocol3Handshake {
-    return cast(JSON.parse(json), r('WebConnectionProtocol3Handshake'));
-  }
-
-  public static webConnectionProtocol3HandshakeToJson(value: WebConnectionProtocol3Handshake): string {
-    return JSON.stringify(uncast(value, r('WebConnectionProtocol3Handshake')), null, 2);
-  }
-
-  public static toWebConnectionProtocol4ValidateAppIdentity(json: string): WebConnectionProtocol4ValidateAppIdentity {
-    return cast(JSON.parse(json), r('WebConnectionProtocol4ValidateAppIdentity'));
-  }
-
-  public static webConnectionProtocol4ValidateAppIdentityToJson(
-    value: WebConnectionProtocol4ValidateAppIdentity
-  ): string {
-    return JSON.stringify(uncast(value, r('WebConnectionProtocol4ValidateAppIdentity')), null, 2);
-  }
-
-  public static toWebConnectionProtocol5ValidateAppIdentityFailedResponse(
-    json: string
-  ): WebConnectionProtocol5ValidateAppIdentityFailedResponse {
-    return cast(JSON.parse(json), r('WebConnectionProtocol5ValidateAppIdentityFailedResponse'));
-  }
-
-  public static webConnectionProtocol5ValidateAppIdentityFailedResponseToJson(
-    value: WebConnectionProtocol5ValidateAppIdentityFailedResponse
-  ): string {
-    return JSON.stringify(uncast(value, r('WebConnectionProtocol5ValidateAppIdentityFailedResponse')), null, 2);
-  }
-
-  public static toWebConnectionProtocol5ValidateAppIdentitySuccessResponse(
-    json: string
-  ): WebConnectionProtocol5ValidateAppIdentitySuccessResponse {
-    return cast(JSON.parse(json), r('WebConnectionProtocol5ValidateAppIdentitySuccessResponse'));
-  }
-
-  public static webConnectionProtocol5ValidateAppIdentitySuccessResponseToJson(
-    value: WebConnectionProtocol5ValidateAppIdentitySuccessResponse
-  ): string {
-    return JSON.stringify(uncast(value, r('WebConnectionProtocol5ValidateAppIdentitySuccessResponse')), null, 2);
-  }
-
-  public static toWebConnectionProtocol6Goodbye(json: string): WebConnectionProtocol6Goodbye {
-    return cast(JSON.parse(json), r('WebConnectionProtocol6Goodbye'));
-  }
-
-  public static webConnectionProtocol6GoodbyeToJson(value: WebConnectionProtocol6Goodbye): string {
-    return JSON.stringify(uncast(value, r('WebConnectionProtocol6Goodbye')), null, 2);
-  }
-
-  public static toWebConnectionProtocolMessage(json: string): WebConnectionProtocolMessage {
-    return cast(JSON.parse(json), r('WebConnectionProtocolMessage'));
-  }
-
-  public static webConnectionProtocolMessageToJson(value: WebConnectionProtocolMessage): string {
-    return JSON.stringify(uncast(value, r('WebConnectionProtocolMessage')), null, 2);
-  }
-
   public static toAddContextListenerRequest(json: string): AddContextListenerRequest {
     return cast(JSON.parse(json), r('AddContextListenerRequest'));
   }
@@ -4161,14 +4087,6 @@ export class Convert {
     return JSON.stringify(uncast(value, r('EventListenerUnsubscribeResponse')), null, 2);
   }
 
-  public static toFdc3UserInterfaceChannelSelected(json: string): Fdc3UserInterfaceChannelSelected {
-    return cast(JSON.parse(json), r('Fdc3UserInterfaceChannelSelected'));
-  }
-
-  public static fdc3UserInterfaceChannelSelectedToJson(value: Fdc3UserInterfaceChannelSelected): string {
-    return JSON.stringify(uncast(value, r('Fdc3UserInterfaceChannelSelected')), null, 2);
-  }
-
   public static toFdc3UserInterfaceChannels(json: string): Fdc3UserInterfaceChannels {
     return cast(JSON.parse(json), r('Fdc3UserInterfaceChannels'));
   }
@@ -4177,6 +4095,14 @@ export class Convert {
     return JSON.stringify(uncast(value, r('Fdc3UserInterfaceChannels')), null, 2);
   }
 
+  public static toFdc3UserInterfaceChannelSelected(json: string): Fdc3UserInterfaceChannelSelected {
+    return cast(JSON.parse(json), r('Fdc3UserInterfaceChannelSelected'));
+  }
+
+  public static fdc3UserInterfaceChannelSelectedToJson(value: Fdc3UserInterfaceChannelSelected): string {
+    return JSON.stringify(uncast(value, r('Fdc3UserInterfaceChannelSelected')), null, 2);
+  }
+
   public static toFdc3UserInterfaceDrag(json: string): Fdc3UserInterfaceDrag {
     return cast(JSON.parse(json), r('Fdc3UserInterfaceDrag'));
   }
@@ -4589,16 +4515,90 @@ export class Convert {
     return cast(JSON.parse(json), r('RaiseIntentResponse'));
   }
 
-  public static raiseIntentResponseToJson(value: RaiseIntentResponse): string {
-    return JSON.stringify(uncast(value, r('RaiseIntentResponse')), null, 2);
+  public static raiseIntentResponseToJson(value: RaiseIntentResponse): string {
+    return JSON.stringify(uncast(value, r('RaiseIntentResponse')), null, 2);
+  }
+
+  public static toRaiseIntentResultResponse(json: string): RaiseIntentResultResponse {
+    return cast(JSON.parse(json), r('RaiseIntentResultResponse'));
+  }
+
+  public static raiseIntentResultResponseToJson(value: RaiseIntentResultResponse): string {
+    return JSON.stringify(uncast(value, r('RaiseIntentResultResponse')), null, 2);
+  }
+
+  public static toWebConnectionProtocol1Hello(json: string): WebConnectionProtocol1Hello {
+    return cast(JSON.parse(json), r('WebConnectionProtocol1Hello'));
+  }
+
+  public static webConnectionProtocol1HelloToJson(value: WebConnectionProtocol1Hello): string {
+    return JSON.stringify(uncast(value, r('WebConnectionProtocol1Hello')), null, 2);
+  }
+
+  public static toWebConnectionProtocol2LoadURL(json: string): WebConnectionProtocol2LoadURL {
+    return cast(JSON.parse(json), r('WebConnectionProtocol2LoadURL'));
+  }
+
+  public static webConnectionProtocol2LoadURLToJson(value: WebConnectionProtocol2LoadURL): string {
+    return JSON.stringify(uncast(value, r('WebConnectionProtocol2LoadURL')), null, 2);
+  }
+
+  public static toWebConnectionProtocol3Handshake(json: string): WebConnectionProtocol3Handshake {
+    return cast(JSON.parse(json), r('WebConnectionProtocol3Handshake'));
+  }
+
+  public static webConnectionProtocol3HandshakeToJson(value: WebConnectionProtocol3Handshake): string {
+    return JSON.stringify(uncast(value, r('WebConnectionProtocol3Handshake')), null, 2);
+  }
+
+  public static toWebConnectionProtocol4ValidateAppIdentity(json: string): WebConnectionProtocol4ValidateAppIdentity {
+    return cast(JSON.parse(json), r('WebConnectionProtocol4ValidateAppIdentity'));
+  }
+
+  public static webConnectionProtocol4ValidateAppIdentityToJson(
+    value: WebConnectionProtocol4ValidateAppIdentity
+  ): string {
+    return JSON.stringify(uncast(value, r('WebConnectionProtocol4ValidateAppIdentity')), null, 2);
+  }
+
+  public static toWebConnectionProtocol5ValidateAppIdentityFailedResponse(
+    json: string
+  ): WebConnectionProtocol5ValidateAppIdentityFailedResponse {
+    return cast(JSON.parse(json), r('WebConnectionProtocol5ValidateAppIdentityFailedResponse'));
+  }
+
+  public static webConnectionProtocol5ValidateAppIdentityFailedResponseToJson(
+    value: WebConnectionProtocol5ValidateAppIdentityFailedResponse
+  ): string {
+    return JSON.stringify(uncast(value, r('WebConnectionProtocol5ValidateAppIdentityFailedResponse')), null, 2);
+  }
+
+  public static toWebConnectionProtocol5ValidateAppIdentitySuccessResponse(
+    json: string
+  ): WebConnectionProtocol5ValidateAppIdentitySuccessResponse {
+    return cast(JSON.parse(json), r('WebConnectionProtocol5ValidateAppIdentitySuccessResponse'));
+  }
+
+  public static webConnectionProtocol5ValidateAppIdentitySuccessResponseToJson(
+    value: WebConnectionProtocol5ValidateAppIdentitySuccessResponse
+  ): string {
+    return JSON.stringify(uncast(value, r('WebConnectionProtocol5ValidateAppIdentitySuccessResponse')), null, 2);
+  }
+
+  public static toWebConnectionProtocol6Goodbye(json: string): WebConnectionProtocol6Goodbye {
+    return cast(JSON.parse(json), r('WebConnectionProtocol6Goodbye'));
+  }
+
+  public static webConnectionProtocol6GoodbyeToJson(value: WebConnectionProtocol6Goodbye): string {
+    return JSON.stringify(uncast(value, r('WebConnectionProtocol6Goodbye')), null, 2);
   }
 
-  public static toRaiseIntentResultResponse(json: string): RaiseIntentResultResponse {
-    return cast(JSON.parse(json), r('RaiseIntentResultResponse'));
+  public static toWebConnectionProtocolMessage(json: string): WebConnectionProtocolMessage {
+    return cast(JSON.parse(json), r('WebConnectionProtocolMessage'));
   }
 
-  public static raiseIntentResultResponseToJson(value: RaiseIntentResultResponse): string {
-    return JSON.stringify(uncast(value, r('RaiseIntentResultResponse')), null, 2);
+  public static webConnectionProtocolMessageToJson(value: WebConnectionProtocolMessage): string {
+    return JSON.stringify(uncast(value, r('WebConnectionProtocolMessage')), null, 2);
   }
 }
 
@@ -4698,250 +4698,77 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any
     }
     const result: any = {};
     Object.getOwnPropertyNames(props).forEach(key => {
-      const prop = props[key];
-      const v = Object.prototype.hasOwnProperty.call(val, key) ? val[key] : undefined;
-      result[prop.key] = transform(v, prop.typ, getProps, key, ref);
-    });
-    Object.getOwnPropertyNames(val).forEach(key => {
-      if (!Object.prototype.hasOwnProperty.call(props, key)) {
-        result[key] = transform(val[key], additional, getProps, key, ref);
-      }
-    });
-    return result;
-  }
-
-  if (typ === 'any') return val;
-  if (typ === null) {
-    if (val === null) return val;
-    return invalidValue(typ, val, key, parent);
-  }
-  if (typ === false) return invalidValue(typ, val, key, parent);
-  let ref: any = undefined;
-  while (typeof typ === 'object' && typ.ref !== undefined) {
-    ref = typ.ref;
-    typ = typeMap[typ.ref];
-  }
-  if (Array.isArray(typ)) return transformEnum(typ, val);
-  if (typeof typ === 'object') {
-    return typ.hasOwnProperty('unionMembers')
-      ? transformUnion(typ.unionMembers, val)
-      : typ.hasOwnProperty('arrayItems')
-        ? transformArray(typ.arrayItems, val)
-        : typ.hasOwnProperty('props')
-          ? transformObject(getProps(typ), typ.additional, val)
-          : invalidValue(typ, val, key, parent);
-  }
-  // Numbers can be parsed by Date but shouldn't be.
-  if (typ === Date && typeof val !== 'number') return transformDate(val);
-  return transformPrimitive(typ, val);
-}
-
-function cast<T>(val: any, typ: any): T {
-  return transform(val, typ, jsonToJSProps);
-}
-
-function uncast<T>(val: T, typ: any): any {
-  return transform(val, typ, jsToJSONProps);
-}
-
-function l(typ: any) {
-  return { literal: typ };
-}
-
-function a(typ: any) {
-  return { arrayItems: typ };
-}
-
-function u(...typs: any[]) {
-  return { unionMembers: typs };
-}
-
-function o(props: any[], additional: any) {
-  return { props, additional };
-}
-
-function m(additional: any) {
-  return { props: [], additional };
-}
-
-function r(name: string) {
-  return { ref: name };
-}
-
-const typeMap: any = {
-  WebConnectionProtocol1Hello: o(
-    [
-      { json: 'meta', js: 'meta', typ: r('WebConnectionProtocol1HelloMeta') },
-      { json: 'payload', js: 'payload', typ: r('WebConnectionProtocol1HelloPayload') },
-      { json: 'type', js: 'type', typ: r('WebConnectionProtocol1HelloType') },
-    ],
-    false
-  ),
-  WebConnectionProtocol1HelloMeta: o(
-    [
-      { json: 'connectionAttemptUuid', js: 'connectionAttemptUuid', typ: '' },
-      { json: 'timestamp', js: 'timestamp', typ: Date },
-    ],
-    false
-  ),
-  WebConnectionProtocol1HelloPayload: o(
-    [
-      { json: 'actualUrl', js: 'actualUrl', typ: '' },
-      { json: 'channelSelector', js: 'channelSelector', typ: u(undefined, true) },
-      { json: 'fdc3Version', js: 'fdc3Version', typ: '' },
-      { json: 'identityUrl', js: 'identityUrl', typ: '' },
-      { json: 'intentResolver', js: 'intentResolver', typ: u(undefined, true) },
-    ],
-    'any'
-  ),
-  WebConnectionProtocol2LoadURL: o(
-    [
-      { json: 'meta', js: 'meta', typ: r('WebConnectionProtocol1HelloMeta') },
-      { json: 'payload', js: 'payload', typ: r('WebConnectionProtocol2LoadURLPayload') },
-      { json: 'type', js: 'type', typ: r('WebConnectionProtocol2LoadURLType') },
-    ],
-    false
-  ),
-  WebConnectionProtocol2LoadURLPayload: o([{ json: 'iframeUrl', js: 'iframeUrl', typ: '' }], 'any'),
-  WebConnectionProtocol3Handshake: o(
-    [
-      { json: 'meta', js: 'meta', typ: r('WebConnectionProtocol1HelloMeta') },
-      { json: 'payload', js: 'payload', typ: r('WebConnectionProtocol3HandshakePayload') },
-      { json: 'type', js: 'type', typ: r('WebConnectionProtocol3HandshakeType') },
-    ],
-    false
-  ),
-  WebConnectionProtocol3HandshakePayload: o(
-    [
-      { json: 'appLaunchTimeout', js: 'appLaunchTimeout', typ: u(undefined, 3.14) },
-      { json: 'channelSelectorUrl', js: 'channelSelectorUrl', typ: u(true, '') },
-      { json: 'fdc3Version', js: 'fdc3Version', typ: '' },
-      { json: 'intentResolverUrl', js: 'intentResolverUrl', typ: u(true, '') },
-      { json: 'messageExchangeTimeout', js: 'messageExchangeTimeout', typ: u(undefined, 3.14) },
-    ],
-    false
-  ),
-  WebConnectionProtocol4ValidateAppIdentity: o(
-    [
-      { json: 'meta', js: 'meta', typ: r('WebConnectionProtocol1HelloMeta') },
-      { json: 'payload', js: 'payload', typ: r('WebConnectionProtocol4ValidateAppIdentityPayload') },
-      { json: 'type', js: 'type', typ: r('WebConnectionProtocol4ValidateAppIdentityType') },
-    ],
-    false
-  ),
-  WebConnectionProtocol4ValidateAppIdentityPayload: o(
-    [
-      { json: 'actualUrl', js: 'actualUrl', typ: '' },
-      { json: 'identityUrl', js: 'identityUrl', typ: '' },
-      { json: 'instanceId', js: 'instanceId', typ: u(undefined, '') },
-      { json: 'instanceUuid', js: 'instanceUuid', typ: u(undefined, '') },
-    ],
-    false
-  ),
-  WebConnectionProtocol5ValidateAppIdentityFailedResponse: o(
-    [
-      { json: 'meta', js: 'meta', typ: r('WebConnectionProtocol1HelloMeta') },
-      { json: 'payload', js: 'payload', typ: r('WebConnectionProtocol5ValidateAppIdentityFailedResponsePayload') },
-      { json: 'type', js: 'type', typ: r('WebConnectionProtocol5ValidateAppIdentityFailedResponseType') },
-    ],
-    false
-  ),
-  WebConnectionProtocol5ValidateAppIdentityFailedResponsePayload: o(
-    [{ json: 'message', js: 'message', typ: u(undefined, '') }],
-    false
-  ),
-  WebConnectionProtocol5ValidateAppIdentitySuccessResponse: o(
-    [
-      { json: 'meta', js: 'meta', typ: r('WebConnectionProtocol1HelloMeta') },
-      { json: 'payload', js: 'payload', typ: r('WebConnectionProtocol5ValidateAppIdentitySuccessResponsePayload') },
-      { json: 'type', js: 'type', typ: r('WebConnectionProtocol5ValidateAppIdentitySuccessResponseType') },
-    ],
-    false
-  ),
-  WebConnectionProtocol5ValidateAppIdentitySuccessResponsePayload: o(
-    [
-      { json: 'appId', js: 'appId', typ: '' },
-      { json: 'implementationMetadata', js: 'implementationMetadata', typ: r('ImplementationMetadata') },
-      { json: 'instanceId', js: 'instanceId', typ: '' },
-      { json: 'instanceUuid', js: 'instanceUuid', typ: '' },
-    ],
-    false
-  ),
-  ImplementationMetadata: o(
-    [
-      { json: 'appMetadata', js: 'appMetadata', typ: r('AppMetadata') },
-      { json: 'fdc3Version', js: 'fdc3Version', typ: '' },
-      { json: 'optionalFeatures', js: 'optionalFeatures', typ: r('OptionalFeatures') },
-      { json: 'provider', js: 'provider', typ: '' },
-      { json: 'providerVersion', js: 'providerVersion', typ: u(undefined, '') },
-    ],
-    false
-  ),
-  AppMetadata: o(
-    [
-      { json: 'appId', js: 'appId', typ: '' },
-      { json: 'description', js: 'description', typ: u(undefined, '') },
-      { json: 'desktopAgent', js: 'desktopAgent', typ: u(undefined, '') },
-      { json: 'icons', js: 'icons', typ: u(undefined, a(r('Icon'))) },
-      { json: 'instanceId', js: 'instanceId', typ: u(undefined, '') },
-      { json: 'instanceMetadata', js: 'instanceMetadata', typ: u(undefined, m('any')) },
-      { json: 'name', js: 'name', typ: u(undefined, '') },
-      { json: 'resultType', js: 'resultType', typ: u(undefined, u(null, '')) },
-      { json: 'screenshots', js: 'screenshots', typ: u(undefined, a(r('Image'))) },
-      { json: 'title', js: 'title', typ: u(undefined, '') },
-      { json: 'tooltip', js: 'tooltip', typ: u(undefined, '') },
-      { json: 'version', js: 'version', typ: u(undefined, '') },
-    ],
-    false
-  ),
-  Icon: o(
-    [
-      { json: 'size', js: 'size', typ: u(undefined, '') },
-      { json: 'src', js: 'src', typ: '' },
-      { json: 'type', js: 'type', typ: u(undefined, '') },
-    ],
-    false
-  ),
-  Image: o(
-    [
-      { json: 'label', js: 'label', typ: u(undefined, '') },
-      { json: 'size', js: 'size', typ: u(undefined, '') },
-      { json: 'src', js: 'src', typ: '' },
-      { json: 'type', js: 'type', typ: u(undefined, '') },
-    ],
-    false
-  ),
-  OptionalFeatures: o(
-    [
-      { json: 'DesktopAgentBridging', js: 'DesktopAgentBridging', typ: true },
-      { json: 'OriginatingAppMetadata', js: 'OriginatingAppMetadata', typ: true },
-      { json: 'UserChannelMembershipAPIs', js: 'UserChannelMembershipAPIs', typ: true },
-    ],
-    false
-  ),
-  WebConnectionProtocol6Goodbye: o(
-    [
-      { json: 'meta', js: 'meta', typ: r('WebConnectionProtocol6GoodbyeMeta') },
-      { json: 'type', js: 'type', typ: r('WebConnectionProtocol6GoodbyeType') },
-    ],
-    false
-  ),
-  WebConnectionProtocol6GoodbyeMeta: o([{ json: 'timestamp', js: 'timestamp', typ: Date }], false),
-  WebConnectionProtocolMessage: o(
-    [
-      { json: 'meta', js: 'meta', typ: r('ConnectionStepMetadata') },
-      { json: 'payload', js: 'payload', typ: u(undefined, m('any')) },
-      { json: 'type', js: 'type', typ: r('ConnectionStepMessageType') },
-    ],
-    false
-  ),
-  ConnectionStepMetadata: o(
-    [
-      { json: 'timestamp', js: 'timestamp', typ: Date },
-      { json: 'connectionAttemptUuid', js: 'connectionAttemptUuid', typ: u(undefined, '') },
-    ],
-    false
-  ),
+      const prop = props[key];
+      const v = Object.prototype.hasOwnProperty.call(val, key) ? val[key] : undefined;
+      result[prop.key] = transform(v, prop.typ, getProps, key, ref);
+    });
+    Object.getOwnPropertyNames(val).forEach(key => {
+      if (!Object.prototype.hasOwnProperty.call(props, key)) {
+        result[key] = transform(val[key], additional, getProps, key, ref);
+      }
+    });
+    return result;
+  }
+
+  if (typ === 'any') return val;
+  if (typ === null) {
+    if (val === null) return val;
+    return invalidValue(typ, val, key, parent);
+  }
+  if (typ === false) return invalidValue(typ, val, key, parent);
+  let ref: any = undefined;
+  while (typeof typ === 'object' && typ.ref !== undefined) {
+    ref = typ.ref;
+    typ = typeMap[typ.ref];
+  }
+  if (Array.isArray(typ)) return transformEnum(typ, val);
+  if (typeof typ === 'object') {
+    return typ.hasOwnProperty('unionMembers')
+      ? transformUnion(typ.unionMembers, val)
+      : typ.hasOwnProperty('arrayItems')
+        ? transformArray(typ.arrayItems, val)
+        : typ.hasOwnProperty('props')
+          ? transformObject(getProps(typ), typ.additional, val)
+          : invalidValue(typ, val, key, parent);
+  }
+  // Numbers can be parsed by Date but shouldn't be.
+  if (typ === Date && typeof val !== 'number') return transformDate(val);
+  return transformPrimitive(typ, val);
+}
+
+function cast<T>(val: any, typ: any): T {
+  return transform(val, typ, jsonToJSProps);
+}
+
+function uncast<T>(val: T, typ: any): any {
+  return transform(val, typ, jsToJSONProps);
+}
+
+function l(typ: any) {
+  return { literal: typ };
+}
+
+function a(typ: any) {
+  return { arrayItems: typ };
+}
+
+function u(...typs: any[]) {
+  return { unionMembers: typs };
+}
+
+function o(props: any[], additional: any) {
+  return { props, additional };
+}
+
+function m(additional: any) {
+  return { props: [], additional };
+}
+
+function r(name: string) {
+  return { ref: name };
+}
+
+const typeMap: any = {
   AddContextListenerRequest: o(
     [
       { json: 'meta', js: 'meta', typ: r('AddContextListenerRequestMeta') },
@@ -5238,14 +5065,6 @@ const typeMap: any = {
     ],
     false
   ),
-  Fdc3UserInterfaceChannelSelected: o(
-    [
-      { json: 'payload', js: 'payload', typ: r('Fdc3UserInterfaceChannelSelectedPayload') },
-      { json: 'type', js: 'type', typ: r('Fdc3UserInterfaceChannelSelectedType') },
-    ],
-    false
-  ),
-  Fdc3UserInterfaceChannelSelectedPayload: o([{ json: 'selected', js: 'selected', typ: u(null, '') }], false),
   Fdc3UserInterfaceChannels: o(
     [
       { json: 'payload', js: 'payload', typ: r('Fdc3UserInterfaceChannelsPayload') },
@@ -5260,6 +5079,14 @@ const typeMap: any = {
     ],
     false
   ),
+  Fdc3UserInterfaceChannelSelected: o(
+    [
+      { json: 'payload', js: 'payload', typ: r('Fdc3UserInterfaceChannelSelectedPayload') },
+      { json: 'type', js: 'type', typ: r('Fdc3UserInterfaceChannelSelectedType') },
+    ],
+    false
+  ),
+  Fdc3UserInterfaceChannelSelectedPayload: o([{ json: 'selected', js: 'selected', typ: u(null, '') }], false),
   Fdc3UserInterfaceDrag: o(
     [
       { json: 'payload', js: 'payload', typ: r('Fdc3UserInterfaceDragPayload') },
@@ -5340,6 +5167,40 @@ const typeMap: any = {
     ],
     false
   ),
+  AppMetadata: o(
+    [
+      { json: 'appId', js: 'appId', typ: '' },
+      { json: 'description', js: 'description', typ: u(undefined, '') },
+      { json: 'desktopAgent', js: 'desktopAgent', typ: u(undefined, '') },
+      { json: 'icons', js: 'icons', typ: u(undefined, a(r('Icon'))) },
+      { json: 'instanceId', js: 'instanceId', typ: u(undefined, '') },
+      { json: 'instanceMetadata', js: 'instanceMetadata', typ: u(undefined, m('any')) },
+      { json: 'name', js: 'name', typ: u(undefined, '') },
+      { json: 'resultType', js: 'resultType', typ: u(undefined, u(null, '')) },
+      { json: 'screenshots', js: 'screenshots', typ: u(undefined, a(r('Image'))) },
+      { json: 'title', js: 'title', typ: u(undefined, '') },
+      { json: 'tooltip', js: 'tooltip', typ: u(undefined, '') },
+      { json: 'version', js: 'version', typ: u(undefined, '') },
+    ],
+    false
+  ),
+  Icon: o(
+    [
+      { json: 'size', js: 'size', typ: u(undefined, '') },
+      { json: 'src', js: 'src', typ: '' },
+      { json: 'type', js: 'type', typ: u(undefined, '') },
+    ],
+    false
+  ),
+  Image: o(
+    [
+      { json: 'label', js: 'label', typ: u(undefined, '') },
+      { json: 'size', js: 'size', typ: u(undefined, '') },
+      { json: 'src', js: 'src', typ: '' },
+      { json: 'type', js: 'type', typ: u(undefined, '') },
+    ],
+    false
+  ),
   IntentMetadata: o(
     [
       { json: 'displayName', js: 'displayName', typ: u(undefined, '') },
@@ -5572,6 +5433,24 @@ const typeMap: any = {
     ],
     false
   ),
+  ImplementationMetadata: o(
+    [
+      { json: 'appMetadata', js: 'appMetadata', typ: r('AppMetadata') },
+      { json: 'fdc3Version', js: 'fdc3Version', typ: '' },
+      { json: 'optionalFeatures', js: 'optionalFeatures', typ: r('OptionalFeatures') },
+      { json: 'provider', js: 'provider', typ: '' },
+      { json: 'providerVersion', js: 'providerVersion', typ: u(undefined, '') },
+    ],
+    false
+  ),
+  OptionalFeatures: o(
+    [
+      { json: 'DesktopAgentBridging', js: 'DesktopAgentBridging', typ: true },
+      { json: 'OriginatingAppMetadata', js: 'OriginatingAppMetadata', typ: true },
+      { json: 'UserChannelMembershipAPIs', js: 'UserChannelMembershipAPIs', typ: true },
+    ],
+    false
+  ),
   GetOrCreateChannelRequest: o(
     [
       { json: 'meta', js: 'meta', typ: r('AddContextListenerRequestMeta') },
@@ -5949,37 +5828,142 @@ const typeMap: any = {
     ],
     false
   ),
-  RaiseIntentResultResponse: o(
+  RaiseIntentResultResponse: o(
+    [
+      { json: 'meta', js: 'meta', typ: r('AddContextListenerResponseMeta') },
+      { json: 'payload', js: 'payload', typ: r('RaiseIntentResultResponsePayload') },
+      { json: 'type', js: 'type', typ: r('RaiseIntentResultResponseType') },
+    ],
+    false
+  ),
+  RaiseIntentResultResponsePayload: o(
+    [
+      { json: 'error', js: 'error', typ: u(undefined, r('ResponsePayloadError')) },
+      { json: 'intentResult', js: 'intentResult', typ: u(undefined, r('IntentResult')) },
+    ],
+    false
+  ),
+  WebConnectionProtocol1Hello: o(
+    [
+      { json: 'meta', js: 'meta', typ: r('WebConnectionProtocol1HelloMeta') },
+      { json: 'payload', js: 'payload', typ: r('WebConnectionProtocol1HelloPayload') },
+      { json: 'type', js: 'type', typ: r('WebConnectionProtocol1HelloType') },
+    ],
+    false
+  ),
+  WebConnectionProtocol1HelloMeta: o(
+    [
+      { json: 'connectionAttemptUuid', js: 'connectionAttemptUuid', typ: '' },
+      { json: 'timestamp', js: 'timestamp', typ: Date },
+    ],
+    false
+  ),
+  WebConnectionProtocol1HelloPayload: o(
+    [
+      { json: 'actualUrl', js: 'actualUrl', typ: '' },
+      { json: 'channelSelector', js: 'channelSelector', typ: u(undefined, true) },
+      { json: 'fdc3Version', js: 'fdc3Version', typ: '' },
+      { json: 'identityUrl', js: 'identityUrl', typ: '' },
+      { json: 'intentResolver', js: 'intentResolver', typ: u(undefined, true) },
+    ],
+    'any'
+  ),
+  WebConnectionProtocol2LoadURL: o(
+    [
+      { json: 'meta', js: 'meta', typ: r('WebConnectionProtocol1HelloMeta') },
+      { json: 'payload', js: 'payload', typ: r('WebConnectionProtocol2LoadURLPayload') },
+      { json: 'type', js: 'type', typ: r('WebConnectionProtocol2LoadURLType') },
+    ],
+    false
+  ),
+  WebConnectionProtocol2LoadURLPayload: o([{ json: 'iframeUrl', js: 'iframeUrl', typ: '' }], 'any'),
+  WebConnectionProtocol3Handshake: o(
+    [
+      { json: 'meta', js: 'meta', typ: r('WebConnectionProtocol1HelloMeta') },
+      { json: 'payload', js: 'payload', typ: r('WebConnectionProtocol3HandshakePayload') },
+      { json: 'type', js: 'type', typ: r('WebConnectionProtocol3HandshakeType') },
+    ],
+    false
+  ),
+  WebConnectionProtocol3HandshakePayload: o(
+    [
+      { json: 'appLaunchTimeout', js: 'appLaunchTimeout', typ: u(undefined, 3.14) },
+      { json: 'channelSelectorUrl', js: 'channelSelectorUrl', typ: u(true, '') },
+      { json: 'fdc3Version', js: 'fdc3Version', typ: '' },
+      { json: 'intentResolverUrl', js: 'intentResolverUrl', typ: u(true, '') },
+      { json: 'messageExchangeTimeout', js: 'messageExchangeTimeout', typ: u(undefined, 3.14) },
+    ],
+    false
+  ),
+  WebConnectionProtocol4ValidateAppIdentity: o(
+    [
+      { json: 'meta', js: 'meta', typ: r('WebConnectionProtocol1HelloMeta') },
+      { json: 'payload', js: 'payload', typ: r('WebConnectionProtocol4ValidateAppIdentityPayload') },
+      { json: 'type', js: 'type', typ: r('WebConnectionProtocol4ValidateAppIdentityType') },
+    ],
+    false
+  ),
+  WebConnectionProtocol4ValidateAppIdentityPayload: o(
+    [
+      { json: 'actualUrl', js: 'actualUrl', typ: '' },
+      { json: 'identityUrl', js: 'identityUrl', typ: '' },
+      { json: 'instanceId', js: 'instanceId', typ: u(undefined, '') },
+      { json: 'instanceUuid', js: 'instanceUuid', typ: u(undefined, '') },
+    ],
+    false
+  ),
+  WebConnectionProtocol5ValidateAppIdentityFailedResponse: o(
+    [
+      { json: 'meta', js: 'meta', typ: r('WebConnectionProtocol1HelloMeta') },
+      { json: 'payload', js: 'payload', typ: r('WebConnectionProtocol5ValidateAppIdentityFailedResponsePayload') },
+      { json: 'type', js: 'type', typ: r('WebConnectionProtocol5ValidateAppIdentityFailedResponseType') },
+    ],
+    false
+  ),
+  WebConnectionProtocol5ValidateAppIdentityFailedResponsePayload: o(
+    [{ json: 'message', js: 'message', typ: u(undefined, '') }],
+    false
+  ),
+  WebConnectionProtocol5ValidateAppIdentitySuccessResponse: o(
+    [
+      { json: 'meta', js: 'meta', typ: r('WebConnectionProtocol1HelloMeta') },
+      { json: 'payload', js: 'payload', typ: r('WebConnectionProtocol5ValidateAppIdentitySuccessResponsePayload') },
+      { json: 'type', js: 'type', typ: r('WebConnectionProtocol5ValidateAppIdentitySuccessResponseType') },
+    ],
+    false
+  ),
+  WebConnectionProtocol5ValidateAppIdentitySuccessResponsePayload: o(
+    [
+      { json: 'appId', js: 'appId', typ: '' },
+      { json: 'implementationMetadata', js: 'implementationMetadata', typ: r('ImplementationMetadata') },
+      { json: 'instanceId', js: 'instanceId', typ: '' },
+      { json: 'instanceUuid', js: 'instanceUuid', typ: '' },
+    ],
+    false
+  ),
+  WebConnectionProtocol6Goodbye: o(
+    [
+      { json: 'meta', js: 'meta', typ: r('WebConnectionProtocol6GoodbyeMeta') },
+      { json: 'type', js: 'type', typ: r('WebConnectionProtocol6GoodbyeType') },
+    ],
+    false
+  ),
+  WebConnectionProtocol6GoodbyeMeta: o([{ json: 'timestamp', js: 'timestamp', typ: Date }], false),
+  WebConnectionProtocolMessage: o(
     [
-      { json: 'meta', js: 'meta', typ: r('AddContextListenerResponseMeta') },
-      { json: 'payload', js: 'payload', typ: r('RaiseIntentResultResponsePayload') },
-      { json: 'type', js: 'type', typ: r('RaiseIntentResultResponseType') },
+      { json: 'meta', js: 'meta', typ: r('ConnectionStepMetadata') },
+      { json: 'payload', js: 'payload', typ: u(undefined, m('any')) },
+      { json: 'type', js: 'type', typ: r('ConnectionStepMessageType') },
     ],
     false
   ),
-  RaiseIntentResultResponsePayload: o(
+  ConnectionStepMetadata: o(
     [
-      { json: 'error', js: 'error', typ: u(undefined, r('ResponsePayloadError')) },
-      { json: 'intentResult', js: 'intentResult', typ: u(undefined, r('IntentResult')) },
+      { json: 'timestamp', js: 'timestamp', typ: Date },
+      { json: 'connectionAttemptUuid', js: 'connectionAttemptUuid', typ: u(undefined, '') },
     ],
     false
   ),
-  WebConnectionProtocol1HelloType: ['WCP1Hello'],
-  WebConnectionProtocol2LoadURLType: ['WCP2LoadUrl'],
-  WebConnectionProtocol3HandshakeType: ['WCP3Handshake'],
-  WebConnectionProtocol4ValidateAppIdentityType: ['WCP4ValidateAppIdentity'],
-  WebConnectionProtocol5ValidateAppIdentityFailedResponseType: ['WCP5ValidateAppIdentityFailedResponse'],
-  WebConnectionProtocol5ValidateAppIdentitySuccessResponseType: ['WCP5ValidateAppIdentityResponse'],
-  WebConnectionProtocol6GoodbyeType: ['WCP6Goodbye'],
-  ConnectionStepMessageType: [
-    'WCP1Hello',
-    'WCP2LoadUrl',
-    'WCP3Handshake',
-    'WCP4ValidateAppIdentity',
-    'WCP5ValidateAppIdentityFailedResponse',
-    'WCP5ValidateAppIdentityResponse',
-    'WCP6Goodbye',
-  ],
   AddContextListenerRequestType: ['addContextListenerRequest'],
   PurpleError: [
     'ApiTimeout',
@@ -6112,8 +6096,8 @@ const typeMap: any = {
   CreatePrivateChannelResponseType: ['createPrivateChannelResponse'],
   EventListenerUnsubscribeRequestType: ['eventListenerUnsubscribeRequest'],
   EventListenerUnsubscribeResponseType: ['eventListenerUnsubscribeResponse'],
-  Fdc3UserInterfaceChannelSelectedType: ['Fdc3UserInterfaceChannelSelected'],
   Fdc3UserInterfaceChannelsType: ['Fdc3UserInterfaceChannels'],
+  Fdc3UserInterfaceChannelSelectedType: ['Fdc3UserInterfaceChannelSelected'],
   Fdc3UserInterfaceDragType: ['Fdc3UserInterfaceDrag'],
   Fdc3UserInterfaceHandshakeType: ['Fdc3UserInterfaceHandshake'],
   Fdc3UserInterfaceHelloType: ['Fdc3UserInterfaceHello'],
@@ -6208,6 +6192,22 @@ const typeMap: any = {
   RaiseIntentRequestType: ['raiseIntentRequest'],
   RaiseIntentResponseType: ['raiseIntentResponse'],
   RaiseIntentResultResponseType: ['raiseIntentResultResponse'],
+  WebConnectionProtocol1HelloType: ['WCP1Hello'],
+  WebConnectionProtocol2LoadURLType: ['WCP2LoadUrl'],
+  WebConnectionProtocol3HandshakeType: ['WCP3Handshake'],
+  WebConnectionProtocol4ValidateAppIdentityType: ['WCP4ValidateAppIdentity'],
+  WebConnectionProtocol5ValidateAppIdentityFailedResponseType: ['WCP5ValidateAppIdentityFailedResponse'],
+  WebConnectionProtocol5ValidateAppIdentitySuccessResponseType: ['WCP5ValidateAppIdentityResponse'],
+  WebConnectionProtocol6GoodbyeType: ['WCP6Goodbye'],
+  ConnectionStepMessageType: [
+    'WCP1Hello',
+    'WCP2LoadUrl',
+    'WCP3Handshake',
+    'WCP4ValidateAppIdentity',
+    'WCP5ValidateAppIdentityFailedResponse',
+    'WCP5ValidateAppIdentityResponse',
+    'WCP6Goodbye',
+  ],
 };
 
 export type AppRequestMessage =
@@ -6233,224 +6233,49 @@ export type AppRequestMessage =
   | JoinUserChannelRequest
   | LeaveCurrentChannelRequest
   | OpenRequest
-  | PrivateChannelAddEventListenerRequest
-  | PrivateChannelDisconnectRequest
-  | PrivateChannelUnsubscribeEventListenerRequest
-  | RaiseIntentForContextRequest
-  | RaiseIntentRequest;
-
-export type AgentResponseMessage =
-  | AddContextListenerResponse
-  | AddEventListenerResponse
-  | AddIntentListenerResponse
-  | BroadcastResponse
-  | ContextListenerUnsubscribeResponse
-  | CreatePrivateChannelResponse
-  | EventListenerUnsubscribeResponse
-  | FindInstancesResponse
-  | FindIntentResponse
-  | FindIntentsByContextResponse
-  | GetAppMetadataResponse
-  | GetCurrentChannelResponse
-  | GetCurrentContextResponse
-  | GetInfoResponse
-  | GetOrCreateChannelResponse
-  | GetUserChannelsResponse
-  | IntentListenerUnsubscribeResponse
-  | IntentResultResponse
-  | JoinUserChannelResponse
-  | LeaveCurrentChannelResponse
-  | OpenResponse
-  | PrivateChannelAddEventListenerResponse
-  | PrivateChannelDisconnectResponse
-  | PrivateChannelUnsubscribeEventListenerResponse
-  | RaiseIntentForContextResponse
-  | RaiseIntentResponse
-  | RaiseIntentResultResponse;
-
-export type AgentEventMessage =
-  | BroadcastEvent
-  | ChannelChangedEvent
-  | HeartbeatEvent
-  | IntentEvent
-  | PrivateChannelOnAddContextListenerEvent
-  | PrivateChannelOnDisconnectEvent
-  | PrivateChannelOnUnsubscribeEvent;
-
-/**
- * Returns true if the value has a type property with value 'WCP1Hello'. This is a fast check that does not check the format of the message
- */
-export function isWebConnectionProtocol1Hello(value: any): value is WebConnectionProtocol1Hello {
-  return value != null && value.type === 'WCP1Hello';
-}
-
-/**
- * Returns true if value is a valid WebConnectionProtocol1Hello. This checks the type against the json schema for the message and will be slower
- */
-export function isValidWebConnectionProtocol1Hello(value: any): value is WebConnectionProtocol1Hello {
-  try {
-    Convert.webConnectionProtocol1HelloToJson(value);
-    return true;
-  } catch (_e: any) {
-    return false;
-  }
-}
-
-export const WEB_CONNECTION_PROTOCOL1_HELLO_TYPE = 'WebConnectionProtocol1Hello';
-
-/**
- * Returns true if the value has a type property with value 'WCP2LoadUrl'. This is a fast check that does not check the format of the message
- */
-export function isWebConnectionProtocol2LoadURL(value: any): value is WebConnectionProtocol2LoadURL {
-  return value != null && value.type === 'WCP2LoadUrl';
-}
-
-/**
- * Returns true if value is a valid WebConnectionProtocol2LoadURL. This checks the type against the json schema for the message and will be slower
- */
-export function isValidWebConnectionProtocol2LoadURL(value: any): value is WebConnectionProtocol2LoadURL {
-  try {
-    Convert.webConnectionProtocol2LoadURLToJson(value);
-    return true;
-  } catch (_e: any) {
-    return false;
-  }
-}
-
-export const WEB_CONNECTION_PROTOCOL2_LOAD_U_R_L_TYPE = 'WebConnectionProtocol2LoadURL';
-
-/**
- * Returns true if the value has a type property with value 'WCP3Handshake'. This is a fast check that does not check the format of the message
- */
-export function isWebConnectionProtocol3Handshake(value: any): value is WebConnectionProtocol3Handshake {
-  return value != null && value.type === 'WCP3Handshake';
-}
-
-/**
- * Returns true if value is a valid WebConnectionProtocol3Handshake. This checks the type against the json schema for the message and will be slower
- */
-export function isValidWebConnectionProtocol3Handshake(value: any): value is WebConnectionProtocol3Handshake {
-  try {
-    Convert.webConnectionProtocol3HandshakeToJson(value);
-    return true;
-  } catch (_e: any) {
-    return false;
-  }
-}
-
-export const WEB_CONNECTION_PROTOCOL3_HANDSHAKE_TYPE = 'WebConnectionProtocol3Handshake';
-
-/**
- * Returns true if the value has a type property with value 'WCP4ValidateAppIdentity'. This is a fast check that does not check the format of the message
- */
-export function isWebConnectionProtocol4ValidateAppIdentity(
-  value: any
-): value is WebConnectionProtocol4ValidateAppIdentity {
-  return value != null && value.type === 'WCP4ValidateAppIdentity';
-}
-
-/**
- * Returns true if value is a valid WebConnectionProtocol4ValidateAppIdentity. This checks the type against the json schema for the message and will be slower
- */
-export function isValidWebConnectionProtocol4ValidateAppIdentity(
-  value: any
-): value is WebConnectionProtocol4ValidateAppIdentity {
-  try {
-    Convert.webConnectionProtocol4ValidateAppIdentityToJson(value);
-    return true;
-  } catch (_e: any) {
-    return false;
-  }
-}
-
-export const WEB_CONNECTION_PROTOCOL4_VALIDATE_APP_IDENTITY_TYPE = 'WebConnectionProtocol4ValidateAppIdentity';
-
-/**
- * Returns true if the value has a type property with value 'WCP5ValidateAppIdentityFailedResponse'. This is a fast check that does not check the format of the message
- */
-export function isWebConnectionProtocol5ValidateAppIdentityFailedResponse(
-  value: any
-): value is WebConnectionProtocol5ValidateAppIdentityFailedResponse {
-  return value != null && value.type === 'WCP5ValidateAppIdentityFailedResponse';
-}
-
-/**
- * Returns true if value is a valid WebConnectionProtocol5ValidateAppIdentityFailedResponse. This checks the type against the json schema for the message and will be slower
- */
-export function isValidWebConnectionProtocol5ValidateAppIdentityFailedResponse(
-  value: any
-): value is WebConnectionProtocol5ValidateAppIdentityFailedResponse {
-  try {
-    Convert.webConnectionProtocol5ValidateAppIdentityFailedResponseToJson(value);
-    return true;
-  } catch (_e: any) {
-    return false;
-  }
-}
-
-export const WEB_CONNECTION_PROTOCOL5_VALIDATE_APP_IDENTITY_FAILED_RESPONSE_TYPE =
-  'WebConnectionProtocol5ValidateAppIdentityFailedResponse';
-
-/**
- * Returns true if the value has a type property with value 'WCP5ValidateAppIdentityResponse'. This is a fast check that does not check the format of the message
- */
-export function isWebConnectionProtocol5ValidateAppIdentitySuccessResponse(
-  value: any
-): value is WebConnectionProtocol5ValidateAppIdentitySuccessResponse {
-  return value != null && value.type === 'WCP5ValidateAppIdentityResponse';
-}
-
-/**
- * Returns true if value is a valid WebConnectionProtocol5ValidateAppIdentitySuccessResponse. This checks the type against the json schema for the message and will be slower
- */
-export function isValidWebConnectionProtocol5ValidateAppIdentitySuccessResponse(
-  value: any
-): value is WebConnectionProtocol5ValidateAppIdentitySuccessResponse {
-  try {
-    Convert.webConnectionProtocol5ValidateAppIdentitySuccessResponseToJson(value);
-    return true;
-  } catch (_e: any) {
-    return false;
-  }
-}
-
-export const WEB_CONNECTION_PROTOCOL5_VALIDATE_APP_IDENTITY_SUCCESS_RESPONSE_TYPE =
-  'WebConnectionProtocol5ValidateAppIdentitySuccessResponse';
-
-/**
- * Returns true if the value has a type property with value 'WCP6Goodbye'. This is a fast check that does not check the format of the message
- */
-export function isWebConnectionProtocol6Goodbye(value: any): value is WebConnectionProtocol6Goodbye {
-  return value != null && value.type === 'WCP6Goodbye';
-}
-
-/**
- * Returns true if value is a valid WebConnectionProtocol6Goodbye. This checks the type against the json schema for the message and will be slower
- */
-export function isValidWebConnectionProtocol6Goodbye(value: any): value is WebConnectionProtocol6Goodbye {
-  try {
-    Convert.webConnectionProtocol6GoodbyeToJson(value);
-    return true;
-  } catch (_e: any) {
-    return false;
-  }
-}
-
-export const WEB_CONNECTION_PROTOCOL6_GOODBYE_TYPE = 'WebConnectionProtocol6Goodbye';
+  | PrivateChannelAddEventListenerRequest
+  | PrivateChannelDisconnectRequest
+  | PrivateChannelUnsubscribeEventListenerRequest
+  | RaiseIntentForContextRequest
+  | RaiseIntentRequest;
 
-/**
- * Returns true if value is a valid WebConnectionProtocolMessage. This checks the type against the json schema for the message and will be slower
- */
-export function isValidWebConnectionProtocolMessage(value: any): value is WebConnectionProtocolMessage {
-  try {
-    Convert.webConnectionProtocolMessageToJson(value);
-    return true;
-  } catch (_e: any) {
-    return false;
-  }
-}
+export type AgentResponseMessage =
+  | AddContextListenerResponse
+  | AddEventListenerResponse
+  | AddIntentListenerResponse
+  | BroadcastResponse
+  | ContextListenerUnsubscribeResponse
+  | CreatePrivateChannelResponse
+  | EventListenerUnsubscribeResponse
+  | FindInstancesResponse
+  | FindIntentResponse
+  | FindIntentsByContextResponse
+  | GetAppMetadataResponse
+  | GetCurrentChannelResponse
+  | GetCurrentContextResponse
+  | GetInfoResponse
+  | GetOrCreateChannelResponse
+  | GetUserChannelsResponse
+  | IntentListenerUnsubscribeResponse
+  | IntentResultResponse
+  | JoinUserChannelResponse
+  | LeaveCurrentChannelResponse
+  | OpenResponse
+  | PrivateChannelAddEventListenerResponse
+  | PrivateChannelDisconnectResponse
+  | PrivateChannelUnsubscribeEventListenerResponse
+  | RaiseIntentForContextResponse
+  | RaiseIntentResponse
+  | RaiseIntentResultResponse;
 
-export const WEB_CONNECTION_PROTOCOL_MESSAGE_TYPE = 'WebConnectionProtocolMessage';
+export type AgentEventMessage =
+  | BroadcastEvent
+  | ChannelChangedEvent
+  | HeartbeatEvent
+  | IntentEvent
+  | PrivateChannelOnAddContextListenerEvent
+  | PrivateChannelOnDisconnectEvent
+  | PrivateChannelOnUnsubscribeEvent;
 
 /**
  * Returns true if the value has a type property with value 'addContextListenerRequest'. This is a fast check that does not check the format of the message
@@ -6789,46 +6614,46 @@ export function isValidEventListenerUnsubscribeResponse(value: any): value is Ev
 export const EVENT_LISTENER_UNSUBSCRIBE_RESPONSE_TYPE = 'EventListenerUnsubscribeResponse';
 
 /**
- * Returns true if the value has a type property with value 'Fdc3UserInterfaceChannelSelected'. This is a fast check that does not check the format of the message
+ * Returns true if the value has a type property with value 'Fdc3UserInterfaceChannels'. This is a fast check that does not check the format of the message
  */
-export function isFdc3UserInterfaceChannelSelected(value: any): value is Fdc3UserInterfaceChannelSelected {
-  return value != null && value.type === 'Fdc3UserInterfaceChannelSelected';
+export function isFdc3UserInterfaceChannels(value: any): value is Fdc3UserInterfaceChannels {
+  return value != null && value.type === 'Fdc3UserInterfaceChannels';
 }
 
 /**
- * Returns true if value is a valid Fdc3UserInterfaceChannelSelected. This checks the type against the json schema for the message and will be slower
+ * Returns true if value is a valid Fdc3UserInterfaceChannels. This checks the type against the json schema for the message and will be slower
  */
-export function isValidFdc3UserInterfaceChannelSelected(value: any): value is Fdc3UserInterfaceChannelSelected {
+export function isValidFdc3UserInterfaceChannels(value: any): value is Fdc3UserInterfaceChannels {
   try {
-    Convert.fdc3UserInterfaceChannelSelectedToJson(value);
+    Convert.fdc3UserInterfaceChannelsToJson(value);
     return true;
   } catch (_e: any) {
     return false;
   }
 }
 
-export const FDC3_USER_INTERFACE_CHANNEL_SELECTED_TYPE = 'Fdc3UserInterfaceChannelSelected';
+export const FDC3_USER_INTERFACE_CHANNELS_TYPE = 'Fdc3UserInterfaceChannels';
 
 /**
- * Returns true if the value has a type property with value 'Fdc3UserInterfaceChannels'. This is a fast check that does not check the format of the message
+ * Returns true if the value has a type property with value 'Fdc3UserInterfaceChannelSelected'. This is a fast check that does not check the format of the message
  */
-export function isFdc3UserInterfaceChannels(value: any): value is Fdc3UserInterfaceChannels {
-  return value != null && value.type === 'Fdc3UserInterfaceChannels';
+export function isFdc3UserInterfaceChannelSelected(value: any): value is Fdc3UserInterfaceChannelSelected {
+  return value != null && value.type === 'Fdc3UserInterfaceChannelSelected';
 }
 
 /**
- * Returns true if value is a valid Fdc3UserInterfaceChannels. This checks the type against the json schema for the message and will be slower
+ * Returns true if value is a valid Fdc3UserInterfaceChannelSelected. This checks the type against the json schema for the message and will be slower
  */
-export function isValidFdc3UserInterfaceChannels(value: any): value is Fdc3UserInterfaceChannels {
+export function isValidFdc3UserInterfaceChannelSelected(value: any): value is Fdc3UserInterfaceChannelSelected {
   try {
-    Convert.fdc3UserInterfaceChannelsToJson(value);
+    Convert.fdc3UserInterfaceChannelSelectedToJson(value);
     return true;
   } catch (_e: any) {
     return false;
   }
 }
 
-export const FDC3_USER_INTERFACE_CHANNELS_TYPE = 'Fdc3UserInterfaceChannels';
+export const FDC3_USER_INTERFACE_CHANNEL_SELECTED_TYPE = 'Fdc3UserInterfaceChannelSelected';
 
 /**
  * Returns true if the value has a type property with value 'Fdc3UserInterfaceDrag'. This is a fast check that does not check the format of the message
@@ -7931,3 +7756,178 @@ export function isValidRaiseIntentResultResponse(value: any): value is RaiseInte
 }
 
 export const RAISE_INTENT_RESULT_RESPONSE_TYPE = 'RaiseIntentResultResponse';
+
+/**
+ * Returns true if the value has a type property with value 'WCP1Hello'. This is a fast check that does not check the format of the message
+ */
+export function isWebConnectionProtocol1Hello(value: any): value is WebConnectionProtocol1Hello {
+  return value != null && value.type === 'WCP1Hello';
+}
+
+/**
+ * Returns true if value is a valid WebConnectionProtocol1Hello. This checks the type against the json schema for the message and will be slower
+ */
+export function isValidWebConnectionProtocol1Hello(value: any): value is WebConnectionProtocol1Hello {
+  try {
+    Convert.webConnectionProtocol1HelloToJson(value);
+    return true;
+  } catch (_e: any) {
+    return false;
+  }
+}
+
+export const WEB_CONNECTION_PROTOCOL1_HELLO_TYPE = 'WebConnectionProtocol1Hello';
+
+/**
+ * Returns true if the value has a type property with value 'WCP2LoadUrl'. This is a fast check that does not check the format of the message
+ */
+export function isWebConnectionProtocol2LoadURL(value: any): value is WebConnectionProtocol2LoadURL {
+  return value != null && value.type === 'WCP2LoadUrl';
+}
+
+/**
+ * Returns true if value is a valid WebConnectionProtocol2LoadURL. This checks the type against the json schema for the message and will be slower
+ */
+export function isValidWebConnectionProtocol2LoadURL(value: any): value is WebConnectionProtocol2LoadURL {
+  try {
+    Convert.webConnectionProtocol2LoadURLToJson(value);
+    return true;
+  } catch (_e: any) {
+    return false;
+  }
+}
+
+export const WEB_CONNECTION_PROTOCOL2_LOAD_U_R_L_TYPE = 'WebConnectionProtocol2LoadURL';
+
+/**
+ * Returns true if the value has a type property with value 'WCP3Handshake'. This is a fast check that does not check the format of the message
+ */
+export function isWebConnectionProtocol3Handshake(value: any): value is WebConnectionProtocol3Handshake {
+  return value != null && value.type === 'WCP3Handshake';
+}
+
+/**
+ * Returns true if value is a valid WebConnectionProtocol3Handshake. This checks the type against the json schema for the message and will be slower
+ */
+export function isValidWebConnectionProtocol3Handshake(value: any): value is WebConnectionProtocol3Handshake {
+  try {
+    Convert.webConnectionProtocol3HandshakeToJson(value);
+    return true;
+  } catch (_e: any) {
+    return false;
+  }
+}
+
+export const WEB_CONNECTION_PROTOCOL3_HANDSHAKE_TYPE = 'WebConnectionProtocol3Handshake';
+
+/**
+ * Returns true if the value has a type property with value 'WCP4ValidateAppIdentity'. This is a fast check that does not check the format of the message
+ */
+export function isWebConnectionProtocol4ValidateAppIdentity(
+  value: any
+): value is WebConnectionProtocol4ValidateAppIdentity {
+  return value != null && value.type === 'WCP4ValidateAppIdentity';
+}
+
+/**
+ * Returns true if value is a valid WebConnectionProtocol4ValidateAppIdentity. This checks the type against the json schema for the message and will be slower
+ */
+export function isValidWebConnectionProtocol4ValidateAppIdentity(
+  value: any
+): value is WebConnectionProtocol4ValidateAppIdentity {
+  try {
+    Convert.webConnectionProtocol4ValidateAppIdentityToJson(value);
+    return true;
+  } catch (_e: any) {
+    return false;
+  }
+}
+
+export const WEB_CONNECTION_PROTOCOL4_VALIDATE_APP_IDENTITY_TYPE = 'WebConnectionProtocol4ValidateAppIdentity';
+
+/**
+ * Returns true if the value has a type property with value 'WCP5ValidateAppIdentityFailedResponse'. This is a fast check that does not check the format of the message
+ */
+export function isWebConnectionProtocol5ValidateAppIdentityFailedResponse(
+  value: any
+): value is WebConnectionProtocol5ValidateAppIdentityFailedResponse {
+  return value != null && value.type === 'WCP5ValidateAppIdentityFailedResponse';
+}
+
+/**
+ * Returns true if value is a valid WebConnectionProtocol5ValidateAppIdentityFailedResponse. This checks the type against the json schema for the message and will be slower
+ */
+export function isValidWebConnectionProtocol5ValidateAppIdentityFailedResponse(
+  value: any
+): value is WebConnectionProtocol5ValidateAppIdentityFailedResponse {
+  try {
+    Convert.webConnectionProtocol5ValidateAppIdentityFailedResponseToJson(value);
+    return true;
+  } catch (_e: any) {
+    return false;
+  }
+}
+
+export const WEB_CONNECTION_PROTOCOL5_VALIDATE_APP_IDENTITY_FAILED_RESPONSE_TYPE =
+  'WebConnectionProtocol5ValidateAppIdentityFailedResponse';
+
+/**
+ * Returns true if the value has a type property with value 'WCP5ValidateAppIdentityResponse'. This is a fast check that does not check the format of the message
+ */
+export function isWebConnectionProtocol5ValidateAppIdentitySuccessResponse(
+  value: any
+): value is WebConnectionProtocol5ValidateAppIdentitySuccessResponse {
+  return value != null && value.type === 'WCP5ValidateAppIdentityResponse';
+}
+
+/**
+ * Returns true if value is a valid WebConnectionProtocol5ValidateAppIdentitySuccessResponse. This checks the type against the json schema for the message and will be slower
+ */
+export function isValidWebConnectionProtocol5ValidateAppIdentitySuccessResponse(
+  value: any
+): value is WebConnectionProtocol5ValidateAppIdentitySuccessResponse {
+  try {
+    Convert.webConnectionProtocol5ValidateAppIdentitySuccessResponseToJson(value);
+    return true;
+  } catch (_e: any) {
+    return false;
+  }
+}
+
+export const WEB_CONNECTION_PROTOCOL5_VALIDATE_APP_IDENTITY_SUCCESS_RESPONSE_TYPE =
+  'WebConnectionProtocol5ValidateAppIdentitySuccessResponse';
+
+/**
+ * Returns true if the value has a type property with value 'WCP6Goodbye'. This is a fast check that does not check the format of the message
+ */
+export function isWebConnectionProtocol6Goodbye(value: any): value is WebConnectionProtocol6Goodbye {
+  return value != null && value.type === 'WCP6Goodbye';
+}
+
+/**
+ * Returns true if value is a valid WebConnectionProtocol6Goodbye. This checks the type against the json schema for the message and will be slower
+ */
+export function isValidWebConnectionProtocol6Goodbye(value: any): value is WebConnectionProtocol6Goodbye {
+  try {
+    Convert.webConnectionProtocol6GoodbyeToJson(value);
+    return true;
+  } catch (_e: any) {
+    return false;
+  }
+}
+
+export const WEB_CONNECTION_PROTOCOL6_GOODBYE_TYPE = 'WebConnectionProtocol6Goodbye';
+
+/**
+ * Returns true if value is a valid WebConnectionProtocolMessage. This checks the type against the json schema for the message and will be slower
+ */
+export function isValidWebConnectionProtocolMessage(value: any): value is WebConnectionProtocolMessage {
+  try {
+    Convert.webConnectionProtocolMessageToJson(value);
+    return true;
+  } catch (_e: any) {
+    return false;
+  }
+}
+
+export const WEB_CONNECTION_PROTOCOL_MESSAGE_TYPE = 'WebConnectionProtocolMessage';
diff --git a/packages/fdc3-standard/src/api/DesktopAgent.ts b/packages/fdc3-standard/src/api/DesktopAgent.ts
index d97f99e62..1ad14cb8c 100644
--- a/packages/fdc3-standard/src/api/DesktopAgent.ts
+++ b/packages/fdc3-standard/src/api/DesktopAgent.ts
@@ -351,6 +351,66 @@ export interface DesktopAgent {
    */
   addIntentListener(intent: Intent, handler: IntentHandler): Promise<Listener>;
 
+  /**
+   * Adds a listener for incoming intents raised by other applications, via calls to `fdc3.raiseIntent` or `fdc3.raiseIntentForContext.  If the application is intended to be launched to resolve raised intents, it SHOULD add its intent listeners as quickly as possible after launch or an error MAY be returned to the caller and the intent and context may not be delivered. The exact timeout used is set by the Desktop Agent implementation, but MUST be at least 15 seconds.
+   *
+   * The handler function may return void or a promise that should resolve to an `IntentResult`, which is either a `Context` object, representing any data that should be returned to the app that raised the intent, a `Channel` Object, a `PrivateChannel` over which data responses will be sent, or `void`. The `IntentResult` will be returned to app that raised the intent via the `IntentResolution` and retrieved from it using the `getResult()` function.
+   *
+   * The Desktop Agent MUST reject the promise returned by the `getResult()` function of `IntentResolution` if: (1) the intent handling function's returned promise rejects, (2) the intent handling function doesn't return a promise, or (3) the returned promise resolves to an invalid type.
+   *
+   * The `PrivateChannel` type is provided to support synchronization of data transmitted over returned channels, by allowing both parties to listen for events denoting subscription and unsubscription from the returned channel. `PrivateChannels` are only retrievable via raising an intent.
+   *
+   * Optional metadata about the raised intent, including the app that originated the message, SHOULD be provided by the desktop agent implementation.
+   *
+   * ```javascript
+   * //Handle a raised intent
+   * const listener = fdc3.addIntentListenerWithContext('StartChat', 'fdc3.contact', context => {
+   *     // start chat has been requested by another application
+   *     return;
+   * });
+   *
+   * //Handle a raised intent and log the originating app metadata
+   * const listener = fdc3.addIntentListenerWithContext('StartChat', ['fdc3.contact', 'fdc3.contactList'], (contact, metadata) => {
+   *   console.log(`Received intent StartChat\nContext: ${contact}\nOriginating app: ${metadata?.source}`);
+   *   return;
+   * });
+   *
+   * //Handle a raised intent and return Context data via a promise
+   * fdc3.addIntentListenerWithContext('CreateOrder', 'fdc3.instrument', (context) => {
+   *     return new Promise<Context>((resolve) => {
+   *         // go create the order
+   *         resolve({type: "fdc3.order", id: { "orderId": 1234}});
+   *	   });
+   * });
+   *
+   * //Handle a raised intent and return a Private Channel over which response will be sent
+   * fdc3.addIntentListenerWithContext('QuoteStream', 'fdc3.instrument', async (context) => {
+   *   const channel: PrivateChannel = await fdc3.createPrivateChannel();
+   *   const symbol = context.id.symbol;
+   *
+   *   // Called when the remote side adds a context listener
+   *   const addContextListener = channel.onAddContextListener((contextType) => {
+   *     // broadcast price quotes as they come in from our quote feed
+   *     feed.onQuote(symbol, (price) => {
+   *       channel.broadcast({ type: "price", price});
+   *     });
+   *   });
+   *
+   *   // Stop the feed if the remote side closes
+   *   const disconnectListener = channel.onDisconnect(() => {
+   *     feed.stop(symbol);
+   *   });
+   *
+   *   return channel;
+   * });
+   * ```
+   */
+  addIntentListenerWithContext(
+    intent: Intent,
+    contextType: string | string[],
+    handler: IntentHandler
+  ): Promise<Listener>;
+
   /**
    * Adds a listener for incoming context broadcasts from the Desktop Agent (via a User channel or `fdc3.open`API call. If the consumer is only interested in a context of a particular type, they can they can specify that type. If the consumer is able to receive context of any type or will inspect types received, then they can pass `null` as the `contextType` parameter to receive all context types.
    *