@fazer-ai/mcp-obsidian 1.1.2 → 1.2.0

package/dist/index.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
@@ -10269,12 +10270,19 @@ var CancelledNotificationSchema = NotificationSchema.extend({
     reason: z.string().optional()
   })
 });
+var IconSchema = z.object({
+  src: z.string(),
+  mimeType: z.optional(z.string()),
+  sizes: z.optional(z.string())
+}).passthrough();
 var BaseMetadataSchema = z.object({
   name: z.string(),
   title: z.optional(z.string())
 }).passthrough();
 var ImplementationSchema = BaseMetadataSchema.extend({
-  version: z.string()
+  version: z.string(),
+  websiteUrl: z.optional(z.string()),
+  icons: z.optional(z.array(IconSchema))
 });
 var ClientCapabilitiesSchema = z.object({
   experimental: z.optional(z.object({}).passthrough()),
@@ -10346,13 +10354,22 @@ var ResourceContentsSchema = z.object({
 var TextResourceContentsSchema = ResourceContentsSchema.extend({
   text: z.string()
 });
+var Base64Schema = z.string().refine((val) => {
+  try {
+    atob(val);
+    return true;
+  } catch (_a) {
+    return false;
+  }
+}, { message: "Invalid Base64 string" });
 var BlobResourceContentsSchema = ResourceContentsSchema.extend({
-  blob: z.string().base64()
+  blob: Base64Schema
 });
 var ResourceSchema = BaseMetadataSchema.extend({
   uri: z.string(),
   description: z.optional(z.string()),
   mimeType: z.optional(z.string()),
+  icons: z.optional(z.array(IconSchema)),
   _meta: z.optional(z.object({}).passthrough())
 });
 var ResourceTemplateSchema = BaseMetadataSchema.extend({
@@ -10411,6 +10428,7 @@ var PromptArgumentSchema = z.object({
 var PromptSchema = BaseMetadataSchema.extend({
   description: z.optional(z.string()),
   arguments: z.optional(z.array(PromptArgumentSchema)),
+  icons: z.optional(z.array(IconSchema)),
   _meta: z.optional(z.object({}).passthrough())
 });
 var ListPromptsRequestSchema = PaginatedRequestSchema.extend({
@@ -10433,13 +10451,13 @@ var TextContentSchema = z.object({
 }).passthrough();
 var ImageContentSchema = z.object({
   type: z.literal("image"),
-  data: z.string().base64(),
+  data: Base64Schema,
   mimeType: z.string(),
   _meta: z.optional(z.object({}).passthrough())
 }).passthrough();
 var AudioContentSchema = z.object({
   type: z.literal("audio"),
-  data: z.string().base64(),
+  data: Base64Schema,
   mimeType: z.string(),
   _meta: z.optional(z.object({}).passthrough())
 }).passthrough();
@@ -10489,6 +10507,7 @@ var ToolSchema = BaseMetadataSchema.extend({
     required: z.optional(z.array(z.string()))
   }).passthrough()),
   annotations: z.optional(ToolAnnotationsSchema),
+  icons: z.optional(z.array(IconSchema)),
   _meta: z.optional(z.object({}).passthrough())
 });
 var ListToolsRequestSchema = PaginatedRequestSchema.extend({
@@ -10621,7 +10640,7 @@ var ElicitRequestSchema = RequestSchema.extend({
   })
 });
 var ElicitResultSchema = ResultSchema.extend({
-  action: z.enum(["accept", "reject", "cancel"]),
+  action: z.enum(["accept", "decline", "cancel"]),
   content: z.optional(z.record(z.string(), z.unknown()))
 });
 var ResourceTemplateReferenceSchema = z.object({
@@ -10743,6 +10762,7 @@ class Protocol {
     this._responseHandlers = new Map;
     this._progressHandlers = new Map;
     this._timeoutInfo = new Map;
+    this._pendingDebouncedNotifications = new Set;
     this.setNotificationHandler(CancelledNotificationSchema, (notification) => {
       const controller = this._requestHandlerAbortControllers.get(notification.params.requestId);
       controller === null || controller === undefined || controller.abort(notification.params.reason);
@@ -10783,14 +10803,21 @@ class Protocol {
     }
   }
   async connect(transport) {
+    var _a, _b, _c;
     this._transport = transport;
+    const _onclose = (_a = this.transport) === null || _a === undefined ? undefined : _a.onclose;
     this._transport.onclose = () => {
+      _onclose === null || _onclose === undefined || _onclose();
       this._onclose();
     };
+    const _onerror = (_b = this.transport) === null || _b === undefined ? undefined : _b.onerror;
     this._transport.onerror = (error) => {
+      _onerror === null || _onerror === undefined || _onerror(error);
       this._onerror(error);
     };
+    const _onmessage = (_c = this._transport) === null || _c === undefined ? undefined : _c.onmessage;
     this._transport.onmessage = (message, extra) => {
+      _onmessage === null || _onmessage === undefined || _onmessage(message, extra);
       if (isJSONRPCResponse(message) || isJSONRPCError(message)) {
         this._onresponse(message);
       } else if (isJSONRPCRequest(message)) {
@@ -10808,6 +10835,7 @@ class Protocol {
     const responseHandlers = this._responseHandlers;
     this._responseHandlers = new Map;
     this._progressHandlers.clear();
+    this._pendingDebouncedNotifications.clear();
     this._transport = undefined;
     (_a = this.onclose) === null || _a === undefined || _a.call(this);
     const error = new McpError(ErrorCode.ConnectionClosed, "Connection closed");
@@ -10828,10 +10856,11 @@ class Protocol {
     Promise.resolve().then(() => handler(notification)).catch((error) => this._onerror(new Error(`Uncaught error in notification handler: ${error}`)));
   }
   _onrequest(request, extra) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     const handler = (_a = this._requestHandlers.get(request.method)) !== null && _a !== undefined ? _a : this.fallbackRequestHandler;
+    const capturedTransport = this._transport;
     if (handler === undefined) {
-      (_b = this._transport) === null || _b === undefined || _b.send({
+      capturedTransport === null || capturedTransport === undefined || capturedTransport.send({
         jsonrpc: "2.0",
         id: request.id,
         error: {
@@ -10845,34 +10874,34 @@ class Protocol {
     this._requestHandlerAbortControllers.set(request.id, abortController);
     const fullExtra = {
       signal: abortController.signal,
-      sessionId: (_c = this._transport) === null || _c === undefined ? undefined : _c.sessionId,
-      _meta: (_d = request.params) === null || _d === undefined ? undefined : _d._meta,
+      sessionId: capturedTransport === null || capturedTransport === undefined ? undefined : capturedTransport.sessionId,
+      _meta: (_b = request.params) === null || _b === undefined ? undefined : _b._meta,
       sendNotification: (notification) => this.notification(notification, { relatedRequestId: request.id }),
       sendRequest: (r, resultSchema, options) => this.request(r, resultSchema, { ...options, relatedRequestId: request.id }),
       authInfo: extra === null || extra === undefined ? undefined : extra.authInfo,
-      requestId: request.id
+      requestId: request.id,
+      requestInfo: extra === null || extra === undefined ? undefined : extra.requestInfo
     };
     Promise.resolve().then(() => handler(request, fullExtra)).then((result) => {
-      var _a2;
       if (abortController.signal.aborted) {
         return;
       }
-      return (_a2 = this._transport) === null || _a2 === undefined ? undefined : _a2.send({
+      return capturedTransport === null || capturedTransport === undefined ? undefined : capturedTransport.send({
         result,
         jsonrpc: "2.0",
         id: request.id
       });
     }, (error) => {
-      var _a2, _b2;
+      var _a2;
       if (abortController.signal.aborted) {
         return;
       }
-      return (_a2 = this._transport) === null || _a2 === undefined ? undefined : _a2.send({
+      return capturedTransport === null || capturedTransport === undefined ? undefined : capturedTransport.send({
         jsonrpc: "2.0",
         id: request.id,
         error: {
           code: Number.isSafeInteger(error["code"]) ? error["code"] : ErrorCode.InternalError,
-          message: (_b2 = error.message) !== null && _b2 !== undefined ? _b2 : "Internal error"
+          message: (_a2 = error.message) !== null && _a2 !== undefined ? _a2 : "Internal error"
         }
       });
     }).catch((error) => this._onerror(new Error(`Failed to send response: ${error}`))).finally(() => {
@@ -10995,10 +11024,32 @@ class Protocol {
     });
   }
   async notification(notification, options) {
+    var _a, _b;
     if (!this._transport) {
       throw new Error("Not connected");
     }
     this.assertNotificationCapability(notification.method);
+    const debouncedMethods = (_b = (_a = this._options) === null || _a === undefined ? undefined : _a.debouncedNotificationMethods) !== null && _b !== undefined ? _b : [];
+    const canDebounce = debouncedMethods.includes(notification.method) && !notification.params && !(options === null || options === undefined ? undefined : options.relatedRequestId);
+    if (canDebounce) {
+      if (this._pendingDebouncedNotifications.has(notification.method)) {
+        return;
+      }
+      this._pendingDebouncedNotifications.add(notification.method);
+      Promise.resolve().then(() => {
+        var _a2;
+        this._pendingDebouncedNotifications.delete(notification.method);
+        if (!this._transport) {
+          return;
+        }
+        const jsonrpcNotification2 = {
+          ...notification,
+          jsonrpc: "2.0"
+        };
+        (_a2 = this._transport) === null || _a2 === undefined || _a2.send(jsonrpcNotification2, options).catch((error) => this._onerror(error));
+      });
+      return;
+    }
     const jsonrpcNotification = {
       ...notification,
       jsonrpc: "2.0"
@@ -11046,6 +11097,12 @@ class Server extends Protocol {
     var _a;
     super(options);
     this._serverInfo = _serverInfo;
+    this._loggingLevels = new Map;
+    this.LOG_LEVEL_SEVERITY = new Map(LoggingLevelSchema.options.map((level, index) => [level, index]));
+    this.isMessageIgnored = (level, sessionId) => {
+      const currentLevel = this._loggingLevels.get(sessionId);
+      return currentLevel ? this.LOG_LEVEL_SEVERITY.get(level) < this.LOG_LEVEL_SEVERITY.get(currentLevel) : false;
+    };
     this._capabilities = (_a = options === null || options === undefined ? undefined : options.capabilities) !== null && _a !== undefined ? _a : {};
     this._instructions = options === null || options === undefined ? undefined : options.instructions;
     this.setRequestHandler(InitializeRequestSchema, (request) => this._oninitialize(request));
@@ -11053,6 +11110,18 @@ class Server extends Protocol {
       var _a2;
       return (_a2 = this.oninitialized) === null || _a2 === undefined ? undefined : _a2.call(this);
     });
+    if (this._capabilities.logging) {
+      this.setRequestHandler(SetLevelRequestSchema, async (request, extra) => {
+        var _a2;
+        const transportSessionId = extra.sessionId || ((_a2 = extra.requestInfo) === null || _a2 === undefined ? undefined : _a2.headers["mcp-session-id"]) || undefined;
+        const { level } = request.params;
+        const parseResult = LoggingLevelSchema.safeParse(level);
+        if (parseResult.success) {
+          this._loggingLevels.set(transportSessionId, parseResult.data);
+        }
+        return {};
+      });
+    }
   }
   registerCapabilities(capabilities) {
     if (this.transport) {
@@ -11196,8 +11265,12 @@ class Server extends Protocol {
   async listRoots(params, options) {
     return this.request({ method: "roots/list", params }, ListRootsResultSchema, options);
   }
-  async sendLoggingMessage(params) {
-    return this.notification({ method: "notifications/message", params });
+  async sendLoggingMessage(params, sessionId) {
+    if (this._capabilities.logging) {
+      if (!this.isMessageIgnored(params.level, sessionId)) {
+        return this.notification({ method: "notifications/message", params });
+      }
+    }
   }
   async sendResourceUpdated(params) {
     return this.notification({
@@ -12512,7 +12585,8 @@ class McpServer {
           inputSchema: tool.inputSchema ? zodToJsonSchema(tool.inputSchema, {
             strictUnions: true
           }) : EMPTY_OBJECT_JSON_SCHEMA,
-          annotations: tool.annotations
+          annotations: tool.annotations,
+          _meta: tool._meta
         };
         if (tool.outputSchema) {
           toolDefinition.outputSchema = zodToJsonSchema(tool.outputSchema, { strictUnions: true });
@@ -12565,7 +12639,7 @@ class McpServer {
           };
         }
       }
-      if (tool.outputSchema) {
+      if (tool.outputSchema && !result.isError) {
         if (!result.structuredContent) {
           throw new McpError(ErrorCode.InvalidParams, `Tool ${request.params.name} has an output schema but no structured content was provided`);
         }
@@ -12877,13 +12951,14 @@ class McpServer {
     this._registeredPrompts[name] = registeredPrompt;
     return registeredPrompt;
   }
-  _createRegisteredTool(name, title, description, inputSchema, outputSchema, annotations, callback) {
+  _createRegisteredTool(name, title, description, inputSchema, outputSchema, annotations, _meta, callback) {
     const registeredTool = {
       title,
       description,
       inputSchema: inputSchema === undefined ? undefined : z.object(inputSchema),
       outputSchema: outputSchema === undefined ? undefined : z.object(outputSchema),
       annotations,
+      _meta,
       callback,
       enabled: true,
       disable: () => registeredTool.update({ enabled: false }),
@@ -12905,6 +12980,8 @@ class McpServer {
           registeredTool.callback = updates.callback;
         if (typeof updates.annotations !== "undefined")
           registeredTool.annotations = updates.annotations;
+        if (typeof updates._meta !== "undefined")
+          registeredTool._meta = updates._meta;
         if (typeof updates.enabled !== "undefined")
           registeredTool.enabled = updates.enabled;
         this.sendToolListChanged();
@@ -12938,14 +13015,14 @@ class McpServer {
       }
     }
     const callback = rest[0];
-    return this._createRegisteredTool(name, undefined, description, inputSchema, outputSchema, annotations, callback);
+    return this._createRegisteredTool(name, undefined, description, inputSchema, outputSchema, annotations, undefined, callback);
   }
   registerTool(name, config, cb) {
     if (this._registeredTools[name]) {
       throw new Error(`Tool ${name} is already registered`);
     }
-    const { title, description, inputSchema, outputSchema, annotations } = config;
-    return this._createRegisteredTool(name, title, description, inputSchema, outputSchema, annotations, cb);
+    const { title, description, inputSchema, outputSchema, annotations, _meta } = config;
+    return this._createRegisteredTool(name, title, description, inputSchema, outputSchema, annotations, _meta, cb);
   }
   prompt(name, ...rest) {
     if (this._registeredPrompts[name]) {
@@ -12978,6 +13055,9 @@ class McpServer {
   isConnected() {
     return this.server.transport !== undefined;
   }
+  async sendLoggingMessage(params, sessionId) {
+    return this.server.sendLoggingMessage(params, sessionId);
+  }
   sendResourceListChanged() {
     if (this.isConnected()) {
       this.server.sendResourceListChanged();
@@ -12995,7 +13075,8 @@ class McpServer {
   }
 }
 var EMPTY_OBJECT_JSON_SCHEMA = {
-  type: "object"
+  type: "object",
+  properties: {}
 };
 function isZodRawShape(obj) {
   if (typeof obj !== "object" || obj === null)
@@ -13577,7 +13658,7 @@ function registerTools(server) {
 
 // package.json
 var name = "@fazer-ai/mcp-obsidian";
-var version = "1.1.2";
+var version = "1.2.0";
 
 // src/index.ts
 var server = new McpServer({ name, version }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fazer-ai/mcp-obsidian",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "module": "src/index.ts",
   "main": "dist/index.js",
   "bin": "dist/index.js",
@@ -26,19 +26,19 @@
   ],
   "scripts": {
     "dev": "bun run --watch src/index.ts",
-    "build": "bun build src/index.ts --target node --outdir=dist",
+    "build": "echo '#!/usr/bin/env node' > dist/index.js && bun build src/index.ts --target node >> dist/index.js",
     "lint": "bun biome check",
     "format": "bun biome check --write",
     "prepublishOnly": "bun run build"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.0.5",
+    "@biomejs/biome": "^2.2.4",
     "@types/bun": "latest"
   },
   "peerDependencies": {
     "typescript": "^5"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.13.1"
+    "@modelcontextprotocol/sdk": "^1.18.2"
   }
 }