feat: replace McpAdapter with thin Scope3McpClient#130
Merged
EmmaLouise2018 merged 8 commits intomainfrom Apr 1, 2026
Merged
Conversation
The McpAdapter wrapped callTool in request() in typed resource methods — 3 layers of indirection over what the MCP server already provides. MCP consumers already have an MCP client; the server handles auth, routing, and validation. The SDK was an unnecessary abstraction layer. New architecture: - Scope3McpClient: thin connection helper (auth + URL) with direct callTool/readResource/listTools passthroughs - Scope3Client: REST-only, keeps typed resource methods where they make sense (humans, CLI, programmatic REST use) Net -490 lines.
- Fix reconnect lifecycle: recreate transport/client in doConnect(), reset all state in disconnect() via finally block - Add sanitizeForLogging to callTool debug output (security regression) - Remove unused persona/version from Scope3McpClientConfig - Use ListToolsResult from MCP SDK instead of lossy inline type - Validate and trim apiKey (reject whitespace-only) - Update README.md and docs/getting-started.md (remove stale adapter refs) - Add 7 new tests: reconnect, error handling, concurrency
…est coverage - Fix reporting validation bug (discarded return value) - Add apiKey trimming and exhaustive persona switch in client - Block path traversal (..) in validateResourceId - Fix empty path in Zod error formatting - Add 9 resource test suites (agents, bundles, campaigns, etc.) - Expand base adapter tests (validateResourceId, sanitizeForLogging) - Expand REST adapter, client, and webhook-server tests - 364 tests across 24 suites, all passing
Replaces the partner persona with storefront across the entire SDK. Adds all missing buyer resources (event sources, measurement data, catalogs, audiences, syndication, tasks, property lists, creatives) and storefront resources (storefront CRUD, inventory sources, readiness, billing, notifications). Syncs bundled skill.md with live API.
…2 API Add unit tests for all 8 new buyer resources (event sources, measurement data, catalogs, audiences, syndication, tasks, property lists, creatives). Rename partner workflow scripts to storefront. Update buyer guide with new resource documentation. Fix all remaining partner references.
…rage - Add 23 new type definitions for all untyped resources (EventSource, Catalog, Audience, Creative, Task, PropertyList, Syndication, etc.) - Replace all Promise<unknown> returns with properly typed responses - Rename CLI partners.ts to storefront.ts, update imports - Fix README stale test:partner reference - Fix storefront-guide and buyer-guide doc examples to match actual types - Add 18 new client tests for tasks, propertyListChecks, buyer cross-access guards, and all new sub-resource accessors
benminer
approved these changes
Mar 31, 2026
Collaborator
benminer
left a comment
benminer
left a comment
There was a problem hiding this comment.
Nothing stuck out to me here. Looks good!
…e3McpClient Declares experimental apps capability so servers can send interactive UI frames. Adds idle auto-disconnect (default 5min) to prevent leaked connections. Adds token expiry awareness that cleanly disconnects and throws instead of producing cryptic server errors.
…rage Add comprehensive tests for OAuth (openBrowser, waitForCallback), REST adapter edge cases (TimeoutError, non-Error throws, error envelopes), MCP client (idle timer, token expiry with Date, debug mode), CLI format (data envelopes, formatValue edges), and CLI commands (config, advertisers, storefront). Brings suite to 39 suites / 491 tests.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
McpAdapterclass (3 layers of indirection:callTool→request()→ typed resource methods) with a thinScope3McpClientconnection helpercallTool(),readResource(), andlistTools()passthroughs — no unnecessary abstraction over what the MCP server already providesScope3Clientis now REST-only, keeping typed resource methods where they make sense (humans, CLI, programmatic use)Motivation
The v2 buyer MCP surface is 4 tools —
api_call,ask_about_capability,help,health. MCP consumers (Claude, ChatGPT, Cursor) already have an MCP client. The server handles auth, routing, and validation. The typed resource methods were just a second abstraction over whatapi_callalready does.The real value for MCP consumers is:
CallToolResult/ReadResourceResulttypesNot a full adapter that wraps
callToolinrequestin typed resource methods.What changed
src/mcp-client.tsScope3McpClientwithcallTool/readResource/listToolssrc/adapters/mcp.tsMcpAdapterindirection layersrc/client.tssrc/types/index.tsAdapterType, removedadapterconfig optionsrc/index.tsTest plan
mcp-client.test.tscovers: init, connect/disconnect, callTool, readResource, listTools, auto-connect, retry after failure