@kirosnn/mosaic 0.73.0 → 0.75.0

package/src/mcp/config.ts

@@ -1,223 +1,234 @@
-import { existsSync, readFileSync, writeFileSync, mkdirSync, readdirSync, unlinkSync } from 'fs';
-import { join } from 'path';
-import { homedir } from 'os';
-import { fileURLToPath } from 'url';
-import type { McpServerConfig, McpGlobalConfig } from './types';
-
-const MCP_DIR = join(homedir(), '.mosaic', 'mcp');
-const CONFIG_FILE = join(MCP_DIR, 'config.json');
-const SERVERS_DIR = join(MCP_DIR, 'servers');
-
-function ensureDirs(): void {
-  if (!existsSync(MCP_DIR)) mkdirSync(MCP_DIR, { recursive: true });
-  if (!existsSync(SERVERS_DIR)) mkdirSync(SERVERS_DIR, { recursive: true });
-}
-
-export function getDefaultServerConfig(): Partial<McpServerConfig> {
-  return {
-    enabled: true,
-    transport: { type: 'stdio' },
-    args: [],
-    autostart: 'startup',
-    timeouts: {
-      initialize: 30000,
-      call: 60000,
-    },
-    limits: {
-      maxCallsPerMinute: 60,
-      maxPayloadBytes: 1024 * 1024,
-    },
-    logs: {
-      persist: false,
-      bufferSize: 200,
-    },
-    tools: {},
-    approval: 'always',
-  };
-}
-
-function getNavigationServerConfig(): Partial<McpServerConfig> {
-  const serverPath = fileURLToPath(new URL('./servers/navigation.ts', import.meta.url));
-  return {
-    id: 'navigation',
-    name: 'Navigation',
-    command: 'bun',
-    args: ['run', serverPath],
-    enabled: true,
-    autostart: 'startup',
-    approval: 'always',
-  };
-}
-
-export function validateServerConfig(config: Partial<McpServerConfig>): string[] {
-  const errors: string[] = [];
-
-  if (!config.id || typeof config.id !== 'string') {
-    errors.push('Server id is required and must be a string');
-  } else if (!/^[a-zA-Z0-9_-]+$/.test(config.id)) {
-    errors.push('Server id must contain only alphanumeric characters, hyphens, and underscores');
-  }
-
-  if (!config.name || typeof config.name !== 'string') {
-    errors.push('Server name is required and must be a string');
-  }
-
-  if (!config.command || typeof config.command !== 'string') {
-    errors.push('Server command is required and must be a string');
-  }
-
-  if (config.args && !Array.isArray(config.args)) {
-    errors.push('Server args must be an array of strings');
-  }
-
-  if (config.autostart && !['startup', 'on-demand', 'never'].includes(config.autostart)) {
-    errors.push('Server autostart must be "startup", "on-demand", or "never"');
-  }
-
-  if (config.approval && !['always', 'once-per-tool', 'once-per-server', 'never'].includes(config.approval)) {
-    errors.push('Server approval must be "always", "once-per-tool", "once-per-server", or "never"');
-  }
-
-  return errors;
-}
-
-function mergeWithDefaults(partial: Partial<McpServerConfig>): McpServerConfig {
-  const defaults = getDefaultServerConfig();
-  return {
-    id: partial.id!,
-    name: partial.name || partial.id!,
-    enabled: partial.enabled ?? defaults.enabled!,
-    transport: partial.transport || defaults.transport!,
-    command: partial.command!,
-    args: partial.args || defaults.args!,
-    cwd: partial.cwd,
-    env: partial.env,
-    autostart: partial.autostart || defaults.autostart!,
-    timeouts: { ...defaults.timeouts!, ...partial.timeouts },
-    limits: { ...defaults.limits!, ...partial.limits },
-    logs: { ...defaults.logs!, ...partial.logs },
-    tools: { ...defaults.tools, ...partial.tools },
-    approval: partial.approval || defaults.approval!,
-  };
-}
-
-function loadGlobalConfigFile(): Partial<McpGlobalConfig> {
-  if (!existsSync(CONFIG_FILE)) return {};
-  try {
-    const content = readFileSync(CONFIG_FILE, 'utf-8');
-    return JSON.parse(content);
-  } catch {
-    return {};
-  }
-}
-
-function loadServerFiles(): Partial<McpServerConfig>[] {
-  if (!existsSync(SERVERS_DIR)) return [];
-  const files = readdirSync(SERVERS_DIR).filter(f => f.endsWith('.json'));
-  const configs: Partial<McpServerConfig>[] = [];
-
-  for (const file of files) {
-    try {
-      const content = readFileSync(join(SERVERS_DIR, file), 'utf-8');
-      const parsed = JSON.parse(content);
-      if (!parsed.id) {
-        parsed.id = file.replace(/\.json$/, '');
-      }
-      configs.push(parsed);
-    } catch {
-      // skip invalid files
-    }
-  }
-
-  return configs;
-}
-
-export function loadMcpConfig(): McpServerConfig[] {
-  ensureDirs();
-
-  const globalConfig = loadGlobalConfigFile();
-  const serverFiles = loadServerFiles();
-
-  const configMap = new Map<string, Partial<McpServerConfig>>();
-
-  if (globalConfig.servers) {
-    for (const server of globalConfig.servers) {
-      if (server.id) {
-        configMap.set(server.id, server);
-      }
-    }
-  }
-
-  for (const server of serverFiles) {
-    if (server.id) {
-      const existing = configMap.get(server.id);
-      if (existing) {
-        configMap.set(server.id, { ...existing, ...server });
-      } else {
-        configMap.set(server.id, server);
-      }
-    }
-  }
-
-  if (!configMap.has('navigation')) {
-    configMap.set('navigation', getNavigationServerConfig());
-  }
-
-  const results: McpServerConfig[] = [];
-  for (const [, partial] of configMap) {
-    const errors = validateServerConfig(partial);
-    if (errors.length === 0) {
-      results.push(mergeWithDefaults(partial));
-    }
-  }
-
-  return results;
-}
-
-export function saveServerConfig(config: Partial<McpServerConfig>): void {
-  ensureDirs();
-  const errors = validateServerConfig(config);
-  if (errors.length > 0) {
-    throw new Error(`Invalid server config: ${errors.join(', ')}`);
-  }
-  const filePath = join(SERVERS_DIR, `${config.id}.json`);
-  writeFileSync(filePath, JSON.stringify(config, null, 2), 'utf-8');
-}
-
-export function removeServerConfig(id: string): boolean {
-  const filePath = join(SERVERS_DIR, `${id}.json`);
-  if (existsSync(filePath)) {
-    unlinkSync(filePath);
-    return true;
-  }
-
-  const globalConfig = loadGlobalConfigFile();
-  if (globalConfig.servers) {
-    const idx = globalConfig.servers.findIndex(s => s.id === id);
-    if (idx !== -1) {
-      globalConfig.servers.splice(idx, 1);
-      writeFileSync(CONFIG_FILE, JSON.stringify(globalConfig, null, 2), 'utf-8');
-      return true;
-    }
-  }
-
-  return false;
-}
-
-export function updateServerConfig(id: string, updates: Partial<McpServerConfig>): McpServerConfig | null {
-  const configs = loadMcpConfig();
-  const existing = configs.find(c => c.id === id);
-  if (!existing) return null;
-
-  const updated = { ...existing, ...updates, id };
-  saveServerConfig(updated);
-  return updated;
-}
-
-export function getMcpConfigDir(): string {
-  return MCP_DIR;
-}
-
-export function getServersDir(): string {
-  return SERVERS_DIR;
-}
+import { existsSync, readFileSync, writeFileSync, mkdirSync, readdirSync, unlinkSync } from 'fs';
+import { join } from 'path';
+import { homedir } from 'os';
+import { fileURLToPath } from 'url';
+import type { McpServerConfig, McpGlobalConfig } from './types';
+
+const MCP_DIR = join(homedir(), '.mosaic', 'mcp');
+const CONFIG_FILE = join(MCP_DIR, 'config.json');
+const SERVERS_DIR = join(MCP_DIR, 'servers');
+
+function ensureDirs(): void {
+  if (!existsSync(MCP_DIR)) mkdirSync(MCP_DIR, { recursive: true });
+  if (!existsSync(SERVERS_DIR)) mkdirSync(SERVERS_DIR, { recursive: true });
+}
+
+export function getDefaultServerConfig(): Partial<McpServerConfig> {
+  return {
+    enabled: true,
+    transport: { type: 'stdio' },
+    args: [],
+    autostart: 'startup',
+    timeouts: {
+      initialize: 30000,
+      call: 60000,
+    },
+    limits: {
+      maxCallsPerMinute: 60,
+      maxPayloadBytes: 1024 * 1024,
+    },
+    logs: {
+      persist: false,
+      bufferSize: 200,
+    },
+    tools: {},
+    approval: 'always',
+  };
+}
+
+function getNavigationServerConfig(): Partial<McpServerConfig> {
+  const serverPath = fileURLToPath(new URL('./servers/navigation/index.ts', import.meta.url));
+  return {
+    id: 'navigation',
+    name: 'Navigation',
+    native: true,
+    command: 'npx',
+    args: ['tsx', serverPath],
+    enabled: true,
+    autostart: 'startup',
+    approval: 'never',
+    toolApproval: {
+      navigation_cookies: 'always',
+      navigation_headers: 'always',
+    },
+    timeouts: {
+      initialize: 30000,
+      call: 60000,
+    },
+  };
+}
+
+export function validateServerConfig(config: Partial<McpServerConfig>): string[] {
+  const errors: string[] = [];
+
+  if (!config.id || typeof config.id !== 'string') {
+    errors.push('Server id is required and must be a string');
+  } else if (!/^[a-zA-Z0-9_-]+$/.test(config.id)) {
+    errors.push('Server id must contain only alphanumeric characters, hyphens, and underscores');
+  }
+
+  if (!config.name || typeof config.name !== 'string') {
+    errors.push('Server name is required and must be a string');
+  }
+
+  if (!config.command || typeof config.command !== 'string') {
+    errors.push('Server command is required and must be a string');
+  }
+
+  if (config.args && !Array.isArray(config.args)) {
+    errors.push('Server args must be an array of strings');
+  }
+
+  if (config.autostart && !['startup', 'on-demand', 'never'].includes(config.autostart)) {
+    errors.push('Server autostart must be "startup", "on-demand", or "never"');
+  }
+
+  if (config.approval && !['always', 'once-per-tool', 'once-per-server', 'never'].includes(config.approval)) {
+    errors.push('Server approval must be "always", "once-per-tool", "once-per-server", or "never"');
+  }
+
+  return errors;
+}
+
+function mergeWithDefaults(partial: Partial<McpServerConfig>): McpServerConfig {
+  const defaults = getDefaultServerConfig();
+  return {
+    id: partial.id!,
+    name: partial.name || partial.id!,
+    enabled: partial.enabled ?? defaults.enabled!,
+    native: partial.native,
+    transport: partial.transport || defaults.transport!,
+    command: partial.command!,
+    args: partial.args || defaults.args!,
+    cwd: partial.cwd,
+    env: partial.env,
+    autostart: partial.autostart || defaults.autostart!,
+    timeouts: { ...defaults.timeouts!, ...partial.timeouts },
+    limits: { ...defaults.limits!, ...partial.limits },
+    logs: { ...defaults.logs!, ...partial.logs },
+    tools: { ...defaults.tools, ...partial.tools },
+    approval: partial.approval || defaults.approval!,
+    toolApproval: partial.toolApproval,
+  };
+}
+
+function loadGlobalConfigFile(): Partial<McpGlobalConfig> {
+  if (!existsSync(CONFIG_FILE)) return {};
+  try {
+    const content = readFileSync(CONFIG_FILE, 'utf-8');
+    return JSON.parse(content);
+  } catch {
+    return {};
+  }
+}
+
+function loadServerFiles(): Partial<McpServerConfig>[] {
+  if (!existsSync(SERVERS_DIR)) return [];
+  const files = readdirSync(SERVERS_DIR).filter(f => f.endsWith('.json'));
+  const configs: Partial<McpServerConfig>[] = [];
+
+  for (const file of files) {
+    try {
+      const content = readFileSync(join(SERVERS_DIR, file), 'utf-8');
+      const parsed = JSON.parse(content);
+      if (!parsed.id) {
+        parsed.id = file.replace(/\.json$/, '');
+      }
+      configs.push(parsed);
+    } catch {
+      // skip invalid files
+    }
+  }
+
+  return configs;
+}
+
+export function loadMcpConfig(): McpServerConfig[] {
+  ensureDirs();
+
+  const globalConfig = loadGlobalConfigFile();
+  const serverFiles = loadServerFiles();
+
+  const configMap = new Map<string, Partial<McpServerConfig>>();
+
+  if (globalConfig.servers) {
+    for (const server of globalConfig.servers) {
+      if (server.id) {
+        configMap.set(server.id, server);
+      }
+    }
+  }
+
+  for (const server of serverFiles) {
+    if (server.id) {
+      const existing = configMap.get(server.id);
+      if (existing) {
+        configMap.set(server.id, { ...existing, ...server });
+      } else {
+        configMap.set(server.id, server);
+      }
+    }
+  }
+
+  if (!configMap.has('navigation')) {
+    configMap.set('navigation', getNavigationServerConfig());
+  }
+
+  const results: McpServerConfig[] = [];
+  for (const [, partial] of configMap) {
+    const errors = validateServerConfig(partial);
+    if (errors.length === 0) {
+      results.push(mergeWithDefaults(partial));
+    }
+  }
+
+  return results;
+}
+
+export function saveServerConfig(config: Partial<McpServerConfig>): void {
+  ensureDirs();
+  const errors = validateServerConfig(config);
+  if (errors.length > 0) {
+    throw new Error(`Invalid server config: ${errors.join(', ')}`);
+  }
+  const filePath = join(SERVERS_DIR, `${config.id}.json`);
+  writeFileSync(filePath, JSON.stringify(config, null, 2), 'utf-8');
+}
+
+export function removeServerConfig(id: string): boolean {
+  const filePath = join(SERVERS_DIR, `${id}.json`);
+  if (existsSync(filePath)) {
+    unlinkSync(filePath);
+    return true;
+  }
+
+  const globalConfig = loadGlobalConfigFile();
+  if (globalConfig.servers) {
+    const idx = globalConfig.servers.findIndex(s => s.id === id);
+    if (idx !== -1) {
+      globalConfig.servers.splice(idx, 1);
+      writeFileSync(CONFIG_FILE, JSON.stringify(globalConfig, null, 2), 'utf-8');
+      return true;
+    }
+  }
+
+  return false;
+}
+
+export function updateServerConfig(id: string, updates: Partial<McpServerConfig>): McpServerConfig | null {
+  const configs = loadMcpConfig();
+  const existing = configs.find(c => c.id === id);
+  if (!existing) return null;
+
+  const updated = { ...existing, ...updates, id };
+  saveServerConfig(updated);
+  return updated;
+}
+
+export function getMcpConfigDir(): string {
+  return MCP_DIR;
+}
+
+export function getServersDir(): string {
+  return SERVERS_DIR;
+}