Add MCP server

Author: nightscape

build_bundle.ts

@@ -18,7 +18,7 @@ const result = await esbuild.build({
   treeShaking: true,
   logLevel: "error",
   minify: true,
-  external: [],
+  external: ["./server/mcp_server.ts"],
   plugins: denoPlugins({
     configPath: new URL("./deno.json", import.meta.url).pathname,
     nodeModulesDir: "auto",

cmd/server.ts

@@ -1,4 +1,4 @@
-import { HttpServer } from "../server/http_server.ts";
+import { HttpServer, type McpServerOptions } from "../server/http_server.ts";
 
 // To ship silverbullet as a single binary, we're importing all assets (client and plugs) as JSON blobs
 import clientAssetBundle from "../dist/client_asset_bundle.json" with {
@@ -107,6 +107,21 @@ export async function serveCommand(
   const shellBackend = Deno.env.get("SB_SHELL_BACKEND") || "local";
   const spaceIgnore = Deno.env.get("SB_SPACE_IGNORE");
 
+  // MCP server configuration
+  const mcpEnabled = Deno.env.get("SB_MCP_ENABLED") === "true";
+  const mcpAuthMode = (Deno.env.get("SB_MCP_AUTH_MODE") as "inherit" | "separate" | "none") || "inherit";
+  const mcpAuthToken = Deno.env.get("SB_MCP_AUTH_TOKEN");
+
+  let mcpOptions: McpServerOptions | undefined;
+  if (mcpEnabled) {
+    mcpOptions = {
+      enabled: true,
+      authMode: mcpAuthMode,
+      authToken: mcpAuthToken,
+    };
+    console.log(`MCP server enabled with auth mode: ${mcpAuthMode}`);
+  }
+
   // All plug code bundled into a JSON blob
   const plugAssets = new AssetBundle(plugAssetBundle as AssetJson);
   // All client files bundled into a JSON blob
@@ -127,6 +142,7 @@ export async function serveCommand(
       readOnly,
       shellBackend,
       pagesPath: folder,
+      mcp: mcpOptions,
     },
     clientAssets,
     plugAssets,
@@ -136,6 +152,17 @@ export async function serveCommand(
   // And kick it off
   await httpServer.start();
 
+  // Handle graceful shutdown
+  const shutdown = async () => {
+    console.log("Shutting down SilverBullet...");
+    await httpServer.stop();
+    Deno.exit(0);
+  };
+
+  // Set up signal handlers for graceful shutdown
+  Deno.addSignalListener("SIGINT", shutdown);
+  Deno.addSignalListener("SIGTERM", shutdown);
+
   // Wait in an infinite loop (to keep the HTTP server running, only cancelable via Ctrl+C or other signal)
   while (true) {
     await sleep(10000);

deno.json

@@ -97,6 +97,7 @@
   "imports": {
     "@cliffy/command": "jsr:@cliffy/command@^1.0.0-rc.7",
     "@cliffy/prompt": "jsr:@cliffy/prompt@^1.0.0-rc.7",
+    "@phughesmcr/deno-mcp-template": "jsr:@phughesmcr/deno-mcp-template@^0.1.0",
     "@silverbulletmd/silverbullet/syscall": "./plug-api/syscall.ts",
     "@silverbulletmd/silverbullet/syscalls": "./plug-api/syscalls.ts",
     "@silverbulletmd/silverbullet/type/client": "./type/client.ts",

deno.lock

@@ -26,6 +26,13 @@ import {
 import { CONFIG_TEMPLATE, INDEX_TEMPLATE } from "../web/PAGE_TEMPLATES.ts";
 import type { FileMeta } from "../type/index.ts";
 
+// Conditionally import MCP types only (not implementation)
+export type McpServerOptions = {
+  enabled: boolean;
+  authMode: "inherit" | "separate" | "none";
+  authToken?: string;
+};
+
 const authenticationExpirySeconds = 60 * 60 * 24 * 7; // 1 week
 
 export type ServerOptions = {
@@ -38,6 +45,7 @@ export type ServerOptions = {
   shellBackend: string;
   readOnly: boolean;
   indexPage: string;
+  mcp?: McpServerOptions;
 };
 
 export class HttpServer {
@@ -48,6 +56,7 @@ export class HttpServer {
   private readonly spacePrimitives: SpacePrimitives;
   private jwtIssuer: JWTIssuer;
   private readonly shellBackend: ShellBackend;
+  private mcpServerManager?: any;
 
   constructor(
     readonly options: ServerOptions,
@@ -79,6 +88,19 @@ export class HttpServer {
       ? new NotSupportedShell() // No shell for read only mode
       : determineShellBackend(options);
     this.jwtIssuer = new JWTIssuer(baseKvPrimitives);
+
+    // MCP server will be initialized in start() method
+  }
+
+  private async initializeMcpServer() {
+    try {
+      // Dynamic import to avoid bundling MCP dependencies
+      const { McpServerManager } = await import("./mcp_server.ts");
+      this.mcpServerManager = new McpServerManager(this.spacePrimitives, this.options.mcp!);
+    } catch (error) {
+      console.error("Failed to initialize MCP server:", error);
+      console.error("MCP functionality will not be available");
+    }
   }
 
   async start() {
@@ -88,10 +110,17 @@ export class HttpServer {
         JSON.stringify({ auth: this.options.auth }),
       );
     }
+    
+    // Initialize MCP server if enabled
+    if (this.options.mcp?.enabled) {
+      await this.initializeMcpServer();
+    }
+    
     await this.ensureBasicPages();
     // Serve static files (javascript, css, html)
     this.serveStatic();
     this.addAuth();
+    this.addMcpRoutes();
     this.addFsRoutes();
 
     // Fallback, serve the UI index.html
@@ -175,7 +204,10 @@ export class HttpServer {
     });
   }
 
-  stop() {
+  async stop() {
+    if (this.mcpServerManager) {
+      await this.mcpServerManager.shutdown();
+    }
     if (this.abortController) {
       this.abortController.abort();
       console.log("stopped server");
@@ -439,6 +471,38 @@ export class HttpServer {
     );
   }
 
+  private addMcpRoutes() {
+    if (!this.mcpServerManager) {
+      return;
+    }
+
+    // MCP endpoint - handles all MCP communication
+    this.app.all("/mcp", async (c) => {
+      return await this.mcpServerManager!.handleMcpRequest(c);
+    });
+
+    // MCP info endpoint (no auth required for basic info)
+    this.app.get("/.mcp", (c) => {
+      if (!this.options.mcp?.enabled) {
+        return c.json({ 
+          mcp: { 
+            enabled: false,
+            message: "MCP server is disabled" 
+          } 
+        });
+      }
+
+      return c.json({
+        mcp: {
+          enabled: true,
+          authMode: this.options.mcp.authMode,
+          endpoint: "/mcp",
+          version: "2.0.0",
+        },
+      });
+    });
+  }
+
   private refreshLogin(c: Context, host: string) {
     if (getCookie(c, "refreshLogin")) {
       const inAWeek = new Date(