obsidian-mcp-server 1.2.6 → 1.3.0

package/README.md

@@ -52,29 +52,73 @@ npm install obsidian-mcp-server
 
 ## Configuration
 
-Add to your MCP client settings:
+Add to your MCP client settings (e.g., `claude_desktop_config.json` or `cline_mcp_settings.json`):
 
 ```json
 {
   "mcpServers": {
-    "obsidian": {
+    "obsidian-mcp-server": {
       "command": "node",
       "args": ["/path/to/obsidian-mcp-server/build/index.js"],
       "env": {
-        "OBSIDIAN_API_KEY": "your-api-key-here",
-        "NODE_ENV": "production"
+        "OBSIDIAN_API_KEY": "your_api_key_here",
+        "VERIFY_SSL": "false",
+        "OBSIDIAN_PROTOCOL": "https",
+        "OBSIDIAN_HOST": "127.0.0.1",
+        "OBSIDIAN_PORT": "27124",
+        "REQUEST_TIMEOUT": "5000",
+        "MAX_CONTENT_LENGTH": "52428800",
+        "MAX_BODY_LENGTH": "52428800",
+        "RATE_LIMIT_WINDOW_MS": "900000",
+        "RATE_LIMIT_MAX_REQUESTS": "200",
+        "TOOL_TIMEOUT_MS": "60000"
       }
     }
   }
 }
 ```
 
-Environment configuration:
-- `OBSIDIAN_VERIFY_SSL`: Enable SSL verification (default: false)
-- `RATE_LIMIT_WINDOW_MS`: Rate limit window in ms (default: 15 minutes)
-- `RATE_LIMIT_MAX_REQUESTS`: Max requests per window (default: 200)
-- `MAX_TOKENS`: Maximum tokens per response (default: 20000)
-- `TOOL_TIMEOUT_MS`: Tool execution timeout (default: 60000)
+Environment Variables:
+
+Required:
+- `OBSIDIAN_API_KEY`: Your API key from Obsidian's Local REST API plugin settings
+
+Connection Settings:
+- `VERIFY_SSL`: Enable SSL certificate verification (default: false in development)
+- `OBSIDIAN_PROTOCOL`: Protocol to use (default: "https")
+- `OBSIDIAN_HOST`: Host address (default: "127.0.0.1")
+- `OBSIDIAN_PORT`: Port number (default: 27124)
+
+Request Limits:
+- `REQUEST_TIMEOUT`: Request timeout in milliseconds (default: 5000)
+- `MAX_CONTENT_LENGTH`: Maximum response content length in bytes (default: 52428800 [50MB])
+- `MAX_BODY_LENGTH`: Maximum request body length in bytes (default: 52428800 [50MB])
+
+Rate Limiting:
+- `RATE_LIMIT_WINDOW_MS`: Rate limit window in milliseconds (default: 900000 [15 minutes])
+- `RATE_LIMIT_MAX_REQUESTS`: Maximum requests per window (default: 200)
+
+Tool Execution:
+- `TOOL_TIMEOUT_MS`: Tool execution timeout in milliseconds (default: 60000 [1 minute])
+
+SSL Certificate Setup:
+
+For Windows Users:
+1. Development Setup (Not Recommended for Production):
+   - Set `VERIFY_SSL` to "false"
+   - Set `OBSIDIAN_PROTOCOL` to "http"
+   - Enable "Non-encrypted (HTTP) Server" in Obsidian's Local REST API settings
+
+2. Production Setup (Recommended):
+   - Set `VERIFY_SSL` to "true"
+   - Get the certificate from Obsidian Settings > Local REST API > 'How to Access'
+   - Open Windows Certificate Manager (certmgr.msc)
+   - Navigate to "Trusted Root Certification Authorities" > "Certificates"
+   - Right-click > "All Tasks" > "Import" and select the certificate file
+
+For Other Systems:
+- macOS: Add certificate to Keychain Access
+- Linux: Add to ca-certificates
 
 Additional configuration options:
 ```typescript

package/build/obsidian.js

@@ -7,15 +7,24 @@ import { dirname, join } from "path";
 // Get package version for user agent
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-const packagePath = join(__dirname, '..', '..', 'package.json');
 const VERSION = (() => {
     try {
+        // Look for package.json in the same directory as the built files
+        const packagePath = join(__dirname, '..', 'package.json');
         const pkg = JSON.parse(readFileSync(packagePath, 'utf-8'));
         return pkg.version;
     }
     catch (error) {
-        console.warn('Could not read package.json version:', error);
-        return '1.1.0'; // Fallback version
+        // Try alternative location for development
+        try {
+            const devPackagePath = join(__dirname, '..', '..', 'package.json');
+            const pkg = JSON.parse(readFileSync(devPackagePath, 'utf-8'));
+            return pkg.version;
+        }
+        catch (devError) {
+            console.warn('Could not read package.json version, using fallback');
+            return '1.1.0'; // Fallback version
+        }
     }
 })();
 export class ObsidianClient {
@@ -30,14 +39,28 @@ export class ObsidianClient {
                 "4. Provide the API key in your configuration", 40100 // Unauthorized
             );
         }
-        // Combine defaults with provided config
+        // Determine if we're in a development environment
+        const isDev = process.env.NODE_ENV === 'development' || !process.env.NODE_ENV;
+        // Read environment variables with fallbacks
+        const envConfig = {
+            protocol: process.env.OBSIDIAN_PROTOCOL || DEFAULT_OBSIDIAN_CONFIG.protocol,
+            host: process.env.OBSIDIAN_HOST || DEFAULT_OBSIDIAN_CONFIG.host,
+            port: parseInt(process.env.OBSIDIAN_PORT || String(DEFAULT_OBSIDIAN_CONFIG.port)),
+            verifySSL: process.env.VERIFY_SSL ? process.env.VERIFY_SSL === 'true' : (isDev ? false : true),
+            timeout: parseInt(process.env.REQUEST_TIMEOUT || '5000'),
+            maxContentLength: parseInt(process.env.MAX_CONTENT_LENGTH || String(50 * 1024 * 1024)),
+            maxBodyLength: parseInt(process.env.MAX_BODY_LENGTH || String(50 * 1024 * 1024))
+        };
+        // Combine defaults with provided config and environment variables
         this.config = {
-            ...DEFAULT_OBSIDIAN_CONFIG,
-            verifySSL: config.verifySSL ?? true, // Default to true as required by Obsidian REST API plugin
+            protocol: envConfig.protocol,
+            host: envConfig.host,
+            port: envConfig.port,
+            verifySSL: config.verifySSL ?? envConfig.verifySSL,
             apiKey: config.apiKey,
-            timeout: config.timeout ?? 5000, // 5 second default timeout
-            maxContentLength: config.maxContentLength ?? 50 * 1024 * 1024, // 50MB
-            maxBodyLength: config.maxBodyLength ?? 50 * 1024 * 1024 // 50MB
+            timeout: config.timeout ?? envConfig.timeout,
+            maxContentLength: config.maxContentLength ?? envConfig.maxContentLength,
+            maxBodyLength: config.maxBodyLength ?? envConfig.maxBodyLength
         };
         // Configure HTTPS agent
         const httpsAgent = new Agent({
@@ -66,9 +89,18 @@ export class ObsidianClient {
             decompress: true
         };
         if (!this.config.verifySSL) {
-            console.warn("WARNING: SSL verification is disabled. The Obsidian REST API plugin requires HTTPS by default.\n" +
-                "Make sure you have configured the certificate as a trusted certificate authority.\n" +
-                "See Obsidian Settings > Local REST API > 'How to Access' for setup instructions.");
+            console.warn("WARNING: SSL verification is disabled. While this works for development, it's not recommended for production.\n" +
+                "To properly configure SSL certificates:\n" +
+                "1. Go to Obsidian Settings > Local REST API\n" +
+                "2. Under 'How to Access', copy the certificate\n" +
+                "3. For Windows users:\n" +
+                "   - Open 'certmgr.msc' (Windows Certificate Manager)\n" +
+                "   - Go to 'Trusted Root Certification Authorities' > 'Certificates'\n" +
+                "   - Right-click > 'All Tasks' > 'Import' and follow the wizard\n" +
+                "   - Select the certificate file you copied from Obsidian\n" +
+                "4. For other systems:\n" +
+                "   - macOS: Add to Keychain Access\n" +
+                "   - Linux: Add to ca-certificates");
         }
         this.client = axios.create(axiosConfig);
     }

package/build/properties.js

@@ -1,4 +1,5 @@
 import { parse, stringify } from 'yaml';
+import { EOL } from 'os';
 import { ObsidianPropertiesSchema, PropertyUpdateSchema } from './propertyTypes.js';
 export class PropertyManager {
     client;
@@ -10,18 +11,22 @@ export class PropertyManager {
      */
     parseProperties(content) {
         try {
-            // Extract frontmatter between --- markers
-            const match = content.match(/^---\n([\s\S]*?)\n---/);
+            // Extract frontmatter between --- markers (handles both \n and \r\n)
+            const match = content.match(/^---(\r?\n)([\s\S]*?)\r?\n---/);
             if (!match) {
                 return {};
             }
-            const frontmatter = match[1];
+            const frontmatter = match[2];
             const properties = parse(frontmatter);
+            // Handle tags - don't add # prefix in frontmatter
+            if (properties.tags && Array.isArray(properties.tags)) {
+                properties.tags = properties.tags.map((tag) => tag.startsWith('#') ? tag.substring(1) : tag);
+            }
             // Validate against schema
             const result = ObsidianPropertiesSchema.safeParse(properties);
             if (!result.success) {
                 console.warn('Property validation warnings:', result.error);
-                // Return partial valid properties rather than throwing
+                // Return the properties with fixed tags
                 return properties;
             }
             return result.data;
@@ -38,9 +43,9 @@ export class PropertyManager {
         try {
             // Remove undefined values
             const cleanProperties = Object.fromEntries(Object.entries(properties).filter(([_, v]) => v !== undefined));
-            // Generate YAML
+            // Generate YAML with platform-specific line endings
             const yaml = stringify(cleanProperties);
-            return `---\n${yaml}---\n`;
+            return `---${EOL}${yaml}---${EOL}`;
         }
         catch (error) {
             console.error('Error generating properties:', error);
@@ -134,8 +139,8 @@ export class PropertyManager {
             const mergedProperties = this.mergeProperties(existingProperties, newProperties, replace);
             // Generate new frontmatter
             const newFrontmatter = this.generateProperties(mergedProperties);
-            // Replace existing frontmatter or prepend to file
-            const newContent = content.replace(/^---[\s\S]*?---\n/, '') || '';
+            // Replace existing frontmatter or prepend to file (handles both \n and \r\n)
+            const newContent = content.replace(/^---[\s\S]*?---\r?\n/, '') || '';
             const updatedContent = newFrontmatter + newContent;
             // Update file
             await this.client.updateContent(filepath, updatedContent);

package/build/propertyTypes.js

@@ -18,7 +18,7 @@ export const ObsidianPropertiesSchema = z.object({
     // Classification
     type: z.array(PropertyType).optional(),
     // Organization
-    tags: z.array(z.string().startsWith("#")).optional(),
+    tags: z.array(z.string()).optional(),
     // Technical Metadata
     status: z.array(StatusEnum).optional(),
     version: z.string().optional(),
@@ -40,7 +40,7 @@ export const PropertyUpdateSchema = z.object({
     // Classification
     type: z.array(PropertyType).optional(),
     // Organization
-    tags: z.array(z.string().startsWith("#")).optional(),
+    tags: z.array(z.string()).optional(),
     // Technical Metadata
     status: z.array(StatusEnum).optional(),
     version: z.string().optional(),

package/build/resources.js

@@ -1,7 +1,7 @@
 import { PropertyManager } from "./properties.js";
+import { sep } from "path";
 export class TagResource {
     client;
-    static TAG_PATTERN = /#[a-zA-Z0-9_-]+/g;
     tagCache = new Map();
     propertyManager;
     isInitialized = false;
@@ -22,9 +22,9 @@ export class TagResource {
     }
     async initializeCache() {
         try {
-            // Get all markdown files
+            // Get all markdown files using platform-agnostic path pattern
             const query = {
-                "glob": ["**/*.md", { "var": "path" }]
+                "glob": [`**${sep}*.md`.replace(/\\/g, '/'), { "var": "path" }]
             };
             const results = await this.client.searchJson(query);
             this.tagCache.clear();
@@ -34,18 +34,13 @@ export class TagResource {
                     continue;
                 try {
                     const content = await this.client.getFileContents(result.filename);
-                    // Extract tags from frontmatter
+                    // Only extract tags from frontmatter YAML
                     const properties = this.propertyManager.parseProperties(content);
                     if (properties.tags) {
                         properties.tags.forEach((tag) => {
                             this.addTag(tag, result.filename);
                         });
                     }
-                    // Extract inline tags
-                    const inlineTags = content.match(TagResource.TAG_PATTERN) || [];
-                    inlineTags.forEach(tag => {
-                        this.addTag(tag, result.filename);
-                    });
                 }
                 catch (error) {
                     console.error(`Failed to process file ${result.filename}:`, error);

package/build/server.js

@@ -46,10 +46,13 @@ const cleanupInterval = setInterval(() => {
         }
     }
 }, 60000); // Clean up every minute
-// Initialize Obsidian client
+// Initialize Obsidian client with environment configuration
 const client = new ObsidianClient({
     apiKey: API_KEY,
-    verifySSL: process.env.NODE_ENV === 'production' // Enable SSL verification in production
+    verifySSL: process.env.VERIFY_SSL === 'true',
+    timeout: parseInt(process.env.REQUEST_TIMEOUT || '5000'),
+    maxContentLength: parseInt(process.env.MAX_CONTENT_LENGTH || String(50 * 1024 * 1024)),
+    maxBodyLength: parseInt(process.env.MAX_BODY_LENGTH || String(50 * 1024 * 1024))
 });
 const toolHandlers = new Map();
 const handlers = [
@@ -223,11 +226,33 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 server.onerror = (error) => {
     console.error("[MCP Error]", error);
 };
-// Handle shutdown
-process.on("SIGINT", async () => {
+// Handle shutdown gracefully across platforms
+const cleanup = async () => {
+    console.error('Shutting down server...');
     clearInterval(cleanupInterval); // Clean up rate limit interval
     await server.close();
     process.exit(0);
+};
+// Handle various termination signals
+process.on('SIGINT', cleanup); // Ctrl+C on all platforms
+process.on('SIGTERM', cleanup); // Termination request
+if (process.platform === 'win32') {
+    // Windows-specific handling
+    process.on('SIGHUP', cleanup); // Terminal closed
+}
+else {
+    // Unix-specific signals
+    process.on('SIGUSR1', cleanup);
+    process.on('SIGUSR2', cleanup);
+}
+// Handle uncaught errors
+process.on('uncaughtException', async (error) => {
+    console.error('Uncaught exception:', error);
+    await cleanup();
+});
+process.on('unhandledRejection', async (error) => {
+    console.error('Unhandled rejection:', error);
+    await cleanup();
 });
 // Export the run function
 export async function run() {

package/build/tools.js

@@ -1,4 +1,5 @@
 import { encoding_for_model } from "tiktoken";
+import { join } from "path";
 import { ObsidianError } from "./types.js";
 import { PropertyManager } from "./properties.js";
 const TOOL_NAMES = {
@@ -528,7 +529,6 @@ export class ComplexSearchToolHandler extends BaseToolHandler {
     }
 }
 export class GetTagsToolHandler extends BaseToolHandler {
-    static TAG_PATTERN = /#[a-zA-Z0-9_-]+/g;
     propertyManager;
     constructor(client) {
         super(TOOL_NAMES.GET_TAGS, client);
@@ -555,7 +555,7 @@ export class GetTagsToolHandler extends BaseToolHandler {
                     response: {
                         "tags": [
                             {
-                                "name": "#project",
+                                "name": "project",
                                 "count": 15,
                                 "files": [
                                     "Projects/ProjectA.md",
@@ -583,50 +583,32 @@ export class GetTagsToolHandler extends BaseToolHandler {
             }
         };
     }
-    async processFiles(files, basePath, tagMap) {
-        let scannedFiles = 0;
-        for (const file of files) {
-            const fullPath = basePath ? `${basePath}/${file.path}` : file.path;
-            if (file.type === "folder" && file.children) {
-                // Recursively process subdirectories
-                scannedFiles += await this.processFiles(file.children, fullPath, tagMap);
-            }
-            else if (file.type === "file" && file.path.endsWith('.md')) {
-                // Process markdown files
-                scannedFiles++;
-                const content = await this.client.getFileContents(fullPath);
-                // Extract tags from frontmatter
+    async runTool(args) {
+        try {
+            const tagMap = new Map();
+            const basePath = args.path || '';
+            // Use searchJson to find files with tags in frontmatter
+            const query = args.path
+                ? { "glob": [join(args.path, "**/*.md").replace(/\\/g, '/'), { "var": "path" }] }
+                : { "glob": ["**/*.md", { "var": "path" }] };
+            const results = await this.client.searchJson(query);
+            let scannedFiles = 0;
+            // Process each file
+            for (const result of results) {
+                if (!('filename' in result))
+                    continue;
+                const content = await this.client.getFileContents(result.filename);
                 const properties = this.propertyManager.parseProperties(content);
                 if (properties.tags) {
+                    scannedFiles++;
                     properties.tags.forEach((tag) => {
                         if (!tagMap.has(tag)) {
                             tagMap.set(tag, new Set());
                         }
-                        tagMap.get(tag).add(fullPath);
+                        tagMap.get(tag).add(result.filename);
                     });
                 }
-                // Extract inline tags using regex
-                const inlineTags = content.match(GetTagsToolHandler.TAG_PATTERN) || [];
-                inlineTags.forEach(tag => {
-                    if (!tagMap.has(tag)) {
-                        tagMap.set(tag, new Set());
-                    }
-                    tagMap.get(tag).add(fullPath);
-                });
             }
-        }
-        return scannedFiles;
-    }
-    async runTool(args) {
-        try {
-            const tagMap = new Map();
-            const basePath = args.path || '';
-            // Get files from vault or specific directory
-            const files = args.path
-                ? await this.client.listFilesInDir(args.path)
-                : await this.client.listFilesInVault();
-            // Process files recursively
-            const scannedFiles = await this.processFiles(files, basePath, tagMap);
             // Calculate total occurrences
             const totalOccurrences = Array.from(tagMap.values())
                 .reduce((sum, files) => sum + files.size, 0);

package/mcp-client-config.example.json

@@ -0,0 +1,23 @@
+{
+  "mcpServers": {
+    "obsidian-mcp-server": {
+      "command": "node",
+      "args": [
+        "/path/to/obsidian-mcp-server/build/index.js"
+      ],
+      "env": {
+        "OBSIDIAN_API_KEY": "your_api_key_here",
+        "VERIFY_SSL": "false",
+        "OBSIDIAN_PROTOCOL": "https",
+        "OBSIDIAN_HOST": "127.0.0.1",
+        "OBSIDIAN_PORT": "27124",
+        "REQUEST_TIMEOUT": "5000",
+        "MAX_CONTENT_LENGTH": "52428800",
+        "MAX_BODY_LENGTH": "52428800",
+        "RATE_LIMIT_WINDOW_MS": "900000",
+        "RATE_LIMIT_MAX_REQUESTS": "200",
+        "TOOL_TIMEOUT_MS": "60000"
+      }
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-mcp-server",
-  "version": "1.2.6",
+  "version": "1.3.0",
   "description": "Model Context Protocol server for Obsidian integration with token-aware response handling",
   "main": "build/index.js",
   "type": "module",
@@ -8,10 +8,11 @@
     "node": ">=18.0.0"
   },
   "scripts": {
-    "build": "tsc && chmod +x build/index.js",
+    "build": "tsc",
+    "postbuild": "node -e \"if (process.platform !== 'win32') require('fs').chmodSync('build/index.js', '755')\"",
     "start": "node build/index.js",
     "dev": "tsc -w",
-    "clean": "rm -rf build",
+    "clean": "node -e \"require('fs').rmSync('build', { recursive: true, force: true })\"",
     "rebuild": "npm run clean && npm run build",
     "test": "echo \"No tests specified yet\" && exit 0",
     "lint": "eslint . --ext .ts",

package/src/obsidian.ts

@@ -24,14 +24,22 @@ import { dirname, join } from "path";
 // Get package version for user agent
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-const packagePath = join(__dirname, '..', '..', 'package.json');
 const VERSION = (() => {
   try {
+    // Look for package.json in the same directory as the built files
+    const packagePath = join(__dirname, '..', 'package.json');
     const pkg = JSON.parse(readFileSync(packagePath, 'utf-8'));
     return pkg.version;
   } catch (error) {
-    console.warn('Could not read package.json version:', error);
-    return '1.1.0'; // Fallback version
+    // Try alternative location for development
+    try {
+      const devPackagePath = join(__dirname, '..', '..', 'package.json');
+      const pkg = JSON.parse(readFileSync(devPackagePath, 'utf-8'));
+      return pkg.version;
+    } catch (devError) {
+      console.warn('Could not read package.json version, using fallback');
+      return '1.1.0'; // Fallback version
+    }
   }
 })();
 
@@ -51,14 +59,30 @@ export class ObsidianClient {
       );
     }
 
-    // Combine defaults with provided config
+    // Determine if we're in a development environment
+    const isDev = process.env.NODE_ENV === 'development' || !process.env.NODE_ENV;
+
+    // Read environment variables with fallbacks
+    const envConfig = {
+      protocol: process.env.OBSIDIAN_PROTOCOL as "http" | "https" || DEFAULT_OBSIDIAN_CONFIG.protocol,
+      host: process.env.OBSIDIAN_HOST || DEFAULT_OBSIDIAN_CONFIG.host,
+      port: parseInt(process.env.OBSIDIAN_PORT || String(DEFAULT_OBSIDIAN_CONFIG.port)),
+      verifySSL: process.env.VERIFY_SSL ? process.env.VERIFY_SSL === 'true' : (isDev ? false : true),
+      timeout: parseInt(process.env.REQUEST_TIMEOUT || '5000'),
+      maxContentLength: parseInt(process.env.MAX_CONTENT_LENGTH || String(50 * 1024 * 1024)),
+      maxBodyLength: parseInt(process.env.MAX_BODY_LENGTH || String(50 * 1024 * 1024))
+    };
+
+    // Combine defaults with provided config and environment variables
     this.config = {
-      ...DEFAULT_OBSIDIAN_CONFIG,
-      verifySSL: config.verifySSL ?? true, // Default to true as required by Obsidian REST API plugin
+      protocol: envConfig.protocol,
+      host: envConfig.host,
+      port: envConfig.port,
+      verifySSL: config.verifySSL ?? envConfig.verifySSL,
       apiKey: config.apiKey,
-      timeout: config.timeout ?? 5000, // 5 second default timeout
-      maxContentLength: config.maxContentLength ?? 50 * 1024 * 1024, // 50MB
-      maxBodyLength: config.maxBodyLength ?? 50 * 1024 * 1024 // 50MB
+      timeout: config.timeout ?? envConfig.timeout,
+      maxContentLength: config.maxContentLength ?? envConfig.maxContentLength,
+      maxBodyLength: config.maxBodyLength ?? envConfig.maxBodyLength
     };
 
     // Configure HTTPS agent
@@ -91,9 +115,18 @@ export class ObsidianClient {
 
     if (!this.config.verifySSL) {
       console.warn(
-        "WARNING: SSL verification is disabled. The Obsidian REST API plugin requires HTTPS by default.\n" +
-        "Make sure you have configured the certificate as a trusted certificate authority.\n" +
-        "See Obsidian Settings > Local REST API > 'How to Access' for setup instructions."
+        "WARNING: SSL verification is disabled. While this works for development, it's not recommended for production.\n" +
+        "To properly configure SSL certificates:\n" +
+        "1. Go to Obsidian Settings > Local REST API\n" +
+        "2. Under 'How to Access', copy the certificate\n" +
+        "3. For Windows users:\n" +
+        "   - Open 'certmgr.msc' (Windows Certificate Manager)\n" +
+        "   - Go to 'Trusted Root Certification Authorities' > 'Certificates'\n" +
+        "   - Right-click > 'All Tasks' > 'Import' and follow the wizard\n" +
+        "   - Select the certificate file you copied from Obsidian\n" +
+        "4. For other systems:\n" +
+        "   - macOS: Add to Keychain Access\n" +
+        "   - Linux: Add to ca-certificates"
       );
     }
 

package/src/properties.ts

@@ -1,5 +1,6 @@
 import { parse, stringify } from 'yaml';
 import { ObsidianClient } from './obsidian.js';
+import { EOL } from 'os';
 import {
   ObsidianProperties,
   ObsidianPropertiesSchema,
@@ -16,20 +17,27 @@ export class PropertyManager {
    */
   parseProperties(content: string): ObsidianProperties {
     try {
-      // Extract frontmatter between --- markers
-      const match = content.match(/^---\n([\s\S]*?)\n---/);
+      // Extract frontmatter between --- markers (handles both \n and \r\n)
+      const match = content.match(/^---(\r?\n)([\s\S]*?)\r?\n---/);
       if (!match) {
         return {};
       }
 
-      const frontmatter = match[1];
+      const frontmatter = match[2];
       const properties = parse(frontmatter);
       
+      // Handle tags - don't add # prefix in frontmatter
+      if (properties.tags && Array.isArray(properties.tags)) {
+        properties.tags = properties.tags.map((tag: string) =>
+          tag.startsWith('#') ? tag.substring(1) : tag
+        );
+      }
+
       // Validate against schema
       const result = ObsidianPropertiesSchema.safeParse(properties);
       if (!result.success) {
         console.warn('Property validation warnings:', result.error);
-        // Return partial valid properties rather than throwing
+        // Return the properties with fixed tags
         return properties;
       }
 
@@ -50,9 +58,9 @@ export class PropertyManager {
         Object.entries(properties).filter(([_, v]) => v !== undefined)
       );
 
-      // Generate YAML
+      // Generate YAML with platform-specific line endings
       const yaml = stringify(cleanProperties);
-      return `---\n${yaml}---\n`;
+      return `---${EOL}${yaml}---${EOL}`;
     } catch (error) {
       console.error('Error generating properties:', error);
       throw error;
@@ -169,8 +177,8 @@ export class PropertyManager {
       // Generate new frontmatter
       const newFrontmatter = this.generateProperties(mergedProperties);
 
-      // Replace existing frontmatter or prepend to file
-      const newContent = content.replace(/^---[\s\S]*?---\n/, '') || '';
+      // Replace existing frontmatter or prepend to file (handles both \n and \r\n)
+      const newContent = content.replace(/^---[\s\S]*?---\r?\n/, '') || '';
       const updatedContent = newFrontmatter + newContent;
 
       // Update file

package/src/propertyTypes.ts

@@ -23,7 +23,7 @@ export const ObsidianPropertiesSchema = z.object({
   type: z.array(PropertyType).optional(),
 
   // Organization
-  tags: z.array(z.string().startsWith("#")).optional(),
+  tags: z.array(z.string()).optional(),
 
   // Technical Metadata
   status: z.array(StatusEnum).optional(),
@@ -51,7 +51,7 @@ export const PropertyUpdateSchema = z.object({
   type: z.array(PropertyType).optional(),
 
   // Organization
-  tags: z.array(z.string().startsWith("#")).optional(),
+  tags: z.array(z.string()).optional(),
 
   // Technical Metadata
   status: z.array(StatusEnum).optional(),

package/src/resources.ts

@@ -2,9 +2,9 @@ import { Resource, TextContent } from "@modelcontextprotocol/sdk/types.js";
 import { ObsidianClient } from "./obsidian.js";
 import { TagResponse, ObsidianFile, JsonLogicQuery } from "./types.js";
 import { PropertyManager } from "./properties.js";
+import { join, sep } from "path";
 
 export class TagResource {
-  private static readonly TAG_PATTERN = /#[a-zA-Z0-9_-]+/g;
   private tagCache: Map<string, Set<string>> = new Map();
   private propertyManager: PropertyManager;
   private isInitialized = false;
@@ -27,9 +27,9 @@ export class TagResource {
 
   private async initializeCache() {
     try {
-      // Get all markdown files
+      // Get all markdown files using platform-agnostic path pattern
       const query: JsonLogicQuery = {
-        "glob": ["**/*.md", { "var": "path" }]
+        "glob": [`**${sep}*.md`.replace(/\\/g, '/'), { "var": "path" }]
       };
       
       const results = await this.client.searchJson(query);
@@ -42,19 +42,13 @@ export class TagResource {
         try {
           const content = await this.client.getFileContents(result.filename);
           
-          // Extract tags from frontmatter
+          // Only extract tags from frontmatter YAML
           const properties = this.propertyManager.parseProperties(content);
           if (properties.tags) {
             properties.tags.forEach((tag: string) => {
               this.addTag(tag, result.filename);
             });
           }
-          
-          // Extract inline tags
-          const inlineTags = content.match(TagResource.TAG_PATTERN) || [];
-          inlineTags.forEach(tag => {
-            this.addTag(tag, result.filename);
-          });
         } catch (error) {
           console.error(`Failed to process file ${result.filename}:`, error);
         }

package/src/server.ts

@@ -78,10 +78,13 @@ const cleanupInterval = setInterval(() => {
   }
 }, 60000); // Clean up every minute
 
-// Initialize Obsidian client
+// Initialize Obsidian client with environment configuration
 const client = new ObsidianClient({
   apiKey: API_KEY,
-  verifySSL: process.env.NODE_ENV === 'production' // Enable SSL verification in production
+  verifySSL: process.env.VERIFY_SSL === 'true',
+  timeout: parseInt(process.env.REQUEST_TIMEOUT || '5000'),
+  maxContentLength: parseInt(process.env.MAX_CONTENT_LENGTH || String(50 * 1024 * 1024)),
+  maxBodyLength: parseInt(process.env.MAX_BODY_LENGTH || String(50 * 1024 * 1024))
 });
 
 // Initialize tool handlers
@@ -293,11 +296,35 @@ server.onerror = (error) => {
   console.error("[MCP Error]", error);
 };
 
-// Handle shutdown
-process.on("SIGINT", async () => {
+// Handle shutdown gracefully across platforms
+const cleanup = async () => {
+  console.error('Shutting down server...');
   clearInterval(cleanupInterval); // Clean up rate limit interval
   await server.close();
   process.exit(0);
+};
+
+// Handle various termination signals
+process.on('SIGINT', cleanup);  // Ctrl+C on all platforms
+process.on('SIGTERM', cleanup); // Termination request
+if (process.platform === 'win32') {
+  // Windows-specific handling
+  process.on('SIGHUP', cleanup);  // Terminal closed
+} else {
+  // Unix-specific signals
+  process.on('SIGUSR1', cleanup);
+  process.on('SIGUSR2', cleanup);
+}
+
+// Handle uncaught errors
+process.on('uncaughtException', async (error) => {
+  console.error('Uncaught exception:', error);
+  await cleanup();
+});
+
+process.on('unhandledRejection', async (error) => {
+  console.error('Unhandled rejection:', error);
+  await cleanup();
 });
 
 // Export the run function

package/src/tools.ts

@@ -1,6 +1,8 @@
 import { Tool, TextContent } from "@modelcontextprotocol/sdk/types.js";
 import { ObsidianClient } from "./obsidian.js";
 import { encoding_for_model } from "tiktoken";
+import { join } from "path";
+import { EOL } from "os";
 import {
   ToolHandler,
   PatchContentArgs,
@@ -589,7 +591,6 @@ export class ComplexSearchToolHandler extends BaseToolHandler<ComplexSearchArgs>
 }
 
 export class GetTagsToolHandler extends BaseToolHandler<GetTagsArgs> {
-  private static readonly TAG_PATTERN = /#[a-zA-Z0-9_-]+/g;
   private propertyManager: PropertyManager;
 
   constructor(client: ObsidianClient) {
@@ -618,7 +619,7 @@ export class GetTagsToolHandler extends BaseToolHandler<GetTagsArgs> {
           response: {
             "tags": [
               {
-                "name": "#project",
+                "name": "project",
                 "count": 15,
                 "files": [
                   "Projects/ProjectA.md",
@@ -647,57 +648,36 @@ export class GetTagsToolHandler extends BaseToolHandler<GetTagsArgs> {
     };
   }
 
-  private async processFiles(files: ObsidianFile[], basePath: string, tagMap: Map<string, Set<string>>): Promise<number> {
-    let scannedFiles = 0;
+  async runTool(args: GetTagsArgs): Promise<Array<TextContent>> {
+    try {
+      const tagMap = new Map<string, Set<string>>();
+      const basePath = args.path || '';
+      
+      // Use searchJson to find files with tags in frontmatter
+      const query: JsonLogicQuery = args.path
+        ? { "glob": [join(args.path, "**/*.md").replace(/\\/g, '/'), { "var": "path" }] }
+        : { "glob": ["**/*.md", { "var": "path" }] };
 
-    for (const file of files) {
-      const fullPath = basePath ? `${basePath}/${file.path}` : file.path;
+      const results = await this.client.searchJson(query);
+      let scannedFiles = 0;
 
-      if (file.type === "folder" && file.children) {
-        // Recursively process subdirectories
-        scannedFiles += await this.processFiles(file.children, fullPath, tagMap);
-      } else if (file.type === "file" && file.path.endsWith('.md')) {
-        // Process markdown files
-        scannedFiles++;
-        const content = await this.client.getFileContents(fullPath);
+      // Process each file
+      for (const result of results) {
+        if (!('filename' in result)) continue;
         
-        // Extract tags from frontmatter
+        const content = await this.client.getFileContents(result.filename);
         const properties = this.propertyManager.parseProperties(content);
+        
         if (properties.tags) {
+          scannedFiles++;
           properties.tags.forEach((tag: string) => {
             if (!tagMap.has(tag)) {
               tagMap.set(tag, new Set());
             }
-            tagMap.get(tag)!.add(fullPath);
+            tagMap.get(tag)!.add(result.filename);
           });
         }
-        
-        // Extract inline tags using regex
-        const inlineTags = content.match(GetTagsToolHandler.TAG_PATTERN) || [];
-        inlineTags.forEach(tag => {
-          if (!tagMap.has(tag)) {
-            tagMap.set(tag, new Set());
-          }
-          tagMap.get(tag)!.add(fullPath);
-        });
       }
-    }
-    
-    return scannedFiles;
-  }
-
-  async runTool(args: GetTagsArgs): Promise<Array<TextContent>> {
-    try {
-      const tagMap = new Map<string, Set<string>>();
-      const basePath = args.path || '';
-      
-      // Get files from vault or specific directory
-      const files = args.path
-        ? await this.client.listFilesInDir(args.path)
-        : await this.client.listFilesInVault();
-      
-      // Process files recursively
-      const scannedFiles = await this.processFiles(files, basePath, tagMap);
       
       // Calculate total occurrences
       const totalOccurrences = Array.from(tagMap.values())