@apollo/client-ai-apps 0.5.1 → 0.5.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.5.2 (2026-02-23)
+
+### Fixes
+
+#### Add fallback when `toolName` is not available from host context
+
+Provides a fallback in MCP apps to get the executed tool name from `_meta.toolName` when the host does not provide `toolInfo` from host context, or `structuredContent.toolName` when the host does not forward `_meta` to the connected application.
+
+#### Always use `window.openai.toolInput` to initialize the tool input value
+
+ChatGPT doesn't always send the `ui/notifications/tool-input` notification before we get `ui/notifications/tool-result`. Other times it sends the notification more than once. Because of the inconsistency, we can't always accurately get the correct tool input value using the notification by the time we get the `ui/notifications/tool-result` notification. This results in the wrong value for `variables` and incorrectly writes the query data to the cache.
+
+This fix falls back to get `toolInput` from `window.openai.toolInput` in ChatGPT apps after we receive the `ui/notification/tool-result` notification to ensure we have the correct tool input value.
+
 ## 0.5.1 (2026-02-19)
 
 ### Fixes

package/dist/core/types.d.ts

@@ -1,12 +1,18 @@
 import type { CallToolResult as McpCallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import type { FormattedExecutionResult } from "graphql";
 export declare namespace ApolloMcpServerApps {
+    interface Meta {
+        toolName: string;
+        [x: string]: unknown;
+    }
     interface StructuredContent {
         result: FormattedExecutionResult;
         prefetch?: Record<string, FormattedExecutionResult>;
+        toolName?: string;
         [x: string]: unknown;
     }
     interface CallToolResult extends McpCallToolResult {
+        _meta?: ApolloMcpServerApps.Meta;
         structuredContent: ApolloMcpServerApps.StructuredContent;
     }
 }

package/dist/core/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,IAAI,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC9F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAExD,yBAAiB,mBAAmB,CAAC;IACnC,UAAiB,iBAAiB;QAChC,MAAM,EAAE,wBAAwB,CAAC;QACjC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;QACpD,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;KACtB;IAED,UAAiB,cAAe,SAAQ,iBAAiB;QACvD,iBAAiB,EAAE,mBAAmB,CAAC,iBAAiB,CAAC;KAC1D;CACF"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,IAAI,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC9F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAExD,yBAAiB,mBAAmB,CAAC;IACnC,UAAiB,IAAI;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;KACtB;IAED,UAAiB,iBAAiB;QAChC,MAAM,EAAE,wBAAwB,CAAC;QACjC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;QACpD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;KACtB;IAED,UAAiB,cAAe,SAAQ,iBAAiB;QACvD,KAAK,CAAC,EAAE,mBAAmB,CAAC,IAAI,CAAC;QACjC,iBAAiB,EAAE,mBAAmB,CAAC,iBAAiB,CAAC;KAC1D;CACF"}

package/dist/core/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { CallToolResult as McpCallToolResult } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { FormattedExecutionResult } from \"graphql\";\n\nexport namespace ApolloMcpServerApps {\n  export interface StructuredContent {\n    result: FormattedExecutionResult;\n    prefetch?: Record<string, FormattedExecutionResult>;\n    [x: string]: unknown;\n  }\n\n  export interface CallToolResult extends McpCallToolResult {\n    structuredContent: ApolloMcpServerApps.StructuredContent;\n  }\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { CallToolResult as McpCallToolResult } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { FormattedExecutionResult } from \"graphql\";\n\nexport namespace ApolloMcpServerApps {\n  export interface Meta {\n    toolName: string;\n    [x: string]: unknown;\n  }\n\n  export interface StructuredContent {\n    result: FormattedExecutionResult;\n    prefetch?: Record<string, FormattedExecutionResult>;\n    toolName?: string;\n    [x: string]: unknown;\n  }\n\n  export interface CallToolResult extends McpCallToolResult {\n    _meta?: ApolloMcpServerApps.Meta;\n    structuredContent: ApolloMcpServerApps.StructuredContent;\n  }\n}\n"]}

package/dist/mcp/core/McpAppManager.d.ts

@@ -2,19 +2,14 @@ import { App } from "@modelcontextprotocol/ext-apps";
 import type { ApplicationManifest } from "../../types/application-manifest";
 import type { FormattedExecutionResult } from "graphql";
 import type { DocumentNode, OperationVariables } from "@apollo/client";
+import type { ApolloMcpServerApps } from "../../core/types";
 /** @internal */
 export declare class McpAppManager {
     #private;
     readonly app: App;
     constructor(manifest: ApplicationManifest);
     get toolName(): string | undefined;
-    get toolMetadata(): {
-        [x: string]: unknown;
-        progressToken?: string | number | undefined;
-        "io.modelcontextprotocol/related-task"?: {
-            taskId: string;
-        } | undefined;
-    } | undefined;
+    get toolMetadata(): ApolloMcpServerApps.Meta | undefined;
     get toolInput(): Record<string, unknown> | undefined;
     waitForInitialization: (() => Promise<{
         toolName: string | undefined;

package/dist/mcp/core/McpAppManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"McpAppManager.d.ts","sourceRoot":"","sources":["../../../src/mcp/core/McpAppManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAwB,MAAM,gCAAgC,CAAC;AAE3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AASvE,gBAAgB;AAChB,qBAAa,aAAa;;IACxB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;gBAMN,QAAQ,EAAE,mBAAmB;IAIzC,IAAI,QAAQ,uBAEX;IAED,IAAI,YAAY;;;;;;kBAEf;IAED,IAAI,SAAS,wCAEZ;IAED,qBAAqB;;;;;;;MA4BlB;IAEH,KAAK;IAIC,YAAY,CAAC,EACjB,KAAK,EACL,SAAS,GACV,EAAE;QACD,KAAK,EAAE,YAAY,CAAC;QACpB,SAAS,EAAE,kBAAkB,GAAG,SAAS,CAAC;KAC3C;YASa,OAAO;CAWtB"}
+{"version":3,"file":"McpAppManager.d.ts","sourceRoot":"","sources":["../../../src/mcp/core/McpAppManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAwB,MAAM,gCAAgC,CAAC;AAE3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAM5D,gBAAgB;AAChB,qBAAa,aAAa;;IACxB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;gBAMN,QAAQ,EAAE,mBAAmB;IAIzC,IAAI,QAAQ,uBAEX;IAED,IAAI,YAAY,yCAEf;IAED,IAAI,SAAS,wCAEZ;IAED,qBAAqB;;;;;;;MAqClB;IAEH,KAAK;IAIC,YAAY,CAAC,EACjB,KAAK,EACL,SAAS,GACV,EAAE;QACD,KAAK,EAAE,YAAY,CAAC;QACpB,SAAS,EAAE,kBAAkB,GAAG,SAAS,CAAC;KAC3C;YASa,OAAO;CAWtB"}

package/dist/mcp/core/McpAppManager.js

@@ -31,7 +31,16 @@ export class McpAppManager {
         await this.connect();
         const { structuredContent, _meta } = await toolResult.promise;
         const { arguments: args } = await toolInput.promise;
-        this.#toolName = this.app.getHostContext()?.toolInfo?.tool.name;
+        // Some hosts do not provide toolInfo in the ui/initialize response, so we
+        // fallback to `_meta.toolName` provided by Apollo MCP server if the value
+        // is not available.
+        this.#toolName =
+            this.app.getHostContext()?.toolInfo?.tool.name ??
+                _meta?.toolName ??
+                // Some hosts do not forward `_meta` nor do they provide `toolInfo`. Our
+                // MCP server provides `toolName` in `structuredContent` as a workaround
+                // that we can use if all else fails
+                structuredContent.toolName;
         this.#toolMetadata = _meta;
         this.#toolInput = args;
         return {

package/dist/mcp/core/McpAppManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"McpAppManager.js","sourceRoot":"","sources":["../../../src/mcp/core/McpAppManager.ts"],"names":[],"mappings":"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","sourcesContent":["import { App, PostMessageTransport } from \"@modelcontextprotocol/ext-apps\";\nimport type { CallToolResult } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { ApplicationManifest } from \"../../types/application-manifest\";\nimport type { FormattedExecutionResult } from \"graphql\";\nimport type { DocumentNode, OperationVariables } from \"@apollo/client\";\nimport { print } from \"@apollo/client/utilities\";\nimport { cacheAsync, promiseWithResolvers } from \"../../utilities\";\nimport type { ApolloMcpServerApps } from \"../../core/types\";\n\ntype ExecuteQueryCallToolResult = Omit<CallToolResult, \"structuredContent\"> & {\n  structuredContent: FormattedExecutionResult;\n};\n\n/** @internal */\nexport class McpAppManager {\n  readonly app: App;\n\n  #toolName: string | undefined;\n  #toolMetadata: ApolloMcpServerApps.CallToolResult[\"_meta\"];\n  #toolInput: Record<string, unknown> | undefined;\n\n  constructor(manifest: ApplicationManifest) {\n    this.app = new App({ name: manifest.name, version: manifest.appVersion });\n  }\n\n  get toolName() {\n    return this.#toolName;\n  }\n\n  get toolMetadata() {\n    return this.#toolMetadata;\n  }\n\n  get toolInput() {\n    return this.#toolInput;\n  }\n\n  waitForInitialization = cacheAsync(async () => {\n    let toolResult = promiseWithResolvers<ApolloMcpServerApps.CallToolResult>();\n    let toolInput = promiseWithResolvers<Parameters<App[\"ontoolinput\"]>[0]>();\n\n    this.app.ontoolresult = (params) => {\n      toolResult.resolve(\n        params as unknown as ApolloMcpServerApps.CallToolResult\n      );\n    };\n\n    this.app.ontoolinput = (params) => {\n      toolInput.resolve(params);\n    };\n\n    await this.connect();\n\n    const { structuredContent, _meta } = await toolResult.promise;\n    const { arguments: args } = await toolInput.promise;\n\n    this.#toolName = this.app.getHostContext()?.toolInfo?.tool.name;\n    this.#toolMetadata = _meta;\n    this.#toolInput = args;\n\n    return {\n      ...structuredContent,\n      toolName: this.toolName,\n      args,\n    };\n  });\n\n  close() {\n    return this.app.close();\n  }\n\n  async executeQuery({\n    query,\n    variables,\n  }: {\n    query: DocumentNode;\n    variables: OperationVariables | undefined;\n  }) {\n    const result = (await this.app.callServerTool({\n      name: \"execute\",\n      arguments: { query: print(query), variables },\n    })) as ExecuteQueryCallToolResult;\n\n    return result.structuredContent;\n  }\n\n  private async connect() {\n    try {\n      return await this.app.connect(\n        new PostMessageTransport(window.parent, window.parent)\n      );\n    } catch (e) {\n      const error = e instanceof Error ? e : new Error(\"Failed to connect\");\n\n      throw error;\n    }\n  }\n}\n"]}
+{"version":3,"file":"McpAppManager.js","sourceRoot":"","sources":["../../../src/mcp/core/McpAppManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAK3E,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAOnE,gBAAgB;AAChB,MAAM,OAAO,aAAa;IACf,GAAG,CAAM;IAElB,SAAS,CAAqB;IAC9B,aAAa,CAA0D;IACvE,UAAU,CAAsC;IAEhD,YAAY,QAA6B;QACvC,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,qBAAqB,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QAC5C,IAAI,UAAU,GAAG,oBAAoB,EAAsC,CAAC;QAC5E,IAAI,SAAS,GAAG,oBAAoB,EAAqC,CAAC;QAE1E,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,CAAC,MAAM,EAAE,EAAE;YACjC,UAAU,CAAC,OAAO,CAChB,MAAuD,CACxD,CAAC;QACJ,CAAC,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,MAAM,EAAE,EAAE;YAChC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC,CAAC;QAEF,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAErB,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9D,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC;QAEpD,0EAA0E;QAC1E,0EAA0E;QAC1E,oBAAoB;QACpB,IAAI,CAAC,SAAS;YACZ,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI;gBAC9C,KAAK,EAAE,QAAQ;gBACf,wEAAwE;gBACxE,wEAAwE;gBACxE,oCAAoC;gBACpC,iBAAiB,CAAC,QAAQ,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAEvB,OAAO;YACL,GAAG,iBAAiB;YACpB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI;SACL,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,KAAK;QACH,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EACjB,KAAK,EACL,SAAS,GAIV;QACC,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC;YAC5C,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE;SAC9C,CAAC,CAA+B,CAAC;QAElC,OAAO,MAAM,CAAC,iBAAiB,CAAC;IAClC,CAAC;IAEO,KAAK,CAAC,OAAO;QACnB,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAC3B,IAAI,oBAAoB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CACvD,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;YAEtE,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;CACF","sourcesContent":["import { App, PostMessageTransport } from \"@modelcontextprotocol/ext-apps\";\nimport type { CallToolResult } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { ApplicationManifest } from \"../../types/application-manifest\";\nimport type { FormattedExecutionResult } from \"graphql\";\nimport type { DocumentNode, OperationVariables } from \"@apollo/client\";\nimport { print } from \"@apollo/client/utilities\";\nimport { cacheAsync, promiseWithResolvers } from \"../../utilities\";\nimport type { ApolloMcpServerApps } from \"../../core/types\";\n\ntype ExecuteQueryCallToolResult = Omit<CallToolResult, \"structuredContent\"> & {\n  structuredContent: FormattedExecutionResult;\n};\n\n/** @internal */\nexport class McpAppManager {\n  readonly app: App;\n\n  #toolName: string | undefined;\n  #toolMetadata: ApolloMcpServerApps.CallToolResult[\"_meta\"] | undefined;\n  #toolInput: Record<string, unknown> | undefined;\n\n  constructor(manifest: ApplicationManifest) {\n    this.app = new App({ name: manifest.name, version: manifest.appVersion });\n  }\n\n  get toolName() {\n    return this.#toolName;\n  }\n\n  get toolMetadata() {\n    return this.#toolMetadata;\n  }\n\n  get toolInput() {\n    return this.#toolInput;\n  }\n\n  waitForInitialization = cacheAsync(async () => {\n    let toolResult = promiseWithResolvers<ApolloMcpServerApps.CallToolResult>();\n    let toolInput = promiseWithResolvers<Parameters<App[\"ontoolinput\"]>[0]>();\n\n    this.app.ontoolresult = (params) => {\n      toolResult.resolve(\n        params as unknown as ApolloMcpServerApps.CallToolResult\n      );\n    };\n\n    this.app.ontoolinput = (params) => {\n      toolInput.resolve(params);\n    };\n\n    await this.connect();\n\n    const { structuredContent, _meta } = await toolResult.promise;\n    const { arguments: args } = await toolInput.promise;\n\n    // Some hosts do not provide toolInfo in the ui/initialize response, so we\n    // fallback to `_meta.toolName` provided by Apollo MCP server if the value\n    // is not available.\n    this.#toolName =\n      this.app.getHostContext()?.toolInfo?.tool.name ??\n      _meta?.toolName ??\n      // Some hosts do not forward `_meta` nor do they provide `toolInfo`. Our\n      // MCP server provides `toolName` in `structuredContent` as a workaround\n      // that we can use if all else fails\n      structuredContent.toolName;\n    this.#toolMetadata = _meta;\n    this.#toolInput = args;\n\n    return {\n      ...structuredContent,\n      toolName: this.toolName,\n      args,\n    };\n  });\n\n  close() {\n    return this.app.close();\n  }\n\n  async executeQuery({\n    query,\n    variables,\n  }: {\n    query: DocumentNode;\n    variables: OperationVariables | undefined;\n  }) {\n    const result = (await this.app.callServerTool({\n      name: \"execute\",\n      arguments: { query: print(query), variables },\n    })) as ExecuteQueryCallToolResult;\n\n    return result.structuredContent;\n  }\n\n  private async connect() {\n    try {\n      return await this.app.connect(\n        new PostMessageTransport(window.parent, window.parent)\n      );\n    } catch (e) {\n      const error = e instanceof Error ? e : new Error(\"Failed to connect\");\n\n      throw error;\n    }\n  }\n}\n"]}

package/dist/mcp/react/hooks/useToolMetadata.d.ts

@@ -1,8 +1,2 @@
-export declare function useToolMetadata(): {
-    [x: string]: unknown;
-    progressToken?: string | number | undefined;
-    "io.modelcontextprotocol/related-task"?: {
-        taskId: string;
-    } | undefined;
-} | undefined;
+export declare function useToolMetadata(): import("../../../core/types.js").ApolloMcpServerApps.Meta | undefined;
 //# sourceMappingURL=useToolMetadata.d.ts.map

package/dist/mcp/react/hooks/useToolMetadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useToolMetadata.d.ts","sourceRoot":"","sources":["../../../../src/mcp/react/hooks/useToolMetadata.ts"],"names":[],"mappings":"AAEA,wBAAgB,eAAe;;;;;;cAE9B"}
+{"version":3,"file":"useToolMetadata.d.ts","sourceRoot":"","sources":["../../../../src/mcp/react/hooks/useToolMetadata.ts"],"names":[],"mappings":"AAEA,wBAAgB,eAAe,0EAE9B"}

package/dist/openai/core/McpAppManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"McpAppManager.d.ts","sourceRoot":"","sources":["../../../src/openai/core/McpAppManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAwB,MAAM,gCAAgC,CAAC;AAE3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AASvE,gBAAgB;AAChB,qBAAa,aAAa;;IACxB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;gBAMN,QAAQ,EAAE,mBAAmB;IAIzC,IAAI,QAAQ,uBAEX;IAED,IAAI,YAAY,mCAEf;IAED,IAAI,SAAS,wCAEZ;IAED,qBAAqB;;;;;;;MAwClB;IAEH,KAAK;IAIC,YAAY,CAAC,EACjB,KAAK,EACL,SAAS,GACV,EAAE;QACD,KAAK,EAAE,YAAY,CAAC;QACpB,SAAS,EAAE,kBAAkB,GAAG,SAAS,CAAC;KAC3C;YASa,OAAO;CAWtB"}
+{"version":3,"file":"McpAppManager.d.ts","sourceRoot":"","sources":["../../../src/openai/core/McpAppManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAwB,MAAM,gCAAgC,CAAC;AAE3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AASvE,gBAAgB;AAChB,qBAAa,aAAa;;IACxB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;gBAMN,QAAQ,EAAE,mBAAmB;IAIzC,IAAI,QAAQ,uBAEX;IAED,IAAI,YAAY,mCAEf;IAED,IAAI,SAAS,wCAEZ;IAED,qBAAqB;;;;;;;MAqClB;IAEH,KAAK;IAIC,YAAY,CAAC,EACjB,KAAK,EACL,SAAS,GACV,EAAE;QACD,KAAK,EAAE,YAAY,CAAC;QACpB,SAAS,EAAE,kBAAkB,GAAG,SAAS,CAAC;KAC3C;YASa,OAAO;CAWtB"}

package/dist/openai/core/McpAppManager.js

@@ -21,33 +21,31 @@ export class McpAppManager {
     }
     waitForInitialization = cacheAsync(async () => {
         let toolResult = promiseWithResolvers();
-        let toolInput = promiseWithResolvers();
         this.app.ontoolresult = (params) => {
             toolResult.resolve(params);
-            // OpenAI is not consistent about sending `ui/notifications/tool-input`
-            // before we get the rool result (which should happen according to the
-            // spec). We resolve this promise in case it wasn't sent to avoid stalling
-            // initialization indefinitely.
-            //
-            // When OpenAI fixes this issue and sends `ui/notifications/tool-input`
-            // consistently, this can be removed.
-            toolInput.resolve({});
-        };
-        this.app.ontoolinput = (params) => {
-            toolInput.resolve(params);
         };
         await this.connect();
         const { structuredContent } = await toolResult.promise;
-        const { arguments: args } = await toolInput.promise;
         this.#toolName = this.app.getHostContext()?.toolInfo?.tool.name;
-        this.#toolInput = args;
+        // OpenAI is not consistent about sending `ui/notifications/tool-input`.
+        // Sometimes it doesn't send at all, other times it sends more than once
+        // before we get the tool result (which should always happen and at most
+        // once according to the spec). Rather than relying on the
+        // `ui/notifications/tool-input` notification to set the tool input value,
+        // we read from `window.openai.toolInput so that we hvae the most recent
+        // set value.
+        //
+        // When OpenAI fixes this issue and sends `ui/notifications/tool-input`
+        // consistently according to the MCP Apps specification, this can be
+        // reverrted to use the `app.ontoolinput` callback.
+        this.#toolInput = window.openai.toolInput;
         // OpenAI doesn't provide access to `_meta`, so we need to use
         // window.openai.toolResponseMetadata directly
         this.#toolMetadata = window.openai.toolResponseMetadata;
         return {
             ...structuredContent,
             toolName: this.toolName,
-            args,
+            args: this.toolInput,
         };
     });
     close() {

package/dist/openai/core/McpAppManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"McpAppManager.js","sourceRoot":"","sources":["../../../src/openai/core/McpAppManager.ts"],"names":[],"mappings":"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","sourcesContent":["import { App, PostMessageTransport } from \"@modelcontextprotocol/ext-apps\";\nimport type { CallToolResult } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { ApplicationManifest } from \"../../types/application-manifest\";\nimport type { FormattedExecutionResult } from \"graphql\";\nimport type { DocumentNode, OperationVariables } from \"@apollo/client\";\nimport { print } from \"@apollo/client/utilities\";\nimport { cacheAsync, promiseWithResolvers } from \"../../utilities\";\nimport type { ApolloMcpServerApps } from \"../../core/types\";\n\ntype ExecuteQueryCallToolResult = Omit<CallToolResult, \"structuredContent\"> & {\n  structuredContent: FormattedExecutionResult;\n};\n\n/** @internal */\nexport class McpAppManager {\n  readonly app: App;\n\n  #toolName: string | undefined;\n  #toolMetadata: Record<string, unknown> | null = null;\n  #toolInput: Record<string, unknown> | undefined;\n\n  constructor(manifest: ApplicationManifest) {\n    this.app = new App({ name: manifest.name, version: manifest.appVersion });\n  }\n\n  get toolName() {\n    return this.#toolName;\n  }\n\n  get toolMetadata() {\n    return this.#toolMetadata;\n  }\n\n  get toolInput() {\n    return this.#toolInput;\n  }\n\n  waitForInitialization = cacheAsync(async () => {\n    let toolResult = promiseWithResolvers<ApolloMcpServerApps.CallToolResult>();\n    let toolInput = promiseWithResolvers<Parameters<App[\"ontoolinput\"]>[0]>();\n\n    this.app.ontoolresult = (params) => {\n      toolResult.resolve(\n        params as unknown as ApolloMcpServerApps.CallToolResult\n      );\n\n      // OpenAI is not consistent about sending `ui/notifications/tool-input`\n      // before we get the rool result (which should happen according to the\n      // spec). We resolve this promise in case it wasn't sent to avoid stalling\n      // initialization indefinitely.\n      //\n      // When OpenAI fixes this issue and sends `ui/notifications/tool-input`\n      // consistently, this can be removed.\n      toolInput.resolve({});\n    };\n\n    this.app.ontoolinput = (params) => {\n      toolInput.resolve(params);\n    };\n\n    await this.connect();\n\n    const { structuredContent } = await toolResult.promise;\n    const { arguments: args } = await toolInput.promise;\n\n    this.#toolName = this.app.getHostContext()?.toolInfo?.tool.name;\n    this.#toolInput = args;\n\n    // OpenAI doesn't provide access to `_meta`, so we need to use\n    // window.openai.toolResponseMetadata directly\n    this.#toolMetadata = window.openai.toolResponseMetadata;\n\n    return {\n      ...structuredContent,\n      toolName: this.toolName,\n      args,\n    };\n  });\n\n  close() {\n    return this.app.close();\n  }\n\n  async executeQuery({\n    query,\n    variables,\n  }: {\n    query: DocumentNode;\n    variables: OperationVariables | undefined;\n  }) {\n    const result = (await this.app.callServerTool({\n      name: \"execute\",\n      arguments: { query: print(query), variables },\n    })) as ExecuteQueryCallToolResult;\n\n    return result.structuredContent;\n  }\n\n  private async connect() {\n    try {\n      return await this.app.connect(\n        new PostMessageTransport(window.parent, window.parent)\n      );\n    } catch (e) {\n      const error = e instanceof Error ? e : new Error(\"Failed to connect\");\n\n      throw error;\n    }\n  }\n}\n"]}
+{"version":3,"file":"McpAppManager.js","sourceRoot":"","sources":["../../../src/openai/core/McpAppManager.ts"],"names":[],"mappings":"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","sourcesContent":["import { App, PostMessageTransport } from \"@modelcontextprotocol/ext-apps\";\nimport type { CallToolResult } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { ApplicationManifest } from \"../../types/application-manifest\";\nimport type { FormattedExecutionResult } from \"graphql\";\nimport type { DocumentNode, OperationVariables } from \"@apollo/client\";\nimport { print } from \"@apollo/client/utilities\";\nimport { cacheAsync, promiseWithResolvers } from \"../../utilities\";\nimport type { ApolloMcpServerApps } from \"../../core/types\";\n\ntype ExecuteQueryCallToolResult = Omit<CallToolResult, \"structuredContent\"> & {\n  structuredContent: FormattedExecutionResult;\n};\n\n/** @internal */\nexport class McpAppManager {\n  readonly app: App;\n\n  #toolName: string | undefined;\n  #toolMetadata: Record<string, unknown> | null = null;\n  #toolInput: Record<string, unknown> | undefined;\n\n  constructor(manifest: ApplicationManifest) {\n    this.app = new App({ name: manifest.name, version: manifest.appVersion });\n  }\n\n  get toolName() {\n    return this.#toolName;\n  }\n\n  get toolMetadata() {\n    return this.#toolMetadata;\n  }\n\n  get toolInput() {\n    return this.#toolInput;\n  }\n\n  waitForInitialization = cacheAsync(async () => {\n    let toolResult = promiseWithResolvers<ApolloMcpServerApps.CallToolResult>();\n\n    this.app.ontoolresult = (params) => {\n      toolResult.resolve(\n        params as unknown as ApolloMcpServerApps.CallToolResult\n      );\n    };\n\n    await this.connect();\n\n    const { structuredContent } = await toolResult.promise;\n\n    this.#toolName = this.app.getHostContext()?.toolInfo?.tool.name;\n\n    // OpenAI is not consistent about sending `ui/notifications/tool-input`.\n    // Sometimes it doesn't send at all, other times it sends more than once\n    // before we get the tool result (which should always happen and at most\n    // once according to the spec). Rather than relying on the\n    // `ui/notifications/tool-input` notification to set the tool input value,\n    // we read from `window.openai.toolInput so that we hvae the most recent\n    // set value.\n    //\n    // When OpenAI fixes this issue and sends `ui/notifications/tool-input`\n    // consistently according to the MCP Apps specification, this can be\n    // reverrted to use the `app.ontoolinput` callback.\n    this.#toolInput = window.openai.toolInput;\n\n    // OpenAI doesn't provide access to `_meta`, so we need to use\n    // window.openai.toolResponseMetadata directly\n    this.#toolMetadata = window.openai.toolResponseMetadata;\n\n    return {\n      ...structuredContent,\n      toolName: this.toolName,\n      args: this.toolInput,\n    };\n  });\n\n  close() {\n    return this.app.close();\n  }\n\n  async executeQuery({\n    query,\n    variables,\n  }: {\n    query: DocumentNode;\n    variables: OperationVariables | undefined;\n  }) {\n    const result = (await this.app.callServerTool({\n      name: \"execute\",\n      arguments: { query: print(query), variables },\n    })) as ExecuteQueryCallToolResult;\n\n    return result.structuredContent;\n  }\n\n  private async connect() {\n    try {\n      return await this.app.connect(\n        new PostMessageTransport(window.parent, window.parent)\n      );\n    } catch (e) {\n      const error = e instanceof Error ? e : new Error(\"Failed to connect\");\n\n      throw error;\n    }\n  }\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://www.schemastore.org/package.json",
   "name": "@apollo/client-ai-apps",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "publishConfig": {
     "access": "public"
   },

package/src/core/types.ts

@@ -2,13 +2,20 @@ import type { CallToolResult as McpCallToolResult } from "@modelcontextprotocol/
 import type { FormattedExecutionResult } from "graphql";
 
 export namespace ApolloMcpServerApps {
+  export interface Meta {
+    toolName: string;
+    [x: string]: unknown;
+  }
+
   export interface StructuredContent {
     result: FormattedExecutionResult;
     prefetch?: Record<string, FormattedExecutionResult>;
+    toolName?: string;
     [x: string]: unknown;
   }
 
   export interface CallToolResult extends McpCallToolResult {
+    _meta?: ApolloMcpServerApps.Meta;
     structuredContent: ApolloMcpServerApps.StructuredContent;
   }
 }

package/src/mcp/core/McpAppManager.ts

@@ -16,7 +16,7 @@ export class McpAppManager {
   readonly app: App;
 
   #toolName: string | undefined;
-  #toolMetadata: ApolloMcpServerApps.CallToolResult["_meta"];
+  #toolMetadata: ApolloMcpServerApps.CallToolResult["_meta"] | undefined;
   #toolInput: Record<string, unknown> | undefined;
 
   constructor(manifest: ApplicationManifest) {
@@ -54,7 +54,16 @@ export class McpAppManager {
     const { structuredContent, _meta } = await toolResult.promise;
     const { arguments: args } = await toolInput.promise;
 
-    this.#toolName = this.app.getHostContext()?.toolInfo?.tool.name;
+    // Some hosts do not provide toolInfo in the ui/initialize response, so we
+    // fallback to `_meta.toolName` provided by Apollo MCP server if the value
+    // is not available.
+    this.#toolName =
+      this.app.getHostContext()?.toolInfo?.tool.name ??
+      _meta?.toolName ??
+      // Some hosts do not forward `_meta` nor do they provide `toolInfo`. Our
+      // MCP server provides `toolName` in `structuredContent` as a workaround
+      // that we can use if all else fails
+      structuredContent.toolName;
     this.#toolMetadata = _meta;
     this.#toolInput = args;
 

package/src/mcp/link/__tests__/ToolCallLink.test.ts

@@ -3,6 +3,7 @@ import { gql, InMemoryCache } from "@apollo/client";
 import { execute } from "@apollo/client/link";
 import { ApolloClient } from "../../core/ApolloClient.js";
 import {
+  minimalHostContextWithToolName,
   mockApplicationManifest,
   mockMcpHost,
   ObservableStream,
@@ -23,15 +24,23 @@ test("delegates query execution to MCP host", async () => {
     manifest: mockApplicationManifest(),
   });
 
-  using host = await mockMcpHost();
+  using host = await mockMcpHost({
+    hostContext: minimalHostContextWithToolName("GetProduct"),
+  });
   host.onCleanup(() => client.stop());
 
+  host.sendToolInput({ arguments: {} });
   host.sendToolResult({
     _meta: { toolName: "GetProduct" },
     content: [],
-    structuredContent: {},
+    structuredContent: {
+      result: {
+        data: {
+          product: null,
+        },
+      },
+    },
   });
-  host.sendToolInput({ arguments: {} });
 
   host.mockToolCall("execute", () => ({
     content: [],

package/src/openai/core/McpAppManager.ts

@@ -37,34 +37,31 @@ export class McpAppManager {
 
   waitForInitialization = cacheAsync(async () => {
     let toolResult = promiseWithResolvers<ApolloMcpServerApps.CallToolResult>();
-    let toolInput = promiseWithResolvers<Parameters<App["ontoolinput"]>[0]>();
 
     this.app.ontoolresult = (params) => {
       toolResult.resolve(
         params as unknown as ApolloMcpServerApps.CallToolResult
       );
-
-      // OpenAI is not consistent about sending `ui/notifications/tool-input`
-      // before we get the rool result (which should happen according to the
-      // spec). We resolve this promise in case it wasn't sent to avoid stalling
-      // initialization indefinitely.
-      //
-      // When OpenAI fixes this issue and sends `ui/notifications/tool-input`
-      // consistently, this can be removed.
-      toolInput.resolve({});
-    };
-
-    this.app.ontoolinput = (params) => {
-      toolInput.resolve(params);
     };
 
     await this.connect();
 
     const { structuredContent } = await toolResult.promise;
-    const { arguments: args } = await toolInput.promise;
 
     this.#toolName = this.app.getHostContext()?.toolInfo?.tool.name;
-    this.#toolInput = args;
+
+    // OpenAI is not consistent about sending `ui/notifications/tool-input`.
+    // Sometimes it doesn't send at all, other times it sends more than once
+    // before we get the tool result (which should always happen and at most
+    // once according to the spec). Rather than relying on the
+    // `ui/notifications/tool-input` notification to set the tool input value,
+    // we read from `window.openai.toolInput so that we hvae the most recent
+    // set value.
+    //
+    // When OpenAI fixes this issue and sends `ui/notifications/tool-input`
+    // consistently according to the MCP Apps specification, this can be
+    // reverrted to use the `app.ontoolinput` callback.
+    this.#toolInput = window.openai.toolInput;
 
     // OpenAI doesn't provide access to `_meta`, so we need to use
     // window.openai.toolResponseMetadata directly
@@ -73,7 +70,7 @@ export class McpAppManager {
     return {
       ...structuredContent,
       toolName: this.toolName,
-      args,
+      args: this.toolInput,
     };
   });
 

package/src/openai/core/__tests__/ApolloClient.test.ts

@@ -92,7 +92,7 @@ describe("Client Basics", () => {
 
 describe("prefetchData", () => {
   test("caches tool response when data is provided", async () => {
-    stubOpenAiGlobals();
+    stubOpenAiGlobals({ toolInput: { id: 1 } });
     using _ = spyOnConsole("debug");
     const client = new ApolloClient({
       cache: new InMemoryCache(),
@@ -148,7 +148,7 @@ describe("prefetchData", () => {
   });
 
   test("caches prefetched data when prefetched data is provided", async () => {
-    stubOpenAiGlobals();
+    stubOpenAiGlobals({ toolInput: { id: 1 } });
     using _ = spyOnConsole("debug");
     const client = new ApolloClient({
       cache: new InMemoryCache(),
@@ -226,7 +226,7 @@ describe("prefetchData", () => {
   });
 
   test("caches both prefetch and tool response when both are provided", async () => {
-    stubOpenAiGlobals();
+    stubOpenAiGlobals({ toolInput: { id: 1 } });
     using _ = spyOnConsole("debug");
     const client = new ApolloClient({
       cache: new InMemoryCache(),
@@ -343,7 +343,7 @@ describe("prefetchData", () => {
   });
 
   test("excludes extra inputs when writing to cache", async () => {
-    stubOpenAiGlobals();
+    stubOpenAiGlobals({ toolInput: { id: 1, myOtherThing: 2 } });
     using _ = spyOnConsole("debug");
     const client = new ApolloClient({
       cache: new InMemoryCache(),

package/src/openai/react/hooks/__tests__/useToolInput.test.tsx

@@ -21,7 +21,7 @@ afterEach(() => {
 
 test("returns the tool input from the MCP host", async () => {
   using _ = spyOnConsole("debug");
-  stubOpenAiGlobals({ toolResponseMetadata: {} });
+  stubOpenAiGlobals({ toolResponseMetadata: {}, toolInput: { id: "1" } });
   const client = new ApolloClient({
     cache: new InMemoryCache(),
     manifest: mockApplicationManifest(),