memorix 1.4.6 → 1.5.1

package/src/types.ts

@@ -328,6 +328,8 @@ export interface SearchOptions {
    * `thorough` explicitly permits optional LLM query rewrite and reranking.
    */
   quality?: RetrievalQuality;
+  /** Abort provider-backed retrieval when the owning request is cancelled. */
+  signal?: AbortSignal;
 }
 
 /** Topic key family heuristics for suggesting stable topic keys */

package/src/workspace/mcp-adapters/codex.ts

@@ -1,191 +1,191 @@
-import type { MCPConfigAdapter, MCPServerEntry } from '../../types.js';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-
-/**
- * Codex MCP config adapter.
- * Format: TOML file at ~/.codex/config.toml or .codex/config.toml (project-level)
- *
- * Structure:
- *   [mcp_servers.<name>]
- *   command = "npx"
- *   args = ["-y", "memorix-mcp"]
- *   url = "https://..."   # for HTTP servers
- *
- *   [mcp_servers.<name>.env]
- *   KEY = "value"
- *
- * We implement a lightweight TOML parser (no external deps) sufficient
- * for MCP server config blocks. This avoids adding a TOML dependency.
- */
-export class CodexMCPAdapter implements MCPConfigAdapter {
-  readonly source = 'codex' as const;
-
-  parse(content: string): MCPServerEntry[] {
-    if (!content.trim()) return [];
-
-    const servers: MCPServerEntry[] = [];
-    const lines = content.split('\n');
-
-    let currentServer: string | null = null;
-    let isEnvBlock = false;
-    const serverMap = new Map<
-      string,
-      { command: string; args: string[]; env: Record<string, string>; url?: string; enabled?: boolean }
-    >();
-
-    for (const rawLine of lines) {
-      const line = rawLine.trim();
-
-      // Skip comments and empty lines
-      if (!line || line.startsWith('#')) continue;
-
-      // Match [mcp_servers.<name>.env]
-      const envMatch = line.match(/^\[mcp_servers\.([^.\]]+)\.env\]$/);
-      if (envMatch) {
-        currentServer = envMatch[1];
-        isEnvBlock = true;
-        if (!serverMap.has(currentServer)) {
-          serverMap.set(currentServer, { command: '', args: [], env: {} });
-        }
-        continue;
-      }
-
-      // Match [mcp_servers.<name>]
-      const serverMatch = line.match(/^\[mcp_servers\.([^.\]]+)\]$/);
-      if (serverMatch) {
-        currentServer = serverMatch[1];
-        isEnvBlock = false;
-        if (!serverMap.has(currentServer)) {
-          serverMap.set(currentServer, { command: '', args: [], env: {} });
-        }
-        continue;
-      }
-
-      // Any other section header resets context
-      if (line.startsWith('[')) {
-        currentServer = null;
-        isEnvBlock = false;
-        continue;
-      }
-
-      // Parse key = value within current server block
-      if (currentServer) {
-        const kvMatch = line.match(/^(\w+)\s*=\s*(.+)$/);
-        if (!kvMatch) continue;
-
-        const key = kvMatch[1];
-        const rawValue = kvMatch[2].trim();
-        const entry = serverMap.get(currentServer)!;
-
-        if (isEnvBlock) {
-          entry.env[key] = this.parseTomlString(rawValue);
-        } else if (key === 'command') {
-          entry.command = this.parseTomlString(rawValue);
-        } else if (key === 'args') {
-          entry.args = this.parseTomlArray(rawValue);
-        } else if (key === 'url') {
-          entry.url = this.parseTomlString(rawValue);
-        } else if (key === 'enabled') {
-          entry.enabled = rawValue === 'true';
-        }
-      }
-    }
-
-    for (const [name, entry] of serverMap) {
-      servers.push({
-        name,
-        command: entry.command,
-        args: entry.args,
-        ...(Object.keys(entry.env).length > 0 ? { env: entry.env } : {}),
-        ...(entry.url ? { url: entry.url } : {}),
-      });
-    }
-
-    return servers;
-  }
-
-  generate(servers: MCPServerEntry[]): string {
-    const blocks: string[] = [];
-
-    for (const s of servers) {
-      const lines: string[] = [];
-      lines.push(`[mcp_servers.${s.name}]`);
-
-      if (s.url) {
-        lines.push(`url = ${this.toTomlString(s.url)}`);
-      } else {
-        lines.push(`command = ${this.toTomlString(s.command)}`);
-        lines.push(`args = [${s.args.map((a) => this.toTomlString(a)).join(', ')}]`);
-      }
-
-      if (s.env && Object.keys(s.env).length > 0) {
-        lines.push('');
-        lines.push(`[mcp_servers.${s.name}.env]`);
-        for (const [key, value] of Object.entries(s.env)) {
-          lines.push(`${key} = ${this.toTomlString(value)}`);
-        }
-      }
-
-      blocks.push(lines.join('\n'));
-    }
-
-    return blocks.join('\n\n') + '\n';
-  }
-
-  getConfigPath(projectRoot?: string): string {
-    if (projectRoot) {
-      return join(projectRoot, '.codex', 'config.toml');
-    }
-    return join(homedir(), '.codex', 'config.toml');
-  }
-
-  // ---- TOML helpers ----
-
-  private parseTomlString(raw: string): string {
-    const trimmed = raw.trim();
-    if (
-      (trimmed.startsWith('"') && trimmed.endsWith('"')) ||
-      (trimmed.startsWith("'") && trimmed.endsWith("'"))
-    ) {
-      return trimmed.slice(1, -1);
-    }
-    return trimmed;
-  }
-
-  private parseTomlArray(raw: string): string[] {
-    const trimmed = raw.trim();
-    if (!trimmed.startsWith('[') || !trimmed.endsWith(']')) return [];
-    const inner = trimmed.slice(1, -1);
-    const result: string[] = [];
-    // Simple CSV parse respecting quotes
-    let current = '';
-    let inQuote = false;
-    let quoteChar = '';
-    for (const ch of inner) {
-      if (inQuote) {
-        if (ch === quoteChar) {
-          inQuote = false;
-        } else {
-          current += ch;
-        }
-      } else if (ch === '"' || ch === "'") {
-        inQuote = true;
-        quoteChar = ch;
-      } else if (ch === ',') {
-        const val = current.trim();
-        if (val) result.push(val);
-        current = '';
-      } else {
-        current += ch;
-      }
-    }
-    const last = current.trim();
-    if (last) result.push(last);
-    return result;
-  }
-
-  private toTomlString(value: string): string {
-    return `"${value.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`;
-  }
-}
+import type { MCPConfigAdapter, MCPServerEntry } from '../../types.js';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+
+/**
+ * Codex MCP config adapter.
+ * Format: TOML file at ~/.codex/config.toml or .codex/config.toml (project-level)
+ *
+ * Structure:
+ *   [mcp_servers.<name>]
+ *   command = "npx"
+ *   args = ["-y", "memorix-mcp"]
+ *   url = "https://..."   # for HTTP servers
+ *
+ *   [mcp_servers.<name>.env]
+ *   KEY = "value"
+ *
+ * We implement a lightweight TOML parser (no external deps) sufficient
+ * for MCP server config blocks. This avoids adding a TOML dependency.
+ */
+export class CodexMCPAdapter implements MCPConfigAdapter {
+  readonly source = 'codex' as const;
+
+  parse(content: string): MCPServerEntry[] {
+    if (!content.trim()) return [];
+
+    const servers: MCPServerEntry[] = [];
+    const lines = content.split('\n');
+
+    let currentServer: string | null = null;
+    let isEnvBlock = false;
+    const serverMap = new Map<
+      string,
+      { command: string; args: string[]; env: Record<string, string>; url?: string; enabled?: boolean }
+    >();
+
+    for (const rawLine of lines) {
+      const line = rawLine.trim();
+
+      // Skip comments and empty lines
+      if (!line || line.startsWith('#')) continue;
+
+      // Match [mcp_servers.<name>.env]
+      const envMatch = line.match(/^\[mcp_servers\.([^.\]]+)\.env\]$/);
+      if (envMatch) {
+        currentServer = envMatch[1];
+        isEnvBlock = true;
+        if (!serverMap.has(currentServer)) {
+          serverMap.set(currentServer, { command: '', args: [], env: {} });
+        }
+        continue;
+      }
+
+      // Match [mcp_servers.<name>]
+      const serverMatch = line.match(/^\[mcp_servers\.([^.\]]+)\]$/);
+      if (serverMatch) {
+        currentServer = serverMatch[1];
+        isEnvBlock = false;
+        if (!serverMap.has(currentServer)) {
+          serverMap.set(currentServer, { command: '', args: [], env: {} });
+        }
+        continue;
+      }
+
+      // Any other section header resets context
+      if (line.startsWith('[')) {
+        currentServer = null;
+        isEnvBlock = false;
+        continue;
+      }
+
+      // Parse key = value within current server block
+      if (currentServer) {
+        const kvMatch = line.match(/^(\w+)\s*=\s*(.+)$/);
+        if (!kvMatch) continue;
+
+        const key = kvMatch[1];
+        const rawValue = kvMatch[2].trim();
+        const entry = serverMap.get(currentServer)!;
+
+        if (isEnvBlock) {
+          entry.env[key] = this.parseTomlString(rawValue);
+        } else if (key === 'command') {
+          entry.command = this.parseTomlString(rawValue);
+        } else if (key === 'args') {
+          entry.args = this.parseTomlArray(rawValue);
+        } else if (key === 'url') {
+          entry.url = this.parseTomlString(rawValue);
+        } else if (key === 'enabled') {
+          entry.enabled = rawValue === 'true';
+        }
+      }
+    }
+
+    for (const [name, entry] of serverMap) {
+      servers.push({
+        name,
+        command: entry.command,
+        args: entry.args,
+        ...(Object.keys(entry.env).length > 0 ? { env: entry.env } : {}),
+        ...(entry.url ? { url: entry.url } : {}),
+      });
+    }
+
+    return servers;
+  }
+
+  generate(servers: MCPServerEntry[]): string {
+    const blocks: string[] = [];
+
+    for (const s of servers) {
+      const lines: string[] = [];
+      lines.push(`[mcp_servers.${s.name}]`);
+
+      if (s.url) {
+        lines.push(`url = ${this.toTomlString(s.url)}`);
+      } else {
+        lines.push(`command = ${this.toTomlString(s.command)}`);
+        lines.push(`args = [${s.args.map((a) => this.toTomlString(a)).join(', ')}]`);
+      }
+
+      if (s.env && Object.keys(s.env).length > 0) {
+        lines.push('');
+        lines.push(`[mcp_servers.${s.name}.env]`);
+        for (const [key, value] of Object.entries(s.env)) {
+          lines.push(`${key} = ${this.toTomlString(value)}`);
+        }
+      }
+
+      blocks.push(lines.join('\n'));
+    }
+
+    return blocks.join('\n\n') + '\n';
+  }
+
+  getConfigPath(projectRoot?: string): string {
+    if (projectRoot) {
+      return join(projectRoot, '.codex', 'config.toml');
+    }
+    return join(homedir(), '.codex', 'config.toml');
+  }
+
+  // ---- TOML helpers ----
+
+  private parseTomlString(raw: string): string {
+    const trimmed = raw.trim();
+    if (
+      (trimmed.startsWith('"') && trimmed.endsWith('"')) ||
+      (trimmed.startsWith("'") && trimmed.endsWith("'"))
+    ) {
+      return trimmed.slice(1, -1);
+    }
+    return trimmed;
+  }
+
+  private parseTomlArray(raw: string): string[] {
+    const trimmed = raw.trim();
+    if (!trimmed.startsWith('[') || !trimmed.endsWith(']')) return [];
+    const inner = trimmed.slice(1, -1);
+    const result: string[] = [];
+    // Simple CSV parse respecting quotes
+    let current = '';
+    let inQuote = false;
+    let quoteChar = '';
+    for (const ch of inner) {
+      if (inQuote) {
+        if (ch === quoteChar) {
+          inQuote = false;
+        } else {
+          current += ch;
+        }
+      } else if (ch === '"' || ch === "'") {
+        inQuote = true;
+        quoteChar = ch;
+      } else if (ch === ',') {
+        const val = current.trim();
+        if (val) result.push(val);
+        current = '';
+      } else {
+        current += ch;
+      }
+    }
+    const last = current.trim();
+    if (last) result.push(last);
+    return result;
+  }
+
+  private toTomlString(value: string): string {
+    return `"${value.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`;
+  }
+}

package/src/workspace/mcp-adapters/copilot.ts

@@ -1,105 +1,105 @@
-import type { MCPConfigAdapter, MCPServerEntry } from '../../types.js';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-
-/**
- * VS Code Copilot MCP config adapter.
- *
- * Supports two config locations / formats:
- *
- * 1. Workspace-level (preferred, new):
- *    Path: .vscode/mcp.json
- *    Format: { "servers": { [name]: { command, args, env?, url? } } }
- *
- * 2. Global (legacy, still scanned):
- *    Path: %APPDATA%/Code/User/settings.json
- *    Format: { "mcp": { "servers": { [name]: { command, args, env? } } } }
- *
- * parse() auto-detects which format is provided.
- * generate() always outputs the new .vscode/mcp.json format.
- * getConfigPath(projectRoot) returns workspace path; getConfigPath() returns global path.
- */
-export class CopilotMCPAdapter implements MCPConfigAdapter {
-  readonly source = 'copilot' as const;
-
-  parse(content: string): MCPServerEntry[] {
-    try {
-      const config = JSON.parse(content);
-
-      // Auto-detect format:
-      // 1. mcp.json format: { "servers": { ... } }
-      // 2. settings.json format: { "mcp": { "servers": { ... } } }
-      const servers = config?.servers ?? config?.mcp?.servers ?? {};
-
-      return Object.entries(servers).map(([name, entry]: [string, any]) => {
-        const result: MCPServerEntry = {
-          name,
-          command: entry.command ?? '',
-          args: entry.args ?? [],
-        };
-
-        if (entry.type) {
-          // VS Code mcp.json supports "type" field (e.g., "http", "stdio")
-          // Map to url for HTTP types
-          if ((entry.type === 'http' || entry.type === 'sse') && entry.url) {
-            result.url = entry.url;
-          }
-        } else if (entry.url) {
-          result.url = entry.url;
-        }
-
-        if (entry.env && typeof entry.env === 'object' && Object.keys(entry.env).length > 0) {
-          result.env = entry.env;
-        }
-
-        if (entry.headers && typeof entry.headers === 'object' && Object.keys(entry.headers).length > 0) {
-          result.headers = entry.headers;
-        }
-
-        return result;
-      });
-    } catch {
-      return [];
-    }
-  }
-
-  generate(servers: MCPServerEntry[]): string {
-    const mcpServers: Record<string, any> = {};
-    for (const s of servers) {
-      const entry: Record<string, any> = {};
-      if (s.url) {
-        entry.type = 'http';
-        entry.url = s.url;
-        if (s.headers && Object.keys(s.headers).length > 0) {
-          entry.headers = s.headers;
-        }
-      } else {
-        entry.command = s.command;
-        entry.args = s.args;
-      }
-      if (s.env && Object.keys(s.env).length > 0) {
-        entry.env = s.env;
-      }
-      mcpServers[s.name] = entry;
-    }
-
-    // Output the new .vscode/mcp.json format: { "servers": { ... } }
-    return JSON.stringify({ servers: mcpServers }, null, 2);
-  }
-
-  getConfigPath(projectRoot?: string): string {
-    if (projectRoot) {
-      // Workspace-level: .vscode/mcp.json (new official format)
-      return join(projectRoot, '.vscode', 'mcp.json');
-    }
-    // Global: VS Code user settings path (legacy, for scan fallback)
-    const home = homedir();
-    if (process.platform === 'win32') {
-      return join(home, 'AppData', 'Roaming', 'Code', 'User', 'settings.json');
-    } else if (process.platform === 'darwin') {
-      return join(home, 'Library', 'Application Support', 'Code', 'User', 'settings.json');
-    } else {
-      return join(home, '.config', 'Code', 'User', 'settings.json');
-    }
-  }
-}
+import type { MCPConfigAdapter, MCPServerEntry } from '../../types.js';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+
+/**
+ * VS Code Copilot MCP config adapter.
+ *
+ * Supports two config locations / formats:
+ *
+ * 1. Workspace-level (preferred, new):
+ *    Path: .vscode/mcp.json
+ *    Format: { "servers": { [name]: { command, args, env?, url? } } }
+ *
+ * 2. Global (legacy, still scanned):
+ *    Path: %APPDATA%/Code/User/settings.json
+ *    Format: { "mcp": { "servers": { [name]: { command, args, env? } } } }
+ *
+ * parse() auto-detects which format is provided.
+ * generate() always outputs the new .vscode/mcp.json format.
+ * getConfigPath(projectRoot) returns workspace path; getConfigPath() returns global path.
+ */
+export class CopilotMCPAdapter implements MCPConfigAdapter {
+  readonly source = 'copilot' as const;
+
+  parse(content: string): MCPServerEntry[] {
+    try {
+      const config = JSON.parse(content);
+
+      // Auto-detect format:
+      // 1. mcp.json format: { "servers": { ... } }
+      // 2. settings.json format: { "mcp": { "servers": { ... } } }
+      const servers = config?.servers ?? config?.mcp?.servers ?? {};
+
+      return Object.entries(servers).map(([name, entry]: [string, any]) => {
+        const result: MCPServerEntry = {
+          name,
+          command: entry.command ?? '',
+          args: entry.args ?? [],
+        };
+
+        if (entry.type) {
+          // VS Code mcp.json supports "type" field (e.g., "http", "stdio")
+          // Map to url for HTTP types
+          if ((entry.type === 'http' || entry.type === 'sse') && entry.url) {
+            result.url = entry.url;
+          }
+        } else if (entry.url) {
+          result.url = entry.url;
+        }
+
+        if (entry.env && typeof entry.env === 'object' && Object.keys(entry.env).length > 0) {
+          result.env = entry.env;
+        }
+
+        if (entry.headers && typeof entry.headers === 'object' && Object.keys(entry.headers).length > 0) {
+          result.headers = entry.headers;
+        }
+
+        return result;
+      });
+    } catch {
+      return [];
+    }
+  }
+
+  generate(servers: MCPServerEntry[]): string {
+    const mcpServers: Record<string, any> = {};
+    for (const s of servers) {
+      const entry: Record<string, any> = {};
+      if (s.url) {
+        entry.type = 'http';
+        entry.url = s.url;
+        if (s.headers && Object.keys(s.headers).length > 0) {
+          entry.headers = s.headers;
+        }
+      } else {
+        entry.command = s.command;
+        entry.args = s.args;
+      }
+      if (s.env && Object.keys(s.env).length > 0) {
+        entry.env = s.env;
+      }
+      mcpServers[s.name] = entry;
+    }
+
+    // Output the new .vscode/mcp.json format: { "servers": { ... } }
+    return JSON.stringify({ servers: mcpServers }, null, 2);
+  }
+
+  getConfigPath(projectRoot?: string): string {
+    if (projectRoot) {
+      // Workspace-level: .vscode/mcp.json (new official format)
+      return join(projectRoot, '.vscode', 'mcp.json');
+    }
+    // Global: VS Code user settings path (legacy, for scan fallback)
+    const home = homedir();
+    if (process.platform === 'win32') {
+      return join(home, 'AppData', 'Roaming', 'Code', 'User', 'settings.json');
+    } else if (process.platform === 'darwin') {
+      return join(home, 'Library', 'Application Support', 'Code', 'User', 'settings.json');
+    } else {
+      return join(home, '.config', 'Code', 'User', 'settings.json');
+    }
+  }
+}