Merge branch 'main' into ajoslin/memory

src/everything/README.md

@@ -173,7 +173,7 @@ Optionally, you can add it to a file called `.vscode/mcp.json` in your workspace
 }
 ```
 
-## Run with [HTTP+SSE Transport](https://modelcontextprotocol.io/specification/2024-11-05/basic/transports#http-with-sse) (deprecated as of [2025-03-26](https://modelcontextprotocol.io/specification/2025-03-26/basic/transports))
+## Running from source with [HTTP+SSE Transport](https://modelcontextprotocol.io/specification/2024-11-05/basic/transports#http-with-sse) (deprecated as of [2025-03-26](https://modelcontextprotocol.io/specification/2025-03-26/basic/transports))
 
 ```shell
 cd src/everything
@@ -181,10 +181,37 @@ npm install
 npm run start:sse
 ```
 
-## Run with [Streamable HTTP Transport](https://modelcontextprotocol.io/specification/2025-03-26/basic/transports#streamable-http)
+## Run from source with [Streamable HTTP Transport](https://modelcontextprotocol.io/specification/2025-03-26/basic/transports#streamable-http)
 
 ```shell
 cd src/everything
 npm install
 npm run start:streamableHttp
 ```
+
+## Running as an installed package
+### Install 
+```shell
+npm install -g @modelcontextprotocol/server-everything@latest
+````
+
+### Run the default (stdio) server
+```shell
+npx @modelcontextprotocol/server-everything
+```
+
+### Or specify stdio explicitly
+```shell
+npx @modelcontextprotocol/server-everything stdio
+```
+
+### Run the SSE server
+```shell
+npx @modelcontextprotocol/server-everything sse
+```
+
+### Run the streamable HTTP server
+```shell
+npx @modelcontextprotocol/server-everything streamableHttp
+```
+

src/everything/index.ts

@@ -1,23 +1,37 @@
 #!/usr/bin/env node
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createServer } from "./everything.js";
+// Parse command line arguments first
+const args = process.argv.slice(2);
+const scriptName = args[0] || 'stdio';
 
-async function main() {
-  const transport = new StdioServerTransport();
-  const { server, cleanup } = createServer();
-
-  await server.connect(transport);
-
-  // Cleanup on exit
-  process.on("SIGINT", async () => {
-    await cleanup();
-    await server.close();
-    process.exit(0);
-  });
+async function run() {
+    try {
+        // Dynamically import only the requested module to prevent all modules from initializing
+        switch (scriptName) {
+            case 'stdio':
+                // Import and run the default server
+                await import('./stdio.js');
+                break;
+            case 'sse':
+                // Import and run the SSE server
+                await import('./sse.js');
+                break;
+            case 'streamableHttp':
+                // Import and run the streamable HTTP server
+                await import('./streamableHttp.js');
+                break;
+            default:
+                console.error(`Unknown script: ${scriptName}`);
+                console.log('Available scripts:');
+                console.log('- stdio');
+                console.log('- sse');
+                console.log('- streamableHttp');
+                process.exit(1);
+        }
+    } catch (error) {
+        console.error('Error running script:', error);
+        process.exit(1);
+    }
 }
 
-main().catch((error) => {
-  console.error("Server error:", error);
-  process.exit(1);
-});
+run();

src/everything/package.json

@@ -22,7 +22,7 @@
     "start:streamableHttp": "node dist/streamableHttp.js"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.10.1",
+    "@modelcontextprotocol/sdk": "^1.11.0",
     "express": "^4.21.1",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.5"

src/everything/sse.ts

@@ -2,6 +2,8 @@ import { SSEServerTransport } from "@modelcontextprotocol/sdk/server/sse.js";
 import express from "express";
 import { createServer } from "./everything.js";
 
+console.error('Starting SSE server...');
+
 const app = express();
 
 const { server, cleanup } = createServer();

src/everything/stdio.ts

@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { createServer } from "./everything.js";
+
+console.error('Starting default (STDIO) server...');
+
+async function main() {
+  const transport = new StdioServerTransport();
+  const {server, cleanup} = createServer();
+
+  await server.connect(transport);
+
+  // Cleanup on exit
+  process.on("SIGINT", async () => {
+    await cleanup();
+    await server.close();
+    process.exit(0);
+  });
+}
+
+main().catch((error) => {
+  console.error("Server error:", error);
+  process.exit(1);
+});
+

src/everything/streamableHttp.ts

@@ -4,6 +4,8 @@ import express, { Request, Response } from "express";
 import { createServer } from "./everything.js";
 import { randomUUID } from 'node:crypto';
 
+console.error('Starting Streamable HTTP server...');
+
 const app = express();
 
 const { server, cleanup } = createServer();

src/gdrive/README.md

@@ -84,7 +84,10 @@ Once authenticated, you can use the server in your app's server configuration:
       "args": [
         "-y",
         "@modelcontextprotocol/server-gdrive"
-      ]
+      ],
+      "env": {
+        "GDRIVE_CREDENTIALS_PATH": "/path/to/.gdrive-server-credentials.json"
+      }
     }
   }
 }

src/puppeteer/Dockerfile

@@ -1,12 +1,12 @@
 FROM node:22-bookworm-slim
 
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 # for arm64 support we need to install chromium provided by debian
 # npm ERR! The chromium binary is not available for arm64.
 # https://github.com/puppeteer/puppeteer/issues/7740
 
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
 
 RUN apt-get update && \

src/puppeteer/README.md

@@ -22,6 +22,7 @@ A Model Context Protocol server that provides browser automation capabilities us
     - `selector` (string, optional): CSS selector for element to screenshot
     - `width` (number, optional, default: 800): Screenshot width
     - `height` (number, optional, default: 600): Screenshot height
+    - `encoded` (boolean, optional): If true, capture the screenshot as a base64-encoded data URI (as text) instead of binary image content. Default false.
 
 - **puppeteer_click**
 

src/puppeteer/index.ts

@@ -39,6 +39,7 @@ const TOOLS: Tool[] = [
         selector: { type: "string", description: "CSS selector for element to screenshot" },
         width: { type: "number", description: "Width in pixels (default: 800)" },
         height: { type: "number", description: "Height in pixels (default: 600)" },
+        encoded: { type: "boolean", description: "If true, capture the screenshot as a base64-encoded data URI (as text) instead of binary image content. Default false." },
       },
       required: ["name"],
     },
@@ -228,6 +229,7 @@ async function handleToolCall(name: string, args: any): Promise<CallToolResult>
     case "puppeteer_screenshot": {
       const width = args.width ?? 800;
       const height = args.height ?? 600;
+      const encoded = args.encoded ?? false;
       await page.setViewport({ width, height });
 
       const screenshot = await (args.selector ?
@@ -255,11 +257,14 @@ async function handleToolCall(name: string, args: any): Promise<CallToolResult>
             type: "text",
             text: `Screenshot '${args.name}' taken at ${width}x${height}`,
           } as TextContent,
-          {
+          encoded ? ({
+            type: "text",
+            text: `data:image/png;base64,${screenshot}`,
+          } as TextContent) : ({
             type: "image",
             data: screenshot,
             mimeType: "image/png",
-          } as ImageContent,
+          } as ImageContent),
         ],
         isError: false,
       };