memorix 1.4.3 → 1.4.5

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

@@ -1,53 +1,53 @@
-import type { MCPConfigAdapter, MCPServerEntry } from '../../types.js';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-
-/**
- * Cursor MCP config adapter.
- * Format: JSON file at ~/.cursor/mcp.json or .cursor/mcp.json (project-level)
- * Structure: { mcpServers: { [name]: { command, args, env?, url? } } }
- */
-export class CursorMCPAdapter implements MCPConfigAdapter {
-  readonly source = 'cursor' as const;
-
-  parse(content: string): MCPServerEntry[] {
-    try {
-      const config = JSON.parse(content);
-      const servers = config.mcpServers ?? {};
-      return Object.entries(servers).map(([name, entry]: [string, any]) => ({
-        name,
-        command: entry.command ?? '',
-        args: entry.args ?? [],
-        ...(entry.env && Object.keys(entry.env).length > 0 ? { env: entry.env } : {}),
-        ...(entry.url ? { url: entry.url } : {}),
-      }));
-    } 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.url = s.url;
-      } 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;
-    }
-    return JSON.stringify({ mcpServers }, null, 2);
-  }
-
-  getConfigPath(projectRoot?: string): string {
-    if (projectRoot) {
-      return join(projectRoot, '.cursor', 'mcp.json');
-    }
-    return join(homedir(), '.cursor', 'mcp.json');
-  }
-}
+import type { MCPConfigAdapter, MCPServerEntry } from '../../types.js';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+
+/**
+ * Cursor MCP config adapter.
+ * Format: JSON file at ~/.cursor/mcp.json or .cursor/mcp.json (project-level)
+ * Structure: { mcpServers: { [name]: { command, args, env?, url? } } }
+ */
+export class CursorMCPAdapter implements MCPConfigAdapter {
+  readonly source = 'cursor' as const;
+
+  parse(content: string): MCPServerEntry[] {
+    try {
+      const config = JSON.parse(content);
+      const servers = config.mcpServers ?? {};
+      return Object.entries(servers).map(([name, entry]: [string, any]) => ({
+        name,
+        command: entry.command ?? '',
+        args: entry.args ?? [],
+        ...(entry.env && Object.keys(entry.env).length > 0 ? { env: entry.env } : {}),
+        ...(entry.url ? { url: entry.url } : {}),
+      }));
+    } 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.url = s.url;
+      } 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;
+    }
+    return JSON.stringify({ mcpServers }, null, 2);
+  }
+
+  getConfigPath(projectRoot?: string): string {
+    if (projectRoot) {
+      return join(projectRoot, '.cursor', 'mcp.json');
+    }
+    return join(homedir(), '.cursor', 'mcp.json');
+  }
+}

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

@@ -0,0 +1,147 @@
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
+import type { MCPConfigAdapter, MCPServerEntry } from '../../types.js';
+
+/**
+ * DeepSeek Harness (DSH) MCP Configuration Adapter.
+ *
+ * DSH composes its runtime from Cordis patch layers. External MCP servers are
+ * registered as rows of the `@deepseek-ai/dsh-mcp-client` plugin inside a
+ * patch list. The user-level layer that applies to every profile lives at:
+ *
+ *   $DSH_HOME/cordis.patch.yml   (default: ~/.dsh/cordis.patch.yml)
+ *
+ * Row shape follows DSH's own shipped Memorix reference
+ * (examples/mcp-memory/memorix.cordis.yml in deepseek-ai/deepseek-harness):
+ *
+ *   - insert:
+ *       - id: memory-memorix
+ *         name: '@deepseek-ai/dsh-mcp-client'
+ *         config:
+ *           serverName: memorix
+ *           transport: stdio
+ *           command: memorix
+ *           args: [serve]
+ *
+ * The `cwd` key is deliberately omitted so the MCP child inherits the DSH
+ * process working directory — the workspace DSH was launched from — which is
+ * what keeps Memorix bound to the current Git project.
+ *
+ * Source: https://github.com/deepseek-ai/deepseek-harness/tree/master/packages/mcp/mcp-client
+ */
+
+const MCP_CLIENT_PLUGIN = '@deepseek-ai/dsh-mcp-client';
+const MEMORIX_ROW_ID = 'memory-memorix';
+
+function resolveDshHome(): string {
+  const configured = process.env.DSH_HOME?.trim();
+  if (configured) return configured;
+  return join(homedir(), '.dsh');
+}
+
+function isMemorixRow(row: unknown): row is Record<string, unknown> {
+  if (!row || typeof row !== 'object' || Array.isArray(row)) return false;
+  const record = row as Record<string, unknown>;
+  if (record.name !== MCP_CLIENT_PLUGIN) return false;
+  const config = record.config;
+  return Boolean(
+    config && typeof config === 'object' && !Array.isArray(config)
+    && (config as Record<string, unknown>).serverName === 'memorix',
+  );
+}
+
+function rowToEntry(row: Record<string, unknown>): MCPServerEntry | null {
+  const config = row.config as Record<string, unknown>;
+  if (!config || typeof config !== 'object') return null;
+  const entry: MCPServerEntry = {
+    name: 'memorix',
+    command: typeof config.command === 'string' ? config.command : '',
+    args: Array.isArray(config.args) ? config.args.filter((arg): arg is string => typeof arg === 'string') : [],
+  };
+  if (typeof config.url === 'string' && config.url) entry.url = config.url;
+  if (config.env && typeof config.env === 'object' && !Array.isArray(config.env)) {
+    const env: Record<string, string> = {};
+    for (const [key, value] of Object.entries(config.env as Record<string, unknown>)) {
+      if (typeof value === 'string') env[key] = value;
+    }
+    if (Object.keys(env).length > 0) entry.env = env;
+  }
+  if (config.disabled === true) entry.disabled = true;
+  return entry;
+}
+
+/** Flatten one parsed patch document into its row list, tolerating both
+ *  `- insert: [...]` operations and bare row lists. */
+function patchRows(document: unknown): Record<string, unknown>[] {
+  const rows: Record<string, unknown>[] = [];
+  if (!Array.isArray(document)) return rows;
+  for (const item of document) {
+    if (!item || typeof item !== 'object' || Array.isArray(item)) continue;
+    const record = item as Record<string, unknown>;
+    if (Array.isArray(record.insert)) {
+      for (const row of record.insert) {
+        if (row && typeof row === 'object' && !Array.isArray(row)) {
+          rows.push(row as Record<string, unknown>);
+        }
+      }
+      continue;
+    }
+    rows.push(record);
+  }
+  return rows;
+}
+
+export class DshMCPAdapter implements MCPConfigAdapter {
+  readonly source = 'dsh' as const;
+
+  parse(content: string): MCPServerEntry[] {
+    if (!content.trim()) return [];
+    let document: unknown;
+    try {
+      document = parseYaml(content);
+    } catch {
+      return [];
+    }
+    return patchRows(document)
+      .filter(isMemorixRow)
+      .map(rowToEntry)
+      .filter((entry): entry is MCPServerEntry => entry !== null);
+  }
+
+  generate(servers: MCPServerEntry[]): string {
+    const rows = servers
+      .filter((server) => server.name === 'memorix')
+      .map((server) => {
+        const config: Record<string, unknown> = {
+          serverName: server.name,
+        };
+        if (server.url) {
+          config.transport = 'streamable-http';
+          config.url = server.url;
+          if (server.headers && Object.keys(server.headers).length > 0) config.headers = server.headers;
+        } else {
+          config.transport = 'stdio';
+          config.command = server.command;
+          if (server.args && server.args.length > 0) config.args = server.args;
+          if (server.env && Object.keys(server.env).length > 0) config.env = server.env;
+        }
+        const row: Record<string, unknown> = {
+          id: MEMORIX_ROW_ID,
+          name: MCP_CLIENT_PLUGIN,
+          config,
+        };
+        if (server.disabled === true) row.disabled = true;
+        return row;
+      });
+
+    if (rows.length === 0) return '';
+    return stringifyYaml([{ insert: rows }], { lineWidth: 0 }) + '\n';
+  }
+
+  getConfigPath(_projectRoot?: string): string {
+    return join(resolveDshHome(), 'cordis.patch.yml');
+  }
+}
+
+export { MEMORIX_ROW_ID };

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

@@ -1,64 +1,64 @@
-import type { MCPConfigAdapter, MCPServerEntry } from '../../types.js';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-
-/**
- * Kiro MCP config adapter.
- * Format: JSON file at .kiro/settings/mcp.json (project-level)
- *         or ~/.kiro/settings/mcp.json (user-level)
- * Structure: { mcpServers: { ... }, powers?: { mcpServers: { ... } } }
- *
- * Kiro stores user-added servers in `mcpServers` and power-installed
- * servers (context7, figma, postman, supabase etc.) in `powers.mcpServers`.
- * Both sections use the same entry format.
- *
- * Source: Kiro official MCP documentation.
- */
-export class KiroMCPAdapter implements MCPConfigAdapter {
-    readonly source = 'kiro' as const;
-
-    parse(content: string): MCPServerEntry[] {
-        try {
-            const config = JSON.parse(content);
-            // Merge top-level mcpServers and powers.mcpServers (dedup by name)
-            const topLevel = config.mcpServers ?? {};
-            const powers = config.powers?.mcpServers ?? {};
-            const merged = { ...powers, ...topLevel };
-            return Object.entries(merged).map(([name, entry]: [string, any]) => ({
-                name,
-                command: entry.command ?? '',
-                args: entry.args ?? [],
-                ...(entry.env && Object.keys(entry.env).length > 0 ? { env: entry.env } : {}),
-                ...(entry.url ? { url: entry.url } : {}),
-                ...(entry.disabled === true ? { disabled: true } : {}),
-            }));
-        } 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.url = s.url;
-            } 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;
-        }
-        return JSON.stringify({ mcpServers }, null, 2);
-    }
-
-    getConfigPath(projectRoot?: string): string {
-        if (projectRoot) {
-            return join(projectRoot, '.kiro', 'settings', 'mcp.json');
-        }
-        return join(homedir(), '.kiro', 'settings', 'mcp.json');
-    }
-}
+import type { MCPConfigAdapter, MCPServerEntry } from '../../types.js';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+
+/**
+ * Kiro MCP config adapter.
+ * Format: JSON file at .kiro/settings/mcp.json (project-level)
+ *         or ~/.kiro/settings/mcp.json (user-level)
+ * Structure: { mcpServers: { ... }, powers?: { mcpServers: { ... } } }
+ *
+ * Kiro stores user-added servers in `mcpServers` and power-installed
+ * servers (context7, figma, postman, supabase etc.) in `powers.mcpServers`.
+ * Both sections use the same entry format.
+ *
+ * Source: Kiro official MCP documentation.
+ */
+export class KiroMCPAdapter implements MCPConfigAdapter {
+    readonly source = 'kiro' as const;
+
+    parse(content: string): MCPServerEntry[] {
+        try {
+            const config = JSON.parse(content);
+            // Merge top-level mcpServers and powers.mcpServers (dedup by name)
+            const topLevel = config.mcpServers ?? {};
+            const powers = config.powers?.mcpServers ?? {};
+            const merged = { ...powers, ...topLevel };
+            return Object.entries(merged).map(([name, entry]: [string, any]) => ({
+                name,
+                command: entry.command ?? '',
+                args: entry.args ?? [],
+                ...(entry.env && Object.keys(entry.env).length > 0 ? { env: entry.env } : {}),
+                ...(entry.url ? { url: entry.url } : {}),
+                ...(entry.disabled === true ? { disabled: true } : {}),
+            }));
+        } 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.url = s.url;
+            } 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;
+        }
+        return JSON.stringify({ mcpServers }, null, 2);
+    }
+
+    getConfigPath(projectRoot?: string): string {
+        if (projectRoot) {
+            return join(projectRoot, '.kiro', 'settings', 'mcp.json');
+        }
+        return join(homedir(), '.kiro', 'settings', 'mcp.json');
+    }
+}

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

@@ -1,123 +1,123 @@
-import type { MCPConfigAdapter, MCPServerEntry } from '../../types.js';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-
-/**
- * OpenCode MCP Configuration Adapter.
- *
- * OpenCode uses JSON config files for MCP servers:
- * 1. Project-level: opencode.json in project root
- * 2. Global: ~/.config/opencode/opencode.json
- *
- * Format:
- *   {
- *     "$schema": "https://opencode.ai/config.json",
- *     "mcp": {
- *       "name": {
- *         "type": "local",
- *         "command": ["memorix", "serve"],
- *         "environment": { "KEY": "value" },
- *         "enabled": true
- *       }
- *     }
- *   }
- *
- * Remote (HTTP) servers:
- *   {
- *     "mcp": {
- *       "name": {
- *         "type": "remote",
- *         "url": "https://...",
- *         "headers": { "Authorization": "Bearer ..." }
- *       }
- *     }
- *   }
- *
- * Source: https://opencode.ai/docs/mcp-servers/
- */
-export class OpenCodeMCPAdapter implements MCPConfigAdapter {
-  readonly source = 'opencode' as const;
-
-  parse(content: string): MCPServerEntry[] {
-    try {
-      const config = JSON.parse(content);
-      const servers = config.mcp ?? {};
-      return Object.entries(servers).map(([name, entry]: [string, any]) => {
-        const result: MCPServerEntry = {
-          name,
-          command: '',
-          args: [],
-        };
-
-        if (entry.type === 'remote' && entry.url) {
-          // HTTP transport
-          result.url = entry.url;
-          if (entry.headers && typeof entry.headers === 'object' && Object.keys(entry.headers).length > 0) {
-            result.headers = entry.headers;
-          }
-        } else {
-          // Local (stdio) transport — command is an array in OpenCode
-          if (Array.isArray(entry.command) && entry.command.length > 0) {
-            result.command = entry.command[0];
-            result.args = entry.command.slice(1);
-          } else if (typeof entry.command === 'string') {
-            result.command = entry.command;
-          }
-        }
-
-        // Environment variables (OpenCode uses "environment" not "env")
-        const env = entry.environment ?? entry.env;
-        if (env && typeof env === 'object' && Object.keys(env).length > 0) {
-          result.env = env;
-        }
-
-        // Disabled flag
-        if (entry.enabled === false) {
-          result.disabled = true;
-        }
-
-        return result;
-      });
-    } catch {
-      return [];
-    }
-  }
-
-  generate(servers: MCPServerEntry[]): string {
-    const mcp: Record<string, any> = {};
-    for (const s of servers) {
-      const entry: Record<string, any> = {};
-
-      if (s.url) {
-        // HTTP transport
-        entry.type = 'remote';
-        entry.url = s.url;
-        if (s.headers && Object.keys(s.headers).length > 0) {
-          entry.headers = s.headers;
-        }
-      } else {
-        // stdio transport — OpenCode uses command as array
-        entry.type = 'local';
-        entry.command = [s.command, ...s.args];
-      }
-
-      if (s.env && Object.keys(s.env).length > 0) {
-        entry.environment = s.env;
-      }
-
-      if (s.disabled === true) {
-        entry.enabled = false;
-      }
-
-      mcp[s.name] = entry;
-    }
-    return JSON.stringify({ $schema: 'https://opencode.ai/config.json', mcp }, null, 2);
-  }
-
-  getConfigPath(projectRoot?: string): string {
-    if (projectRoot) {
-      return join(projectRoot, 'opencode.json');
-    }
-    return join(homedir(), '.config', 'opencode', 'opencode.json');
-  }
-}
+import type { MCPConfigAdapter, MCPServerEntry } from '../../types.js';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+
+/**
+ * OpenCode MCP Configuration Adapter.
+ *
+ * OpenCode uses JSON config files for MCP servers:
+ * 1. Project-level: opencode.json in project root
+ * 2. Global: ~/.config/opencode/opencode.json
+ *
+ * Format:
+ *   {
+ *     "$schema": "https://opencode.ai/config.json",
+ *     "mcp": {
+ *       "name": {
+ *         "type": "local",
+ *         "command": ["memorix", "serve"],
+ *         "environment": { "KEY": "value" },
+ *         "enabled": true
+ *       }
+ *     }
+ *   }
+ *
+ * Remote (HTTP) servers:
+ *   {
+ *     "mcp": {
+ *       "name": {
+ *         "type": "remote",
+ *         "url": "https://...",
+ *         "headers": { "Authorization": "Bearer ..." }
+ *       }
+ *     }
+ *   }
+ *
+ * Source: https://opencode.ai/docs/mcp-servers/
+ */
+export class OpenCodeMCPAdapter implements MCPConfigAdapter {
+  readonly source = 'opencode' as const;
+
+  parse(content: string): MCPServerEntry[] {
+    try {
+      const config = JSON.parse(content);
+      const servers = config.mcp ?? {};
+      return Object.entries(servers).map(([name, entry]: [string, any]) => {
+        const result: MCPServerEntry = {
+          name,
+          command: '',
+          args: [],
+        };
+
+        if (entry.type === 'remote' && entry.url) {
+          // HTTP transport
+          result.url = entry.url;
+          if (entry.headers && typeof entry.headers === 'object' && Object.keys(entry.headers).length > 0) {
+            result.headers = entry.headers;
+          }
+        } else {
+          // Local (stdio) transport — command is an array in OpenCode
+          if (Array.isArray(entry.command) && entry.command.length > 0) {
+            result.command = entry.command[0];
+            result.args = entry.command.slice(1);
+          } else if (typeof entry.command === 'string') {
+            result.command = entry.command;
+          }
+        }
+
+        // Environment variables (OpenCode uses "environment" not "env")
+        const env = entry.environment ?? entry.env;
+        if (env && typeof env === 'object' && Object.keys(env).length > 0) {
+          result.env = env;
+        }
+
+        // Disabled flag
+        if (entry.enabled === false) {
+          result.disabled = true;
+        }
+
+        return result;
+      });
+    } catch {
+      return [];
+    }
+  }
+
+  generate(servers: MCPServerEntry[]): string {
+    const mcp: Record<string, any> = {};
+    for (const s of servers) {
+      const entry: Record<string, any> = {};
+
+      if (s.url) {
+        // HTTP transport
+        entry.type = 'remote';
+        entry.url = s.url;
+        if (s.headers && Object.keys(s.headers).length > 0) {
+          entry.headers = s.headers;
+        }
+      } else {
+        // stdio transport — OpenCode uses command as array
+        entry.type = 'local';
+        entry.command = [s.command, ...s.args];
+      }
+
+      if (s.env && Object.keys(s.env).length > 0) {
+        entry.environment = s.env;
+      }
+
+      if (s.disabled === true) {
+        entry.enabled = false;
+      }
+
+      mcp[s.name] = entry;
+    }
+    return JSON.stringify({ $schema: 'https://opencode.ai/config.json', mcp }, null, 2);
+  }
+
+  getConfigPath(projectRoot?: string): string {
+    if (projectRoot) {
+      return join(projectRoot, 'opencode.json');
+    }
+    return join(homedir(), '.config', 'opencode', 'opencode.json');
+  }
+}