Merge pull request #12 from MohMaya/01-01-mcp-not-found

Author: Dhravya

src/cli.ts

@@ -3,6 +3,7 @@ import { mkdirSync, writeFileSync, readFileSync, existsSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
 import * as readline from "node:readline";
+import { stripJsoncComments } from "./services/jsonc.js";
 
 const OPENCODE_CONFIG_DIR = join(homedir(), ".config", "opencode");
 const OPENCODE_COMMAND_DIR = join(OPENCODE_CONFIG_DIR, "command");
@@ -200,8 +201,7 @@ function addPluginToConfig(configPath: string): boolean {
       return true;
     }
 
-    // Parse JSONC (strip comments for parsing)
-    const jsonContent = content.replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
+    const jsonContent = stripJsoncComments(content);
     let config: Record<string, unknown>;
 
     try {

src/config.ts

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
+import { stripJsoncComments } from "./services/jsonc.js";
 
 const CONFIG_DIR = join(homedir(), ".config", "opencode");
 const CONFIG_FILES = [
@@ -34,10 +35,7 @@ function loadConfig(): SupermemoryConfig {
     if (existsSync(path)) {
       try {
         const content = readFileSync(path, "utf-8");
-        // Strip comments for JSONC
-        const json = content
-          .replace(/\/\/.*$/gm, "")
-          .replace(/\/\*[\s\S]*?\*\//g, "");
+        const json = stripJsoncComments(content);
         return JSON.parse(json) as SupermemoryConfig;
       } catch {
         // Invalid config, use defaults

src/services/jsonc.ts

@@ -0,0 +1,83 @@
+/**
+ * Strips comments from JSONC content while respecting string boundaries.
+ * Handles // and /* comments, URLs in strings, and escaped quotes.
+ */
+export function stripJsoncComments(content: string): string {
+  let result = "";
+  let i = 0;
+  let inString = false;
+  let inSingleLineComment = false;
+  let inMultiLineComment = false;
+
+  while (i < content.length) {
+    const char = content[i];
+    const nextChar = content[i + 1];
+
+    if (!inSingleLineComment && !inMultiLineComment) {
+      if (char === '"') {
+        // Count consecutive backslashes before this quote
+        let backslashCount = 0;
+        let j = i - 1;
+        while (j >= 0 && content[j] === "\\") {
+          backslashCount++;
+          j--;
+        }
+        // Quote is escaped only if preceded by ODD number of backslashes
+        // e.g., \" = escaped, \\" = not escaped (escaped backslash + quote)
+        if (backslashCount % 2 === 0) {
+          inString = !inString;
+        }
+        result += char;
+        i++;
+        continue;
+      }
+    }
+
+    if (inString) {
+      result += char;
+      i++;
+      continue;
+    }
+
+    if (!inSingleLineComment && !inMultiLineComment) {
+      if (char === "/" && nextChar === "/") {
+        inSingleLineComment = true;
+        i += 2;
+        continue;
+      }
+
+      if (char === "/" && nextChar === "*") {
+        inMultiLineComment = true;
+        i += 2;
+        continue;
+      }
+    }
+
+    if (inSingleLineComment) {
+      if (char === "\n") {
+        inSingleLineComment = false;
+        result += char;
+      }
+      i++;
+      continue;
+    }
+
+    if (inMultiLineComment) {
+      if (char === "*" && nextChar === "/") {
+        inMultiLineComment = false;
+        i += 2;
+        continue;
+      }
+      if (char === "\n") {
+        result += char;
+      }
+      i++;
+      continue;
+    }
+
+    result += char;
+    i++;
+  }
+
+  return result;
+}