@beeper/desktop-mcp 4.2.3 → 4.7.0

package/server.mjs

@@ -1,46 +1,24 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { endpoints, query } from "./tools.mjs";
 import { CallToolRequestSchema, ListToolsRequestSchema, SetLevelRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
 import BeeperDesktop from '@beeper/desktop-api';
-import { applyCompatibilityTransformations, defaultClientCapabilities, knownClients, parseEmbeddedJSON, } from "./compat.mjs";
-import { dynamicTools } from "./dynamic-tools.mjs";
 import { codeTool } from "./code-tool.mjs";
 import docsSearchTool from "./docs-search-tool.mjs";
-export { ClientType } from "./compat.mjs";
-export { endpoints } from "./tools.mjs";
-export const newMcpServer = () => new McpServer({
+import { getInstructions } from "./instructions.mjs";
+import { blockedMethodsForCodeTool } from "./methods.mjs";
+export const newMcpServer = async (stainlessApiKey) => new McpServer({
     name: 'beeper_desktop_api_api',
-    version: '4.2.3',
+    version: '4.7.0',
 }, {
+    instructions: await getInstructions(stainlessApiKey),
     capabilities: { tools: {}, logging: {} },
-    instructions: 'Access to all chats and messages across networks using Beeper Desktop. Can be used to find, get, send, and manage messages and chats.',
 });
-// Create server instance
-export const server = newMcpServer();
 /**
  * Initializes the provided MCP Server with the given tools and handlers.
  * If not provided, the default client, tools and handlers will be used.
  */
-export function initMcpServer(params) {
+export async function initMcpServer(params) {
     const server = params.server instanceof McpServer ? params.server.server : params.server;
-    const mcpOptions = params.mcpOptions ?? {};
-    let providedEndpoints = null;
-    let endpointMap = null;
-    const initTools = async (implementation) => {
-        if (implementation && (!mcpOptions.client || mcpOptions.client === 'infer')) {
-            mcpOptions.client =
-                implementation.name.toLowerCase().includes('claude') ? 'claude'
-                    : implementation.name.toLowerCase().includes('cursor') ? 'cursor'
-                        : undefined;
-            mcpOptions.capabilities = {
-                ...(mcpOptions.client && knownClients[mcpOptions.client]),
-                ...mcpOptions.capabilities,
-            };
-        }
-        providedEndpoints ?? (providedEndpoints = await selectTools(endpoints, mcpOptions));
-        endpointMap ?? (endpointMap = Object.fromEntries(providedEndpoints.map((endpoint) => [endpoint.tool.name, endpoint])));
-    };
     const logAtLevel = (level) => (message, ...rest) => {
         void server.sendLoggingMessage({
             level,
@@ -53,111 +31,118 @@ export function initMcpServer(params) {
         warn: logAtLevel('warning'),
         error: logAtLevel('error'),
     };
-    let client = new BeeperDesktop({
-        logger,
-        ...params.clientOptions,
-        defaultHeaders: {
-            ...params.clientOptions?.defaultHeaders,
-            'X-Stainless-MCP': 'true',
-        },
-    });
-    server.setRequestHandler(ListToolsRequestSchema, async () => {
-        if (providedEndpoints === null) {
-            await initTools(server.getClientVersion());
+    let _client;
+    let _clientError;
+    let _logLevel;
+    const getClient = () => {
+        if (_clientError)
+            throw _clientError;
+        if (!_client) {
+            try {
+                _client = new BeeperDesktop({
+                    logger,
+                    ...params.clientOptions,
+                    defaultHeaders: {
+                        ...params.clientOptions?.defaultHeaders,
+                        'X-Stainless-MCP': 'true',
+                    },
+                });
+                if (_logLevel) {
+                    _client = _client.withOptions({ logLevel: _logLevel });
+                }
+            }
+            catch (e) {
+                _clientError = e instanceof Error ? e : new Error(String(e));
+                throw _clientError;
+            }
         }
+        return _client;
+    };
+    const providedTools = selectTools(params.mcpOptions);
+    const toolMap = Object.fromEntries(providedTools.map((mcpTool) => [mcpTool.tool.name, mcpTool]));
+    server.setRequestHandler(ListToolsRequestSchema, async () => {
         return {
-            tools: providedEndpoints.map((endpoint) => endpoint.tool),
+            tools: providedTools.map((mcpTool) => mcpTool.tool),
         };
     });
     server.setRequestHandler(CallToolRequestSchema, async (request) => {
-        if (endpointMap === null) {
-            await initTools(server.getClientVersion());
-        }
         const { name, arguments: args } = request.params;
-        const endpoint = endpointMap[name];
-        if (!endpoint) {
+        const mcpTool = toolMap[name];
+        if (!mcpTool) {
             throw new Error(`Unknown tool: ${name}`);
         }
-        return executeHandler(endpoint.tool, endpoint.handler, client, args, mcpOptions.capabilities);
+        let client;
+        try {
+            client = getClient();
+        }
+        catch (error) {
+            return {
+                content: [
+                    {
+                        type: 'text',
+                        text: `Failed to initialize client: ${error instanceof Error ? error.message : String(error)}`,
+                    },
+                ],
+                isError: true,
+            };
+        }
+        return executeHandler({
+            handler: mcpTool.handler,
+            reqContext: {
+                client,
+                stainlessApiKey: params.stainlessApiKey ?? params.mcpOptions?.stainlessApiKey,
+            },
+            args,
+        });
     });
     server.setRequestHandler(SetLevelRequestSchema, async (request) => {
         const { level } = request.params;
+        let logLevel;
         switch (level) {
             case 'debug':
-                client = client.withOptions({ logLevel: 'debug' });
+                logLevel = 'debug';
                 break;
             case 'info':
-                client = client.withOptions({ logLevel: 'info' });
+                logLevel = 'info';
                 break;
             case 'notice':
             case 'warning':
-                client = client.withOptions({ logLevel: 'warn' });
+                logLevel = 'warn';
                 break;
             case 'error':
-                client = client.withOptions({ logLevel: 'error' });
+                logLevel = 'error';
                 break;
             default:
-                client = client.withOptions({ logLevel: 'off' });
+                logLevel = 'off';
                 break;
         }
+        _logLevel = logLevel;
+        if (_client) {
+            _client = _client.withOptions({ logLevel });
+        }
         return {};
     });
 }
 /**
  * Selects the tools to include in the MCP Server based on the provided options.
  */
-export async function selectTools(endpoints, options) {
-    const filteredEndpoints = query(options?.filters ?? [], endpoints);
-    let includedTools = filteredEndpoints.slice();
-    if (includedTools.length > 0) {
-        if (options?.includeDynamicTools) {
-            includedTools = dynamicTools(includedTools);
-        }
-    }
-    else {
-        if (options?.includeAllTools) {
-            includedTools = endpoints.slice();
-        }
-        else if (options?.includeDynamicTools) {
-            includedTools = dynamicTools(endpoints);
-        }
-        else if (options?.includeCodeTools) {
-            includedTools = [await codeTool()];
-        }
-        else {
-            includedTools = endpoints.slice();
-        }
+export function selectTools(options) {
+    const includedTools = [];
+    if (options?.includeCodeTool ?? true) {
+        includedTools.push(codeTool({
+            blockedMethods: blockedMethodsForCodeTool(options),
+            codeExecutionMode: options?.codeExecutionMode ?? 'stainless-sandbox',
+        }));
     }
     if (options?.includeDocsTools ?? true) {
         includedTools.push(docsSearchTool);
     }
-    const capabilities = { ...defaultClientCapabilities, ...options?.capabilities };
-    return applyCompatibilityTransformations(includedTools, capabilities);
+    return includedTools;
 }
 /**
  * Runs the provided handler with the given client and arguments.
  */
-export async function executeHandler(tool, handler, client, args, compatibilityOptions) {
-    const options = { ...defaultClientCapabilities, ...compatibilityOptions };
-    if (!options.validJson && args) {
-        args = parseEmbeddedJSON(args, tool.inputSchema);
-    }
-    return await handler(client, args || {});
+export async function executeHandler({ handler, reqContext, args, }) {
+    return await handler({ reqContext, args: args || {} });
 }
-export const readEnv = (env) => {
-    if (typeof globalThis.process !== 'undefined') {
-        return globalThis.process.env?.[env]?.trim();
-    }
-    else if (typeof globalThis.Deno !== 'undefined') {
-        return globalThis.Deno.env?.get?.(env)?.trim();
-    }
-    return;
-};
-export const readEnvOrError = (env) => {
-    let envValue = readEnv(env);
-    if (envValue === undefined) {
-        throw new Error(`Environment variable ${env} is not set`);
-    }
-    return envValue;
-};
 //# sourceMappingURL=server.mjs.map

package/server.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"server.mjs","sourceRoot":"","sources":["src/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.mjs","sourceRoot":"","sources":["src/server.ts"],"names":[],"mappings":"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"}

package/src/auth.ts

@@ -0,0 +1,42 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { IncomingMessage } from 'node:http';
+import { ClientOptions } from '@beeper/desktop-api';
+import { McpOptions } from './options';
+
+export const parseClientAuthHeaders = (req: IncomingMessage, required?: boolean): Partial<ClientOptions> => {
+  if (req.headers.authorization) {
+    const scheme = req.headers.authorization.split(' ')[0]!;
+    const value = req.headers.authorization.slice(scheme.length + 1);
+    switch (scheme) {
+      case 'Bearer':
+        return { accessToken: req.headers.authorization.slice('Bearer '.length) };
+      default:
+        throw new Error(
+          'Unsupported authorization scheme. Expected the "Authorization" header to be a supported scheme (Bearer).',
+        );
+    }
+  } else if (required) {
+    throw new Error('Missing required Authorization header; see WWW-Authenticate header for details.');
+  }
+
+  const accessToken =
+    Array.isArray(req.headers['x-beeper-access-token']) ?
+      req.headers['x-beeper-access-token'][0]
+    : req.headers['x-beeper-access-token'];
+  return { accessToken };
+};
+
+export const getStainlessApiKey = (req: IncomingMessage, mcpOptions: McpOptions): string | undefined => {
+  // Try to get the key from the x-stainless-api-key header
+  const headerKey =
+    Array.isArray(req.headers['x-stainless-api-key']) ?
+      req.headers['x-stainless-api-key'][0]
+    : req.headers['x-stainless-api-key'];
+  if (headerKey && typeof headerKey === 'string') {
+    return headerKey;
+  }
+
+  // Fall back to value set in the mcpOptions (e.g. from environment variable), if provided
+  return mcpOptions.stainlessApiKey;
+};

package/src/code-tool-types.ts

@@ -3,12 +3,15 @@
 import { ClientOptions } from '@beeper/desktop-api';
 
 export type WorkerInput = {
-  opts: ClientOptions;
+  project_name: string;
   code: string;
+  client_opts: ClientOptions;
+  intent?: string | undefined;
 };
-export type WorkerSuccess = {
+
+export type WorkerOutput = {
+  is_error: boolean;
   result: unknown | null;
-  logLines: string[];
-  errLines: string[];
+  log_lines: string[];
+  err_lines: string[];
 };
-export type WorkerError = { message: string | undefined };

package/src/code-tool-worker.ts

@@ -1,37 +1,47 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+import path from 'node:path';
 import util from 'node:util';
-
 import Fuse from 'fuse.js';
 import ts from 'typescript';
+import { WorkerOutput } from './code-tool-types';
+import { BeeperDesktop, ClientOptions } from '@beeper/desktop-api';
 
-import { WorkerInput, WorkerSuccess, WorkerError } from './code-tool-types';
-import { BeeperDesktop } from '@beeper/desktop-api';
-
-function getRunFunctionNode(
-  code: string,
-): ts.FunctionDeclaration | ts.FunctionExpression | ts.ArrowFunction | null {
+function getRunFunctionSource(code: string): {
+  type: 'declaration' | 'expression';
+  client: string | undefined;
+  code: string;
+} | null {
   const sourceFile = ts.createSourceFile('code.ts', code, ts.ScriptTarget.Latest, true);
+  const printer = ts.createPrinter();
 
   for (const statement of sourceFile.statements) {
     // Check for top-level function declarations
     if (ts.isFunctionDeclaration(statement)) {
       if (statement.name?.text === 'run') {
-        return statement;
+        return {
+          type: 'declaration',
+          client: statement.parameters[0]?.name.getText(),
+          code: printer.printNode(ts.EmitHint.Unspecified, statement.body!, sourceFile),
+        };
       }
     }
 
     // Check for variable declarations: const run = () => {} or const run = function() {}
     if (ts.isVariableStatement(statement)) {
       for (const declaration of statement.declarationList.declarations) {
-        if (ts.isIdentifier(declaration.name) && declaration.name.text === 'run') {
+        if (
+          ts.isIdentifier(declaration.name) &&
+          declaration.name.text === 'run' &&
           // Check if it's initialized with a function
-          if (
-            declaration.initializer &&
-            (ts.isFunctionExpression(declaration.initializer) || ts.isArrowFunction(declaration.initializer))
-          ) {
-            return declaration.initializer;
-          }
+          declaration.initializer &&
+          (ts.isFunctionExpression(declaration.initializer) || ts.isArrowFunction(declaration.initializer))
+        ) {
+          return {
+            type: 'expression',
+            client: declaration.initializer.parameters[0]?.name.getText(),
+            code: printer.printNode(ts.EmitHint.Unspecified, declaration.initializer, sourceFile),
+          };
         }
       }
     }
@@ -40,11 +50,64 @@ function getRunFunctionNode(
   return null;
 }
 
+function getTSDiagnostics(code: string): string[] {
+  const functionSource = getRunFunctionSource(code)!;
+  const codeWithImport = [
+    'import { BeeperDesktop } from "@beeper/desktop-api";',
+    functionSource.type === 'declaration' ?
+      `async function run(${functionSource.client}: BeeperDesktop)`
+    : `const run: (${functionSource.client}: BeeperDesktop) => Promise<unknown> =`,
+    functionSource.code,
+  ].join('\n');
+  const sourcePath = path.resolve('code.ts');
+  const ast = ts.createSourceFile(sourcePath, codeWithImport, ts.ScriptTarget.Latest, true);
+  const options = ts.getDefaultCompilerOptions();
+  options.target = ts.ScriptTarget.Latest;
+  options.module = ts.ModuleKind.NodeNext;
+  options.moduleResolution = ts.ModuleResolutionKind.NodeNext;
+  const host = ts.createCompilerHost(options, true);
+  const newHost: typeof host = {
+    ...host,
+    getSourceFile: (...args) => {
+      if (path.resolve(args[0]) === sourcePath) {
+        return ast;
+      }
+      return host.getSourceFile(...args);
+    },
+    readFile: (...args) => {
+      if (path.resolve(args[0]) === sourcePath) {
+        return codeWithImport;
+      }
+      return host.readFile(...args);
+    },
+    fileExists: (...args) => {
+      if (path.resolve(args[0]) === sourcePath) {
+        return true;
+      }
+      return host.fileExists(...args);
+    },
+  };
+  const program = ts.createProgram({
+    options,
+    rootNames: [sourcePath],
+    host: newHost,
+  });
+  const diagnostics = ts.getPreEmitDiagnostics(program, ast);
+  return diagnostics.map((d) => {
+    const message = ts.flattenDiagnosticMessageText(d.messageText, '\n');
+    if (!d.file || !d.start) return `- ${message}`;
+    const { line: lineNumber } = ts.getLineAndCharacterOfPosition(d.file, d.start);
+    const line = codeWithImport.split('\n').at(lineNumber)?.trim();
+    return line ? `- ${message}\n    ${line}` : `- ${message}`;
+  });
+}
+
 const fuse = new Fuse(
   [
     'client.focus',
     'client.search',
     'client.accounts.list',
+    'client.accounts.contacts.list',
     'client.accounts.contacts.search',
     'client.chats.archive',
     'client.chats.create',
@@ -53,10 +116,17 @@ const fuse = new Fuse(
     'client.chats.search',
     'client.chats.reminders.create',
     'client.chats.reminders.delete',
+    'client.chats.messages.reactions.add',
+    'client.chats.messages.reactions.delete',
     'client.messages.list',
     'client.messages.search',
     'client.messages.send',
+    'client.messages.update',
     'client.assets.download',
+    'client.assets.serve',
+    'client.assets.upload',
+    'client.assets.uploadBase64',
+    'client.info.retrieve',
   ],
   { threshold: 1, shouldSort: true },
 );
@@ -151,24 +221,34 @@ function parseError(code: string, error: unknown): string | undefined {
 }
 
 const fetch = async (req: Request): Promise<Response> => {
-  const { opts, code } = (await req.json()) as WorkerInput;
-  if (code == null) {
+  const { opts, code } = (await req.json()) as { opts: ClientOptions; code: string };
+
+  const runFunctionSource = code ? getRunFunctionSource(code) : null;
+  if (!runFunctionSource) {
+    const message =
+      code ?
+        'The code is missing a top-level `run` function.'
+      : 'The code argument is missing. Provide one containing a top-level `run` function.';
     return Response.json(
       {
-        message:
-          'The code param is missing. Provide one containing a top-level `run` function. Write code within this template:\n\n```\nasync function run(client) {\n  // Fill this out\n}\n```',
-      } satisfies WorkerError,
+        is_error: true,
+        result: `${message} Write code within this template:\n\n\`\`\`\nasync function run(client) {\n  // Fill this out\n}\n\`\`\``,
+        log_lines: [],
+        err_lines: [],
+      } satisfies WorkerOutput,
       { status: 400, statusText: 'Code execution error' },
     );
   }
 
-  const runFunctionNode = getRunFunctionNode(code);
-  if (!runFunctionNode) {
+  const diagnostics = getTSDiagnostics(code);
+  if (diagnostics.length > 0) {
     return Response.json(
       {
-        message:
-          'The code is missing a top-level `run` function. Write code within this template:\n\n```\nasync function run(client) {\n  // Fill this out\n}\n```',
-      } satisfies WorkerError,
+        is_error: true,
+        result: `The code contains TypeScript diagnostics:\n${diagnostics.join('\n')}`,
+        log_lines: [],
+        err_lines: [],
+      } satisfies WorkerOutput,
       { status: 400, statusText: 'Code execution error' },
     );
   }
@@ -177,14 +257,14 @@ const fetch = async (req: Request): Promise<Response> => {
     ...opts,
   });
 
-  const logLines: string[] = [];
-  const errLines: string[] = [];
+  const log_lines: string[] = [];
+  const err_lines: string[] = [];
   const console = {
     log: (...args: unknown[]) => {
-      logLines.push(util.format(...args));
+      log_lines.push(util.format(...args));
     },
     error: (...args: unknown[]) => {
-      errLines.push(util.format(...args));
+      err_lines.push(util.format(...args));
     },
   };
   try {
@@ -192,15 +272,19 @@ const fetch = async (req: Request): Promise<Response> => {
     eval(`${code}\nrun_ = run;`);
     const result = await run_(makeSdkProxy(client, { path: ['client'] }));
     return Response.json({
+      is_error: false,
       result,
-      logLines,
-      errLines,
-    } satisfies WorkerSuccess);
+      log_lines,
+      err_lines,
+    } satisfies WorkerOutput);
   } catch (e) {
     return Response.json(
       {
-        message: parseError(code, e),
-      } satisfies WorkerError,
+        is_error: true,
+        result: parseError(code, e),
+        log_lines,
+        err_lines,
+      } satisfies WorkerOutput,
       { status: 400, statusText: 'Code execution error' },
     );
   }